From 46c8cecbbc6f8e0a3bc30182504cac5b2c7e2d0e Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Sun, 28 Jul 2024 21:53:23 +0200 Subject: [PATCH 001/422] Update Marathon (Engineering revamp and small stuff) (#30429) * Update Marathon * Update 2 * Update 3 * Update 5 * Update 5 (actually this time) --- Resources/Maps/marathon.yml | 31254 ++++++++++++++++------------------ 1 file changed, 14606 insertions(+), 16648 deletions(-) diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml index 58136160e2..0bb7ea2aed 100644 --- a/Resources/Maps/marathon.yml +++ b/Resources/Maps/marathon.yml @@ -47,6 +47,7 @@ tilemap: 101: FloorSteelHerringbone 102: FloorSteelLime 103: FloorSteelMini + 1: FloorSteelMono 106: FloorSteelPavement 107: FloorSteelPavementVertical 108: FloorTechMaint @@ -76,7 +77,7 @@ entities: version: 6 0,0: ind: 0,0 - tiles: XQAAAAABXQAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADfgAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAADXQAAAAADXQAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAACXQAAAAADXQAAAAADXQAAAAABXQAAAAACXQAAAAABXQAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAABXQAAAAADXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAACXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAADfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABHwAAAAACXQAAAAAAHwAAAAABXQAAAAAAHwAAAAADXQAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADXQAAAAACHwAAAAADXQAAAAACHwAAAAABXQAAAAACHwAAAAADXQAAAAABXQAAAAADXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAABXQAAAAADHwAAAAABXQAAAAADHwAAAAACXQAAAAACXQAAAAAAXQAAAAABXQAAAAABXQAAAAABfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAHwAAAAAAXQAAAAAAHwAAAAAAfgAAAAAAHwAAAAAAXQAAAAACHwAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAADXQAAAAACfgAAAAAAXQAAAAABHwAAAAACXQAAAAACfgAAAAAAXQAAAAADXQAAAAAAXQAAAAACfgAAAAAAHwAAAAABHwAAAAABHwAAAAACHwAAAAAAHwAAAAADXQAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAADHwAAAAACHwAAAAAAfgAAAAAAHwAAAAADfgAAAAAAHwAAAAADHwAAAAADHwAAAAADfgAAAAAAXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAHwAAAAACHwAAAAACHwAAAAADHwAAAAAAegAAAAACfgAAAAAAGwAAAAAAGwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAQwAAAAAAQwAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADfgAAAAAAHwAAAAADHwAAAAABHwAAAAAAHwAAAAACHwAAAAADfgAAAAAAHwAAAAAAHwAAAAABHwAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAHwAAAAAD + tiles: XQAAAAABXQAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADfgAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAADXQAAAAADXQAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAACXQAAAAADXQAAAAADXQAAAAABXQAAAAACXQAAAAABXQAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAABXQAAAAADXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAACXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAADfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABHwAAAAACXQAAAAAAHwAAAAABXQAAAAAAHwAAAAADXQAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADXQAAAAACHwAAAAADXQAAAAACHwAAAAABXQAAAAACHwAAAAADXQAAAAABXQAAAAADXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAABXQAAAAADHwAAAAABXQAAAAADHwAAAAACXQAAAAACXQAAAAAAXQAAAAABXQAAAAABXQAAAAABfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAHwAAAAAAXQAAAAAAHwAAAAAAfgAAAAAAHwAAAAAAXQAAAAACHwAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAADXQAAAAACfgAAAAAAXQAAAAABHwAAAAACXQAAAAACfgAAAAAAXQAAAAADXQAAAAAAXQAAAAACfgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHwAAAAAAHwAAAAADXQAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAADHwAAAAACHwAAAAAAfgAAAAAAHwAAAAADfgAAAAAAHwAAAAADHwAAAAADHwAAAAADfgAAAAAAXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAeQAAAAAAeQAAAAAAHwAAAAADHwAAAAAAegAAAAACfgAAAAAAGwAAAAAAGwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAQwAAAAAAQwAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADfgAAAAAAHwAAAAADHwAAAAABHwAAAAAAHwAAAAACHwAAAAADfgAAAAAAHwAAAAAAHwAAAAABHwAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAHwAAAAAD version: 6 -1,-1: ind: -1,-1 @@ -88,7 +89,7 @@ entities: version: 6 -2,0: ind: -2,0 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAABXQAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAACXQAAAAADXQAAAAADXQAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAABfgAAAAAAYAAAAAAAYAAAAAABHwAAAAABHwAAAAADfgAAAAAATQAAAAAATQAAAAADTQAAAAABTQAAAAAATQAAAAABTQAAAAACXQAAAAABXQAAAAACXQAAAAACXQAAAAADXQAAAAABYAAAAAAAYAAAAAADJAAAAAABHwAAAAADfgAAAAAAPAAAAAAATQAAAAACagAAAAABagAAAAAAagAAAAADTQAAAAACfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABfgAAAAAAYAAAAAADYAAAAAADJAAAAAACHwAAAAABfgAAAAAAPAAAAAAATQAAAAAAagAAAAADagAAAAABagAAAAABTQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAYAAAAAACYAAAAAADJAAAAAABHwAAAAABfgAAAAAAPAAAAAAATQAAAAADagAAAAADagAAAAAAagAAAAADTQAAAAACTQAAAAABXQAAAAADXQAAAAAAXQAAAAADfgAAAAAAYAAAAAADYAAAAAABHwAAAAACHwAAAAABfgAAAAAAPAAAAAAATQAAAAACagAAAAADagAAAAADagAAAAAATQAAAAABTQAAAAADXQAAAAACXQAAAAABXQAAAAABXQAAAAACYAAAAAACYAAAAAABHwAAAAACfgAAAAAAfgAAAAAAPAAAAAAATQAAAAABagAAAAAAagAAAAABagAAAAAATQAAAAAATQAAAAABXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAYAAAAAACYAAAAAACHwAAAAABHwAAAAAAfgAAAAAATQAAAAADTQAAAAABTQAAAAAATQAAAAADTQAAAAABTQAAAAADPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAABfgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAATQAAAAADPAAAAAAAPAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJgAAAAABfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAJgAAAAABPAAAAAAAPAAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAA + tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAABXQAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAACXQAAAAADXQAAAAADXQAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAXQAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAABfgAAAAAAYAAAAAAAYAAAAAABHwAAAAABHwAAAAADfgAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAADXQAAAAABYAAAAAAAYAAAAAADJAAAAAABHwAAAAADfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAAQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABfgAAAAAAYAAAAAADYAAAAAADJAAAAAACHwAAAAABfgAAAAAAXQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAYAAAAAACYAAAAAADJAAAAAABHwAAAAABfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAAQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAYAAAAAADYAAAAAABHwAAAAACHwAAAAABfgAAAAAAXQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACYAAAAAACYAAAAAABHwAAAAACfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAAQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAYAAAAAACYAAAAAACHwAAAAABHwAAAAAAfgAAAAAAXQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAABfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJgAAAAABfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAKAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAA version: 6 0,1: ind: 0,1 @@ -100,7 +101,7 @@ entities: version: 6 -2,1: ind: -2,1 - tiles: fgAAAAAAbAAAAAAAfgAAAAAAPAAAAAAAJgAAAAAAJgAAAAACJgAAAAABJgAAAAAAJgAAAAABPAAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAALgAAAAAALgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAABfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAADfgAAAAAAYgAAAAACYgAAAAABYgAAAAACYgAAAAACfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAACfgAAAAAAYgAAAAAAYgAAAAAAYgAAAAACYgAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAADgAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAABXQAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAADTQAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAACXQAAAAADTQAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAACXQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAABXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAegAAAAABegAAAAADegAAAAADegAAAAADegAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAegAAAAACegAAAAACegAAAAAAegAAAAAAegAAAAAAfgAAAAAA + tiles: fgAAAAAAbAAAAAAAfgAAAAAAPAAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAPAAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAALgAAAAAALgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAABfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAADfgAAAAAAYgAAAAACYgAAAAABYgAAAAACYgAAAAACfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAACfgAAAAAAYgAAAAAAYgAAAAAAYgAAAAACYgAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAADgAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAABXQAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAADTQAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAACXQAAAAADTQAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAACXQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAABXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAegAAAAABegAAAAADegAAAAADegAAAAADegAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAegAAAAACegAAAAACegAAAAAAegAAAAAAegAAAAAAfgAAAAAA version: 6 -3,0: ind: -3,0 @@ -148,7 +149,7 @@ entities: version: 6 -3,3: ind: -3,3 - tiles: XQAAAAADXQAAAAACfgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAACfgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAADHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAADfgAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAAAHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAADXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAUgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAXQAAAAADUgAAAAAAUgAAAAAAfgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAUgAAAAAAUgAAAAAALgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAALgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAXQAAAAAAUgAAAAAAUgAAAAAAfgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAXQAAAAADXQAAAAADXQAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAADXQAAAAABLgAAAAAALgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA + tiles: XQAAAAADXQAAAAACfgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAACfgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAADHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAADfgAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAAAHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAADXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAUgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAXQAAAAADUgAAAAAAUgAAAAAAfgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAUgAAAAAAUgAAAAAALgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAALgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAXQAAAAAAUgAAAAAAUgAAAAAAfgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAXQAAAAADXQAAAAADXQAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAADXQAAAAABLgAAAAAALgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA version: 6 -2,3: ind: -2,3 @@ -156,7 +157,7 @@ entities: version: 6 -3,4: ind: -3,4 - tiles: XQAAAAABXQAAAAABXQAAAAABLgAAAAAALgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAABPwAAAAAAPwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAACPwAAAAAAPwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: XQAAAAABXQAAAAABXQAAAAABLgAAAAAALgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAXQAAAAABXQAAAAAAXQAAAAABPwAAAAAAPwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAADXQAAAAACPwAAAAAAPwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -4,4: ind: -4,4 @@ -176,7 +177,7 @@ entities: version: 6 1,1: ind: 1,1 - tiles: fgAAAAAAeQAAAAABeQAAAAABfgAAAAAAHwAAAAADHwAAAAACHwAAAAABHwAAAAAAfgAAAAAAegAAAAACegAAAAABegAAAAAAegAAAAABegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAeQAAAAABeQAAAAABeQAAAAACeQAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAACXQAAAAAAHwAAAAABHwAAAAACHwAAAAABHwAAAAADHwAAAAAAHwAAAAAAfgAAAAAAeQAAAAACeQAAAAACeQAAAAAAeQAAAAABXQAAAAABXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAHwAAAAADHwAAAAACHwAAAAABHwAAAAABHwAAAAAAHwAAAAADHwAAAAADHwAAAAADHwAAAAABXQAAAAACXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAABXQAAAAAAHwAAAAADHwAAAAAAHwAAAAADHwAAAAADHwAAAAACHwAAAAABHwAAAAABHwAAAAACHwAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAADcAAAAAACJAAAAAABJAAAAAADJAAAAAAATQAAAAAATQAAAAADHwAAAAADHwAAAAAAHwAAAAACXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAABXQAAAAABXQAAAAACfgAAAAAAJAAAAAABJAAAAAABJAAAAAACTQAAAAADTQAAAAAAHwAAAAADHwAAAAAAHwAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAADfgAAAAAAJAAAAAAAJAAAAAAAJAAAAAADTQAAAAABTQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAADXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAALgAAAAAALgAAAAAAEAAAAAAAEAAAAAAAfgAAAAAAbAAAAAAAXQAAAAADXQAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAACXQAAAAABcAAAAAACLgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAAAfgAAAAAALgAAAAAALgAAAAAAfgAAAAAAEAAAAAAAfgAAAAAAEAAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAACfgAAAAAAfgAAAAAALgAAAAAALgAAAAAAfgAAAAAAEAAAAAAAfgAAAAAAEAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAADfgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbQAAAAAAXQAAAAAAXQAAAAACXQAAAAABfgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAADfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAA + tiles: HwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAABHwAAAAAAfgAAAAAAegAAAAACegAAAAABegAAAAAAegAAAAABegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAeQAAAAABeQAAAAABeQAAAAACeQAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAACXQAAAAAAHwAAAAABHwAAAAACHwAAAAABHwAAAAADHwAAAAAAHwAAAAAAfgAAAAAAeQAAAAACeQAAAAACeQAAAAAAeQAAAAABXQAAAAABXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAHwAAAAADHwAAAAACHwAAAAABHwAAAAABHwAAAAAAHwAAAAADHwAAAAADHwAAAAADHwAAAAABXQAAAAACXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAABXQAAAAAAHwAAAAADHwAAAAAAHwAAAAADHwAAAAADHwAAAAACHwAAAAABHwAAAAABHwAAAAACHwAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAADcAAAAAACJAAAAAABJAAAAAADJAAAAAAATQAAAAAATQAAAAADHwAAAAADHwAAAAAAHwAAAAACXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAABXQAAAAABXQAAAAACfgAAAAAAJAAAAAABJAAAAAABJAAAAAACTQAAAAADTQAAAAAAHwAAAAADHwAAAAAAHwAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAADfgAAAAAAJAAAAAAAJAAAAAAAJAAAAAADTQAAAAABTQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAADXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAALgAAAAAALgAAAAAAEAAAAAAAEAAAAAAAfgAAAAAAbAAAAAAAXQAAAAADXQAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAACXQAAAAABcAAAAAACLgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAAAfgAAAAAALgAAAAAALgAAAAAAfgAAAAAAEAAAAAAAfgAAAAAAEAAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAACfgAAAAAAfgAAAAAALgAAAAAALgAAAAAAfgAAAAAAEAAAAAAAfgAAAAAAEAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAADfgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbQAAAAAAXQAAAAAAXQAAAAACXQAAAAABfgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAADfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAA version: 6 1,2: ind: 1,2 @@ -192,7 +193,7 @@ entities: version: 6 1,0: ind: 1,0 - tiles: XQAAAAABXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAABfgAAAAAAegAAAAADegAAAAADegAAAAADegAAAAADXQAAAAABfgAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAAAXQAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAADfgAAAAAAegAAAAADegAAAAADegAAAAADegAAAAABXQAAAAADXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAegAAAAADegAAAAABegAAAAABegAAAAAAXQAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAACcAAAAAABcAAAAAABcAAAAAAAcAAAAAAAcAAAAAADcAAAAAAAHwAAAAAAHwAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAAAcAAAAAABcAAAAAADcAAAAAADcAAAAAABcAAAAAADcAAAAAADHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAADcAAAAAABcAAAAAADXQAAAAADXQAAAAACXQAAAAACcAAAAAABfgAAAAAAHwAAAAAAHwAAAAABHwAAAAADHwAAAAADHwAAAAACHwAAAAADHwAAAAACHwAAAAABHwAAAAABcAAAAAAAcAAAAAAAXQAAAAACXQAAAAABXQAAAAAAcAAAAAACfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAACHwAAAAAAHwAAAAAAHwAAAAADHwAAAAADHwAAAAABcAAAAAAAcAAAAAACcAAAAAACcAAAAAADcAAAAAAAcAAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAADHwAAAAAAHwAAAAACHwAAAAAAHwAAAAADHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAADfgAAAAAAegAAAAAAegAAAAADegAAAAADegAAAAACegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAeQAAAAABbAAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAADfgAAAAAAegAAAAADegAAAAADegAAAAAAegAAAAAAegAAAAADfgAAAAAAEQAAAAAAHwAAAAAAHwAAAAADHwAAAAADHwAAAAABHwAAAAABHwAAAAABHwAAAAACHwAAAAAAfgAAAAAAegAAAAACegAAAAACegAAAAADegAAAAADegAAAAADfgAAAAAAEQAAAAAA + tiles: XQAAAAABXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAABfgAAAAAAegAAAAADegAAAAADegAAAAADegAAAAADXQAAAAABfgAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAAAXQAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAADfgAAAAAAegAAAAADegAAAAADegAAAAADegAAAAABXQAAAAADXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAegAAAAADegAAAAABegAAAAABegAAAAAAXQAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAACcAAAAAABcAAAAAABcAAAAAAAcAAAAAAAcAAAAAADcAAAAAAAHwAAAAAAHwAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAAAcAAAAAABcAAAAAADcAAAAAADcAAAAAABcAAAAAADcAAAAAADHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAADcAAAAAABcAAAAAADXQAAAAADXQAAAAACXQAAAAACcAAAAAABfgAAAAAAHwAAAAAAHwAAAAABHwAAAAADHwAAAAADHwAAAAACHwAAAAADHwAAAAACHwAAAAABHwAAAAABcAAAAAAAcAAAAAAAXQAAAAACXQAAAAABXQAAAAAAcAAAAAACfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAACHwAAAAAAHwAAAAAAHwAAAAADHwAAAAADHwAAAAABcAAAAAAAcAAAAAACcAAAAAACcAAAAAADcAAAAAAAcAAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAADHwAAAAAAHwAAAAACHwAAAAAAHwAAAAADHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAACHwAAAAAAHwAAAAADfgAAAAAAegAAAAAAegAAAAADegAAAAADegAAAAACegAAAAABfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAADfgAAAAAAegAAAAADegAAAAADegAAAAAAegAAAAAAegAAAAADfgAAAAAAEQAAAAAAHwAAAAAAHwAAAAADHwAAAAADHwAAAAABHwAAAAABHwAAAAABHwAAAAACHwAAAAAAfgAAAAAAegAAAAACegAAAAACegAAAAADegAAAAADegAAAAADfgAAAAAAEQAAAAAA version: 6 1,-1: ind: 1,-1 @@ -200,11 +201,11 @@ entities: version: 6 -1,-2: ind: -1,-2 - tiles: HwAAAAABfgAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAACXQAAAAACfgAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAADHwAAAAADHwAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACHwAAAAACfgAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAABXQAAAAACfgAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAACfgAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAACbAAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAAAfgAAAAAAcAAAAAACcAAAAAABcAAAAAADcAAAAAAAfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAABfgAAAAAAcAAAAAADcAAAAAAAcAAAAAABcAAAAAACfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAABfgAAAAAAcAAAAAACcAAAAAADcAAAAAABcAAAAAABfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAABcAAAAAADcAAAAAACcAAAAAADcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAcAAAAAADcAAAAAAAcAAAAAACcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAACcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAA + tiles: HwAAAAAAfgAAAAAAXQAAAAAAEQAAAAAAHwAAAAAAEQAAAAAAHwAAAAAAEQAAAAAAHwAAAAAAEQAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAEQAAAAAAHwAAAAAAEQAAAAAAHwAAAAAAEQAAAAAAHwAAAAAAEQAAAAAAHwAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAADHwAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAHwAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACHwAAAAAAfgAAAAAAHwAAAAAAEQAAAAAAHwAAAAAAEQAAAAAAHwAAAAAAEQAAAAAAHwAAAAAAEQAAAAAAHwAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAHwAAAAAAEQAAAAAAHwAAAAAAEQAAAAAAHwAAAAAAEQAAAAAAHwAAAAAAEQAAAAAAHwAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAACbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAAAfgAAAAAAcAAAAAACcAAAAAABcAAAAAADcAAAAAAAfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAABfgAAAAAAcAAAAAADcAAAAAAAcAAAAAABcAAAAAACfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAABfgAAAAAAcAAAAAACcAAAAAADcAAAAAABcAAAAAABfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAABcAAAAAADcAAAAAACcAAAAAADcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAcAAAAAADcAAAAAAAcAAAAAACcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAACcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAA version: 6 -2,-2: ind: -2,-2 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABfgAAAAAAegAAAAADegAAAAACegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACcAAAAAACcAAAAAABfgAAAAAAHwAAAAADHwAAAAACHwAAAAACfgAAAAAAcAAAAAADcAAAAAAAcAAAAAADfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAcAAAAAACeQAAAAACcAAAAAADHwAAAAACHwAAAAABHwAAAAABHwAAAAADHwAAAAADcAAAAAACeQAAAAACcAAAAAADDAAAAAADcAAAAAACcAAAAAACcAAAAAAAfgAAAAAAcAAAAAAAeQAAAAABcAAAAAACfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAcAAAAAACeQAAAAABcAAAAAAADAAAAAACcAAAAAACcAAAAAAAcAAAAAADfgAAAAAAcAAAAAACeQAAAAABcAAAAAACfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAcAAAAAADeQAAAAAAcAAAAAADcAAAAAAAcAAAAAADcAAAAAADcAAAAAABfgAAAAAAcAAAAAAAeQAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADeQAAAAABcAAAAAACDAAAAAABcAAAAAADcAAAAAABcAAAAAAAfgAAAAAAcAAAAAABeQAAAAADcAAAAAABfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAcAAAAAAAeQAAAAACcAAAAAACDAAAAAAAcAAAAAAAcAAAAAAAcAAAAAADcAAAAAACcAAAAAABeQAAAAAAcAAAAAADfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAcAAAAAACeQAAAAAAcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADeQAAAAACcAAAAAAAHwAAAAACHwAAAAABHwAAAAADHwAAAAACHwAAAAABcAAAAAAAeQAAAAADcAAAAAACfgAAAAAAeQAAAAABeQAAAAADeQAAAAAA + tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABfgAAAAAAegAAAAADegAAAAACegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACcAAAAAACcAAAAAABfgAAAAAAHwAAAAADHwAAAAACHwAAAAACfgAAAAAAcAAAAAADcAAAAAAAcAAAAAADfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAcAAAAAACeQAAAAACcAAAAAADHwAAAAACHwAAAAABHwAAAAABHwAAAAADHwAAAAADcAAAAAACeQAAAAACcAAAAAADDAAAAAADcAAAAAACcAAAAAACcAAAAAAAfgAAAAAAcAAAAAAAeQAAAAABcAAAAAACfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAcAAAAAACeQAAAAABcAAAAAAADAAAAAACcAAAAAACcAAAAAAAcAAAAAADfgAAAAAAcAAAAAACeQAAAAABcAAAAAACfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAcAAAAAADeQAAAAAAcAAAAAADcAAAAAAAcAAAAAADcAAAAAADcAAAAAABfgAAAAAAcAAAAAAAeQAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADeQAAAAABcAAAAAACDAAAAAABcAAAAAADcAAAAAABcAAAAAAAfgAAAAAAcAAAAAABeQAAAAADcAAAAAABfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAcAAAAAAAeQAAAAACcAAAAAACDAAAAAAAcAAAAAAAcAAAAAAAcAAAAAADcAAAAAACcAAAAAABeQAAAAAAcAAAAAADfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAcAAAAAACeQAAAAAAcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADeQAAAAACcAAAAAAAHwAAAAACHwAAAAABHwAAAAADHwAAAAACHwAAAAABcAAAAAAAeQAAAAADcAAAAAACfgAAAAAAeQAAAAABeQAAAAADeQAAAAAA version: 6 -3,-2: ind: -3,-2 @@ -212,11 +213,11 @@ entities: version: 6 0,-2: ind: 0,-2 - tiles: fgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAACXQAAAAADfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAACfgAAAAAAXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAABfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAABbAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAAAXQAAAAACXQAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAACXQAAAAABXQAAAAACXQAAAAADbAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAACHwAAAAABfgAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAegAAAAABegAAAAAAegAAAAADfgAAAAAAXQAAAAACXQAAAAACXQAAAAAAHwAAAAACfgAAAAAA + tiles: fgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAACXQAAAAADfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAACfgAAAAAAXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAACfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAABfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAAAXQAAAAACXQAAAAAAbAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAACXQAAAAABXQAAAAACXQAAAAADbAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAACHwAAAAABfgAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAegAAAAABegAAAAAAegAAAAADfgAAAAAAXQAAAAACXQAAAAACXQAAAAAAHwAAAAACfgAAAAAA version: 6 1,-2: ind: 1,-2 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAATwAAAAAAHwAAAAABHwAAAAABTwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAABHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAHwAAAAABHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAATwAAAAAAHwAAAAABHwAAAAABTwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAHwAAAAAAHwAAAAACHwAAAAAAHwAAAAABHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAHwAAAAABHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 2,-1: ind: 2,-1 @@ -224,7 +225,7 @@ entities: version: 6 0,-3: ind: 0,-3 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAABfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAADfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAXQAAAAABXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfQAAAAAAXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAACXQAAAAADbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA + tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAXQAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAHwAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAHwAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAHwAAAAAAXQAAAAAAXQAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfQAAAAAAXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAACXQAAAAADbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA version: 6 1,-3: ind: 1,-3 @@ -232,39 +233,35 @@ entities: version: 6 -1,-3: ind: -1,-3 - tiles: fgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAABHwAAAAADHwAAAAACHwAAAAAAHwAAAAADHwAAAAABHwAAAAABHwAAAAADHwAAAAACHwAAAAACHwAAAAADfgAAAAAAXQAAAAACfgAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAAAXQAAAAADXQAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAABfgAAAAAAXQAAAAABfgAAAAAAXQAAAAABXQAAAAADXQAAAAABXQAAAAABXQAAAAABXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAACXQAAAAADXQAAAAACXQAAAAACXQAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAADTgAAAAAATgAAAAAATgAAAAACTgAAAAAATgAAAAABXQAAAAADXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAACXQAAAAABXQAAAAACXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAADfgAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAABXQAAAAACXQAAAAAAXQAAAAABXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAACfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAHwAAAAAAHwAAAAADHwAAAAABfgAAAAAAHwAAAAAAHwAAAAACHwAAAAAAHwAAAAABHwAAAAACfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADfgAAAAAAHwAAAAADfgAAAAAAHwAAAAABHwAAAAACHwAAAAACfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAXQAAAAABTQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAABHwAAAAADHwAAAAABHwAAAAABHwAAAAACHwAAAAACHwAAAAABfgAAAAAAXQAAAAACTQAAAAABXQAAAAADXQAAAAAAHwAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADfgAAAAAA + tiles: XQAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAXQAAAAAAXQAAAAAAHwAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAXQAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAATwAAAAAAfgAAAAAAHwAAAAAAXQAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAXQAAAAAAHwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAAHwAAAAAAXQAAAAAAHwAAAAAAfgAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADfgAAAAAATwAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAHwAAAAAAfgAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAfgAAAAAAXQAAAAABTQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAKAAAAAAAfgAAAAAAXQAAAAACTQAAAAABXQAAAAADXQAAAAAAHwAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADfgAAAAAA version: 6 -2,-3: ind: -2,-3 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAXQAAAAADfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABZgAAAAADZgAAAAACZgAAAAABZgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAHwAAAAABZgAAAAADZgAAAAABZgAAAAAAZgAAAAABfgAAAAAAXQAAAAAAXQAAAAACXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAHwAAAAACZgAAAAADZgAAAAACZgAAAAACZgAAAAACZgAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAZgAAAAACZgAAAAABZgAAAAABZgAAAAABZgAAAAACZgAAAAABXQAAAAACXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAZgAAAAACZgAAAAACZgAAAAACZgAAAAABZgAAAAABfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAABHwAAAAACHwAAAAABfgAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABfgAAAAAAHwAAAAADHwAAAAAAHwAAAAABHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAADfgAAAAAAegAAAAADegAAAAABfgAAAAAAegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAABegAAAAAAfgAAAAAAegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAB + tiles: fgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAHwAAAAAAZgAAAAAAZgAAAAAAZgAAAAAAHwAAAAAAfQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAXQAAAAADfgAAAAAAHwAAAAAAHwAAAAAAZgAAAAAAHwAAAAAAHwAAAAAAfQAAAAAAHwAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAZgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAXQAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAHwAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAHwAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAHwAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAHwAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAHwAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAZAAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAADfgAAAAAAegAAAAADegAAAAABfgAAAAAAegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAABegAAAAAAfgAAAAAAegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAA version: 6 -2,-4: ind: -2,-4 - tiles: XQAAAAADXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAUQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAHwAAAAADXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAXQAAAAADXQAAAAACfgAAAAAAXQAAAAABXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAXQAAAAABXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAA + tiles: AAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAXQAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfQAAAAAAHwAAAAAAHwAAAAAAXQAAAAAAHwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAZgAAAAAAZgAAAAAAZgAAAAAAHwAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAZgAAAAAAZgAAAAAAZgAAAAAAHwAAAAAAfQAAAAAAHwAAAAAAXQAAAAAAXQAAAAAAXQAAAAAA version: 6 -1,-4: ind: -1,-4 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA + tiles: fQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA version: 6 0,-4: ind: 0,-4 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAHwAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAHwAAAAADfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADHwAAAAACfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAHwAAAAACfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADHwAAAAACfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACHwAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABHwAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAA version: 6 -2,-5: ind: -2,-5 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAA version: 6 -1,-5: ind: -1,-5 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -2,4: ind: -2,4 - tiles: fgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - version: 6 - -3,-5: - ind: -3,-5 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA + tiles: fQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 2,0: ind: 2,0 @@ -308,15 +305,15 @@ entities: version: 6 -5,2: ind: -5,2 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAA version: 6 -5,3: ind: -5,3 - tiles: AAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -6,2: ind: -6,2 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAALwAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAALwAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfgAAAAAA version: 6 -6,3: ind: -6,3 @@ -324,11 +321,11 @@ entities: version: 6 -4,-2: ind: -4,-2 - tiles: BwAAAAAHCwAAAAAACwAAAAAABwAAAAAHBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAABfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAABwAAAAAACwAAAAAACwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAABwAAAAAACwAAAAAACwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAABwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAABwAAAAAACwAAAAAACwAAAAAABwAAAAAACwAAAAAABwAAAAAABwAAAAAIfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAACwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAABHwAAAAADXQAAAAADfgAAAAAAHwAAAAADHwAAAAACHwAAAAABfgAAAAAATgAAAAADTgAAAAAATgAAAAABTgAAAAABTgAAAAABTgAAAAACTgAAAAABXQAAAAABHwAAAAADHwAAAAADXQAAAAACfgAAAAAAHwAAAAAAHwAAAAABHwAAAAAAHwAAAAAAHwAAAAABHwAAAAAAHwAAAAABHwAAAAABHwAAAAABHwAAAAADHwAAAAABHwAAAAACXQAAAAADXQAAAAABHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAADHwAAAAAAfgAAAAAATgAAAAAATgAAAAAATgAAAAACTgAAAAADTgAAAAAATgAAAAACTgAAAAADHwAAAAADHwAAAAACHwAAAAABHwAAAAADfgAAAAAAHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAA + tiles: BwAAAAAHCwAAAAAACwAAAAAABwAAAAAHBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAABfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAABwAAAAAACwAAAAAACwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAABwAAAAAACwAAAAAACwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAABwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAABwAAAAAACwAAAAAACwAAAAAABwAAAAAACwAAAAAABwAAAAAABwAAAAAIfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAACwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAABHwAAAAADXQAAAAADfgAAAAAAHwAAAAADHwAAAAACHwAAAAABfgAAAAAATgAAAAADTgAAAAAATgAAAAABTgAAAAABTgAAAAABTgAAAAACTgAAAAABXQAAAAABHwAAAAADHwAAAAADXQAAAAACfgAAAAAAHwAAAAAAHwAAAAABHwAAAAAAHwAAAAAAHwAAAAABHwAAAAAAHwAAAAABHwAAAAABHwAAAAABHwAAAAADHwAAAAABHwAAAAACXQAAAAADXQAAAAABHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAADHwAAAAAAfgAAAAAATgAAAAAATgAAAAAATgAAAAACTgAAAAADTgAAAAAATgAAAAACTgAAAAADHwAAAAADHwAAAAACHwAAAAABHwAAAAADfgAAAAAAHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAA version: 6 -5,-2: ind: -5,-2 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAABwAAAAACBwAAAAAABwAAAAAABwAAAAAABwAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAABwAAAAAKBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAABwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAABwAAAAACBwAAAAAABwAAAAAABwAAAAAABwAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAABwAAAAAKBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAABwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -5,-3: ind: -5,-3 @@ -340,15 +337,15 @@ entities: version: 6 -4,-4: ind: -4,-4 - tiles: bAAAAAAAbAAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAACHwAAAAAAHwAAAAACHwAAAAAAfgAAAAAABwAAAAAMBwAAAAAABwAAAAAABwAAAAAAAAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAHBwAAAAAABwAAAAAAJgAAAAAAJgAAAAAAJgAAAAABJgAAAAABJgAAAAADJgAAAAABJgAAAAABJgAAAAABIgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAEBwAAAAAAagAAAAADagAAAAACagAAAAAAagAAAAACagAAAAACagAAAAABagAAAAACZQAAAAABJwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAawAAAAAAJwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATAAAAAAATAAAAAABTAAAAAACTAAAAAABTAAAAAACTAAAAAAAfgAAAAAAawAAAAAAJwAAAAABfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAALgAAAAAAfgAAAAAATAAAAAACKgAAAAABTAAAAAACTAAAAAACTAAAAAAATAAAAAACfgAAAAAAawAAAAACJwAAAAADQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAALgAAAAAALgAAAAAAfgAAAAAATAAAAAADKgAAAAACTAAAAAADTAAAAAABTAAAAAAATAAAAAABfgAAAAAAawAAAAAAJwAAAAACfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAALgAAAAAAfgAAAAAAKgAAAAACKgAAAAACKgAAAAADKgAAAAABKgAAAAABKgAAAAABHwAAAAACawAAAAADJwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATAAAAAACTAAAAAABKgAAAAADTAAAAAAATAAAAAAATAAAAAABfgAAAAAAawAAAAAAJwAAAAACfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAALgAAAAAAfgAAAAAATAAAAAADTAAAAAAATAAAAAADTAAAAAAATAAAAAACTAAAAAADfgAAAAAAawAAAAAAJwAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAALgAAAAAALgAAAAAAfgAAAAAATAAAAAACTAAAAAABTAAAAAABTAAAAAAATAAAAAABTAAAAAADfgAAAAAAawAAAAAAJwAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAawAAAAAAJwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAagAAAAAAagAAAAABagAAAAAAagAAAAABagAAAAADagAAAAAAagAAAAABZQAAAAABJwAAAAABfgAAAAAAfgAAAAAAfgAAAAAACwAAAAAACwAAAAAACwAAAAAAfgAAAAAAJgAAAAABJgAAAAAAJgAAAAAAJgAAAAACJgAAAAABJgAAAAAAJgAAAAACJgAAAAACIgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAGCwAAAAAABwAAAAAAfgAAAAAA + tiles: egAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAfgAAAAAAegAAAAAAegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAHBwAAAAAABwAAAAAAJgAAAAAAJgAAAAAAJgAAAAABJgAAAAABJgAAAAADJgAAAAABJgAAAAABJgAAAAABIgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAABwAAAAAABwAAAAAEBwAAAAAAagAAAAADagAAAAACagAAAAAAagAAAAACagAAAAACagAAAAABagAAAAACZQAAAAABJwAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAawAAAAAAJwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATAAAAAAATAAAAAABTAAAAAACTAAAAAABTAAAAAACTAAAAAAAfgAAAAAAawAAAAAAJwAAAAABfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAALgAAAAAAfgAAAAAATAAAAAACKgAAAAABTAAAAAACTAAAAAACTAAAAAAATAAAAAACfgAAAAAAawAAAAACJwAAAAADQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAALgAAAAAALgAAAAAAfgAAAAAATAAAAAADKgAAAAACTAAAAAADTAAAAAABTAAAAAAATAAAAAABfgAAAAAAawAAAAAAJwAAAAACfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAALgAAAAAAfgAAAAAAKgAAAAACKgAAAAACKgAAAAADKgAAAAABKgAAAAABKgAAAAABHwAAAAACawAAAAADJwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATAAAAAACTAAAAAABKgAAAAADTAAAAAAATAAAAAAATAAAAAABfgAAAAAAawAAAAAAJwAAAAACfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAALgAAAAAAfgAAAAAATAAAAAADTAAAAAAATAAAAAADTAAAAAAATAAAAAACTAAAAAADfgAAAAAAawAAAAAAJwAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAALgAAAAAALgAAAAAAfgAAAAAATAAAAAACTAAAAAABTAAAAAABTAAAAAAATAAAAAABTAAAAAADfgAAAAAAawAAAAAAJwAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAawAAAAAAJwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAagAAAAAAagAAAAABagAAAAAAagAAAAABagAAAAADagAAAAAAagAAAAABZQAAAAABJwAAAAABfgAAAAAAfgAAAAAAfgAAAAAACwAAAAAACwAAAAAACwAAAAAAfgAAAAAAJgAAAAABJgAAAAAAJgAAAAAAJgAAAAACJgAAAAABJgAAAAAAJgAAAAACJgAAAAACIgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAGCwAAAAAABwAAAAAAfgAAAAAA version: 6 -3,-3: ind: -3,-3 - tiles: fQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAADfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAHwAAAAABHwAAAAAAHwAAAAABfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAHwAAAAAAHwAAAAADHwAAAAACfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAHwAAAAACHwAAAAAAHwAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAHwAAAAAAHwAAAAADHwAAAAAD + tiles: fQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAADfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAHwAAAAABHwAAAAAAHwAAAAABfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAHwAAAAAAHwAAAAADHwAAAAACfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAHwAAAAACHwAAAAAAHwAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAHwAAAAAAHwAAAAADHwAAAAAD version: 6 -5,-4: ind: -5,-4 - tiles: fgAAAAAAHwAAAAADHwAAAAABHwAAAAAAHwAAAAABHwAAAAADHwAAAAABHwAAAAAAHwAAAAABfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAACHwAAAAACHwAAAAABHwAAAAADHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAADHwAAAAAAHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAAAHwAAAAACHwAAAAACHwAAAAADHwAAAAADHwAAAAAAHwAAAAACHwAAAAACHwAAAAAAfgAAAAAAIgAAAAADJgAAAAACJgAAAAABJgAAAAABJgAAAAAAHwAAAAABfgAAAAAAHwAAAAACHwAAAAAAHwAAAAADHwAAAAABHwAAAAACHwAAAAABfgAAAAAAHwAAAAADfgAAAAAAJwAAAAADZQAAAAABagAAAAAAagAAAAADagAAAAACHwAAAAACfgAAAAAAHwAAAAADHwAAAAABHwAAAAADHwAAAAAAHwAAAAABHwAAAAABfgAAAAAAHwAAAAACHwAAAAACJwAAAAACawAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJwAAAAACawAAAAABfgAAAAAATAAAAAACTAAAAAACPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfgAAAAAAegAAAAABegAAAAAAegAAAAADegAAAAADfgAAAAAAJwAAAAADawAAAAACfgAAAAAATAAAAAACTAAAAAAAPgAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAAAfgAAAAAAegAAAAABegAAAAADegAAAAAAegAAAAADfgAAAAAAJwAAAAAAawAAAAAAfgAAAAAATAAAAAABTAAAAAACfgAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAADHwAAAAAAegAAAAADegAAAAADegAAAAAAegAAAAADHwAAAAABJwAAAAAAawAAAAADHwAAAAACKgAAAAAAKgAAAAAAPAAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAACfgAAAAAAegAAAAADegAAAAACegAAAAAAegAAAAADfgAAAAAAJwAAAAACawAAAAAAfgAAAAAATAAAAAADTAAAAAACPAAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAABfgAAAAAAegAAAAABegAAAAACegAAAAAAegAAAAACfgAAAAAAJwAAAAABawAAAAACfgAAAAAATAAAAAABTAAAAAABPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAegAAAAADegAAAAAAegAAAAACegAAAAABfgAAAAAAJwAAAAABawAAAAAAfgAAAAAATAAAAAAATAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJwAAAAABawAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAABwAAAAAABwAAAAAKBwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAJwAAAAACZQAAAAAAagAAAAABagAAAAABagAAAAAAHwAAAAABHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAIgAAAAACJgAAAAABJgAAAAADJgAAAAADJgAAAAAC + tiles: fgAAAAAAHwAAAAADHwAAAAABHwAAAAAAHwAAAAABHwAAAAADHwAAAAABHwAAAAAAHwAAAAABfgAAAAAAegAAAAAAegAAAAAAfgAAAAAAegAAAAAAegAAAAAAegAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAACHwAAAAACHwAAAAABHwAAAAADHwAAAAADHwAAAAAAfgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAADHwAAAAAAHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAACHwAAAAACHwAAAAADHwAAAAADHwAAAAAAHwAAAAACHwAAAAACJwAAAAAAJwAAAAAAIgAAAAADJgAAAAACJgAAAAABJgAAAAABJgAAAAAAHwAAAAABfgAAAAAAHwAAAAACHwAAAAAAHwAAAAADHwAAAAABHwAAAAACHwAAAAABHwAAAAAAJwAAAAAAJwAAAAAAJwAAAAADZQAAAAABagAAAAAAagAAAAADagAAAAACHwAAAAACfgAAAAAAHwAAAAADHwAAAAABHwAAAAADHwAAAAAAHwAAAAABHwAAAAABfgAAAAAAJwAAAAAAJwAAAAAAJwAAAAACawAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJwAAAAACawAAAAABfgAAAAAATAAAAAACTAAAAAACPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfgAAAAAAegAAAAABegAAAAAAegAAAAADegAAAAADfgAAAAAAJwAAAAADawAAAAACfgAAAAAATAAAAAACTAAAAAAAPgAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAAAfgAAAAAAegAAAAABegAAAAADegAAAAAAegAAAAADfgAAAAAAJwAAAAAAawAAAAAAfgAAAAAATAAAAAABTAAAAAACfgAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAADHwAAAAAAegAAAAADegAAAAADegAAAAAAegAAAAADHwAAAAABJwAAAAAAawAAAAADHwAAAAACKgAAAAAAKgAAAAAAPAAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAACfgAAAAAAegAAAAADegAAAAACegAAAAAAegAAAAADfgAAAAAAJwAAAAACawAAAAAAfgAAAAAATAAAAAADTAAAAAACPAAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAABfgAAAAAAegAAAAABegAAAAACegAAAAAAegAAAAACfgAAAAAAJwAAAAABawAAAAACfgAAAAAATAAAAAABTAAAAAABPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAegAAAAADegAAAAAAegAAAAACegAAAAABfgAAAAAAJwAAAAABawAAAAAAfgAAAAAATAAAAAAATAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJwAAAAABawAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAABwAAAAAABwAAAAAKBwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAJwAAAAACZQAAAAAAagAAAAABagAAAAABagAAAAAAHwAAAAABHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAIgAAAAACJgAAAAABJgAAAAADJgAAAAADJgAAAAAC version: 6 -6,-4: ind: -6,-4 @@ -360,11 +357,11 @@ entities: version: 6 -5,-5: ind: -5,-5 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAMBwAAAAALBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAFfgAAAAAAHwAAAAACHwAAAAABHwAAAAABHwAAAAABHwAAAAABHwAAAAADfgAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAADHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAMBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAFfgAAAAAAHwAAAAACHwAAAAABHwAAAAABHwAAAAABHwAAAAABHwAAAAADfgAAAAAABwAAAAAABwAAAAAAfgAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAADHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAAAegAAAAAA version: 6 -4,-5: ind: -4,-5 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAADBwAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAACHwAAAAABHwAAAAABHwAAAAABHwAAAAADfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAADHwAAAAABHwAAAAACHwAAAAACHwAAAAACfgAAAAAABwAAAAAABwAAAAAFBwAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAABHwAAAAABHwAAAAACHwAAAAADHwAAAAACfgAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAACHwAAAAACHwAAAAABHwAAAAACHwAAAAADfgAAAAAABwAAAAAJBwAAAAAABwAAAAAABwAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAADBwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAAAegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAABwAAAAAABwAAAAAAAAAAAAAA version: 6 -6,-5: ind: -6,-5 @@ -372,7 +369,7 @@ entities: version: 6 -3,-4: ind: -3,-4 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAEQAAAAAAHwAAAAABEQAAAAAAEQAAAAAAHwAAAAAAEQAAAAAAHwAAAAADfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAEQAAAAAAHwAAAAAAEQAAAAAAEQAAAAAAHwAAAAACEQAAAAAAHwAAAAAAEQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAABEQAAAAAAHwAAAAADHwAAAAABHwAAAAAAHwAAAAACEQAAAAAAHwAAAAABfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAACEQAAAAAAEQAAAAAAHwAAAAADHwAAAAAAHwAAAAABHwAAAAACHwAAAAACfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAACEQAAAAAAHwAAAAAAHwAAAAACHwAAAAAAHwAAAAACEQAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAADEQAAAAAAHwAAAAABEQAAAAAAEQAAAAAAHwAAAAAAEQAAAAAAHwAAAAADEQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAEQAAAAAAHwAAAAADEQAAAAAAEQAAAAAAHwAAAAABEQAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAA version: 6 0,4: ind: 0,4 @@ -452,51 +449,44 @@ entities: color: '#FFFFFFFF' id: Arrows decals: - 657: -8,-44 - 1390: 23,23 - 1391: 21,23 - 2506: -35,40 - 2507: -37,40 + 1258: 23,23 + 1259: 21,23 + 2210: -35,40 + 2211: -37,40 - node: angle: -1.5707963267948966 rad color: '#FFFFFFFF' id: Arrows decals: - 2208: 5,-30 - 2737: -3,-55 - 2771: 20,-24 - 2772: 20,-26 - 2773: 20,-28 - 2774: 20,-30 - 2775: 20,-32 - 2776: 20,-34 - 2777: 20,-36 + 2065: 5,-30 + 2370: 20,-24 + 2371: 20,-26 + 2372: 20,-28 + 2373: 20,-30 + 2374: 20,-32 + 2375: 20,-34 + 2376: 20,-36 - node: color: '#FFFFFFFF' id: Arrows decals: - 1388: 23,25 - 1389: 21,25 - 1873: 31,21 - 3064: -31,-10 + 1256: 23,25 + 1257: 21,25 + 1730: 31,21 + 2648: -31,-10 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' id: Arrows decals: - 1236: 33,-3 - 2764: 21,-35 - 2765: 21,-33 - 2766: 21,-31 - 2767: 21,-29 - 2768: 21,-27 - 2769: 21,-25 - 2770: 21,-23 - - node: - color: '#FFFFFFFF' - id: ArrowsGreyscale - decals: - 2789: -19,-67 + 1136: 33,-3 + 2363: 21,-35 + 2364: 21,-33 + 2365: 21,-31 + 2366: 21,-29 + 2367: 21,-27 + 2368: 21,-25 + 2369: 21,-23 - node: color: '#FFFFFFFF' id: Bot @@ -520,1187 +510,1035 @@ entities: 482: -8,-9 552: -12,-1 587: 6,-1 - 658: -11,-44 - 659: -12,-44 - 660: -13,-44 - 661: -14,-44 - 740: 19,0 - 751: 12,14 - 807: -30,37 - 1031: 5,43 - 1032: 3,41 - 1033: 7,41 - 1141: -41,59 - 1143: 14,-2 - 1144: 15,-2 - 1192: 23,-6 - 1193: 23,-5 - 1194: 23,-4 - 1195: 25,-6 - 1196: 25,-5 - 1197: 25,-4 - 1198: 27,-6 - 1199: 27,-5 - 1200: 27,-4 - 1201: 29,-6 - 1202: 29,-5 - 1203: 29,-4 - 1241: 21,-20 - 1242: 18,-20 - 1243: 18,-18 - 1244: 18,-17 - 1245: 19,-17 - 1246: 19,-18 - 1247: 20,-18 - 1248: 20,-17 - 1249: 20,-15 - 1250: 20,-14 - 1251: 21,-14 - 1252: 21,-15 - 1253: 22,-15 - 1254: 22,-14 - 1303: 36,7 - 1304: 35,7 - 1311: 22,20 - 1312: 22,21 - 1313: 23,21 - 1314: 23,20 - 1319: 27,9 - 1320: 27,10 - 1420: 12,12 - 1421: 20,23 - 1588: -1,29 - 1789: 5,-26 - 1790: 5,-25 - 1791: 7,-30 - 1864: 33,17 - 1865: 32,17 - 1866: 31,17 - 2185: -40,54 - 2237: 3,-41 - 2241: -4,-38 - 2242: -2,-38 - 2258: -22,-45 - 2297: -26,-47 - 2298: -26,-48 - 2400: 1,-7 - 2401: -1,-7 - 2521: -13,38 - 2522: -12,31 - 2533: 12,-30 - 2534: 12,-29 - 2535: 12,-28 - 2536: 11,-23 - 2537: 10,-23 - 2547: 32,21 - 2548: 32,22 - 2549: 32,23 - 2565: 41,12 - 2566: 41,13 - 2567: 41,14 - 2629: 32,39 - 2630: 24,33 - 2761: -15,-49 - 2762: -15,-48 - 2763: -15,-47 - 2790: 15,-22 - 2802: 7,35 - 2835: -4,-29 - 2836: -33,10 - 2837: -26,13 - 2838: -14,5 - 2839: 6,6 - 2840: -6,-9 - 2861: -43,19 - 2862: -41,19 - 3063: -33,-12 - 3082: -28,-14 - 3083: -23,-15 - 3084: -19,-23 - 3157: -20,-5 - - node: - angle: 3.141592653589793 rad - color: '#FFFFFFFF' - id: Bot - decals: - 634: 14,-19 - - node: - color: '#52B4E996' - id: BotGreyscale - decals: - 2733: -4,-52 - 2734: -5,-52 - - node: - color: '#DE3A3A96' - id: BotGreyscale - decals: - 2735: -11,-52 - 2736: -12,-52 + 680: 19,0 + 742: -30,37 + 951: 5,43 + 952: 3,41 + 953: 7,41 + 1041: -41,59 + 1043: 14,-2 + 1044: 15,-2 + 1092: 23,-6 + 1093: 23,-5 + 1094: 23,-4 + 1095: 25,-6 + 1096: 25,-5 + 1097: 25,-4 + 1098: 27,-6 + 1099: 27,-5 + 1100: 27,-4 + 1101: 29,-6 + 1102: 29,-5 + 1103: 29,-4 + 1141: 21,-20 + 1142: 18,-20 + 1143: 18,-18 + 1144: 18,-17 + 1145: 19,-17 + 1146: 19,-18 + 1147: 20,-18 + 1148: 20,-17 + 1149: 20,-15 + 1150: 20,-14 + 1151: 21,-14 + 1152: 21,-15 + 1153: 22,-15 + 1154: 22,-14 + 1203: 36,7 + 1204: 35,7 + 1211: 22,20 + 1212: 22,21 + 1213: 23,21 + 1214: 23,20 + 1219: 27,9 + 1220: 27,10 + 1278: 20,23 + 1445: -1,29 + 1646: 5,-26 + 1647: 5,-25 + 1648: 7,-30 + 1721: 33,17 + 1722: 32,17 + 1723: 31,17 + 2042: -40,54 + 2104: 1,-7 + 2105: -1,-7 + 2225: -13,38 + 2226: -12,31 + 2236: 12,-30 + 2237: 12,-29 + 2238: 12,-28 + 2239: 11,-23 + 2240: 10,-23 + 2246: 32,21 + 2247: 32,22 + 2248: 32,23 + 2261: 41,12 + 2262: 41,13 + 2263: 41,14 + 2325: 32,39 + 2326: 24,33 + 2380: 15,-22 + 2392: 7,35 + 2425: -4,-29 + 2426: -33,10 + 2427: -26,13 + 2428: -14,5 + 2429: 6,6 + 2430: -6,-9 + 2445: -43,19 + 2446: -41,19 + 2647: -33,-12 + 2666: -28,-14 + 2667: -23,-15 + 2668: -19,-23 + 2741: -20,-5 + 2840: 18,16 + 2841: 20,16 + 2853: 12,14 + 2856: 14,-18 + 2898: -6,-48 + 2899: -6,-49 + 2900: -6,-50 + 2901: -6,-51 + 2915: -2,-44 + 2916: -3,-44 + 2917: -1,-44 + 2918: 1,-44 + 2919: 2,-44 + 2920: 3,-44 + 2921: 4,-44 - node: color: '#FFFFFFFF' id: BotGreyscale decals: - 2429: -22,-1 - 2785: -18,-69 - 2786: -18,-68 - 2787: -18,-67 + 2133: -22,-1 - node: color: '#FFFFFFFF' id: BotLeft decals: - 2183: -39,56 - 2184: -41,56 - 2238: 2,-38 - 2239: 0,-38 - 2259: -26,-45 - 2260: -26,-44 - 2261: -26,-43 - 2447: -57,-22 - 2503: -42,42 - 2504: -46,42 - 2505: -49,42 - 2550: 33,20 - 2551: 33,19 - 2568: 40,14 - 2758: -15,-52 - 2759: -15,-51 - 2760: -15,-50 - 2863: -44,19 - 2864: -42,19 - 2865: -40,19 + 2040: -39,56 + 2041: -41,56 + 2151: -57,-22 + 2207: -42,42 + 2208: -46,42 + 2209: -49,42 + 2249: 33,20 + 2250: 33,19 + 2264: 40,14 + 2447: -44,19 + 2448: -42,19 + 2449: -40,19 - node: color: '#FFFFFFFF' id: BotRight decals: - 2240: 3,-40 - 2262: -23,-40 - 2263: -22,-40 - 2500: -45,51 - 2501: -45,52 - 2502: -45,53 + 2204: -45,51 + 2205: -45,52 + 2206: -45,53 - node: color: '#FFFFFFFF' id: BotRightGreyscale decals: - 2729: -24,-5 - 2788: -19,-68 + 2357: -24,-5 - node: color: '#FFFFFFFF' id: Box decals: - 2289: -12,-38 - 2290: -14,-38 - 2569: 39,9 - 2842: -5,-50 - 2843: -12,-56 - 2844: -10,-56 - 2845: -6,-56 - 2846: -4,-56 - - node: - color: '#FFFFFFFF' - id: BoxGreyscale - decals: - 2782: -19,-70 - 2783: -18,-70 - 2784: -17,-70 + 2265: 39,9 + 2896: -14,-38 + 2897: -12,-38 - node: color: '#FFFFFFFF' id: BrickTileDarkBox decals: - 1845: -6,40 - 1846: -14,40 - 2113: -46,-13 - 2114: -46,-15 - 2115: -46,-17 - 2116: -46,-19 - 2117: -46,-21 + 1702: -6,40 + 1703: -14,40 + 1970: -46,-13 + 1971: -46,-15 + 1972: -46,-17 + 1973: -46,-19 + 1974: -46,-21 - node: color: '#FFFFFFFF' id: BrickTileDarkCornerNe decals: - 1530: -7,36 - 1697: -57,-50 - 1807: -50,24 + 1387: -7,36 + 1554: -57,-50 + 1664: -50,24 - node: color: '#FFFFFFFF' id: BrickTileDarkCornerNw decals: - 1529: -13,36 - 1714: -68,-50 + 1386: -13,36 + 1571: -68,-50 - node: color: '#FFFFFFFF' id: BrickTileDarkCornerSe decals: - 1525: -7,32 - 1705: -57,-60 - 1822: -50,12 + 1382: -7,32 + 1562: -57,-60 + 1679: -50,12 - node: color: '#FFFFFFFF' id: BrickTileDarkCornerSw decals: - 1524: -13,32 - 1715: -68,-60 + 1381: -13,32 + 1572: -68,-60 - node: color: '#FFFFFFFF' id: BrickTileDarkInnerNe decals: - 1620: -12,40 - 1731: -66,-50 + 1477: -12,40 + 1588: -66,-50 - node: color: '#FFFFFFFF' id: BrickTileDarkInnerNw decals: - 1622: -8,40 - 1729: -64,-50 - 1730: -59,-50 + 1479: -8,40 + 1586: -64,-50 + 1587: -59,-50 - node: color: '#FFFFFFFF' id: BrickTileDarkInnerSe decals: - 1619: -12,42 - 1706: -57,-59 + 1476: -12,42 + 1563: -57,-59 - node: color: '#FFFFFFFF' id: BrickTileDarkInnerSw decals: - 1621: -8,42 - 1699: -59,-60 + 1478: -8,42 + 1556: -59,-60 - node: color: '#FFFFFFFF' id: BrickTileDarkLineE decals: - 1443: -17,37 - 1526: -7,33 - 1527: -7,34 - 1528: -7,35 - 1618: -12,41 - 1648: -17,39 - 1649: -17,40 - 1707: -57,-58 - 1799: -50,16 - 1800: -50,17 - 1801: -50,18 - 1802: -50,19 - 1803: -50,20 - 1804: -50,21 - 1805: -50,22 - 1806: -50,23 + 1300: -17,37 + 1383: -7,33 + 1384: -7,34 + 1385: -7,35 + 1475: -12,41 + 1505: -17,39 + 1506: -17,40 + 1564: -57,-58 + 1656: -50,16 + 1657: -50,17 + 1658: -50,18 + 1659: -50,19 + 1660: -50,20 + 1661: -50,21 + 1662: -50,22 + 1663: -50,23 - node: color: '#FFFFFFFF' id: BrickTileDarkLineN decals: - 1531: -8,36 - 1532: -9,36 - 1533: -10,36 - 1534: -11,36 - 1535: -12,36 - 1614: -9,40 - 1615: -10,40 - 1616: -11,40 - 1725: -60,-50 - 1726: -61,-50 - 1727: -65,-50 - 1728: -62,-50 - 1808: -52,24 - 1809: -51,24 - 1810: -53,24 - 1811: -54,24 - 1812: -55,24 - 1813: -57,24 - 1814: -56,24 - 1815: -58,24 + 1388: -8,36 + 1389: -9,36 + 1390: -10,36 + 1391: -11,36 + 1392: -12,36 + 1471: -9,40 + 1472: -10,40 + 1473: -11,40 + 1582: -60,-50 + 1583: -61,-50 + 1584: -65,-50 + 1585: -62,-50 + 1665: -52,24 + 1666: -51,24 + 1667: -53,24 + 1668: -54,24 + 1669: -55,24 + 1670: -57,24 + 1671: -56,24 + 1672: -58,24 - node: color: '#FFFFFFFF' id: BrickTileDarkLineS decals: - 1466: -23,38 - 1513: -7,32 - 1514: -8,32 - 1515: -9,32 - 1516: -10,32 - 1517: -11,32 - 1518: -12,32 - 1519: -13,32 - 1611: -10,42 - 1612: -9,42 - 1613: -11,42 - 1698: -60,-60 - 1700: -64,-60 - 1701: -66,-60 - 1816: -58,12 - 1817: -57,12 - 1818: -56,12 - 1819: -55,12 - 1820: -54,12 - 1821: -51,12 + 1323: -23,38 + 1370: -7,32 + 1371: -8,32 + 1372: -9,32 + 1373: -10,32 + 1374: -11,32 + 1375: -12,32 + 1376: -13,32 + 1468: -10,42 + 1469: -9,42 + 1470: -11,42 + 1555: -60,-60 + 1557: -64,-60 + 1558: -66,-60 + 1673: -58,12 + 1674: -57,12 + 1675: -56,12 + 1676: -55,12 + 1677: -54,12 + 1678: -51,12 - node: color: '#FFFFFFFF' id: BrickTileDarkLineW decals: - 1520: -13,32 - 1521: -13,33 - 1522: -13,34 - 1523: -13,35 - 1617: -8,41 + 1377: -13,32 + 1378: -13,33 + 1379: -13,34 + 1380: -13,35 + 1474: -8,41 - node: color: '#9FED5896' id: BrickTileSteelBox decals: - 2397: 2,-9 - 2398: 2,-10 - 2399: 2,-11 + 2101: 2,-9 + 2102: 2,-10 + 2103: 2,-11 - node: color: '#9FED5896' id: BrickTileSteelCornerNe decals: - 2388: 1,-7 - 2452: -31,10 - 2463: -31,13 + 2092: 1,-7 + 2156: -31,10 + 2167: -31,13 - node: color: '#D381C996' id: BrickTileSteelCornerNe decals: - 2555: 33,9 + 2251: 33,9 - node: color: '#FFFFFFFF' id: BrickTileSteelCornerNe decals: - 2449: -62,-24 - 2643: -25,11 + 2153: -62,-24 - node: color: '#9FED5896' id: BrickTileSteelCornerNw decals: - 2389: -1,-7 - 2453: -33,10 - 2464: -33,13 + 2093: -1,-7 + 2157: -33,10 + 2168: -33,13 - node: color: '#D381C996' id: BrickTileSteelCornerNw decals: - 2556: 31,9 + 2252: 31,9 - node: color: '#FFFFFFFF' id: BrickTileSteelCornerNw decals: - 2450: -63,-24 - 2642: -27,11 + 2154: -63,-24 - node: color: '#9FED5896' id: BrickTileSteelCornerSe decals: - 2455: -31,6 - 2466: -31,12 + 2159: -31,6 + 2170: -31,12 - node: color: '#D381C996' id: BrickTileSteelCornerSe decals: - 2558: 33,7 + 2254: 33,7 - node: color: '#FFFFFFFF' id: BrickTileSteelCornerSe decals: - 2451: -62,-25 - 2644: -25,7 + 2155: -62,-25 - node: color: '#9FED5896' id: BrickTileSteelCornerSw decals: - 2392: -1,-10 - 2454: -33,6 - 2465: -33,12 + 2096: -1,-10 + 2158: -33,6 + 2169: -33,12 - node: color: '#D381C996' id: BrickTileSteelCornerSw decals: - 2557: 31,7 + 2253: 31,7 - node: color: '#FFFFFFFF' id: BrickTileSteelCornerSw decals: - 2448: -63,-25 - 2641: -27,7 + 2152: -63,-25 - node: color: '#9FED5896' id: BrickTileSteelEndS decals: - 2396: 1,-12 + 2100: 1,-12 - node: color: '#FFFFFFFF' id: BrickTileSteelInnerNe decals: - 1723: -69,-52 - 1724: -69,-58 + 1580: -69,-52 + 1581: -69,-58 - node: color: '#FFFFFFFF' id: BrickTileSteelInnerNw decals: - 1704: -61,-61 - 1711: -56,-56 + 1561: -61,-61 + 1568: -56,-56 - node: color: '#FFFFFFFF' id: BrickTileSteelInnerSe decals: - 1716: -68,-60 - 1721: -69,-53 - 1722: -69,-51 + 1573: -68,-60 + 1578: -69,-53 + 1579: -69,-51 - node: color: '#9FED5896' id: BrickTileSteelInnerSw decals: - 2394: 1,-10 + 2098: 1,-10 - node: color: '#FFFFFFFF' id: BrickTileSteelInnerSw decals: - 1712: -56,-55 - 1713: -56,-52 + 1569: -56,-55 + 1570: -56,-52 - node: color: '#9FED5896' id: BrickTileSteelLineE decals: - 2384: 1,-11 - 2385: 1,-10 - 2386: 1,-9 - 2387: 1,-8 - 2457: -31,7 - 2458: -31,8 - 2459: -31,9 + 2088: 1,-11 + 2089: 1,-10 + 2090: 1,-9 + 2091: 1,-8 + 2161: -31,7 + 2162: -31,8 + 2163: -31,9 - node: color: '#FFFFFFFF' id: BrickTileSteelLineE decals: - 1717: -69,-57 - 1718: -69,-56 - 1720: -69,-54 - 2649: -25,8 - 2650: -25,9 - 2651: -25,10 + 1574: -69,-57 + 1575: -69,-56 + 1577: -69,-54 - node: color: '#334E6DC8' id: BrickTileSteelLineN decals: - 1444: -18,37 - 1445: -19,37 - 1446: -20,37 - 1447: -21,37 - 1448: -22,37 - 1449: -24,37 - 1450: -25,37 - 1451: -26,37 - 1452: -28,37 + 1301: -18,37 + 1302: -19,37 + 1303: -20,37 + 1304: -21,37 + 1305: -22,37 + 1306: -24,37 + 1307: -25,37 + 1308: -26,37 + 1309: -28,37 - node: color: '#9FED5896' id: BrickTileSteelLineN decals: - 2467: -32,13 + 2171: -32,13 - node: color: '#FFFFFFFF' id: BrickTileSteelLineN decals: - 1668: 26,32 - 1703: -62,-61 - 2652: -26,11 + 1525: 26,32 + 1560: -62,-61 - node: color: '#9FED5896' id: BrickTileSteelLineS decals: - 2393: 0,-10 - 2456: -32,6 + 2097: 0,-10 + 2160: -32,6 - node: color: '#FFFFFFFF' id: BrickTileSteelLineS decals: - 1666: -27,24 - 1747: 8,-18 - 2648: -26,7 + 1523: -27,24 + 1604: 8,-18 - node: color: '#9FED5896' id: BrickTileSteelLineW decals: - 2390: -1,-8 - 2391: -1,-9 - 2395: 1,-11 - 2460: -33,9 + 2094: -1,-8 + 2095: -1,-9 + 2099: 1,-11 + 2164: -33,9 - node: color: '#D381C996' id: BrickTileSteelLineW decals: - 2559: 31,8 + 2255: 31,8 - node: color: '#FFFFFFFF' id: BrickTileSteelLineW decals: - 1667: 25,26 - 1710: -56,-53 - 2645: -27,8 - 2646: -27,9 - 2647: -27,10 + 1524: 25,26 + 1567: -56,-53 - node: color: '#334E6DC8' id: BrickTileWhiteCornerNe decals: - 2631: -19,40 + 2327: -19,40 - node: color: '#52B4E996' id: BrickTileWhiteCornerNe decals: - 2952: -21,-15 - 2962: -13,-15 - 3018: -13,-19 - 3046: -29,-16 - 3091: -12,-9 + 2536: -21,-15 + 2546: -13,-15 + 2602: -13,-19 + 2630: -29,-16 + 2675: -12,-9 - node: color: '#DE3A3A96' id: BrickTileWhiteCornerNe decals: - 2191: -2,-33 + 2048: -2,-33 - node: color: '#EFB34196' id: BrickTileWhiteCornerNe decals: - 2247: -22,-41 - 2268: -16,-39 - 2300: -6,-28 - 2849: -40,19 + 2433: -40,19 + 2977: -25,-45 + 2978: -26,-43 + 2979: -20,-45 + 2987: -14,-46 + 2989: -20,-49 + 2996: -21,-57 + 3021: -1,-42 - node: color: '#FFFFFFFF' id: BrickTileWhiteCornerNe decals: - 2951: -21,-15 - 2997: -13,-19 + 2535: -21,-15 + 2581: -13,-19 - node: color: '#334E6DC8' id: BrickTileWhiteCornerNw decals: - 2632: -21,40 + 2328: -21,40 - node: color: '#52B4E996' id: BrickTileWhiteCornerNw decals: - 2953: -23,-15 - 2961: -15,-15 - 3019: -19,-19 - 3047: -31,-16 - 3090: -16,-9 + 2537: -23,-15 + 2545: -15,-15 + 2603: -19,-19 + 2631: -31,-16 + 2674: -16,-9 - node: color: '#DE3A3A96' id: BrickTileWhiteCornerNw decals: - 2192: -4,-33 + 2049: -4,-33 - node: color: '#EFB34196' id: BrickTileWhiteCornerNw decals: - 2246: -25,-41 - 2267: -20,-39 - 2301: -14,-28 - 2523: 5,-24 - 2528: 9,-23 - 2853: -44,19 + 2227: 5,-24 + 2232: 9,-23 + 2437: -44,19 + 2976: -23,-45 + 2985: -16,-45 + 2986: -11,-46 + 2991: -16,-49 + 2999: -15,-57 + 3010: -10,-42 + 3019: 3,-40 + 3020: 1,-42 - node: color: '#FFFFFFFF' id: BrickTileWhiteCornerNw decals: - 2950: -23,-15 - 2990: -19,-19 + 2534: -23,-15 + 2574: -19,-19 - node: color: '#52B4E996' id: BrickTileWhiteCornerSe decals: - 2949: -21,-24 - 2964: -13,-17 - 3016: -13,-23 - 3055: -29,-24 - 3093: -12,-13 + 2533: -21,-24 + 2548: -13,-17 + 2600: -13,-23 + 2639: -29,-24 + 2677: -12,-13 - node: color: '#DE3A3A96' id: BrickTileWhiteCornerSe decals: - 2193: -2,-36 + 2050: -2,-36 - node: color: '#EFB34196' id: BrickTileWhiteCornerSe decals: - 1785: 7,-30 - 2231: 3,-45 - 2249: -22,-45 - 2269: -16,-45 - 2303: -6,-32 - 2856: -40,17 + 1642: 7,-30 + 2440: -40,17 + 2974: -26,-41 + 2990: -20,-47 + 2992: -19,-51 + 2998: -21,-55 + 3013: -9,-39 + 3014: -5,-39 + 3015: -4,-38 + 3017: 0,-38 - node: color: '#FFFFFFFF' id: BrickTileWhiteCornerSe decals: - 2946: -21,-24 - 2996: -13,-23 + 2530: -21,-24 + 2580: -13,-23 - node: color: '#52B4E996' id: BrickTileWhiteCornerSw decals: - 2476: -37,0 - 2948: -23,-24 - 2965: -15,-17 - 3017: -19,-23 - 3054: -31,-24 - 3092: -16,-13 + 2180: -37,0 + 2532: -23,-24 + 2549: -15,-17 + 2601: -19,-23 + 2638: -31,-24 + 2676: -16,-13 - node: color: '#DE3A3A96' id: BrickTileWhiteCornerSw decals: - 2194: -4,-36 + 2051: -4,-36 - node: color: '#EFB34196' id: BrickTileWhiteCornerSw decals: - 1784: 5,-30 - 2232: 0,-45 - 2248: -25,-45 - 2272: -20,-45 - 2302: -14,-32 - 2854: -44,17 + 1641: 5,-30 + 2438: -44,17 + 2988: -16,-47 + 2993: -17,-51 + 2997: -15,-55 + 3011: -11,-39 + 3012: -7,-39 + 3016: -2,-38 + 3018: 3,-38 - node: color: '#FFFFFFFF' id: BrickTileWhiteCornerSw decals: - 2947: -23,-24 - 2991: -19,-23 + 2531: -23,-24 + 2575: -19,-23 + - node: + color: '#EFB34196' + id: BrickTileWhiteEndS + decals: + 2984: -20,-40 - node: color: '#334E6DC8' id: BrickTileWhiteInnerNe decals: - 1608: -3,32 - 1632: -12,40 + 1465: -3,32 + 1489: -12,40 - node: color: '#52B4E996' id: BrickTileWhiteInnerNe decals: - 2939: -21,-21 + 2523: -21,-21 - node: color: '#D381C996' id: BrickTileWhiteInnerNe decals: - 2663: 12,20 + 2347: 12,20 - node: color: '#EFB34196' id: BrickTileWhiteInnerNe decals: - 2379: -11,-42 + 2980: -26,-45 - node: color: '#FFFFFFFF' id: BrickTileWhiteInnerNe decals: - 2911: -21,-21 + 2495: -21,-21 - node: color: '#334E6DC8' id: BrickTileWhiteInnerNw decals: - 1606: -3,32 - 1634: -8,40 + 1463: -3,32 + 1491: -8,40 - node: color: '#52B4E996' id: BrickTileWhiteInnerNw decals: - 2940: -19,-21 + 2524: -19,-21 - node: color: '#79150096' id: BrickTileWhiteInnerNw decals: - 2411: 7,-9 + 2115: 7,-9 - node: color: '#D381C996' id: BrickTileWhiteInnerNw decals: - 2662: 14,20 + 2346: 14,20 - node: color: '#EFB34196' id: BrickTileWhiteInnerNw decals: - 2378: -5,-42 - 2527: 9,-24 + 2231: 9,-24 + 3033: 3,-42 - node: color: '#FFFFFFFF' id: BrickTileWhiteInnerNw decals: - 2912: -19,-21 + 2496: -19,-21 - node: color: '#334E6DC8' id: BrickTileWhiteInnerSe decals: - 1609: -3,32 - 1633: -12,42 + 1466: -3,32 + 1490: -12,42 - node: color: '#52B4E996' id: BrickTileWhiteInnerSe decals: - 2937: -21,-21 + 2521: -21,-21 - node: color: '#D381C996' id: BrickTileWhiteInnerSe decals: - 2661: 12,23 + 2345: 12,23 - node: color: '#EFB34196' id: BrickTileWhiteInnerSe decals: - 1788: 7,-25 - 2377: -11,-40 + 1645: 7,-25 - node: color: '#FFFFFFFF' id: BrickTileWhiteInnerSe decals: - 2909: -21,-21 + 2493: -21,-21 - node: color: '#334E6DC8' id: BrickTileWhiteInnerSw decals: - 1607: -3,32 - 1631: -8,42 + 1464: -3,32 + 1488: -8,42 - node: color: '#52B4E996' id: BrickTileWhiteInnerSw decals: - 2938: -19,-21 + 2522: -19,-21 - node: color: '#79150096' id: BrickTileWhiteInnerSw decals: - 2410: 7,-4 - 2412: 7,-11 + 2114: 7,-4 + 2116: 7,-11 - node: color: '#D381C996' id: BrickTileWhiteInnerSw decals: - 2660: 14,23 + 2344: 14,23 - node: color: '#EFB34196' id: BrickTileWhiteInnerSw decals: - 1787: 9,-25 - 2376: -5,-40 + 1644: 9,-25 - node: color: '#FFFFFFFF' id: BrickTileWhiteInnerSw decals: - 2910: -19,-21 + 2494: -19,-21 - node: color: '#334E6DC8' id: BrickTileWhiteLineE decals: - 1542: -4,29 - 1543: -4,30 - 1544: -4,31 - 1545: -4,33 - 1546: -4,35 - 1547: -15,29 - 1548: -15,30 - 1549: -15,31 - 1550: -15,33 - 1551: -15,35 - 1629: -12,41 - 2672: -40,-61 + 1399: -4,29 + 1400: -4,30 + 1401: -4,31 + 1402: -4,33 + 1403: -4,35 + 1404: -15,29 + 1405: -15,30 + 1406: -15,31 + 1407: -15,33 + 1408: -15,35 + 1486: -12,41 - node: color: '#52B4E996' id: BrickTileWhiteLineE decals: - 2675: -40,-63 - 2929: -21,-17 - 2930: -21,-18 - 2931: -21,-19 - 2932: -21,-20 - 2933: -21,-22 - 2934: -21,-23 - 2963: -13,-16 - 3005: -13,-22 - 3006: -13,-21 - 3007: -13,-20 - 3041: -29,-22 - 3042: -29,-21 - 3043: -29,-20 - 3044: -29,-19 - 3045: -29,-18 - 3094: -12,-12 - 3095: -12,-10 - - node: - color: '#9FED5896' - id: BrickTileWhiteLineE - decals: - 2684: -37,-60 - 2685: -37,-59 - 2686: -37,-58 - - node: - color: '#A4610696' - id: BrickTileWhiteLineE - decals: - 2671: -40,-59 + 2513: -21,-17 + 2514: -21,-18 + 2515: -21,-19 + 2516: -21,-20 + 2517: -21,-22 + 2518: -21,-23 + 2547: -13,-16 + 2589: -13,-22 + 2590: -13,-21 + 2591: -13,-20 + 2625: -29,-22 + 2626: -29,-21 + 2627: -29,-20 + 2628: -29,-19 + 2629: -29,-18 + 2678: -12,-12 + 2679: -12,-10 - node: color: '#D381C996' id: BrickTileWhiteLineE decals: - 2655: 12,21 - 2656: 12,22 - 2676: -40,-64 - - node: - color: '#D4D4D428' - id: BrickTileWhiteLineE - decals: - 2696: -42,-60 - 2697: -42,-59 - 2698: -42,-58 - - node: - color: '#D4D4D496' - id: BrickTileWhiteLineE - decals: - 2693: -42,-64 - 2694: -42,-63 - 2695: -42,-62 + 2339: 12,21 + 2340: 12,22 - node: color: '#DE3A3A96' id: BrickTileWhiteLineE decals: - 2197: -2,-35 - 2198: -2,-34 - 2681: -37,-64 - 2682: -37,-63 - 2683: -37,-62 + 2054: -2,-35 + 2055: -2,-34 - node: color: '#EFB34196' id: BrickTileWhiteLineE decals: - 1775: 7,-29 - 1776: 7,-28 - 1777: 7,-27 - 1778: 7,-26 - 2201: -4,-35 - 2202: -4,-34 - 2225: 3,-42 - 2226: 3,-41 - 2227: 3,-40 - 2228: 3,-39 - 2229: 3,-43 - 2230: 3,-44 - 2252: -22,-44 - 2275: -16,-44 - 2276: -16,-43 - 2311: -6,-31 - 2312: -6,-30 - 2313: -6,-29 - 2668: -40,-58 - 2858: -40,18 + 1632: 7,-29 + 1633: 7,-28 + 1634: 7,-27 + 1635: 7,-26 + 2058: -4,-35 + 2059: -4,-34 + 2442: -40,18 + 2975: -26,-40 + 2981: -26,-44 - node: color: '#FFFFFFFF' id: BrickTileWhiteLineE decals: - 2903: -21,-23 - 2904: -21,-22 - 2905: -21,-20 - 2906: -21,-19 - 2915: -21,-18 - 2916: -21,-17 - 3002: -13,-22 - 3003: -13,-21 - 3004: -13,-20 + 2487: -21,-23 + 2488: -21,-22 + 2489: -21,-20 + 2490: -21,-19 + 2499: -21,-18 + 2500: -21,-17 + 2586: -13,-22 + 2587: -13,-21 + 2588: -13,-20 - node: color: '#334E6DC8' id: BrickTileWhiteLineN decals: - 1503: -18,37 - 1504: -19,37 - 1505: -20,37 - 1506: -21,37 - 1507: -22,37 - 1508: -25,37 - 1509: -26,37 - 1510: -28,37 - 1511: -24,37 - 1626: -9,40 - 1627: -10,40 - 1628: -11,40 + 1360: -18,37 + 1361: -19,37 + 1362: -20,37 + 1363: -21,37 + 1364: -22,37 + 1365: -25,37 + 1366: -26,37 + 1367: -28,37 + 1368: -24,37 + 1483: -9,40 + 1484: -10,40 + 1485: -11,40 - node: color: '#52B4E996' id: BrickTileWhiteLineN decals: - 2941: -20,-21 - 3008: -15,-19 - 3009: -16,-19 - 3010: -17,-19 - 3011: -18,-19 - 3096: -13,-9 - 3097: -14,-9 - 3098: -15,-9 + 2525: -20,-21 + 2592: -15,-19 + 2593: -16,-19 + 2594: -17,-19 + 2595: -18,-19 + 2680: -13,-9 + 2681: -14,-9 + 2682: -15,-9 - node: color: '#D381C996' id: BrickTileWhiteLineN decals: - 2553: 17,16 - 2554: 18,16 - 2653: 13,20 + 2337: 13,20 - node: color: '#DE3A3A96' id: BrickTileWhiteLineN decals: - 2199: -3,-33 - 2243: -3,-39 + 2056: -3,-33 - node: color: '#EFB34196' id: BrickTileWhiteLineN decals: - 2205: -3,-34 - 2256: -24,-41 - 2257: -23,-41 - 2273: -17,-39 - 2274: -18,-39 - 2314: -7,-28 - 2315: -8,-28 - 2316: -9,-28 - 2317: -10,-28 - 2318: -11,-28 - 2319: -12,-28 - 2320: -13,-28 - 2371: -6,-42 - 2372: -7,-42 - 2373: -8,-42 - 2374: -9,-42 - 2375: -10,-42 - 2524: 8,-24 - 2526: 7,-24 - 2529: 10,-23 - 2530: 11,-23 - 2531: 12,-23 - 2532: 13,-23 - 2850: -41,19 - 2851: -42,19 - 2852: -43,19 + 2062: -3,-34 + 2228: 8,-24 + 2230: 7,-24 + 2233: 10,-23 + 2234: 11,-23 + 2235: 12,-23 + 2434: -41,19 + 2435: -42,19 + 2436: -43,19 + 2982: -22,-45 + 2983: -21,-45 + 3022: -9,-42 + 3023: -8,-42 + 3024: -6,-42 + 3025: -7,-42 + 3026: -5,-42 + 3027: -4,-42 + 3028: -3,-42 + 3029: -2,-42 + 3030: 2,-42 - node: color: '#FFFFFFFF' id: BrickTileWhiteLineN decals: - 1459: -26,39 - 1460: -28,39 - 1461: -27,39 - 2914: -20,-21 - 2998: -15,-19 - 2999: -16,-19 - 3000: -17,-19 - 3001: -18,-19 + 1316: -26,39 + 1317: -28,39 + 1318: -27,39 + 2498: -20,-21 + 2582: -15,-19 + 2583: -16,-19 + 2584: -17,-19 + 2585: -18,-19 - node: color: '#334E6DC8' id: BrickTileWhiteLineS decals: - 1623: -9,42 - 1624: -10,42 - 1625: -11,42 + 1480: -9,42 + 1481: -10,42 + 1482: -11,42 - node: color: '#52B4E996' id: BrickTileWhiteLineS decals: - 2474: -34,0 - 2475: -36,0 - 2942: -20,-21 - 3012: -17,-23 - 3013: -16,-23 - 3014: -15,-23 - 3015: -14,-23 - 3056: -30,-24 - 3100: -13,-13 - 3101: -15,-13 + 2178: -34,0 + 2179: -36,0 + 2526: -20,-21 + 2596: -17,-23 + 2597: -16,-23 + 2598: -15,-23 + 2599: -14,-23 + 2640: -30,-24 + 2684: -13,-13 + 2685: -15,-13 - node: color: '#79150096' id: BrickTileWhiteLineS decals: - 2407: 6,-4 - 2408: 5,-4 - 2409: 3,-4 + 2111: 6,-4 + 2112: 5,-4 + 2113: 3,-4 - node: color: '#D381C996' id: BrickTileWhiteLineS decals: - 2552: 17,14 - 2654: 13,23 + 2338: 13,23 - node: color: '#DE3A3A96' id: BrickTileWhiteLineS decals: - 2200: -3,-36 + 2057: -3,-36 - node: color: '#EFB34196' id: BrickTileWhiteLineS decals: - 2206: -3,-35 - 2235: 2,-45 - 2236: 1,-45 - 2250: -23,-45 - 2251: -24,-45 - 2270: -19,-45 - 2271: -17,-45 - 2304: -7,-32 - 2305: -8,-32 - 2306: -9,-32 - 2307: -10,-32 - 2308: -11,-32 - 2309: -12,-32 - 2310: -13,-32 - 2366: -6,-40 - 2367: -7,-40 - 2368: -8,-40 - 2369: -9,-40 - 2370: -10,-40 - 2525: 8,-25 - 2855: -43,17 - 2857: -42,17 + 2063: -3,-35 + 2229: 8,-25 + 2439: -43,17 + 2441: -42,17 + 2994: -20,-51 + 2995: -16,-51 + 3031: -10,-39 + 3032: -6,-39 - node: color: '#FFFFFFFF' id: BrickTileWhiteLineS decals: - 1458: -27,39 - 2913: -20,-21 - 2992: -17,-23 - 2993: -16,-23 - 2994: -15,-23 - 2995: -14,-23 + 1315: -27,39 + 2497: -20,-21 + 2576: -17,-23 + 2577: -16,-23 + 2578: -15,-23 + 2579: -14,-23 - node: color: '#334E6DC8' id: BrickTileWhiteLineW decals: - 1536: -16,29 - 1537: -16,30 - 1538: -16,31 - 1539: -16,32 - 1540: -16,33 - 1541: -16,35 - 1552: -5,29 - 1553: -5,30 - 1554: -5,31 - 1555: -5,33 - 1556: -5,35 - 1630: -8,41 - 2673: -37,-61 + 1393: -16,29 + 1394: -16,30 + 1395: -16,31 + 1396: -16,32 + 1397: -16,33 + 1398: -16,35 + 1409: -5,29 + 1410: -5,30 + 1411: -5,31 + 1412: -5,33 + 1413: -5,35 + 1487: -8,41 - node: color: '#52B4E996' id: BrickTileWhiteLineW decals: - 2674: -37,-63 - 2923: -23,-22 - 2924: -23,-21 - 2925: -23,-20 - 2926: -23,-19 - 2927: -23,-18 - 2928: -23,-16 - 2935: -19,-22 - 2936: -19,-20 - 3048: -31,-17 - 3049: -31,-19 - 3050: -31,-20 - 3051: -31,-21 - 3052: -31,-22 - 3053: -31,-23 - 3099: -16,-12 + 2507: -23,-22 + 2508: -23,-21 + 2509: -23,-20 + 2510: -23,-19 + 2511: -23,-18 + 2512: -23,-16 + 2519: -19,-22 + 2520: -19,-20 + 2632: -31,-17 + 2633: -31,-19 + 2634: -31,-20 + 2635: -31,-21 + 2636: -31,-22 + 2637: -31,-23 + 2683: -16,-12 - node: color: '#79150096' id: BrickTileWhiteLineW decals: - 2402: 7,-12 - 2403: 7,-8 - 2404: 7,-7 - 2405: 7,-6 - 2406: 7,-5 - - node: - color: '#9FED5896' - id: BrickTileWhiteLineW - decals: - 2687: -35,-60 - 2688: -35,-59 - 2689: -35,-58 - - node: - color: '#A4610696' - id: BrickTileWhiteLineW - decals: - 2670: -37,-59 + 2106: 7,-12 + 2107: 7,-8 + 2108: 7,-7 + 2109: 7,-6 + 2110: 7,-5 - node: color: '#D381C996' id: BrickTileWhiteLineW decals: - 2658: 14,21 - 2659: 14,22 - 2677: -37,-64 - - node: - color: '#D4D4D428' - id: BrickTileWhiteLineW - decals: - 2699: -40,-60 - 2700: -40,-59 - 2701: -40,-58 - - node: - color: '#D4D4D496' - id: BrickTileWhiteLineW - decals: - 2690: -40,-64 - 2691: -40,-63 - 2692: -40,-62 + 2342: 14,21 + 2343: 14,22 - node: color: '#DE3A3A96' id: BrickTileWhiteLineW decals: - 2195: -4,-35 - 2196: -4,-34 - 2678: -35,-64 - 2679: -35,-63 - 2680: -35,-62 + 2052: -4,-35 + 2053: -4,-34 - node: color: '#EFB34196' id: BrickTileWhiteLineW decals: - 1779: 5,-28 - 1780: 5,-27 - 1781: 5,-29 - 1782: 5,-26 - 1783: 5,-25 - 1786: 9,-26 - 2203: -2,-35 - 2204: -2,-34 - 2233: 0,-44 - 2234: 0,-43 - 2253: -25,-44 - 2254: -25,-43 - 2255: -25,-42 - 2264: -20,-44 - 2265: -20,-41 - 2266: -20,-40 - 2321: -14,-31 - 2322: -14,-29 - 2669: -37,-58 + 1636: 5,-28 + 1637: 5,-27 + 1638: 5,-29 + 1639: 5,-26 + 1640: 5,-25 + 1643: 9,-26 + 2060: -2,-35 + 2061: -2,-34 + 3034: 3,-41 - node: color: '#FFFFFFFF' id: BrickTileWhiteLineW decals: - 2907: -19,-22 - 2908: -19,-20 - 2917: -23,-22 - 2918: -23,-21 - 2919: -23,-20 - 2920: -23,-19 - 2921: -23,-18 - 2922: -23,-16 + 2491: -19,-22 + 2492: -19,-20 + 2501: -23,-22 + 2502: -23,-21 + 2503: -23,-20 + 2504: -23,-19 + 2505: -23,-18 + 2506: -23,-16 - node: color: '#FFFFFFFF' id: Busha1 decals: 367: -40.05385,30.256437 - - node: - color: '#FFFFFFFF' - id: Busha2 - decals: - 1104: -25.204376,3.9985995 - node: color: '#FFFFFFFF' id: Busha3 decals: - 1045: -67.012436,-29.136745 + 965: -67.012436,-29.136745 - node: color: '#9FED5896' id: Bushb1 decals: - 1078: 5.955755,-11.904804 + 998: 5.955755,-11.904804 - node: color: '#FFFFFFFF' id: Bushb1 @@ -1710,152 +1548,143 @@ entities: color: '#9FED5896' id: Bushb3 decals: - 1076: 5.424505,-4.9673038 + 996: 5.424505,-4.9673038 - node: color: '#FFFFFFFF' id: Bushb3 decals: 365: -39.256973,28.912687 - 1040: -71.06114,-43.947823 - 1733: -52.14543,-42.415432 + 960: -71.06114,-43.947823 + 1590: -52.14543,-42.415432 - node: color: '#9FED5896' id: Bushc1 decals: - 1075: 6.03388,-7.2173038 + 995: 6.03388,-7.2173038 - node: color: '#FFFFFFFF' id: Bushc1 decals: - 949: -12.158052,22.978218 + 884: -12.158052,22.978218 - node: color: '#9FED5896' id: Bushc2 decals: - 1074: 6,-8 - 1077: 2.9401298,-4.9985538 + 994: 6,-8 + 997: 2.9401298,-4.9985538 - node: color: '#FFFFFFFF' id: Bushc2 decals: 366: -39.1476,33.037685 - 948: -9.158052,23.040718 + 883: -9.158052,23.040718 - node: color: '#FFFFFFFF' id: Bushc3 decals: 368: -39.11635,29.006437 - 1066: -65.91299,-37.046043 + 986: -65.91299,-37.046043 - node: color: '#FFFFFFFF' id: Bushd3 decals: - 1058: -67.06147,-29.881145 - - node: - color: '#FFFFFFFF' - id: Bushd4 - decals: - 1112: -27.485626,3.9673495 + 978: -67.06147,-29.881145 - node: color: '#FFFFFFFF' id: Bushe1 decals: - 1052: -65.58819,-29.014542 - 1111: -28.454376,3.9517245 + 972: -65.58819,-29.014542 - node: color: '#FFFFFFFF' id: Bushe2 decals: - 1043: -71.81257,-43.137188 - 1053: -65.66631,-32.030167 - 1054: -59.71319,-35.530167 + 963: -71.81257,-43.137188 + 973: -65.66631,-32.030167 + 974: -59.71319,-35.530167 - node: color: '#FFFFFFFF' id: Bushe3 decals: - 1055: -65.26006,-35.280167 - 1056: -59.36944,-31.748917 - 1115: -24.141876,3.9673495 + 975: -65.26006,-35.280167 + 976: -59.36944,-31.748917 - node: color: '#FFFFFFFF' id: Bushe4 decals: - 1284: -59.021492,-29.650486 + 1184: -59.021492,-29.650486 - node: color: '#FFFFFFFF' id: Bushf1 decals: - 1047: -65.58819,-32.131794 - 1048: -59.291313,-31.866169 + 967: -65.58819,-32.131794 + 968: -59.291313,-31.866169 - node: color: '#FFFFFFFF' id: Bushf2 decals: - 1049: -59.74444,-35.631794 - 1050: -65.52569,-29.053669 - 1283: -59.068367,-29.628086 + 969: -59.74444,-35.631794 + 970: -65.52569,-29.053669 + 1183: -59.068367,-29.628086 - node: color: '#FFFFFFFF' id: Bushf3 decals: - 1051: -65.27569,-35.350544 + 971: -65.27569,-35.350544 - node: color: '#FFFFFFFF' id: Bushh2 decals: - 1059: -50.04093,-42.20576 + 979: -50.04093,-42.20576 - node: color: '#FFFFFFFF' id: Bushh3 decals: - 1057: -66.616165,-27.440277 - 1060: -53.009384,-36.94919 + 977: -66.616165,-27.440277 + 980: -53.009384,-36.94919 - node: color: '#FFFFFFFF' id: Bushi1 decals: 375: -38.850723,30.881437 - 940: -10.897953,23.01216 - 941: -7.147953,23.059034 - 943: -12.769052,22.88716 - 3188: -20,-22 + 875: -10.897953,23.01216 + 876: -7.147953,23.059034 + 878: -12.769052,22.88716 + 2772: -20,-22 - node: color: '#FFFFFFFF' id: Bushi2 decals: 374: -40.131973,32.52206 - 1079: 5.9999943,-7.451386 + 999: 5.9999943,-7.451386 - node: color: '#FFFFFFFF' id: Bushi3 decals: 372: -38.850723,29.881437 373: -40.05385,31.053312 - 1114: -28.032501,3.9673495 - node: color: '#FFFFFFFF' id: Bushi4 decals: - 942: -9.757328,22.85591 - 1080: 5.4999943,-5.029511 - 1113: -25.548126,3.9829745 + 877: -9.757328,22.85591 + 1000: 5.4999943,-5.029511 - node: color: '#FFFFFFFF' id: Bushj1 decals: - 1044: -73.48444,-43.855938 - 1061: -68.11463,-38.9754 - 1067: -69.40792,-34.063843 + 964: -73.48444,-43.855938 + 981: -68.11463,-38.9754 + 987: -69.40792,-34.063843 - node: color: '#FFFFFFFF' id: Bushj2 decals: - 1062: -57.046288,-37.982056 + 982: -57.046288,-37.982056 - node: color: '#FFFFFFFF' id: Bushj3 decals: - 1063: -49.987144,-48.963146 + 983: -49.987144,-48.963146 - node: color: '#FFFFFFFF' id: Bushk1 @@ -1871,123 +1700,120 @@ entities: color: '#FFFFFFFF' id: Bushl1 decals: - 889: -59.13713,-56.211792 - 1081: 3.0098214,-4.939097 - 1599: -9.9612665,40.993107 + 824: -59.13713,-56.211792 + 1001: 3.0098214,-4.939097 + 1456: -9.9612665,40.993107 - node: color: '#FFFFFFFF' id: Bushl2 decals: - 890: -59.79338,-57.039917 - 1082: 6.009821,-11.977411 + 825: -59.79338,-57.039917 + 1002: 6.009821,-11.977411 - node: color: '#FFFFFFFF' id: Bushm2 decals: - 891: -59.16838,-57.789917 + 826: -59.16838,-57.789917 - node: color: '#FFFFFFFF' id: Bushm3 decals: - 892: -65.91838,-51.868042 + 827: -65.91838,-51.868042 - node: color: '#FFFFFFFF' id: Bushn1 decals: - 950: -10.126802,23.012297 - - node: - color: '#FFFFFFFF' - id: Caution - decals: - 662: -8,-45 + 885: -10.126802,23.012297 - node: color: '#52B4E996' id: CheckerNESW decals: 520: -11,-2 - 2966: -19,-17 - 2967: -19,-16 - 2968: -19,-15 - 2969: -18,-15 - 2970: -17,-15 - 2971: -17,-16 - 2972: -18,-16 - 2973: -18,-17 - 2974: -17,-17 - 2975: -18,-22 - 2976: -18,-21 - 2977: -18,-20 - 2978: -17,-20 - 2979: -17,-21 - 2980: -17,-22 - 2981: -16,-22 - 2982: -16,-21 - 2983: -16,-20 - 2984: -15,-20 - 2985: -15,-21 - 2986: -15,-22 - 2987: -14,-22 - 2988: -14,-21 - 2989: -14,-20 - 3026: -33,-20 - 3027: -34,-20 - 3028: -35,-20 - 3029: -35,-19 - 3030: -34,-19 - 3031: -33,-19 - 3032: -33,-18 - 3033: -34,-18 - 3034: -35,-18 - 3035: -35,-17 - 3036: -34,-17 - 3037: -33,-17 - 3038: -33,-16 - 3039: -34,-16 - 3040: -35,-16 + 2550: -19,-17 + 2551: -19,-16 + 2552: -19,-15 + 2553: -18,-15 + 2554: -17,-15 + 2555: -17,-16 + 2556: -18,-16 + 2557: -18,-17 + 2558: -17,-17 + 2559: -18,-22 + 2560: -18,-21 + 2561: -18,-20 + 2562: -17,-20 + 2563: -17,-21 + 2564: -17,-22 + 2565: -16,-22 + 2566: -16,-21 + 2567: -16,-20 + 2568: -15,-20 + 2569: -15,-21 + 2570: -15,-22 + 2571: -14,-22 + 2572: -14,-21 + 2573: -14,-20 + 2610: -33,-20 + 2611: -34,-20 + 2612: -35,-20 + 2613: -35,-19 + 2614: -34,-19 + 2615: -33,-19 + 2616: -33,-18 + 2617: -34,-18 + 2618: -35,-18 + 2619: -35,-17 + 2620: -34,-17 + 2621: -33,-17 + 2622: -33,-16 + 2623: -34,-16 + 2624: -35,-16 + - node: + color: '#9FED5896' + id: CheckerNESW + decals: + 2787: -28,13 + 2788: -27,13 + 2789: -29,12 + 2790: -28,11 + 2791: -27,11 + 2792: -29,10 + 2793: -28,9 + 2794: -27,9 + 2795: -29,8 + 2796: -28,7 + 2797: -27,7 - node: color: '#D4D4D496' id: CheckerNESW decals: - 1795: -15,8 - - node: - color: '#EFB34196' - id: CheckerNESW - decals: - 1014: -20,-37 - 1015: -19,-37 - 1016: -18,-37 - 1017: -17,-37 - 1018: -16,-37 - 1019: -16,-36 - 1020: -17,-36 - 1021: -19,-36 - 1022: -19,-36 - 1023: -20,-36 - 1024: -20,-35 - 1025: -19,-35 - 1026: -18,-35 - 1027: -17,-35 - 1028: -16,-35 + 1652: -15,8 - node: color: '#52B4E996' id: CheckerNWSE decals: 516: -9,-4 - 3118: -32,-8 - 3119: -32,-7 - 3120: -32,-6 - 3121: -31,-6 - 3122: -30,-6 - 3123: -29,-6 - 3124: -28,-6 - 3125: -28,-7 - 3126: -28,-8 - 3127: -29,-8 - 3128: -29,-7 - 3129: -30,-7 - 3130: -30,-8 - 3131: -31,-8 - 3132: -31,-7 + 2702: -32,-8 + 2703: -32,-7 + 2704: -32,-6 + 2705: -31,-6 + 2706: -30,-6 + 2707: -29,-6 + 2708: -28,-6 + 2709: -28,-7 + 2710: -28,-8 + 2711: -29,-8 + 2712: -29,-7 + 2713: -30,-7 + 2714: -30,-8 + 2715: -31,-8 + 2716: -31,-7 + - node: + color: '#724276FF' + id: CheckerNWSE + decals: + 2842: 19,13 + 2843: 18,13 - node: color: '#79150096' id: CheckerNWSE @@ -2010,20 +1836,20 @@ entities: color: '#A4610696' id: CheckerNWSE decals: - 1084: 30,0 - 1085: 29,0 - 1086: 29,1 - 1087: 29,2 - 1088: 30,2 - 1089: 30,1 - 1090: 31,0 - 1091: 31,1 - 1092: 31,2 + 1004: 30,0 + 1005: 29,0 + 1006: 29,1 + 1007: 29,2 + 1008: 30,2 + 1009: 30,1 + 1010: 31,0 + 1011: 31,1 + 1012: 31,2 - node: color: '#EFB34196' id: CheckerNWSE decals: - 1119: 3,-28 + 1019: 3,-28 - node: color: '#FFFFFFFF' id: Delivery @@ -2051,71 +1877,68 @@ entities: 628: 3,-35 629: 3,-34 630: 3,-33 - 712: 14,-12 - 713: 14,-11 - 714: 14,-10 - 1145: 16,-2 - 1146: 17,-2 - 1238: 31,-6 - 1239: 31,-5 - 1240: 31,-4 - 1255: 18,-15 - 1256: 18,-14 - 1257: 19,-14 - 1258: 19,-15 - 1300: 38,7 - 1301: 39,7 - 1302: 40,7 - 1321: 28,9 - 1322: 28,10 - 1323: 26,9 - 1324: 26,10 - 2207: 4,-30 - 2291: -15,-42 - 2292: -15,-41 - 2293: -15,-40 - 2294: -1,-42 - 2295: -1,-41 - 2296: -1,-40 - 2841: -8,-49 - 3180: -13,-8 - 3181: -12,-8 + 652: 14,-12 + 653: 14,-11 + 654: 14,-10 + 1045: 16,-2 + 1046: 17,-2 + 1138: 31,-6 + 1139: 31,-5 + 1140: 31,-4 + 1155: 18,-15 + 1156: 18,-14 + 1157: 19,-14 + 1158: 19,-15 + 1200: 38,7 + 1201: 39,7 + 1202: 40,7 + 1221: 28,9 + 1222: 28,10 + 1223: 26,9 + 1224: 26,10 + 2064: 4,-30 + 2764: -13,-8 + 2765: -12,-8 + 2868: 14,-24 + 2869: 14,-25 + 2870: 10,-31 + 2871: 11,-31 - node: color: '#FFFFFFFF' id: DiagonalCheckerAOverlay decals: - 1658: -29,22 - 1659: -28,22 - 1660: -27,22 - 1661: -26,22 - 1662: -26,23 - 1663: -27,23 - 1664: -28,23 - 1665: -29,23 + 1515: -29,22 + 1516: -28,22 + 1517: -27,22 + 1518: -26,22 + 1519: -26,23 + 1520: -27,23 + 1521: -28,23 + 1522: -29,23 - node: cleanable: True color: '#FFFFFFFF' id: Dirt decals: - 923: -27,-36 - 924: -28,-38 - 925: -23,-36 - 926: -25,-38 - 2888: -41,-11 - 2889: -42,-13 - 2890: -43,-17 - 2891: -42,-16 - 2892: -42,-17 - 2893: -41,-16 - 2894: -42,-12 - 2895: -41,-9 - 2896: -42,-8 - 2897: -42,-7 - 2898: -39,-7 - 2899: -39,-6 - 2900: -38,-7 - 2901: -38,-8 - 2902: -40,-7 + 858: -27,-36 + 859: -28,-38 + 860: -23,-36 + 861: -25,-38 + 2472: -41,-11 + 2473: -42,-13 + 2474: -43,-17 + 2475: -42,-16 + 2476: -42,-17 + 2477: -41,-16 + 2478: -42,-12 + 2479: -41,-9 + 2480: -42,-8 + 2481: -42,-7 + 2482: -39,-7 + 2483: -39,-6 + 2484: -38,-7 + 2485: -38,-8 + 2486: -40,-7 - node: color: '#FFFFFFFF' id: DirtHeavy @@ -2126,9 +1949,8 @@ entities: 232: -49,40 245: -34,57 246: -31,59 - 681: 1,-38 - 762: 53,19 - 763: 53,20 + 697: 53,19 + 698: 53,20 - node: cleanable: True color: '#FFFFFFFF' @@ -2139,32 +1961,31 @@ entities: 403: -28,32 404: -28,31 405: -31,30 - 893: -76,-57 - 894: -76,-56 - 895: -77,-55 - 896: -79,-54 - 910: -22,-38 - 911: -23,-38 - 912: -24,-36 - 913: -25,-36 - 914: -25,-36 - 1165: 23,-12 - 1166: 23,-11 - 1167: 24,-12 - 1168: 34,-12 - 1169: 35,-11 - 1170: 32,-12 - 1171: 31,-10 - 2331: -13,-31 - 2332: -11,-32 - 2481: -19,19 - 2482: -14,19 - 2483: -21,18 - 2486: -15,19 - 2866: -40,-8 - 2867: -41,-7 - 2868: -42,-14 - 2869: -42,-17 + 828: -76,-57 + 829: -76,-56 + 830: -77,-55 + 831: -79,-54 + 845: -22,-38 + 846: -23,-38 + 847: -24,-36 + 848: -25,-36 + 849: -25,-36 + 1065: 23,-12 + 1066: 23,-11 + 1067: 24,-12 + 1068: 34,-12 + 1069: 35,-11 + 1070: 32,-12 + 1071: 31,-10 + 2075: -13,-31 + 2185: -19,19 + 2186: -14,19 + 2187: -21,18 + 2190: -15,19 + 2450: -40,-8 + 2451: -41,-7 + 2452: -42,-14 + 2453: -42,-17 - node: color: '#FFFFFFFF' id: DirtLight @@ -2194,25 +2015,22 @@ entities: 260: -40,42 262: -48,42 263: -37,40 - 690: -19,-44 - 691: -17,-42 - 692: -14,-40 - 693: -19,-42 - 694: -23,-43 - 695: -1,-40 - 696: -4,-41 - 697: 1,-40 - 698: 0,-39 - 699: 2,-38 - 700: 2,-39 - 701: 1,-34 - 702: 1,-31 - 758: 43,22 - 759: 45,22 - 760: 52,19 - 761: 51,20 - 764: 50,19 - 770: 45,23 + 641: -19,-44 + 642: -17,-42 + 643: -19,-42 + 644: -23,-43 + 645: -4,-41 + 646: 1,-40 + 647: 0,-39 + 648: 2,-39 + 649: 1,-34 + 650: 1,-31 + 693: 43,22 + 694: 45,22 + 695: 52,19 + 696: 51,20 + 699: 50,19 + 705: 45,23 - node: cleanable: True color: '#FFFFFFFF' @@ -2229,120 +2047,102 @@ entities: 419: -32,27 420: -26,28 421: -33,27 - 742: 20,-11 - 743: 21,-10 - 744: 17,-11 - 745: 17,-12 - 746: 19,-8 - 903: -78,-53 - 904: -76,-53 - 905: -78,-56 - 906: -79,-56 - 907: -80,-53 - 908: -79,-52 - 909: -76,-55 - 1002: 27,0 - 1003: 28,1 - 1004: 29,1 - 1177: 24,-11 - 1178: 24,-10 - 1179: 23,-10 - 1180: 26,-12 - 1181: 31,-12 - 1182: 32,-11 - 1183: 33,-10 - 1184: 34,-11 - 1185: 33,-12 - 1186: 32,-9 - 1187: 33,-9 - 1188: 24,-9 - 1189: 21,-9 - 1190: 24,-8 - 1191: 23,-8 - 1223: 29,-2 - 1224: 30,-3 - 1225: 31,-4 - 1226: 32,-4 - 1227: 30,0 - 1228: 33,-7 - 1229: 32,-8 - 1230: 24,-8 - 1231: 25,-7 - 1232: 26,-6 - 1233: 23,-3 - 1234: 22,-2 - 1235: 21,-2 - 1589: -1,29 - 1835: -58,15 - 1836: -57,16 - 1837: -58,21 - 1838: -57,20 - 1839: -57,23 - 1841: -51,14 - 1842: -51,15 - 1843: -56,20 - 1847: -4,27 - 1848: -6,27 - 1849: -14,26 - 1850: -19,27 - 1851: -26,28 - 1852: -26,27 - 1853: -27,26 - 1854: -25,25 - 1855: -27,31 - 1856: -39,37 - 1857: -37,36 - 1858: -36,35 - 1859: -41,43 - 1860: -47,52 - 1861: -49,53 - 1862: -47,56 - 2338: -13,-32 - 2339: -11,-31 - 2340: -9,-32 - 2341: -10,-30 - 2342: -10,-31 - 2343: -11,-29 - 2344: -11,-28 - 2345: -13,-29 - 2346: -14,-30 - 2347: -13,-33 - 2348: -13,-34 - 2349: -19,-41 - 2350: -20,-42 - 2351: -20,-44 - 2352: -20,-44 - 2353: -22,-44 - 2354: -22,-43 - 2355: -22,-41 - 2356: -25,-41 - 2357: -26,-41 - 2358: -26,-42 - 2359: -24,-43 - 2360: -24,-45 - 2361: -25,-44 - 2362: -12,-39 - 2363: -12,-40 - 2364: -9,-39 - 2365: -8,-39 - 2484: -18,19 - 2485: -21,19 - 2487: -16,19 - 2488: -22,19 - 2489: -31,16 - 2490: -31,17 - 2491: -7,18 - 2870: -41,-13 - 2871: -42,-10 - 2872: -42,-9 - 2873: -41,-8 - 2874: -40,-7 - 2884: -42,-15 - 2885: -42,-15 - 2886: -42,-14 - 2887: -42,-13 - 3158: -18,-9 - 3159: -23,-12 + 682: 20,-11 + 683: 21,-10 + 684: 17,-11 + 685: 17,-12 + 686: 19,-8 + 838: -78,-53 + 839: -76,-53 + 840: -78,-56 + 841: -79,-56 + 842: -80,-53 + 843: -79,-52 + 844: -76,-55 + 937: 27,0 + 938: 28,1 + 939: 29,1 + 1077: 24,-11 + 1078: 24,-10 + 1079: 23,-10 + 1080: 26,-12 + 1081: 31,-12 + 1082: 32,-11 + 1083: 33,-10 + 1084: 34,-11 + 1085: 33,-12 + 1086: 32,-9 + 1087: 33,-9 + 1088: 24,-9 + 1089: 21,-9 + 1090: 24,-8 + 1091: 23,-8 + 1123: 29,-2 + 1124: 30,-3 + 1125: 31,-4 + 1126: 32,-4 + 1127: 30,0 + 1128: 33,-7 + 1129: 32,-8 + 1130: 24,-8 + 1131: 25,-7 + 1132: 26,-6 + 1133: 23,-3 + 1134: 22,-2 + 1135: 21,-2 + 1446: -1,29 + 1692: -58,15 + 1693: -57,16 + 1694: -58,21 + 1695: -57,20 + 1696: -57,23 + 1698: -51,14 + 1699: -51,15 + 1700: -56,20 + 1704: -4,27 + 1705: -6,27 + 1706: -14,26 + 1707: -19,27 + 1708: -26,28 + 1709: -26,27 + 1710: -27,26 + 1711: -25,25 + 1712: -27,31 + 1713: -39,37 + 1714: -37,36 + 1715: -36,35 + 1716: -41,43 + 1717: -47,52 + 1718: -49,53 + 1719: -47,56 + 2078: -11,-31 + 2079: -10,-30 + 2080: -10,-31 + 2081: -11,-29 + 2082: -13,-29 + 2083: -14,-30 + 2084: -13,-33 + 2085: -13,-34 + 2086: -19,-41 + 2087: -24,-43 + 2188: -18,19 + 2189: -21,19 + 2191: -16,19 + 2192: -22,19 + 2193: -31,16 + 2194: -31,17 + 2195: -7,18 + 2454: -41,-13 + 2455: -42,-10 + 2456: -42,-9 + 2457: -41,-8 + 2458: -40,-7 + 2468: -42,-15 + 2469: -42,-15 + 2470: -42,-14 + 2471: -42,-13 + 2742: -18,-9 + 2743: -23,-12 - node: color: '#FFFFFFFF' id: DirtMedium @@ -2355,21 +2155,17 @@ entities: 244: -35,58 253: -36,54 261: -48,41 - 682: 0,-38 - 683: 1,-39 - 684: 0,-40 - 685: -18,-44 - 686: -19,-43 - 687: -23,-44 - 688: -18,-42 - 689: -16,-41 - 756: 46,23 - 757: 43,21 - 765: 52,19 - 766: 43,22 - 767: 46,23 - 768: 46,22 - 769: 44,23 + 637: 1,-39 + 638: -23,-44 + 639: -18,-42 + 640: -16,-41 + 691: 46,23 + 692: 43,21 + 700: 52,19 + 701: 43,22 + 702: 46,23 + 703: 46,22 + 704: 44,23 - node: cleanable: True color: '#FFFFFFFF' @@ -2380,45 +2176,42 @@ entities: 408: -30,30 409: -32,29 410: -31,32 - 741: 21,-11 - 897: -78,-54 - 898: -79,-55 - 899: -79,-53 - 900: -80,-53 - 901: -76,-54 - 902: -77,-53 - 915: -26,-36 - 916: -27,-37 - 1001: 27,1 - 1172: 32,-10 - 1173: 31,-11 - 1174: 30,-11 - 1175: 25,-12 - 1176: 26,-11 - 1220: 34,-7 - 1221: 30,-2 - 1222: 31,-3 - 1590: 3,29 - 1840: -58,13 - 2333: -10,-32 - 2334: -12,-31 - 2335: -12,-32 - 2336: -14,-31 - 2337: -12,-29 - 2875: -39,-8 - 2876: -42,-6 - 2877: -42,-7 - 2878: -41,-8 - 2879: -41,-12 - 2880: -42,-11 - 2881: -38,-8 - 2882: -38,-6 - 2883: -39,-7 + 681: 21,-11 + 832: -78,-54 + 833: -79,-55 + 834: -79,-53 + 835: -80,-53 + 836: -76,-54 + 837: -77,-53 + 850: -26,-36 + 851: -27,-37 + 936: 27,1 + 1072: 32,-10 + 1073: 31,-11 + 1074: 30,-11 + 1075: 25,-12 + 1076: 26,-11 + 1120: 34,-7 + 1121: 30,-2 + 1122: 31,-3 + 1447: 3,29 + 1697: -58,13 + 2076: -12,-31 + 2077: -12,-29 + 2459: -39,-8 + 2460: -42,-6 + 2461: -42,-7 + 2462: -41,-8 + 2463: -41,-12 + 2464: -42,-11 + 2465: -38,-8 + 2466: -38,-6 + 2467: -39,-7 - node: color: '#FFFFFFFF' id: FlowersBRTwo decals: - 3186: -20,-20 + 2770: -20,-20 - node: color: '#FFFFFFFF' id: Flowersbr1 @@ -2426,54 +2219,52 @@ entities: 75: -55,17 76: -53,18 77: -54.752693,18.73386 - 882: -59.152756,-56.526844 + 817: -59.152756,-56.526844 - node: color: '#FFFFFFFF' id: Flowersbr2 decals: - 877: -64.66838,-52.26122 - 878: -65.559006,-53.82372 - 879: -64.94963,-56.339344 - 880: -59.777756,-52.66747 - 1110: -24.157501,3.9829745 - 1598: -10.5706415,40.97748 + 812: -64.66838,-52.26122 + 813: -65.559006,-53.82372 + 814: -64.94963,-56.339344 + 815: -59.777756,-52.66747 + 1455: -10.5706415,40.97748 - node: color: '#FFFFFFFF' id: Flowersbr3 decals: 62: -53,22 63: -55,14 - 881: -60.121506,-53.44872 + 816: -60.121506,-53.44872 - node: color: '#FFFFFFFF' id: Flowerspv1 decals: - 883: -62.184006,-55.76122 - 884: -61.777756,-56.370594 - 885: -62.152756,-53.308094 - 1597: -9.3987665,40.961857 + 818: -62.184006,-55.76122 + 819: -61.777756,-56.370594 + 820: -62.152756,-53.308094 + 1454: -9.3987665,40.961857 - node: color: '#FFFFFFFF' id: Flowerspv2 decals: 81: -54.471443,18.20261 82: -53.533943,17.17136 - 886: -58.996506,-57.370594 - 887: -62.88713,-57.995594 + 821: -58.996506,-57.370594 + 822: -62.88713,-57.995594 - node: color: '#FFFFFFFF' id: Flowerspv3 decals: 64: -53,14 65: -55,22 - 888: -59.809006,-54.414917 - 1107: -25.970001,3.9985995 - 3187: -20,-23 + 823: -59.809006,-54.414917 + 2771: -20,-23 - node: color: '#FFFFFFFF' id: Flowersy1 decals: - 947: -13.0907,22.978218 + 882: -13.0907,22.978218 - node: color: '#FFFFFFFF' id: Flowersy2 @@ -2485,103 +2276,108 @@ entities: 78: -53.471443,17.280735 79: -54.76832,17.48386 376: -39.80385,29.303312 - 869: -64.98088,-57.620594 - 870: -62.090256,-57.776844 - 871: -61.10588,-57.13622 - 872: -60.090256,-57.91747 - 873: -64.152756,-53.683094 - 874: -62.69963,-52.51122 - 1108: -28.032501,3.9985995 - 1596: -9.9456415,40.993107 + 804: -64.98088,-57.620594 + 805: -62.090256,-57.776844 + 806: -61.10588,-57.13622 + 807: -60.090256,-57.91747 + 808: -64.152756,-53.683094 + 809: -62.69963,-52.51122 + 1453: -9.9456415,40.993107 - node: color: '#FFFFFFFF' id: Flowersy3 decals: 377: -39.4601,29.881437 - 876: -65.652756,-52.401844 - 944: -7.856325,22.931343 + 811: -65.652756,-52.401844 + 879: -7.856325,22.931343 - node: color: '#FFFFFFFF' id: Flowersy4 decals: 80: -53.61207,18.499485 378: -39.069473,32.17831 - 875: -63.26213,-53.76122 - 945: -10.293825,23.009468 - 946: -11.18445,22.978218 - 1109: -28.938751,3.9985995 - 3185: -20,-19 - - node: - color: '#334E6DC8' - id: FullTileOverlayGreyscale - decals: - 2718: -30,-62 + 810: -63.26213,-53.76122 + 880: -10.293825,23.009468 + 881: -11.18445,22.978218 + 2769: -20,-19 - node: color: '#4A8F37B1' id: FullTileOverlayGreyscale decals: - 1885: 5,23 - 1886: 6,23 - 1887: 3,23 - 1888: 2,23 - 1889: 2,20 - 1890: 2,21 - 1891: 3,20 - 1892: 5,20 - 1893: 6,20 - 1894: 6,21 + 1742: 5,23 + 1743: 6,23 + 1744: 3,23 + 1745: 2,23 + 1746: 2,20 + 1747: 2,21 + 1748: 3,20 + 1749: 5,20 + 1750: 6,20 + 1751: 6,21 - node: color: '#52B4E996' id: FullTileOverlayGreyscale decals: - 3085: -14,-12 - 3086: -14,-11 - 3087: -14,-10 - 3088: -15,-11 - 3089: -13,-11 - 3133: -25,-14 - 3134: -26,-14 - 3155: -20,-5 - 3156: -18,-5 - 3160: -20,-7 - 3161: -18,-7 + 2669: -14,-12 + 2670: -14,-11 + 2671: -14,-10 + 2672: -15,-11 + 2673: -13,-11 + 2717: -25,-14 + 2718: -26,-14 + 2739: -20,-5 + 2740: -18,-5 + 2744: -20,-7 + 2745: -18,-7 - node: color: '#79150096' id: FullTileOverlayGreyscale decals: - 808: -76,-46 - 809: -77,-46 - 810: -78,-46 - 811: -79,-46 - 812: -80,-46 - 813: -81,-46 + 743: -76,-46 + 744: -77,-46 + 745: -78,-46 + 746: -79,-46 + 747: -80,-46 + 748: -81,-46 + - node: + color: '#9FED5896' + id: FullTileOverlayGreyscale + decals: + 2798: -29,7 + 2799: -29,9 + 2800: -29,11 + 2801: -29,13 + 2802: -26,13 + 2803: -23,13 + 2804: -23,12 + 2805: -24,5 - node: color: '#A4610696' id: FullTileOverlayGreyscale decals: - 1093: 28,1 - 1094: 30,-1 - 1095: 20,-1 + 1013: 28,1 + 1014: 30,-1 + 1015: 20,-1 - node: color: '#D4D4D406' id: FullTileOverlayGreyscale decals: - 2413: -22,-6 - 2414: -23,-6 - 2415: -24,-6 - 2416: -25,-6 - 2417: -26,-6 - 2418: -25,-5 - 2419: -25,-4 - 2420: -25,-3 - 2421: -25,-2 - 2422: -25,-1 - 2423: -23,-5 - 2424: -23,-4 - 2425: -23,-3 - 2426: -23,-2 - 2427: -23,-1 - 2428: -24,-1 + 2117: -22,-6 + 2118: -23,-6 + 2119: -24,-6 + 2120: -25,-6 + 2121: -26,-6 + 2122: -25,-5 + 2123: -25,-4 + 2124: -25,-3 + 2125: -25,-2 + 2126: -25,-1 + 2127: -23,-5 + 2128: -23,-4 + 2129: -23,-3 + 2130: -23,-2 + 2131: -23,-1 + 2132: -24,-1 - node: color: '#D4D4D428' id: FullTileOverlayGreyscale @@ -2602,56 +2398,52 @@ entities: 479: -19,-4 480: 13,19 481: -38,10 - 680: -1,-34 - 1083: -19,0 - 2189: -3,-37 - 2190: -3,-32 + 636: -1,-34 + 1003: -19,0 + 2046: -3,-37 + 2047: -3,-32 - node: color: '#EFB34196' id: FullTileOverlayGreyscale decals: - 711: -11,-34 - 2244: -26,-42 - 2245: -26,-41 + 651: -11,-34 - node: color: '#FFFFFFFF' id: Grassb1 decals: 370: -39.100723,32.30331 - 936: -7.3405266,22.973469 - 939: -11.434277,23.035969 - 1064: -56.986298,-31.010326 - 1065: -59.069237,-37.03042 - 1735: -70.08625,-34.436035 + 871: -7.3405266,22.973469 + 874: -11.434277,23.035969 + 984: -56.986298,-31.010326 + 985: -59.069237,-37.03042 + 1592: -70.08625,-34.436035 - node: color: '#FFFFFFFF' id: Grassb2 decals: - 1038: -74.07677,-44.072823 - 1046: -67.18431,-28.324245 - 1102: -29.016876,3.9360995 - 1732: -53.955444,-43.088474 + 958: -74.07677,-44.072823 + 966: -67.18431,-28.324245 + 1589: -53.955444,-43.088474 - node: color: '#FFFFFFFF' id: Grassb3 decals: - 1039: -71.98302,-44.010323 - 1103: -24.048126,3.9673495 + 959: -71.98302,-44.010323 - node: color: '#FFFFFFFF' id: Grassb4 decals: - 938: -8.387402,22.973469 - 1041: -70.92052,-43.057198 - 1734: -52.942307,-42.899807 + 873: -8.387402,22.973469 + 961: -70.92052,-43.057198 + 1591: -52.942307,-42.899807 - node: color: '#FFFFFFFF' id: Grassb5 decals: 369: -39.881973,31.162687 371: -40.0851,28.850187 - 937: -12.856152,23.020344 - 1042: -73.10302,-35.91218 + 872: -12.856152,23.020344 + 962: -73.10302,-35.91218 - node: color: '#FFFFFFFF' id: Grassd1 @@ -2668,79 +2460,86 @@ entities: 357: -39.2726,29.881437 358: -39.694473,32.58456 359: -39.163223,31.818935 - 866: -65.69963,-54.183094 - 867: -59.934006,-54.276844 - 868: -60.98088,-57.745594 - 1100: -24.516876,4.0142245 + 801: -65.69963,-54.183094 + 802: -59.934006,-54.276844 + 803: -60.98088,-57.745594 + 2779: -27.285925,4.265137 + 2780: -29.097805,5.111672 - node: color: '#FFFFFFFF' id: Grassd2 decals: 83: -53.596443,17.79636 356: -39.7726,29.178312 - 848: -65.01213,-58.04247 - 849: -62.29338,-52.69872 - 850: -61.684006,-53.433094 - 851: -65.027756,-53.464344 - 852: -62.809006,-53.32372 - 932: -12.746777,23.114094 - 933: -6.8249016,22.957844 - 1099: -24.048126,4.0298495 - 3182: -20,-23 + 783: -65.01213,-58.04247 + 784: -62.29338,-52.69872 + 785: -61.684006,-53.433094 + 786: -65.027756,-53.464344 + 787: -62.809006,-53.32372 + 867: -12.746777,23.114094 + 868: -6.8249016,22.957844 + 2766: -20,-23 + 2776: -28.74137,4.8443456 + 2777: -28.177013,4.08692 + 2778: -23.974043,4.0126615 + 2785: -27.285925,5.6760283 + 2786: -25.503746,4.9037514 - node: color: '#FFFFFFFF' id: Grassd3 decals: - 853: -63.38713,-53.72997 - 854: -59.98088,-52.35497 - 855: -65.01213,-57.19872 - 856: -60.19963,-57.464344 - 857: -59.41838,-56.79247 - 934: -9.168652,22.942219 - 935: -10.309277,23.067219 + 788: -63.38713,-53.72997 + 789: -59.98088,-52.35497 + 790: -65.01213,-57.19872 + 791: -60.19963,-57.464344 + 792: -59.41838,-56.79247 + 869: -9.168652,22.942219 + 870: -10.309277,23.067219 + 2782: -26.157211,4.161177 + 2783: -27.865131,5.1859293 + 2784: -26.469091,5.022563 - node: color: '#FFFFFFFF' id: Grasse1 decals: - 858: -65.652756,-52.41747 - 859: -58.98088,-57.97997 - 860: -64.69963,-56.44872 - 861: -62.98088,-57.776844 - 1072: 6,-7 - 1073: 3,-5 - 1098: -27.532501,4.0298495 - 3183: -20,-22 + 793: -65.652756,-52.41747 + 794: -58.98088,-57.97997 + 795: -64.69963,-56.44872 + 796: -62.98088,-57.776844 + 992: 6,-7 + 993: 3,-5 + 2767: -20,-22 + 2774: -29.14236,4.101771 + 2775: -28.696815,5.5275135 - node: color: '#FFFFFFFF' id: Grasse2 decals: 360: -39.881973,31.74081 - 930: -11.340527,23.020344 - 931: -7.8092766,22.989094 - 1068: 6,-8 - 1069: 5,-5 - 1097: -28.532501,3.9829745 - 1101: -25.938751,4.0923495 - 1593: -9,41 - 1594: -10.480507,40.958054 - 3184: -20,-20 + 865: -11.340527,23.020344 + 866: -7.8092766,22.989094 + 988: 6,-8 + 989: 5,-5 + 1450: -9,41 + 1451: -10.480507,40.958054 + 2768: -20,-20 - node: color: '#FFFFFFFF' id: Grasse3 decals: - 862: -60.277756,-56.558094 - 863: -63.340256,-52.22997 - 864: -65.82463,-53.29247 - 865: -60.23088,-53.433094 - 927: -7.3717766,23.020344 - 928: -8.434277,22.973469 - 929: -11.918652,23.051594 - 1070: 6,-5 - 1071: 6,-12 - 1096: -29.001251,3.9829745 - 1591: -11,41 - 1592: -10,41 - 1595: -9.464882,40.926804 + 797: -60.277756,-56.558094 + 798: -63.340256,-52.22997 + 799: -65.82463,-53.29247 + 800: -60.23088,-53.433094 + 862: -7.3717766,23.020344 + 863: -8.434277,22.973469 + 864: -11.918652,23.051594 + 990: 6,-5 + 991: 6,-12 + 1448: -11,41 + 1449: -10,41 + 1452: -9.464882,40.926804 + 2781: -24.983944,4.08692 - node: color: '#334E6DC8' id: HalfTileOverlayGreyscale @@ -2754,21 +2553,20 @@ entities: 398: -12,27 399: -13,27 400: -14,27 - 963: -1,66 - 1565: -3,27 - 1567: -17,27 - 2716: -31,-63 + 898: -1,66 + 1422: -3,27 + 1424: -17,27 - node: color: '#33666DC8' id: HalfTileOverlayGreyscale decals: - 1401: 33,20 - 1402: 32,20 - 1403: 31,20 - 1404: 30,20 - 1405: 29,20 - 1406: 28,20 - 1407: 27,20 + 1267: 33,20 + 1268: 32,20 + 1269: 31,20 + 1270: 30,20 + 1271: 29,20 + 1272: 28,20 + 1273: 27,20 - node: color: '#52B4E996' id: HalfTileOverlayGreyscale @@ -2784,22 +2582,34 @@ entities: 491: -7,-2 492: -8,-2 550: -16,-5 - 3147: -25,-8 - 3148: -24,-8 - 3149: -23,-8 - 3150: -22,-8 - 3151: -21,-8 - 3152: -20,-8 + 2731: -25,-8 + 2732: -24,-8 + 2733: -23,-8 + 2734: -22,-8 + 2735: -21,-8 + 2736: -20,-8 + - node: + color: '#724276FF' + id: HalfTileOverlayGreyscale + decals: + 2817: 17,16 + 2829: 19,15 + 2839: 16,12 - node: color: '#79150096' id: HalfTileOverlayGreyscale decals: - 819: -76,-47 - 820: -77,-47 - 821: -78,-47 - 822: -79,-47 - 823: -80,-47 - 824: -81,-47 + 754: -76,-47 + 755: -77,-47 + 756: -78,-47 + 757: -79,-47 + 758: -80,-47 + 759: -81,-47 + - node: + color: '#9FED5896' + id: HalfTileOverlayGreyscale + decals: + 2806: -24,13 - node: color: '#A4610696' id: HalfTileOverlayGreyscale @@ -2811,49 +2621,39 @@ entities: 560: 8,-2 561: 7,-2 565: 6,-2 - 722: 21,2 - 723: 20,2 - 724: 19,2 - 725: 18,2 - 726: 17,2 - 727: 16,2 - 728: 15,2 - 1150: 26,-10 - 1151: 27,-10 - 1152: 28,-10 - 1153: 29,-10 - 1154: 30,-10 + 662: 21,2 + 663: 20,2 + 664: 19,2 + 665: 18,2 + 666: 17,2 + 667: 16,2 + 668: 15,2 + 1050: 26,-10 + 1051: 27,-10 + 1052: 28,-10 + 1053: 29,-10 + 1054: 30,-10 - node: color: '#D381C93B' id: HalfTileOverlayGreyscale decals: - 1358: 12,12 - 1359: 13,12 - 1360: 14,12 - 1361: 15,12 - 1362: 16,12 - 1363: 17,12 - 1364: 18,12 - 1365: 19,12 - 1366: 20,12 - 1368: 20,16 - 1383: 18,23 - 1384: 17,23 - 1385: 16,23 + 1251: 18,23 + 1252: 17,23 + 1253: 16,23 - node: color: '#D381C996' id: HalfTileOverlayGreyscale decals: - 1331: 29,11 - 1332: 28,11 - 1333: 27,11 - 1334: 26,11 - 1335: 25,11 - 1336: 24,11 - 1379: 24,23 - 1380: 25,23 - 1381: 20,23 - 1382: 19,23 + 1231: 29,11 + 1232: 28,11 + 1233: 27,11 + 1234: 26,11 + 1235: 25,11 + 1236: 24,11 + 1247: 24,23 + 1248: 25,23 + 1249: 20,23 + 1250: 19,23 - node: color: '#DE3A3A96' id: HalfTileOverlayGreyscale @@ -2922,35 +2722,21 @@ entities: color: '#EFB34196' id: HalfTileOverlayGreyscale decals: - 670: -5,-39 - 671: -4,-39 - 672: -1,-39 - 673: -2,-39 - 674: -6,-39 - 675: -7,-39 - 676: -8,-39 - 677: -9,-39 - 678: -10,-39 - 679: -11,-39 - 2287: -12,-39 - 2288: -14,-39 - 2703: -31,-58 - - node: - color: '#334E6DC8' - id: HalfTileOverlayGreyscale180 - decals: - 2717: -31,-64 + 635: -1,-39 + 2891: -11,-48 + 2892: -10,-48 + 2893: -9,-48 - node: color: '#33666DC8' id: HalfTileOverlayGreyscale180 decals: - 1394: 27,18 - 1395: 28,18 - 1396: 29,18 - 1397: 30,18 - 1398: 31,18 - 1399: 32,18 - 1400: 33,18 + 1260: 27,18 + 1261: 28,18 + 1262: 29,18 + 1263: 30,18 + 1264: 31,18 + 1265: 32,18 + 1266: 33,18 - node: color: '#52B4E935' id: HalfTileOverlayGreyscale180 @@ -2962,7 +2748,7 @@ entities: color: '#52B4E957' id: HalfTileOverlayGreyscale180 decals: - 2496: -49,42 + 2200: -49,42 - node: color: '#52B4E996' id: HalfTileOverlayGreyscale180 @@ -2978,12 +2764,26 @@ entities: 529: -7,0 530: -6,0 531: -5,0 - 3139: -19,-13 - 3140: -20,-13 - 3141: -21,-13 - 3142: -23,-13 - 3143: -24,-13 - 3144: -25,-13 + 2723: -19,-13 + 2724: -20,-13 + 2725: -21,-13 + 2726: -23,-13 + 2727: -24,-13 + 2728: -25,-13 + - node: + color: '#724276FF' + id: HalfTileOverlayGreyscale180 + decals: + 2813: 20,10 + 2814: 19,10 + 2815: 18,10 + 2816: 17,10 + 2818: 22,7 + 2819: 23,7 + 2838: 16,10 + 2846: 12,14 + 2847: 13,14 + 2848: 14,14 - node: color: '#79150096' id: HalfTileOverlayGreyscale180 @@ -2994,13 +2794,13 @@ entities: 37: -3,15 38: -2,15 39: -1,15 - 814: -80,-45 - 815: -79,-45 - 816: -78,-45 - 817: -77,-45 - 818: -76,-45 - 825: -81,-45 - 1742: 0,15 + 749: -80,-45 + 750: -79,-45 + 751: -78,-45 + 752: -77,-45 + 753: -76,-45 + 760: -81,-45 + 1599: 0,15 - node: color: '#9FED582F' id: HalfTileOverlayGreyscale180 @@ -3012,14 +2812,15 @@ entities: color: '#9FED5844' id: HalfTileOverlayGreyscale180 decals: - 2495: -46,42 + 2199: -46,42 - node: color: '#9FED5896' id: HalfTileOverlayGreyscale180 decals: - 2778: -20,9 - 2779: -21,9 - 2780: -22,9 + 2377: -20,9 + 2378: -21,9 + 2379: -22,9 + 2808: -23,9 - node: color: '#A4610696' id: HalfTileOverlayGreyscale180 @@ -3027,70 +2828,50 @@ entities: 553: -1,0 554: 0,0 555: 1,0 - 715: 21,0 - 716: 20,0 - 717: 19,0 - 718: 18,0 - 719: 17,0 - 720: 16,0 - 721: 15,0 - 729: 19,-12 - 730: 20,-12 - 731: 21,-12 - 732: 16,-12 - 733: 17,-12 - 1155: 23,-12 - 1156: 24,-12 - 1157: 25,-12 - 1158: 26,-12 - 1159: 27,-12 - 1160: 28,-12 - 1161: 29,-12 - 1162: 30,-12 - 1163: 31,-12 - 1204: 26,-8 - 1205: 27,-8 - 1206: 28,-8 - 1207: 29,-8 - 1208: 30,-8 - - node: - color: '#D381C93B' - id: HalfTileOverlayGreyscale180 - decals: - 1342: 23,7 - 1343: 22,7 - 1344: 21,7 - 1349: 20,10 - 1350: 19,10 - 1351: 18,10 - 1352: 17,10 - 1353: 16,10 - 1354: 15,10 - 1355: 14,10 - 1356: 13,10 - 1357: 12,10 - 1367: 20,14 - 1412: 12,14 - 1413: 13,14 - 1414: 14,14 + 655: 21,0 + 656: 20,0 + 657: 19,0 + 658: 18,0 + 659: 17,0 + 660: 16,0 + 661: 15,0 + 669: 19,-12 + 670: 20,-12 + 671: 21,-12 + 672: 16,-12 + 673: 17,-12 + 1055: 23,-12 + 1056: 24,-12 + 1057: 25,-12 + 1058: 26,-12 + 1059: 27,-12 + 1060: 28,-12 + 1061: 29,-12 + 1062: 30,-12 + 1063: 31,-12 + 1104: 26,-8 + 1105: 27,-8 + 1106: 28,-8 + 1107: 29,-8 + 1108: 30,-8 - node: color: '#D381C996' id: HalfTileOverlayGreyscale180 decals: - 1005: 24,25 - 1006: 20,25 - 1007: 19,25 - 1008: 18,25 - 1009: 17,25 - 1010: 16,25 - 1011: 15,25 - 1012: 14,25 - 1013: 13,25 - 1374: 21,18 - 1375: 22,18 - 1376: 23,18 - 1377: 24,18 - 1378: 25,18 + 940: 24,25 + 941: 20,25 + 942: 19,25 + 943: 18,25 + 944: 17,25 + 945: 16,25 + 946: 15,25 + 947: 14,25 + 948: 13,25 + 1242: 21,18 + 1243: 22,18 + 1244: 23,18 + 1245: 24,18 + 1246: 25,18 - node: color: '#DE3A3A96' id: HalfTileOverlayGreyscale180 @@ -3133,7 +2914,7 @@ entities: 429: 14,20 471: -18,-3 472: -19,-3 - 2493: -43,42 + 2197: -43,42 - node: color: '#EDD75E93' id: HalfTileOverlayGreyscale180 @@ -3152,36 +2933,46 @@ entities: color: '#EFB3415D' id: HalfTileOverlayGreyscale180 decals: - 2494: -42,42 - - node: - color: '#EFB34196' - id: HalfTileOverlayGreyscale180 - decals: - 2719: -28,-60 - 2720: -27,-60 - 2721: -26,-60 + 2198: -42,42 - node: color: '#334E6DC8' id: HalfTileOverlayGreyscale270 decals: - 959: -2,63 - 960: -2,64 - 961: -2,65 - 962: -2,66 - 1558: -5,28 - 1561: -16,28 - 1570: -5,34 - 1571: -16,34 - 1635: -5,36 - 1636: -16,36 + 894: -2,63 + 895: -2,64 + 896: -2,65 + 897: -2,66 + 1415: -5,28 + 1418: -16,28 + 1427: -5,34 + 1428: -16,34 + 1492: -5,36 + 1493: -16,36 + 2968: -10,-31 + 2969: -10,-32 - node: color: '#52B4E996' id: HalfTileOverlayGreyscale270 decals: 524: -5,-4 525: -5,-3 - 3145: -26,-12 - 3146: -26,-9 + 2729: -26,-12 + 2730: -26,-9 + 2956: -6,-28 + 2957: -6,-29 + - node: + color: '#724276FF' + id: HalfTileOverlayGreyscale270 + decals: + 2820: 21,8 + 2821: 21,9 + 2828: 21,17 + - node: + color: '#9FED5896' + id: HalfTileOverlayGreyscale270 + decals: + 2966: -12,-28 + 2967: -12,-29 - node: color: '#A4610696' id: HalfTileOverlayGreyscale270 @@ -3194,24 +2985,26 @@ entities: 582: 11,-4 583: 11,-3 584: 11,-2 - 998: 27,0 - 999: 27,1 - 1000: 27,2 - - node: - color: '#D381C93B' - id: HalfTileOverlayGreyscale270 - decals: - 1346: 21,8 - 1347: 21,9 - 1369: 21,13 - 1370: 21,17 + 933: 27,0 + 934: 27,1 + 935: 27,2 + 2954: -10,-28 + 2955: -10,-29 - node: color: '#D381C996' id: HalfTileOverlayGreyscale270 decals: - 1867: 30,21 - 1868: 30,22 - 1869: 30,23 + 1724: 30,21 + 1725: 30,22 + 1726: 30,23 + 2952: -8,-28 + 2953: -8,-29 + - node: + color: '#D4D4D428' + id: HalfTileOverlayGreyscale270 + decals: + 2972: -12,-31 + 2973: -12,-32 - node: color: '#DE3A3A96' id: HalfTileOverlayGreyscale270 @@ -3251,6 +3044,8 @@ entities: 468: -20,-3 469: -20,-2 470: -20,-1 + 2950: -6,-31 + 2951: -6,-32 - node: color: '#EDD75E93' id: HalfTileOverlayGreyscale270 @@ -3266,25 +3061,26 @@ entities: 588: 9,-30 589: 9,-29 590: 9,-28 - 703: -10,-37 - 704: -10,-36 - 705: -10,-35 - 706: -10,-34 - 2702: -31,-60 + 2889: -14,-49 + 2890: -14,-50 + 2944: -8,-32 + 2945: -8,-31 - node: color: '#334E6DC8' id: HalfTileOverlayGreyscale90 decals: - 964: 0,66 - 965: 0,65 - 966: 0,64 - 967: 0,63 - 1559: -4,28 - 1560: -15,28 - 1569: -4,34 - 1572: -15,34 - 1637: -15,36 - 1638: -4,36 + 899: 0,66 + 900: 0,65 + 901: 0,64 + 902: 0,63 + 1416: -4,28 + 1417: -15,28 + 1426: -4,34 + 1429: -15,34 + 1494: -15,36 + 1495: -4,36 + 2970: -12,-31 + 2971: -12,-32 - node: color: '#52B4E996' id: HalfTileOverlayGreyscale90 @@ -3295,37 +3091,55 @@ entities: 547: -15,-7 548: -15,-6 549: -15,-5 - 3153: -18,-9 - 3154: -18,-12 + 2737: -18,-9 + 2738: -18,-12 + 2958: -8,-28 + 2959: -8,-29 + - node: + color: '#724276FF' + id: HalfTileOverlayGreyscale90 + decals: + 2822: 23,12 + 2823: 23,13 + 2824: 23,14 + 2825: 23,15 + 2826: 23,16 + 2827: 23,17 + 2849: 15,15 + 2850: 15,16 + 2851: 15,17 + 2852: 15,18 + - node: + color: '#9FED5896' + id: HalfTileOverlayGreyscale90 + decals: + 2807: -24,8 + 2964: -14,-28 + 2965: -14,-29 - node: color: '#A4610696' id: HalfTileOverlayGreyscale90 decals: 564: 5,-1 - 1149: 21,-4 + 1049: 21,-4 + 2962: -12,-28 + 2963: -12,-29 - node: cleanable: True color: '#A4610696' id: HalfTileOverlayGreyscale90 decals: - 1147: 21,-6 - 1148: 21,-5 - - node: - color: '#D381C93B' - id: HalfTileOverlayGreyscale90 - decals: - 1392: 23,17 - 1416: 15,15 - 1417: 15,16 - 1418: 15,17 - 1419: 15,18 + 1047: 21,-6 + 1048: 21,-5 - node: color: '#D381C996' id: HalfTileOverlayGreyscale90 decals: - 1870: 32,21 - 1871: 32,22 - 1872: 32,23 + 1727: 32,21 + 1728: 32,22 + 1729: 32,23 + 2960: -10,-28 + 2961: -10,-29 - node: color: '#DE3A3A96' id: HalfTileOverlayGreyscale90 @@ -3373,7 +3187,9 @@ entities: 465: -17,-3 466: -17,-2 467: -17,-1 - 2657: 14,21 + 2341: 14,21 + 2948: -8,-31 + 2949: -8,-32 - node: color: '#EDD75E93' id: HalfTileOverlayGreyscale90 @@ -3392,17 +3208,15 @@ entities: 591: 12,-30 592: 12,-29 593: 12,-28 - 707: -6,-37 - 708: -6,-36 - 709: -6,-35 - 710: -6,-34 - 2704: -30,-60 - 2705: -30,-59 + 2894: -8,-49 + 2895: -8,-50 + 2946: -10,-31 + 2947: -10,-32 - node: color: '#FFFFFFFF' id: HatchSmall decals: - 1610: -3,32 + 1467: -3,32 - node: angle: -3.141592653589793 rad color: '#FFFFFFFF' @@ -3414,9 +3228,9 @@ entities: color: '#FFFFFFFF' id: LoadingArea decals: - 1142: 16,-4 - 1237: 34,-7 - 2209: 3,-30 + 1042: 16,-4 + 1137: 34,-7 + 2066: 3,-30 - node: color: '#FFFFFFFF' id: LoadingArea @@ -3426,100 +3240,97 @@ entities: color: '#FFFFFFFF' id: MiniTileDarkLineE decals: - 1708: -57,-57 + 1565: -57,-57 - node: color: '#FFFFFFFF' id: MiniTileDarkLineS decals: - 1441: -27,38 - 1702: -65,-60 + 1298: -27,38 + 1559: -65,-60 - node: color: '#FFFFFFFF' id: MiniTileSteelLineE decals: - 1719: -69,-55 + 1576: -69,-55 - node: color: '#FFFFFFFF' id: MiniTileSteelLineW decals: - 1709: -56,-54 - - node: - color: '#EFB34196' - id: MiniTileWhiteLineE - decals: - 2380: -11,-41 + 1566: -56,-54 - node: color: '#FFFFFFFF' id: MiniTileWhiteLineE decals: - 1669: 25,26 + 1526: 25,26 - node: color: '#FFFFFFFF' id: MiniTileWhiteLineN decals: - 1442: -27,38 + 1299: -27,38 - node: color: '#FFFFFFFF' id: MiniTileWhiteLineS decals: - 1670: 26,32 - - node: - color: '#EFB34196' - id: MiniTileWhiteLineW - decals: - 2381: -5,-41 + 1527: 26,32 - node: color: '#D381C996' id: MonoOverlay decals: - 2542: 29,21 - 2543: 28,22 - 2544: 29,23 - 2545: 27,23 - 2546: 27,21 + 2241: 29,21 + 2242: 28,22 + 2243: 29,23 + 2244: 27,23 + 2245: 27,21 - node: color: '#334E6DC8' id: QuarterTileOverlayGreyscale decals: - 1557: -5,27 - 1563: -16,27 - 1566: -2,27 - 1644: -16,38 - 1645: -16,41 - 1646: -16,40 - 1647: -16,39 + 1414: -5,27 + 1420: -16,27 + 1423: -2,27 + 1501: -16,38 + 1502: -16,41 + 1503: -16,40 + 1504: -16,39 - node: color: '#52B4E996' id: QuarterTileOverlayGreyscale decals: 518: -8,-4 551: -15,-5 - 3168: -22,-12 - 3169: -22,-10 + 2752: -22,-12 + 2753: -22,-10 + - node: + color: '#724276FF' + id: QuarterTileOverlayGreyscale + decals: + 2830: 20,15 + 2831: 21,16 + 2836: 17,12 - node: color: '#79150096' id: QuarterTileOverlayGreyscale decals: - 826: -81,-45 - 827: -80,-45 - 828: -79,-45 - 829: -78,-45 - 830: -77,-45 - 831: -76,-45 - 2061: -52,13 - 2062: -53,13 - 2063: -54,13 - 2064: -55,13 - 2065: -56,13 - 2066: -56,21 - 2067: -55,21 - 2068: -54,21 - 2069: -53,21 - 2070: -52,21 - 2081: -51,13 - 2082: -51,14 - 2087: -51,22 - 2088: -51,21 + 761: -81,-45 + 762: -80,-45 + 763: -79,-45 + 764: -78,-45 + 765: -77,-45 + 766: -76,-45 + 1918: -52,13 + 1919: -53,13 + 1920: -54,13 + 1921: -55,13 + 1922: -56,13 + 1923: -56,21 + 1924: -55,21 + 1925: -54,21 + 1926: -53,21 + 1927: -52,21 + 1938: -51,13 + 1939: -51,14 + 1944: -51,22 + 1945: -51,21 - node: color: '#9FED5896' id: QuarterTileOverlayGreyscale @@ -3528,157 +3339,150 @@ entities: 17: -24,3 18: -28,3 19: -29,3 - 1105: -25,3 - 1116: -26,3 - 1117: -27,3 + 1016: -25,3 + 1017: -26,3 + 1018: -27,3 - node: color: '#A4610696' id: QuarterTileOverlayGreyscale decals: 562: 3,-2 585: 11,-9 - - node: - color: '#D381C93B' - id: QuarterTileOverlayGreyscale - decals: - 1345: 21,7 - 1372: 21,12 - 1373: 21,16 - node: color: '#D381C996' id: QuarterTileOverlayGreyscale decals: - 785: 8,7 - 786: 8,8 - 787: 8,9 - 788: 8,10 - 789: 8,11 - 790: 8,12 - 791: 8,13 - 792: 8,14 - 793: 8,15 - 794: 8,16 - 795: 8,17 - 796: 8,18 - 797: 8,19 - 798: 8,20 - 799: 8,21 - 800: 8,22 - 801: 8,23 + 720: 8,7 + 721: 8,8 + 722: 8,9 + 723: 8,10 + 724: 8,11 + 725: 8,12 + 726: 8,13 + 727: 8,14 + 728: 8,15 + 729: 8,16 + 730: 8,17 + 731: 8,18 + 732: 8,19 + 733: 8,20 + 734: 8,21 + 735: 8,22 + 736: 8,23 - node: color: '#D4D4D428' id: QuarterTileOverlayGreyscale decals: - 1965: -12,4 - 1966: -11,4 - 1967: -10,4 - 1968: -9,4 - 1969: -8,4 - 1970: -7,4 - 1971: -6,4 - 1990: -22,3 - 1991: -22,4 - 1992: -22,5 - 1993: -22,6 - 1994: -22,7 - 2015: -44,-3 - 2118: 11,-19 - 2119: 11,-18 - 2120: 11,-17 - 2121: 10,-19 - 2122: 9,-19 - 2123: 8,-19 - 2124: 7,-19 - 2125: 5,-19 - 2126: 6,-19 - 2127: 4,-19 - 2128: 3,-19 - 2129: 2,-19 - 2130: 1,-19 - 2131: 0,-19 - 2132: -1,-19 - 2133: -2,-19 - 2134: -3,-19 - 2135: -4,-19 - 2136: 11,-16 - 2137: 11,-15 - 2138: 11,-14 - 2162: -37,34 - 2163: -37,33 - 2164: -37,32 - 2165: -37,31 - 2166: -37,30 - 2167: -37,29 - 2168: -37,28 - 2169: -37,27 - 2170: -37,26 - 2171: -37,25 - 2172: -37,24 - 2173: -37,23 - 2174: -37,22 - 2175: -37,21 - 2176: -37,20 - 2177: -37,19 - 2178: -37,18 - 2179: -37,17 - 2180: -37,16 - 2181: -37,15 - 2182: -38,15 - 2570: 7,34 - 2578: 13,27 - 2579: 14,27 - 2580: 15,27 - 2581: 16,27 - 2582: 17,27 - 2583: 18,27 - 2584: 19,27 - 2585: 20,27 - 2586: 21,27 - 2587: 21,28 - 2588: 21,29 - 2589: 21,30 - 2590: 21,31 - 2601: 24,40 - 2602: 23,40 - 2603: 22,40 - 2604: 21,40 - 2605: 20,40 - 2606: 20,39 - 2607: 20,38 - 2608: 20,37 - 2609: 20,36 - 2610: 20,35 - 2611: 20,34 - 2612: 20,33 - 2799: 7,35 - 2800: 7,36 - 2803: -58,9 - 2804: -58,8 - 2805: -59,8 - 2806: -60,8 - 2825: -46,-3 - 2826: -46,-5 - 2827: -46,-4 - 2828: -46,-6 - 2829: -46,-7 - 2830: -46,-8 - 2831: -46,-9 - 2832: -47,-9 + 1822: -12,4 + 1823: -11,4 + 1824: -10,4 + 1825: -9,4 + 1826: -8,4 + 1827: -7,4 + 1828: -6,4 + 1847: -22,3 + 1848: -22,4 + 1849: -22,5 + 1850: -22,6 + 1851: -22,7 + 1872: -44,-3 + 1975: 11,-19 + 1976: 11,-18 + 1977: 11,-17 + 1978: 10,-19 + 1979: 9,-19 + 1980: 8,-19 + 1981: 7,-19 + 1982: 5,-19 + 1983: 6,-19 + 1984: 4,-19 + 1985: 3,-19 + 1986: 2,-19 + 1987: 1,-19 + 1988: 0,-19 + 1989: -1,-19 + 1990: -2,-19 + 1991: -3,-19 + 1992: -4,-19 + 1993: 11,-16 + 1994: 11,-15 + 1995: 11,-14 + 2019: -37,34 + 2020: -37,33 + 2021: -37,32 + 2022: -37,31 + 2023: -37,30 + 2024: -37,29 + 2025: -37,28 + 2026: -37,27 + 2027: -37,26 + 2028: -37,25 + 2029: -37,24 + 2030: -37,23 + 2031: -37,22 + 2032: -37,21 + 2033: -37,20 + 2034: -37,19 + 2035: -37,18 + 2036: -37,17 + 2037: -37,16 + 2038: -37,15 + 2039: -38,15 + 2266: 7,34 + 2274: 13,27 + 2275: 14,27 + 2276: 15,27 + 2277: 16,27 + 2278: 17,27 + 2279: 18,27 + 2280: 19,27 + 2281: 20,27 + 2282: 21,27 + 2283: 21,28 + 2284: 21,29 + 2285: 21,30 + 2286: 21,31 + 2297: 24,40 + 2298: 23,40 + 2299: 22,40 + 2300: 21,40 + 2301: 20,40 + 2302: 20,39 + 2303: 20,38 + 2304: 20,37 + 2305: 20,36 + 2306: 20,35 + 2307: 20,34 + 2308: 20,33 + 2389: 7,35 + 2390: 7,36 + 2393: -58,9 + 2394: -58,8 + 2395: -59,8 + 2396: -60,8 + 2415: -46,-3 + 2416: -46,-5 + 2417: -46,-4 + 2418: -46,-6 + 2419: -46,-7 + 2420: -46,-8 + 2421: -46,-9 + 2422: -47,-9 - node: color: '#D4D4D496' id: QuarterTileOverlayGreyscale decals: - 2019: -58,10 - 2020: -57,10 - 2021: -56,10 - 2022: -55,10 - 2023: -54,10 - 2024: -53,10 - 2025: -52,10 - 2026: -51,10 - 2027: -50,10 - 2028: -49,10 - 2029: -48,10 + 1876: -58,10 + 1877: -57,10 + 1878: -56,10 + 1879: -55,10 + 1880: -54,10 + 1881: -53,10 + 1882: -52,10 + 1883: -51,10 + 1884: -50,10 + 1885: -49,10 + 1886: -48,10 - node: color: '#DE3A3A96' id: QuarterTileOverlayGreyscale @@ -3691,7 +3495,7 @@ entities: 348: -37,37 430: 12,20 475: -17,-1 - 2517: -49,45 + 2221: -49,45 - node: color: '#EDD75E93' id: QuarterTileOverlayGreyscale @@ -3703,19 +3507,19 @@ entities: color: '#EFB34196' id: QuarterTileOverlayGreyscale decals: - 638: -4,-2 - 639: -4,-5 - 1120: 2,-28 - 1121: 1,-28 - 1122: 0,-28 - 1123: -1,-28 + 631: -4,-2 + 632: -4,-5 + 1020: 2,-28 + 1021: 1,-28 + 1022: 0,-28 + 1023: -1,-28 - node: color: '#334E6DC8' id: QuarterTileOverlayGreyscale180 decals: - 2796: 11,38 - 2797: 12,38 - 2798: 12,39 + 2386: 11,38 + 2387: 12,38 + 2388: 12,39 - node: color: '#52B4E996' id: QuarterTileOverlayGreyscale180 @@ -3741,35 +3545,35 @@ entities: 544: -27,1 545: -26,1 546: -25,1 - 3072: -29,-14 - 3073: -28,-14 - 3074: -28,-13 - 3075: -28,-12 - 3172: -23,-11 - 3173: -23,-9 + 2656: -29,-14 + 2657: -28,-14 + 2658: -28,-13 + 2659: -28,-12 + 2756: -23,-11 + 2757: -23,-9 - node: color: '#79150096' id: QuarterTileOverlayGreyscale180 decals: - 2071: -56,23 - 2072: -54,23 - 2073: -55,23 - 2074: -52,23 - 2075: -53,23 - 2076: -56,15 - 2077: -55,15 - 2078: -54,15 - 2079: -53,15 - 2080: -52,15 - 2083: -57,14 - 2084: -57,15 - 2085: -57,22 - 2086: -57,23 + 1928: -56,23 + 1929: -54,23 + 1930: -55,23 + 1931: -52,23 + 1932: -53,23 + 1933: -56,15 + 1934: -55,15 + 1935: -54,15 + 1936: -53,15 + 1937: -52,15 + 1940: -57,14 + 1941: -57,15 + 1942: -57,22 + 1943: -57,23 - node: color: '#9FED5896' id: QuarterTileOverlayGreyscale180 decals: - 2781: -23,9 + 2809: -24,9 - node: color: '#A4610696' id: QuarterTileOverlayGreyscale180 @@ -3780,117 +3584,117 @@ entities: 575: 16,-8 576: 15,-8 577: 14,-8 - 802: 13,0 - 803: 13,1 - 804: 13,2 - 805: 13,3 - 806: 13,4 - 2640: 5,1 + 737: 13,0 + 738: 13,1 + 739: 13,2 + 740: 13,3 + 741: 13,4 + 2336: 5,1 - node: color: '#D381C996' id: QuarterTileOverlayGreyscale180 decals: - 1292: 39,7 - 1293: 38,7 - 1294: 37,7 - 1295: 36,7 - 1296: 35,7 - 1297: 40,8 - 1298: 40,9 - 1299: 40,10 + 1192: 39,7 + 1193: 38,7 + 1194: 37,7 + 1195: 36,7 + 1196: 35,7 + 1197: 40,8 + 1198: 40,9 + 1199: 40,10 - node: color: '#D4D4D428' id: QuarterTileOverlayGreyscale180 decals: - 1904: 10,24 - 1905: 10,25 - 1906: 11,25 - 1909: -11,25 - 1910: -12,25 - 1911: -13,25 - 1912: -14,25 - 1913: -15,25 - 1914: -16,25 - 1915: -17,25 - 1916: -18,25 - 1917: -19,25 - 1918: -20,25 - 1919: -21,25 - 1920: -22,25 - 1921: -23,25 - 1922: -24,25 - 1923: -25,25 - 1924: -26,25 - 1925: -27,25 - 1926: -28,25 - 1927: -29,25 - 1928: -30,25 - 1929: -31,25 - 1930: -32,25 - 1931: -33,25 - 1932: -34,25 - 1933: -35,25 - 1934: -35,24 - 1935: -35,23 - 1936: -35,22 - 1937: -35,21 - 1938: -35,20 - 1939: -35,19 - 1940: -35,18 - 1941: -35,17 - 1942: -35,16 - 1943: -35,15 - 1944: -35,14 - 1945: -35,12 - 1946: -35,13 - 1947: -35,11 - 1948: -35,10 - 1949: -35,9 - 1950: -35,7 - 1951: -35,8 - 1952: -35,6 - 1953: -35,5 - 2002: -40,5 - 2003: -41,5 - 2004: -42,5 - 2005: -43,5 - 2006: -44,5 - 2007: -45,4 - 2008: -45,3 - 2009: -45,2 - 2010: -45,1 - 2011: -45,0 - 2012: -45,-1 - 2013: -45,-2 - 2105: -47,13 - 2106: -46,13 - 2107: -45,13 - 2108: -44,13 - 2109: -43,13 - 2110: -42,13 - 2111: -40,13 - 2112: -41,13 - 2468: -28,1 - 2469: -29,1 - 2470: -30,1 - 2471: -31,1 - 2472: -32,1 - 2473: -33,1 - 2613: 24,33 - 2614: 25,33 - 2615: 26,33 - 2616: 27,33 - 2617: 27,34 - 2618: 27,35 - 2619: 33,35 - 2620: 32,35 - 2621: 31,35 - 2622: 30,35 - 2623: 29,35 - 2816: -54,7 - 2817: -55,7 - 2818: -55,6 - 2819: -56,6 + 1761: 10,24 + 1762: 10,25 + 1763: 11,25 + 1766: -11,25 + 1767: -12,25 + 1768: -13,25 + 1769: -14,25 + 1770: -15,25 + 1771: -16,25 + 1772: -17,25 + 1773: -18,25 + 1774: -19,25 + 1775: -20,25 + 1776: -21,25 + 1777: -22,25 + 1778: -23,25 + 1779: -24,25 + 1780: -25,25 + 1781: -26,25 + 1782: -27,25 + 1783: -28,25 + 1784: -29,25 + 1785: -30,25 + 1786: -31,25 + 1787: -32,25 + 1788: -33,25 + 1789: -34,25 + 1790: -35,25 + 1791: -35,24 + 1792: -35,23 + 1793: -35,22 + 1794: -35,21 + 1795: -35,20 + 1796: -35,19 + 1797: -35,18 + 1798: -35,17 + 1799: -35,16 + 1800: -35,15 + 1801: -35,14 + 1802: -35,12 + 1803: -35,13 + 1804: -35,11 + 1805: -35,10 + 1806: -35,9 + 1807: -35,7 + 1808: -35,8 + 1809: -35,6 + 1810: -35,5 + 1859: -40,5 + 1860: -41,5 + 1861: -42,5 + 1862: -43,5 + 1863: -44,5 + 1864: -45,4 + 1865: -45,3 + 1866: -45,2 + 1867: -45,1 + 1868: -45,0 + 1869: -45,-1 + 1870: -45,-2 + 1962: -47,13 + 1963: -46,13 + 1964: -45,13 + 1965: -44,13 + 1966: -43,13 + 1967: -42,13 + 1968: -40,13 + 1969: -41,13 + 2172: -28,1 + 2173: -29,1 + 2174: -30,1 + 2175: -31,1 + 2176: -32,1 + 2177: -33,1 + 2309: 24,33 + 2310: 25,33 + 2311: 26,33 + 2312: 27,33 + 2313: 27,34 + 2314: 27,35 + 2315: 33,35 + 2316: 32,35 + 2317: 31,35 + 2318: 30,35 + 2319: 29,35 + 2406: -54,7 + 2407: -55,7 + 2408: -55,6 + 2409: -56,6 - node: color: '#DE3A3A96' id: QuarterTileOverlayGreyscale180 @@ -3922,35 +3726,31 @@ entities: 622: 3,-31 623: 3,-30 624: 3,-29 - 838: -81,-44 - 839: -80,-44 - 840: -79,-44 - 841: -78,-44 - 842: -77,-44 - 1124: -1,-21 - 1125: 0,-21 - 1126: 1,-21 - 1127: 3,-21 - 1128: 4,-21 - 1134: 2,-21 - 2327: -12,-36 - 2328: -12,-35 - 2329: -12,-34 - 2330: -12,-33 + 773: -81,-44 + 774: -80,-44 + 775: -79,-44 + 776: -78,-44 + 777: -77,-44 + 1024: -1,-21 + 1025: 0,-21 + 1026: 1,-21 + 1027: 3,-21 + 1028: 4,-21 + 1034: 2,-21 - node: color: '#334E6DC8' id: QuarterTileOverlayGreyscale270 decals: - 1954: -4,25 - 1955: -3,25 - 1956: -2,25 - 1957: -1,25 - 1958: 0,25 - 2791: 4,39 - 2792: 4,38 - 2793: 5,38 - 2794: 6,38 - 2795: 7,38 + 1811: -4,25 + 1812: -3,25 + 1813: -2,25 + 1814: -1,25 + 1815: 0,25 + 2381: 4,39 + 2382: 4,38 + 2383: 5,38 + 2384: 6,38 + 2385: 7,38 - node: color: '#52B4E996' id: QuarterTileOverlayGreyscale270 @@ -3966,121 +3766,121 @@ entities: 507: -13,-7 515: -6,-5 523: -10,-2 - 3076: -31,-14 - 3077: -32,-14 - 3078: -33,-14 - 3079: -34,-14 - 3080: -35,-14 - 3081: -35,-13 - 3164: -20,-11 - 3167: -20,-9 - 3178: -24,-11 - 3179: -24,-9 + 2660: -31,-14 + 2661: -32,-14 + 2662: -33,-14 + 2663: -34,-14 + 2664: -35,-14 + 2665: -35,-13 + 2748: -20,-11 + 2751: -20,-9 + 2762: -24,-11 + 2763: -24,-9 + - node: + color: '#724276FF' + id: QuarterTileOverlayGreyscale270 + decals: + 2832: 21,10 + 2837: 17,14 - node: color: '#79150096' id: QuarterTileOverlayGreyscale270 decals: - 832: -81,-47 - 833: -80,-47 - 834: -79,-47 - 835: -78,-47 - 836: -77,-47 - 837: -76,-47 + 767: -81,-47 + 768: -80,-47 + 769: -79,-47 + 770: -78,-47 + 771: -77,-47 + 772: -76,-47 - node: color: '#A4610696' id: QuarterTileOverlayGreyscale270 decals: 567: 3,0 586: 11,0 - 1164: 32,-12 - 2636: 8,1 - 2637: 9,1 - 2638: 10,1 - 2639: 11,1 - - node: - color: '#D381C93B' - id: QuarterTileOverlayGreyscale270 - decals: - 1348: 21,10 - 1371: 21,14 + 1064: 32,-12 + 2332: 8,1 + 2333: 9,1 + 2334: 10,1 + 2335: 11,1 - node: color: '#D381C996' id: QuarterTileOverlayGreyscale270 decals: - 1337: 25,7 - 1338: 26,7 - 1339: 27,7 - 1340: 28,7 - 1341: 29,7 - 1411: 24,7 + 1237: 25,7 + 1238: 26,7 + 1239: 27,7 + 1240: 28,7 + 1241: 29,7 + 1277: 24,7 - node: color: '#D4D4D428' id: QuarterTileOverlayGreyscale270 decals: - 1895: -9,25 - 1896: -8,25 - 1897: -7,25 - 1898: -6,25 - 1899: -5,25 - 1900: 1,25 - 1901: 2,25 - 1902: 8,25 - 1903: 8,24 - 1907: 6,25 - 1908: 7,25 - 1962: 8,6 - 1963: 8,5 - 1964: 8,4 - 1995: -37,1 - 1996: -37,2 - 1997: -37,3 - 1998: -37,4 - 1999: -37,5 - 2000: -38,5 - 2001: -39,5 - 2139: 11,-12 - 2140: 10,-12 - 2141: 9,-12 - 2142: 8,-12 - 2722: -46,4 - 2723: -46,3 - 2724: -46,2 - 2725: -46,1 - 2726: -46,0 - 2727: -46,-1 - 2728: -46,-2 - 2807: -46,5 - 2808: -47,5 - 2809: -48,5 - 2810: -49,5 - 2811: -51,5 - 2812: -50,5 - 2813: -51,6 - 2814: -51,7 - 2815: -52,7 - 2820: -57,6 - 2821: -58,6 - 2822: -58,7 - 2823: -59,7 - 2824: -60,7 + 1752: -9,25 + 1753: -8,25 + 1754: -7,25 + 1755: -6,25 + 1756: -5,25 + 1757: 1,25 + 1758: 2,25 + 1759: 8,25 + 1760: 8,24 + 1764: 6,25 + 1765: 7,25 + 1819: 8,6 + 1820: 8,5 + 1821: 8,4 + 1852: -37,1 + 1853: -37,2 + 1854: -37,3 + 1855: -37,4 + 1856: -37,5 + 1857: -38,5 + 1858: -39,5 + 1996: 11,-12 + 1997: 10,-12 + 1998: 9,-12 + 1999: 8,-12 + 2350: -46,4 + 2351: -46,3 + 2352: -46,2 + 2353: -46,1 + 2354: -46,0 + 2355: -46,-1 + 2356: -46,-2 + 2397: -46,5 + 2398: -47,5 + 2399: -48,5 + 2400: -49,5 + 2401: -51,5 + 2402: -50,5 + 2403: -51,6 + 2404: -51,7 + 2405: -52,7 + 2410: -57,6 + 2411: -58,6 + 2412: -58,7 + 2413: -59,7 + 2414: -60,7 - node: color: '#D4D4D496' id: QuarterTileOverlayGreyscale270 decals: - 2041: -56,15 - 2042: -55,15 - 2043: -54,15 - 2044: -52,15 - 2045: -53,15 - 2046: -52,23 - 2047: -53,23 - 2048: -54,23 - 2049: -55,23 - 2050: -56,23 - 2089: -51,23 - 2090: -51,22 - 2091: -51,15 - 2092: -51,14 + 1898: -56,15 + 1899: -55,15 + 1900: -54,15 + 1901: -52,15 + 1902: -53,15 + 1903: -52,23 + 1904: -53,23 + 1905: -54,23 + 1906: -55,23 + 1907: -56,23 + 1946: -51,23 + 1947: -51,22 + 1948: -51,15 + 1949: -51,14 - node: color: '#DE3A3A96' id: QuarterTileOverlayGreyscale270 @@ -4133,52 +3933,47 @@ entities: 618: -2,-31 619: -1,-31 620: 0,-31 - 1129: 8,-21 - 1130: 9,-21 - 1131: 11,-21 - 1132: 12,-21 - 1133: 13,-21 - 1959: 5,25 - 1960: 4,25 - 1961: 3,25 - 2323: -14,-36 - 2324: -14,-35 - 2325: -14,-34 - 2326: -14,-33 - 2709: -31,-59 + 1029: 8,-21 + 1030: 9,-21 + 1031: 11,-21 + 1032: 12,-21 + 1033: 13,-21 + 1816: 5,25 + 1817: 4,25 + 1818: 3,25 - node: color: '#334E6DC8' id: QuarterTileOverlayGreyscale90 decals: - 1562: -15,27 - 1564: -4,27 - 1568: -18,27 - 1639: -4,37 - 1640: -4,38 - 1641: -4,39 - 1642: -4,40 - 1643: -4,41 - 1650: -19,27 - 1651: -20,27 - 1652: -21,27 - 1653: -22,27 - 1654: -23,27 - 1655: -24,27 + 1419: -15,27 + 1421: -4,27 + 1425: -18,27 + 1496: -4,37 + 1497: -4,38 + 1498: -4,39 + 1499: -4,40 + 1500: -4,41 + 1507: -19,27 + 1508: -20,27 + 1509: -21,27 + 1510: -22,27 + 1511: -23,27 + 1512: -24,27 - node: color: '#52B4E957' id: QuarterTileOverlayGreyscale90 decals: - 2030: -58,10 - 2031: -57,10 - 2032: -56,10 - 2033: -55,10 - 2034: -54,10 - 2035: -53,10 - 2036: -52,10 - 2037: -51,10 - 2038: -50,10 - 2039: -49,10 - 2040: -48,10 + 1887: -58,10 + 1888: -57,10 + 1889: -56,10 + 1890: -55,10 + 1891: -54,10 + 1892: -53,10 + 1893: -52,10 + 1894: -51,10 + 1895: -50,10 + 1896: -49,10 + 1897: -48,10 - node: color: '#52B4E996' id: QuarterTileOverlayGreyscale90 @@ -4186,10 +3981,16 @@ entities: 497: -9,-2 517: -9,-4 522: -11,-3 - 3163: -21,-12 - 3166: -21,-10 - 3176: -25,-10 - 3177: -25,-12 + 2747: -21,-12 + 2750: -21,-10 + 2760: -25,-10 + 2761: -25,-12 + - node: + color: '#724276FF' + id: QuarterTileOverlayGreyscale90 + decals: + 2833: 18,15 + 2834: 23,11 - node: color: '#A4610696' id: QuarterTileOverlayGreyscale90 @@ -4199,140 +4000,135 @@ entities: 571: 16,-2 572: 15,-2 573: 14,-2 - - node: - color: '#D381C93B' - id: QuarterTileOverlayGreyscale90 - decals: - 1393: 23,16 - node: color: '#D381C996' id: QuarterTileOverlayGreyscale90 decals: - 771: 10,23 - 772: 10,22 - 773: 10,21 - 774: 10,20 - 775: 10,19 - 776: 10,18 - 777: 10,14 - 778: 10,13 - 779: 10,12 - 780: 10,11 - 781: 10,10 - 782: 10,9 - 783: 10,8 - 784: 10,7 + 706: 10,23 + 707: 10,22 + 708: 10,21 + 709: 10,20 + 710: 10,19 + 711: 10,18 + 712: 10,14 + 713: 10,13 + 714: 10,12 + 715: 10,11 + 716: 10,10 + 717: 10,9 + 718: 10,8 + 719: 10,7 - node: color: '#D4D4D428' id: QuarterTileOverlayGreyscale90 decals: - 1972: 0,4 - 1973: 1,4 - 1974: 2,4 - 1975: 4,4 - 1976: 3,4 - 1977: 5,4 - 1978: 6,4 - 1979: -14,3 - 1980: -15,3 - 1981: -16,3 - 1982: -17,3 - 1983: -18,3 - 1984: -19,3 - 1985: -20,3 - 1986: -20,4 - 1987: -20,5 - 1988: -20,6 - 1989: -20,7 - 2014: -45,-3 - 2016: -44,-3 - 2017: -44,-4 - 2018: -44,-5 - 2097: -47,15 - 2098: -46,15 - 2099: -45,15 - 2100: -44,15 - 2101: -43,15 - 2102: -42,15 - 2103: -41,15 - 2104: -40,15 - 2143: 9,-3 - 2144: 9,-4 - 2145: 9,-5 - 2146: 9,-6 - 2147: 9,-7 - 2148: 9,-8 - 2149: 9,-9 - 2150: 9,-10 - 2151: 10,-10 - 2152: -33,27 - 2153: -34,27 - 2154: -35,27 - 2155: -35,28 - 2156: -35,29 - 2157: -35,30 - 2158: -35,31 - 2159: -35,32 - 2160: -35,33 - 2161: -35,34 - 2432: 10,6 - 2433: 10,5 - 2434: 10,4 - 2435: 11,4 - 2436: 12,4 - 2437: 13,4 - 2438: -40,7 - 2439: -41,7 - 2440: -42,7 - 2441: -43,7 - 2442: -44,7 - 2443: -45,7 - 2444: -45,8 - 2445: -46,8 - 2446: -47,8 - 2571: 11,35 - 2572: 11,34 - 2573: 11,33 - 2574: 11,32 - 2575: 11,31 - 2576: 11,30 - 2577: 11,29 - 2591: 24,27 - 2592: 23,27 - 2593: 23,28 - 2594: 23,29 - 2595: 23,30 - 2596: 23,31 - 2597: 27,40 - 2598: 27,38 - 2599: 27,39 - 2600: 26,40 - 2624: 33,38 - 2625: 32,38 - 2626: 31,38 - 2627: 30,38 - 2628: 29,38 - 2801: 11,36 - 2847: -44,-7 - 2848: -44,-8 + 1829: 0,4 + 1830: 1,4 + 1831: 2,4 + 1832: 4,4 + 1833: 3,4 + 1834: 5,4 + 1835: 6,4 + 1836: -14,3 + 1837: -15,3 + 1838: -16,3 + 1839: -17,3 + 1840: -18,3 + 1841: -19,3 + 1842: -20,3 + 1843: -20,4 + 1844: -20,5 + 1845: -20,6 + 1846: -20,7 + 1871: -45,-3 + 1873: -44,-3 + 1874: -44,-4 + 1875: -44,-5 + 1954: -47,15 + 1955: -46,15 + 1956: -45,15 + 1957: -44,15 + 1958: -43,15 + 1959: -42,15 + 1960: -41,15 + 1961: -40,15 + 2000: 9,-3 + 2001: 9,-4 + 2002: 9,-5 + 2003: 9,-6 + 2004: 9,-7 + 2005: 9,-8 + 2006: 9,-9 + 2007: 9,-10 + 2008: 10,-10 + 2009: -33,27 + 2010: -34,27 + 2011: -35,27 + 2012: -35,28 + 2013: -35,29 + 2014: -35,30 + 2015: -35,31 + 2016: -35,32 + 2017: -35,33 + 2018: -35,34 + 2136: 10,6 + 2137: 10,5 + 2138: 10,4 + 2139: 11,4 + 2140: 12,4 + 2141: 13,4 + 2142: -40,7 + 2143: -41,7 + 2144: -42,7 + 2145: -43,7 + 2146: -44,7 + 2147: -45,7 + 2148: -45,8 + 2149: -46,8 + 2150: -47,8 + 2267: 11,35 + 2268: 11,34 + 2269: 11,33 + 2270: 11,32 + 2271: 11,31 + 2272: 11,30 + 2273: 11,29 + 2287: 24,27 + 2288: 23,27 + 2289: 23,28 + 2290: 23,29 + 2291: 23,30 + 2292: 23,31 + 2293: 27,40 + 2294: 27,38 + 2295: 27,39 + 2296: 26,40 + 2320: 33,38 + 2321: 32,38 + 2322: 31,38 + 2323: 30,38 + 2324: 29,38 + 2391: 11,36 + 2431: -44,-7 + 2432: -44,-8 - node: color: '#D4D4D496' id: QuarterTileOverlayGreyscale90 decals: - 2051: -52,21 - 2052: -53,21 - 2053: -54,21 - 2054: -55,21 - 2055: -56,21 - 2056: -56,13 - 2057: -55,13 - 2058: -54,13 - 2059: -53,13 - 2060: -52,13 - 2093: -57,13 - 2094: -57,14 - 2095: -57,21 - 2096: -57,22 + 1908: -52,21 + 1909: -53,21 + 1910: -54,21 + 1911: -55,21 + 1912: -56,21 + 1913: -56,13 + 1914: -55,13 + 1915: -54,13 + 1916: -53,13 + 1917: -52,13 + 1950: -57,13 + 1951: -57,14 + 1952: -57,21 + 1953: -57,22 - node: color: '#DE3A3A96' id: QuarterTileOverlayGreyscale90 @@ -4367,236 +4163,215 @@ entities: color: '#EFB34196' id: QuarterTileOverlayGreyscale90 decals: - 640: -2,-5 - 641: -2,-2 - 843: -81,-48 - 844: -80,-48 - 845: -79,-48 - 846: -78,-48 - 847: -77,-48 - - node: - color: '#FFFFFFFF' - id: Rock01 - decals: - 1106: -26.720001,4.0298495 + 633: -2,-5 + 634: -2,-2 + 778: -81,-48 + 779: -80,-48 + 780: -79,-48 + 781: -78,-48 + 782: -77,-48 - node: cleanable: True color: '#FFFFFFFF' id: Rust decals: - 917: -24,-36 - 918: -22,-38 - 919: -22,-38 - 920: -26,-37 - 921: -28,-37 - 922: -28,-37 + 852: -24,-36 + 853: -22,-38 + 854: -22,-38 + 855: -26,-37 + 856: -28,-37 + 857: -28,-37 + - node: + angle: -1.5707963267948966 rad + color: '#FFFFFFFF' + id: StandClear + decals: + 2867: 14,-19 - node: color: '#FFFFFFFF' id: StandClear decals: 389: 10,42 - 655: -10,-45 - 656: -6,-45 - 1037: 5,41 - 1386: 22,25 - 1387: 22,23 + 957: 5,41 + 1254: 22,25 + 1255: 22,23 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' id: StandClear decals: - 3190: -53,36 - - node: - color: '#334E6DC8' - id: ThreeQuarterTileOverlayGreyscale - decals: - 2714: -32,-63 + 2773: -53,36 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale decals: - 3136: -26,-8 - 3162: -20,-12 - 3165: -20,-10 - 3174: -24,-12 - 3175: -24,-10 + 2720: -26,-8 + 2746: -20,-12 + 2749: -20,-10 + 2758: -24,-12 + 2759: -24,-10 - node: color: '#EFB34196' id: ThreeQuarterTileOverlayGreyscale decals: - 2706: -32,-58 - - node: - color: '#334E6DC8' - id: ThreeQuarterTileOverlayGreyscale180 - decals: - 2712: -30,-64 + 2887: -14,-48 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale180 decals: - 3138: -18,-13 + 2722: -18,-13 - node: - color: '#D381C93B' + color: '#724276FF' id: ThreeQuarterTileOverlayGreyscale180 decals: - 1415: 15,14 + 2845: 15,14 - node: color: '#D381C996' id: ThreeQuarterTileOverlayGreyscale180 decals: - 1291: 40,7 - - node: - color: '#EFB34196' - id: ThreeQuarterTileOverlayGreyscale180 - decals: - 2711: -30,-61 - - node: - color: '#334E6DC8' - id: ThreeQuarterTileOverlayGreyscale270 - decals: - 2715: -32,-64 + 1191: 40,7 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale270 decals: - 3137: -26,-13 - 3170: -22,-9 - 3171: -22,-11 + 2721: -26,-13 + 2754: -22,-9 + 2755: -22,-11 - node: - color: '#EFB34196' + color: '#724276FF' id: ThreeQuarterTileOverlayGreyscale270 decals: - 2708: -32,-59 - 2710: -31,-61 - - node: - color: '#334E6DC8' - id: ThreeQuarterTileOverlayGreyscale90 - decals: - 2713: -30,-63 + 2835: 21,7 + 2844: 17,13 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale90 decals: - 3135: -18,-8 + 2719: -18,-8 - node: color: '#EFB34196' id: ThreeQuarterTileOverlayGreyscale90 decals: - 2707: -30,-58 + 2888: -8,-48 - node: color: '#FFFFFFFF' id: VentSmall decals: - 1462: -27,39 - 1582: -1,34 - 1671: 34,30 - 1672: 33,30 - 1844: -14,40 - - node: - color: '#FFFFFFFF' - id: WarnBox - decals: - 2667: -19,-48 + 1319: -27,39 + 1439: -1,34 + 1528: 34,30 + 1529: 33,30 + 1701: -14,40 - node: angle: -3.141592653589793 rad color: '#FFFFFFFF' id: WarnCorner decals: - 1140: -40,60 + 1040: -40,60 - node: angle: -1.5707963267948966 rad color: '#FFFFFFFF' id: WarnCorner decals: 463: -6,-12 - 970: 2,64 + 905: 2,64 - node: color: '#FFFFFFFF' id: WarnCorner decals: - 1137: -42,58 + 1037: -42,58 - node: angle: -3.141592653589793 rad color: '#FFFFFFFF' id: WarnCornerFlipped decals: - 1139: -42,60 + 1039: -42,60 - node: color: '#FFFFFFFF' id: WarnCornerFlipped decals: - 1138: -40,58 + 1038: -40,58 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' id: WarnCornerFlipped decals: - 973: -4,64 + 908: -4,64 - node: color: '#FFFFFFFF' id: WarnCornerGreyscaleSE decals: - 3065: -31,-11 + 2649: -31,-11 - node: color: '#FFFFFFFF' id: WarnCornerGreyscaleSW decals: - 3069: -35,-11 + 2653: -35,-11 - node: color: '#FFFFFFFF' id: WarnCornerNE decals: - 2222: 2,-33 + 2072: 2,-33 + 2876: -8,-51 + 3001: -17,-53 - node: color: '#FFFFFFFF' id: WarnCornerNW decals: - 2221: 0,-33 + 2071: 0,-33 + 2878: -14,-51 + 3000: -19,-53 - node: color: '#FFFFFFFF' id: WarnCornerSE decals: - 1876: 5,21 - 2220: 2,-35 + 1733: 5,21 + 2070: 2,-35 + 2810: 13,12 + 2877: -8,-53 + 2902: -5,-52 + 3003: -17,-56 - node: color: '#FFFFFFFF' id: WarnCornerSW decals: - 1875: 3,21 - 2219: 0,-35 + 1732: 3,21 + 2069: 0,-35 + 2879: -14,-53 + 3002: -19,-56 - node: color: '#FFFFFFFF' id: WarnCornerSmallNE decals: - 2213: -10,-36 - 2756: -10,-52 + 2863: 14,-20 + 2864: 14,-19 + 2933: -3,-52 - node: color: '#FFFFFFFF' id: WarnCornerSmallNW decals: - 1275: 21,-19 - 1834: -58,19 - 2212: -6,-36 - 2755: -6,-52 + 1175: 21,-19 + 1691: -58,19 + 2934: 1,-52 - node: color: '#FFFFFFFF' id: WarnCornerSmallSE decals: - 1277: 20,-19 - 1877: 5,22 - 2383: -10,-34 - 2754: -10,-50 + 1177: 20,-19 + 1734: 5,22 + 2865: 14,-18 + 2866: 14,-19 + 2931: -3,-50 - node: color: '#FFFFFFFF' id: WarnCornerSmallSW decals: - 1274: 21,-16 - 1276: 19,-19 - 1282: 22,-19 - 1833: -58,17 - 1878: 3,22 - 2382: -6,-34 - 2757: -6,-50 + 1174: 21,-16 + 1176: 19,-19 + 1182: 22,-19 + 1690: -58,17 + 1735: 3,22 + 2932: 1,-50 - node: angle: -3.141592653589793 rad color: '#FFFFFFFF' @@ -4612,290 +4387,304 @@ entities: color: '#52B4E996' id: WarnFullGreyscale decals: - 2478: -35,-1 - 2956: -24,-17 - 2957: -24,-23 - 2958: -20,-16 - 2959: -16,-16 - 3023: -14,-18 - 3024: -14,-14 - 3060: -28,-23 - 3061: -28,-17 - 3062: -32,-18 - 3106: -17,-11 - 3107: -17,-10 - 3111: -22,-14 - 3112: -27,-10 - 3113: -27,-11 + 2182: -35,-1 + 2540: -24,-17 + 2541: -24,-23 + 2542: -20,-16 + 2543: -16,-16 + 2607: -14,-18 + 2608: -14,-14 + 2644: -28,-23 + 2645: -28,-17 + 2646: -32,-18 + 2690: -17,-11 + 2691: -17,-10 + 2695: -22,-14 + 2696: -27,-10 + 2697: -27,-11 - node: color: '#D381C996' id: WarnFullGreyscale decals: - 2560: 30,7 - 2561: 30,8 + 2256: 30,7 + 2257: 30,8 - node: color: '#DE3A3A96' id: WarnFullGreyscale decals: - 2513: -33,45 - 2516: -40,45 - - node: - color: '#FFFFFFFF' - id: WarnFullGreyscale - decals: - 2282: -21,-43 - 2283: -21,-42 - 2285: -18,-46 - 2286: -19,-38 + 2217: -33,45 + 2220: -40,45 - node: color: '#FFFFFFFF' id: WarnLineE decals: - 1278: 20,-20 - 1289: 38,9 - 1290: 38,10 - 1309: 20,18 - 1310: 20,19 - 1317: 21,20 - 1318: 21,21 - 2211: -10,-35 - 2223: 2,-34 - 2431: -2,-1 - 2752: -10,-51 + 1178: 20,-20 + 1189: 38,9 + 1190: 38,10 + 1209: 20,18 + 1210: 20,19 + 1217: 21,20 + 1218: 21,21 + 2073: 2,-34 + 2135: -2,-1 + 2881: -8,-52 + 2903: -5,-51 + 2904: -5,-50 + 2905: -5,-49 + 2906: -5,-48 + 2925: -3,-51 + 3005: -17,-54 + 3006: -17,-55 - node: color: '#334E6DC8' id: WarnLineGreyscaleE decals: - 2634: -19,39 + 2330: -19,39 - node: color: '#52B4E996' id: WarnLineGreyscaleE decals: - 2945: -21,-16 - 3057: -29,-23 - 3058: -29,-17 - 3103: -12,-11 - 3108: -18,-11 - 3109: -18,-10 - 3116: -28,-11 - 3117: -28,-10 + 2529: -21,-16 + 2641: -29,-23 + 2642: -29,-17 + 2687: -12,-11 + 2692: -18,-11 + 2693: -18,-10 + 2700: -28,-11 + 2701: -28,-10 - node: color: '#D381C996' id: WarnLineGreyscaleE decals: - 2563: 33,8 + 2259: 33,8 - node: color: '#FFFFFFFF' id: WarnLineGreyscaleE decals: - 2280: -22,-43 - 2281: -22,-42 - 3066: -31,-10 + 2650: -31,-10 - node: color: '#334E6DC8' id: WarnLineGreyscaleN decals: - 2635: -20,40 + 2331: -20,40 - node: color: '#52B4E996' id: WarnLineGreyscaleN decals: - 2954: -22,-15 - 3022: -14,-19 - 3025: -14,-15 + 2538: -22,-15 + 2606: -14,-19 + 2609: -14,-15 - node: color: '#D381C996' id: WarnLineGreyscaleN decals: - 2564: 32,9 + 2260: 32,9 - node: color: '#DE3A3A96' id: WarnLineGreyscaleN decals: - 2511: -33,44 - 2512: -40,44 - - node: - color: '#FFFFFFFF' - id: WarnLineGreyscaleN - decals: - 2279: -19,-39 - 2299: -13,-39 + 2215: -33,44 + 2216: -40,44 - node: color: '#52B4E996' id: WarnLineGreyscaleS decals: - 2477: -35,0 - 2955: -22,-24 - 3020: -18,-23 - 3021: -14,-17 - 3102: -14,-13 - 3110: -22,-13 + 2181: -35,0 + 2539: -22,-24 + 2604: -18,-23 + 2605: -14,-17 + 2686: -14,-13 + 2694: -22,-13 - node: color: '#D381C996' id: WarnLineGreyscaleS decals: - 2562: 32,7 + 2258: 32,7 - node: color: '#DE3A3A96' id: WarnLineGreyscaleS decals: - 2508: -32,42 - 2509: -35,42 - 2510: -37,42 - 2514: -33,46 - 2515: -40,46 - 2518: -47,45 - 2519: -48,45 - 2520: -49,45 + 2212: -32,42 + 2213: -35,42 + 2214: -37,42 + 2218: -33,46 + 2219: -40,46 + 2222: -47,45 + 2223: -48,45 + 2224: -49,45 - node: color: '#EFB34196' id: WarnLineGreyscaleS decals: - 2859: -41,17 + 2443: -41,17 - node: color: '#FFFFFFFF' id: WarnLineGreyscaleS decals: - 2284: -18,-45 - 2497: -40,42 - 2498: -44,42 - 2499: -48,42 - 3067: -32,-11 - 3068: -33,-11 - 3070: -34,-11 + 2201: -40,42 + 2202: -44,42 + 2203: -48,42 + 2651: -32,-11 + 2652: -33,-11 + 2654: -34,-11 - node: color: '#334E6DC8' id: WarnLineGreyscaleW decals: - 2633: -21,39 + 2329: -21,39 - node: color: '#52B4E996' id: WarnLineGreyscaleW decals: - 2943: -23,-23 - 2944: -23,-17 - 2960: -15,-16 - 3059: -31,-18 - 3104: -16,-11 - 3105: -16,-10 - 3114: -26,-11 - 3115: -26,-10 + 2527: -23,-23 + 2528: -23,-17 + 2544: -15,-16 + 2643: -31,-18 + 2688: -16,-11 + 2689: -16,-10 + 2698: -26,-11 + 2699: -26,-10 - node: color: '#EFB34196' id: WarnLineGreyscaleW decals: - 2860: -44,18 + 2444: -44,18 - node: color: '#FFFFFFFF' id: WarnLineGreyscaleW decals: - 2277: -20,-43 - 2278: -20,-42 - 2461: -33,7 - 2462: -33,8 - 3071: -35,-10 + 2165: -33,7 + 2166: -33,8 + 2655: -35,-10 - node: color: '#FFFFFFFF' id: WarnLineN decals: - 1264: 18,-16 - 1265: 19,-16 - 1266: 20,-16 - 1267: 21,-19 - 1268: 18,-19 - 1285: 38,9 - 1286: 37,9 - 1287: 36,9 - 1288: 35,9 - 1328: 28,11 - 1329: 27,11 - 1330: 26,11 - 1874: 4,21 - 1879: 6,22 - 1880: 2,22 - 2186: -21,43 - 2187: -20,43 - 2188: -19,43 - 2224: 1,-35 - 2664: -26,-58 - 2665: -27,-58 - 2666: -28,-58 - 2749: -7,-50 - 2750: -8,-50 - 2751: -9,-50 + 1164: 18,-16 + 1165: 19,-16 + 1166: 20,-16 + 1167: 21,-19 + 1168: 18,-19 + 1185: 38,9 + 1186: 37,9 + 1187: 36,9 + 1188: 35,9 + 1228: 28,11 + 1229: 27,11 + 1230: 26,11 + 1731: 4,21 + 1736: 6,22 + 1737: 2,22 + 2043: -21,43 + 2044: -20,43 + 2045: -19,43 + 2074: 1,-35 + 2348: -26,-58 + 2349: -27,-58 + 2811: 12,12 + 2857: 15,-19 + 2858: 16,-19 + 2859: 17,-19 + 2882: -13,-53 + 2883: -12,-53 + 2884: -11,-53 + 2885: -10,-53 + 2886: -9,-53 + 2907: -6,-52 + 2908: -3,-47 + 2909: 1,-47 + 2910: 2,-47 + 2911: 3,-47 + 2912: 4,-47 + 2913: -2,-47 + 2914: 0,-47 + 2922: -2,-50 + 2923: -1,-50 + 2924: 0,-50 + 3009: -18,-56 - node: color: '#FFFFFFFF' id: WarnLineS decals: - 1272: 21,-18 - 1273: 21,-17 - 1279: 19,-20 - 1315: 24,20 - 1316: 24,21 - 1408: 27,18 - 1409: 27,19 - 1410: 27,20 - 1823: -58,12 - 1824: -58,13 - 1825: -58,14 - 1826: -58,15 - 1827: -58,16 - 1828: -58,20 - 1829: -58,21 - 1830: -58,22 - 1831: -58,23 - 1832: -58,24 - 2210: -6,-35 - 2217: 0,-34 - 2430: -4,-1 - 2538: 14,-26 - 2539: 14,-25 - 2540: 14,-24 - 2541: 14,-23 - 2753: -6,-51 - 2833: -47,-10 - 2834: -47,-9 + 1172: 21,-18 + 1173: 21,-17 + 1179: 19,-20 + 1215: 24,20 + 1216: 24,21 + 1274: 27,18 + 1275: 27,19 + 1276: 27,20 + 1680: -58,12 + 1681: -58,13 + 1682: -58,14 + 1683: -58,15 + 1684: -58,16 + 1685: -58,20 + 1686: -58,21 + 1687: -58,22 + 1688: -58,23 + 1689: -58,24 + 2067: 0,-34 + 2134: -4,-1 + 2423: -47,-10 + 2424: -47,-9 + 2880: -14,-52 + 2926: 1,-51 + 3007: -19,-54 + 3008: -19,-55 - node: color: '#FFFFFFFF' id: WarnLineW decals: - 1259: 18,-16 - 1260: 19,-16 - 1261: 20,-16 - 1262: 21,-16 - 1263: 22,-16 - 1269: 18,-19 - 1270: 19,-19 - 1271: 20,-19 - 1280: 20,-21 - 1281: 19,-21 - 1305: 17,19 - 1306: 18,19 - 1307: 19,19 - 1308: 20,19 - 1325: 26,8 - 1326: 27,8 - 1327: 28,8 - 1465: -23,38 - 1881: 6,22 - 1882: 5,22 - 1883: 3,22 - 1884: 2,22 - 2214: -7,-36 - 2215: -8,-36 - 2216: -9,-36 - 2218: 1,-33 - 2738: -6,-58 - 2739: -12,-58 - 2740: -5,-58 - 2741: -4,-58 - 2742: -13,-58 - 2743: -3,-58 - 2744: -10,-58 - 2745: -11,-58 - 2746: -9,-52 - 2747: -8,-52 - 2748: -7,-52 + 1159: 18,-16 + 1160: 19,-16 + 1161: 20,-16 + 1162: 21,-16 + 1163: 22,-16 + 1169: 18,-19 + 1170: 19,-19 + 1171: 20,-19 + 1180: 20,-21 + 1181: 19,-21 + 1205: 17,19 + 1206: 18,19 + 1207: 19,19 + 1208: 20,19 + 1225: 26,8 + 1226: 27,8 + 1227: 28,8 + 1322: -23,38 + 1738: 6,22 + 1739: 5,22 + 1740: 3,22 + 1741: 2,22 + 2068: 1,-33 + 2361: -12,-58 + 2362: -11,-58 + 2812: 12,10 + 2854: 13,10 + 2855: 14,10 + 2860: 15,-19 + 2861: 16,-19 + 2862: 17,-19 + 2872: -11,-51 + 2873: -10,-51 + 2874: -12,-51 + 2875: -9,-51 + 2927: -2,-52 + 2928: -1,-52 + 2929: 0,-52 + 2930: 0,-52 + 2935: -4,-48 + 2936: -3,-48 + 2937: -2,-48 + 2938: -1,-48 + 2939: 0,-48 + 2940: 1,-48 + 2941: 2,-48 + 2942: 3,-48 + 2943: 4,-48 + 3004: -18,-53 - node: angle: -3.141592653589793 rad color: '#FFFFFFFF' @@ -4910,17 +4699,13 @@ entities: 387: 10,42 388: 9,42 464: -5,-12 - 635: -24,-47 - 636: -25,-47 - 637: -26,-47 - 734: 13,-9 - 735: 12,-9 - 736: 11,-9 - 976: -6,82 - 977: 4,82 - 988: 3,78 - 989: -5,78 - 1118: 2,-38 + 674: 13,-9 + 675: 12,-9 + 676: 11,-9 + 911: -6,82 + 912: 4,82 + 923: 3,78 + 924: -5,78 - node: angle: -1.5707963267948966 rad color: '#FFFFFFFF' @@ -4932,13 +4717,13 @@ entities: 8: 0,22 9: 0,23 462: -6,-13 - 951: -47,-25 - 952: -47,-24 - 953: -47,-23 - 968: 2,62 - 969: 2,63 - 980: 4,87 - 990: 4,79 + 886: -47,-25 + 887: -47,-24 + 888: -47,-23 + 903: 2,62 + 904: 2,63 + 915: 4,87 + 925: 4,79 - node: color: '#FFFFFFFF' id: WarningLine @@ -4951,45 +4736,25 @@ entities: 614: 7,-21 615: 6,-21 616: 5,-21 - 642: -2,-46 - 643: -3,-46 - 644: -4,-46 - 645: -5,-46 - 646: -6,-46 - 647: -7,-46 - 648: -8,-46 - 649: -9,-46 - 650: -10,-46 - 651: -11,-46 - 652: -12,-46 - 653: -13,-46 - 654: -14,-46 - 663: -8,-42 - 664: -7,-42 - 665: -9,-42 - 666: -10,-42 - 667: -6,-42 - 737: 13,-9 - 738: 12,-9 - 739: 11,-9 - 747: 17,16 - 748: 18,16 - 752: 38,12 - 753: 37,12 - 754: 36,12 - 755: 35,12 - 974: 4,84 - 975: -6,84 - 978: 3,88 - 979: -5,88 - 1029: 6,41 - 1030: 4,41 - 1034: 7,41 - 1035: 3,41 - 1036: 5,41 - 1216: 35,-12 - 1217: 34,-12 - 1218: 33,-12 + 677: 13,-9 + 678: 12,-9 + 679: 11,-9 + 687: 38,12 + 688: 37,12 + 689: 36,12 + 690: 35,12 + 909: 4,84 + 910: -6,84 + 913: 3,88 + 914: -5,88 + 949: 6,41 + 950: 4,41 + 954: 7,41 + 955: 3,41 + 956: 5,41 + 1116: 35,-12 + 1117: 34,-12 + 1118: 33,-12 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' @@ -5001,315 +4766,303 @@ entities: 13: -4,22 14: -4,23 15: -2,22 - 954: -57,-25 - 955: -57,-24 - 956: -57,-23 - 971: -4,62 - 972: -4,63 - 981: -6,87 - 991: -6,79 - 1209: 35,-8 - 1210: 35,-7 - 1211: 35,-6 - 1212: 35,-5 - 1213: 35,-4 - 1214: 35,-3 - 1215: 35,-2 - - node: - angle: 3.141592653589793 rad - color: '#FFFFFFFF' - id: WarningLine - decals: - 631: 2,-38 - 632: 1,-38 - 633: 0,-38 - 749: 17,14 - 750: 18,14 + 889: -57,-25 + 890: -57,-24 + 891: -57,-23 + 906: -4,62 + 907: -4,63 + 916: -6,87 + 926: -6,79 + 1109: 35,-8 + 1110: 35,-7 + 1111: 35,-6 + 1112: 35,-5 + 1113: 35,-4 + 1114: 35,-3 + 1115: 35,-2 - node: angle: -3.141592653589793 rad color: '#FFFFFFFF' id: WarningLineCorner decals: - 993: 4,78 - 995: -4,78 + 928: 4,78 + 930: -4,78 - node: angle: -1.5707963267948966 rad color: '#FFFFFFFF' id: WarningLineCorner decals: - 958: -47,-22 + 893: -47,-22 - node: color: '#FFFFFFFF' id: WarningLineCorner decals: - 669: -11,-42 - 983: 2,88 - 985: -6,88 - 997: -6,80 - 1136: 4,-21 - 1219: 32,-12 + 918: 2,88 + 920: -6,88 + 932: -6,80 + 1036: 4,-21 + 1119: 32,-12 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' id: WarningLineCorner decals: - 987: -6,86 + 922: -6,86 - node: angle: -3.141592653589793 rad color: '#FFFFFFFF' id: WarningLineCornerFlipped decals: - 992: -6,78 - 994: 2,78 + 927: -6,78 + 929: 2,78 - node: angle: -1.5707963267948966 rad color: '#FFFFFFFF' id: WarningLineCornerFlipped decals: - 984: 4,86 + 919: 4,86 - node: color: '#FFFFFFFF' id: WarningLineCornerFlipped decals: - 668: -5,-42 - 982: 4,88 - 986: -4,88 - 996: 4,80 - 1135: 8,-21 + 917: 4,88 + 921: -4,88 + 931: 4,80 + 1035: 8,-21 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' id: WarningLineCornerFlipped decals: - 957: -57,-22 + 892: -57,-22 - node: color: '#FFFFFFFF' id: WoodTrimThinBox decals: - 1796: -11,34 - 1797: -10,34 - 1798: -9,34 + 1653: -11,34 + 1654: -10,34 + 1655: -9,34 - node: color: '#334E6DC8' id: WoodTrimThinEndE decals: - 1600: -9,41 + 1457: -9,41 - node: color: '#FFFFFFFF' id: WoodTrimThinEndN decals: - 1478: -22,31 + 1335: -22,31 - node: color: '#334E6DC8' id: WoodTrimThinEndW decals: - 1601: -11,41 + 1458: -11,41 - node: color: '#FFFFFFFF' id: WoodTrimThinInnerNe decals: - 1502: -13,32 - 1682: 42,40 - 2492: -27,52 + 1359: -13,32 + 1539: 42,40 + 2196: -27,52 - node: color: '#FFFFFFFF' id: WoodTrimThinInnerNw decals: - 1501: -7,32 + 1358: -7,32 - node: color: '#FFFFFFFF' id: WoodTrimThinInnerSe decals: - 1472: -24,37 - 1500: -13,36 - 1764: -21,36 + 1329: -24,37 + 1357: -13,36 + 1621: -21,36 - node: color: '#FFFFFFFF' id: WoodTrimThinInnerSw decals: - 1471: -24,37 - 1499: -7,36 + 1328: -24,37 + 1356: -7,36 - node: color: '#FFFFFFFF' id: WoodTrimThinLineE decals: - 1483: -20,30 - 1496: -13,33 - 1497: -13,34 - 1498: -13,35 - 1573: -2,32 - 1574: -2,33 - 1575: -2,31 - 1587: -19,32 - 1673: 35,37 - 1674: 35,38 - 1675: 35,39 - 1676: 35,40 - 1677: 35,41 - 1678: 43,37 - 1679: 43,38 - 1680: 43,39 - 1681: 43,40 - 1683: -75,-55 - 1685: -71,-55 - 1686: -71,-54 - 1687: -71,-53 - 1688: -71,-52 - 1689: -71,-56 - 1690: -71,-57 - 1762: -21,34 - 1763: -21,35 - 1769: 25,14 - 1770: 25,15 - 2730: -31,-3 - 2731: -31,-2 - 2732: -31,-1 + 1340: -20,30 + 1353: -13,33 + 1354: -13,34 + 1355: -13,35 + 1430: -2,32 + 1431: -2,33 + 1432: -2,31 + 1444: -19,32 + 1530: 35,37 + 1531: 35,38 + 1532: 35,39 + 1533: 35,40 + 1534: 35,41 + 1535: 43,37 + 1536: 43,38 + 1537: 43,39 + 1538: 43,40 + 1540: -75,-55 + 1542: -71,-55 + 1543: -71,-54 + 1544: -71,-53 + 1545: -71,-52 + 1546: -71,-56 + 1547: -71,-57 + 1619: -21,34 + 1620: -21,35 + 1626: 25,14 + 1627: 25,15 + 2358: -31,-3 + 2359: -31,-2 + 2360: -31,-1 - node: color: '#334E6DC8' id: WoodTrimThinLineN decals: - 1602: -10,41 + 1459: -10,41 - node: color: '#FFFFFFFF' id: WoodTrimThinLineN decals: - 1424: -49,32 - 1425: -50,32 - 1426: -51,32 - 1427: -52,32 - 1428: -53,32 - 1435: -54,32 - 1436: -22,52 - 1437: -23,52 - 1438: -24,52 - 1439: -25,52 - 1440: -26,52 - 1464: -21,33 - 1476: -20,30 - 1477: -21,30 - 1491: -8,32 - 1492: -9,32 - 1493: -10,32 - 1494: -11,32 - 1495: -12,32 - 1577: -1,34 - 1583: -22,32 - 1584: -20,32 - 1657: -32,20 - 1748: 8,-18 - 1766: 26,13 - 1767: 27,13 - 1768: 28,13 + 1281: -49,32 + 1282: -50,32 + 1283: -51,32 + 1284: -52,32 + 1285: -53,32 + 1292: -54,32 + 1293: -22,52 + 1294: -23,52 + 1295: -24,52 + 1296: -25,52 + 1297: -26,52 + 1321: -21,33 + 1333: -20,30 + 1334: -21,30 + 1348: -8,32 + 1349: -9,32 + 1350: -10,32 + 1351: -11,32 + 1352: -12,32 + 1434: -1,34 + 1440: -22,32 + 1441: -20,32 + 1514: -32,20 + 1605: 8,-18 + 1623: 26,13 + 1624: 27,13 + 1625: 28,13 - node: color: '#334E6DC8' id: WoodTrimThinLineS decals: - 1603: -10,41 + 1460: -10,41 - node: color: '#FFFFFFFF' id: WoodTrimThinLineS decals: - 1422: -43,32 - 1423: -44,32 - 1429: -52,29 - 1430: -53,29 - 1431: -51,29 - 1432: -50,29 - 1433: -49,29 - 1434: -54,29 - 1453: -18,37 - 1454: -19,37 - 1455: -20,37 - 1456: -21,37 - 1457: -22,37 - 1463: -21,33 - 1467: -25,37 - 1468: -26,37 - 1469: -27,37 - 1470: -28,37 - 1473: -19,36 - 1474: -20,36 - 1475: -18,36 - 1480: -22,30 - 1481: -21,30 - 1482: -20,30 - 1484: -12,36 - 1485: -10,36 - 1486: -9,36 - 1487: -8,36 - 1512: -11,36 - 1576: -1,34 - 1578: 3,34 - 1579: 4,34 - 1580: 5,34 - 1581: 2,34 - 1585: -19,32 - 1656: -32,24 - 1736: -6,15 - 1737: -5,15 - 1738: -4,15 - 1739: -3,15 - 1740: -2,15 - 1741: -1,15 - 1743: 0,15 - 1749: 9,-17 - 1750: 8,-17 - 1751: 7,-17 - 1752: 5,-12 - 1753: 4,-12 - 1754: 3,-12 - 1765: 28,16 - 1773: 27,16 - 1774: 26,16 - 2479: -42,32 - 2480: -45,32 + 1279: -43,32 + 1280: -44,32 + 1286: -52,29 + 1287: -53,29 + 1288: -51,29 + 1289: -50,29 + 1290: -49,29 + 1291: -54,29 + 1310: -18,37 + 1311: -19,37 + 1312: -20,37 + 1313: -21,37 + 1314: -22,37 + 1320: -21,33 + 1324: -25,37 + 1325: -26,37 + 1326: -27,37 + 1327: -28,37 + 1330: -19,36 + 1331: -20,36 + 1332: -18,36 + 1337: -22,30 + 1338: -21,30 + 1339: -20,30 + 1341: -12,36 + 1342: -10,36 + 1343: -9,36 + 1344: -8,36 + 1369: -11,36 + 1433: -1,34 + 1435: 3,34 + 1436: 4,34 + 1437: 5,34 + 1438: 2,34 + 1442: -19,32 + 1513: -32,24 + 1593: -6,15 + 1594: -5,15 + 1595: -4,15 + 1596: -3,15 + 1597: -2,15 + 1598: -1,15 + 1600: 0,15 + 1606: 9,-17 + 1607: 8,-17 + 1608: 7,-17 + 1609: 5,-12 + 1610: 4,-12 + 1611: 3,-12 + 1622: 28,16 + 1630: 27,16 + 1631: 26,16 + 2183: -42,32 + 2184: -45,32 - node: cleanable: True color: '#FFFFFFFF' id: WoodTrimThinLineS decals: - 1863: -23,37 + 1720: -23,37 - node: color: '#FFFFFFFF' id: WoodTrimThinLineW decals: - 1479: -22,30 - 1488: -7,33 - 1489: -7,34 - 1490: -7,35 - 1586: -19,32 - 1684: -70,-55 - 1691: -74,-57 - 1692: -74,-56 - 1693: -74,-55 - 1694: -74,-54 - 1695: -74,-53 - 1696: -74,-52 - 1744: 6,-11 - 1745: 6,-10 - 1746: 6,-9 - 1755: 3,-12 - 1756: 3,-11 - 1757: 3,-10 - 1758: 3,-9 - 1759: 3,-8 - 1760: 3,-7 - 1761: 3,-6 - 1771: 29,14 - 1772: 29,15 - 1792: 27,0 - 1793: 27,1 - 1794: 27,2 + 1336: -22,30 + 1345: -7,33 + 1346: -7,34 + 1347: -7,35 + 1443: -19,32 + 1541: -70,-55 + 1548: -74,-57 + 1549: -74,-56 + 1550: -74,-55 + 1551: -74,-54 + 1552: -74,-53 + 1553: -74,-52 + 1601: 6,-11 + 1602: 6,-10 + 1603: 6,-9 + 1612: 3,-12 + 1613: 3,-11 + 1614: 3,-10 + 1615: 3,-9 + 1616: 3,-8 + 1617: 3,-7 + 1618: 3,-6 + 1628: 29,14 + 1629: 29,15 + 1649: 27,0 + 1650: 27,1 + 1651: 27,2 - node: color: '#FFFFFFFF' id: bushsnowa1 decals: - 1605: -11,41 + 1462: -11,41 - node: color: '#FFFFFFFF' id: bushsnowb3 decals: - 1604: -9,41 + 1461: -9,41 - type: GridAtmosphere version: 2 data: @@ -7774,11 +7527,6 @@ entities: - type: Transform pos: -0.39634466,12.638008 parent: 30 - - uid: 9608 - components: - - type: Transform - pos: -19.30925,-35.362278 - parent: 30 - proto: AirAlarm entities: - uid: 6224 @@ -7865,11 +7613,6 @@ entities: rot: 1.5707963267948966 rad pos: -26.5,-40.5 parent: 30 - - type: DeviceList - devices: - - 9952 - - 11153 - - 11094 - uid: 9671 components: - type: Transform @@ -7882,6 +7625,120 @@ entities: - 7116 - 9686 - 9864 + - uid: 9996 + components: + - type: Transform + pos: -3.5,-46.5 + parent: 30 + - type: DeviceList + devices: + - 11134 + - 9793 + - 9994 + - 19806 + - uid: 10010 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 14.5,-22.5 + parent: 30 + - type: DeviceList + devices: + - 11180 + - 11192 + - 4353 + - 11188 + - 9301 + - 9300 + - 9769 + - 4241 + - 9782 + - 9618 + - 11189 + - uid: 13957 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,-42.5 + parent: 30 + - type: DeviceList + devices: + - 19767 + - 19768 + - 9993 + - 11007 + - 19770 + - 19771 + - 8454 + - 8609 + - 7443 + - 7098 + - 10000 + - 7099 + - 7100 + - 11003 + - 19812 + - 19766 + - 19598 + - uid: 13958 + components: + - type: Transform + pos: -19.5,-38.5 + parent: 30 + - type: DeviceList + devices: + - 9897 + - 8297 + - 11005 + - 11009 + - 7226 + - 9884 + - 19562 + - 11280 + - 11007 + - 9993 + - 19768 + - 19767 + - uid: 13966 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -14.5,-34.5 + parent: 30 + - type: DeviceList + devices: + - 10042 + - 9903 + - 10043 + - 10022 + - 9899 + - 9908 + - 11011 + - uid: 14365 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,16.5 + parent: 30 + - type: DeviceList + devices: + - 13002 + - 14522 + - 22440 + - 22439 + - 13082 + - 13085 + - 18074 + - 18214 + - 17912 + - 18601 + - 18212 + - 13073 + - 17724 + - 12664 + - 12665 + - 12666 + - 18073 - uid: 17960 components: - type: Transform @@ -7894,6 +7751,21 @@ entities: - 18435 - 18436 - 18437 + - uid: 19570 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,-51.5 + parent: 30 + - type: DeviceList + devices: + - 8335 + - 7222 + - 11280 + - 9839 + - 7224 + - 8311 + - 9995 - uid: 20325 components: - type: Transform @@ -7909,58 +7781,6 @@ entities: - 18442 - 18439 - 17228 - - uid: 20353 - components: - - type: Transform - pos: -14.5,-45.5 - parent: 30 - - type: DeviceList - devices: - - 20354 - - 11262 - - 11263 - - 11264 - - 11114 - - 11163 - - uid: 20356 - components: - - type: Transform - pos: -9.5,-37.5 - parent: 30 - - type: DeviceList - devices: - - 11343 - - 11344 - - 11345 - - 11340 - - 11341 - - 11342 - - 20355 - - 11155 - - 11098 - - 11099 - - 11154 - - uid: 21740 - components: - - type: Transform - pos: -16.5,-33.5 - parent: 30 - - type: DeviceList - devices: - - 11097 - - 11227 - - 21741 - - uid: 21743 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -14.5,-33.5 - parent: 30 - - type: DeviceList - devices: - - 11176 - - 11107 - - 21744 - uid: 21747 components: - type: Transform @@ -7977,21 +7797,6 @@ entities: - 21749 - 11178 - 11179 - - uid: 21754 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 8.5,-27.5 - parent: 30 - - type: DeviceList - devices: - - 21753 - - 9302 - - 9303 - - 9301 - - 9300 - - 11188 - - 11189 - uid: 21755 components: - type: Transform @@ -8000,23 +7805,6 @@ entities: - type: DeviceList devices: - 21756 - - uid: 21757 - components: - - type: Transform - pos: 14.5,-21.5 - parent: 30 - - type: DeviceList - devices: - - 21759 - - 9303 - - 9302 - - 9301 - - 9300 - - 9307 - - 9308 - - 9309 - - 11192 - - 11180 - uid: 21760 components: - type: Transform @@ -8286,17 +8074,6 @@ entities: - 18758 - 18759 - 21843 - - uid: 21844 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -56.5,-62.5 - parent: 30 - - type: DeviceList - devices: - - 18770 - - 18769 - - 21845 - uid: 21846 components: - type: Transform @@ -8885,26 +8662,6 @@ entities: - 22053 - 12959 - 12813 - - uid: 22054 - components: - - type: Transform - pos: 19.5,13.5 - parent: 30 - - type: DeviceList - devices: - - 9161 - - 12665 - - 12664 - - 12666 - - 12858 - - 13391 - - 22056 - - 13078 - - 12983 - - 13085 - - 13002 - - 13086 - - 13003 - uid: 22057 components: - type: Transform @@ -8970,7 +8727,6 @@ entities: - 13080 - 22071 - 13006 - - 9161 - uid: 22073 components: - type: Transform @@ -8981,7 +8737,6 @@ entities: - 320 - 21456 - 22072 - - 3357 - 3358 - uid: 22075 components: @@ -9039,6 +8794,13 @@ entities: - 22084 - 3484 - 3481 +- proto: AirAlarmElectronics + entities: + - uid: 15214 + components: + - type: Transform + pos: 3.6103516,20.451275 + parent: 30 - proto: AirCanister entities: - uid: 2087 @@ -9056,6 +8818,21 @@ entities: - type: Transform pos: 22.5,-13.5 parent: 30 + - uid: 12727 + components: + - type: Transform + pos: -52.5,-64.5 + parent: 30 + - uid: 12770 + components: + - type: Transform + pos: -52.5,-65.5 + parent: 30 + - uid: 12816 + components: + - type: Transform + pos: -52.5,-63.5 + parent: 30 - uid: 15156 components: - type: Transform @@ -9071,26 +8848,6 @@ entities: - type: Transform pos: -44.5,25.5 parent: 30 - - uid: 18782 - components: - - type: Transform - pos: -66.5,-65.5 - parent: 30 - - uid: 18783 - components: - - type: Transform - pos: -65.5,-65.5 - parent: 30 - - uid: 18784 - components: - - type: Transform - pos: -64.5,-65.5 - parent: 30 - - uid: 22767 - components: - - type: Transform - pos: -27.5,-63.5 - parent: 30 - proto: Airlock entities: - uid: 752 @@ -9229,6 +8986,30 @@ entities: - type: Transform pos: 6.5,-30.5 parent: 30 + - uid: 9894 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 11.5,-30.5 + parent: 30 + - uid: 10017 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 14.5,-24.5 + parent: 30 + - uid: 11290 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 14.5,-23.5 + parent: 30 + - uid: 19783 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 10.5,-30.5 + parent: 30 - proto: AirlockAtmosphericsLocked entities: - uid: 8604 @@ -9246,6 +9027,18 @@ entities: - type: Transform pos: 20.5,-20.5 parent: 30 + - uid: 9978 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.5,-18.5 + parent: 30 + - uid: 9989 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 15.5,-18.5 + parent: 30 - proto: AirlockBarLocked entities: - uid: 455 @@ -9430,12 +9223,16 @@ entities: parent: 30 - proto: AirlockChiefEngineerGlassLocked entities: - - uid: 9592 + - uid: 870 components: - - type: MetaData - name: CE's Office - type: Transform - pos: -18.5,-37.5 + pos: -7.5,-37.5 + parent: 30 + - uid: 9519 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -14.5,-30.5 parent: 30 - proto: AirlockChiefMedicalOfficerGlassLocked entities: @@ -9508,12 +9305,6 @@ entities: - type: Transform pos: -2.5,37.5 parent: 30 - - uid: 22638 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -29.5,-61.5 - parent: 30 - proto: AirlockCommandLocked entities: - uid: 4927 @@ -9552,12 +9343,20 @@ entities: parent: 30 - proto: AirlockEngineeringGlassLocked entities: - - uid: 9353 + - uid: 4827 components: - - type: MetaData - name: SMES bank - type: Transform - pos: -10.5,-33.5 + pos: -13.5,-32.5 + parent: 30 + - uid: 7125 + components: + - type: Transform + pos: -12.5,-46.5 + parent: 30 + - uid: 7146 + components: + - type: Transform + pos: -11.5,-46.5 parent: 30 - uid: 9463 components: @@ -9566,28 +9365,30 @@ entities: - type: Transform pos: -12.5,-36.5 parent: 30 - - uid: 9934 + - uid: 10767 components: - type: Transform - pos: -0.5,-53.5 + rot: 1.5707963267948966 rad + pos: 0.5,-42.5 parent: 30 - - uid: 9935 + - uid: 10769 components: - type: Transform - pos: -0.5,-49.5 + rot: 1.5707963267948966 rad + pos: -9.5,-44.5 parent: 30 - - uid: 10116 + - uid: 10785 components: - type: Transform + rot: 1.5707963267948966 rad + pos: -23.5,-45.5 + parent: 30 + - uid: 10788 + components: + - type: Transform + rot: 1.5707963267948966 rad pos: -17.5,-45.5 parent: 30 - - uid: 11177 - components: - - type: MetaData - name: SMES Bank - - type: Transform - pos: -7.5,-37.5 - parent: 30 - uid: 20984 components: - type: MetaData @@ -9595,18 +9396,6 @@ entities: - type: Transform pos: 4.5,24.5 parent: 30 - - uid: 22635 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -31.5,-60.5 - parent: 30 - - uid: 22636 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -33.5,-60.5 - parent: 30 - proto: AirlockEngineeringLocked entities: - uid: 204 @@ -9616,6 +9405,11 @@ entities: - type: Transform pos: 1.5,22.5 parent: 30 + - uid: 340 + components: + - type: Transform + pos: -54.5,-60.5 + parent: 30 - uid: 914 components: - type: Transform @@ -9666,27 +9460,11 @@ entities: - type: Transform pos: 1.5,-36.5 parent: 30 - - uid: 9426 + - uid: 10786 components: - type: Transform - pos: -20.5,-41.5 - parent: 30 - - uid: 9474 - components: - - type: Transform - pos: -14.5,-29.5 - parent: 30 - - uid: 9577 - components: - - type: Transform - pos: -20.5,-42.5 - parent: 30 - - uid: 9693 - components: - - type: MetaData - name: Thermo Electric Generator - - type: Transform - pos: -7.5,-42.5 + rot: 1.5707963267948966 rad + pos: -17.5,-49.5 parent: 30 - uid: 11377 components: @@ -9713,27 +9491,11 @@ entities: - type: Transform pos: -62.5,43.5 parent: 30 - - uid: 17912 - components: - - type: Transform - pos: -54.5,-59.5 - parent: 30 - - uid: 18794 - components: - - type: Transform - pos: -64.5,-61.5 - parent: 30 - uid: 18927 components: - type: Transform pos: -39.5,-24.5 parent: 30 - - uid: 22633 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -28.5,-58.5 - parent: 30 - proto: AirlockExternal entities: - uid: 841 @@ -9792,25 +9554,41 @@ entities: linkedPorts: 1695: - DoorStatus: DoorBolt - - uid: 22631 + - uid: 9501 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -24.5,-58.5 + rot: 1.5707963267948966 rad + pos: -21.5,-55.5 parent: 30 - type: DeviceLinkSource linkedPorts: - 22632: + 10789: - DoorStatus: DoorBolt - - uid: 22632 + - uid: 10534 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -21.5,-58.5 + rot: 3.141592653589793 rad + pos: -13.5,-55.5 + parent: 30 + - type: DeviceLinkSink + invokeCounter: 1 + - uid: 10789 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -23.5,-57.5 + parent: 30 + - type: DeviceLinkSink + invokeCounter: 1 + - uid: 11117 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,-57.5 parent: 30 - type: DeviceLinkSource linkedPorts: - 22631: + 10534: - DoorStatus: DoorBolt - proto: AirlockExternalGlass entities: @@ -9902,66 +9680,24 @@ entities: parent: 30 - proto: AirlockExternalGlassEngineeringLocked entities: - - uid: 3531 + - uid: 9342 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -8.5,-58.5 + rot: 3.141592653589793 rad + pos: 5.5,-44.5 + parent: 30 + - type: DeviceLinkSource + linkedPorts: + 10559: + - DoorStatus: DoorBolt + - uid: 10559 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,-45.5 parent: 30 - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 6272: - - DoorStatus: DoorBolt - 7207: - - DoorStatus: DoorBolt - - uid: 6272 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -7.5,-56.5 - parent: 30 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 3531: - - DoorStatus: DoorBolt - 7207: - - DoorStatus: DoorBolt - - uid: 7207 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -6.5,-58.5 - parent: 30 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 6272: - - DoorStatus: DoorBolt - 3531: - - DoorStatus: DoorBolt - - uid: 10135 - components: - - type: Transform - pos: -17.5,-52.5 - parent: 30 - - type: DeviceLinkSource - linkedPorts: - 10136: - - DoorStatus: DoorBolt - - uid: 10136 - components: - - type: Transform - pos: -17.5,-49.5 - parent: 30 - - type: DeviceLinkSource - linkedPorts: - 10135: - - DoorStatus: DoorBolt + invokeCounter: 1 - uid: 20059 components: - type: Transform @@ -10002,6 +9738,48 @@ entities: linkedPorts: 5390: - DoorStatus: DoorBolt + - uid: 9654 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-54.5 + parent: 30 + - type: DeviceLinkSink + invokeCounter: 2 + - type: DeviceLinkSource + linkedPorts: + 9655: + - DoorStatus: DoorBolt + 9675: + - DoorStatus: DoorBolt + - uid: 9655 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-56.5 + parent: 30 + - type: DeviceLinkSink + invokeCounter: 2 + - type: DeviceLinkSource + linkedPorts: + 9654: + - DoorStatus: DoorBolt + 9675: + - DoorStatus: DoorBolt + - uid: 9675 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-56.5 + parent: 30 + - type: DeviceLinkSink + invokeCounter: 2 + - type: DeviceLinkSource + linkedPorts: + 9654: + - DoorStatus: DoorBolt + 9655: + - DoorStatus: DoorBolt - uid: 15334 components: - type: Transform @@ -10361,6 +10139,16 @@ entities: - type: Transform pos: -34.5,-0.5 parent: 30 + - uid: 4098 + components: + - type: Transform + pos: -62.5,-61.5 + parent: 30 + - uid: 4101 + components: + - type: Transform + pos: -61.5,-61.5 + parent: 30 - uid: 6287 components: - type: Transform @@ -10556,6 +10344,16 @@ entities: - type: Transform pos: -59.5,-22.5 parent: 30 + - uid: 17717 + components: + - type: Transform + pos: -71.5,-59.5 + parent: 30 + - uid: 18360 + components: + - type: Transform + pos: -71.5,-60.5 + parent: 30 - uid: 18534 components: - type: Transform @@ -10566,26 +10364,6 @@ entities: - type: Transform pos: -66.5,-54.5 parent: 30 - - uid: 18733 - components: - - type: Transform - pos: -71.5,-60.5 - parent: 30 - - uid: 18734 - components: - - type: Transform - pos: -69.5,-58.5 - parent: 30 - - uid: 18814 - components: - - type: Transform - pos: -59.5,-61.5 - parent: 30 - - uid: 18815 - components: - - type: Transform - pos: -58.5,-61.5 - parent: 30 - uid: 19392 components: - type: Transform @@ -10773,17 +10551,6 @@ entities: - type: Transform pos: -26.5,-41.5 parent: 30 - - uid: 9462 - components: - - type: Transform - pos: -12.5,-26.5 - parent: 30 - - uid: 22634 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -26.5,-60.5 - parent: 30 - proto: AirlockMaintGlass entities: - uid: 8303 @@ -10992,10 +10759,11 @@ entities: - type: Transform pos: -60.5,31.5 parent: 30 - - uid: 19687 + - uid: 18992 components: - type: Transform - pos: -19.5,-27.5 + rot: 3.141592653589793 rad + pos: -19.5,-28.5 parent: 30 - uid: 19815 components: @@ -11191,7 +10959,7 @@ entities: pos: -20.5,-5.5 parent: 30 - type: Door - secondsUntilStateChange: -1046.2256 + secondsUntilStateChange: -17234.736 state: Opening - type: DeviceLinkSource lastSignals: @@ -11330,6 +11098,12 @@ entities: parent: 30 - proto: AirlockScienceGlassLocked entities: + - uid: 7677 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 15.5,11.5 + parent: 30 - uid: 12914 components: - type: Transform @@ -11342,16 +11116,6 @@ entities: parent: 30 - proto: AirlockScienceLocked entities: - - uid: 12651 - components: - - type: Transform - pos: 16.5,15.5 - parent: 30 - - uid: 12652 - components: - - type: Transform - pos: 19.5,15.5 - parent: 30 - uid: 12908 components: - type: MetaData @@ -11359,6 +11123,12 @@ entities: - type: Transform pos: 34.5,8.5 parent: 30 + - uid: 14335 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 14.5,13.5 + parent: 30 - proto: AirlockSecurityGlass entities: - uid: 2312 @@ -11516,6 +11286,11 @@ entities: - type: Transform pos: -6.5,14.5 parent: 30 + - uid: 12637 + components: + - type: Transform + pos: -67.5,-62.5 + parent: 30 - proto: AirlockTheatreLocked entities: - uid: 652 @@ -11532,6 +11307,16 @@ entities: parent: 30 - proto: AirSensor entities: + - uid: 4353 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 10.5,-26.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 10010 + - 829 - uid: 7116 components: - type: Transform @@ -11569,11 +11354,41 @@ entities: deviceLists: - 8262 - 8254 - - uid: 9952 + - uid: 9994 components: - type: Transform - pos: -23.5,-43.5 + pos: 0.5,-48.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 9996 + - uid: 9995 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -17.5,-51.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 13965 + - 19570 + - uid: 9999 + components: + - type: Transform + pos: 1.5,-39.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 19597 + - uid: 10000 + components: + - type: Transform + pos: -8.5,-40.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 13957 + - 13959 - uid: 17227 components: - type: Transform @@ -11584,61 +11399,38 @@ entities: - type: Transform pos: -48.5,-23.5 parent: 30 + - uid: 18073 + components: + - type: Transform + pos: 20.5,13.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 14365 + - uid: 19562 + components: + - type: Transform + pos: -17.5,-42.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 13958 + - 13964 - uid: 20326 components: - type: Transform pos: -56.5,-23.5 parent: 30 - - uid: 20354 - components: - - type: Transform - pos: -8.5,-44.5 - parent: 30 - - uid: 20355 - components: - - type: Transform - pos: -9.5,-39.5 - parent: 30 - - uid: 20358 - components: - - type: Transform - pos: -17.5,-40.5 - parent: 30 - - uid: 21741 - components: - - type: Transform - pos: -17.5,-34.5 - parent: 30 - - uid: 21744 - components: - - type: Transform - pos: -12.5,-33.5 - parent: 30 - - uid: 21745 - components: - - type: Transform - pos: 1.5,-40.5 - parent: 30 - uid: 21749 components: - type: Transform pos: -2.5,-25.5 parent: 30 - - uid: 21753 - components: - - type: Transform - pos: 10.5,-27.5 - parent: 30 - uid: 21756 components: - type: Transform pos: 12.5,-36.5 parent: 30 - - uid: 21759 - components: - - type: Transform - pos: 12.5,-24.5 - parent: 30 - uid: 21761 components: - type: Transform @@ -11734,11 +11526,6 @@ entities: - type: Transform pos: -66.5,-48.5 parent: 30 - - uid: 21845 - components: - - type: Transform - pos: -57.5,-62.5 - parent: 30 - uid: 21847 components: - type: Transform @@ -11964,11 +11751,6 @@ entities: - type: Transform pos: 32.5,19.5 parent: 30 - - uid: 22056 - components: - - type: Transform - pos: 20.5,11.5 - parent: 30 - uid: 22058 components: - type: Transform @@ -12043,17 +11825,10 @@ entities: parent: 30 - proto: AmeController entities: - - uid: 9476 + - uid: 11269 components: - type: Transform - pos: -11.5,-27.5 - parent: 30 -- proto: AmeJar - entities: - - uid: 801 - components: - - type: Transform - pos: -17.490644,-32.439728 + pos: -13.5,-47.5 parent: 30 - proto: AnomalyScanner entities: @@ -12338,6 +12113,12 @@ entities: rot: 1.5707963267948966 rad pos: -27.5,-23.5 parent: 30 + - uid: 8278 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -20.5,-45.5 + parent: 30 - uid: 8363 components: - type: MetaData @@ -12370,16 +12151,6 @@ entities: - type: Transform pos: 0.5,-31.5 parent: 30 - - uid: 9573 - components: - - type: MetaData - name: Engineering APC - - type: Transform - rot: 1.5707963267948966 rad - pos: -20.5,-38.5 - parent: 30 - - type: Battery - startingCharge: 12000 - uid: 9628 components: - type: MetaData @@ -12388,29 +12159,16 @@ entities: rot: -1.5707963267948966 rad pos: -26.5,-2.5 parent: 30 - - uid: 10633 + - uid: 9934 components: - - type: MetaData - name: Engineering Central APC - type: Transform rot: 1.5707963267948966 rad - pos: -14.5,-38.5 + pos: -18.5,-30.5 parent: 30 - - uid: 10641 + - uid: 10590 components: - - type: MetaData - name: AME APC - type: Transform - rot: 1.5707963267948966 rad - pos: -14.5,-32.5 - parent: 30 - - uid: 10790 - components: - - type: MetaData - name: TEG APC - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,-47.5 + pos: -20.5,-53.5 parent: 30 - uid: 10791 components: @@ -12420,6 +12178,11 @@ entities: rot: 1.5707963267948966 rad pos: -10.5,-7.5 parent: 30 + - uid: 11014 + components: + - type: Transform + pos: -10.5,-37.5 + parent: 30 - uid: 11808 components: - type: MetaData @@ -12442,13 +12205,6 @@ entities: rot: -1.5707963267948966 rad pos: 41.5,10.5 parent: 30 - - uid: 12974 - components: - - type: MetaData - name: RND APC - - type: Transform - pos: 18.5,13.5 - parent: 30 - uid: 13096 components: - type: MetaData @@ -12470,6 +12226,12 @@ entities: - type: Transform pos: 15.5,55.5 parent: 30 + - uid: 14364 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 16.5,13.5 + parent: 30 - uid: 14541 components: - type: MetaData @@ -12511,6 +12273,11 @@ entities: - type: Transform pos: 0.5,85.5 parent: 30 + - uid: 20367 + components: + - type: Transform + pos: 1.5,-42.5 + parent: 30 - uid: 22213 components: - type: MetaData @@ -12526,21 +12293,12 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,10.5 parent: 30 - - uid: 22672 +- proto: APCElectronics + entities: + - uid: 15969 components: - - type: MetaData - name: Telecomms APC - type: Transform - rot: -1.5707963267948966 rad - pos: -33.5,-57.5 - parent: 30 - - uid: 22673 - components: - - type: MetaData - name: Telecomms Entrance APC - - type: Transform - rot: -1.5707963267948966 rad - pos: -28.5,-60.5 + pos: 3.115302,20.471077 parent: 30 - proto: APCSuperCapacity entities: @@ -12577,6 +12335,41 @@ entities: parent: 30 - proto: AsteroidRock entities: + - uid: 332 + components: + - type: Transform + pos: -61.5,-68.5 + parent: 30 + - uid: 333 + components: + - type: Transform + pos: -60.5,-69.5 + parent: 30 + - uid: 3342 + components: + - type: Transform + pos: -51.5,-67.5 + parent: 30 + - uid: 3343 + components: + - type: Transform + pos: -54.5,-68.5 + parent: 30 + - uid: 3345 + components: + - type: Transform + pos: -53.5,-67.5 + parent: 30 + - uid: 3346 + components: + - type: Transform + pos: -52.5,-67.5 + parent: 30 + - uid: 12854 + components: + - type: Transform + pos: -54.5,-67.5 + parent: 30 - uid: 13747 components: - type: Transform @@ -12757,26 +12550,16 @@ entities: - type: Transform pos: -70.5,-49.5 parent: 30 + - uid: 17791 + components: + - type: Transform + pos: -53.5,-68.5 + parent: 30 - uid: 18183 components: - type: Transform pos: -74.5,-39.5 parent: 30 - - uid: 18189 - components: - - type: Transform - pos: -53.5,-61.5 - parent: 30 - - uid: 18190 - components: - - type: Transform - pos: -52.5,-61.5 - parent: 30 - - uid: 18191 - components: - - type: Transform - pos: -51.5,-61.5 - parent: 30 - uid: 18192 components: - type: Transform @@ -12837,61 +12620,11 @@ entities: - type: Transform pos: -50.5,-62.5 parent: 30 - - uid: 18205 - components: - - type: Transform - pos: -51.5,-62.5 - parent: 30 - - uid: 18206 - components: - - type: Transform - pos: -52.5,-62.5 - parent: 30 - - uid: 18207 - components: - - type: Transform - pos: -52.5,-63.5 - parent: 30 - uid: 18208 components: - type: Transform pos: -50.5,-63.5 parent: 30 - - uid: 18210 - components: - - type: Transform - pos: -52.5,-64.5 - parent: 30 - - uid: 18211 - components: - - type: Transform - pos: -52.5,-65.5 - parent: 30 - - uid: 18212 - components: - - type: Transform - pos: -52.5,-66.5 - parent: 30 - - uid: 18213 - components: - - type: Transform - pos: -52.5,-67.5 - parent: 30 - - uid: 18214 - components: - - type: Transform - pos: -51.5,-66.5 - parent: 30 - - uid: 18215 - components: - - type: Transform - pos: -51.5,-65.5 - parent: 30 - - uid: 18216 - components: - - type: Transform - pos: -51.5,-64.5 - parent: 30 - uid: 18217 components: - type: Transform @@ -13102,36 +12835,6 @@ entities: - type: Transform pos: -81.5,-56.5 parent: 30 - - uid: 18354 - components: - - type: Transform - pos: -55.5,-69.5 - parent: 30 - - uid: 18355 - components: - - type: Transform - pos: -56.5,-69.5 - parent: 30 - - uid: 18356 - components: - - type: Transform - pos: -61.5,-69.5 - parent: 30 - - uid: 18357 - components: - - type: Transform - pos: -62.5,-69.5 - parent: 30 - - uid: 18358 - components: - - type: Transform - pos: -62.5,-68.5 - parent: 30 - - uid: 18359 - components: - - type: Transform - pos: -62.5,-67.5 - parent: 30 - uid: 18361 components: - type: Transform @@ -13187,26 +12890,61 @@ entities: - type: Transform pos: -66.5,-68.5 parent: 30 - - uid: 18372 - components: - - type: Transform - pos: -65.5,-68.5 - parent: 30 - - uid: 18373 - components: - - type: Transform - pos: -64.5,-68.5 - parent: 30 - - uid: 18374 - components: - - type: Transform - pos: -63.5,-68.5 - parent: 30 - uid: 18376 components: - type: Transform pos: -79.5,-65.5 parent: 30 + - uid: 18776 + components: + - type: Transform + pos: -58.5,-69.5 + parent: 30 + - uid: 18777 + components: + - type: Transform + pos: -57.5,-69.5 + parent: 30 + - uid: 18778 + components: + - type: Transform + pos: -59.5,-69.5 + parent: 30 + - uid: 18779 + components: + - type: Transform + pos: -57.5,-68.5 + parent: 30 + - uid: 18780 + components: + - type: Transform + pos: -58.5,-68.5 + parent: 30 + - uid: 18781 + components: + - type: Transform + pos: -56.5,-68.5 + parent: 30 + - uid: 18782 + components: + - type: Transform + pos: -55.5,-68.5 + parent: 30 + - uid: 18784 + components: + - type: Transform + pos: -59.5,-68.5 + parent: 30 + - uid: 18785 + components: + - type: Transform + pos: -60.5,-68.5 + parent: 30 + - uid: 18798 + components: + - type: Transform + pos: -56.5,-69.5 + parent: 30 - uid: 19393 components: - type: Transform @@ -13531,18 +13269,11 @@ entities: parent: 30 - proto: Autolathe entities: - - uid: 11276 + - uid: 3125 components: - type: Transform - pos: 3.5,-43.5 + pos: -21.5,-44.5 parent: 30 - - type: MaterialStorage - materialWhiteList: - - Steel - - Plastic - - Wood - - Glass - - Cloth - uid: 11726 components: - type: Transform @@ -13602,6 +13333,12 @@ entities: parent: 30 - proto: Barricade entities: + - uid: 3196 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -19.5,-27.5 + parent: 30 - uid: 15531 components: - type: Transform @@ -13622,11 +13359,6 @@ entities: - type: Transform pos: -53.5,42.5 parent: 30 - - uid: 19688 - components: - - type: Transform - pos: -19.5,-26.5 - parent: 30 - uid: 19689 components: - type: Transform @@ -13683,6 +13415,19 @@ entities: - type: Transform pos: -0.5,-10.5 parent: 30 +- proto: BaseComputer + entities: + - uid: 8821 + components: + - type: Transform + pos: -12.5,-33.5 + parent: 30 + - uid: 9592 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -17.5,-31.5 + parent: 30 - proto: BaseGasCondenser entities: - uid: 6731 @@ -13840,6 +13585,11 @@ entities: - type: Transform pos: -51.5,-53.5 parent: 30 + - uid: 18216 + components: + - type: Transform + pos: -69.5,-62.5 + parent: 30 - uid: 21091 components: - type: Transform @@ -13884,14 +13634,6 @@ entities: - type: Transform pos: -17.5,31.5 parent: 30 -- proto: BedsheetCE - entities: - - uid: 9329 - components: - - type: Transform - parent: 9604 - - type: Physics - canCollide: False - proto: BedsheetCMO entities: - uid: 7166 @@ -14012,6 +13754,11 @@ entities: - type: Transform pos: -51.5,-53.5 parent: 30 + - uid: 18786 + components: + - type: Transform + pos: -69.5,-62.5 + parent: 30 - uid: 21092 components: - type: Transform @@ -14097,50 +13844,57 @@ entities: - type: Transform pos: -43.5,16.5 parent: 30 + - uid: 9064 + components: + - type: Transform + pos: -4.5,-58.5 + parent: 30 + - type: DeviceLinkSink + invokeCounter: 1 + - uid: 9065 + components: + - type: Transform + pos: -3.5,-58.5 + parent: 30 - uid: 9068 components: - type: Transform pos: 12.5,-38.5 parent: 30 - - uid: 9404 + - uid: 9302 components: - type: Transform - pos: -24.5,-45.5 + pos: 2.5,-58.5 parent: 30 - - uid: 9405 + - uid: 9533 components: - type: Transform - pos: -23.5,-45.5 + pos: -16.5,-38.5 parent: 30 - - uid: 9825 + - uid: 9678 components: - type: Transform - pos: -13.5,-59.5 + pos: -2.5,-58.5 parent: 30 - - uid: 9826 + - uid: 9690 components: - type: Transform - pos: -13.5,-58.5 + pos: 1.5,-58.5 parent: 30 - - uid: 9827 + - uid: 9691 components: - type: Transform - pos: -13.5,-57.5 + pos: 3.5,-58.5 parent: 30 - - uid: 9828 + - uid: 11015 components: - type: Transform - pos: -1.5,-59.5 + pos: -18.5,-38.5 parent: 30 - - uid: 9829 + - uid: 11028 components: - type: Transform - pos: -1.5,-58.5 - parent: 30 - - uid: 9830 - components: - - type: Transform - pos: -1.5,-57.5 + pos: -17.5,-38.5 parent: 30 - uid: 11659 components: @@ -14177,16 +13931,11 @@ entities: - type: Transform pos: 36.5,14.5 parent: 30 - - uid: 13751 + - uid: 15990 components: - type: Transform pos: 48.5,25.5 parent: 30 - - uid: 14512 - components: - - type: Transform - pos: 48.5,23.5 - parent: 30 - uid: 16228 components: - type: Transform @@ -14323,38 +14072,38 @@ entities: enabled: False - proto: BookAtmosAirAlarms entities: - - uid: 22308 + - uid: 3347 components: - type: Transform - pos: -60.65072,-63.356808 + pos: -58.671722,-63.148144 parent: 30 - proto: BookAtmosDistro entities: - - uid: 22309 + - uid: 3359 components: - type: Transform - pos: -60.36943,-63.3924 + pos: -58.35984,-63.163 parent: 30 - proto: BookAtmosVentsMore entities: - - uid: 22310 + - uid: 16405 components: - type: Transform - pos: -60.68197,-63.450558 + pos: -58.656876,-63.44517 parent: 30 - proto: BookAtmosWaste entities: - - uid: 22311 + - uid: 3357 components: - type: Transform - pos: -60.353844,-63.575558 + pos: -58.35984,-63.50458 parent: 30 - proto: BookHowToCookForFortySpaceman entities: - uid: 9948 components: - type: Transform - pos: -15.506373,7.7216425 + pos: -17.483065,5.6789637 parent: 30 - proto: BookRandomStory entities: @@ -14363,23 +14112,6 @@ entities: - type: Transform pos: 8.515235,-13.437349 parent: 30 - - uid: 22306 - components: - - type: Transform - pos: -54.57496,-63.325558 - parent: 30 - - uid: 22307 - components: - - type: Transform - pos: -54.340584,-63.466183 - parent: 30 -- proto: BooksBag - entities: - - uid: 22303 - components: - - type: Transform - pos: -60.525063,-67.28237 - parent: 30 - proto: Bookshelf entities: - uid: 2356 @@ -14434,50 +14166,30 @@ entities: - type: Transform pos: 7.5,-13.5 parent: 30 - - uid: 14970 + - uid: 10148 components: - type: Transform - pos: -54.5,-65.5 + pos: -60.5,-62.5 parent: 30 - - uid: 15180 + - uid: 10149 components: - type: Transform - pos: -55.5,-65.5 + pos: -58.5,-62.5 parent: 30 - - uid: 15213 + - uid: 12819 components: - type: Transform - pos: -56.5,-65.5 + pos: -59.5,-62.5 parent: 30 - - uid: 15214 + - uid: 14361 components: - type: Transform - pos: -54.5,-67.5 + pos: -58.5,-64.5 parent: 30 - - uid: 15280 + - uid: 14504 components: - type: Transform - pos: -55.5,-67.5 - parent: 30 - - uid: 15353 - components: - - type: Transform - pos: -56.5,-67.5 - parent: 30 - - uid: 15355 - components: - - type: Transform - pos: -54.5,-62.5 - parent: 30 - - uid: 15975 - components: - - type: Transform - pos: -55.5,-62.5 - parent: 30 - - uid: 16165 - components: - - type: Transform - pos: -56.5,-63.5 + pos: -67.5,-65.5 parent: 30 - uid: 16177 components: @@ -14519,6 +14231,11 @@ entities: - type: Transform pos: -76.5,-61.5 parent: 30 + - uid: 17544 + components: + - type: Transform + pos: -59.5,-64.5 + parent: 30 - uid: 17669 components: - type: Transform @@ -14539,6 +14256,21 @@ entities: - type: Transform pos: -74.5,-58.5 parent: 30 + - uid: 18773 + components: + - type: Transform + pos: -60.5,-66.5 + parent: 30 + - uid: 18774 + components: + - type: Transform + pos: -58.5,-66.5 + parent: 30 + - uid: 18783 + components: + - type: Transform + pos: -59.5,-66.5 + parent: 30 - uid: 18818 components: - type: Transform @@ -14687,6 +14419,11 @@ entities: parent: 30 - proto: BoxFolderGrey entities: + - uid: 339 + components: + - type: Transform + pos: 16.633371,16.353863 + parent: 30 - uid: 1403 components: - type: Transform @@ -14697,11 +14434,6 @@ entities: - type: Transform pos: -11.490971,34.71304 parent: 30 - - uid: 12865 - components: - - type: Transform - pos: 14.525648,10.557264 - parent: 30 - proto: BoxFolderRed entities: - uid: 1520 @@ -14763,11 +14495,6 @@ entities: - type: Transform pos: -7.4440956,34.21304 parent: 30 - - uid: 9616 - components: - - type: Transform - pos: -17.512093,-35.436672 - parent: 30 - uid: 11253 components: - type: Transform @@ -14778,10 +14505,10 @@ entities: - type: Transform pos: 17.53771,-0.43951988 parent: 30 - - uid: 19424 + - uid: 12842 components: - type: Transform - pos: -60.46691,-65.40645 + pos: -62.622215,-64.76696 parent: 30 - proto: BoxHandcuff entities: @@ -14814,7 +14541,7 @@ entities: - uid: 18788 components: - type: Transform - pos: -63.476974,-62.485996 + pos: -52.499535,-60.446262 parent: 30 - proto: BoxLightMixed entities: @@ -14961,11 +14688,6 @@ entities: parent: 30 - proto: Bucket entities: - - uid: 318 - components: - - type: Transform - pos: -24.461937,5.451811 - parent: 30 - uid: 323 components: - type: Transform @@ -14981,6 +14703,11 @@ entities: - type: Transform pos: -47.45382,68.49689 parent: 30 + - uid: 13049 + components: + - type: Transform + pos: -24.119356,6.357745 + parent: 30 - uid: 19541 components: - type: Transform @@ -14998,6 +14725,49 @@ entities: - type: Transform pos: -15.949732,15.31613 parent: 30 +- proto: ButtonFrameCaution + entities: + - uid: 12380 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -20.5,-47.5 + parent: 30 +- proto: ButtonFrameCautionSecurity + entities: + - uid: 9062 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-54.5 + parent: 30 + - uid: 9215 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-54.5 + parent: 30 +- proto: ButtonFrameGrey + entities: + - uid: 11138 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -15.5,-38.5 + parent: 30 +- proto: ButtonFrameJanitor + entities: + - uid: 9401 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-5.5 + parent: 30 + - uid: 9405 + components: + - type: Transform + pos: 18.5,17.5 + parent: 30 - proto: CableApcExtension entities: - uid: 41 @@ -15010,6 +14780,11 @@ entities: - type: Transform pos: 27.5,20.5 parent: 30 + - uid: 335 + components: + - type: Transform + pos: -67.5,-60.5 + parent: 30 - uid: 408 components: - type: Transform @@ -15020,16 +14795,26 @@ entities: - type: Transform pos: -14.5,20.5 parent: 30 + - uid: 773 + components: + - type: Transform + pos: -24.5,-41.5 + parent: 30 + - uid: 788 + components: + - type: Transform + pos: -22.5,-40.5 + parent: 30 + - uid: 795 + components: + - type: Transform + pos: -23.5,-43.5 + parent: 30 - uid: 828 components: - type: Transform pos: 30.5,-6.5 parent: 30 - - uid: 870 - components: - - type: Transform - pos: -12.5,-55.5 - parent: 30 - uid: 878 components: - type: Transform @@ -15045,6 +14830,16 @@ entities: - type: Transform pos: -59.5,7.5 parent: 30 + - uid: 908 + components: + - type: Transform + pos: -9.5,-29.5 + parent: 30 + - uid: 915 + components: + - type: Transform + pos: -12.5,-30.5 + parent: 30 - uid: 917 components: - type: Transform @@ -15145,6 +14940,11 @@ entities: - type: Transform pos: -37.5,61.5 parent: 30 + - uid: 3126 + components: + - type: Transform + pos: -11.5,-56.5 + parent: 30 - uid: 3193 components: - type: Transform @@ -17030,31 +16830,6 @@ entities: - type: Transform pos: -26.5,7.5 parent: 30 - - uid: 4126 - components: - - type: Transform - pos: -26.5,6.5 - parent: 30 - - uid: 4127 - components: - - type: Transform - pos: -26.5,6.5 - parent: 30 - - uid: 4128 - components: - - type: Transform - pos: -26.5,5.5 - parent: 30 - - uid: 4129 - components: - - type: Transform - pos: -27.5,5.5 - parent: 30 - - uid: 4130 - components: - - type: Transform - pos: -28.5,5.5 - parent: 30 - uid: 4131 components: - type: Transform @@ -17103,12 +16878,7 @@ entities: - uid: 4140 components: - type: Transform - pos: -25.5,6.5 - parent: 30 - - uid: 4141 - components: - - type: Transform - pos: -24.5,6.5 + pos: 16.5,11.5 parent: 30 - uid: 4142 components: @@ -17915,6 +17685,11 @@ entities: - type: Transform pos: -29.5,-22.5 parent: 30 + - uid: 4444 + components: + - type: Transform + pos: -23.5,-44.5 + parent: 30 - uid: 4569 components: - type: Transform @@ -18965,11 +18740,6 @@ entities: - type: Transform pos: -51.5,55.5 parent: 30 - - uid: 4827 - components: - - type: Transform - pos: -7.5,-55.5 - parent: 30 - uid: 4829 components: - type: Transform @@ -18985,16 +18755,6 @@ entities: - type: Transform pos: -41.5,29.5 parent: 30 - - uid: 4893 - components: - - type: Transform - pos: -9.5,-55.5 - parent: 30 - - uid: 4894 - components: - - type: Transform - pos: -8.5,-55.5 - parent: 30 - uid: 5188 components: - type: Transform @@ -20265,21 +20025,6 @@ entities: - type: Transform pos: 7.5,26.5 parent: 30 - - uid: 6274 - components: - - type: Transform - pos: -3.5,-55.5 - parent: 30 - - uid: 6466 - components: - - type: Transform - pos: -4.5,-55.5 - parent: 30 - - uid: 6467 - components: - - type: Transform - pos: -5.5,-55.5 - parent: 30 - uid: 6648 components: - type: Transform @@ -20555,6 +20300,11 @@ entities: - type: Transform pos: -29.5,-21.5 parent: 30 + - uid: 7107 + components: + - type: Transform + pos: -6.5,-29.5 + parent: 30 - uid: 7138 components: - type: Transform @@ -20565,11 +20315,6 @@ entities: - type: Transform pos: -29.5,-23.5 parent: 30 - - uid: 7225 - components: - - type: Transform - pos: -10.5,-33.5 - parent: 30 - uid: 7418 components: - type: Transform @@ -21530,16 +21275,26 @@ entities: - type: Transform pos: -34.5,-3.5 parent: 30 - - uid: 8253 + - uid: 8266 components: - type: Transform - pos: -11.5,-33.5 + pos: -20.5,-41.5 parent: 30 - uid: 8289 components: - type: Transform pos: -25.5,-23.5 parent: 30 + - uid: 8293 + components: + - type: Transform + pos: -20.5,-45.5 + parent: 30 + - uid: 8294 + components: + - type: Transform + pos: -6.5,-28.5 + parent: 30 - uid: 8302 components: - type: Transform @@ -21580,31 +21335,81 @@ entities: - type: Transform pos: 27.5,-21.5 parent: 30 - - uid: 8819 + - uid: 8800 components: - type: Transform - pos: -9.5,-58.5 + pos: -25.5,-41.5 parent: 30 - - uid: 8820 + - uid: 8807 components: - type: Transform - pos: -10.5,-58.5 + pos: -17.5,-36.5 + parent: 30 + - uid: 8818 + components: + - type: Transform + pos: -18.5,-36.5 parent: 30 - uid: 8822 components: - type: Transform - pos: -11.5,-58.5 + pos: -16.5,-36.5 + parent: 30 + - uid: 8823 + components: + - type: Transform + pos: -17.5,-42.5 + parent: 30 + - uid: 8824 + components: + - type: Transform + pos: -22.5,-48.5 + parent: 30 + - uid: 8825 + components: + - type: Transform + pos: -23.5,-48.5 + parent: 30 + - uid: 8835 + components: + - type: Transform + pos: -17.5,-41.5 + parent: 30 + - uid: 8836 + components: + - type: Transform + pos: -23.5,-49.5 + parent: 30 + - uid: 9406 + components: + - type: Transform + pos: -20.5,-42.5 + parent: 30 + - uid: 9421 + components: + - type: Transform + pos: -22.5,-41.5 parent: 30 - uid: 9422 components: - type: Transform pos: -24.5,-6.5 parent: 30 + - uid: 9567 + components: + - type: Transform + pos: -21.5,-41.5 + parent: 30 - uid: 9611 components: - type: Transform pos: 1.5,-8.5 parent: 30 + - uid: 9619 + components: + - type: Transform + pos: -12.5,-28.5 + parent: 30 - uid: 9635 components: - type: Transform @@ -21615,26 +21420,6 @@ entities: - type: Transform pos: -41.5,-12.5 parent: 30 - - uid: 9653 - components: - - type: Transform - pos: -6.5,-58.5 - parent: 30 - - uid: 9654 - components: - - type: Transform - pos: -4.5,-58.5 - parent: 30 - - uid: 9655 - components: - - type: Transform - pos: -5.5,-58.5 - parent: 30 - - uid: 9656 - components: - - type: Transform - pos: -7.5,-58.5 - parent: 30 - uid: 9665 components: - type: Transform @@ -21655,26 +21440,6 @@ entities: - type: Transform pos: -36.5,-6.5 parent: 30 - - uid: 9677 - components: - - type: Transform - pos: -2.5,-55.5 - parent: 30 - - uid: 9678 - components: - - type: Transform - pos: -6.5,-55.5 - parent: 30 - - uid: 9679 - components: - - type: Transform - pos: -11.5,-55.5 - parent: 30 - - uid: 9690 - components: - - type: Transform - pos: -10.5,-55.5 - parent: 30 - uid: 9698 components: - type: Transform @@ -21690,26 +21455,6 @@ entities: - type: Transform pos: -37.5,-6.5 parent: 30 - - uid: 9821 - components: - - type: Transform - pos: -3.5,-58.5 - parent: 30 - - uid: 9822 - components: - - type: Transform - pos: -8.5,-58.5 - parent: 30 - - uid: 9823 - components: - - type: Transform - pos: -7.5,-56.5 - parent: 30 - - uid: 9824 - components: - - type: Transform - pos: -7.5,-57.5 - parent: 30 - uid: 9851 components: - type: Transform @@ -21740,6 +21485,21 @@ entities: - type: Transform pos: -18.5,-4.5 parent: 30 + - uid: 10001 + components: + - type: Transform + pos: -23.5,-42.5 + parent: 30 + - uid: 10008 + components: + - type: Transform + pos: -23.5,-41.5 + parent: 30 + - uid: 10009 + components: + - type: Transform + pos: -12.5,-35.5 + parent: 30 - uid: 10048 components: - type: Transform @@ -21800,395 +21560,150 @@ entities: - type: Transform pos: -59.5,-8.5 parent: 30 - - uid: 10503 + - uid: 10163 components: - type: Transform - pos: -7.5,-52.5 + pos: -24.5,-48.5 parent: 30 - - uid: 10536 - components: - - type: Transform - pos: 3.5,-38.5 - parent: 30 - - uid: 10582 - components: - - type: Transform - pos: -20.5,-38.5 - parent: 30 - - uid: 10583 - components: - - type: Transform - pos: -19.5,-38.5 - parent: 30 - - uid: 10584 - components: - - type: Transform - pos: -18.5,-38.5 - parent: 30 - - uid: 10585 - components: - - type: Transform - pos: -17.5,-38.5 - parent: 30 - - uid: 10586 - components: - - type: Transform - pos: -18.5,-37.5 - parent: 30 - - uid: 10587 - components: - - type: Transform - pos: -18.5,-36.5 - parent: 30 - - uid: 10588 - components: - - type: Transform - pos: -17.5,-36.5 - parent: 30 - - uid: 10589 - components: - - type: Transform - pos: -16.5,-36.5 - parent: 30 - - uid: 10590 - components: - - type: Transform - pos: -16.5,-35.5 - parent: 30 - - uid: 10591 - components: - - type: Transform - pos: -16.5,-34.5 - parent: 30 - - uid: 10592 - components: - - type: Transform - pos: -18.5,-39.5 - parent: 30 - - uid: 10593 - components: - - type: Transform - pos: -18.5,-40.5 - parent: 30 - - uid: 10594 - components: - - type: Transform - pos: -18.5,-41.5 - parent: 30 - - uid: 10595 - components: - - type: Transform - pos: -18.5,-42.5 - parent: 30 - - uid: 10596 - components: - - type: Transform - pos: -18.5,-43.5 - parent: 30 - - uid: 10597 - components: - - type: Transform - pos: -19.5,-42.5 - parent: 30 - - uid: 10598 - components: - - type: Transform - pos: -20.5,-42.5 - parent: 30 - - uid: 10599 - components: - - type: Transform - pos: -21.5,-42.5 - parent: 30 - - uid: 10600 - components: - - type: Transform - pos: -22.5,-42.5 - parent: 30 - - uid: 10601 - components: - - type: Transform - pos: -23.5,-42.5 - parent: 30 - - uid: 10602 - components: - - type: Transform - pos: -23.5,-43.5 - parent: 30 - - uid: 10603 - components: - - type: Transform - pos: -23.5,-44.5 - parent: 30 - - uid: 10604 - components: - - type: Transform - pos: -23.5,-45.5 - parent: 30 - - uid: 10605 - components: - - type: Transform - pos: -23.5,-46.5 - parent: 30 - - uid: 10606 + - uid: 10176 components: - type: Transform pos: -23.5,-47.5 parent: 30 - - uid: 10607 - components: - - type: Transform - pos: -23.5,-48.5 - parent: 30 - - uid: 10608 - components: - - type: Transform - pos: -23.5,-49.5 - parent: 30 - - uid: 10609 - components: - - type: Transform - pos: -23.5,-50.5 - parent: 30 - - uid: 10610 - components: - - type: Transform - pos: -23.5,-41.5 - parent: 30 - - uid: 10611 - components: - - type: Transform - pos: -23.5,-40.5 - parent: 30 - - uid: 10612 - components: - - type: Transform - pos: -24.5,-40.5 - parent: 30 - - uid: 10613 - components: - - type: Transform - pos: -25.5,-40.5 - parent: 30 - - uid: 10614 - components: - - type: Transform - pos: -22.5,-40.5 - parent: 30 - - uid: 10615 - components: - - type: Transform - pos: -21.5,-40.5 - parent: 30 - - uid: 10616 + - uid: 10179 components: - type: Transform pos: -17.5,-43.5 parent: 30 + - uid: 10180 + components: + - type: Transform + pos: -17.5,-38.5 + parent: 30 + - uid: 10181 + components: + - type: Transform + pos: -18.5,-41.5 + parent: 30 + - uid: 10182 + components: + - type: Transform + pos: -19.5,-41.5 + parent: 30 + - uid: 10192 + components: + - type: Transform + pos: -23.5,-46.5 + parent: 30 + - uid: 10194 + components: + - type: Transform + pos: -23.5,-45.5 + parent: 30 + - uid: 10235 + components: + - type: Transform + pos: -3.5,-14.5 + parent: 30 + - uid: 10268 + components: + - type: Transform + pos: -16.5,-30.5 + parent: 30 + - uid: 10269 + components: + - type: Transform + pos: -18.5,-30.5 + parent: 30 + - uid: 10270 + components: + - type: Transform + pos: -20.5,-43.5 + parent: 30 + - uid: 10444 + components: + - type: Transform + pos: -17.5,-30.5 + parent: 30 + - uid: 10531 + components: + - type: Transform + pos: -15.5,-30.5 + parent: 30 + - uid: 10538 + components: + - type: Transform + pos: -20.5,-44.5 + parent: 30 + - uid: 10597 + components: + - type: Transform + pos: -19.5,-53.5 + parent: 30 + - uid: 10612 + components: + - type: Transform + pos: -14.5,-30.5 + parent: 30 - uid: 10617 - components: - - type: Transform - pos: -17.5,-44.5 - parent: 30 - - uid: 10618 - components: - - type: Transform - pos: -17.5,-45.5 - parent: 30 - - uid: 10619 - components: - - type: Transform - pos: -17.5,-46.5 - parent: 30 - - uid: 10620 - components: - - type: Transform - pos: -17.5,-47.5 - parent: 30 - - uid: 10621 - components: - - type: Transform - pos: -17.5,-48.5 - parent: 30 - - uid: 10622 - components: - - type: Transform - pos: -17.5,-48.5 - parent: 30 - - uid: 10623 - components: - - type: Transform - pos: -17.5,-49.5 - parent: 30 - - uid: 10624 - components: - - type: Transform - pos: -17.5,-50.5 - parent: 30 - - uid: 10625 components: - type: Transform pos: -17.5,-51.5 parent: 30 - - uid: 10626 + - uid: 10619 components: - type: Transform - pos: -17.5,-52.5 + pos: -20.5,-53.5 + parent: 30 + - uid: 10621 + components: + - type: Transform + pos: -17.5,-50.5 + parent: 30 + - uid: 10624 + components: + - type: Transform + pos: -23.5,-55.5 parent: 30 - uid: 10627 components: - type: Transform - pos: -17.5,-53.5 - parent: 30 - - uid: 10628 - components: - - type: Transform - pos: -17.5,-54.5 + pos: -23.5,-56.5 parent: 30 - uid: 10629 components: - type: Transform - pos: -17.5,-40.5 - parent: 30 - - uid: 10630 - components: - - type: Transform - pos: -16.5,-40.5 - parent: 30 - - uid: 10631 - components: - - type: Transform - pos: -15.5,-40.5 + pos: -19.5,-52.5 parent: 30 - uid: 10632 components: - type: Transform pos: -9.5,-7.5 parent: 30 - - uid: 10634 - components: - - type: Transform - pos: -12.5,-40.5 - parent: 30 - - uid: 10635 - components: - - type: Transform - pos: -11.5,-40.5 - parent: 30 - - uid: 10636 - components: - - type: Transform - pos: -10.5,-40.5 - parent: 30 - - uid: 10637 - components: - - type: Transform - pos: -9.5,-40.5 - parent: 30 - - uid: 10638 - components: - - type: Transform - pos: -8.5,-40.5 - parent: 30 - - uid: 10639 - components: - - type: Transform - pos: -7.5,-40.5 - parent: 30 - - uid: 10640 - components: - - type: Transform - pos: -7.5,-41.5 - parent: 30 - uid: 10644 components: - type: Transform - pos: -7.5,-44.5 + pos: -19.5,-51.5 parent: 30 - uid: 10645 components: - type: Transform - pos: -8.5,-44.5 - parent: 30 - - uid: 10646 - components: - - type: Transform - pos: -9.5,-44.5 + pos: -17.5,-49.5 parent: 30 - uid: 10647 components: - type: Transform - pos: -10.5,-44.5 - parent: 30 - - uid: 10648 - components: - - type: Transform - pos: -11.5,-44.5 - parent: 30 - - uid: 10649 - components: - - type: Transform - pos: -12.5,-44.5 - parent: 30 - - uid: 10650 - components: - - type: Transform - pos: -13.5,-44.5 - parent: 30 - - uid: 10651 - components: - - type: Transform - pos: -13.5,-45.5 + pos: -11.5,-57.5 parent: 30 - uid: 10652 components: - type: Transform - pos: -13.5,-46.5 - parent: 30 - - uid: 10653 - components: - - type: Transform - pos: -13.5,-47.5 - parent: 30 - - uid: 10654 - components: - - type: Transform - pos: -13.5,-48.5 - parent: 30 - - uid: 10655 - components: - - type: Transform - pos: -13.5,-49.5 - parent: 30 - - uid: 10656 - components: - - type: Transform - pos: -13.5,-50.5 - parent: 30 - - uid: 10657 - components: - - type: Transform - pos: -13.5,-51.5 + pos: -13.5,-31.5 parent: 30 - uid: 10658 components: - type: Transform - pos: -13.5,-52.5 - parent: 30 - - uid: 10659 - components: - - type: Transform - pos: -13.5,-53.5 - parent: 30 - - uid: 10660 - components: - - type: Transform - pos: -13.5,-54.5 - parent: 30 - - uid: 10661 - components: - - type: Transform - pos: -13.5,-55.5 + pos: -11.5,-58.5 parent: 30 - uid: 10662 components: @@ -22230,85 +21745,45 @@ entities: - type: Transform pos: -63.5,23.5 parent: 30 - - uid: 10679 + - uid: 10672 components: - type: Transform - pos: -1.5,-55.5 + pos: -11.5,-29.5 parent: 30 - - uid: 10680 + - uid: 10673 components: - type: Transform - pos: -1.5,-53.5 - parent: 30 - - uid: 10681 - components: - - type: Transform - pos: -1.5,-52.5 - parent: 30 - - uid: 10682 - components: - - type: Transform - pos: -1.5,-54.5 - parent: 30 - - uid: 10683 - components: - - type: Transform - pos: -1.5,-51.5 - parent: 30 - - uid: 10684 - components: - - type: Transform - pos: -1.5,-50.5 - parent: 30 - - uid: 10685 - components: - - type: Transform - pos: -1.5,-49.5 - parent: 30 - - uid: 10686 - components: - - type: Transform - pos: -1.5,-48.5 - parent: 30 - - uid: 10687 - components: - - type: Transform - pos: -1.5,-47.5 - parent: 30 - - uid: 10689 - components: - - type: Transform - pos: -1.5,-45.5 + pos: -8.5,-29.5 parent: 30 - uid: 10690 components: - type: Transform - pos: -2.5,-44.5 + pos: -17.5,-55.5 parent: 30 - uid: 10691 components: - type: Transform - pos: -3.5,-44.5 + pos: -16.5,-55.5 parent: 30 - uid: 10692 components: - type: Transform - pos: -1.5,-44.5 + pos: -18.5,-55.5 parent: 30 - uid: 10693 components: - type: Transform - pos: -4.5,-44.5 - parent: 30 - - uid: 10694 - components: - - type: Transform - pos: -6.5,-44.5 + pos: -15.5,-55.5 parent: 30 - uid: 10695 components: - type: Transform - pos: -5.5,-44.5 + pos: -23.5,-57.5 + parent: 30 + - uid: 10696 + components: + - type: Transform + pos: -23.5,-58.5 parent: 30 - uid: 10717 components: @@ -22350,21 +21825,6 @@ entities: - type: Transform pos: 1.5,-37.5 parent: 30 - - uid: 10725 - components: - - type: Transform - pos: 1.5,-38.5 - parent: 30 - - uid: 10726 - components: - - type: Transform - pos: 0.5,-38.5 - parent: 30 - - uid: 10727 - components: - - type: Transform - pos: 2.5,-38.5 - parent: 30 - uid: 10728 components: - type: Transform @@ -22418,7 +21878,7 @@ entities: - uid: 10740 components: - type: Transform - pos: 2.5,-20.5 + pos: -10.5,-37.5 parent: 30 - uid: 10744 components: @@ -22455,100 +21915,10 @@ entities: - type: Transform pos: -2.5,-25.5 parent: 30 - - uid: 10751 - components: - - type: Transform - pos: -3.5,-29.5 - parent: 30 - - uid: 10752 - components: - - type: Transform - pos: -4.5,-29.5 - parent: 30 - - uid: 10753 - components: - - type: Transform - pos: -5.5,-29.5 - parent: 30 - - uid: 10754 - components: - - type: Transform - pos: -6.5,-29.5 - parent: 30 - uid: 10755 components: - type: Transform - pos: -7.5,-29.5 - parent: 30 - - uid: 10756 - components: - - type: Transform - pos: -8.5,-29.5 - parent: 30 - - uid: 10757 - components: - - type: Transform - pos: -9.5,-29.5 - parent: 30 - - uid: 10758 - components: - - type: Transform - pos: -10.5,-29.5 - parent: 30 - - uid: 10759 - components: - - type: Transform - pos: -11.5,-29.5 - parent: 30 - - uid: 10760 - components: - - type: Transform - pos: -12.5,-29.5 - parent: 30 - - uid: 10761 - components: - - type: Transform - pos: -13.5,-29.5 - parent: 30 - - uid: 10762 - components: - - type: Transform - pos: -14.5,-29.5 - parent: 30 - - uid: 10763 - components: - - type: Transform - pos: -16.5,-29.5 - parent: 30 - - uid: 10764 - components: - - type: Transform - pos: -15.5,-29.5 - parent: 30 - - uid: 10765 - components: - - type: Transform - pos: -16.5,-30.5 - parent: 30 - - uid: 10766 - components: - - type: Transform - pos: -16.5,-31.5 - parent: 30 - - uid: 10767 - components: - - type: Transform - pos: -12.5,-28.5 - parent: 30 - - uid: 10768 - components: - - type: Transform - pos: -12.5,-27.5 - parent: 30 - - uid: 10769 - components: - - type: Transform - pos: -12.5,-26.5 + pos: -14.5,-55.5 parent: 30 - uid: 10770 components: @@ -22625,80 +21995,15 @@ entities: - type: Transform pos: -21.5,-25.5 parent: 30 - - uid: 10785 - components: - - type: Transform - pos: -12.5,-30.5 - parent: 30 - - uid: 10786 - components: - - type: Transform - pos: -12.5,-31.5 - parent: 30 - - uid: 10787 - components: - - type: Transform - pos: -12.5,-32.5 - parent: 30 - - uid: 10788 - components: - - type: Transform - pos: -12.5,-33.5 - parent: 30 - - uid: 10789 - components: - - type: Transform - pos: -12.5,-34.5 - parent: 30 - uid: 10792 components: - type: Transform pos: -10.5,-7.5 parent: 30 - - uid: 10793 - components: - - type: Transform - pos: -9.5,-33.5 - parent: 30 - - uid: 10794 - components: - - type: Transform - pos: -8.5,-33.5 - parent: 30 - - uid: 10795 - components: - - type: Transform - pos: -7.5,-33.5 - parent: 30 - uid: 10796 components: - type: Transform - pos: -6.5,-33.5 - parent: 30 - - uid: 10797 - components: - - type: Transform - pos: -5.5,-33.5 - parent: 30 - - uid: 10798 - components: - - type: Transform - pos: -7.5,-30.5 - parent: 30 - - uid: 10799 - components: - - type: Transform - pos: -7.5,-31.5 - parent: 30 - - uid: 10800 - components: - - type: Transform - pos: -7.5,-28.5 - parent: 30 - - uid: 10801 - components: - - type: Transform - pos: -7.5,-27.5 + pos: -13.5,-55.5 parent: 30 - uid: 10802 components: @@ -23485,170 +22790,25 @@ entities: - type: Transform pos: 24.5,-35.5 parent: 30 - - uid: 11039 + - uid: 11098 components: - type: Transform - pos: -9.5,-34.5 + pos: -13.5,-30.5 parent: 30 - - uid: 11040 + - uid: 11099 components: - type: Transform - pos: -9.5,-35.5 + pos: -17.5,-37.5 parent: 30 - - uid: 11041 + - uid: 11101 components: - type: Transform - pos: -9.5,-36.5 + pos: -12.5,-55.5 parent: 30 - - uid: 11042 + - uid: 11128 components: - type: Transform - pos: -5.5,-34.5 - parent: 30 - - uid: 11043 - components: - - type: Transform - pos: -5.5,-35.5 - parent: 30 - - uid: 11044 - components: - - type: Transform - pos: -5.5,-36.5 - parent: 30 - - uid: 11045 - components: - - type: Transform - pos: -6.5,-36.5 - parent: 30 - - uid: 11046 - components: - - type: Transform - pos: -7.5,-36.5 - parent: 30 - - uid: 11047 - components: - - type: Transform - pos: -5.5,-40.5 - parent: 30 - - uid: 11048 - components: - - type: Transform - pos: -6.5,-40.5 - parent: 30 - - uid: 11049 - components: - - type: Transform - pos: -4.5,-40.5 - parent: 30 - - uid: 11050 - components: - - type: Transform - pos: -3.5,-40.5 - parent: 30 - - uid: 11051 - components: - - type: Transform - pos: -2.5,-40.5 - parent: 30 - - uid: 11052 - components: - - type: Transform - pos: -1.5,-40.5 - parent: 30 - - uid: 11053 - components: - - type: Transform - pos: -0.5,-40.5 - parent: 30 - - uid: 11054 - components: - - type: Transform - pos: 0.5,-40.5 - parent: 30 - - uid: 11055 - components: - - type: Transform - pos: 1.5,-40.5 - parent: 30 - - uid: 11056 - components: - - type: Transform - pos: 2.5,-40.5 - parent: 30 - - uid: 11057 - components: - - type: Transform - pos: 1.5,-41.5 - parent: 30 - - uid: 11058 - components: - - type: Transform - pos: 1.5,-42.5 - parent: 30 - - uid: 11059 - components: - - type: Transform - pos: 1.5,-42.5 - parent: 30 - - uid: 11060 - components: - - type: Transform - pos: 1.5,-43.5 - parent: 30 - - uid: 11061 - components: - - type: Transform - pos: 1.5,-44.5 - parent: 30 - - uid: 11062 - components: - - type: Transform - pos: 2.5,-43.5 - parent: 30 - - uid: 11063 - components: - - type: Transform - pos: 3.5,-43.5 - parent: 30 - - uid: 11064 - components: - - type: Transform - pos: -2.5,-39.5 - parent: 30 - - uid: 11065 - components: - - type: Transform - pos: -2.5,-38.5 - parent: 30 - - uid: 11066 - components: - - type: Transform - pos: -9.5,-39.5 - parent: 30 - - uid: 11067 - components: - - type: Transform - pos: -12.5,-39.5 - parent: 30 - - uid: 11068 - components: - - type: Transform - pos: -12.5,-38.5 - parent: 30 - - uid: 11069 - components: - - type: Transform - pos: -12.5,-37.5 - parent: 30 - - uid: 11070 - components: - - type: Transform - pos: -15.5,-41.5 - parent: 30 - - uid: 11071 - components: - - type: Transform - pos: -15.5,-42.5 + pos: -12.5,-34.5 parent: 30 - uid: 11231 components: @@ -23685,11 +22845,66 @@ entities: - type: Transform pos: 22.5,-37.5 parent: 30 + - uid: 11300 + components: + - type: Transform + pos: -18.5,-51.5 + parent: 30 + - uid: 11301 + components: + - type: Transform + pos: -20.5,-55.5 + parent: 30 + - uid: 11305 + components: + - type: Transform + pos: -17.5,-48.5 + parent: 30 + - uid: 11306 + components: + - type: Transform + pos: -17.5,-40.5 + parent: 30 + - uid: 11311 + components: + - type: Transform + pos: -6.5,-30.5 + parent: 30 + - uid: 11312 + components: + - type: Transform + pos: -19.5,-54.5 + parent: 30 - uid: 11332 components: - type: Transform pos: 1.5,-9.5 parent: 30 + - uid: 11335 + components: + - type: Transform + pos: -21.5,-55.5 + parent: 30 + - uid: 11339 + components: + - type: Transform + pos: -17.5,-47.5 + parent: 30 + - uid: 11341 + components: + - type: Transform + pos: -19.5,-55.5 + parent: 30 + - uid: 11342 + components: + - type: Transform + pos: -22.5,-55.5 + parent: 30 + - uid: 11343 + components: + - type: Transform + pos: -17.5,-39.5 + parent: 30 - uid: 11350 components: - type: Transform @@ -24795,11 +24010,6 @@ entities: - type: Transform pos: -41.5,25.5 parent: 30 - - uid: 12297 - components: - - type: Transform - pos: -7.5,-54.5 - parent: 30 - uid: 12307 components: - type: Transform @@ -25395,11 +24605,6 @@ entities: - type: Transform pos: 24.5,34.5 parent: 30 - - uid: 12442 - components: - - type: Transform - pos: -0.5,-47.5 - parent: 30 - uid: 12444 components: - type: Transform @@ -25410,10 +24615,15 @@ entities: - type: Transform pos: 31.5,31.5 parent: 30 - - uid: 12663 + - uid: 12668 components: - type: Transform - pos: -7.5,-53.5 + pos: -68.5,-60.5 + parent: 30 + - uid: 12680 + components: + - type: Transform + pos: -69.5,-60.5 parent: 30 - uid: 12832 components: @@ -25425,16 +24635,6 @@ entities: - type: Transform pos: 25.5,20.5 parent: 30 - - uid: 12961 - components: - - type: Transform - pos: 18.5,13.5 - parent: 30 - - uid: 12973 - components: - - type: Transform - pos: 18.5,12.5 - parent: 30 - uid: 13169 components: - type: Transform @@ -25770,11 +24970,6 @@ entities: - type: Transform pos: 14.5,11.5 parent: 30 - - uid: 13241 - components: - - type: Transform - pos: 13.5,11.5 - parent: 30 - uid: 13242 components: - type: Transform @@ -27820,6 +27015,11 @@ entities: - type: Transform pos: 23.5,-0.5 parent: 30 + - uid: 17725 + components: + - type: Transform + pos: 13.5,11.5 + parent: 30 - uid: 17811 components: - type: Transform @@ -27895,11 +27095,41 @@ entities: - type: Transform pos: -45.5,-25.5 parent: 30 + - uid: 18085 + components: + - type: Transform + pos: 16.5,13.5 + parent: 30 - uid: 18126 components: - type: Transform pos: -79.5,-57.5 parent: 30 + - uid: 18814 + components: + - type: Transform + pos: 16.5,12.5 + parent: 30 + - uid: 18820 + components: + - type: Transform + pos: -23.5,7.5 + parent: 30 + - uid: 18827 + components: + - type: Transform + pos: -24.5,7.5 + parent: 30 + - uid: 18831 + components: + - type: Transform + pos: -25.5,7.5 + parent: 30 + - uid: 18833 + components: + - type: Transform + pos: -27.5,7.5 + parent: 30 - uid: 18970 components: - type: Transform @@ -28850,90 +28080,20 @@ entities: - type: Transform pos: -58.5,-60.5 parent: 30 - - uid: 19178 - components: - - type: Transform - pos: -58.5,-62.5 - parent: 30 - - uid: 19179 - components: - - type: Transform - pos: -58.5,-63.5 - parent: 30 - - uid: 19180 - components: - - type: Transform - pos: -58.5,-61.5 - parent: 30 - - uid: 19181 - components: - - type: Transform - pos: -58.5,-64.5 - parent: 30 - - uid: 19182 - components: - - type: Transform - pos: -58.5,-65.5 - parent: 30 - - uid: 19183 - components: - - type: Transform - pos: -58.5,-66.5 - parent: 30 - - uid: 19184 - components: - - type: Transform - pos: -58.5,-67.5 - parent: 30 - - uid: 19185 - components: - - type: Transform - pos: -58.5,-68.5 - parent: 30 - - uid: 19186 - components: - - type: Transform - pos: -57.5,-66.5 - parent: 30 - uid: 19187 components: - type: Transform - pos: -56.5,-66.5 + pos: -13.5,-34.5 parent: 30 - uid: 19188 components: - type: Transform - pos: -55.5,-66.5 + pos: -13.5,-32.5 parent: 30 - uid: 19189 components: - type: Transform - pos: -59.5,-63.5 - parent: 30 - - uid: 19190 - components: - - type: Transform - pos: -60.5,-63.5 - parent: 30 - - uid: 19191 - components: - - type: Transform - pos: -57.5,-64.5 - parent: 30 - - uid: 19192 - components: - - type: Transform - pos: -56.5,-64.5 - parent: 30 - - uid: 19193 - components: - - type: Transform - pos: -55.5,-64.5 - parent: 30 - - uid: 19194 - components: - - type: Transform - pos: -54.5,-64.5 + pos: -13.5,-33.5 parent: 30 - uid: 19195 components: @@ -29115,70 +28275,10 @@ entities: - type: Transform pos: -55.5,-59.5 parent: 30 - - uid: 19231 - components: - - type: Transform - pos: -54.5,-59.5 - parent: 30 - - uid: 19232 - components: - - type: Transform - pos: -64.5,-60.5 - parent: 30 - - uid: 19233 - components: - - type: Transform - pos: -64.5,-61.5 - parent: 30 - - uid: 19234 - components: - - type: Transform - pos: -64.5,-62.5 - parent: 30 - - uid: 19235 - components: - - type: Transform - pos: -64.5,-63.5 - parent: 30 - - uid: 19236 - components: - - type: Transform - pos: -64.5,-64.5 - parent: 30 - - uid: 19237 - components: - - type: Transform - pos: -64.5,-65.5 - parent: 30 - - uid: 19238 - components: - - type: Transform - pos: -63.5,-64.5 - parent: 30 - - uid: 19239 - components: - - type: Transform - pos: -62.5,-64.5 - parent: 30 - uid: 19240 components: - type: Transform - pos: -65.5,-63.5 - parent: 30 - - uid: 19241 - components: - - type: Transform - pos: -67.5,-63.5 - parent: 30 - - uid: 19242 - components: - - type: Transform - pos: -66.5,-63.5 - parent: 30 - - uid: 19243 - components: - - type: Transform - pos: -68.5,-63.5 + pos: -11.5,-55.5 parent: 30 - uid: 19244 components: @@ -29825,16 +28925,6 @@ entities: - type: Transform pos: -70.5,-60.5 parent: 30 - - uid: 19373 - components: - - type: Transform - pos: -70.5,-59.5 - parent: 30 - - uid: 19374 - components: - - type: Transform - pos: -70.5,-58.5 - parent: 30 - uid: 19375 components: - type: Transform @@ -29920,16 +29010,6 @@ entities: - type: Transform pos: -50.5,43.5 parent: 30 - - uid: 19597 - components: - - type: Transform - pos: -25.5,-41.5 - parent: 30 - - uid: 19598 - components: - - type: Transform - pos: -26.5,-41.5 - parent: 30 - uid: 19599 components: - type: Transform @@ -30015,50 +29095,110 @@ entities: - type: Transform pos: -29.5,-34.5 parent: 30 - - uid: 19709 - components: - - type: Transform - pos: -19.5,-34.5 - parent: 30 - - uid: 19710 - components: - - type: Transform - pos: -18.5,-34.5 - parent: 30 - - uid: 19781 - components: - - type: Transform - pos: -1.5,-46.5 - parent: 30 - - uid: 19794 - components: - - type: Transform - pos: -1.5,-45.5 - parent: 30 - - uid: 19795 - components: - - type: Transform - pos: -13.5,-38.5 - parent: 30 - uid: 19796 components: - type: Transform - pos: -14.5,-38.5 + pos: -12.5,-29.5 parent: 30 - uid: 19797 components: - type: Transform pos: -38.5,62.5 parent: 30 - - uid: 19801 + - uid: 19828 components: - type: Transform - pos: -13.5,-32.5 + pos: -7.5,-29.5 parent: 30 - - uid: 19802 + - uid: 19829 components: - type: Transform - pos: -14.5,-32.5 + pos: -10.5,-29.5 + parent: 30 + - uid: 19832 + components: + - type: Transform + pos: -10.5,-38.5 + parent: 30 + - uid: 19833 + components: + - type: Transform + pos: -10.5,-39.5 + parent: 30 + - uid: 19834 + components: + - type: Transform + pos: -12.5,-39.5 + parent: 30 + - uid: 19835 + components: + - type: Transform + pos: -12.5,-40.5 + parent: 30 + - uid: 19837 + components: + - type: Transform + pos: -12.5,-41.5 + parent: 30 + - uid: 19838 + components: + - type: Transform + pos: -12.5,-42.5 + parent: 30 + - uid: 19839 + components: + - type: Transform + pos: -12.5,-43.5 + parent: 30 + - uid: 19842 + components: + - type: Transform + pos: -12.5,-44.5 + parent: 30 + - uid: 19845 + components: + - type: Transform + pos: -12.5,-45.5 + parent: 30 + - uid: 19846 + components: + - type: Transform + pos: -12.5,-46.5 + parent: 30 + - uid: 19847 + components: + - type: Transform + pos: -12.5,-47.5 + parent: 30 + - uid: 19848 + components: + - type: Transform + pos: -11.5,-47.5 + parent: 30 + - uid: 19849 + components: + - type: Transform + pos: -11.5,-48.5 + parent: 30 + - uid: 19850 + components: + - type: Transform + pos: -10.5,-48.5 + parent: 30 + - uid: 19851 + components: + - type: Transform + pos: -9.5,-48.5 + parent: 30 + - uid: 19852 + components: + - type: Transform + pos: -8.5,-48.5 + parent: 30 + - uid: 19853 + components: + - type: Transform + pos: -11.5,-39.5 parent: 30 - uid: 20163 components: @@ -30555,50 +29695,320 @@ entities: - type: Transform pos: 0.5,66.5 parent: 30 + - uid: 20320 + components: + - type: Transform + pos: -9.5,-39.5 + parent: 30 + - uid: 20321 + components: + - type: Transform + pos: -8.5,-39.5 + parent: 30 + - uid: 20322 + components: + - type: Transform + pos: -7.5,-39.5 + parent: 30 + - uid: 20323 + components: + - type: Transform + pos: -7.5,-38.5 + parent: 30 + - uid: 20324 + components: + - type: Transform + pos: -7.5,-37.5 + parent: 30 + - uid: 20327 + components: + - type: Transform + pos: -7.5,-36.5 + parent: 30 + - uid: 20328 + components: + - type: Transform + pos: -7.5,-35.5 + parent: 30 + - uid: 20334 + components: + - type: Transform + pos: -7.5,-34.5 + parent: 30 + - uid: 20343 + components: + - type: Transform + pos: -6.5,-35.5 + parent: 30 + - uid: 20344 + components: + - type: Transform + pos: -8.5,-35.5 + parent: 30 + - uid: 20346 + components: + - type: Transform + pos: -12.5,-38.5 + parent: 30 + - uid: 20353 + components: + - type: Transform + pos: -6.5,-39.5 + parent: 30 + - uid: 20354 + components: + - type: Transform + pos: -5.5,-39.5 + parent: 30 + - uid: 20355 + components: + - type: Transform + pos: -4.5,-39.5 + parent: 30 + - uid: 20356 + components: + - type: Transform + pos: -3.5,-39.5 + parent: 30 + - uid: 20357 + components: + - type: Transform + pos: -2.5,-39.5 + parent: 30 + - uid: 20358 + components: + - type: Transform + pos: -2.5,-38.5 + parent: 30 + - uid: 20359 + components: + - type: Transform + pos: -2.5,-40.5 + parent: 30 + - uid: 20361 + components: + - type: Transform + pos: -1.5,-40.5 + parent: 30 + - uid: 20362 + components: + - type: Transform + pos: -0.5,-40.5 + parent: 30 - uid: 20363 components: - type: Transform - pos: -0.5,-49.5 + pos: 0.5,-40.5 parent: 30 - uid: 20364 components: - type: Transform - pos: 0.5,-49.5 + pos: 1.5,-40.5 parent: 30 - uid: 20365 components: - type: Transform - pos: 1.5,-49.5 + pos: 1.5,-39.5 parent: 30 - uid: 20366 components: - type: Transform - pos: 1.5,-51.5 - parent: 30 - - uid: 20367 - components: - - type: Transform - pos: 1.5,-50.5 + pos: 1.5,-38.5 parent: 30 - uid: 20368 + components: + - type: Transform + pos: 1.5,-42.5 + parent: 30 + - uid: 20396 + components: + - type: Transform + pos: 0.5,-42.5 + parent: 30 + - uid: 20397 + components: + - type: Transform + pos: 0.5,-43.5 + parent: 30 + - uid: 20399 + components: + - type: Transform + pos: 0.5,-44.5 + parent: 30 + - uid: 20409 + components: + - type: Transform + pos: 0.5,-45.5 + parent: 30 + - uid: 20410 + components: + - type: Transform + pos: 0.5,-46.5 + parent: 30 + - uid: 20411 + components: + - type: Transform + pos: 1.5,-44.5 + parent: 30 + - uid: 20412 + components: + - type: Transform + pos: 2.5,-44.5 + parent: 30 + - uid: 20413 + components: + - type: Transform + pos: 3.5,-44.5 + parent: 30 + - uid: 20414 + components: + - type: Transform + pos: 4.5,-44.5 + parent: 30 + - uid: 20415 + components: + - type: Transform + pos: 5.5,-44.5 + parent: 30 + - uid: 20416 + components: + - type: Transform + pos: 6.5,-44.5 + parent: 30 + - uid: 20417 + components: + - type: Transform + pos: 6.5,-45.5 + parent: 30 + - uid: 20418 + components: + - type: Transform + pos: 6.5,-46.5 + parent: 30 + - uid: 20419 + components: + - type: Transform + pos: -0.5,-46.5 + parent: 30 + - uid: 20420 + components: + - type: Transform + pos: -1.5,-46.5 + parent: 30 + - uid: 20421 + components: + - type: Transform + pos: -2.5,-46.5 + parent: 30 + - uid: 20422 + components: + - type: Transform + pos: 0.5,-47.5 + parent: 30 + - uid: 20423 + components: + - type: Transform + pos: 0.5,-48.5 + parent: 30 + - uid: 20424 + components: + - type: Transform + pos: -0.5,-48.5 + parent: 30 + - uid: 20425 + components: + - type: Transform + pos: -1.5,-48.5 + parent: 30 + - uid: 20426 + components: + - type: Transform + pos: -2.5,-48.5 + parent: 30 + - uid: 20427 + components: + - type: Transform + pos: -3.5,-48.5 + parent: 30 + - uid: 20428 + components: + - type: Transform + pos: -3.5,-49.5 + parent: 30 + - uid: 20429 + components: + - type: Transform + pos: -3.5,-50.5 + parent: 30 + - uid: 20430 + components: + - type: Transform + pos: -3.5,-51.5 + parent: 30 + - uid: 20431 + components: + - type: Transform + pos: -3.5,-52.5 + parent: 30 + - uid: 20440 + components: + - type: Transform + pos: -2.5,-52.5 + parent: 30 + - uid: 20450 + components: + - type: Transform + pos: -1.5,-52.5 + parent: 30 + - uid: 20462 + components: + - type: Transform + pos: -0.5,-52.5 + parent: 30 + - uid: 20463 + components: + - type: Transform + pos: 0.5,-52.5 + parent: 30 + - uid: 20464 components: - type: Transform pos: 1.5,-52.5 parent: 30 - - uid: 20369 + - uid: 20465 components: - type: Transform - pos: 1.5,-53.5 + pos: 2.5,-52.5 parent: 30 - - uid: 20370 + - uid: 20466 components: - type: Transform - pos: 1.5,-54.5 + pos: 3.5,-52.5 parent: 30 - - uid: 20371 + - uid: 20467 components: - type: Transform - pos: 0.5,-54.5 + pos: 3.5,-51.5 + parent: 30 + - uid: 20468 + components: + - type: Transform + pos: 3.5,-50.5 + parent: 30 + - uid: 20469 + components: + - type: Transform + pos: 3.5,-49.5 + parent: 30 + - uid: 20470 + components: + - type: Transform + pos: 3.5,-48.5 + parent: 30 + - uid: 20474 + components: + - type: Transform + pos: 2.5,-48.5 parent: 30 - uid: 20504 components: @@ -30665,6 +30075,56 @@ entities: - type: Transform pos: -33.5,-35.5 parent: 30 + - uid: 20518 + components: + - type: Transform + pos: 1.5,-48.5 + parent: 30 + - uid: 20527 + components: + - type: Transform + pos: -0.5,-55.5 + parent: 30 + - uid: 20528 + components: + - type: Transform + pos: -0.5,-56.5 + parent: 30 + - uid: 20538 + components: + - type: Transform + pos: -0.5,-54.5 + parent: 30 + - uid: 20539 + components: + - type: Transform + pos: -0.5,-53.5 + parent: 30 + - uid: 20544 + components: + - type: Transform + pos: 0.5,-56.5 + parent: 30 + - uid: 20545 + components: + - type: Transform + pos: 1.5,-56.5 + parent: 30 + - uid: 20562 + components: + - type: Transform + pos: 2.5,-56.5 + parent: 30 + - uid: 20569 + components: + - type: Transform + pos: 3.5,-56.5 + parent: 30 + - uid: 20570 + components: + - type: Transform + pos: -1.5,-56.5 + parent: 30 - uid: 20582 components: - type: Transform @@ -30685,6 +30145,41 @@ entities: - type: Transform pos: -59.5,4.5 parent: 30 + - uid: 20590 + components: + - type: Transform + pos: -2.5,-56.5 + parent: 30 + - uid: 20591 + components: + - type: Transform + pos: -3.5,-56.5 + parent: 30 + - uid: 20613 + components: + - type: Transform + pos: -4.5,-56.5 + parent: 30 + - uid: 20617 + components: + - type: Transform + pos: 4.5,-52.5 + parent: 30 + - uid: 20618 + components: + - type: Transform + pos: -0.5,-33.5 + parent: 30 + - uid: 20619 + components: + - type: Transform + pos: -1.5,-33.5 + parent: 30 + - uid: 20620 + components: + - type: Transform + pos: -2.5,-33.5 + parent: 30 - uid: 21007 components: - type: Transform @@ -31195,276 +30690,6 @@ entities: - type: Transform pos: 1.5,10.5 parent: 30 - - uid: 22706 - components: - - type: Transform - pos: -33.5,-57.5 - parent: 30 - - uid: 22707 - components: - - type: Transform - pos: -34.5,-57.5 - parent: 30 - - uid: 22708 - components: - - type: Transform - pos: -34.5,-58.5 - parent: 30 - - uid: 22709 - components: - - type: Transform - pos: -34.5,-59.5 - parent: 30 - - uid: 22710 - components: - - type: Transform - pos: -34.5,-60.5 - parent: 30 - - uid: 22711 - components: - - type: Transform - pos: -34.5,-61.5 - parent: 30 - - uid: 22712 - components: - - type: Transform - pos: -34.5,-62.5 - parent: 30 - - uid: 22713 - components: - - type: Transform - pos: -34.5,-63.5 - parent: 30 - - uid: 22714 - components: - - type: Transform - pos: -35.5,-60.5 - parent: 30 - - uid: 22715 - components: - - type: Transform - pos: -36.5,-60.5 - parent: 30 - - uid: 22716 - components: - - type: Transform - pos: -36.5,-61.5 - parent: 30 - - uid: 22717 - components: - - type: Transform - pos: -37.5,-61.5 - parent: 30 - - uid: 22718 - components: - - type: Transform - pos: -38.5,-61.5 - parent: 30 - - uid: 22719 - components: - - type: Transform - pos: -39.5,-61.5 - parent: 30 - - uid: 22720 - components: - - type: Transform - pos: -39.5,-60.5 - parent: 30 - - uid: 22721 - components: - - type: Transform - pos: -40.5,-60.5 - parent: 30 - - uid: 22722 - components: - - type: Transform - pos: -41.5,-60.5 - parent: 30 - - uid: 22723 - components: - - type: Transform - pos: -39.5,-59.5 - parent: 30 - - uid: 22724 - components: - - type: Transform - pos: -38.5,-59.5 - parent: 30 - - uid: 22725 - components: - - type: Transform - pos: -37.5,-59.5 - parent: 30 - - uid: 22726 - components: - - type: Transform - pos: -36.5,-59.5 - parent: 30 - - uid: 22727 - components: - - type: Transform - pos: -41.5,-59.5 - parent: 30 - - uid: 22728 - components: - - type: Transform - pos: -41.5,-58.5 - parent: 30 - - uid: 22729 - components: - - type: Transform - pos: -41.5,-61.5 - parent: 30 - - uid: 22730 - components: - - type: Transform - pos: -41.5,-62.5 - parent: 30 - - uid: 22731 - components: - - type: Transform - pos: -36.5,-58.5 - parent: 30 - - uid: 22732 - components: - - type: Transform - pos: -36.5,-62.5 - parent: 30 - - uid: 22733 - components: - - type: Transform - pos: -39.5,-62.5 - parent: 30 - - uid: 22734 - components: - - type: Transform - pos: -39.5,-58.5 - parent: 30 - - uid: 22735 - components: - - type: Transform - pos: -28.5,-60.5 - parent: 30 - - uid: 22736 - components: - - type: Transform - pos: -29.5,-60.5 - parent: 30 - - uid: 22737 - components: - - type: Transform - pos: -29.5,-61.5 - parent: 30 - - uid: 22738 - components: - - type: Transform - pos: -29.5,-62.5 - parent: 30 - - uid: 22739 - components: - - type: Transform - pos: -29.5,-63.5 - parent: 30 - - uid: 22740 - components: - - type: Transform - pos: -30.5,-63.5 - parent: 30 - - uid: 22741 - components: - - type: Transform - pos: -29.5,-59.5 - parent: 30 - - uid: 22742 - components: - - type: Transform - pos: -29.5,-58.5 - parent: 30 - - uid: 22743 - components: - - type: Transform - pos: -29.5,-57.5 - parent: 30 - - uid: 22744 - components: - - type: Transform - pos: -30.5,-57.5 - parent: 30 - - uid: 22745 - components: - - type: Transform - pos: -30.5,-60.5 - parent: 30 - - uid: 22746 - components: - - type: Transform - pos: -31.5,-60.5 - parent: 30 - - uid: 22747 - components: - - type: Transform - pos: -28.5,-58.5 - parent: 30 - - uid: 22748 - components: - - type: Transform - pos: -26.5,-58.5 - parent: 30 - - uid: 22749 - components: - - type: Transform - pos: -25.5,-58.5 - parent: 30 - - uid: 22750 - components: - - type: Transform - pos: -25.5,-58.5 - parent: 30 - - uid: 22751 - components: - - type: Transform - pos: -27.5,-58.5 - parent: 30 - - uid: 22752 - components: - - type: Transform - pos: -26.5,-59.5 - parent: 30 - - uid: 22753 - components: - - type: Transform - pos: -26.5,-60.5 - parent: 30 - - uid: 22754 - components: - - type: Transform - pos: -26.5,-62.5 - parent: 30 - - uid: 22755 - components: - - type: Transform - pos: -26.5,-61.5 - parent: 30 - - uid: 22756 - components: - - type: Transform - pos: -24.5,-58.5 - parent: 30 - - uid: 22757 - components: - - type: Transform - pos: -23.5,-58.5 - parent: 30 - - uid: 22758 - components: - - type: Transform - pos: -22.5,-58.5 - parent: 30 - - uid: 22759 - components: - - type: Transform - pos: -21.5,-58.5 - parent: 30 - proto: CableApcStack entities: - uid: 1637 @@ -31477,11 +30702,6 @@ entities: - type: Transform pos: -36.516556,-12.325844 parent: 30 - - uid: 9605 - components: - - type: Transform - pos: -15.653,-34.268528 - parent: 30 - uid: 10259 components: - type: Transform @@ -31497,15 +30717,15 @@ entities: - type: Transform pos: -42.554832,27.618874 parent: 30 - - uid: 11310 + - uid: 11024 components: - type: Transform - pos: -11.510529,-35.15977 + pos: -5.583432,-34.527874 parent: 30 - uid: 18792 components: - type: Transform - pos: -66.4926,-62.50162 + pos: -55.006935,-63.112835 parent: 30 - uid: 20302 components: @@ -31519,15 +30739,10 @@ entities: parent: 30 - proto: CableHV entities: - - uid: 829 + - uid: 867 components: - type: Transform - pos: -20.5,-56.5 - parent: 30 - - uid: 833 - components: - - type: Transform - pos: -20.5,-57.5 + pos: -17.5,-47.5 parent: 30 - uid: 933 components: @@ -31549,6 +30764,16 @@ entities: - type: Transform pos: -46.5,8.5 parent: 30 + - uid: 2403 + components: + - type: Transform + pos: -55.5,-60.5 + parent: 30 + - uid: 3152 + components: + - type: Transform + pos: -17.5,-48.5 + parent: 30 - uid: 3187 components: - type: Transform @@ -31559,6 +30784,11 @@ entities: - type: Transform pos: -47.5,9.5 parent: 30 + - uid: 3221 + components: + - type: Transform + pos: -23.5,-57.5 + parent: 30 - uid: 3532 components: - type: Transform @@ -31739,10 +30969,15 @@ entities: - type: Transform pos: -44.5,18.5 parent: 30 - - uid: 4444 + - uid: 4406 components: - type: Transform - pos: -20.5,-58.5 + pos: -3.5,-44.5 + parent: 30 + - uid: 4412 + components: + - type: Transform + pos: -20.5,-41.5 parent: 30 - uid: 4456 components: @@ -32494,11 +31729,6 @@ entities: - type: Transform pos: -22.5,43.5 parent: 30 - - uid: 5240 - components: - - type: Transform - pos: -24.5,-58.5 - parent: 30 - uid: 5507 components: - type: Transform @@ -32744,21 +31974,6 @@ entities: - type: Transform pos: 12.5,42.5 parent: 30 - - uid: 5635 - components: - - type: Transform - pos: -23.5,-58.5 - parent: 30 - - uid: 5722 - components: - - type: Transform - pos: -22.5,-58.5 - parent: 30 - - uid: 6095 - components: - - type: Transform - pos: -21.5,-58.5 - parent: 30 - uid: 6387 components: - type: Transform @@ -32859,10 +32074,70 @@ entities: - type: Transform pos: 19.5,31.5 parent: 30 + - uid: 6467 + components: + - type: Transform + pos: -13.5,-32.5 + parent: 30 + - uid: 7096 + components: + - type: Transform + pos: -24.5,-41.5 + parent: 30 + - uid: 7097 + components: + - type: Transform + pos: -2.5,-44.5 + parent: 30 + - uid: 7101 + components: + - type: Transform + pos: -5.5,-39.5 + parent: 30 + - uid: 7104 + components: + - type: Transform + pos: -3.5,-39.5 + parent: 30 + - uid: 7105 + components: + - type: Transform + pos: -2.5,-39.5 + parent: 30 - uid: 7106 components: - type: Transform - pos: -7.5,-45.5 + pos: -1.5,-39.5 + parent: 30 + - uid: 7108 + components: + - type: Transform + pos: -13.5,-34.5 + parent: 30 + - uid: 7109 + components: + - type: Transform + pos: -4.5,-39.5 + parent: 30 + - uid: 7207 + components: + - type: Transform + pos: -8.5,-51.5 + parent: 30 + - uid: 7208 + components: + - type: Transform + pos: -9.5,-51.5 + parent: 30 + - uid: 7219 + components: + - type: Transform + pos: -10.5,-51.5 + parent: 30 + - uid: 7220 + components: + - type: Transform + pos: -16.5,-35.5 parent: 30 - uid: 7615 components: @@ -33379,260 +32654,165 @@ entities: - type: Transform pos: -0.5,-11.5 parent: 30 - - uid: 7965 - components: - - type: Transform - pos: -7.5,-46.5 - parent: 30 - - uid: 8225 - components: - - type: Transform - pos: -7.5,-47.5 - parent: 30 - - uid: 8230 - components: - - type: Transform - pos: -7.5,-48.5 - parent: 30 - - uid: 8231 - components: - - type: Transform - pos: -7.5,-49.5 - parent: 30 - uid: 8232 components: - type: Transform - pos: -7.5,-50.5 + pos: -16.5,-28.5 + parent: 30 + - uid: 8233 + components: + - type: Transform + pos: -15.5,-28.5 + parent: 30 + - uid: 8235 + components: + - type: Transform + pos: -15.5,-30.5 + parent: 30 + - uid: 8236 + components: + - type: Transform + pos: -15.5,-29.5 + parent: 30 + - uid: 8253 + components: + - type: Transform + pos: -13.5,-30.5 + parent: 30 + - uid: 8256 + components: + - type: Transform + pos: -14.5,-30.5 + parent: 30 + - uid: 8337 + components: + - type: Transform + pos: -12.5,-40.5 parent: 30 - uid: 8402 components: - type: Transform pos: 3.5,-13.5 parent: 30 - - uid: 9293 + - uid: 8606 components: - type: Transform - pos: 3.5,-37.5 + pos: -7.5,-43.5 parent: 30 - - uid: 9484 + - uid: 8798 components: - type: Transform - pos: -8.5,-33.5 + pos: -13.5,-33.5 parent: 30 - - uid: 9485 + - uid: 8801 components: - type: Transform - pos: -7.5,-33.5 + pos: -10.5,-39.5 parent: 30 - - uid: 9486 + - uid: 9400 components: - type: Transform - pos: -6.5,-33.5 + pos: -20.5,-55.5 parent: 30 - - uid: 9490 + - uid: 9404 components: - type: Transform - pos: -8.5,-35.5 + pos: -19.5,-52.5 parent: 30 - - uid: 9491 + - uid: 9420 components: - type: Transform - pos: -7.5,-35.5 + pos: -15.5,-40.5 parent: 30 - - uid: 9492 + - uid: 9427 components: - type: Transform - pos: -6.5,-35.5 + pos: -23.5,-58.5 + parent: 30 + - uid: 9429 + components: + - type: Transform + pos: -23.5,-56.5 + parent: 30 + - uid: 9430 + components: + - type: Transform + pos: -6.5,-44.5 + parent: 30 + - uid: 9437 + components: + - type: Transform + pos: -23.5,-55.5 + parent: 30 + - uid: 9438 + components: + - type: Transform + pos: -22.5,-55.5 + parent: 30 + - uid: 9462 + components: + - type: Transform + pos: -5.5,-42.5 + parent: 30 + - uid: 9465 + components: + - type: Transform + pos: -8.5,-44.5 + parent: 30 + - uid: 9469 + components: + - type: Transform + pos: -9.5,-44.5 + parent: 30 + - uid: 9474 + components: + - type: Transform + pos: -12.5,-46.5 + parent: 30 + - uid: 9475 + components: + - type: Transform + pos: -11.5,-44.5 + parent: 30 + - uid: 9476 + components: + - type: Transform + pos: -12.5,-48.5 + parent: 30 + - uid: 9479 + components: + - type: Transform + pos: -16.5,-43.5 + parent: 30 + - uid: 9480 + components: + - type: Transform + pos: -13.5,-43.5 parent: 30 - uid: 9493 components: - type: Transform - pos: -8.5,-34.5 - parent: 30 - - uid: 9494 - components: - - type: Transform - pos: -6.5,-34.5 - parent: 30 - - uid: 9495 - components: - - type: Transform - pos: -7.5,-34.5 - parent: 30 - - uid: 9499 - components: - - type: Transform - pos: -9.5,-33.5 + pos: -17.5,-43.5 parent: 30 - uid: 9500 components: - type: Transform - pos: -7.5,-36.5 - parent: 30 - - uid: 9501 - components: - - type: Transform - pos: -7.5,-37.5 - parent: 30 - - uid: 9502 - components: - - type: Transform - pos: -7.5,-38.5 - parent: 30 - - uid: 9503 - components: - - type: Transform - pos: -6.5,-38.5 - parent: 30 - - uid: 9504 - components: - - type: Transform - pos: -5.5,-38.5 - parent: 30 - - uid: 9505 - components: - - type: Transform - pos: -4.5,-38.5 - parent: 30 - - uid: 9506 - components: - - type: Transform - pos: -3.5,-38.5 - parent: 30 - - uid: 9507 - components: - - type: Transform - pos: -10.5,-33.5 - parent: 30 - - uid: 9508 - components: - - type: Transform - pos: -11.5,-33.5 - parent: 30 - - uid: 9509 - components: - - type: Transform - pos: -12.5,-33.5 - parent: 30 - - uid: 9510 - components: - - type: Transform - pos: -12.5,-34.5 - parent: 30 - - uid: 9511 - components: - - type: Transform - pos: -12.5,-35.5 + pos: -15.5,-36.5 parent: 30 - uid: 9512 components: - type: Transform pos: -12.5,-36.5 parent: 30 - - uid: 9513 - components: - - type: Transform - pos: -12.5,-37.5 - parent: 30 - - uid: 9514 - components: - - type: Transform - pos: -12.5,-38.5 - parent: 30 - - uid: 9515 - components: - - type: Transform - pos: -12.5,-40.5 - parent: 30 - - uid: 9516 - components: - - type: Transform - pos: -12.5,-39.5 - parent: 30 - - uid: 9517 - components: - - type: Transform - pos: -12.5,-32.5 - parent: 30 - - uid: 9518 - components: - - type: Transform - pos: -12.5,-31.5 - parent: 30 - - uid: 9519 - components: - - type: Transform - pos: -12.5,-30.5 - parent: 30 - - uid: 9520 - components: - - type: Transform - pos: -12.5,-29.5 - parent: 30 - uid: 9521 components: - type: Transform - pos: -11.5,-29.5 + pos: -11.5,-51.5 parent: 30 - uid: 9522 components: - type: Transform - pos: -9.5,-29.5 - parent: 30 - - uid: 9523 - components: - - type: Transform - pos: -10.5,-29.5 - parent: 30 - - uid: 9524 - components: - - type: Transform - pos: -8.5,-29.5 - parent: 30 - - uid: 9525 - components: - - type: Transform - pos: -7.5,-29.5 - parent: 30 - - uid: 9526 - components: - - type: Transform - pos: -6.5,-29.5 - parent: 30 - - uid: 9527 - components: - - type: Transform - pos: -5.5,-29.5 - parent: 30 - - uid: 9528 - components: - - type: Transform - pos: -13.5,-29.5 - parent: 30 - - uid: 9529 - components: - - type: Transform - pos: -2.5,-38.5 - parent: 30 - - uid: 9530 - components: - - type: Transform - pos: -1.5,-38.5 - parent: 30 - - uid: 9531 - components: - - type: Transform - pos: -0.5,-38.5 - parent: 30 - - uid: 9532 - components: - - type: Transform - pos: 0.5,-38.5 - parent: 30 - - uid: 9533 - components: - - type: Transform - pos: 1.5,-38.5 + pos: -16.5,-34.5 parent: 30 - uid: 9534 components: @@ -33779,15 +32959,30 @@ entities: - type: Transform pos: -2.5,-15.5 parent: 30 - - uid: 9571 + - uid: 9568 components: - type: Transform - pos: 2.5,-38.5 + pos: -14.5,-40.5 parent: 30 - - uid: 9572 + - uid: 9570 components: - type: Transform - pos: 3.5,-38.5 + pos: -7.5,-42.5 + parent: 30 + - uid: 9576 + components: + - type: Transform + pos: -25.5,-41.5 + parent: 30 + - uid: 9577 + components: + - type: Transform + pos: -1.5,-44.5 + parent: 30 + - uid: 9578 + components: + - type: Transform + pos: -21.5,-41.5 parent: 30 - uid: 9594 components: @@ -33799,260 +32994,365 @@ entities: - type: Transform pos: 3.5,-10.5 parent: 30 - - uid: 9793 + - uid: 9620 components: - type: Transform - pos: -12.5,-42.5 + pos: 1.5,-38.5 parent: 30 - - uid: 9795 + - uid: 9621 components: - type: Transform - pos: -17.5,-41.5 + pos: -0.5,-39.5 parent: 30 - - uid: 9839 + - uid: 9622 components: - type: Transform - pos: -7.5,-44.5 + pos: 0.5,-39.5 parent: 30 - - uid: 9999 + - uid: 9623 components: - type: Transform - pos: -17.5,-42.5 + pos: 1.5,-39.5 parent: 30 - - uid: 10151 + - uid: 9703 components: - type: Transform - pos: -13.5,-40.5 + pos: -5.5,-43.5 parent: 30 - - uid: 10152 + - uid: 9789 components: - type: Transform - pos: -14.5,-40.5 + pos: -0.5,-50.5 parent: 30 - - uid: 10153 + - uid: 9808 components: - type: Transform - pos: -15.5,-40.5 + pos: -6.5,-40.5 parent: 30 - - uid: 10154 + - uid: 9814 components: - type: Transform - pos: -16.5,-40.5 + pos: -7.5,-39.5 parent: 30 - - uid: 10155 + - uid: 9830 components: - type: Transform - pos: -17.5,-40.5 + pos: -6.5,-41.5 parent: 30 - - uid: 10156 + - uid: 9875 components: - type: Transform - pos: -7.5,-43.5 + pos: -6.5,-39.5 parent: 30 - - uid: 10157 + - uid: 9880 components: - type: Transform - pos: -7.5,-42.5 + pos: -9.5,-39.5 parent: 30 - - uid: 10158 + - uid: 9895 components: - type: Transform - pos: -7.5,-41.5 + pos: -22.5,-41.5 parent: 30 - - uid: 10159 + - uid: 9937 components: - type: Transform - pos: -7.5,-40.5 + pos: -12.5,-49.5 parent: 30 - - uid: 10160 + - uid: 9945 components: - type: Transform - pos: -8.5,-40.5 + pos: -12.5,-51.5 parent: 30 - - uid: 10161 + - uid: 9950 components: - type: Transform - pos: -9.5,-40.5 + pos: -12.5,-50.5 parent: 30 - - uid: 10162 + - uid: 9952 components: - type: Transform - pos: -10.5,-40.5 + pos: -16.5,-37.5 parent: 30 - - uid: 10163 - components: - - type: Transform - pos: -11.5,-40.5 - parent: 30 - - uid: 10164 - components: - - type: Transform - pos: -17.5,-43.5 - parent: 30 - - uid: 10165 - components: - - type: Transform - pos: -17.5,-44.5 - parent: 30 - - uid: 10166 - components: - - type: Transform - pos: -17.5,-45.5 - parent: 30 - - uid: 10167 + - uid: 9987 components: - type: Transform pos: -17.5,-46.5 parent: 30 - - uid: 10168 - components: - - type: Transform - pos: -17.5,-47.5 - parent: 30 - - uid: 10169 - components: - - type: Transform - pos: -17.5,-48.5 - parent: 30 - - uid: 10170 - components: - - type: Transform - pos: -17.5,-49.5 - parent: 30 - - uid: 10171 - components: - - type: Transform - pos: -17.5,-50.5 - parent: 30 - - uid: 10172 - components: - - type: Transform - pos: -17.5,-51.5 - parent: 30 - - uid: 10173 - components: - - type: Transform - pos: -17.5,-52.5 - parent: 30 - - uid: 10174 - components: - - type: Transform - pos: -17.5,-53.5 - parent: 30 - - uid: 10175 - components: - - type: Transform - pos: -17.5,-54.5 - parent: 30 - - uid: 10176 - components: - - type: Transform - pos: -17.5,-55.5 - parent: 30 - - uid: 10177 - components: - - type: Transform - pos: -17.5,-56.5 - parent: 30 - - uid: 10178 - components: - - type: Transform - pos: -17.5,-57.5 - parent: 30 - - uid: 10179 - components: - - type: Transform - pos: -17.5,-58.5 - parent: 30 - - uid: 10180 - components: - - type: Transform - pos: -17.5,-59.5 - parent: 30 - - uid: 10181 + - uid: 10087 components: - type: Transform pos: -17.5,-60.5 parent: 30 - - uid: 10182 + - uid: 10090 components: - type: Transform - pos: -17.5,-61.5 + pos: -16.5,-60.5 parent: 30 - - uid: 10183 + - uid: 10138 components: - type: Transform - pos: -17.5,-62.5 + pos: -20.5,-60.5 parent: 30 - - uid: 10184 + - uid: 10142 components: - type: Transform - pos: -17.5,-63.5 + pos: -14.5,-60.5 parent: 30 - - uid: 10185 + - uid: 10144 components: - type: Transform - pos: -17.5,-64.5 + pos: -19.5,-60.5 parent: 30 - - uid: 10535 + - uid: 10153 components: - type: Transform - pos: -16.5,-51.5 + pos: -19.5,-55.5 parent: 30 - - uid: 10670 + - uid: 10154 components: - type: Transform - pos: -20.5,-55.5 + pos: -19.5,-53.5 parent: 30 - - uid: 10671 + - uid: 10156 + components: + - type: Transform + pos: -19.5,-47.5 + parent: 30 + - uid: 10164 + components: + - type: Transform + pos: -18.5,-60.5 + parent: 30 + - uid: 10189 + components: + - type: Transform + pos: -54.5,-62.5 + parent: 30 + - uid: 10204 + components: + - type: Transform + pos: -0.5,-47.5 + parent: 30 + - uid: 10211 + components: + - type: Transform + pos: -0.5,-46.5 + parent: 30 + - uid: 10271 + components: + - type: Transform + pos: -18.5,-46.5 + parent: 30 + - uid: 10274 components: - type: Transform pos: -21.5,-55.5 parent: 30 - - uid: 10672 + - uid: 10510 components: - type: Transform - pos: -22.5,-55.5 + pos: -12.5,-43.5 parent: 30 - - uid: 10673 + - uid: 10529 components: - type: Transform - pos: -22.5,-54.5 + pos: -7.5,-44.5 parent: 30 - - uid: 10674 + - uid: 10530 components: - type: Transform - pos: -22.5,-53.5 + pos: -12.5,-44.5 parent: 30 - - uid: 10675 + - uid: 10537 components: - type: Transform - pos: -22.5,-52.5 + pos: -19.5,-46.5 parent: 30 - - uid: 10676 + - uid: 10539 components: - type: Transform - pos: -22.5,-51.5 + pos: -10.5,-44.5 parent: 30 - - uid: 10677 + - uid: 10540 components: - type: Transform - pos: -22.5,-50.5 + pos: -12.5,-47.5 parent: 30 - - uid: 10678 + - uid: 10541 components: - type: Transform - pos: -22.5,-49.5 + pos: -15.5,-43.5 parent: 30 - - uid: 10688 + - uid: 10542 components: - type: Transform - pos: -22.5,-48.5 + pos: -17.5,-44.5 parent: 30 - - uid: 10696 + - uid: 10543 components: - type: Transform - pos: -22.5,-47.5 + pos: -14.5,-43.5 + parent: 30 + - uid: 10544 + components: + - type: Transform + pos: -16.5,-36.5 + parent: 30 + - uid: 10547 + components: + - type: Transform + pos: -4.5,-44.5 + parent: 30 + - uid: 10586 + components: + - type: Transform + pos: -19.5,-54.5 + parent: 30 + - uid: 10588 + components: + - type: Transform + pos: -15.5,-60.5 + parent: 30 + - uid: 10599 + components: + - type: Transform + pos: -19.5,-48.5 + parent: 30 + - uid: 10601 + components: + - type: Transform + pos: -12.5,-45.5 + parent: 30 + - uid: 10611 + components: + - type: Transform + pos: -5.5,-44.5 + parent: 30 + - uid: 10628 + components: + - type: Transform + pos: -21.5,-58.5 + parent: 30 + - uid: 10631 + components: + - type: Transform + pos: -22.5,-58.5 + parent: 30 + - uid: 10633 + components: + - type: Transform + pos: -20.5,-59.5 + parent: 30 + - uid: 10634 + components: + - type: Transform + pos: -20.5,-58.5 + parent: 30 + - uid: 10638 + components: + - type: Transform + pos: -17.5,-45.5 + parent: 30 + - uid: 10694 + components: + - type: Transform + pos: -17.5,-50.5 + parent: 30 + - uid: 10725 + components: + - type: Transform + pos: -17.5,-51.5 + parent: 30 + - uid: 10754 + components: + - type: Transform + pos: -17.5,-49.5 + parent: 30 + - uid: 11066 + components: + - type: Transform + pos: -19.5,-41.5 + parent: 30 + - uid: 11070 + components: + - type: Transform + pos: -0.5,-44.5 + parent: 30 + - uid: 11078 + components: + - type: Transform + pos: -12.5,-37.5 + parent: 30 + - uid: 11082 + components: + - type: Transform + pos: -12.5,-38.5 + parent: 30 + - uid: 11084 + components: + - type: Transform + pos: -8.5,-39.5 + parent: 30 + - uid: 11096 + components: + - type: Transform + pos: -18.5,-41.5 + parent: 30 + - uid: 11097 + components: + - type: Transform + pos: -11.5,-39.5 + parent: 30 + - uid: 11103 + components: + - type: Transform + pos: -12.5,-35.5 + parent: 30 + - uid: 11114 + components: + - type: Transform + pos: -16.5,-39.5 + parent: 30 + - uid: 11120 + components: + - type: Transform + pos: -13.5,-40.5 + parent: 30 + - uid: 11124 + components: + - type: Transform + pos: -0.5,-49.5 + parent: 30 + - uid: 11142 + components: + - type: Transform + pos: -18.5,-51.5 + parent: 30 + - uid: 11143 + components: + - type: Transform + pos: -19.5,-51.5 + parent: 30 + - uid: 11277 + components: + - type: Transform + pos: -6.5,-42.5 + parent: 30 + - uid: 11291 + components: + - type: Transform + pos: -0.5,-45.5 + parent: 30 + - uid: 11307 + components: + - type: Transform + pos: -16.5,-40.5 + parent: 30 + - uid: 11337 + components: + - type: Transform + pos: -12.5,-39.5 parent: 30 - uid: 11378 components: @@ -34244,6 +33544,26 @@ entities: - type: Transform pos: 3.5,-12.5 parent: 30 + - uid: 12213 + components: + - type: Transform + pos: -6.5,-43.5 + parent: 30 + - uid: 12443 + components: + - type: Transform + pos: -12.5,-34.5 + parent: 30 + - uid: 12814 + components: + - type: Transform + pos: -53.5,-62.5 + parent: 30 + - uid: 13083 + components: + - type: Transform + pos: -16.5,-38.5 + parent: 30 - uid: 13842 components: - type: Transform @@ -35969,6 +35289,11 @@ entities: - type: Transform pos: 46.5,31.5 parent: 30 + - uid: 16129 + components: + - type: Transform + pos: -55.5,-62.5 + parent: 30 - uid: 16265 components: - type: Transform @@ -37044,21 +36369,6 @@ entities: - type: Transform pos: -55.5,-48.5 parent: 30 - - uid: 17884 - components: - - type: Transform - pos: -52.5,-59.5 - parent: 30 - - uid: 17885 - components: - - type: Transform - pos: -53.5,-59.5 - parent: 30 - - uid: 17886 - components: - - type: Transform - pos: -54.5,-59.5 - parent: 30 - uid: 17887 components: - type: Transform @@ -37114,6 +36424,16 @@ entities: - type: Transform pos: -55.5,-49.5 parent: 30 + - uid: 17910 + components: + - type: Transform + pos: -54.5,-60.5 + parent: 30 + - uid: 17911 + components: + - type: Transform + pos: -53.5,-60.5 + parent: 30 - uid: 17913 components: - type: Transform @@ -37349,45 +36669,35 @@ entities: - type: Transform pos: -52.5,-43.5 parent: 30 - - uid: 18796 + - uid: 18766 components: - type: Transform - pos: -69.5,-63.5 + pos: -56.5,-65.5 parent: 30 - - uid: 18797 + - uid: 18767 components: - type: Transform - pos: -68.5,-62.5 + pos: -56.5,-64.5 parent: 30 - - uid: 18798 + - uid: 18768 components: - type: Transform - pos: -69.5,-62.5 + pos: -53.5,-61.5 + parent: 30 + - uid: 18795 + components: + - type: Transform + pos: -55.5,-63.5 parent: 30 - uid: 18799 components: - type: Transform - pos: -67.5,-62.5 + pos: -56.5,-63.5 parent: 30 - uid: 18800 components: - type: Transform - pos: -65.5,-62.5 - parent: 30 - - uid: 18801 - components: - - type: Transform - pos: -64.5,-62.5 - parent: 30 - - uid: 18802 - components: - - type: Transform - pos: -64.5,-61.5 - parent: 30 - - uid: 18803 - components: - - type: Transform - pos: -64.5,-60.5 + pos: -56.5,-62.5 parent: 30 - uid: 18804 components: @@ -37434,6 +36744,11 @@ entities: - type: Transform pos: -56.5,-59.5 parent: 30 + - uid: 18924 + components: + - type: Transform + pos: -15.5,-39.5 + parent: 30 - uid: 18926 components: - type: Transform @@ -37509,6 +36824,31 @@ entities: - type: Transform pos: -54.5,-42.5 parent: 30 + - uid: 19243 + components: + - type: Transform + pos: -13.5,-31.5 + parent: 30 + - uid: 19424 + components: + - type: Transform + pos: -0.5,-48.5 + parent: 30 + - uid: 19785 + components: + - type: Transform + pos: -17.5,-41.5 + parent: 30 + - uid: 19801 + components: + - type: Transform + pos: -16.5,-41.5 + parent: 30 + - uid: 19802 + components: + - type: Transform + pos: -23.5,-41.5 + parent: 30 - uid: 19816 components: - type: Transform @@ -37559,51 +36899,6 @@ entities: - type: Transform pos: -26.5,-41.5 parent: 30 - - uid: 20409 - components: - - type: Transform - pos: -25.5,-41.5 - parent: 30 - - uid: 20410 - components: - - type: Transform - pos: -24.5,-41.5 - parent: 30 - - uid: 20411 - components: - - type: Transform - pos: -23.5,-41.5 - parent: 30 - - uid: 20412 - components: - - type: Transform - pos: -23.5,-42.5 - parent: 30 - - uid: 20413 - components: - - type: Transform - pos: -23.5,-43.5 - parent: 30 - - uid: 20414 - components: - - type: Transform - pos: -23.5,-44.5 - parent: 30 - - uid: 20415 - components: - - type: Transform - pos: -23.5,-45.5 - parent: 30 - - uid: 20416 - components: - - type: Transform - pos: -23.5,-46.5 - parent: 30 - - uid: 20417 - components: - - type: Transform - pos: -22.5,-46.5 - parent: 30 - uid: 21289 components: - type: Transform @@ -37659,61 +36954,6 @@ entities: - type: Transform pos: 0.5,84.5 parent: 30 - - uid: 22660 - components: - - type: Transform - pos: -25.5,-58.5 - parent: 30 - - uid: 22661 - components: - - type: Transform - pos: -26.5,-58.5 - parent: 30 - - uid: 22662 - components: - - type: Transform - pos: -26.5,-59.5 - parent: 30 - - uid: 22663 - components: - - type: Transform - pos: -26.5,-60.5 - parent: 30 - - uid: 22664 - components: - - type: Transform - pos: -26.5,-61.5 - parent: 30 - - uid: 22665 - components: - - type: Transform - pos: -25.5,-61.5 - parent: 30 - - uid: 22666 - components: - - type: Transform - pos: -25.5,-62.5 - parent: 30 - - uid: 22667 - components: - - type: Transform - pos: -25.5,-63.5 - parent: 30 - - uid: 22668 - components: - - type: Transform - pos: -26.5,-63.5 - parent: 30 - - uid: 22669 - components: - - type: Transform - pos: -27.5,-63.5 - parent: 30 - - uid: 22670 - components: - - type: Transform - pos: -27.5,-62.5 - parent: 30 - proto: CableHVStack entities: - uid: 1639 @@ -37721,10 +36961,10 @@ entities: - type: Transform pos: -29.80019,33.583 parent: 30 - - uid: 9607 + - uid: 10203 components: - type: Transform - pos: -15.37175,-34.518528 + pos: -24.57955,-44.498714 parent: 30 - uid: 10314 components: @@ -37741,10 +36981,10 @@ entities: - type: Transform pos: -42.242332,27.415749 parent: 30 - - uid: 11312 + - uid: 11025 components: - type: Transform - pos: 1.5133002,-44.49842 + pos: -5.405215,-34.750645 parent: 30 - uid: 15972 components: @@ -37753,6 +36993,16 @@ entities: parent: 30 - proto: CableMV entities: + - uid: 845 + components: + - type: Transform + pos: -11.5,-39.5 + parent: 30 + - uid: 866 + components: + - type: Transform + pos: -10.5,-37.5 + parent: 30 - uid: 948 components: - type: Transform @@ -38523,26 +37773,6 @@ entities: - type: Transform pos: -23.5,6.5 parent: 30 - - uid: 4098 - components: - - type: Transform - pos: -24.5,6.5 - parent: 30 - - uid: 4099 - components: - - type: Transform - pos: -25.5,6.5 - parent: 30 - - uid: 4100 - components: - - type: Transform - pos: -26.5,6.5 - parent: 30 - - uid: 4101 - components: - - type: Transform - pos: -26.5,6.5 - parent: 30 - uid: 4102 components: - type: Transform @@ -38778,6 +38008,16 @@ entities: - type: Transform pos: -5.5,12.5 parent: 30 + - uid: 4426 + components: + - type: Transform + pos: -24.5,7.5 + parent: 30 + - uid: 4455 + components: + - type: Transform + pos: -25.5,7.5 + parent: 30 - uid: 4512 components: - type: Transform @@ -39673,6 +38913,11 @@ entities: - type: Transform pos: -13.5,-7.5 parent: 30 + - uid: 7449 + components: + - type: Transform + pos: -23.5,7.5 + parent: 30 - uid: 7481 components: - type: Transform @@ -39883,16 +39128,6 @@ entities: - type: Transform pos: -24.5,-6.5 parent: 30 - - uid: 8004 - components: - - type: Transform - pos: -4.5,-47.5 - parent: 30 - - uid: 8005 - components: - - type: Transform - pos: -7.5,-46.5 - parent: 30 - uid: 8045 components: - type: Transform @@ -39923,11 +39158,6 @@ entities: - type: Transform pos: -25.5,-5.5 parent: 30 - - uid: 8137 - components: - - type: Transform - pos: -5.5,-15.5 - parent: 30 - uid: 8138 components: - type: Transform @@ -39938,10 +39168,25 @@ entities: - type: Transform pos: -28.5,-5.5 parent: 30 - - uid: 8606 + - uid: 8251 components: - type: Transform - pos: 3.5,-37.5 + pos: -15.5,-40.5 + parent: 30 + - uid: 8837 + components: + - type: Transform + pos: -19.5,-41.5 + parent: 30 + - uid: 9047 + components: + - type: Transform + pos: -20.5,-44.5 + parent: 30 + - uid: 9048 + components: + - type: Transform + pos: -20.5,-43.5 parent: 30 - uid: 9055 components: @@ -40033,210 +39278,120 @@ entities: - type: Transform pos: -30.5,-13.5 parent: 30 - - uid: 10269 + - uid: 9927 + components: + - type: Transform + pos: -16.5,-28.5 + parent: 30 + - uid: 9935 + components: + - type: Transform + pos: -16.5,-29.5 + parent: 30 + - uid: 10143 + components: + - type: Transform + pos: -23.5,-55.5 + parent: 30 + - uid: 10155 + components: + - type: Transform + pos: -17.5,-48.5 + parent: 30 + - uid: 10157 + components: + - type: Transform + pos: -22.5,-60.5 + parent: 30 + - uid: 10158 + components: + - type: Transform + pos: -21.5,-60.5 + parent: 30 + - uid: 10159 + components: + - type: Transform + pos: -20.5,-53.5 + parent: 30 + - uid: 10161 + components: + - type: Transform + pos: -20.5,-42.5 + parent: 30 + - uid: 10162 + components: + - type: Transform + pos: -18.5,-41.5 + parent: 30 + - uid: 10165 + components: + - type: Transform + pos: -23.5,-57.5 + parent: 30 + - uid: 10168 + components: + - type: Transform + pos: -17.5,-50.5 + parent: 30 + - uid: 10169 components: - type: Transform pos: -17.5,-51.5 parent: 30 - - uid: 10270 + - uid: 10177 components: - type: Transform - pos: -17.5,-52.5 + pos: -20.5,-41.5 parent: 30 - - uid: 10271 + - uid: 10178 components: - type: Transform - pos: -17.5,-53.5 + pos: -16.5,-40.5 parent: 30 - - uid: 10272 + - uid: 10183 components: - type: Transform - pos: -17.5,-54.5 + pos: -17.5,-41.5 parent: 30 - - uid: 10273 + - uid: 10184 components: - type: Transform - pos: -17.5,-55.5 + pos: -20.5,-45.5 parent: 30 - - uid: 10274 + - uid: 10187 components: - type: Transform - pos: -17.5,-56.5 + pos: -53.5,-60.5 parent: 30 - - uid: 10275 + - uid: 10207 components: - type: Transform - pos: -17.5,-57.5 + pos: -55.5,-62.5 parent: 30 - - uid: 10276 + - uid: 10209 components: - type: Transform - pos: -17.5,-58.5 + pos: -53.5,-62.5 parent: 30 - - uid: 10277 + - uid: 10210 components: - type: Transform - pos: -17.5,-59.5 + pos: -53.5,-61.5 parent: 30 - - uid: 10278 + - uid: 10441 components: - type: Transform - pos: -17.5,-60.5 + pos: -18.5,-30.5 parent: 30 - - uid: 10279 + - uid: 10532 components: - type: Transform - pos: -17.5,-61.5 + pos: -17.5,-30.5 parent: 30 - - uid: 10280 + - uid: 10533 components: - type: Transform - pos: -17.5,-62.5 - parent: 30 - - uid: 10281 - components: - - type: Transform - pos: -17.5,-63.5 - parent: 30 - - uid: 10282 - components: - - type: Transform - pos: -17.5,-64.5 - parent: 30 - - uid: 10534 - components: - - type: Transform - pos: -16.5,-51.5 - parent: 30 - - uid: 10537 - components: - - type: Transform - pos: 3.5,-38.5 - parent: 30 - - uid: 10538 - components: - - type: Transform - pos: 2.5,-38.5 - parent: 30 - - uid: 10539 - components: - - type: Transform - pos: 1.5,-38.5 - parent: 30 - - uid: 10540 - components: - - type: Transform - pos: 0.5,-38.5 - parent: 30 - - uid: 10541 - components: - - type: Transform - pos: -0.5,-38.5 - parent: 30 - - uid: 10542 - components: - - type: Transform - pos: -1.5,-38.5 - parent: 30 - - uid: 10543 - components: - - type: Transform - pos: -1.5,-38.5 - parent: 30 - - uid: 10544 - components: - - type: Transform - pos: -2.5,-38.5 - parent: 30 - - uid: 10545 - components: - - type: Transform - pos: -3.5,-38.5 - parent: 30 - - uid: 10546 - components: - - type: Transform - pos: -4.5,-38.5 - parent: 30 - - uid: 10547 - components: - - type: Transform - pos: -20.5,-38.5 - parent: 30 - - uid: 10548 - components: - - type: Transform - pos: -19.5,-38.5 - parent: 30 - - uid: 10549 - components: - - type: Transform - pos: -18.5,-38.5 - parent: 30 - - uid: 10550 - components: - - type: Transform - pos: -17.5,-38.5 - parent: 30 - - uid: 10551 - components: - - type: Transform - pos: -16.5,-38.5 - parent: 30 - - uid: 10552 - components: - - type: Transform - pos: -15.5,-38.5 - parent: 30 - - uid: 10553 - components: - - type: Transform - pos: -14.5,-38.5 - parent: 30 - - uid: 10554 - components: - - type: Transform - pos: -13.5,-38.5 - parent: 30 - - uid: 10555 - components: - - type: Transform - pos: -12.5,-38.5 - parent: 30 - - uid: 10556 - components: - - type: Transform - pos: -11.5,-38.5 - parent: 30 - - uid: 10557 - components: - - type: Transform - pos: -10.5,-38.5 - parent: 30 - - uid: 10558 - components: - - type: Transform - pos: -9.5,-38.5 - parent: 30 - - uid: 10559 - components: - - type: Transform - pos: -8.5,-38.5 - parent: 30 - - uid: 10560 - components: - - type: Transform - pos: -7.5,-38.5 - parent: 30 - - uid: 10561 - components: - - type: Transform - pos: -6.5,-38.5 - parent: 30 - - uid: 10562 - components: - - type: Transform - pos: -5.5,-38.5 + pos: -16.5,-30.5 parent: 30 - uid: 10563 components: @@ -40333,16 +39488,186 @@ entities: - type: Transform pos: 9.5,-30.5 parent: 30 - - uid: 10642 + - uid: 10594 components: - type: Transform - pos: -7.5,-40.5 + pos: -16.5,-41.5 parent: 30 - - uid: 10643 + - uid: 10595 + components: + - type: Transform + pos: -24.5,-60.5 + parent: 30 + - uid: 10596 + components: + - type: Transform + pos: -24.5,-62.5 + parent: 30 + - uid: 10600 + components: + - type: Transform + pos: -19.5,-48.5 + parent: 30 + - uid: 10602 + components: + - type: Transform + pos: -24.5,-63.5 + parent: 30 + - uid: 10605 + components: + - type: Transform + pos: -12.5,-40.5 + parent: 30 + - uid: 10615 + components: + - type: Transform + pos: -18.5,-48.5 + parent: 30 + - uid: 10616 + components: + - type: Transform + pos: -17.5,-49.5 + parent: 30 + - uid: 10618 + components: + - type: Transform + pos: -23.5,-56.5 + parent: 30 + - uid: 10620 + components: + - type: Transform + pos: -23.5,-58.5 + parent: 30 + - uid: 10625 + components: + - type: Transform + pos: -10.5,-39.5 + parent: 30 + - uid: 10626 + components: + - type: Transform + pos: -8.5,-39.5 + parent: 30 + - uid: 10630 + components: + - type: Transform + pos: -24.5,-61.5 + parent: 30 + - uid: 10646 + components: + - type: Transform + pos: -19.5,-54.5 + parent: 30 + - uid: 10675 components: - type: Transform pos: -7.5,-39.5 parent: 30 + - uid: 10679 + components: + - type: Transform + pos: -12.5,-39.5 + parent: 30 + - uid: 10681 + components: + - type: Transform + pos: -6.5,-39.5 + parent: 30 + - uid: 10683 + components: + - type: Transform + pos: -1.5,-39.5 + parent: 30 + - uid: 10684 + components: + - type: Transform + pos: 0.5,-39.5 + parent: 30 + - uid: 10685 + components: + - type: Transform + pos: 1.5,-38.5 + parent: 30 + - uid: 10686 + components: + - type: Transform + pos: -15.5,-39.5 + parent: 30 + - uid: 10687 + components: + - type: Transform + pos: -10.5,-38.5 + parent: 30 + - uid: 10688 + components: + - type: Transform + pos: -9.5,-39.5 + parent: 30 + - uid: 11064 + components: + - type: Transform + pos: -13.5,-40.5 + parent: 30 + - uid: 11158 + components: + - type: Transform + pos: -3.5,-39.5 + parent: 30 + - uid: 11227 + components: + - type: Transform + pos: -0.5,-39.5 + parent: 30 + - uid: 11257 + components: + - type: Transform + pos: 1.5,-39.5 + parent: 30 + - uid: 11263 + components: + - type: Transform + pos: -4.5,-39.5 + parent: 30 + - uid: 11268 + components: + - type: Transform + pos: -2.5,-39.5 + parent: 30 + - uid: 11302 + components: + - type: Transform + pos: -21.5,-55.5 + parent: 30 + - uid: 11304 + components: + - type: Transform + pos: -20.5,-55.5 + parent: 30 + - uid: 11313 + components: + - type: Transform + pos: -14.5,-40.5 + parent: 30 + - uid: 11333 + components: + - type: Transform + pos: -22.5,-55.5 + parent: 30 + - uid: 11334 + components: + - type: Transform + pos: -23.5,-59.5 + parent: 30 + - uid: 11344 + components: + - type: Transform + pos: -23.5,-60.5 + parent: 30 + - uid: 11464 + components: + - type: Transform + pos: -68.5,-60.5 + parent: 30 - uid: 11534 components: - type: Transform @@ -40773,25 +40098,40 @@ entities: - type: Transform pos: -10.5,-7.5 parent: 30 - - uid: 12380 + - uid: 12651 components: - type: Transform - pos: -0.5,-47.5 + pos: 21.5,11.5 parent: 30 - - uid: 12443 + - uid: 12652 components: - type: Transform - pos: -1.5,-47.5 + pos: 20.5,11.5 parent: 30 - - uid: 12860 + - uid: 12654 components: - type: Transform - pos: 21.5,12.5 + pos: 19.5,11.5 + parent: 30 + - uid: 12696 + components: + - type: Transform + pos: -69.5,-60.5 parent: 30 - uid: 12862 components: - type: Transform - pos: 20.5,12.5 + pos: 16.5,11.5 + parent: 30 + - uid: 12865 + components: + - type: Transform + pos: 16.5,12.5 + parent: 30 + - uid: 13075 + components: + - type: Transform + pos: -54.5,-62.5 parent: 30 - uid: 13099 components: @@ -41141,28 +40481,13 @@ entities: - uid: 13211 components: - type: Transform - pos: 19.5,12.5 - parent: 30 - - uid: 13283 - components: - - type: Transform - pos: 18.5,13.5 + pos: 18.5,11.5 parent: 30 - uid: 13307 components: - type: Transform pos: 26.5,20.5 parent: 30 - - uid: 13319 - components: - - type: Transform - pos: -2.5,-47.5 - parent: 30 - - uid: 13331 - components: - - type: Transform - pos: 18.5,12.5 - parent: 30 - uid: 13369 components: - type: Transform @@ -41188,6 +40513,26 @@ entities: - type: Transform pos: 15.5,55.5 parent: 30 + - uid: 13972 + components: + - type: Transform + pos: -17.5,-52.5 + parent: 30 + - uid: 14345 + components: + - type: Transform + pos: 17.5,11.5 + parent: 30 + - uid: 14441 + components: + - type: Transform + pos: -54.5,-60.5 + parent: 30 + - uid: 14523 + components: + - type: Transform + pos: -55.5,-60.5 + parent: 30 - uid: 14542 components: - type: Transform @@ -41253,11 +40598,6 @@ entities: - type: Transform pos: 48.5,20.5 parent: 30 - - uid: 14590 - components: - - type: Transform - pos: -7.5,-43.5 - parent: 30 - uid: 14731 components: - type: Transform @@ -41438,46 +40778,16 @@ entities: - type: Transform pos: 32.5,44.5 parent: 30 - - uid: 14808 - components: - - type: Transform - pos: -7.5,-44.5 - parent: 30 - - uid: 14827 - components: - - type: Transform - pos: -7.5,-45.5 - parent: 30 - - uid: 14828 - components: - - type: Transform - pos: -6.5,-47.5 - parent: 30 - - uid: 14848 - components: - - type: Transform - pos: -3.5,-47.5 - parent: 30 - - uid: 14868 - components: - - type: Transform - pos: -7.5,-42.5 - parent: 30 - - uid: 14895 - components: - - type: Transform - pos: -5.5,-47.5 - parent: 30 - - uid: 14915 - components: - - type: Transform - pos: -7.5,-41.5 - parent: 30 - uid: 16128 components: - type: Transform pos: 23.5,-4.5 parent: 30 + - uid: 16404 + components: + - type: Transform + pos: -56.5,-62.5 + parent: 30 - uid: 16420 components: - type: Transform @@ -41488,10 +40798,10 @@ entities: - type: Transform pos: 23.5,-6.5 parent: 30 - - uid: 17593 + - uid: 17785 components: - type: Transform - pos: -7.5,-47.5 + pos: -56.5,-65.5 parent: 30 - uid: 18118 components: @@ -41503,20 +40813,20 @@ entities: - type: Transform pos: 16.5,47.5 parent: 30 - - uid: 18859 + - uid: 18189 components: - type: Transform - pos: -52.5,-59.5 + pos: -56.5,-64.5 parent: 30 - - uid: 18860 + - uid: 18190 components: - type: Transform - pos: -53.5,-59.5 + pos: -56.5,-63.5 parent: 30 - - uid: 18861 + - uid: 18207 components: - type: Transform - pos: -54.5,-59.5 + pos: 16.5,13.5 parent: 30 - uid: 18862 components: @@ -41598,21 +40908,6 @@ entities: - type: Transform pos: -68.5,-58.5 parent: 30 - - uid: 18878 - components: - - type: Transform - pos: -69.5,-58.5 - parent: 30 - - uid: 18879 - components: - - type: Transform - pos: -70.5,-58.5 - parent: 30 - - uid: 18880 - components: - - type: Transform - pos: -70.5,-59.5 - parent: 30 - uid: 18881 components: - type: Transform @@ -41988,6 +41283,31 @@ entities: - type: Transform pos: -59.5,-26.5 parent: 30 + - uid: 19182 + components: + - type: Transform + pos: -5.5,-39.5 + parent: 30 + - uid: 19235 + components: + - type: Transform + pos: -17.5,-53.5 + parent: 30 + - uid: 19412 + components: + - type: Transform + pos: -18.5,-54.5 + parent: 30 + - uid: 19421 + components: + - type: Transform + pos: -20.5,-54.5 + parent: 30 + - uid: 19422 + components: + - type: Transform + pos: -17.5,-54.5 + parent: 30 - uid: 19494 components: - type: Transform @@ -42108,31 +41428,6 @@ entities: - type: Transform pos: -8.5,-13.5 parent: 30 - - uid: 19828 - components: - - type: Transform - pos: -5.5,-16.5 - parent: 30 - - uid: 19829 - components: - - type: Transform - pos: -5.5,-17.5 - parent: 30 - - uid: 19830 - components: - - type: Transform - pos: -5.5,-18.5 - parent: 30 - - uid: 19831 - components: - - type: Transform - pos: -5.5,-19.5 - parent: 30 - - uid: 19832 - components: - - type: Transform - pos: -5.5,-20.5 - parent: 30 - uid: 20157 components: - type: Transform @@ -42173,75 +41468,20 @@ entities: - type: Transform pos: 30.5,6.5 parent: 30 - - uid: 20418 + - uid: 20369 components: - type: Transform - pos: -22.5,-46.5 + pos: 1.5,-40.5 parent: 30 - - uid: 20419 + - uid: 20370 components: - type: Transform - pos: -23.5,-46.5 + pos: 1.5,-41.5 parent: 30 - - uid: 20420 + - uid: 20371 components: - type: Transform - pos: -23.5,-45.5 - parent: 30 - - uid: 20421 - components: - - type: Transform - pos: -23.5,-44.5 - parent: 30 - - uid: 20422 - components: - - type: Transform - pos: -23.5,-43.5 - parent: 30 - - uid: 20423 - components: - - type: Transform - pos: -23.5,-42.5 - parent: 30 - - uid: 20424 - components: - - type: Transform - pos: -22.5,-42.5 - parent: 30 - - uid: 20425 - components: - - type: Transform - pos: -21.5,-42.5 - parent: 30 - - uid: 20426 - components: - - type: Transform - pos: -20.5,-42.5 - parent: 30 - - uid: 20427 - components: - - type: Transform - pos: -19.5,-42.5 - parent: 30 - - uid: 20428 - components: - - type: Transform - pos: -18.5,-42.5 - parent: 30 - - uid: 20429 - components: - - type: Transform - pos: -18.5,-41.5 - parent: 30 - - uid: 20430 - components: - - type: Transform - pos: -18.5,-40.5 - parent: 30 - - uid: 20431 - components: - - type: Transform - pos: -18.5,-39.5 + pos: 1.5,-42.5 parent: 30 - uid: 20893 components: @@ -42763,166 +42003,6 @@ entities: - type: Transform pos: 3.5,10.5 parent: 30 - - uid: 22674 - components: - - type: Transform - pos: -27.5,-62.5 - parent: 30 - - uid: 22675 - components: - - type: Transform - pos: -27.5,-61.5 - parent: 30 - - uid: 22676 - components: - - type: Transform - pos: -26.5,-61.5 - parent: 30 - - uid: 22677 - components: - - type: Transform - pos: -26.5,-60.5 - parent: 30 - - uid: 22678 - components: - - type: Transform - pos: -26.5,-59.5 - parent: 30 - - uid: 22679 - components: - - type: Transform - pos: -27.5,-59.5 - parent: 30 - - uid: 22680 - components: - - type: Transform - pos: -27.5,-58.5 - parent: 30 - - uid: 22681 - components: - - type: Transform - pos: -28.5,-58.5 - parent: 30 - - uid: 22682 - components: - - type: Transform - pos: -29.5,-58.5 - parent: 30 - - uid: 22683 - components: - - type: Transform - pos: -29.5,-59.5 - parent: 30 - - uid: 22684 - components: - - type: Transform - pos: -29.5,-60.5 - parent: 30 - - uid: 22685 - components: - - type: Transform - pos: -28.5,-60.5 - parent: 30 - - uid: 22686 - components: - - type: Transform - pos: -30.5,-60.5 - parent: 30 - - uid: 22687 - components: - - type: Transform - pos: -31.5,-60.5 - parent: 30 - - uid: 22688 - components: - - type: Transform - pos: -32.5,-60.5 - parent: 30 - - uid: 22689 - components: - - type: Transform - pos: -33.5,-60.5 - parent: 30 - - uid: 22690 - components: - - type: Transform - pos: -34.5,-60.5 - parent: 30 - - uid: 22691 - components: - - type: Transform - pos: -34.5,-59.5 - parent: 30 - - uid: 22692 - components: - - type: Transform - pos: -34.5,-58.5 - parent: 30 - - uid: 22693 - components: - - type: Transform - pos: -34.5,-57.5 - parent: 30 - - uid: 22694 - components: - - type: Transform - pos: -33.5,-57.5 - parent: 30 - - uid: 22695 - components: - - type: Transform - pos: -32.5,-59.5 - parent: 30 - - uid: 22696 - components: - - type: Transform - pos: -32.5,-58.5 - parent: 30 - - uid: 22697 - components: - - type: Transform - pos: -32.5,-57.5 - parent: 30 - - uid: 22698 - components: - - type: Transform - pos: -32.5,-61.5 - parent: 30 - - uid: 22699 - components: - - type: Transform - pos: -32.5,-62.5 - parent: 30 - - uid: 22700 - components: - - type: Transform - pos: -32.5,-63.5 - parent: 30 - - uid: 22701 - components: - - type: Transform - pos: -31.5,-59.5 - parent: 30 - - uid: 22702 - components: - - type: Transform - pos: -33.5,-59.5 - parent: 30 - - uid: 22703 - components: - - type: Transform - pos: -33.5,-61.5 - parent: 30 - - uid: 22704 - components: - - type: Transform - pos: -31.5,-61.5 - parent: 30 - - uid: 22705 - components: - - type: Transform - pos: -30.5,-61.5 - parent: 30 - proto: CableMVStack entities: - uid: 1638 @@ -42930,10 +42010,10 @@ entities: - type: Transform pos: -30.17519,33.583 parent: 30 - - uid: 9606 + - uid: 10202 components: - type: Transform - pos: -15.528,-34.377903 + pos: -24.846876,-44.33535 parent: 30 - uid: 10260 components: @@ -42950,10 +42030,18 @@ entities: - type: Transform pos: -42.382957,27.540749 parent: 30 - - uid: 11311 + - uid: 10751 components: - type: Transform - pos: 1.2945502,-44.37342 + pos: -5.4943237,-34.631832 + parent: 30 +- proto: CableMVStack10 + entities: + - uid: 10151 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -24.347925,-59.731403 parent: 30 - proto: CableTerminal entities: @@ -42967,33 +42055,48 @@ entities: canCollide: False - type: Fixtures fixtures: {} - - uid: 9487 + - uid: 8419 components: - type: Transform - pos: -6.5,-33.5 + rot: 3.141592653589793 rad + pos: -15.5,-29.5 parent: 30 - - type: Physics - canCollide: False - - type: Fixtures - fixtures: {} - - uid: 9488 + - uid: 9412 components: - type: Transform - pos: -8.5,-33.5 + rot: -1.5707963267948966 rad + pos: -18.5,-46.5 parent: 30 - - type: Physics - canCollide: False - - type: Fixtures - fixtures: {} - - uid: 9489 + - uid: 9418 components: - type: Transform - pos: -7.5,-33.5 + rot: 3.141592653589793 rad + pos: -5.5,-44.5 + parent: 30 + - uid: 9451 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,-44.5 + parent: 30 + - uid: 9499 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -16.5,-34.5 + parent: 30 + - uid: 10503 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,-44.5 + parent: 30 + - uid: 11340 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -16.5,-35.5 parent: 30 - - type: Physics - canCollide: False - - type: Fixtures - fixtures: {} - uid: 15296 components: - type: Transform @@ -43020,11 +42123,6 @@ entities: rot: -1.5707963267948966 rad pos: 0.5,84.5 parent: 30 - - uid: 22671 - components: - - type: Transform - pos: -25.5,-61.5 - parent: 30 - proto: CandyBowl entities: - uid: 10047 @@ -43056,11 +42154,6 @@ entities: - type: Transform pos: 2.6220274,21.009964 parent: 30 - - uid: 22441 - components: - - type: Transform - pos: 2.452661,20.541075 - parent: 30 - proto: CarbonDioxideCanister entities: - uid: 8772 @@ -43078,10 +42171,10 @@ entities: - type: Transform pos: 19.5,-17.5 parent: 30 - - uid: 10430 + - uid: 9657 components: - type: Transform - pos: -14.5,-47.5 + pos: -5.5,-50.5 parent: 30 - proto: Carpet entities: @@ -43604,76 +42697,6 @@ entities: - type: Transform pos: -79.5,-49.5 parent: 30 - - uid: 19401 - components: - - type: Transform - pos: -59.5,-68.5 - parent: 30 - - uid: 19402 - components: - - type: Transform - pos: -59.5,-67.5 - parent: 30 - - uid: 19403 - components: - - type: Transform - pos: -59.5,-66.5 - parent: 30 - - uid: 19404 - components: - - type: Transform - pos: -59.5,-65.5 - parent: 30 - - uid: 19405 - components: - - type: Transform - pos: -59.5,-64.5 - parent: 30 - - uid: 19406 - components: - - type: Transform - pos: -59.5,-63.5 - parent: 30 - - uid: 19407 - components: - - type: Transform - pos: -59.5,-62.5 - parent: 30 - - uid: 19408 - components: - - type: Transform - pos: -58.5,-68.5 - parent: 30 - - uid: 19409 - components: - - type: Transform - pos: -58.5,-67.5 - parent: 30 - - uid: 19410 - components: - - type: Transform - pos: -58.5,-66.5 - parent: 30 - - uid: 19411 - components: - - type: Transform - pos: -58.5,-65.5 - parent: 30 - - uid: 19412 - components: - - type: Transform - pos: -58.5,-64.5 - parent: 30 - - uid: 19413 - components: - - type: Transform - pos: -58.5,-63.5 - parent: 30 - - uid: 19414 - components: - - type: Transform - pos: -58.5,-62.5 - parent: 30 - uid: 19478 components: - type: Transform @@ -44408,23 +43431,35 @@ entities: parent: 30 - proto: CarpetOrange entities: - - uid: 8294 + - uid: 4099 components: - type: Transform - rot: 3.141592653589793 rad - pos: -16.5,-35.5 + pos: -66.5,-63.5 parent: 30 - - uid: 8297 + - uid: 4100 components: - type: Transform - rot: 3.141592653589793 rad - pos: -16.5,-36.5 + pos: -66.5,-62.5 parent: 30 - - uid: 8298 + - uid: 4128 components: - type: Transform - rot: 3.141592653589793 rad - pos: -16.5,-34.5 + pos: -65.5,-64.5 + parent: 30 + - uid: 4129 + components: + - type: Transform + pos: -65.5,-63.5 + parent: 30 + - uid: 4130 + components: + - type: Transform + pos: -65.5,-62.5 + parent: 30 + - uid: 9492 + components: + - type: Transform + pos: -6.5,-33.5 parent: 30 - uid: 9720 components: @@ -44446,6 +43481,26 @@ entities: - type: Transform pos: -42.5,-13.5 parent: 30 + - uid: 9976 + components: + - type: Transform + pos: -63.5,-63.5 + parent: 30 + - uid: 10227 + components: + - type: Transform + pos: -61.5,-65.5 + parent: 30 + - uid: 10742 + components: + - type: Transform + pos: -6.5,-35.5 + parent: 30 + - uid: 11020 + components: + - type: Transform + pos: -6.5,-34.5 + parent: 30 - uid: 11619 components: - type: Transform @@ -44466,6 +43521,46 @@ entities: - type: Transform pos: 24.5,0.5 parent: 30 + - uid: 12771 + components: + - type: Transform + pos: -62.5,-65.5 + parent: 30 + - uid: 12772 + components: + - type: Transform + pos: -61.5,-63.5 + parent: 30 + - uid: 12809 + components: + - type: Transform + pos: -61.5,-64.5 + parent: 30 + - uid: 12820 + components: + - type: Transform + pos: -63.5,-64.5 + parent: 30 + - uid: 14360 + components: + - type: Transform + pos: -66.5,-64.5 + parent: 30 + - uid: 14473 + components: + - type: Transform + pos: -63.5,-65.5 + parent: 30 + - uid: 14474 + components: + - type: Transform + pos: -62.5,-64.5 + parent: 30 + - uid: 14478 + components: + - type: Transform + pos: -62.5,-63.5 + parent: 30 - proto: CarpetPink entities: - uid: 15267 @@ -44881,11 +43976,6 @@ entities: - type: Transform pos: -58.5,-8.5 parent: 30 - - uid: 4987 - components: - - type: Transform - pos: -20.5,-58.5 - parent: 30 - uid: 5068 components: - type: Transform @@ -45008,21 +44098,23 @@ entities: - type: Transform pos: 27.5,-18.5 parent: 30 - - uid: 7443 - components: - - type: Transform - pos: -19.5,-58.5 - parent: 30 - - uid: 7444 - components: - - type: Transform - pos: -18.5,-58.5 - parent: 30 - uid: 7975 components: - type: Transform pos: 24.5,-18.5 parent: 30 + - uid: 8455 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,-44.5 + parent: 30 + - uid: 8526 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,-43.5 + parent: 30 - uid: 8538 components: - type: Transform @@ -45078,36 +44170,6 @@ entities: - type: Transform pos: -5.5,-14.5 parent: 30 - - uid: 9213 - components: - - type: Transform - pos: -5.5,-15.5 - parent: 30 - - uid: 9214 - components: - - type: Transform - pos: -5.5,-16.5 - parent: 30 - - uid: 9215 - components: - - type: Transform - pos: -5.5,-17.5 - parent: 30 - - uid: 9216 - components: - - type: Transform - pos: -5.5,-18.5 - parent: 30 - - uid: 9217 - components: - - type: Transform - pos: -5.5,-19.5 - parent: 30 - - uid: 9218 - components: - - type: Transform - pos: -5.5,-20.5 - parent: 30 - uid: 9219 components: - type: Transform @@ -45123,51 +44185,110 @@ entities: - type: Transform pos: 25.5,-18.5 parent: 30 + - uid: 9478 + components: + - type: Transform + pos: -12.5,-48.5 + parent: 30 + - uid: 9484 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,-43.5 + parent: 30 + - uid: 9518 + components: + - type: Transform + pos: -5.5,-18.5 + parent: 30 + - uid: 9520 + components: + - type: Transform + pos: -11.5,-51.5 + parent: 30 - uid: 9563 components: - type: Transform - pos: -12.5,-29.5 - parent: 30 - - uid: 9564 - components: - - type: Transform - pos: -11.5,-29.5 - parent: 30 - - uid: 9565 - components: - - type: Transform - pos: -10.5,-29.5 - parent: 30 - - uid: 9566 - components: - - type: Transform - pos: -9.5,-29.5 - parent: 30 - - uid: 9567 - components: - - type: Transform - pos: -8.5,-29.5 - parent: 30 - - uid: 9568 - components: - - type: Transform - pos: -7.5,-29.5 + pos: -10.5,-51.5 parent: 30 - uid: 9569 components: - type: Transform - pos: -6.5,-29.5 + rot: -1.5707963267948966 rad + pos: -6.5,-44.5 + parent: 30 + - uid: 9571 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,-44.5 + parent: 30 + - uid: 9613 + components: + - type: Transform + pos: -5.5,-17.5 + parent: 30 + - uid: 9615 + components: + - type: Transform + pos: -5.5,-19.5 + parent: 30 + - uid: 9616 + components: + - type: Transform + pos: -5.5,-20.5 + parent: 30 + - uid: 9704 + components: + - type: Transform + pos: -5.5,-16.5 + parent: 30 + - uid: 9705 + components: + - type: Transform + pos: -5.5,-15.5 parent: 30 - uid: 9799 components: - type: Transform pos: -40.5,-24.5 parent: 30 + - uid: 9821 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-46.5 + parent: 30 - uid: 9831 components: - type: Transform pos: -41.5,-24.5 parent: 30 + - uid: 9888 + components: + - type: Transform + pos: -12.5,-49.5 + parent: 30 + - uid: 9889 + components: + - type: Transform + pos: -8.5,-51.5 + parent: 30 + - uid: 9938 + components: + - type: Transform + pos: -12.5,-51.5 + parent: 30 + - uid: 9939 + components: + - type: Transform + pos: -12.5,-50.5 + parent: 30 + - uid: 9985 + components: + - type: Transform + pos: -9.5,-51.5 + parent: 30 - uid: 10073 components: - type: Transform @@ -45183,6 +44304,107 @@ entities: - type: Transform pos: -48.5,-8.5 parent: 30 + - uid: 10659 + components: + - type: Transform + pos: -21.5,-55.5 + parent: 30 + - uid: 10660 + components: + - type: Transform + pos: -22.5,-55.5 + parent: 30 + - uid: 10670 + components: + - type: Transform + pos: -22.5,-56.5 + parent: 30 + - uid: 10671 + components: + - type: Transform + pos: -10.5,-55.5 + parent: 30 + - uid: 10689 + components: + - type: Transform + pos: -11.5,-56.5 + parent: 30 + - uid: 11093 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-45.5 + parent: 30 + - uid: 11094 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-44.5 + parent: 30 + - uid: 11121 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,-44.5 + parent: 30 + - uid: 11148 + components: + - type: Transform + pos: -23.5,-55.5 + parent: 30 + - uid: 11149 + components: + - type: Transform + pos: -9.5,-55.5 + parent: 30 + - uid: 11150 + components: + - type: Transform + pos: -10.5,-56.5 + parent: 30 + - uid: 11151 + components: + - type: Transform + pos: -12.5,-55.5 + parent: 30 + - uid: 11152 + components: + - type: Transform + pos: -13.5,-55.5 + parent: 30 + - uid: 11153 + components: + - type: Transform + pos: -11.5,-57.5 + parent: 30 + - uid: 11154 + components: + - type: Transform + pos: -12.5,-56.5 + parent: 30 + - uid: 11273 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,-44.5 + parent: 30 + - uid: 11274 + components: + - type: Transform + pos: -9.5,-56.5 + parent: 30 + - uid: 11287 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-44.5 + parent: 30 + - uid: 11288 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,-44.5 + parent: 30 - uid: 11314 components: - type: Transform @@ -45363,6 +44585,17 @@ entities: - type: Transform pos: 37.5,-18.5 parent: 30 + - uid: 13903 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,-43.5 + parent: 30 + - uid: 14848 + components: + - type: Transform + pos: -23.5,-56.5 + parent: 30 - uid: 14869 components: - type: Transform @@ -47196,6 +46429,16 @@ entities: - type: Transform pos: -59.5,23.5 parent: 30 + - uid: 18994 + components: + - type: Transform + pos: -23.5,-57.5 + parent: 30 + - uid: 19241 + components: + - type: Transform + pos: -11.5,-55.5 + parent: 30 - uid: 19591 components: - type: Transform @@ -47556,46 +46799,6 @@ entities: - type: Transform pos: -0.5,58.5 parent: 30 - - uid: 22647 - components: - - type: Transform - pos: -22.5,-58.5 - parent: 30 - - uid: 22648 - components: - - type: Transform - pos: -23.5,-58.5 - parent: 30 - - uid: 22760 - components: - - type: Transform - pos: -25.5,-63.5 - parent: 30 - - uid: 22761 - components: - - type: Transform - pos: -26.5,-63.5 - parent: 30 - - uid: 22762 - components: - - type: Transform - pos: -27.5,-63.5 - parent: 30 - - uid: 22763 - components: - - type: Transform - pos: -27.5,-61.5 - parent: 30 - - uid: 22764 - components: - - type: Transform - pos: -26.5,-61.5 - parent: 30 - - uid: 22765 - components: - - type: Transform - pos: -25.5,-61.5 - parent: 30 - proto: Chair entities: - uid: 586 @@ -48039,6 +47242,42 @@ entities: rot: 1.5707963267948966 rad pos: 11.5,-4.5 parent: 30 + - uid: 10125 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -23.5,-39.5 + parent: 30 + - uid: 10127 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -23.5,-40.5 + parent: 30 + - uid: 10195 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -23.5,-41.5 + parent: 30 + - uid: 10196 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -20.5,-40.5 + parent: 30 + - uid: 10197 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -20.5,-39.5 + parent: 30 + - uid: 10198 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -20.5,-41.5 + parent: 30 - uid: 11360 components: - type: Transform @@ -48735,22 +47974,10 @@ entities: rot: -1.5707963267948966 rad pos: -2.5,-34.5 parent: 30 - - uid: 8251 + - uid: 9060 components: - type: Transform - pos: -16.5,-28.5 - parent: 30 - - uid: 8300 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -5.5,-39.5 - parent: 30 - - uid: 9047 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -17.5,-36.5 + pos: 4.095898,-45.486774 parent: 30 - uid: 9126 components: @@ -48764,20 +47991,28 @@ entities: rot: -1.5707963267948966 rad pos: 5.5,-27.5 parent: 30 - - uid: 9446 + - uid: 9677 components: - type: Transform - pos: -23.5,-40.5 + pos: 2.8055086,-45.39959 parent: 30 - - uid: 11304 + - uid: 9964 components: - type: Transform - pos: -16.5,-43.5 + rot: 3.141592653589793 rad + pos: -8.548677,-35.341038 parent: 30 - - uid: 11305 + - uid: 10095 components: - type: Transform - pos: 1.5,-43.5 + rot: -1.5707963267948966 rad + pos: -16.516525,-31.38681 + parent: 30 + - uid: 10764 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -22.450798,-48.444862 parent: 30 - uid: 11569 components: @@ -48825,12 +48060,6 @@ entities: rot: 1.5707963267948966 rad pos: 32.5,12.5 parent: 30 - - uid: 12831 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 14.5,12.5 - parent: 30 - uid: 16157 components: - type: Transform @@ -48847,6 +48076,11 @@ entities: - type: Transform pos: -60.5,44.5 parent: 30 + - uid: 18995 + components: + - type: Transform + pos: -24.534996,-43.467594 + parent: 30 - uid: 20274 components: - type: Transform @@ -48888,20 +48122,19 @@ entities: rot: -1.5707963267948966 rad pos: 30.5,20.5 parent: 30 - - uid: 22834 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -30.5,-62.5 - parent: 30 - - uid: 22837 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -30.5,-58.5 - parent: 30 - proto: ChairOfficeLight entities: + - uid: 318 + components: + - type: Transform + pos: 18.503437,14.498728 + parent: 30 + - uid: 334 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -66.47906,-63.39059 + parent: 30 - uid: 2111 components: - type: Transform @@ -49001,6 +48234,12 @@ entities: rot: 3.141592653589793 rad pos: 18.5,23.5 parent: 30 + - uid: 14048 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 17.504675,15.6658 + parent: 30 - proto: ChairWood entities: - uid: 562 @@ -49086,6 +48325,24 @@ entities: rot: 1.5707963267948966 rad pos: 17.5,40.5 parent: 30 + - uid: 10229 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -63.447754,-64.514534 + parent: 30 + - uid: 10230 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -61.457657,-64.514534 + parent: 30 + - uid: 10232 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -61.427956,-65.45017 + parent: 30 - uid: 13673 components: - type: Transform @@ -49248,12 +48505,6 @@ entities: rot: -1.5707963267948966 rad pos: -81.5,-44.5 parent: 30 - - uid: 17789 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -55.5,-63.5 - parent: 30 - uid: 18078 components: - type: Transform @@ -49269,16 +48520,6 @@ entities: - type: Transform pos: -58.5,-48.5 parent: 30 - - uid: 19422 - components: - - type: Transform - pos: -60.5,-66.5 - parent: 30 - - uid: 19423 - components: - - type: Transform - pos: -60.5,-64.5 - parent: 30 - uid: 19464 components: - type: Transform @@ -49646,29 +48887,23 @@ entities: - 0 - proto: ClosetChefFilled entities: - - uid: 64 + - uid: 18188 components: - type: Transform - pos: -17.5,5.5 + pos: -16.5,5.5 + parent: 30 +- proto: ClosetEmergency + entities: + - uid: 9869 + components: + - type: Transform + pos: -8.5,-38.5 + parent: 30 + - uid: 13975 + components: + - type: Transform + pos: -15.5,-50.5 parent: 30 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - proto: ClosetEmergencyFilledRandom entities: - uid: 893 @@ -49865,29 +49100,6 @@ entities: - type: Transform pos: -37.5,-5.5 parent: 30 - - uid: 11267 - components: - - type: Transform - pos: -18.5,-51.5 - parent: 30 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - uid: 11456 components: - type: Transform @@ -49939,6 +49151,16 @@ entities: - 0 - 0 - 0 + - uid: 12817 + components: + - type: Transform + pos: -53.5,-65.5 + parent: 30 + - uid: 14049 + components: + - type: Transform + pos: 14.5,10.5 + parent: 30 - uid: 15549 components: - type: Transform @@ -50146,29 +49368,11 @@ entities: - 0 - 0 - 0 - - uid: 18785 + - uid: 19242 components: - type: Transform - pos: -67.5,-65.5 + pos: -13.5,-35.5 parent: 30 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - uid: 19394 components: - type: Transform @@ -50266,52 +49470,6 @@ entities: - 0 - 0 - 0 - - uid: 22654 - components: - - type: Transform - pos: -23.5,-57.5 - parent: 30 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - uid: 22840 - components: - - type: Transform - pos: -27.5,-57.5 - parent: 30 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - proto: ClosetFireFilled entities: - uid: 1277 @@ -50406,6 +49564,11 @@ entities: - 0 - 0 - 0 + - uid: 9067 + components: + - type: Transform + pos: 2.5,-43.5 + parent: 30 - uid: 9242 components: - type: Transform @@ -50452,75 +49615,21 @@ entities: - 0 - 0 - 0 - - uid: 9996 + - uid: 10562 components: - type: Transform - pos: -4.5,-43.5 + pos: 1.5,-43.5 parent: 30 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - uid: 9997 + - uid: 11069 components: - type: Transform - pos: -5.5,-43.5 + pos: 3.5,-37.5 parent: 30 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - uid: 10094 + - uid: 11285 components: - type: Transform - pos: 3.5,-39.5 + pos: -6.5,-38.5 parent: 30 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - uid: 11752 components: - type: Transform @@ -50544,29 +49653,6 @@ entities: - 0 - 0 - 0 - - uid: 12771 - components: - - type: Transform - pos: 18.5,16.5 - parent: 30 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - uid: 13340 components: - type: Transform @@ -50636,6 +49722,11 @@ entities: - 0 - 0 - 0 + - uid: 17726 + components: + - type: Transform + pos: 13.5,12.5 + parent: 30 - uid: 22224 components: - type: Transform @@ -50659,29 +49750,6 @@ entities: - 0 - 0 - 0 - - uid: 22841 - components: - - type: Transform - pos: -25.5,-57.5 - parent: 30 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - proto: ClosetJanitorFilled entities: - uid: 539 @@ -51005,75 +50073,26 @@ entities: - 0 - proto: ClosetRadiationSuitFilled entities: - - uid: 9993 + - uid: 9058 components: - type: Transform - pos: -1.5,-43.5 + pos: 4.5,-43.5 parent: 30 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - uid: 9994 + - uid: 9246 components: - type: Transform - pos: -2.5,-43.5 + pos: 3.5,-43.5 parent: 30 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - uid: 9995 + - uid: 10049 components: - type: Transform - pos: -3.5,-43.5 + pos: -15.5,-48.5 + parent: 30 + - uid: 11062 + components: + - type: Transform + pos: -15.5,-46.5 parent: 30 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - uid: 11246 components: - type: Transform @@ -51097,29 +50116,6 @@ entities: - 0 - 0 - 0 - - uid: 12770 - components: - - type: Transform - pos: 17.5,16.5 - parent: 30 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - uid: 13346 components: - type: Transform @@ -51143,52 +50139,11 @@ entities: - 0 - 0 - 0 - - uid: 21459 + - uid: 14333 components: - type: Transform - pos: 0.5,-37.5 + pos: 12.5,12.5 parent: 30 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - uid: 21460 - components: - - type: Transform - pos: 2.5,-37.5 - parent: 30 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - proto: ClosetSteelBase entities: - uid: 7040 @@ -51253,29 +50208,6 @@ entities: - 0 - 0 - 0 - - uid: 16172 - components: - - type: Transform - pos: 52.5,24.5 - parent: 30 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - uid: 16213 components: - type: Transform @@ -51399,6 +50331,18 @@ entities: - type: Transform pos: -32.460716,58.62153 parent: 30 +- proto: ClothingBeltUtilityEngineering + entities: + - uid: 8298 + components: + - type: Transform + pos: -5.4889383,-38.35511 + parent: 30 + - uid: 11172 + components: + - type: Transform + pos: -9.825792,-47.53879 + parent: 30 - proto: ClothingBeltUtilityFilled entities: - uid: 1630 @@ -51406,16 +50350,6 @@ entities: - type: Transform pos: -28.53513,29.598625 parent: 30 - - uid: 8337 - components: - - type: Transform - pos: -4.5536795,-38.356297 - parent: 30 - - uid: 11334 - components: - - type: Transform - pos: -17.525967,-28.59756 - parent: 30 - proto: ClothingEyesEyepatch entities: - uid: 15076 @@ -51445,10 +50379,10 @@ entities: - type: Transform pos: 24.515018,11.567955 parent: 30 - - uid: 19524 + - uid: 18355 components: - type: Transform - pos: -57.565453,-65.51947 + pos: -58.808327,-65.48881 parent: 30 - uid: 19696 components: @@ -51490,31 +50424,16 @@ entities: parent: 30 - proto: ClothingEyesGlassesMeson entities: - - uid: 9437 + - uid: 9370 components: - type: Transform - pos: -23.481958,-39.312622 - parent: 30 - - uid: 9438 - components: - - type: Transform - pos: -23.481958,-39.468872 + pos: -2.4337187,-46.09784 parent: 30 - uid: 9440 components: - type: Transform pos: 5.538602,-23.326946 parent: 30 - - uid: 9618 - components: - - type: Transform - pos: -18.387093,-35.233547 - parent: 30 - - uid: 10009 - components: - - type: Transform - pos: -13.542964,-45.357754 - parent: 30 - uid: 22447 components: - type: Transform @@ -51539,27 +50458,27 @@ entities: parent: 30 - proto: ClothingEyesGlassesThermal entities: + - uid: 9397 + components: + - type: Transform + pos: -2.5034692,-46.307095 + parent: 30 - uid: 9441 components: - type: Transform pos: 5.522977,-23.530071 parent: 30 - - uid: 10010 - components: - - type: Transform - pos: -13.542964,-45.170254 - parent: 30 - proto: ClothingEyesHudDiagnostic entities: - - uid: 11291 + - uid: 11115 components: - type: Transform - pos: -15.509655,-44.429184 + pos: -9.615068,-41.346893 parent: 30 - - uid: 11292 + - uid: 11116 components: - type: Transform - pos: -15.509655,-44.241684 + pos: -9.388378,-41.503834 parent: 30 - proto: ClothingEyesHudSecurity entities: @@ -51618,10 +50537,10 @@ entities: - type: Transform pos: -29.37888,29.583 parent: 30 - - uid: 9444 + - uid: 19401 components: - type: Transform - pos: -24.364544,-39.42136 + pos: -24.731133,-50.435394 parent: 30 - proto: ClothingHandsGlovesFingerless entities: @@ -51974,20 +50893,10 @@ entities: - type: Transform pos: 16.616007,29.472477 parent: 30 - - uid: 7751 + - uid: 8295 components: - type: Transform - pos: -4.5693045,-38.59067 - parent: 30 - - uid: 7771 - components: - - type: Transform - pos: -4.3505545,-38.46567 - parent: 30 - - uid: 11337 - components: - - type: Transform - pos: -17.479092,-30.706936 + pos: -5.4715004,-38.529488 parent: 30 - uid: 18177 components: @@ -52041,10 +50950,10 @@ entities: parent: 30 - proto: ClothingNeckCloakTrans entities: - - uid: 18360 + - uid: 3344 components: - type: Transform - pos: -64.42011,-67.461174 + pos: -56.501534,-67.426544 parent: 30 - proto: ClothingNeckHeadphones entities: @@ -52067,6 +50976,11 @@ entities: parent: 30 - proto: ClothingNeckScarfStripedGreen entities: + - uid: 3360 + components: + - type: Transform + pos: -66.40864,-64.41052 + parent: 30 - uid: 16211 components: - type: Transform @@ -52077,11 +50991,6 @@ entities: - type: Transform pos: -38.49321,0.5225295 parent: 30 - - uid: 19430 - components: - - type: Transform - pos: -57.52941,-67.45332 - parent: 30 - uid: 21488 components: - type: Transform @@ -52332,15 +51241,15 @@ entities: parent: 30 - proto: ClothingOuterVestHazard entities: - - uid: 11335 + - uid: 11258 components: - type: Transform - pos: -17.557217,-31.269436 + pos: -8.974306,-47.528893 parent: 30 - - uid: 11336 + - uid: 11262 components: - type: Transform - pos: -17.385342,-31.456936 + pos: -9.241632,-47.33087 parent: 30 - proto: ClothingOuterVestWeb entities: @@ -52403,10 +51312,10 @@ entities: - type: Transform pos: -3.4180164,22.487759 parent: 30 - - uid: 11268 + - uid: 4895 components: - type: Transform - pos: -16.51538,-50.461685 + pos: -19.595419,-50.39677 parent: 30 - proto: ClothingShoesBootsPerformer entities: @@ -52782,10 +51691,10 @@ entities: rot: 3.141592653589793 rad pos: 14.5,-16.5 parent: 30 - - uid: 9588 + - uid: 9407 components: - type: Transform - pos: -18.5,-34.5 + pos: -8.5,-33.5 parent: 30 - uid: 9673 components: @@ -52798,17 +51707,23 @@ entities: - type: Transform pos: -42.5,-11.5 parent: 30 - - uid: 12854 + - uid: 14359 components: - type: Transform rot: 1.5707963267948966 rad - pos: 13.5,10.5 + pos: 17.5,10.5 parent: 30 - - uid: 12929 + - uid: 14509 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 15.5,10.5 + rot: 3.141592653589793 rad + pos: -66.5,-65.5 + parent: 30 + - uid: 14524 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -65.5,-65.5 parent: 30 - uid: 15363 components: @@ -52904,6 +51819,12 @@ entities: rot: 1.5707963267948966 rad pos: -57.5,31.5 parent: 30 + - uid: 18544 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 19.5,10.5 + parent: 30 - uid: 19463 components: - type: Transform @@ -52991,12 +51912,6 @@ entities: - type: Transform pos: -61.5,-20.5 parent: 30 - - uid: 22806 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -31.5,-58.5 - parent: 30 - proto: ComputerAnalysisConsole entities: - uid: 15282 @@ -53112,11 +52027,11 @@ entities: - type: Transform pos: -14.5,-14.5 parent: 30 - - uid: 22804 + - uid: 9596 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -31.5,-62.5 + rot: 3.141592653589793 rad + pos: -16.5,-32.5 parent: 30 - proto: ComputerCriminalRecords entities: @@ -53171,11 +52086,6 @@ entities: parent: 30 - proto: ComputerFrame entities: - - uid: 10213 - components: - - type: Transform - pos: -22.5,-68.5 - parent: 30 - uid: 20279 components: - type: Transform @@ -53254,10 +52164,23 @@ entities: rot: -1.5707963267948966 rad pos: -6.5,43.5 parent: 30 - - uid: 11271 + - uid: 8525 components: - type: Transform - pos: -7.5,-35.5 + rot: 1.5707963267948966 rad + pos: -9.5,-33.5 + parent: 30 + - uid: 10200 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -20.5,-44.5 + parent: 30 + - uid: 10589 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,-45.5 parent: 30 - proto: ComputerRadar entities: @@ -53268,12 +52191,6 @@ entities: parent: 30 - proto: ComputerResearchAndDevelopment entities: - - uid: 490 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 13.5,12.5 - parent: 30 - uid: 5816 components: - type: Transform @@ -53339,10 +52256,11 @@ entities: rot: -1.5707963267948966 rad pos: -6.5,44.5 parent: 30 - - uid: 11270 + - uid: 7225 components: - type: Transform - pos: -5.5,-38.5 + rot: -1.5707963267948966 rad + pos: -6.5,-45.5 parent: 30 - uid: 15966 components: @@ -53390,12 +52308,6 @@ entities: - type: Transform pos: -30.5,49.5 parent: 30 - - uid: 22805 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -31.5,-63.5 - parent: 30 - proto: ComputerSurveillanceCameraMonitor entities: - uid: 1073 @@ -53441,10 +52353,11 @@ entities: parent: 30 - proto: ComputerTechnologyDiskTerminal entities: - - uid: 12814 + - uid: 17885 components: - type: Transform - pos: 20.5,12.5 + rot: 3.141592653589793 rad + pos: 20.5,10.5 parent: 30 - proto: ComputerTelevision entities: @@ -53455,25 +52368,25 @@ entities: parent: 30 - proto: ContainmentFieldGenerator entities: - - uid: 9413 + - uid: 18859 components: - type: Transform - pos: -23.5,-49.5 + pos: -18.5,-35.5 parent: 30 - - uid: 9414 + - uid: 19414 components: - type: Transform - pos: -23.5,-50.5 + pos: -17.5,-34.5 parent: 30 - - uid: 9415 + - uid: 19417 components: - type: Transform - pos: -22.5,-50.5 + pos: -17.5,-35.5 parent: 30 - - uid: 9416 + - uid: 19418 components: - type: Transform - pos: -22.5,-49.5 + pos: -18.5,-34.5 parent: 30 - proto: ConveyorBelt entities: @@ -53585,55 +52498,58 @@ entities: - type: Transform pos: 35.5,-17.5 parent: 30 - - uid: 14522 + - uid: 12943 components: - type: Transform - pos: 48.5,25.5 + rot: -1.5707963267948966 rad + pos: 53.5,24.5 parent: 30 - - uid: 14523 + - uid: 12944 components: - type: Transform - pos: 48.5,24.5 + rot: -1.5707963267948966 rad + pos: 52.5,24.5 parent: 30 - - uid: 14524 + - uid: 12961 components: - type: Transform + rot: -1.5707963267948966 rad + pos: 51.5,24.5 + parent: 30 + - uid: 12973 + components: + - type: Transform + pos: 50.5,24.5 + parent: 30 + - uid: 12983 + components: + - type: Transform + rot: 3.141592653589793 rad pos: 48.5,23.5 parent: 30 - - uid: 14525 + - uid: 13034 components: - type: Transform - pos: 48.5,22.5 + rot: 3.141592653589793 rad + pos: 48.5,24.5 parent: 30 - - uid: 14526 + - uid: 13048 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 49.5,22.5 - parent: 30 - - uid: 14527 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 50.5,22.5 - parent: 30 - - uid: 14528 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 51.5,22.5 - parent: 30 - - uid: 14529 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 52.5,22.5 + rot: 3.141592653589793 rad + pos: 48.5,25.5 parent: 30 - uid: 16126 components: - type: Transform pos: 35.5,-15.5 parent: 30 + - uid: 18374 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 50.5,23.5 + parent: 30 - proto: CornSeeds entities: - uid: 2348 @@ -53650,6 +52566,11 @@ entities: parent: 30 - proto: CrateArtifactContainer entities: + - uid: 17790 + components: + - type: Transform + pos: 41.5,12.5 + parent: 30 - uid: 22272 components: - type: Transform @@ -53697,31 +52618,22 @@ entities: - type: Transform pos: 23.5,-3.5 parent: 30 -- proto: CrateEngineeringAMEShielding +- proto: CrateEngineeringAMEJar entities: - - uid: 9478 + - uid: 18993 components: - type: Transform - pos: -16.5,-32.5 + pos: -13.5,-48.5 + parent: 30 + - type: Lock + locked: False +- proto: CrateEngineeringAMEShielding + entities: + - uid: 19186 + components: + - type: Transform + pos: -13.5,-49.5 parent: 30 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 2.0214376 - - 7.6044564 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - proto: CrateEngineeringCableBulk entities: - uid: 3520 @@ -53756,33 +52668,11 @@ entities: - type: Transform pos: -37.5,-3.5 parent: 30 - - uid: 9578 + - uid: 10765 components: - type: Transform - pos: -22.5,-44.5 + pos: -25.5,-47.5 parent: 30 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - uid: 16813 components: - type: Transform @@ -53810,33 +52700,6 @@ entities: containers: - EntityStorageComponent - entity_storage - - uid: 20467 - components: - - type: Transform - pos: 3.5,-44.5 - parent: 30 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - uid: 22442 components: - type: Transform @@ -53862,10 +52725,10 @@ entities: - 0 - proto: CrateEngineeringCableHV entities: - - uid: 10219 + - uid: 10201 components: - type: Transform - pos: -10.5,-68.5 + pos: -5.5,-45.5 parent: 30 - proto: CrateEngineeringCableLV entities: @@ -53896,80 +52759,6 @@ entities: containers: - EntityStorageComponent - entity_storage -- proto: CrateEngineeringCableMV - entities: - - uid: 10220 - components: - - type: Transform - pos: -9.5,-68.5 - parent: 30 -- proto: CrateEngineeringSingularityCollector - entities: - - uid: 10216 - components: - - type: Transform - pos: -13.5,-68.5 - parent: 30 - - uid: 10217 - components: - - type: Transform - pos: -12.5,-68.5 - parent: 30 - - uid: 10218 - components: - - type: Transform - pos: -11.5,-68.5 - parent: 30 -- proto: CrateEngineeringSingularityContainment - entities: - - uid: 11299 - components: - - type: Transform - pos: -16.5,-48.5 - parent: 30 - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 -- proto: CrateEngineeringTeslaCoil - entities: - - uid: 20617 - components: - - type: Transform - pos: -12.5,-69.5 - parent: 30 -- proto: CrateEngineeringTeslaGenerator - entities: - - uid: 9475 - components: - - type: Transform - pos: -13.5,-69.5 - parent: 30 -- proto: CrateEngineeringTeslaGroundingRod - entities: - - uid: 20618 - components: - - type: Transform - pos: -11.5,-69.5 - parent: 30 - proto: CrateFilledSpawner entities: - uid: 3505 @@ -54089,31 +52878,6 @@ entities: - type: Transform pos: 17.5,18.5 parent: 30 -- proto: CrateNPCCow - entities: - - uid: 494 - components: - - type: Transform - pos: -16.5,5.5 - parent: 30 - - type: EntityStorage - air: - volume: 800 - immutable: False - temperature: 293.14987 - moles: - - 13.772371 - - 51.81035 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - proto: CrateNPCHamlet entities: - uid: 4350 @@ -54308,10 +53072,10 @@ entities: available: False - proto: Crowbar entities: - - uid: 12836 + - uid: 18695 components: - type: Transform - pos: 16.474464,12.551813 + pos: 17.494757,13.487526 parent: 30 - proto: CrowbarRed entities: @@ -54335,11 +53099,6 @@ entities: - type: Transform pos: 11.455861,34.475574 parent: 30 - - uid: 11301 - components: - - type: Transform - pos: -18.417063,-48.52035 - parent: 30 - uid: 11738 components: - type: Transform @@ -54461,13 +53220,6 @@ entities: rot: 1.5707963267948966 rad pos: -74.382675,-63.392025 parent: 30 -- proto: DefaultStationBeaconAME - entities: - - uid: 20527 - components: - - type: Transform - pos: -11.5,-30.5 - parent: 30 - proto: DefaultStationBeaconAnomalyGenerator entities: - uid: 20529 @@ -54552,13 +53304,6 @@ entities: - type: Transform pos: 15.5,-4.5 parent: 30 -- proto: DefaultStationBeaconCERoom - entities: - - uid: 20538 - components: - - type: Transform - pos: -18.5,-36.5 - parent: 30 - proto: DefaultStationBeaconChapel entities: - uid: 20543 @@ -54671,13 +53416,6 @@ entities: - type: Transform pos: -51.5,31.5 parent: 30 -- proto: DefaultStationBeaconLibrary - entities: - - uid: 20544 - components: - - type: Transform - pos: -57.5,-66.5 - parent: 30 - proto: DefaultStationBeaconMedbay entities: - uid: 8026 @@ -54704,13 +53442,6 @@ entities: - type: Transform pos: -48.5,64.5 parent: 30 -- proto: DefaultStationBeaconPowerBank - entities: - - uid: 20562 - components: - - type: Transform - pos: -7.5,-36.5 - parent: 30 - proto: DefaultStationBeaconQMRoom entities: - uid: 20563 @@ -54791,20 +53522,6 @@ entities: - type: Transform pos: 4.5,22.5 parent: 30 -- proto: DefaultStationBeaconTEG - entities: - - uid: 20569 - components: - - type: Transform - pos: -7.5,-51.5 - parent: 30 -- proto: DefaultStationBeaconTelecoms - entities: - - uid: 20570 - components: - - type: Transform - pos: -35.5,-60.5 - parent: 30 - proto: DefaultStationBeaconToolRoom entities: - uid: 20574 @@ -54937,18 +53654,28 @@ entities: rot: 3.141592653589793 rad pos: 4.5,-5.5 parent: 30 - - uid: 8454 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -17.5,-58.5 - parent: 30 - uid: 11022 components: - type: Transform rot: 1.5707963267948966 rad pos: 4.5,-0.5 parent: 30 + - uid: 11283 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -13.5,-39.5 + parent: 30 + - uid: 11284 + components: + - type: Transform + pos: -23.5,-40.5 + parent: 30 + - uid: 12641 + components: + - type: Transform + pos: -24.5,13.5 + parent: 30 - uid: 12784 components: - type: Transform @@ -55028,41 +53755,6 @@ entities: - type: Transform pos: 1.5,-29.5 parent: 30 - - uid: 13958 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,-41.5 - parent: 30 - - uid: 13959 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 0.5,-41.5 - parent: 30 - - uid: 13960 - components: - - type: Transform - pos: 0.5,-40.5 - parent: 30 - - uid: 13977 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -17.5,-40.5 - parent: 30 - - uid: 13978 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -17.5,-42.5 - parent: 30 - - uid: 13979 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -21.5,-42.5 - parent: 30 - uid: 13991 components: - type: Transform @@ -55102,12 +53794,6 @@ entities: - type: Transform pos: -21.5,6.5 parent: 30 - - uid: 14051 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -25.5,6.5 - parent: 30 - uid: 14054 components: - type: Transform @@ -55246,40 +53932,12 @@ entities: rot: 3.141592653589793 rad pos: 13.5,15.5 parent: 30 - - uid: 14334 - components: - - type: Transform - pos: 23.5,15.5 - parent: 30 - - uid: 14335 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 23.5,14.5 - parent: 30 - - uid: 14336 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 22.5,14.5 - parent: 30 - uid: 14348 components: - type: Transform rot: 3.141592653589793 rad pos: 22.5,8.5 parent: 30 - - uid: 14357 - components: - - type: Transform - pos: 13.5,12.5 - parent: 30 - - uid: 14358 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 13.5,11.5 - parent: 30 - uid: 14379 components: - type: Transform @@ -55326,6 +53984,12 @@ entities: rot: -1.5707963267948966 rad pos: -7.5,-9.5 parent: 30 + - uid: 14456 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -24.5,6.5 + parent: 30 - uid: 14465 components: - type: Transform @@ -55380,6 +54044,18 @@ entities: rot: -1.5707963267948966 rad pos: 26.5,34.5 parent: 30 + - uid: 19429 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-39.5 + parent: 30 + - uid: 19505 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -23.5,-46.5 + parent: 30 - uid: 19701 components: - type: Transform @@ -55507,17 +54183,6 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,64.5 parent: 30 - - uid: 22599 - components: - - type: Transform - pos: -17.5,-47.5 - parent: 30 - - uid: 22618 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -26.5,-58.5 - parent: 30 - proto: DisposalJunction entities: - uid: 6948 @@ -55531,6 +54196,12 @@ entities: rot: 1.5707963267948966 rad pos: -21.5,-9.5 parent: 30 + - uid: 9617 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 12.5,-17.5 + parent: 30 - uid: 13878 components: - type: Transform @@ -55543,24 +54214,12 @@ entities: rot: 3.141592653589793 rad pos: 12.5,-6.5 parent: 30 - - uid: 13901 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 12.5,-18.5 - parent: 30 - uid: 13910 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,-19.5 parent: 30 - - uid: 13957 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,-40.5 - parent: 30 - uid: 14018 components: - type: Transform @@ -55579,6 +54238,12 @@ entities: rot: 1.5707963267948966 rad pos: 5.5,2.5 parent: 30 + - uid: 14047 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.5,15.5 + parent: 30 - uid: 14053 components: - type: Transform @@ -55611,12 +54276,6 @@ entities: - type: Transform pos: -32.5,46.5 parent: 30 - - uid: 14333 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 22.5,15.5 - parent: 30 - proto: DisposalJunctionFlipped entities: - uid: 7252 @@ -55711,12 +54370,6 @@ entities: rot: -1.5707963267948966 rad pos: 12.5,16.5 parent: 30 - - uid: 14345 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 22.5,11.5 - parent: 30 - uid: 14375 components: - type: Transform @@ -55743,8 +54396,44 @@ entities: - type: Transform pos: -35.5,37.5 parent: 30 + - uid: 19427 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -13.5,-42.5 + parent: 30 + - uid: 19765 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,-39.5 + parent: 30 - proto: DisposalPipe entities: + - uid: 925 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -13.5,-43.5 + parent: 30 + - uid: 1938 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -16.5,-42.5 + parent: 30 + - uid: 3118 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -17.5,-42.5 + parent: 30 + - uid: 3155 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -14.5,-42.5 + parent: 30 - uid: 5299 components: - type: Transform @@ -55975,6 +54664,18 @@ entities: rot: 1.5707963267948966 rad pos: -11.5,-9.5 parent: 30 + - uid: 9746 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 13.5,-17.5 + parent: 30 + - uid: 9891 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 12.5,-18.5 + parent: 30 - uid: 11018 components: - type: Transform @@ -55995,12 +54696,42 @@ entities: - type: Transform pos: 4.5,-3.5 parent: 30 + - uid: 11155 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -23.5,-45.5 + parent: 30 + - uid: 11162 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -23.5,-43.5 + parent: 30 + - uid: 11170 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -23.5,-44.5 + parent: 30 + - uid: 11349 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -19.5,-42.5 + parent: 30 - uid: 11447 components: - type: Transform rot: 1.5707963267948966 rad pos: -10.5,-9.5 parent: 30 + - uid: 12297 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -15.5,-42.5 + parent: 30 - uid: 12678 components: - type: Transform @@ -56037,11 +54768,28 @@ entities: rot: -1.5707963267948966 rad pos: 21.5,23.5 parent: 30 - - uid: 13083 + - uid: 12840 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -16.5,-40.5 + pos: 52.5,23.5 + parent: 30 + - uid: 13077 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -24.5,9.5 + parent: 30 + - uid: 13081 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 22.5,14.5 + parent: 30 + - uid: 13331 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 22.5,11.5 parent: 30 - uid: 13800 components: @@ -56525,12 +55273,6 @@ entities: rot: 3.141592653589793 rad pos: 12.5,-17.5 parent: 30 - - uid: 13903 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 13.5,-18.5 - parent: 30 - uid: 13905 components: - type: Transform @@ -56763,155 +55505,24 @@ entities: rot: 3.141592653589793 rad pos: 1.5,-36.5 parent: 30 - - uid: 13952 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,-37.5 - parent: 30 - - uid: 13953 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,-39.5 - parent: 30 - - uid: 13954 + - uid: 13961 components: - type: Transform rot: 3.141592653589793 rad pos: 1.5,-38.5 parent: 30 - - uid: 13956 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,-40.5 - parent: 30 - - uid: 13961 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,-40.5 - parent: 30 - uid: 13962 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,-40.5 + rot: 1.5707963267948966 rad + pos: 0.5,-39.5 parent: 30 - uid: 13963 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -2.5,-40.5 - parent: 30 - - uid: 13964 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -3.5,-40.5 - parent: 30 - - uid: 13965 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -4.5,-40.5 - parent: 30 - - uid: 13966 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -5.5,-40.5 - parent: 30 - - uid: 13967 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -6.5,-40.5 - parent: 30 - - uid: 13968 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -7.5,-40.5 - parent: 30 - - uid: 13969 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -8.5,-40.5 - parent: 30 - - uid: 13970 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -9.5,-40.5 - parent: 30 - - uid: 13971 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -10.5,-40.5 - parent: 30 - - uid: 13972 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,-40.5 - parent: 30 - - uid: 13973 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -12.5,-40.5 - parent: 30 - - uid: 13974 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -13.5,-40.5 - parent: 30 - - uid: 13975 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -14.5,-40.5 - parent: 30 - - uid: 13976 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -15.5,-40.5 - parent: 30 - - uid: 13981 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -21.5,-43.5 - parent: 30 - - uid: 13982 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -20.5,-42.5 - parent: 30 - - uid: 13983 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -19.5,-42.5 - parent: 30 - - uid: 13984 components: - type: Transform rot: 1.5707963267948966 rad pos: -18.5,-42.5 parent: 30 - - uid: 13985 - components: - - type: Transform - pos: -17.5,-41.5 - parent: 30 - uid: 13993 components: - type: Transform @@ -57140,41 +55751,23 @@ entities: rot: 1.5707963267948966 rad pos: -19.5,6.5 parent: 30 - - uid: 14043 - components: - - type: Transform - pos: -25.5,12.5 - parent: 30 - uid: 14044 components: - type: Transform - pos: -25.5,11.5 + rot: 3.141592653589793 rad + pos: -24.5,8.5 parent: 30 - uid: 14045 components: - type: Transform - pos: -25.5,10.5 + rot: 3.141592653589793 rad + pos: -24.5,7.5 parent: 30 - uid: 14046 components: - type: Transform - pos: -25.5,9.5 - parent: 30 - - uid: 14047 - components: - - type: Transform - pos: -25.5,8.5 - parent: 30 - - uid: 14048 - components: - - type: Transform - pos: -25.5,7.5 - parent: 30 - - uid: 14049 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -24.5,6.5 + rot: 1.5707963267948966 rad + pos: 19.5,15.5 parent: 30 - uid: 14050 components: @@ -58431,18 +57024,6 @@ entities: rot: 1.5707963267948966 rad pos: 17.5,15.5 parent: 30 - - uid: 14329 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 18.5,15.5 - parent: 30 - - uid: 14330 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 19.5,15.5 - parent: 30 - uid: 14331 components: - type: Transform @@ -58503,54 +57084,6 @@ entities: rot: 1.5707963267948966 rad pos: 25.5,8.5 parent: 30 - - uid: 14359 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 14.5,11.5 - parent: 30 - - uid: 14360 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 15.5,11.5 - parent: 30 - - uid: 14361 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 16.5,11.5 - parent: 30 - - uid: 14362 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 17.5,11.5 - parent: 30 - - uid: 14363 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 18.5,11.5 - parent: 30 - - uid: 14364 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 19.5,11.5 - parent: 30 - - uid: 14365 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 20.5,11.5 - parent: 30 - - uid: 14366 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 21.5,11.5 - parent: 30 - uid: 14367 components: - type: Transform @@ -58834,6 +57367,12 @@ entities: - type: Transform pos: -11.5,-1.5 parent: 30 + - uid: 14436 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -24.5,10.5 + parent: 30 - uid: 14438 components: - type: Transform @@ -58876,6 +57415,18 @@ entities: rot: 3.141592653589793 rad pos: -12.5,-7.5 parent: 30 + - uid: 14458 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -24.5,11.5 + parent: 30 + - uid: 14459 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -24.5,12.5 + parent: 30 - uid: 14463 components: - type: Transform @@ -59029,6 +57580,100 @@ entities: rot: -1.5707963267948966 rad pos: -34.5,37.5 parent: 30 + - uid: 17808 + components: + - type: Transform + pos: 52.5,22.5 + parent: 30 + - uid: 19430 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-39.5 + parent: 30 + - uid: 19431 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,-39.5 + parent: 30 + - uid: 19438 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-39.5 + parent: 30 + - uid: 19441 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-39.5 + parent: 30 + - uid: 19473 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,-39.5 + parent: 30 + - uid: 19474 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,-39.5 + parent: 30 + - uid: 19475 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,-39.5 + parent: 30 + - uid: 19490 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,-39.5 + parent: 30 + - uid: 19524 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-37.5 + parent: 30 + - uid: 19631 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -9.5,-39.5 + parent: 30 + - uid: 19638 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -11.5,-39.5 + parent: 30 + - uid: 19639 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.5,-39.5 + parent: 30 + - uid: 19640 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -12.5,-39.5 + parent: 30 + - uid: 19687 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -21.5,-42.5 + parent: 30 + - uid: 19688 + components: + - type: Transform + pos: -23.5,-41.5 + parent: 30 - uid: 19703 components: - type: Transform @@ -59040,6 +57685,42 @@ entities: - type: Transform pos: -22.5,-35.5 parent: 30 + - uid: 19709 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -22.5,-42.5 + parent: 30 + - uid: 19710 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -24.5,-40.5 + parent: 30 + - uid: 19724 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -13.5,-40.5 + parent: 30 + - uid: 19772 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -13.5,-44.5 + parent: 30 + - uid: 19773 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -20.5,-42.5 + parent: 30 + - uid: 19774 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -13.5,-41.5 + parent: 30 - uid: 22109 components: - type: Transform @@ -59627,104 +58308,6 @@ entities: rot: -1.5707963267948966 rad pos: 1.5,64.5 parent: 30 - - uid: 22600 - components: - - type: Transform - pos: -17.5,-48.5 - parent: 30 - - uid: 22601 - components: - - type: Transform - pos: -17.5,-49.5 - parent: 30 - - uid: 22602 - components: - - type: Transform - pos: -17.5,-50.5 - parent: 30 - - uid: 22603 - components: - - type: Transform - pos: -17.5,-51.5 - parent: 30 - - uid: 22604 - components: - - type: Transform - pos: -17.5,-52.5 - parent: 30 - - uid: 22605 - components: - - type: Transform - pos: -17.5,-53.5 - parent: 30 - - uid: 22606 - components: - - type: Transform - pos: -17.5,-54.5 - parent: 30 - - uid: 22607 - components: - - type: Transform - pos: -17.5,-55.5 - parent: 30 - - uid: 22608 - components: - - type: Transform - pos: -17.5,-56.5 - parent: 30 - - uid: 22609 - components: - - type: Transform - pos: -17.5,-57.5 - parent: 30 - - uid: 22610 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -18.5,-58.5 - parent: 30 - - uid: 22611 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -19.5,-58.5 - parent: 30 - - uid: 22612 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -20.5,-58.5 - parent: 30 - - uid: 22613 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -21.5,-58.5 - parent: 30 - - uid: 22614 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -22.5,-58.5 - parent: 30 - - uid: 22615 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -23.5,-58.5 - parent: 30 - - uid: 22616 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -24.5,-58.5 - parent: 30 - - uid: 22617 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -25.5,-58.5 - parent: 30 - proto: DisposalTrunk entities: - uid: 356 @@ -59768,6 +58351,18 @@ entities: - type: Transform pos: -19.5,-4.5 parent: 30 + - uid: 9753 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 14.5,-17.5 + parent: 30 + - uid: 11171 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -13.5,-45.5 + parent: 30 - uid: 11226 components: - type: Transform @@ -59786,30 +58381,12 @@ entities: rot: 1.5707963267948966 rad pos: 19.5,0.5 parent: 30 - - uid: 13902 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 14.5,-18.5 - parent: 30 - uid: 13911 components: - type: Transform rot: -1.5707963267948966 rad pos: 7.5,-29.5 parent: 30 - - uid: 13955 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,-40.5 - parent: 30 - - uid: 13980 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -21.5,-44.5 - parent: 30 - uid: 13986 components: - type: Transform @@ -59833,11 +58410,6 @@ entities: rot: 3.141592653589793 rad pos: -13.5,5.5 parent: 30 - - uid: 13990 - components: - - type: Transform - pos: -25.5,13.5 - parent: 30 - uid: 14076 components: - type: Transform @@ -59912,12 +58484,6 @@ entities: rot: 3.141592653589793 rad pos: 12.5,14.5 parent: 30 - - uid: 14356 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 12.5,12.5 - parent: 30 - uid: 14377 components: - type: Transform @@ -59946,15 +58512,21 @@ entities: - type: Transform pos: -7.5,-8.5 parent: 30 + - uid: 14449 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -25.5,13.5 + parent: 30 - uid: 14453 components: - type: Transform pos: -21.5,-0.5 parent: 30 - - uid: 14534 + - uid: 14460 components: - type: Transform - pos: 52.5,22.5 + pos: 18.5,16.5 parent: 30 - uid: 16078 components: @@ -59967,6 +58539,23 @@ entities: rot: -1.5707963267948966 rad pos: -29.5,37.5 parent: 30 + - uid: 17794 + components: + - type: Transform + pos: 52.5,24.5 + parent: 30 + - uid: 19428 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -25.5,-40.5 + parent: 30 + - uid: 19523 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -24.5,-46.5 + parent: 30 - uid: 19700 components: - type: Transform @@ -59991,6 +58580,11 @@ entities: rot: -1.5707963267948966 rad pos: -21.5,-34.5 parent: 30 + - uid: 19781 + components: + - type: Transform + pos: -4.5,-38.5 + parent: 30 - uid: 22187 components: - type: Transform @@ -60009,17 +58603,6 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,64.5 parent: 30 - - uid: 22598 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -18.5,-47.5 - parent: 30 - - uid: 22619 - components: - - type: Transform - pos: -26.5,-57.5 - parent: 30 - proto: DisposalUnit entities: - uid: 343 @@ -60102,13 +58685,6 @@ entities: - type: Transform pos: -24.5,53.5 parent: 30 - - uid: 5238 - components: - - type: MetaData - name: Telecomms Tube - - type: Transform - pos: -18.5,-47.5 - parent: 30 - uid: 5686 components: - type: Transform @@ -60174,6 +58750,21 @@ entities: - type: Transform pos: -18.5,-22.5 parent: 30 + - uid: 7229 + components: + - type: Transform + pos: -25.5,-40.5 + parent: 30 + - uid: 8296 + components: + - type: Transform + pos: -13.5,-45.5 + parent: 30 + - uid: 8300 + components: + - type: Transform + pos: -4.5,-38.5 + parent: 30 - uid: 8504 components: - type: Transform @@ -60184,21 +58775,6 @@ entities: - type: Transform pos: 7.5,-29.5 parent: 30 - - uid: 9234 - components: - - type: Transform - pos: 3.5,-40.5 - parent: 30 - - uid: 9316 - components: - - type: Transform - pos: 14.5,-18.5 - parent: 30 - - uid: 9428 - components: - - type: Transform - pos: -21.5,-44.5 - parent: 30 - uid: 10985 components: - type: Transform @@ -60209,11 +58785,6 @@ entities: - type: Transform pos: 19.5,0.5 parent: 30 - - uid: 12772 - components: - - type: Transform - pos: 12.5,12.5 - parent: 30 - uid: 12773 components: - type: Transform @@ -60224,6 +58795,11 @@ entities: - type: Transform pos: 20.5,23.5 parent: 30 + - uid: 13078 + components: + - type: Transform + pos: 18.5,16.5 + parent: 30 - uid: 14217 components: - type: Transform @@ -60239,6 +58815,11 @@ entities: - type: Transform pos: 32.5,39.5 parent: 30 + - uid: 19407 + components: + - type: Transform + pos: -25.5,-46.5 + parent: 30 - uid: 19699 components: - type: Transform @@ -60259,11 +58840,6 @@ entities: - type: Transform pos: 2.5,64.5 parent: 30 - - uid: 22620 - components: - - type: Transform - pos: -26.5,-57.5 - parent: 30 - proto: DisposalYJunction entities: - uid: 6965 @@ -60272,12 +58848,24 @@ entities: rot: 3.141592653589793 rad pos: -12.5,-9.5 parent: 30 + - uid: 13283 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,15.5 + parent: 30 - uid: 14077 components: - type: Transform rot: 3.141592653589793 rad pos: 5.5,-0.5 parent: 30 + - uid: 19725 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -23.5,-42.5 + parent: 30 - proto: DogBed entities: - uid: 2007 @@ -60324,6 +58912,11 @@ entities: - type: Transform pos: -27.536026,33.455597 parent: 30 + - uid: 15074 + components: + - type: Transform + pos: 3.1450052,20.758205 + parent: 30 - uid: 15078 components: - type: Transform @@ -60334,6 +58927,11 @@ entities: - type: Transform pos: 19.593287,54.456036 parent: 30 + - uid: 15355 + components: + - type: Transform + pos: 3.6301537,20.758205 + parent: 30 - proto: DoorRemoteSecurity entities: - uid: 2429 @@ -60405,10 +59003,10 @@ entities: parent: 30 - proto: DresserChiefEngineerFilled entities: - - uid: 11614 + - uid: 10741 components: - type: Transform - pos: -15.5,-36.5 + pos: -5.5,-33.5 parent: 30 - proto: DresserChiefMedicalOfficerFilled entities: @@ -60717,32 +59315,6 @@ entities: - type: PointLight enabled: True - type: ActiveEmergencyLight - - uid: 19638 - components: - - type: Transform - pos: -16.5,-38.5 - parent: 30 - - type: PointLight - enabled: True - - type: ActiveEmergencyLight - - uid: 19639 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -13.5,-28.5 - parent: 30 - - type: PointLight - enabled: True - - type: ActiveEmergencyLight - - uid: 19640 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -14.5,-49.5 - parent: 30 - - type: PointLight - enabled: True - - type: ActiveEmergencyLight - uid: 19654 components: - type: Transform @@ -60918,15 +59490,6 @@ entities: - type: PointLight enabled: True - type: ActiveEmergencyLight - - uid: 21261 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,-41.5 - parent: 30 - - type: PointLight - enabled: True - - type: ActiveEmergencyLight - uid: 21331 components: - type: Transform @@ -60953,14 +59516,6 @@ entities: - type: PointLight enabled: True - type: ActiveEmergencyLight - - uid: 21377 - components: - - type: Transform - pos: 18.5,12.5 - parent: 30 - - type: PointLight - enabled: True - - type: ActiveEmergencyLight - uid: 21378 components: - type: Transform @@ -61095,80 +59650,50 @@ entities: parent: 30 - proto: Emitter entities: - - uid: 9409 + - uid: 194 components: - type: Transform - pos: -25.5,-49.5 + rot: -1.5707963267948966 rad + pos: -10.5,-71.5 parent: 30 - - uid: 9412 + - uid: 9818 components: - type: Transform - pos: -25.5,-50.5 + rot: 3.141592653589793 rad + pos: -13.5,-74.5 parent: 30 -- proto: EncryptionKeyCargo - entities: - - uid: 22622 + - uid: 10654 components: - type: Transform - parent: 22621 - - type: Physics - canCollide: False -- proto: EncryptionKeyCommand - entities: - - uid: 22815 + pos: -13.5,-60.5 + parent: 30 + - uid: 11088 components: - type: Transform - parent: 22814 - - type: Physics - canCollide: False -- proto: EncryptionKeyCommon - entities: - - uid: 22817 + rot: 1.5707963267948966 rad + pos: -24.5,-63.5 + parent: 30 + - uid: 11272 components: - type: Transform - parent: 22816 - - type: Physics - canCollide: False -- proto: EncryptionKeyEngineering - entities: - - uid: 22823 + pos: -21.5,-60.5 + parent: 30 + - uid: 13319 components: - type: Transform - parent: 22822 - - type: Physics - canCollide: False -- proto: EncryptionKeyMedical - entities: - - uid: 22828 + rot: 3.141592653589793 rad + pos: -21.5,-74.5 + parent: 30 + - uid: 18861 components: - type: Transform - parent: 22827 - - type: Physics - canCollide: False -- proto: EncryptionKeyScience - entities: - - uid: 22826 + pos: -19.5,-34.5 + parent: 30 + - uid: 19416 components: - type: Transform - parent: 22825 - - type: Physics - canCollide: False -- proto: EncryptionKeySecurity - entities: - - uid: 22813 - components: - - type: Transform - parent: 22812 - - type: Physics - canCollide: False -- proto: EncryptionKeyService - entities: - - uid: 22830 - components: - - type: Transform - parent: 22829 - - type: Physics - canCollide: False + pos: -19.5,-35.5 + parent: 30 - proto: ExosuitFabricator entities: - uid: 12799 @@ -61285,36 +59810,11 @@ entities: - type: Transform pos: -26.5,-42.5 parent: 30 - - uid: 9613 - components: - - type: Transform - pos: -14.5,-35.5 - parent: 30 - uid: 9614 components: - type: Transform pos: -4.5,-27.5 parent: 30 - - uid: 9769 - components: - - type: Transform - pos: -15.5,-49.5 - parent: 30 - - uid: 10013 - components: - - type: Transform - pos: -0.5,-44.5 - parent: 30 - - uid: 10014 - components: - - type: Transform - pos: -14.5,-44.5 - parent: 30 - - uid: 12809 - components: - - type: Transform - pos: 20.5,13.5 - parent: 30 - uid: 15868 components: - type: Transform @@ -61335,6 +59835,11 @@ entities: - type: Transform pos: -51.5,22.5 parent: 30 + - uid: 17685 + components: + - type: Transform + pos: 19.5,16.5 + parent: 30 - uid: 21381 components: - type: Transform @@ -61377,6 +59882,21 @@ entities: parent: 30 - type: FaxMachine name: Law Office + - uid: 10199 + components: + - type: Transform + pos: -21.5,-39.5 + parent: 30 + - type: FaxMachine + destinationAddress: Engineering + name: Engineering + - uid: 14477 + components: + - type: Transform + pos: -62.5,-65.5 + parent: 30 + - type: FaxMachine + destinationAddress: Library - uid: 21701 components: - type: Transform @@ -61419,13 +59939,6 @@ entities: parent: 30 - type: FaxMachine name: Psych - - uid: 22435 - components: - - type: Transform - pos: -57.5,-63.5 - parent: 30 - - type: FaxMachine - name: Library - proto: FaxMachineCaptain entities: - uid: 22275 @@ -61488,6 +60001,11 @@ entities: - type: Transform pos: 2.5,34.5 parent: 30 + - uid: 9490 + components: + - type: Transform + pos: -9.5,-35.5 + parent: 30 - uid: 11017 components: - type: Transform @@ -61495,18 +60013,32 @@ entities: parent: 30 - proto: filingCabinetRandom entities: + - uid: 8234 + components: + - type: Transform + pos: -15.5,-31.5 + parent: 30 - uid: 21370 components: - type: Transform pos: -21.5,32.5 parent: 30 - - uid: 22833 - components: - - type: Transform - pos: -29.5,-63.5 - parent: 30 - proto: FireAlarm entities: + - uid: 829 + components: + - type: Transform + pos: 13.5,-21.5 + parent: 30 + - type: DeviceList + devices: + - 4353 + - 9301 + - 9300 + - 9769 + - 4241 + - 9782 + - 9618 - uid: 1980 components: - type: Transform @@ -61586,6 +60118,53 @@ entities: devices: - 7960 - 7116 + - uid: 13959 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-42.5 + parent: 30 + - type: DeviceList + devices: + - 19812 + - 19766 + - 19598 + - 10000 + - 11011 + - 19767 + - 19768 + - 9993 + - 11007 + - 19770 + - 19771 + - 11281 + - 11003 + - uid: 13964 + components: + - type: Transform + pos: -20.5,-38.5 + parent: 30 + - type: DeviceList + devices: + - 19562 + - 11280 + - 11005 + - 11009 + - 19767 + - 19768 + - 11007 + - 9993 + - uid: 13965 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,-52.5 + parent: 30 + - type: DeviceList + devices: + - 11280 + - 9839 + - 9995 - uid: 17226 components: - type: Transform @@ -61598,57 +60177,21 @@ entities: - 15117 - 15116 - 13644 - - uid: 20334 + - uid: 19597 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,-45.5 + rot: 1.5707963267948966 rad + pos: -0.5,-38.5 parent: 30 - type: DeviceList devices: - - 20354 - - 11262 - - 11263 - - 11264 - - uid: 20357 - components: - - type: Transform - pos: -4.5,-37.5 - parent: 30 - - type: DeviceList - devices: - - 11343 - - 11344 - - 11345 - - 11340 - - 11341 - - 11342 - - 20355 - - uid: 21739 - components: - - type: Transform - pos: -16.5,-37.5 - parent: 30 - - type: DeviceList - devices: - - 11340 - - 11341 - - 11342 - - 20358 - - uid: 21746 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-41.5 - parent: 30 - - type: DeviceList - devices: - - 21745 - - 11343 - - 11344 - - 11345 - - 9305 + - 9999 + - 19812 + - 19766 + - 19598 + - 19806 - 9304 + - 9305 - 9306 - uid: 21748 components: @@ -61664,34 +60207,6 @@ entities: - 8626 - 7731 - 21749 - - uid: 21752 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 8.5,-28.5 - parent: 30 - - type: DeviceList - devices: - - 21753 - - 9302 - - 9303 - - 9301 - - 9300 - - uid: 21758 - components: - - type: Transform - pos: 13.5,-21.5 - parent: 30 - - type: DeviceList - devices: - - 21759 - - 9303 - - 9302 - - 9301 - - 9300 - - 9307 - - 9308 - - 9309 - uid: 21769 components: - type: Transform @@ -62307,13 +60822,11 @@ entities: parent: 30 - type: DeviceList devices: - - 9161 - 12665 - 12664 - 12666 - 12858 - 13391 - - 22056 - uid: 22060 components: - type: Transform @@ -62460,10 +60973,10 @@ entities: - type: Transform pos: 23.339325,-11.410534 parent: 30 - - uid: 18795 + - uid: 12811 components: - type: Transform - pos: -62.63935,-64.45475 + pos: -52.242584,-60.55653 parent: 30 - uid: 20301 components: @@ -62670,24 +61183,6 @@ entities: rot: -1.5707963267948966 rad pos: 13.5,27.5 parent: 30 - - uid: 11262 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -8.5,-43.5 - parent: 30 - - uid: 11263 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -7.5,-43.5 - parent: 30 - - uid: 11264 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -6.5,-43.5 - parent: 30 - uid: 20347 components: - type: Transform @@ -62722,18 +61217,6 @@ entities: rot: 3.141592653589793 rad pos: -55.5,-45.5 parent: 30 - - uid: 20361 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -59.5,-62.5 - parent: 30 - - uid: 20362 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -58.5,-62.5 - parent: 30 - uid: 20383 components: - type: Transform @@ -62773,12 +61256,18 @@ entities: rot: -1.5707963267948966 rad pos: 24.5,7.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 14365 - uid: 22440 components: - type: Transform rot: -1.5707963267948966 rad pos: 24.5,8.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 14365 - proto: FirelockElectronics entities: - uid: 1642 @@ -62791,6 +61280,11 @@ entities: - type: Transform pos: -28.192276,33.564972 parent: 30 + - uid: 14846 + components: + - type: Transform + pos: 2.6400542,20.579987 + parent: 30 - uid: 19627 components: - type: Transform @@ -63066,6 +61560,16 @@ entities: - type: Transform pos: -37.5,35.5 parent: 30 + - uid: 4241 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 14.5,-24.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 10010 + - 829 - uid: 4842 components: - type: Transform @@ -63376,11 +61880,6 @@ entities: - type: Transform pos: -3.5,-21.5 parent: 30 - - uid: 9161 - components: - - type: Transform - pos: 14.5,13.5 - parent: 30 - uid: 9202 components: - type: Transform @@ -63391,36 +61890,43 @@ entities: - type: Transform pos: 11.5,-30.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 10010 + - 829 - uid: 9301 components: - type: Transform pos: 10.5,-30.5 parent: 30 - - uid: 9302 - components: - - type: Transform - pos: 10.5,-26.5 - parent: 30 - - uid: 9303 - components: - - type: Transform - pos: 11.5,-26.5 - parent: 30 + - type: DeviceNetwork + deviceLists: + - 10010 + - 829 - uid: 9304 components: - type: Transform pos: 1.5,-35.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 19597 - uid: 9305 components: - type: Transform pos: 0.5,-35.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 19597 - uid: 9306 components: - type: Transform pos: 2.5,-35.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 19597 - uid: 9307 components: - type: Transform @@ -63446,11 +61952,50 @@ entities: - type: Transform pos: -0.5,-2.5 parent: 30 + - uid: 9618 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,-24.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 10010 + - 829 - uid: 9669 components: - type: Transform pos: -10.5,-8.5 parent: 30 + - uid: 9769 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 14.5,-23.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 10010 + - 829 + - uid: 9782 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,-23.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 10010 + - 829 + - uid: 9839 + components: + - type: Transform + pos: -17.5,-49.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 19570 + - 13965 - uid: 9914 components: - type: Transform @@ -63461,6 +62006,17 @@ entities: - type: Transform pos: -35.5,-28.5 parent: 30 + - uid: 9993 + components: + - type: Transform + pos: -14.5,-42.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 13958 + - 13964 + - 13957 + - 13959 - uid: 10394 components: - type: Transform @@ -63471,40 +62027,81 @@ entities: - type: Transform pos: -40.5,8.5 parent: 30 + - uid: 11003 + components: + - type: Transform + pos: -7.5,-37.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 13957 + - 13959 + - uid: 11005 + components: + - type: Transform + pos: -23.5,-45.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 13958 + - 13964 + - uid: 11007 + components: + - type: Transform + pos: -14.5,-43.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 13958 + - 13964 + - 13957 + - 13959 + - uid: 11009 + components: + - type: Transform + pos: -26.5,-41.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 13958 + - 13964 + - uid: 11011 + components: + - type: Transform + pos: -12.5,-36.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 13966 + - 13959 - uid: 11275 components: - type: Transform pos: 18.5,24.5 parent: 30 - - uid: 11340 + - uid: 11280 components: - type: Transform - pos: -14.5,-41.5 + pos: -17.5,-45.5 parent: 30 - - uid: 11341 + - type: DeviceNetwork + deviceLists: + - 19570 + - 13965 + - 13958 + - 13964 + - uid: 11281 components: - type: Transform - pos: -14.5,-40.5 + pos: -9.5,-44.5 parent: 30 - - uid: 11342 + - type: DeviceNetwork + deviceLists: + - 13959 + - uid: 11282 components: - type: Transform - pos: -14.5,-39.5 - parent: 30 - - uid: 11343 - components: - - type: Transform - pos: -0.5,-41.5 - parent: 30 - - uid: 11344 - components: - - type: Transform - pos: -0.5,-40.5 - parent: 30 - - uid: 11345 - components: - - type: Transform - pos: -0.5,-39.5 + pos: -2.5,-36.5 parent: 30 - uid: 11705 components: @@ -63591,21 +62188,39 @@ entities: - type: Transform pos: 21.5,17.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 14365 - uid: 12665 components: - type: Transform pos: 22.5,17.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 14365 - uid: 12666 components: - type: Transform pos: 23.5,17.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 14365 - uid: 12858 components: - type: Transform pos: 30.5,7.5 parent: 30 + - uid: 13073 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 16.5,15.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 14365 - uid: 13391 components: - type: Transform @@ -63701,6 +62316,24 @@ entities: - type: Transform pos: -52.5,11.5 parent: 30 + - uid: 17724 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 16.5,16.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 14365 + - uid: 17912 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 14.5,13.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 14365 - uid: 18069 components: - type: Transform @@ -63711,16 +62344,118 @@ entities: - type: Transform pos: -74.5,-55.5 parent: 30 + - uid: 18212 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 16.5,14.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 14365 + - uid: 18601 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 15.5,11.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 14365 - uid: 19590 components: - type: Transform pos: -29.5,-37.5 parent: 30 + - uid: 19598 + components: + - type: Transform + pos: -0.5,-41.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 13957 + - 13959 + - 19597 + - uid: 19630 + components: + - type: Transform + pos: -0.5,-39.5 + parent: 30 - uid: 19741 components: - type: Transform pos: -20.5,-25.5 parent: 30 + - uid: 19766 + components: + - type: Transform + pos: -0.5,-40.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 13957 + - 13959 + - 19597 + - uid: 19767 + components: + - type: Transform + pos: -14.5,-40.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 13958 + - 13964 + - 13957 + - 13959 + - uid: 19768 + components: + - type: Transform + pos: -14.5,-41.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 13958 + - 13964 + - 13957 + - 13959 + - uid: 19770 + components: + - type: Transform + pos: -12.5,-46.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 13957 + - 13959 + - uid: 19771 + components: + - type: Transform + pos: -11.5,-46.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 13957 + - 13959 + - uid: 19806 + components: + - type: Transform + pos: 0.5,-42.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 19597 + - 9996 + - uid: 19812 + components: + - type: Transform + pos: -0.5,-39.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 13957 + - 13959 + - 19597 - uid: 20051 components: - type: Transform @@ -63857,10 +62592,10 @@ entities: - type: Transform pos: -32.45644,29.55175 parent: 30 - - uid: 9445 + - uid: 14828 components: - type: Transform - pos: -23.99604,-39.42414 + pos: -21.50836,-48.326485 parent: 30 - uid: 15978 components: @@ -63922,11 +62657,6 @@ entities: - type: Transform pos: -39.51754,18.309746 parent: 30 - - uid: 22433 - components: - - type: Transform - pos: 0.84980106,-44.601856 - parent: 30 - uid: 22434 components: - type: Transform @@ -63964,6 +62694,22 @@ entities: parent: 30 - type: Fixtures fixtures: {} + - uid: 10592 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -15.5,-47.5 + parent: 30 + - type: Fixtures + fixtures: {} + - uid: 14330 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 12.5,10.5 + parent: 30 + - type: Fixtures + fixtures: {} - uid: 20458 components: - type: Transform @@ -63992,13 +62738,6 @@ entities: parent: 30 - type: Fixtures fixtures: {} - - uid: 22542 - components: - - type: Transform - pos: 18.5,14.5 - parent: 30 - - type: Fixtures - fixtures: {} - proto: FloorTileItemEighties entities: - uid: 15081 @@ -64203,11 +62942,6 @@ entities: - type: Transform pos: 46.4532,20.604744 parent: 30 - - uid: 16163 - components: - - type: Transform - pos: 52.484413,22.604744 - parent: 30 - proto: FoodBoxDonut entities: - uid: 2168 @@ -64554,20 +63288,20 @@ entities: - uid: 491 components: - type: Transform - pos: -14.547203,7.8102264 + pos: -15.331403,8.303028 parent: 30 - proto: GasAnalyzer entities: + - uid: 9369 + components: + - type: Transform + pos: -2.4162815,-45.696774 + parent: 30 - uid: 9443 components: - type: Transform pos: 5.410018,-23.577772 parent: 30 - - uid: 10011 - components: - - type: Transform - pos: -13.400943,-44.52121 - parent: 30 - uid: 13344 components: - type: Transform @@ -64589,7 +63323,7 @@ entities: pos: -32.5,-11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - proto: GasMinerCarbonDioxide entities: - uid: 8691 @@ -64684,36 +63418,6 @@ entities: rot: -1.5707963267948966 rad pos: -15.5,16.5 parent: 30 - - uid: 3125 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -4.5,-57.5 - parent: 30 - - uid: 3126 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -4.5,-58.5 - parent: 30 - - uid: 3221 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -4.5,-59.5 - parent: 30 - - uid: 7099 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -10.5,-57.5 - parent: 30 - - uid: 7100 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -10.5,-58.5 - parent: 30 - uid: 8566 components: - type: Transform @@ -64769,12 +63473,6 @@ entities: parent: 30 - type: AtmosPipeColor color: '#947507FF' - - uid: 9622 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -10.5,-59.5 - parent: 30 - uid: 12869 components: - type: Transform @@ -64793,29 +63491,11 @@ entities: parent: 30 - proto: GasPipeBend entities: - - uid: 866 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,-59.5 - parent: 30 - - uid: 867 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -12.5,-59.5 - parent: 30 - - uid: 906 + - uid: 64 components: - type: Transform rot: 1.5707963267948966 rad - pos: -12.5,-56.5 - parent: 30 - - uid: 916 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -5.5,-59.5 + pos: -53.5,-62.5 parent: 30 - uid: 939 components: @@ -64824,7 +63504,7 @@ entities: pos: -48.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 941 components: - type: Transform @@ -64832,21 +63512,21 @@ entities: pos: -53.5,10.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 943 components: - type: Transform pos: -47.5,10.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 946 components: - type: Transform pos: -48.5,9.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2474 components: - type: Transform @@ -64854,7 +63534,7 @@ entities: pos: -50.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2475 components: - type: Transform @@ -64862,14 +63542,14 @@ entities: pos: -49.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2576 components: - type: Transform pos: -33.5,53.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2577 components: - type: Transform @@ -64877,7 +63557,7 @@ entities: pos: -31.5,53.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2578 components: - type: Transform @@ -64885,7 +63565,7 @@ entities: pos: -29.5,53.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2579 components: - type: Transform @@ -64893,7 +63573,7 @@ entities: pos: -35.5,53.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2580 components: - type: Transform @@ -64901,14 +63581,14 @@ entities: pos: -35.5,57.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2581 components: - type: Transform pos: -29.5,57.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2681 components: - type: Transform @@ -64916,7 +63596,7 @@ entities: pos: -50.5,57.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2700 components: - type: Transform @@ -64924,14 +63604,14 @@ entities: pos: -50.5,67.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2701 components: - type: Transform pos: -46.5,67.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2711 components: - type: Transform @@ -64939,7 +63619,7 @@ entities: pos: -47.5,58.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2712 components: - type: Transform @@ -64947,7 +63627,7 @@ entities: pos: -51.5,58.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2725 components: - type: Transform @@ -64955,21 +63635,21 @@ entities: pos: -51.5,64.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2726 components: - type: Transform pos: -47.5,64.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2741 components: - type: Transform pos: -28.5,44.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2774 components: - type: Transform @@ -64977,7 +63657,7 @@ entities: pos: -36.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3039 components: - type: Transform @@ -64985,14 +63665,14 @@ entities: pos: -31.5,31.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3040 components: - type: Transform pos: -25.5,31.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3078 components: - type: Transform @@ -65000,7 +63680,7 @@ entities: pos: -40.5,9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3114 components: - type: Transform @@ -65008,19 +63688,14 @@ entities: pos: -47.5,8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3116 components: - type: Transform pos: -44.5,8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 3152 - components: - - type: Transform - pos: -2.5,-56.5 - parent: 30 + color: '#0000FFFF' - uid: 3271 components: - type: Transform @@ -65028,7 +63703,7 @@ entities: pos: -49.5,12.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3272 components: - type: Transform @@ -65036,21 +63711,21 @@ entities: pos: -51.5,12.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3286 components: - type: Transform pos: -57.5,23.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3307 components: - type: Transform pos: -49.5,20.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3336 components: - type: Transform @@ -65058,15 +63733,7 @@ entities: pos: -16.5,6.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 3344 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -27.5,6.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3356 components: - type: Transform @@ -65074,29 +63741,21 @@ entities: pos: -23.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 3360 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -27.5,12.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' + color: '#FF0000FF' - uid: 3368 components: - type: Transform pos: -24.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3372 components: - type: Transform pos: -23.5,16.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3373 components: - type: Transform @@ -65104,7 +63763,7 @@ entities: pos: -26.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3375 components: - type: Transform @@ -65112,7 +63771,22 @@ entities: pos: -24.5,12.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' + - uid: 4141 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -63.5,-62.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 4424 + components: + - type: Transform + pos: -24.5,7.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' - uid: 6148 components: - type: Transform @@ -65120,28 +63794,28 @@ entities: pos: -14.5,40.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6158 components: - type: Transform pos: -4.5,40.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6198 components: - type: Transform pos: -3.5,41.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6200 components: - type: Transform pos: -7.5,42.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6201 components: - type: Transform @@ -65149,7 +63823,7 @@ entities: pos: -11.5,42.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6202 components: - type: Transform @@ -65157,7 +63831,7 @@ entities: pos: -11.5,41.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6203 components: - type: Transform @@ -65165,7 +63839,7 @@ entities: pos: -15.5,41.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6250 components: - type: Transform @@ -65173,7 +63847,7 @@ entities: pos: -18.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6251 components: - type: Transform @@ -65181,14 +63855,14 @@ entities: pos: -18.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6255 components: - type: Transform pos: -21.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6260 components: - type: Transform @@ -65196,22 +63870,14 @@ entities: pos: -26.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6262 components: - type: Transform pos: -26.5,39.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 6468 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -12.5,-49.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6789 components: - type: Transform @@ -65223,14 +63889,14 @@ entities: pos: -17.5,-0.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6936 components: - type: Transform pos: -18.5,-4.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6961 components: - type: Transform @@ -65238,7 +63904,7 @@ entities: pos: -18.5,-0.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7001 components: - type: Transform @@ -65257,12 +63923,6 @@ entities: rot: -1.5707963267948966 rad pos: -30.5,-11.5 parent: 30 - - uid: 7098 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -9.5,-59.5 - parent: 30 - uid: 7113 components: - type: Transform @@ -65270,33 +63930,14 @@ entities: pos: -30.5,-21.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 7123 - components: - - type: Transform - pos: 1.5,-51.5 - parent: 30 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 7146 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -2.5,-59.5 - parent: 30 - - uid: 7148 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -3.5,-59.5 - parent: 30 + color: '#0000FFFF' - uid: 7154 components: - type: Transform pos: -30.5,-6.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7204 components: - type: Transform @@ -65304,29 +63945,7 @@ entities: pos: -34.5,-6.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 7221 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -8.5,-48.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 7224 - components: - - type: Transform - pos: -3.5,-48.5 - parent: 30 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 7230 - components: - - type: Transform - pos: -9.5,-53.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' + color: '#0000FFFF' - uid: 7353 components: - type: Transform @@ -65334,14 +63953,14 @@ entities: pos: -19.5,-4.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7376 components: - type: Transform pos: -5.5,-10.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7408 components: - type: Transform @@ -65349,29 +63968,13 @@ entities: pos: -19.5,-1.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7564 components: - type: Transform rot: 1.5707963267948966 rad pos: -34.5,-12.5 parent: 30 - - uid: 7667 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -6.5,-52.5 - parent: 30 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 7672 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -12.5,-53.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' - uid: 7762 components: - type: Transform @@ -65379,7 +63982,7 @@ entities: pos: -29.5,-22.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7887 components: - type: Transform @@ -65393,7 +63996,7 @@ entities: pos: -32.5,-12.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8063 components: - type: Transform @@ -65401,7 +64004,7 @@ entities: pos: -28.5,-12.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8076 components: - type: Transform @@ -65409,7 +64012,7 @@ entities: pos: -20.5,-22.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8219 components: - type: Transform @@ -65417,7 +64020,7 @@ entities: pos: -24.5,-5.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8220 components: - type: Transform @@ -65425,23 +64028,7 @@ entities: pos: -22.5,-5.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 8236 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -6.5,-49.5 - parent: 30 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 8264 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -9.5,-52.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' + color: '#0000FFFF' - uid: 8576 components: - type: Transform @@ -65497,7 +64084,7 @@ entities: pos: 16.5,-23.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8786 components: - type: Transform @@ -65505,14 +64092,14 @@ entities: pos: 16.5,-21.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8868 components: - type: Transform pos: 7.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8869 components: - type: Transform @@ -65520,7 +64107,7 @@ entities: pos: 7.5,-11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8871 components: - type: Transform @@ -65528,14 +64115,14 @@ entities: pos: 11.5,-18.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8911 components: - type: Transform pos: 11.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8944 components: - type: Transform @@ -65543,21 +64130,21 @@ entities: pos: 13.5,-20.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8966 components: - type: Transform pos: 13.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8978 components: - type: Transform pos: 9.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 9023 components: - type: Transform @@ -65572,45 +64159,52 @@ entities: pos: -13.5,-15.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 9067 + color: '#0000FFFF' + - uid: 9063 components: - type: Transform rot: -1.5707963267948966 rad - pos: -8.5,-52.5 + pos: 6.5,-48.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#EB9834FF' - uid: 9262 components: - type: Transform pos: 21.5,-16.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9620 + color: '#FF0000FF' + - uid: 9428 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,-39.5 + pos: -11.5,-44.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9675 - components: - - type: Transform - pos: -2.5,-51.5 - parent: 30 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 9683 + color: '#FF0000FF' + - uid: 9436 components: - type: Transform rot: 3.141592653589793 rad - pos: -2.5,-53.5 + pos: -13.5,-44.5 parent: 30 - type: AtmosPipeColor - color: '#03FCD3FF' + color: '#FF0000FF' + - uid: 9653 + components: + - type: Transform + pos: 8.5,-42.5 + parent: 30 + - type: AtmosPipeColor + color: '#EB9834FF' + - uid: 9681 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,-42.5 + parent: 30 + - type: AtmosPipeColor + color: '#EB9834FF' - uid: 9750 components: - type: Transform @@ -65618,7 +64212,7 @@ entities: pos: -3.5,-30.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 9751 components: - type: Transform @@ -65626,7 +64220,7 @@ entities: pos: -3.5,-18.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 9752 components: - type: Transform @@ -65634,69 +64228,53 @@ entities: pos: -1.5,-20.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 9770 components: - type: Transform pos: 0.5,-30.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9869 + color: '#FF0000FF' + - uid: 9783 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,-53.5 - parent: 30 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 9870 - components: - - type: Transform - pos: 3.5,-49.5 - parent: 30 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 9883 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-54.5 + rot: 1.5707963267948966 rad + pos: 6.5,-46.5 parent: 30 - type: AtmosPipeColor color: '#EB9834FF' + - uid: 9813 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,-46.5 + parent: 30 + - type: AtmosPipeColor + color: '#EB9834FF' + - uid: 9892 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -24.5,-43.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' - uid: 9898 components: - type: Transform rot: 1.5707963267948966 rad - pos: 4.5,-46.5 + pos: -22.5,-41.5 parent: 30 - type: AtmosPipeColor - color: '#EB9834FF' - - uid: 9899 + color: '#FF0000FF' + - uid: 9919 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,-46.5 + pos: -11.5,-29.5 parent: 30 - type: AtmosPipeColor - color: '#EB9834FF' - - uid: 9900 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 5.5,-38.5 - parent: 30 - - type: AtmosPipeColor - color: '#EB9834FF' - - uid: 9901 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,-38.5 - parent: 30 - - type: AtmosPipeColor - color: '#EB9834FF' + color: '#0000FFFF' - uid: 9983 components: - type: Transform @@ -65704,55 +64282,31 @@ entities: pos: 7.5,-27.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11088 + color: '#0000FFFF' + - uid: 10604 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-27.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 10606 components: - type: Transform rot: 1.5707963267948966 rad - pos: -18.5,-39.5 + pos: -12.5,-39.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11090 + color: '#0000FFFF' + - uid: 10636 components: - type: Transform rot: -1.5707963267948966 rad - pos: -18.5,-41.5 + pos: 0.5,-40.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11101 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -5.5,-29.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11102 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -5.5,-30.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11117 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,-41.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11137 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -17.5,-41.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' + color: '#FF0000FF' - uid: 11167 components: - type: Transform @@ -65768,21 +64322,21 @@ entities: pos: 11.5,-22.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11191 components: - type: Transform pos: 12.5,-22.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11668 components: - type: Transform pos: 34.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11778 components: - type: Transform @@ -65790,14 +64344,14 @@ entities: pos: 30.5,-6.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11873 components: - type: Transform pos: 33.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11874 components: - type: Transform @@ -65805,14 +64359,14 @@ entities: pos: 5.5,-23.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11982 components: - type: Transform pos: 21.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12002 components: - type: Transform @@ -65820,7 +64374,7 @@ entities: pos: 33.5,-5.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12493 components: - type: Transform @@ -65828,7 +64382,7 @@ entities: pos: 9.5,39.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12514 components: - type: Transform @@ -65836,7 +64390,7 @@ entities: pos: 21.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12515 components: - type: Transform @@ -65844,14 +64398,14 @@ entities: pos: 23.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12588 components: - type: Transform pos: 26.5,40.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12589 components: - type: Transform @@ -65859,7 +64413,7 @@ entities: pos: 26.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12610 components: - type: Transform @@ -65867,7 +64421,7 @@ entities: pos: 27.5,26.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12618 components: - type: Transform @@ -65875,7 +64429,22 @@ entities: pos: 26.5,29.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' + - uid: 12639 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -24.5,6.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 12659 + components: + - type: Transform + pos: -52.5,-60.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' - uid: 12750 components: - type: Transform @@ -65888,6 +64457,14 @@ entities: rot: -1.5707963267948966 rad pos: 32.5,11.5 parent: 30 + - uid: 12831 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -62.5,-62.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' - uid: 12883 components: - type: Transform @@ -65895,7 +64472,7 @@ entities: pos: 21.5,20.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12903 components: - type: Transform @@ -65903,7 +64480,7 @@ entities: pos: 43.5,10.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12909 components: - type: Transform @@ -65911,7 +64488,7 @@ entities: pos: 42.5,10.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12926 components: - type: Transform @@ -65925,14 +64502,14 @@ entities: pos: 23.5,8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12995 components: - type: Transform pos: 18.5,20.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12996 components: - type: Transform @@ -65940,7 +64517,7 @@ entities: pos: 18.5,19.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13016 components: - type: Transform @@ -65948,7 +64525,7 @@ entities: pos: 12.5,22.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13024 components: - type: Transform @@ -65956,7 +64533,7 @@ entities: pos: 12.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13036 components: - type: Transform @@ -65964,7 +64541,7 @@ entities: pos: 21.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13038 components: - type: Transform @@ -65972,14 +64549,14 @@ entities: pos: 17.5,18.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13039 components: - type: Transform pos: 17.5,22.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13341 components: - type: Transform @@ -65987,14 +64564,14 @@ entities: pos: 40.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13752 components: - type: Transform pos: 31.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13767 components: - type: Transform @@ -66002,7 +64579,7 @@ entities: pos: 31.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13791 components: - type: Transform @@ -66010,7 +64587,23 @@ entities: pos: 29.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' + - uid: 14450 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -25.5,7.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 14451 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -25.5,12.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' - uid: 14978 components: - type: Transform @@ -66018,7 +64611,7 @@ entities: pos: 16.5,43.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 15452 components: - type: Transform @@ -66026,7 +64619,7 @@ entities: pos: 52.5,19.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 15888 components: - type: Transform @@ -66034,7 +64627,7 @@ entities: pos: 42.5,19.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 15890 components: - type: Transform @@ -66042,7 +64635,7 @@ entities: pos: 32.5,5.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 15963 components: - type: Transform @@ -66050,7 +64643,7 @@ entities: pos: 42.5,5.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 16099 components: - type: Transform @@ -66058,7 +64651,34 @@ entities: pos: 32.5,-11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' + - uid: 17723 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -52.5,-62.5 + parent: 30 + - uid: 17729 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -53.5,-65.5 + parent: 30 + - uid: 18071 + components: + - type: Transform + pos: 16.5,12.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 18075 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 16.5,10.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' - uid: 18385 components: - type: Transform @@ -66066,7 +64686,7 @@ entities: pos: -45.5,-22.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18386 components: - type: Transform @@ -66074,7 +64694,7 @@ entities: pos: -62.5,-22.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18415 components: - type: Transform @@ -66082,7 +64702,7 @@ entities: pos: -44.5,-24.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18447 components: - type: Transform @@ -66090,7 +64710,7 @@ entities: pos: -63.5,-24.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18478 components: - type: Transform @@ -66098,7 +64718,7 @@ entities: pos: -62.5,-38.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18479 components: - type: Transform @@ -66106,7 +64726,7 @@ entities: pos: -61.5,-38.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18484 components: - type: Transform @@ -66114,21 +64734,21 @@ entities: pos: -65.5,-38.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18485 components: - type: Transform pos: -58.5,-38.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18498 components: - type: Transform pos: -62.5,-45.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18513 components: - type: Transform @@ -66136,7 +64756,7 @@ entities: pos: -78.5,-45.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18608 components: - type: Transform @@ -66144,15 +64764,7 @@ entities: pos: -56.5,-59.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 18609 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -55.5,-60.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' + color: '#FF0000FF' - uid: 18612 components: - type: Transform @@ -66160,7 +64772,7 @@ entities: pos: -68.5,-48.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18613 components: - type: Transform @@ -66168,7 +64780,7 @@ entities: pos: -67.5,-49.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18621 components: - type: Transform @@ -66176,7 +64788,7 @@ entities: pos: -58.5,-46.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18648 components: - type: Transform @@ -66184,7 +64796,7 @@ entities: pos: -79.5,-46.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18661 components: - type: Transform @@ -66192,7 +64804,7 @@ entities: pos: -77.5,-43.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18743 components: - type: Transform @@ -66200,21 +64812,7 @@ entities: pos: -76.5,-54.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 18763 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -58.5,-65.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 18779 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -66.5,-64.5 - parent: 30 + color: '#FF0000FF' - uid: 21262 components: - type: Transform @@ -66222,14 +64820,14 @@ entities: pos: 21.5,-19.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 21269 components: - type: Transform pos: 27.5,-18.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 21270 components: - type: Transform @@ -66237,7 +64835,7 @@ entities: pos: 27.5,-20.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 21986 components: - type: Transform @@ -66245,7 +64843,7 @@ entities: pos: -0.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 22264 components: - type: Transform @@ -66253,30 +64851,14 @@ entities: pos: 42.5,16.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 22266 components: - type: Transform pos: 43.5,16.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 22795 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -30.5,-60.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 22855 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -17.5,-58.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - proto: GasPipeFourway entities: - uid: 2101 @@ -66285,91 +64867,91 @@ entities: pos: 32.5,8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2430 components: - type: Transform pos: -36.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2702 components: - type: Transform pos: -48.5,67.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2770 components: - type: Transform pos: -36.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2805 components: - type: Transform pos: -10.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2807 components: - type: Transform pos: -3.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2843 components: - type: Transform pos: 8.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2883 components: - type: Transform pos: -31.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2909 components: - type: Transform pos: -36.5,10.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2910 components: - type: Transform pos: -34.5,8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2950 components: - type: Transform pos: -1.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2957 components: - type: Transform pos: 5.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2986 components: - type: Transform pos: 10.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7002 components: - type: Transform @@ -66381,14 +64963,14 @@ entities: pos: -29.5,-12.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7086 components: - type: Transform pos: -34.5,-1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7603 components: - type: Transform @@ -66400,105 +64982,105 @@ entities: pos: -28.5,-5.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8779 components: - type: Transform pos: 10.5,-24.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8845 components: - type: Transform pos: 11.5,-23.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8866 components: - type: Transform pos: 5.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8870 components: - type: Transform pos: 13.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8955 components: - type: Transform pos: 11.5,-11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11078 + color: '#FF0000FF' + - uid: 10136 components: - type: Transform - pos: -8.5,-39.5 + pos: -12.5,-43.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11126 + color: '#0000FFFF' + - uid: 10439 components: - type: Transform - pos: -6.5,-41.5 + pos: -6.5,-39.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11876 components: - type: Transform pos: 21.5,-6.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11937 components: - type: Transform pos: 20.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12001 components: - type: Transform pos: 30.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12541 components: - type: Transform pos: 21.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12872 components: - type: Transform pos: 23.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12886 components: - type: Transform pos: 21.5,18.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 13034 + color: '#FF0000FF' + - uid: 14462 components: - type: Transform pos: 21.5,11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - proto: GasPipeStraight entities: - uid: 239 @@ -66508,7 +65090,7 @@ entities: pos: -50.5,-8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 475 components: - type: Transform @@ -66516,12 +65098,7 @@ entities: pos: -16.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 845 - components: - - type: Transform - pos: -9.5,-56.5 - parent: 30 + color: '#FF0000FF' - uid: 874 components: - type: Transform @@ -66529,7 +65106,7 @@ entities: pos: -52.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 875 components: - type: Transform @@ -66537,7 +65114,7 @@ entities: pos: -50.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 877 components: - type: Transform @@ -66545,12 +65122,7 @@ entities: pos: -51.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 908 - components: - - type: Transform - pos: -12.5,-58.5 - parent: 30 + color: '#FF0000FF' - uid: 909 components: - type: Transform @@ -66558,12 +65130,7 @@ entities: pos: -48.5,-8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 915 - components: - - type: Transform - pos: -12.5,-57.5 - parent: 30 + color: '#0000FFFF' - uid: 935 components: - type: Transform @@ -66571,7 +65138,7 @@ entities: pos: -47.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 940 components: - type: Transform @@ -66579,7 +65146,7 @@ entities: pos: -46.5,8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 942 components: - type: Transform @@ -66587,28 +65154,28 @@ entities: pos: -49.5,10.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 944 components: - type: Transform pos: -48.5,8.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 947 components: - type: Transform pos: -45.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 964 components: - type: Transform pos: -44.5,-4.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 1076 components: - type: Transform @@ -66616,7 +65183,7 @@ entities: pos: -47.5,-8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 1307 components: - type: Transform @@ -66624,7 +65191,7 @@ entities: pos: -52.5,-8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 1308 components: - type: Transform @@ -66632,14 +65199,14 @@ entities: pos: -51.5,-8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 1415 components: - type: Transform pos: -47.5,9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 1929 components: - type: Transform @@ -66647,14 +65214,14 @@ entities: pos: -31.5,-18.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2100 components: - type: Transform pos: 32.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2432 components: - type: Transform @@ -66662,7 +65229,7 @@ entities: pos: -36.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2433 components: - type: Transform @@ -66670,7 +65237,7 @@ entities: pos: -36.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2434 components: - type: Transform @@ -66678,7 +65245,7 @@ entities: pos: -36.5,34.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2435 components: - type: Transform @@ -66686,7 +65253,7 @@ entities: pos: -36.5,33.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2436 components: - type: Transform @@ -66694,7 +65261,7 @@ entities: pos: -34.5,34.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2437 components: - type: Transform @@ -66702,7 +65269,7 @@ entities: pos: -34.5,33.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2438 components: - type: Transform @@ -66710,7 +65277,7 @@ entities: pos: -36.5,31.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2439 components: - type: Transform @@ -66718,7 +65285,7 @@ entities: pos: -34.5,32.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2443 components: - type: Transform @@ -66726,7 +65293,7 @@ entities: pos: -35.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2444 components: - type: Transform @@ -66734,7 +65301,7 @@ entities: pos: -36.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2445 components: - type: Transform @@ -66742,7 +65309,7 @@ entities: pos: -37.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2446 components: - type: Transform @@ -66750,7 +65317,7 @@ entities: pos: -38.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2447 components: - type: Transform @@ -66758,7 +65325,7 @@ entities: pos: -39.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2448 components: - type: Transform @@ -66766,7 +65333,7 @@ entities: pos: -37.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2449 components: - type: Transform @@ -66774,7 +65341,7 @@ entities: pos: -38.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2450 components: - type: Transform @@ -66782,7 +65349,7 @@ entities: pos: -39.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2455 components: - type: Transform @@ -66790,7 +65357,7 @@ entities: pos: -40.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2457 components: - type: Transform @@ -66798,7 +65365,7 @@ entities: pos: -40.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2460 components: - type: Transform @@ -66806,7 +65373,7 @@ entities: pos: -42.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2461 components: - type: Transform @@ -66814,7 +65381,7 @@ entities: pos: -44.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2462 components: - type: Transform @@ -66822,7 +65389,7 @@ entities: pos: -43.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2464 components: - type: Transform @@ -66830,7 +65397,7 @@ entities: pos: -46.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2465 components: - type: Transform @@ -66838,7 +65405,7 @@ entities: pos: -47.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2466 components: - type: Transform @@ -66846,7 +65413,7 @@ entities: pos: -48.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2467 components: - type: Transform @@ -66854,7 +65421,7 @@ entities: pos: -43.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2468 components: - type: Transform @@ -66862,7 +65429,7 @@ entities: pos: -44.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2469 components: - type: Transform @@ -66870,7 +65437,7 @@ entities: pos: -45.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2470 components: - type: Transform @@ -66878,7 +65445,7 @@ entities: pos: -46.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2471 components: - type: Transform @@ -66886,7 +65453,7 @@ entities: pos: -47.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2472 components: - type: Transform @@ -66894,7 +65461,7 @@ entities: pos: -48.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2473 components: - type: Transform @@ -66902,105 +65469,105 @@ entities: pos: -49.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2476 components: - type: Transform pos: -49.5,34.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2477 components: - type: Transform pos: -49.5,33.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2478 components: - type: Transform pos: -50.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2479 components: - type: Transform pos: -50.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2480 components: - type: Transform pos: -50.5,34.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2481 components: - type: Transform pos: -50.5,33.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2484 components: - type: Transform pos: -41.5,34.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2485 components: - type: Transform pos: -41.5,33.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2486 components: - type: Transform pos: -42.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2487 components: - type: Transform pos: -42.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2488 components: - type: Transform pos: -42.5,34.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2489 components: - type: Transform pos: -42.5,33.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2494 components: - type: Transform pos: -36.5,38.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2495 components: - type: Transform pos: -36.5,39.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2498 components: - type: Transform @@ -67008,7 +65575,7 @@ entities: pos: -34.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2499 components: - type: Transform @@ -67016,7 +65583,7 @@ entities: pos: -34.5,38.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2500 components: - type: Transform @@ -67024,7 +65591,7 @@ entities: pos: -34.5,40.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2501 components: - type: Transform @@ -67032,7 +65599,7 @@ entities: pos: -34.5,41.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2502 components: - type: Transform @@ -67040,7 +65607,7 @@ entities: pos: -36.5,41.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2505 components: - type: Transform @@ -67048,7 +65615,7 @@ entities: pos: -36.5,42.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2506 components: - type: Transform @@ -67056,7 +65623,7 @@ entities: pos: -36.5,43.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2511 components: - type: Transform @@ -67064,7 +65631,7 @@ entities: pos: -34.5,44.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2514 components: - type: Transform @@ -67072,7 +65639,7 @@ entities: pos: -32.5,42.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2515 components: - type: Transform @@ -67080,7 +65647,7 @@ entities: pos: -31.5,43.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2516 components: - type: Transform @@ -67088,7 +65655,7 @@ entities: pos: -31.5,44.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2517 components: - type: Transform @@ -67096,7 +65663,7 @@ entities: pos: -31.5,45.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2518 components: - type: Transform @@ -67104,7 +65671,7 @@ entities: pos: -33.5,45.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2522 components: - type: Transform @@ -67112,7 +65679,7 @@ entities: pos: -31.5,47.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2528 components: - type: Transform @@ -67120,7 +65687,7 @@ entities: pos: -34.5,47.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2529 components: - type: Transform @@ -67128,7 +65695,7 @@ entities: pos: -35.5,47.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2530 components: - type: Transform @@ -67136,7 +65703,7 @@ entities: pos: -36.5,47.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2531 components: - type: Transform @@ -67144,7 +65711,7 @@ entities: pos: -37.5,47.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2533 components: - type: Transform @@ -67152,7 +65719,7 @@ entities: pos: -39.5,47.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2534 components: - type: Transform @@ -67160,7 +65727,7 @@ entities: pos: -32.5,48.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2535 components: - type: Transform @@ -67168,7 +65735,7 @@ entities: pos: -33.5,48.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2536 components: - type: Transform @@ -67176,7 +65743,7 @@ entities: pos: -34.5,48.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2537 components: - type: Transform @@ -67184,7 +65751,7 @@ entities: pos: -35.5,48.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2538 components: - type: Transform @@ -67192,7 +65759,7 @@ entities: pos: -36.5,48.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2539 components: - type: Transform @@ -67200,7 +65767,7 @@ entities: pos: -37.5,48.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2540 components: - type: Transform @@ -67208,7 +65775,7 @@ entities: pos: -38.5,48.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2541 components: - type: Transform @@ -67216,7 +65783,7 @@ entities: pos: -39.5,48.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2543 components: - type: Transform @@ -67224,7 +65791,7 @@ entities: pos: -40.5,47.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2546 components: - type: Transform @@ -67232,7 +65799,7 @@ entities: pos: -38.5,48.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2547 components: - type: Transform @@ -67240,7 +65807,7 @@ entities: pos: -40.5,49.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2548 components: - type: Transform @@ -67248,7 +65815,7 @@ entities: pos: -38.5,49.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2549 components: - type: Transform @@ -67256,7 +65823,7 @@ entities: pos: -38.5,50.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2550 components: - type: Transform @@ -67264,49 +65831,49 @@ entities: pos: -40.5,50.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2555 components: - type: Transform pos: -33.5,48.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2556 components: - type: Transform pos: -33.5,49.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2557 components: - type: Transform pos: -33.5,50.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2558 components: - type: Transform pos: -31.5,50.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2559 components: - type: Transform pos: -31.5,51.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2560 components: - type: Transform pos: -31.5,52.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2561 components: - type: Transform @@ -67314,7 +65881,7 @@ entities: pos: -32.5,51.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2562 components: - type: Transform @@ -67322,7 +65889,7 @@ entities: pos: -31.5,51.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2563 components: - type: Transform @@ -67330,7 +65897,7 @@ entities: pos: -30.5,51.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2564 components: - type: Transform @@ -67338,7 +65905,7 @@ entities: pos: -29.5,51.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2565 components: - type: Transform @@ -67346,7 +65913,7 @@ entities: pos: -28.5,51.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2566 components: - type: Transform @@ -67354,7 +65921,7 @@ entities: pos: -27.5,51.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2567 components: - type: Transform @@ -67362,7 +65929,7 @@ entities: pos: -26.5,51.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2568 components: - type: Transform @@ -67370,7 +65937,7 @@ entities: pos: -30.5,49.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2569 components: - type: Transform @@ -67378,7 +65945,7 @@ entities: pos: -29.5,49.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2570 components: - type: Transform @@ -67386,7 +65953,7 @@ entities: pos: -28.5,49.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2571 components: - type: Transform @@ -67394,7 +65961,7 @@ entities: pos: -27.5,49.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2572 components: - type: Transform @@ -67402,7 +65969,7 @@ entities: pos: -26.5,49.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2575 components: - type: Transform @@ -67410,7 +65977,7 @@ entities: pos: -33.5,52.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2584 components: - type: Transform @@ -67418,7 +65985,7 @@ entities: pos: -29.5,54.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2585 components: - type: Transform @@ -67426,7 +65993,7 @@ entities: pos: -35.5,54.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2586 components: - type: Transform @@ -67434,7 +66001,7 @@ entities: pos: -35.5,55.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2587 components: - type: Transform @@ -67442,7 +66009,7 @@ entities: pos: -35.5,56.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2588 components: - type: Transform @@ -67450,7 +66017,7 @@ entities: pos: -29.5,56.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2589 components: - type: Transform @@ -67458,7 +66025,7 @@ entities: pos: -29.5,55.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2590 components: - type: Transform @@ -67466,7 +66033,7 @@ entities: pos: -30.5,57.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2591 components: - type: Transform @@ -67474,91 +66041,91 @@ entities: pos: -34.5,57.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2602 components: - type: Transform pos: -46.5,41.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2603 components: - type: Transform pos: -48.5,43.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2604 components: - type: Transform pos: -48.5,42.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2605 components: - type: Transform pos: -48.5,41.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2606 components: - type: Transform pos: -44.5,43.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2607 components: - type: Transform pos: -44.5,42.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2608 components: - type: Transform pos: -44.5,41.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2609 components: - type: Transform pos: -42.5,41.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2610 components: - type: Transform pos: -40.5,43.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2611 components: - type: Transform pos: -40.5,42.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2612 components: - type: Transform pos: -40.5,41.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2613 components: - type: Transform pos: -38.5,41.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2614 components: - type: Transform @@ -67566,7 +66133,7 @@ entities: pos: -35.5,42.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2615 components: - type: Transform @@ -67574,7 +66141,7 @@ entities: pos: -36.5,42.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2616 components: - type: Transform @@ -67582,7 +66149,7 @@ entities: pos: -37.5,42.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2617 components: - type: Transform @@ -67590,7 +66157,7 @@ entities: pos: -39.5,42.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2618 components: - type: Transform @@ -67598,7 +66165,7 @@ entities: pos: -40.5,42.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2620 components: - type: Transform @@ -67606,7 +66173,7 @@ entities: pos: -43.5,42.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2621 components: - type: Transform @@ -67614,7 +66181,7 @@ entities: pos: -44.5,42.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2622 components: - type: Transform @@ -67622,7 +66189,7 @@ entities: pos: -45.5,42.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2623 components: - type: Transform @@ -67630,7 +66197,7 @@ entities: pos: -37.5,44.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2624 components: - type: Transform @@ -67638,7 +66205,7 @@ entities: pos: -38.5,44.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2625 components: - type: Transform @@ -67646,7 +66213,7 @@ entities: pos: -39.5,44.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2626 components: - type: Transform @@ -67654,7 +66221,7 @@ entities: pos: -41.5,44.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2627 components: - type: Transform @@ -67662,7 +66229,7 @@ entities: pos: -42.5,44.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2629 components: - type: Transform @@ -67670,7 +66237,7 @@ entities: pos: -45.5,44.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2630 components: - type: Transform @@ -67678,7 +66245,7 @@ entities: pos: -46.5,44.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2631 components: - type: Transform @@ -67686,7 +66253,7 @@ entities: pos: -47.5,44.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2632 components: - type: Transform @@ -67694,7 +66261,7 @@ entities: pos: -46.5,43.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2633 components: - type: Transform @@ -67702,7 +66269,7 @@ entities: pos: -46.5,44.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2634 components: - type: Transform @@ -67710,7 +66277,7 @@ entities: pos: -46.5,45.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2635 components: - type: Transform @@ -67718,7 +66285,7 @@ entities: pos: -46.5,46.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2636 components: - type: Transform @@ -67726,7 +66293,7 @@ entities: pos: -48.5,45.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2637 components: - type: Transform @@ -67734,7 +66301,7 @@ entities: pos: -48.5,46.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2649 components: - type: Transform @@ -67742,7 +66309,7 @@ entities: pos: -48.5,47.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2650 components: - type: Transform @@ -67750,7 +66317,7 @@ entities: pos: -48.5,48.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2651 components: - type: Transform @@ -67758,7 +66325,7 @@ entities: pos: -46.5,48.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2652 components: - type: Transform @@ -67766,7 +66333,7 @@ entities: pos: -46.5,47.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2653 components: - type: Transform @@ -67774,7 +66341,7 @@ entities: pos: -48.5,49.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2655 components: - type: Transform @@ -67782,7 +66349,7 @@ entities: pos: -46.5,53.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2656 components: - type: Transform @@ -67790,7 +66357,7 @@ entities: pos: -46.5,50.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2657 components: - type: Transform @@ -67798,7 +66365,7 @@ entities: pos: -46.5,51.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2660 components: - type: Transform @@ -67806,7 +66373,7 @@ entities: pos: -48.5,52.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2661 components: - type: Transform @@ -67814,7 +66381,7 @@ entities: pos: -48.5,53.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2663 components: - type: Transform @@ -67822,7 +66389,7 @@ entities: pos: -48.5,54.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2664 components: - type: Transform @@ -67830,7 +66397,7 @@ entities: pos: -46.5,54.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2665 components: - type: Transform @@ -67838,7 +66405,7 @@ entities: pos: -46.5,55.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2666 components: - type: Transform @@ -67846,7 +66413,7 @@ entities: pos: -48.5,55.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2671 components: - type: Transform @@ -67854,7 +66421,7 @@ entities: pos: -49.5,51.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2672 components: - type: Transform @@ -67862,7 +66429,7 @@ entities: pos: -47.5,52.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2673 components: - type: Transform @@ -67870,7 +66437,7 @@ entities: pos: -48.5,52.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2674 components: - type: Transform @@ -67878,7 +66445,7 @@ entities: pos: -49.5,52.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2678 components: - type: Transform @@ -67886,7 +66453,7 @@ entities: pos: -47.5,57.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2679 components: - type: Transform @@ -67894,7 +66461,7 @@ entities: pos: -48.5,57.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2680 components: - type: Transform @@ -67902,7 +66469,7 @@ entities: pos: -49.5,57.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2682 components: - type: Transform @@ -67910,7 +66477,7 @@ entities: pos: -50.5,58.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2683 components: - type: Transform @@ -67918,7 +66485,7 @@ entities: pos: -46.5,58.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2684 components: - type: Transform @@ -67926,7 +66493,7 @@ entities: pos: -46.5,59.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2685 components: - type: Transform @@ -67934,7 +66501,7 @@ entities: pos: -46.5,60.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2686 components: - type: Transform @@ -67942,7 +66509,7 @@ entities: pos: -50.5,60.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2687 components: - type: Transform @@ -67950,77 +66517,77 @@ entities: pos: -50.5,59.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2690 components: - type: Transform pos: -50.5,62.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2691 components: - type: Transform pos: -46.5,62.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2692 components: - type: Transform pos: -46.5,63.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2693 components: - type: Transform pos: -46.5,64.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2694 components: - type: Transform pos: -46.5,65.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2695 components: - type: Transform pos: -46.5,66.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2696 components: - type: Transform pos: -50.5,63.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2697 components: - type: Transform pos: -50.5,64.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2698 components: - type: Transform pos: -50.5,65.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2699 components: - type: Transform pos: -50.5,66.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2703 components: - type: Transform @@ -68028,7 +66595,7 @@ entities: pos: -49.5,67.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2704 components: - type: Transform @@ -68036,7 +66603,7 @@ entities: pos: -47.5,67.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2710 components: - type: Transform @@ -68044,7 +66611,7 @@ entities: pos: -48.5,57.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2713 components: - type: Transform @@ -68052,7 +66619,7 @@ entities: pos: -49.5,58.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2714 components: - type: Transform @@ -68060,63 +66627,63 @@ entities: pos: -50.5,58.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2715 components: - type: Transform pos: -47.5,59.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2716 components: - type: Transform pos: -51.5,59.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2719 components: - type: Transform pos: -47.5,61.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2720 components: - type: Transform pos: -51.5,61.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2721 components: - type: Transform pos: -51.5,62.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2722 components: - type: Transform pos: -51.5,63.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2723 components: - type: Transform pos: -47.5,62.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2724 components: - type: Transform pos: -47.5,63.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2727 components: - type: Transform @@ -68124,7 +66691,7 @@ entities: pos: -50.5,64.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2728 components: - type: Transform @@ -68132,7 +66699,7 @@ entities: pos: -49.5,64.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2735 components: - type: Transform @@ -68140,7 +66707,7 @@ entities: pos: -32.5,44.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2736 components: - type: Transform @@ -68148,7 +66715,7 @@ entities: pos: -31.5,44.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2737 components: - type: Transform @@ -68156,7 +66723,7 @@ entities: pos: -30.5,44.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2738 components: - type: Transform @@ -68164,7 +66731,7 @@ entities: pos: -29.5,44.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2739 components: - type: Transform @@ -68172,7 +66739,7 @@ entities: pos: -30.5,42.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2740 components: - type: Transform @@ -68180,154 +66747,154 @@ entities: pos: -29.5,42.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2747 components: - type: Transform pos: -36.5,30.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2748 components: - type: Transform pos: -36.5,29.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2749 components: - type: Transform pos: -36.5,28.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2751 components: - type: Transform pos: -36.5,26.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2752 components: - type: Transform pos: -36.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2754 components: - type: Transform pos: -36.5,23.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2755 components: - type: Transform pos: -36.5,22.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2756 components: - type: Transform pos: -36.5,21.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2757 components: - type: Transform pos: -36.5,20.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2758 components: - type: Transform pos: -36.5,19.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2759 components: - type: Transform pos: -36.5,18.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2761 components: - type: Transform pos: -36.5,16.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2763 components: - type: Transform pos: -36.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2764 components: - type: Transform pos: -36.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2765 components: - type: Transform pos: -36.5,12.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2766 components: - type: Transform pos: -36.5,11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2768 components: - type: Transform pos: -36.5,9.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2769 components: - type: Transform pos: -36.5,8.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2771 components: - type: Transform pos: -36.5,6.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2772 components: - type: Transform pos: -36.5,4.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2773 components: - type: Transform pos: -36.5,5.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2775 components: - type: Transform @@ -68335,7 +66902,7 @@ entities: pos: -35.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2776 components: - type: Transform @@ -68343,7 +66910,7 @@ entities: pos: -34.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2778 components: - type: Transform @@ -68351,7 +66918,7 @@ entities: pos: -32.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2780 components: - type: Transform @@ -68359,7 +66926,7 @@ entities: pos: -30.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2781 components: - type: Transform @@ -68367,7 +66934,7 @@ entities: pos: -29.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2782 components: - type: Transform @@ -68375,7 +66942,7 @@ entities: pos: -28.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2783 components: - type: Transform @@ -68383,7 +66950,7 @@ entities: pos: -27.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2784 components: - type: Transform @@ -68391,7 +66958,7 @@ entities: pos: -26.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2785 components: - type: Transform @@ -68399,7 +66966,7 @@ entities: pos: -25.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2787 components: - type: Transform @@ -68407,7 +66974,7 @@ entities: pos: -23.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2789 components: - type: Transform @@ -68415,7 +66982,7 @@ entities: pos: -22.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2790 components: - type: Transform @@ -68423,7 +66990,7 @@ entities: pos: -20.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2791 components: - type: Transform @@ -68431,7 +66998,7 @@ entities: pos: -19.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2792 components: - type: Transform @@ -68439,7 +67006,7 @@ entities: pos: -18.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2793 components: - type: Transform @@ -68447,7 +67014,7 @@ entities: pos: -17.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2794 components: - type: Transform @@ -68455,7 +67022,7 @@ entities: pos: -16.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2795 components: - type: Transform @@ -68463,7 +67030,7 @@ entities: pos: -15.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2797 components: - type: Transform @@ -68471,7 +67038,7 @@ entities: pos: -13.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2798 components: - type: Transform @@ -68479,7 +67046,7 @@ entities: pos: -12.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2799 components: - type: Transform @@ -68487,7 +67054,7 @@ entities: pos: -11.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2800 components: - type: Transform @@ -68495,7 +67062,7 @@ entities: pos: -10.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2801 components: - type: Transform @@ -68503,7 +67070,7 @@ entities: pos: -9.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2803 components: - type: Transform @@ -68511,7 +67078,7 @@ entities: pos: -7.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2804 components: - type: Transform @@ -68519,7 +67086,7 @@ entities: pos: -5.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2806 components: - type: Transform @@ -68527,7 +67094,7 @@ entities: pos: -4.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2808 components: - type: Transform @@ -68535,7 +67102,7 @@ entities: pos: -1.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2809 components: - type: Transform @@ -68543,7 +67110,7 @@ entities: pos: -2.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2810 components: - type: Transform @@ -68551,7 +67118,7 @@ entities: pos: -0.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2811 components: - type: Transform @@ -68559,7 +67126,7 @@ entities: pos: 0.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2813 components: - type: Transform @@ -68567,7 +67134,7 @@ entities: pos: 2.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2815 components: - type: Transform @@ -68575,7 +67142,7 @@ entities: pos: 4.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2816 components: - type: Transform @@ -68583,7 +67150,7 @@ entities: pos: 5.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2817 components: - type: Transform @@ -68591,7 +67158,7 @@ entities: pos: 6.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2818 components: - type: Transform @@ -68599,7 +67166,7 @@ entities: pos: 7.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2820 components: - type: Transform @@ -68607,7 +67174,7 @@ entities: pos: 8.5,4.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2821 components: - type: Transform @@ -68615,7 +67182,7 @@ entities: pos: 8.5,5.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2822 components: - type: Transform @@ -68623,7 +67190,7 @@ entities: pos: 8.5,6.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2823 components: - type: Transform @@ -68631,7 +67198,7 @@ entities: pos: 8.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2824 components: - type: Transform @@ -68639,7 +67206,7 @@ entities: pos: 8.5,8.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2825 components: - type: Transform @@ -68647,7 +67214,7 @@ entities: pos: 8.5,9.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2826 components: - type: Transform @@ -68655,7 +67222,7 @@ entities: pos: 8.5,10.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2827 components: - type: Transform @@ -68663,7 +67230,7 @@ entities: pos: 8.5,11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2828 components: - type: Transform @@ -68671,7 +67238,7 @@ entities: pos: 8.5,12.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2829 components: - type: Transform @@ -68679,7 +67246,7 @@ entities: pos: 8.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2830 components: - type: Transform @@ -68687,7 +67254,7 @@ entities: pos: 8.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2832 components: - type: Transform @@ -68695,7 +67262,7 @@ entities: pos: 8.5,16.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2834 components: - type: Transform @@ -68703,7 +67270,7 @@ entities: pos: 8.5,18.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2835 components: - type: Transform @@ -68711,7 +67278,7 @@ entities: pos: 8.5,19.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2836 components: - type: Transform @@ -68719,7 +67286,7 @@ entities: pos: 8.5,20.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2837 components: - type: Transform @@ -68727,7 +67294,7 @@ entities: pos: 8.5,21.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2838 components: - type: Transform @@ -68735,7 +67302,7 @@ entities: pos: 8.5,22.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2839 components: - type: Transform @@ -68743,7 +67310,7 @@ entities: pos: 8.5,23.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2840 components: - type: Transform @@ -68751,7 +67318,7 @@ entities: pos: 8.5,24.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2841 components: - type: Transform @@ -68759,7 +67326,7 @@ entities: pos: 8.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2844 components: - type: Transform @@ -68767,7 +67334,7 @@ entities: pos: 7.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2845 components: - type: Transform @@ -68775,7 +67342,7 @@ entities: pos: 6.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2846 components: - type: Transform @@ -68783,7 +67350,7 @@ entities: pos: 5.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2847 components: - type: Transform @@ -68791,7 +67358,7 @@ entities: pos: 4.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2848 components: - type: Transform @@ -68799,7 +67366,7 @@ entities: pos: 3.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2849 components: - type: Transform @@ -68807,7 +67374,7 @@ entities: pos: 2.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2850 components: - type: Transform @@ -68815,7 +67382,7 @@ entities: pos: 1.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2852 components: - type: Transform @@ -68823,7 +67390,7 @@ entities: pos: -0.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2853 components: - type: Transform @@ -68831,7 +67398,7 @@ entities: pos: -1.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2855 components: - type: Transform @@ -68839,7 +67406,7 @@ entities: pos: -3.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2856 components: - type: Transform @@ -68847,7 +67414,7 @@ entities: pos: -5.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2858 components: - type: Transform @@ -68855,7 +67422,7 @@ entities: pos: -6.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2859 components: - type: Transform @@ -68863,7 +67430,7 @@ entities: pos: -7.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2860 components: - type: Transform @@ -68871,7 +67438,7 @@ entities: pos: -8.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2861 components: - type: Transform @@ -68879,7 +67446,7 @@ entities: pos: -9.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2863 components: - type: Transform @@ -68887,7 +67454,7 @@ entities: pos: -12.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2864 components: - type: Transform @@ -68895,7 +67462,7 @@ entities: pos: -11.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2865 components: - type: Transform @@ -68903,7 +67470,7 @@ entities: pos: -13.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2867 components: - type: Transform @@ -68911,7 +67478,7 @@ entities: pos: -15.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2868 components: - type: Transform @@ -68919,7 +67486,7 @@ entities: pos: -16.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2869 components: - type: Transform @@ -68927,7 +67494,7 @@ entities: pos: -17.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2870 components: - type: Transform @@ -68935,7 +67502,7 @@ entities: pos: -18.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2872 components: - type: Transform @@ -68943,7 +67510,7 @@ entities: pos: -20.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2874 components: - type: Transform @@ -68951,7 +67518,7 @@ entities: pos: -22.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2875 components: - type: Transform @@ -68959,7 +67526,7 @@ entities: pos: -23.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2876 components: - type: Transform @@ -68967,7 +67534,7 @@ entities: pos: -24.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2877 components: - type: Transform @@ -68975,7 +67542,7 @@ entities: pos: -25.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2878 components: - type: Transform @@ -68983,7 +67550,7 @@ entities: pos: -26.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2880 components: - type: Transform @@ -68991,7 +67558,7 @@ entities: pos: -28.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2881 components: - type: Transform @@ -68999,7 +67566,7 @@ entities: pos: -29.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2882 components: - type: Transform @@ -69007,7 +67574,7 @@ entities: pos: -30.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2884 components: - type: Transform @@ -69015,7 +67582,7 @@ entities: pos: -33.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2885 components: - type: Transform @@ -69023,7 +67590,7 @@ entities: pos: -32.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2886 components: - type: Transform @@ -69031,7 +67598,7 @@ entities: pos: -34.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2887 components: - type: Transform @@ -69039,161 +67606,161 @@ entities: pos: -35.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2889 components: - type: Transform pos: -34.5,30.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2890 components: - type: Transform pos: -34.5,29.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2891 components: - type: Transform pos: -34.5,28.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2892 components: - type: Transform pos: -34.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2894 components: - type: Transform pos: -34.5,24.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2895 components: - type: Transform pos: -34.5,23.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2896 components: - type: Transform pos: -34.5,22.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2897 components: - type: Transform pos: -34.5,21.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2898 components: - type: Transform pos: -34.5,20.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2900 components: - type: Transform pos: -34.5,18.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2901 components: - type: Transform pos: -34.5,17.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2902 components: - type: Transform pos: -34.5,16.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2903 components: - type: Transform pos: -34.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2904 components: - type: Transform pos: -34.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2906 components: - type: Transform pos: -34.5,12.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2907 components: - type: Transform pos: -34.5,11.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2908 components: - type: Transform pos: -34.5,10.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2911 components: - type: Transform pos: -34.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2912 components: - type: Transform pos: -34.5,6.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2914 components: - type: Transform pos: -34.5,4.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2915 components: - type: Transform pos: -34.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2916 components: - type: Transform pos: -34.5,2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2918 components: - type: Transform @@ -69201,7 +67768,7 @@ entities: pos: -33.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2920 components: - type: Transform @@ -69209,7 +67776,7 @@ entities: pos: -31.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2921 components: - type: Transform @@ -69217,7 +67784,7 @@ entities: pos: -30.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2922 components: - type: Transform @@ -69225,7 +67792,7 @@ entities: pos: -29.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2923 components: - type: Transform @@ -69233,7 +67800,7 @@ entities: pos: -28.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2925 components: - type: Transform @@ -69241,7 +67808,7 @@ entities: pos: -26.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2926 components: - type: Transform @@ -69249,7 +67816,7 @@ entities: pos: -25.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2927 components: - type: Transform @@ -69257,7 +67824,7 @@ entities: pos: -24.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2928 components: - type: Transform @@ -69265,7 +67832,7 @@ entities: pos: -23.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2929 components: - type: Transform @@ -69273,7 +67840,7 @@ entities: pos: -22.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2930 components: - type: Transform @@ -69281,7 +67848,7 @@ entities: pos: -21.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2931 components: - type: Transform @@ -69289,7 +67856,7 @@ entities: pos: -20.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2934 components: - type: Transform @@ -69297,7 +67864,7 @@ entities: pos: -16.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2936 components: - type: Transform @@ -69305,7 +67872,7 @@ entities: pos: -15.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2937 components: - type: Transform @@ -69313,7 +67880,7 @@ entities: pos: -14.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2938 components: - type: Transform @@ -69321,7 +67888,7 @@ entities: pos: -13.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2939 components: - type: Transform @@ -69329,7 +67896,7 @@ entities: pos: -12.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2940 components: - type: Transform @@ -69337,7 +67904,7 @@ entities: pos: -11.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2942 components: - type: Transform @@ -69345,7 +67912,7 @@ entities: pos: -9.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2943 components: - type: Transform @@ -69353,7 +67920,7 @@ entities: pos: -8.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2944 components: - type: Transform @@ -69361,7 +67928,7 @@ entities: pos: -7.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2945 components: - type: Transform @@ -69369,7 +67936,7 @@ entities: pos: -6.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2946 components: - type: Transform @@ -69377,7 +67944,7 @@ entities: pos: -5.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2947 components: - type: Transform @@ -69385,7 +67952,7 @@ entities: pos: -4.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2948 components: - type: Transform @@ -69393,7 +67960,7 @@ entities: pos: -3.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2949 components: - type: Transform @@ -69401,7 +67968,7 @@ entities: pos: -2.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2951 components: - type: Transform @@ -69409,7 +67976,7 @@ entities: pos: -0.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2952 components: - type: Transform @@ -69417,7 +67984,7 @@ entities: pos: 0.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2953 components: - type: Transform @@ -69425,7 +67992,7 @@ entities: pos: 2.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2954 components: - type: Transform @@ -69433,7 +68000,7 @@ entities: pos: 1.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2955 components: - type: Transform @@ -69441,7 +68008,7 @@ entities: pos: 3.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2956 components: - type: Transform @@ -69449,7 +68016,7 @@ entities: pos: 4.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2958 components: - type: Transform @@ -69457,7 +68024,7 @@ entities: pos: 6.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2959 components: - type: Transform @@ -69465,7 +68032,7 @@ entities: pos: 7.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2960 components: - type: Transform @@ -69473,7 +68040,7 @@ entities: pos: 9.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2961 components: - type: Transform @@ -69481,7 +68048,7 @@ entities: pos: 8.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2963 components: - type: Transform @@ -69489,7 +68056,7 @@ entities: pos: 10.5,2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2964 components: - type: Transform @@ -69497,7 +68064,7 @@ entities: pos: 10.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2965 components: - type: Transform @@ -69505,7 +68072,7 @@ entities: pos: 10.5,4.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2966 components: - type: Transform @@ -69513,7 +68080,7 @@ entities: pos: 10.5,5.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2967 components: - type: Transform @@ -69521,7 +68088,7 @@ entities: pos: 10.5,6.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2968 components: - type: Transform @@ -69529,7 +68096,7 @@ entities: pos: 10.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2969 components: - type: Transform @@ -69537,7 +68104,7 @@ entities: pos: 10.5,8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2970 components: - type: Transform @@ -69545,7 +68112,7 @@ entities: pos: 10.5,9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2971 components: - type: Transform @@ -69553,7 +68120,7 @@ entities: pos: 10.5,10.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2972 components: - type: Transform @@ -69561,7 +68128,7 @@ entities: pos: 10.5,11.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2973 components: - type: Transform @@ -69569,7 +68136,7 @@ entities: pos: 10.5,12.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2974 components: - type: Transform @@ -69577,7 +68144,7 @@ entities: pos: 10.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2976 components: - type: Transform @@ -69585,7 +68152,7 @@ entities: pos: 11.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2977 components: - type: Transform @@ -69593,7 +68160,7 @@ entities: pos: 10.5,16.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2978 components: - type: Transform @@ -69601,7 +68168,7 @@ entities: pos: 10.5,17.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2979 components: - type: Transform @@ -69609,7 +68176,7 @@ entities: pos: 10.5,18.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2980 components: - type: Transform @@ -69617,7 +68184,7 @@ entities: pos: 10.5,20.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2981 components: - type: Transform @@ -69625,7 +68192,7 @@ entities: pos: 10.5,19.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2982 components: - type: Transform @@ -69633,7 +68200,7 @@ entities: pos: 10.5,21.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2983 components: - type: Transform @@ -69641,7 +68208,7 @@ entities: pos: 10.5,22.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2984 components: - type: Transform @@ -69649,7 +68216,7 @@ entities: pos: 10.5,23.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2987 components: - type: Transform @@ -69657,7 +68224,7 @@ entities: pos: 9.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2988 components: - type: Transform @@ -69665,7 +68232,7 @@ entities: pos: 8.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2989 components: - type: Transform @@ -69673,7 +68240,7 @@ entities: pos: 7.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2990 components: - type: Transform @@ -69681,7 +68248,7 @@ entities: pos: 6.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2991 components: - type: Transform @@ -69689,7 +68256,7 @@ entities: pos: 5.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2992 components: - type: Transform @@ -69697,7 +68264,7 @@ entities: pos: 4.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2993 components: - type: Transform @@ -69705,7 +68272,7 @@ entities: pos: 2.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2995 components: - type: Transform @@ -69713,7 +68280,7 @@ entities: pos: 0.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2996 components: - type: Transform @@ -69721,7 +68288,7 @@ entities: pos: 1.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2998 components: - type: Transform @@ -69729,7 +68296,7 @@ entities: pos: -2.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2999 components: - type: Transform @@ -69737,7 +68304,7 @@ entities: pos: -1.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3001 components: - type: Transform @@ -69745,7 +68312,7 @@ entities: pos: -4.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3002 components: - type: Transform @@ -69753,7 +68320,7 @@ entities: pos: -5.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3003 components: - type: Transform @@ -69761,7 +68328,7 @@ entities: pos: -6.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3004 components: - type: Transform @@ -69769,7 +68336,7 @@ entities: pos: -7.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3005 components: - type: Transform @@ -69777,7 +68344,7 @@ entities: pos: -9.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3007 components: - type: Transform @@ -69785,7 +68352,7 @@ entities: pos: -10.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3008 components: - type: Transform @@ -69793,7 +68360,7 @@ entities: pos: -11.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3009 components: - type: Transform @@ -69801,7 +68368,7 @@ entities: pos: -12.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3010 components: - type: Transform @@ -69809,7 +68376,7 @@ entities: pos: -13.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3011 components: - type: Transform @@ -69817,7 +68384,7 @@ entities: pos: -14.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3013 components: - type: Transform @@ -69825,7 +68392,7 @@ entities: pos: -16.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3014 components: - type: Transform @@ -69833,7 +68400,7 @@ entities: pos: -17.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3015 components: - type: Transform @@ -69841,7 +68408,7 @@ entities: pos: -18.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3016 components: - type: Transform @@ -69849,7 +68416,7 @@ entities: pos: -19.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3017 components: - type: Transform @@ -69857,7 +68424,7 @@ entities: pos: -20.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3018 components: - type: Transform @@ -69865,7 +68432,7 @@ entities: pos: -21.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3021 components: - type: Transform @@ -69873,7 +68440,7 @@ entities: pos: -24.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3024 components: - type: Transform @@ -69881,7 +68448,7 @@ entities: pos: -27.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3025 components: - type: Transform @@ -69889,7 +68456,7 @@ entities: pos: -29.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3026 components: - type: Transform @@ -69897,7 +68464,7 @@ entities: pos: -28.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3028 components: - type: Transform @@ -69905,7 +68472,7 @@ entities: pos: -31.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3029 components: - type: Transform @@ -69913,7 +68480,7 @@ entities: pos: -32.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3030 components: - type: Transform @@ -69921,7 +68488,7 @@ entities: pos: -33.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3031 components: - type: Transform @@ -69929,7 +68496,7 @@ entities: pos: -31.5,28.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3032 components: - type: Transform @@ -69937,7 +68504,7 @@ entities: pos: -31.5,29.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3033 components: - type: Transform @@ -69945,7 +68512,7 @@ entities: pos: -31.5,30.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3034 components: - type: Transform @@ -69953,7 +68520,7 @@ entities: pos: -25.5,26.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3035 components: - type: Transform @@ -69961,7 +68528,7 @@ entities: pos: -25.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3036 components: - type: Transform @@ -69969,7 +68536,7 @@ entities: pos: -25.5,28.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3037 components: - type: Transform @@ -69977,7 +68544,7 @@ entities: pos: -25.5,29.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3038 components: - type: Transform @@ -69985,112 +68552,112 @@ entities: pos: -25.5,30.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3043 components: - type: Transform pos: -30.5,24.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3044 components: - type: Transform pos: -30.5,23.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3045 components: - type: Transform pos: -31.5,26.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3046 components: - type: Transform pos: -31.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3047 components: - type: Transform pos: -31.5,24.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3048 components: - type: Transform pos: -31.5,23.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3051 components: - type: Transform pos: -26.5,24.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3052 components: - type: Transform pos: -27.5,26.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3053 components: - type: Transform pos: -27.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3054 components: - type: Transform pos: -27.5,24.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3057 components: - type: Transform pos: -22.5,24.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3058 components: - type: Transform pos: -21.5,26.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3059 components: - type: Transform pos: -21.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3060 components: - type: Transform pos: -21.5,24.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3061 components: - type: Transform pos: -21.5,23.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3070 components: - type: Transform @@ -70098,7 +68665,7 @@ entities: pos: -35.5,9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3071 components: - type: Transform @@ -70106,7 +68673,7 @@ entities: pos: -36.5,9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3072 components: - type: Transform @@ -70114,7 +68681,7 @@ entities: pos: -37.5,9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3073 components: - type: Transform @@ -70122,7 +68689,7 @@ entities: pos: -38.5,9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3074 components: - type: Transform @@ -70130,7 +68697,7 @@ entities: pos: -37.5,10.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3075 components: - type: Transform @@ -70138,7 +68705,7 @@ entities: pos: -38.5,10.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3079 components: - type: Transform @@ -70146,7 +68713,7 @@ entities: pos: -39.5,9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3080 components: - type: Transform @@ -70154,7 +68721,7 @@ entities: pos: -35.5,5.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3081 components: - type: Transform @@ -70162,7 +68729,7 @@ entities: pos: -36.5,5.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3082 components: - type: Transform @@ -70170,7 +68737,7 @@ entities: pos: -37.5,5.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3083 components: - type: Transform @@ -70178,7 +68745,7 @@ entities: pos: -38.5,5.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3085 components: - type: Transform @@ -70186,7 +68753,7 @@ entities: pos: -40.5,5.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3086 components: - type: Transform @@ -70194,7 +68761,7 @@ entities: pos: -41.5,5.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3088 components: - type: Transform @@ -70202,7 +68769,7 @@ entities: pos: -43.5,5.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3089 components: - type: Transform @@ -70210,7 +68777,7 @@ entities: pos: -37.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3090 components: - type: Transform @@ -70218,7 +68785,7 @@ entities: pos: -38.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3092 components: - type: Transform @@ -70226,7 +68793,7 @@ entities: pos: -40.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3094 components: - type: Transform @@ -70234,7 +68801,7 @@ entities: pos: -42.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3095 components: - type: Transform @@ -70242,7 +68809,7 @@ entities: pos: -43.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3096 components: - type: Transform @@ -70250,7 +68817,7 @@ entities: pos: -44.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3101 components: - type: Transform @@ -70258,7 +68825,7 @@ entities: pos: -41.5,6.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3102 components: - type: Transform @@ -70266,7 +68833,7 @@ entities: pos: -41.5,5.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3103 components: - type: Transform @@ -70274,7 +68841,7 @@ entities: pos: -41.5,4.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3104 components: - type: Transform @@ -70282,7 +68849,7 @@ entities: pos: -41.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3105 components: - type: Transform @@ -70290,7 +68857,7 @@ entities: pos: -41.5,2.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3106 components: - type: Transform @@ -70298,7 +68865,7 @@ entities: pos: -41.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3107 components: - type: Transform @@ -70306,7 +68873,7 @@ entities: pos: -39.5,4.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3108 components: - type: Transform @@ -70314,7 +68881,7 @@ entities: pos: -39.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3109 components: - type: Transform @@ -70322,7 +68889,7 @@ entities: pos: -39.5,2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3110 components: - type: Transform @@ -70330,7 +68897,7 @@ entities: pos: -39.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3113 components: - type: Transform @@ -70338,7 +68905,7 @@ entities: pos: -46.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3121 components: - type: Transform @@ -70346,7 +68913,7 @@ entities: pos: -51.5,10.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3122 components: - type: Transform @@ -70354,7 +68921,7 @@ entities: pos: -50.5,10.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3124 components: - type: Transform @@ -70362,7 +68929,7 @@ entities: pos: -48.5,10.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3127 components: - type: Transform @@ -70370,7 +68937,7 @@ entities: pos: -45.5,8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3128 components: - type: Transform @@ -70378,7 +68945,7 @@ entities: pos: -44.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3129 components: - type: Transform @@ -70386,7 +68953,7 @@ entities: pos: -44.5,6.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3132 components: - type: Transform @@ -70394,7 +68961,7 @@ entities: pos: -49.5,9.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3133 components: - type: Transform @@ -70402,124 +68969,119 @@ entities: pos: -50.5,9.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3139 components: - type: Transform pos: -45.5,5.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3140 components: - type: Transform pos: -45.5,4.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3141 components: - type: Transform pos: -45.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3142 components: - type: Transform pos: -45.5,2.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3143 components: - type: Transform pos: -44.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3144 components: - type: Transform pos: -44.5,2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3145 components: - type: Transform pos: -44.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3146 components: - type: Transform pos: -45.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3149 components: - type: Transform pos: -45.5,0.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3150 components: - type: Transform pos: -45.5,-0.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3151 components: - type: Transform pos: -45.5,-1.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 3153 - components: - - type: Transform - pos: -5.5,-56.5 - parent: 30 + color: '#FF0000FF' - uid: 3156 components: - type: Transform pos: -44.5,-5.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3157 components: - type: Transform pos: -44.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3158 components: - type: Transform pos: -44.5,-1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3159 components: - type: Transform pos: -44.5,-0.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3160 components: - type: Transform pos: -44.5,0.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3164 components: - type: Transform @@ -70527,7 +69089,7 @@ entities: pos: -45.5,-4.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3165 components: - type: Transform @@ -70535,7 +69097,7 @@ entities: pos: -45.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3178 components: - type: Transform @@ -70543,7 +69105,7 @@ entities: pos: -49.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3179 components: - type: Transform @@ -70551,28 +69113,28 @@ entities: pos: -48.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3190 components: - type: Transform pos: -51.5,10.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3191 components: - type: Transform pos: -51.5,11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3192 components: - type: Transform pos: -52.5,11.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3205 components: - type: Transform @@ -70580,7 +69142,7 @@ entities: pos: -45.5,-6.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3206 components: - type: Transform @@ -70588,7 +69150,7 @@ entities: pos: -45.5,-7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3207 components: - type: Transform @@ -70596,7 +69158,7 @@ entities: pos: -45.5,-8.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3209 components: - type: Transform @@ -70604,7 +69166,7 @@ entities: pos: -45.5,-10.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3210 components: - type: Transform @@ -70612,7 +69174,7 @@ entities: pos: -45.5,-11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3211 components: - type: Transform @@ -70620,7 +69182,7 @@ entities: pos: -44.5,-6.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3212 components: - type: Transform @@ -70628,7 +69190,7 @@ entities: pos: -44.5,-7.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3214 components: - type: Transform @@ -70636,7 +69198,7 @@ entities: pos: -44.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3215 components: - type: Transform @@ -70644,7 +69206,7 @@ entities: pos: -44.5,-10.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3216 components: - type: Transform @@ -70652,21 +69214,21 @@ entities: pos: -44.5,-11.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3217 components: - type: Transform pos: -45.5,-12.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3218 components: - type: Transform pos: -45.5,-13.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3219 components: - type: Transform @@ -70674,7 +69236,7 @@ entities: pos: -45.5,-8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3220 components: - type: Transform @@ -70682,7 +69244,7 @@ entities: pos: -46.5,-8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3222 components: - type: Transform @@ -70690,7 +69252,7 @@ entities: pos: -33.5,8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3223 components: - type: Transform @@ -70698,7 +69260,7 @@ entities: pos: -32.5,8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3224 components: - type: Transform @@ -70706,7 +69268,7 @@ entities: pos: -35.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3225 components: - type: Transform @@ -70714,7 +69276,7 @@ entities: pos: -34.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3226 components: - type: Transform @@ -70722,7 +69284,7 @@ entities: pos: -33.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3227 components: - type: Transform @@ -70730,7 +69292,7 @@ entities: pos: -32.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3232 components: - type: Transform @@ -70738,7 +69300,7 @@ entities: pos: -35.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3233 components: - type: Transform @@ -70746,7 +69308,7 @@ entities: pos: -36.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3234 components: - type: Transform @@ -70754,7 +69316,7 @@ entities: pos: -37.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3235 components: - type: Transform @@ -70762,7 +69324,7 @@ entities: pos: -38.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3236 components: - type: Transform @@ -70770,7 +69332,7 @@ entities: pos: -39.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3237 components: - type: Transform @@ -70778,7 +69340,7 @@ entities: pos: -37.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3238 components: - type: Transform @@ -70786,7 +69348,7 @@ entities: pos: -38.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3239 components: - type: Transform @@ -70794,7 +69356,7 @@ entities: pos: -39.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3240 components: - type: Transform @@ -70802,7 +69364,7 @@ entities: pos: -40.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3242 components: - type: Transform @@ -70810,7 +69372,7 @@ entities: pos: -40.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3243 components: - type: Transform @@ -70818,7 +69380,7 @@ entities: pos: -41.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3244 components: - type: Transform @@ -70826,7 +69388,7 @@ entities: pos: -42.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3247 components: - type: Transform @@ -70834,7 +69396,7 @@ entities: pos: -43.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3248 components: - type: Transform @@ -70842,7 +69404,7 @@ entities: pos: -43.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3249 components: - type: Transform @@ -70850,7 +69412,7 @@ entities: pos: -42.5,16.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3250 components: - type: Transform @@ -70858,7 +69420,7 @@ entities: pos: -43.5,16.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3251 components: - type: Transform @@ -70866,7 +69428,7 @@ entities: pos: -43.5,17.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3252 components: - type: Transform @@ -70874,7 +69436,7 @@ entities: pos: -42.5,17.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3256 components: - type: Transform @@ -70882,7 +69444,7 @@ entities: pos: -43.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3257 components: - type: Transform @@ -70890,7 +69452,7 @@ entities: pos: -44.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3258 components: - type: Transform @@ -70898,7 +69460,7 @@ entities: pos: -45.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3259 components: - type: Transform @@ -70906,7 +69468,7 @@ entities: pos: -46.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3260 components: - type: Transform @@ -70914,7 +69476,7 @@ entities: pos: -47.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3261 components: - type: Transform @@ -70922,7 +69484,7 @@ entities: pos: -45.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3262 components: - type: Transform @@ -70930,7 +69492,7 @@ entities: pos: -46.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3263 components: - type: Transform @@ -70938,7 +69500,7 @@ entities: pos: -47.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3264 components: - type: Transform @@ -70946,7 +69508,7 @@ entities: pos: -48.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3265 components: - type: Transform @@ -70954,21 +69516,21 @@ entities: pos: -48.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3269 components: - type: Transform pos: -49.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3270 components: - type: Transform pos: -49.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3273 components: - type: Transform @@ -70976,7 +69538,7 @@ entities: pos: -50.5,12.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3274 components: - type: Transform @@ -70984,7 +69546,7 @@ entities: pos: -49.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3276 components: - type: Transform @@ -70992,14 +69554,14 @@ entities: pos: -51.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3277 components: - type: Transform pos: -52.5,12.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3279 components: - type: Transform @@ -71007,7 +69569,7 @@ entities: pos: -53.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3280 components: - type: Transform @@ -71015,7 +69577,7 @@ entities: pos: -54.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3281 components: - type: Transform @@ -71023,7 +69585,7 @@ entities: pos: -55.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3282 components: - type: Transform @@ -71031,7 +69593,7 @@ entities: pos: -56.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3287 components: - type: Transform @@ -71039,7 +69601,7 @@ entities: pos: -58.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3288 components: - type: Transform @@ -71047,7 +69609,7 @@ entities: pos: -59.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3289 components: - type: Transform @@ -71055,7 +69617,7 @@ entities: pos: -58.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3290 components: - type: Transform @@ -71063,7 +69625,7 @@ entities: pos: -59.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3291 components: - type: Transform @@ -71071,7 +69633,7 @@ entities: pos: -57.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3292 components: - type: Transform @@ -71079,7 +69641,7 @@ entities: pos: -57.5,16.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3293 components: - type: Transform @@ -71087,7 +69649,7 @@ entities: pos: -57.5,17.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3295 components: - type: Transform @@ -71095,7 +69657,7 @@ entities: pos: -57.5,19.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3296 components: - type: Transform @@ -71103,7 +69665,7 @@ entities: pos: -57.5,20.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3297 components: - type: Transform @@ -71111,7 +69673,7 @@ entities: pos: -58.5,21.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3298 components: - type: Transform @@ -71119,7 +69681,7 @@ entities: pos: -59.5,21.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3299 components: - type: Transform @@ -71127,7 +69689,7 @@ entities: pos: -58.5,23.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3300 components: - type: Transform @@ -71135,35 +69697,35 @@ entities: pos: -59.5,23.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3301 components: - type: Transform pos: -57.5,22.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3308 components: - type: Transform pos: -49.5,17.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3309 components: - type: Transform pos: -49.5,18.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3310 components: - type: Transform pos: -49.5,19.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3311 components: - type: Transform @@ -71171,7 +69733,7 @@ entities: pos: -50.5,20.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3312 components: - type: Transform @@ -71179,7 +69741,7 @@ entities: pos: -51.5,20.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3313 components: - type: Transform @@ -71187,7 +69749,7 @@ entities: pos: -52.5,20.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3314 components: - type: Transform @@ -71195,7 +69757,7 @@ entities: pos: -50.5,16.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3315 components: - type: Transform @@ -71203,7 +69765,7 @@ entities: pos: -51.5,16.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3316 components: - type: Transform @@ -71211,7 +69773,7 @@ entities: pos: -52.5,16.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3319 components: - type: Transform @@ -71219,7 +69781,7 @@ entities: pos: -50.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3320 components: - type: Transform @@ -71227,7 +69789,7 @@ entities: pos: -50.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3321 components: - type: Transform @@ -71235,7 +69797,7 @@ entities: pos: -50.5,16.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3322 components: - type: Transform @@ -71243,7 +69805,7 @@ entities: pos: -50.5,17.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3329 components: - type: Transform @@ -71251,7 +69813,7 @@ entities: pos: -19.5,2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3330 components: - type: Transform @@ -71259,7 +69821,7 @@ entities: pos: -19.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3331 components: - type: Transform @@ -71267,7 +69829,7 @@ entities: pos: -19.5,4.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3332 components: - type: Transform @@ -71275,7 +69837,7 @@ entities: pos: -19.5,5.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3334 components: - type: Transform @@ -71283,7 +69845,7 @@ entities: pos: -18.5,6.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3335 components: - type: Transform @@ -71291,7 +69853,7 @@ entities: pos: -17.5,6.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3337 components: - type: Transform @@ -71299,7 +69861,7 @@ entities: pos: -20.5,6.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3338 components: - type: Transform @@ -71307,7 +69869,7 @@ entities: pos: -21.5,6.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3339 components: - type: Transform @@ -71315,7 +69877,7 @@ entities: pos: -22.5,6.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3340 components: - type: Transform @@ -71323,55 +69885,7 @@ entities: pos: -23.5,6.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 3341 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -24.5,6.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 3342 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -25.5,6.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 3343 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -26.5,6.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 3345 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -27.5,7.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 3346 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -27.5,8.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 3347 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -27.5,9.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3350 components: - type: Transform @@ -71379,7 +69893,7 @@ entities: pos: -21.5,4.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3351 components: - type: Transform @@ -71387,7 +69901,7 @@ entities: pos: -21.5,5.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3352 components: - type: Transform @@ -71395,7 +69909,7 @@ entities: pos: -21.5,6.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3354 components: - type: Transform @@ -71403,7 +69917,7 @@ entities: pos: -22.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3355 components: - type: Transform @@ -71411,51 +69925,36 @@ entities: pos: -23.5,8.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 3359 - components: - - type: Transform - pos: -27.5,11.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 3361 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -26.5,12.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' + color: '#FF0000FF' - uid: 3362 components: - type: Transform pos: -23.5,10.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3363 components: - type: Transform pos: -23.5,11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3364 components: - type: Transform pos: -23.5,12.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3365 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -25.5,12.5 + rot: 3.141592653589793 rad + pos: -62.5,-61.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3366 components: - type: Transform @@ -71463,7 +69962,7 @@ entities: pos: -24.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3367 components: - type: Transform @@ -71471,7 +69970,7 @@ entities: pos: -24.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3369 components: - type: Transform @@ -71479,7 +69978,7 @@ entities: pos: -23.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3370 components: - type: Transform @@ -71487,7 +69986,7 @@ entities: pos: -23.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3371 components: - type: Transform @@ -71495,7 +69994,7 @@ entities: pos: -23.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3374 components: - type: Transform @@ -71503,7 +70002,7 @@ entities: pos: -25.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3378 components: - type: Transform @@ -71511,7 +70010,7 @@ entities: pos: -20.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3379 components: - type: Transform @@ -71519,7 +70018,7 @@ entities: pos: -19.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3380 components: - type: Transform @@ -71527,7 +70026,7 @@ entities: pos: -18.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3382 components: - type: Transform @@ -71535,7 +70034,7 @@ entities: pos: -16.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3383 components: - type: Transform @@ -71543,7 +70042,7 @@ entities: pos: -15.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3384 components: - type: Transform @@ -71551,84 +70050,84 @@ entities: pos: -14.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3385 components: - type: Transform pos: -16.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3386 components: - type: Transform pos: -16.5,8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3387 components: - type: Transform pos: -16.5,9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3389 components: - type: Transform pos: -17.5,8.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3390 components: - type: Transform pos: -17.5,9.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3391 components: - type: Transform pos: -17.5,10.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3392 components: - type: Transform pos: -17.5,11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3393 components: - type: Transform pos: -16.5,11.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3394 components: - type: Transform pos: -16.5,12.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3395 components: - type: Transform pos: -16.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3396 components: - type: Transform pos: -17.5,12.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3402 components: - type: Transform @@ -71636,7 +70135,7 @@ entities: pos: -14.5,10.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3403 components: - type: Transform @@ -71644,63 +70143,63 @@ entities: pos: -15.5,10.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3411 components: - type: Transform pos: -1.5,2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3412 components: - type: Transform pos: -1.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3413 components: - type: Transform pos: -1.5,4.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3414 components: - type: Transform pos: -1.5,5.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3415 components: - type: Transform pos: -1.5,6.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3416 components: - type: Transform pos: -3.5,4.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3417 components: - type: Transform pos: -3.5,5.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3418 components: - type: Transform pos: -3.5,6.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3425 components: - type: Transform @@ -71708,7 +70207,7 @@ entities: pos: -3.5,8.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3426 components: - type: Transform @@ -71716,7 +70215,7 @@ entities: pos: -3.5,9.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3427 components: - type: Transform @@ -71724,7 +70223,7 @@ entities: pos: -3.5,10.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3428 components: - type: Transform @@ -71732,7 +70231,7 @@ entities: pos: -3.5,11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3429 components: - type: Transform @@ -71740,7 +70239,7 @@ entities: pos: -3.5,12.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3430 components: - type: Transform @@ -71748,7 +70247,7 @@ entities: pos: -1.5,8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3431 components: - type: Transform @@ -71756,7 +70255,7 @@ entities: pos: -1.5,9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3432 components: - type: Transform @@ -71764,7 +70263,7 @@ entities: pos: -1.5,10.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3433 components: - type: Transform @@ -71772,7 +70271,7 @@ entities: pos: -1.5,11.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3434 components: - type: Transform @@ -71780,7 +70279,7 @@ entities: pos: -1.5,12.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3435 components: - type: Transform @@ -71788,7 +70287,7 @@ entities: pos: -1.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3436 components: - type: Transform @@ -71796,7 +70295,7 @@ entities: pos: -2.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3437 components: - type: Transform @@ -71804,7 +70303,7 @@ entities: pos: -1.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3438 components: - type: Transform @@ -71812,7 +70311,7 @@ entities: pos: -0.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3439 components: - type: Transform @@ -71820,7 +70319,7 @@ entities: pos: 0.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3440 components: - type: Transform @@ -71828,7 +70327,7 @@ entities: pos: 1.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3441 components: - type: Transform @@ -71836,7 +70335,7 @@ entities: pos: 2.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3443 components: - type: Transform @@ -71844,7 +70343,7 @@ entities: pos: 0.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3444 components: - type: Transform @@ -71852,7 +70351,7 @@ entities: pos: 1.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3445 components: - type: Transform @@ -71860,7 +70359,7 @@ entities: pos: 2.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3446 components: - type: Transform @@ -71868,7 +70367,7 @@ entities: pos: -2.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3447 components: - type: Transform @@ -71876,7 +70375,7 @@ entities: pos: -3.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3448 components: - type: Transform @@ -71884,7 +70383,7 @@ entities: pos: -4.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3449 components: - type: Transform @@ -71892,7 +70391,7 @@ entities: pos: -5.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3450 components: - type: Transform @@ -71900,7 +70399,7 @@ entities: pos: -6.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3451 components: - type: Transform @@ -71908,7 +70407,7 @@ entities: pos: -7.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3453 components: - type: Transform @@ -71916,7 +70415,7 @@ entities: pos: -5.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3454 components: - type: Transform @@ -71924,7 +70423,7 @@ entities: pos: -6.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3455 components: - type: Transform @@ -71932,7 +70431,7 @@ entities: pos: -7.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3456 components: - type: Transform @@ -71940,7 +70439,7 @@ entities: pos: -8.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3457 components: - type: Transform @@ -71948,7 +70447,7 @@ entities: pos: -9.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3462 components: - type: Transform @@ -71956,7 +70455,7 @@ entities: pos: -11.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3463 components: - type: Transform @@ -71964,7 +70463,7 @@ entities: pos: -10.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3464 components: - type: Transform @@ -71972,7 +70471,7 @@ entities: pos: -11.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3465 components: - type: Transform @@ -71980,7 +70479,7 @@ entities: pos: -12.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3466 components: - type: Transform @@ -71988,7 +70487,7 @@ entities: pos: -13.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3467 components: - type: Transform @@ -71996,7 +70495,7 @@ entities: pos: -14.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3468 components: - type: Transform @@ -72004,7 +70503,7 @@ entities: pos: -15.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3470 components: - type: Transform @@ -72012,7 +70511,7 @@ entities: pos: -15.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3471 components: - type: Transform @@ -72020,7 +70519,7 @@ entities: pos: -14.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3472 components: - type: Transform @@ -72028,113 +70527,141 @@ entities: pos: -13.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3473 components: - type: Transform pos: -10.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3474 components: - type: Transform pos: -10.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3475 components: - type: Transform pos: -10.5,16.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3476 components: - type: Transform pos: -9.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3477 components: - type: Transform pos: -9.5,16.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3478 components: - type: Transform pos: -9.5,17.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3487 components: - type: Transform pos: -3.5,2.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3488 components: - type: Transform pos: -3.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3489 components: - type: Transform pos: -3.5,0.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3490 components: - type: Transform pos: -1.5,0.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3491 components: - type: Transform pos: -8.5,2.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3492 components: - type: Transform pos: -8.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3493 components: - type: Transform pos: 3.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3494 components: - type: Transform pos: 3.5,2.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 4353 + color: '#FF0000FF' + - uid: 3531 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -4.5,-48.5 + pos: -13.5,-33.5 parent: 30 - type: AtmosPipeColor - color: '#03FCD3FF' + color: '#FF0000FF' + - uid: 3583 + components: + - type: Transform + pos: -13.5,-35.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 3598 + components: + - type: Transform + pos: -18.5,-47.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 4371 + components: + - type: Transform + pos: -25.5,9.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 4894 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-42.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' - uid: 4908 components: - type: Transform @@ -72142,21 +70669,21 @@ entities: pos: -26.5,-17.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 5006 components: - type: Transform pos: -19.5,33.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 5014 components: - type: Transform pos: -19.5,34.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 5418 components: - type: Transform @@ -72164,7 +70691,7 @@ entities: pos: -47.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 5427 components: - type: Transform @@ -72172,7 +70699,7 @@ entities: pos: -53.5,-8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 5428 components: - type: Transform @@ -72180,7 +70707,7 @@ entities: pos: -46.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 5494 components: - type: Transform @@ -72188,7 +70715,7 @@ entities: pos: -53.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 5625 components: - type: Transform @@ -72196,7 +70723,7 @@ entities: pos: -27.5,-17.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 5668 components: - type: Transform @@ -72204,7 +70731,7 @@ entities: pos: -30.5,-20.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 5841 components: - type: Transform @@ -72218,63 +70745,63 @@ entities: pos: -2.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6114 components: - type: Transform pos: -2.5,26.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6115 components: - type: Transform pos: -2.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6116 components: - type: Transform pos: -2.5,24.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6117 components: - type: Transform pos: -2.5,23.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6118 components: - type: Transform pos: -2.5,22.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6119 components: - type: Transform pos: -0.5,24.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6120 components: - type: Transform pos: -0.5,23.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6121 components: - type: Transform pos: -0.5,22.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6124 components: - type: Transform @@ -72282,7 +70809,7 @@ entities: pos: -14.5,28.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6125 components: - type: Transform @@ -72290,7 +70817,7 @@ entities: pos: -14.5,29.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6126 components: - type: Transform @@ -72298,7 +70825,7 @@ entities: pos: -14.5,30.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6127 components: - type: Transform @@ -72306,7 +70833,7 @@ entities: pos: -14.5,31.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6128 components: - type: Transform @@ -72314,7 +70841,7 @@ entities: pos: -14.5,32.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6129 components: - type: Transform @@ -72322,7 +70849,7 @@ entities: pos: -14.5,33.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6130 components: - type: Transform @@ -72330,7 +70857,7 @@ entities: pos: -14.5,34.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6131 components: - type: Transform @@ -72338,7 +70865,7 @@ entities: pos: -14.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6133 components: - type: Transform @@ -72346,7 +70873,7 @@ entities: pos: -14.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6134 components: - type: Transform @@ -72354,7 +70881,7 @@ entities: pos: -14.5,38.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6135 components: - type: Transform @@ -72362,7 +70889,7 @@ entities: pos: -14.5,39.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6136 components: - type: Transform @@ -72370,7 +70897,7 @@ entities: pos: -4.5,28.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6137 components: - type: Transform @@ -72378,7 +70905,7 @@ entities: pos: -4.5,29.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6138 components: - type: Transform @@ -72386,7 +70913,7 @@ entities: pos: -4.5,30.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6139 components: - type: Transform @@ -72394,7 +70921,7 @@ entities: pos: -4.5,31.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6141 components: - type: Transform @@ -72402,7 +70929,7 @@ entities: pos: -4.5,33.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6142 components: - type: Transform @@ -72410,7 +70937,7 @@ entities: pos: -4.5,34.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6143 components: - type: Transform @@ -72418,7 +70945,7 @@ entities: pos: -4.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6144 components: - type: Transform @@ -72426,7 +70953,7 @@ entities: pos: -4.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6145 components: - type: Transform @@ -72434,7 +70961,7 @@ entities: pos: -4.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6146 components: - type: Transform @@ -72442,7 +70969,7 @@ entities: pos: -4.5,38.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6147 components: - type: Transform @@ -72450,7 +70977,7 @@ entities: pos: -4.5,39.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6149 components: - type: Transform @@ -72458,7 +70985,7 @@ entities: pos: -13.5,40.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6150 components: - type: Transform @@ -72466,7 +70993,7 @@ entities: pos: -12.5,40.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6152 components: - type: Transform @@ -72474,7 +71001,7 @@ entities: pos: -10.5,40.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6154 components: - type: Transform @@ -72482,7 +71009,7 @@ entities: pos: -8.5,40.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6155 components: - type: Transform @@ -72490,7 +71017,7 @@ entities: pos: -7.5,40.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6156 components: - type: Transform @@ -72498,7 +71025,7 @@ entities: pos: -6.5,40.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6157 components: - type: Transform @@ -72506,189 +71033,189 @@ entities: pos: -5.5,40.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6159 components: - type: Transform pos: -15.5,26.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6160 components: - type: Transform pos: -15.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6161 components: - type: Transform pos: -15.5,28.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6162 components: - type: Transform pos: -15.5,29.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6163 components: - type: Transform pos: -15.5,30.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6164 components: - type: Transform pos: -15.5,31.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6165 components: - type: Transform pos: -15.5,32.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6166 components: - type: Transform pos: -15.5,33.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6167 components: - type: Transform pos: -15.5,34.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6168 components: - type: Transform pos: -15.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6169 components: - type: Transform pos: -15.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6171 components: - type: Transform pos: -15.5,38.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6173 components: - type: Transform pos: -15.5,40.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6174 components: - type: Transform pos: -3.5,26.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6175 components: - type: Transform pos: -3.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6176 components: - type: Transform pos: -3.5,28.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6177 components: - type: Transform pos: -3.5,29.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6178 components: - type: Transform pos: -3.5,30.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6180 components: - type: Transform pos: -3.5,32.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6181 components: - type: Transform pos: -3.5,33.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6182 components: - type: Transform pos: -3.5,34.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6183 components: - type: Transform pos: -3.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6184 components: - type: Transform pos: -3.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6186 components: - type: Transform pos: -3.5,38.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6187 components: - type: Transform pos: -3.5,39.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6188 components: - type: Transform pos: -3.5,40.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6189 components: - type: Transform @@ -72696,7 +71223,7 @@ entities: pos: -4.5,41.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6190 components: - type: Transform @@ -72704,7 +71231,7 @@ entities: pos: -5.5,41.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6191 components: - type: Transform @@ -72712,7 +71239,7 @@ entities: pos: -6.5,41.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6192 components: - type: Transform @@ -72720,7 +71247,7 @@ entities: pos: -8.5,42.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6194 components: - type: Transform @@ -72728,7 +71255,7 @@ entities: pos: -10.5,42.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6195 components: - type: Transform @@ -72736,7 +71263,7 @@ entities: pos: -14.5,41.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6196 components: - type: Transform @@ -72744,7 +71271,7 @@ entities: pos: -13.5,41.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6197 components: - type: Transform @@ -72752,56 +71279,56 @@ entities: pos: -12.5,41.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6206 components: - type: Transform pos: -11.5,39.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6207 components: - type: Transform pos: -11.5,38.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6208 components: - type: Transform pos: -11.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6209 components: - type: Transform pos: -7.5,40.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6210 components: - type: Transform pos: -7.5,39.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6211 components: - type: Transform pos: -7.5,38.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6212 components: - type: Transform pos: -7.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6215 components: - type: Transform @@ -72809,7 +71336,7 @@ entities: pos: -3.5,32.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6216 components: - type: Transform @@ -72817,7 +71344,7 @@ entities: pos: -2.5,32.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6217 components: - type: Transform @@ -72825,7 +71352,7 @@ entities: pos: -1.5,32.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6218 components: - type: Transform @@ -72833,7 +71360,7 @@ entities: pos: -0.5,32.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6219 components: - type: Transform @@ -72841,7 +71368,7 @@ entities: pos: -2.5,31.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6220 components: - type: Transform @@ -72849,7 +71376,7 @@ entities: pos: -1.5,31.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6221 components: - type: Transform @@ -72857,7 +71384,7 @@ entities: pos: -0.5,31.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6226 components: - type: Transform @@ -72865,7 +71392,7 @@ entities: pos: -16.5,39.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6227 components: - type: Transform @@ -72873,7 +71400,7 @@ entities: pos: -17.5,39.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6228 components: - type: Transform @@ -72881,7 +71408,7 @@ entities: pos: -18.5,39.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6230 components: - type: Transform @@ -72889,7 +71416,7 @@ entities: pos: -16.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6231 components: - type: Transform @@ -72897,7 +71424,7 @@ entities: pos: -17.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6232 components: - type: Transform @@ -72905,7 +71432,7 @@ entities: pos: -18.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6233 components: - type: Transform @@ -72913,7 +71440,7 @@ entities: pos: -19.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6235 components: - type: Transform @@ -72921,7 +71448,7 @@ entities: pos: -21.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6236 components: - type: Transform @@ -72929,7 +71456,7 @@ entities: pos: -22.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6237 components: - type: Transform @@ -72937,7 +71464,7 @@ entities: pos: -23.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6238 components: - type: Transform @@ -72945,35 +71472,35 @@ entities: pos: -24.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6241 components: - type: Transform pos: -20.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6242 components: - type: Transform pos: -20.5,34.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6243 components: - type: Transform pos: -20.5,33.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6244 components: - type: Transform pos: -20.5,32.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6247 components: - type: Transform @@ -72981,7 +71508,7 @@ entities: pos: -15.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6248 components: - type: Transform @@ -72989,7 +71516,7 @@ entities: pos: -16.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6249 components: - type: Transform @@ -72997,7 +71524,7 @@ entities: pos: -17.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6253 components: - type: Transform @@ -73005,7 +71532,7 @@ entities: pos: -20.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6256 components: - type: Transform @@ -73013,7 +71540,7 @@ entities: pos: -22.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6257 components: - type: Transform @@ -73021,7 +71548,7 @@ entities: pos: -23.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6258 components: - type: Transform @@ -73029,7 +71556,7 @@ entities: pos: -24.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6259 components: - type: Transform @@ -73037,14 +71564,14 @@ entities: pos: -25.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6263 components: - type: Transform pos: -26.5,38.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6264 components: - type: Transform @@ -73052,14 +71579,14 @@ entities: pos: -27.5,39.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6267 components: - type: Transform pos: -19.5,32.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6681 components: - type: Transform @@ -73067,7 +71594,7 @@ entities: pos: -11.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6685 components: - type: Transform @@ -73075,7 +71602,7 @@ entities: pos: -17.5,-6.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6686 components: - type: Transform @@ -73083,14 +71610,14 @@ entities: pos: -14.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6724 components: - type: Transform pos: -12.5,-8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6729 components: - type: Transform @@ -73098,7 +71625,7 @@ entities: pos: -15.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6812 components: - type: Transform @@ -73106,7 +71633,7 @@ entities: pos: -16.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6813 components: - type: Transform @@ -73114,7 +71641,7 @@ entities: pos: -17.5,-8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6814 components: - type: Transform @@ -73122,7 +71649,7 @@ entities: pos: -17.5,-7.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6816 components: - type: Transform @@ -73130,7 +71657,7 @@ entities: pos: -30.5,-8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6819 components: - type: Transform @@ -73138,7 +71665,7 @@ entities: pos: -14.5,-10.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6820 components: - type: Transform @@ -73146,7 +71673,7 @@ entities: pos: -15.5,-10.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6822 components: - type: Transform @@ -73154,7 +71681,7 @@ entities: pos: -16.5,-10.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6825 components: - type: Transform @@ -73162,7 +71689,7 @@ entities: pos: -17.5,-10.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6893 components: - type: Transform @@ -73170,7 +71697,7 @@ entities: pos: -17.5,-1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6896 components: - type: Transform @@ -73178,7 +71705,7 @@ entities: pos: -33.5,-1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6897 components: - type: Transform @@ -73186,7 +71713,7 @@ entities: pos: -18.5,0.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6898 components: - type: Transform @@ -73194,7 +71721,7 @@ entities: pos: -32.5,-1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6901 components: - type: Transform @@ -73202,7 +71729,7 @@ entities: pos: -29.5,-1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6902 components: - type: Transform @@ -73210,7 +71737,7 @@ entities: pos: -31.5,-1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6909 components: - type: Transform @@ -73218,14 +71745,14 @@ entities: pos: -30.5,-1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6910 components: - type: Transform pos: -28.5,-4.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6922 components: - type: Transform @@ -73233,7 +71760,7 @@ entities: pos: -31.5,-16.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6925 components: - type: Transform @@ -73241,7 +71768,7 @@ entities: pos: -32.5,-16.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6930 components: - type: Transform @@ -73249,42 +71776,42 @@ entities: pos: -32.5,-18.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6931 components: - type: Transform pos: -18.5,-8.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6932 components: - type: Transform pos: -18.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6937 components: - type: Transform pos: -18.5,-5.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6938 components: - type: Transform pos: -18.5,-6.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6957 components: - type: Transform pos: -18.5,-7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7004 components: - type: Transform @@ -73298,7 +71825,7 @@ entities: pos: -22.5,-10.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7059 components: - type: Transform @@ -73306,7 +71833,7 @@ entities: pos: -28.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7060 components: - type: Transform @@ -73314,7 +71841,7 @@ entities: pos: -26.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7069 components: - type: Transform @@ -73322,7 +71849,7 @@ entities: pos: -25.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7070 components: - type: Transform @@ -73330,7 +71857,7 @@ entities: pos: -27.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7073 components: - type: Transform @@ -73338,7 +71865,7 @@ entities: pos: -24.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7091 components: - type: Transform @@ -73346,25 +71873,15 @@ entities: pos: -12.5,-10.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 7101 + color: '#FF0000FF' + - uid: 7095 components: - type: Transform - pos: -11.5,-54.5 + rot: -1.5707963267948966 rad + pos: -15.5,-41.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 7103 - components: - - type: Transform - pos: -11.5,-56.5 - parent: 30 - - uid: 7105 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -2.5,-58.5 - parent: 30 + color: '#FF0000FF' - uid: 7117 components: - type: Transform @@ -73372,7 +71889,7 @@ entities: pos: -26.5,-22.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7118 components: - type: Transform @@ -73380,7 +71897,7 @@ entities: pos: -27.5,-10.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7150 components: - type: Transform @@ -73388,7 +71905,7 @@ entities: pos: -31.5,-12.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7152 components: - type: Transform @@ -73396,7 +71913,7 @@ entities: pos: -30.5,-12.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7153 components: - type: Transform @@ -73404,7 +71921,7 @@ entities: pos: -33.5,-6.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7157 components: - type: Transform @@ -73412,21 +71929,21 @@ entities: pos: -27.5,-22.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7203 components: - type: Transform pos: -34.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7205 components: - type: Transform pos: -34.5,-4.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7212 components: - type: Transform @@ -73434,7 +71951,7 @@ entities: pos: -30.5,-18.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7213 components: - type: Transform @@ -73442,38 +71959,21 @@ entities: pos: -29.5,-16.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7216 components: - type: Transform pos: -11.5,-8.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 7226 + color: '#FF0000FF' + - uid: 7223 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -5.5,-48.5 + pos: -22.5,-43.5 parent: 30 - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 7227 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -6.5,-48.5 - parent: 30 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 7229 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -10.5,-49.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7257 components: - type: Transform @@ -73481,7 +71981,7 @@ entities: pos: -18.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7303 components: - type: Transform @@ -73489,35 +71989,35 @@ entities: pos: -21.5,-10.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7306 components: - type: Transform pos: -8.5,0.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7307 components: - type: Transform pos: -8.5,-0.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7308 components: - type: Transform pos: -8.5,-1.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7309 components: - type: Transform pos: -8.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7312 components: - type: Transform @@ -73525,7 +72025,7 @@ entities: pos: -7.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7313 components: - type: Transform @@ -73533,7 +72033,7 @@ entities: pos: -6.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7314 components: - type: Transform @@ -73541,7 +72041,7 @@ entities: pos: -5.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7315 components: - type: Transform @@ -73549,42 +72049,42 @@ entities: pos: -4.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7316 components: - type: Transform pos: -3.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7317 components: - type: Transform pos: -3.5,-1.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7318 components: - type: Transform pos: -3.5,-0.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7319 components: - type: Transform pos: -1.5,-0.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7320 components: - type: Transform pos: -1.5,-1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7324 components: - type: Transform @@ -73592,7 +72092,7 @@ entities: pos: -3.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7325 components: - type: Transform @@ -73600,7 +72100,7 @@ entities: pos: -4.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7326 components: - type: Transform @@ -73608,7 +72108,7 @@ entities: pos: -5.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7327 components: - type: Transform @@ -73616,7 +72116,7 @@ entities: pos: -6.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7328 components: - type: Transform @@ -73624,7 +72124,7 @@ entities: pos: -7.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7329 components: - type: Transform @@ -73632,7 +72132,7 @@ entities: pos: -8.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7330 components: - type: Transform @@ -73640,28 +72140,28 @@ entities: pos: -9.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7331 components: - type: Transform pos: -10.5,-1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7332 components: - type: Transform pos: -10.5,-0.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7333 components: - type: Transform pos: -10.5,0.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7334 components: - type: Transform @@ -73669,7 +72169,7 @@ entities: pos: -11.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7335 components: - type: Transform @@ -73677,7 +72177,7 @@ entities: pos: -9.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7336 components: - type: Transform @@ -73685,70 +72185,70 @@ entities: pos: -10.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7341 components: - type: Transform pos: -12.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7342 components: - type: Transform pos: -12.5,-4.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7343 components: - type: Transform pos: -12.5,-5.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7344 components: - type: Transform pos: -12.5,-6.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7345 components: - type: Transform pos: -12.5,-7.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7347 components: - type: Transform pos: -11.5,-4.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7348 components: - type: Transform pos: -11.5,-6.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7349 components: - type: Transform pos: -11.5,-5.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7350 components: - type: Transform pos: -11.5,-7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7357 components: - type: Transform @@ -73756,7 +72256,7 @@ entities: pos: -10.5,-10.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7358 components: - type: Transform @@ -73764,7 +72264,7 @@ entities: pos: -9.5,-10.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7359 components: - type: Transform @@ -73772,7 +72272,7 @@ entities: pos: -8.5,-10.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7361 components: - type: Transform @@ -73780,7 +72280,7 @@ entities: pos: -10.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7362 components: - type: Transform @@ -73788,7 +72288,7 @@ entities: pos: -8.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7363 components: - type: Transform @@ -73796,7 +72296,7 @@ entities: pos: -9.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7375 components: - type: Transform @@ -73804,28 +72304,28 @@ entities: pos: -6.5,-10.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7400 components: - type: Transform pos: -19.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7401 components: - type: Transform pos: -19.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7405 components: - type: Transform pos: -17.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7406 components: - type: Transform @@ -73833,21 +72333,21 @@ entities: pos: -24.5,-10.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7409 components: - type: Transform pos: -34.5,0.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7410 components: - type: Transform pos: -34.5,-0.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7480 components: - type: Transform @@ -73861,7 +72361,7 @@ entities: pos: -20.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7495 components: - type: Transform @@ -73869,7 +72369,7 @@ entities: pos: -21.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7505 components: - type: Transform @@ -73877,14 +72377,14 @@ entities: pos: -25.5,-10.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7526 components: - type: Transform pos: -34.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7531 components: - type: Transform @@ -73892,7 +72392,7 @@ entities: pos: -16.5,-15.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7551 components: - type: Transform @@ -73900,7 +72400,7 @@ entities: pos: -26.5,-10.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7566 components: - type: Transform @@ -73908,7 +72408,7 @@ entities: pos: -19.5,-15.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7568 components: - type: Transform @@ -73916,7 +72416,7 @@ entities: pos: -21.5,-15.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7570 components: - type: Transform @@ -73924,7 +72424,7 @@ entities: pos: -20.5,-18.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7573 components: - type: Transform @@ -73932,7 +72432,7 @@ entities: pos: -22.5,-12.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7599 components: - type: Transform @@ -73940,7 +72440,7 @@ entities: pos: -22.5,-17.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7604 components: - type: Transform @@ -73948,7 +72448,7 @@ entities: pos: -27.5,-16.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7661 components: - type: Transform @@ -73956,7 +72456,7 @@ entities: pos: -19.5,-5.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7662 components: - type: Transform @@ -73964,7 +72464,7 @@ entities: pos: -30.5,-18.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7664 components: - type: Transform @@ -73972,7 +72472,7 @@ entities: pos: -30.5,-19.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7665 components: - type: Transform @@ -73980,7 +72480,7 @@ entities: pos: -28.5,-22.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7668 components: - type: Transform @@ -73988,31 +72488,7 @@ entities: pos: -30.5,-17.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 7669 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,-49.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 7670 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -12.5,-50.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 7671 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -12.5,-52.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' + color: '#0000FFFF' - uid: 7755 components: - type: Transform @@ -74020,7 +72496,7 @@ entities: pos: -29.5,-21.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7756 components: - type: Transform @@ -74028,7 +72504,7 @@ entities: pos: -29.5,-19.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7761 components: - type: Transform @@ -74036,7 +72512,7 @@ entities: pos: -26.5,-21.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7763 components: - type: Transform @@ -74044,7 +72520,7 @@ entities: pos: -29.5,-20.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7764 components: - type: Transform @@ -74052,7 +72528,7 @@ entities: pos: -28.5,-16.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7816 components: - type: Transform @@ -74060,7 +72536,7 @@ entities: pos: -29.5,-21.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7817 components: - type: Transform @@ -74068,7 +72544,7 @@ entities: pos: -26.5,-16.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7818 components: - type: Transform @@ -74076,7 +72552,7 @@ entities: pos: -27.5,-21.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7821 components: - type: Transform @@ -74084,7 +72560,7 @@ entities: pos: -32.5,-6.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7832 components: - type: Transform @@ -74092,7 +72568,7 @@ entities: pos: -17.5,-4.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7884 components: - type: Transform @@ -74100,15 +72576,7 @@ entities: pos: -31.5,-6.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 7914 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -9.5,-51.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' + color: '#0000FFFF' - uid: 7925 components: - type: Transform @@ -74116,7 +72584,7 @@ entities: pos: -18.5,-20.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7928 components: - type: Transform @@ -74124,7 +72592,7 @@ entities: pos: -19.5,-20.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7929 components: - type: Transform @@ -74132,21 +72600,21 @@ entities: pos: -13.5,-11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7950 components: - type: Transform pos: -28.5,-11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7951 components: - type: Transform pos: -28.5,-8.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7958 components: - type: Transform @@ -74154,7 +72622,7 @@ entities: pos: -22.5,-18.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7999 components: - type: Transform @@ -74162,7 +72630,7 @@ entities: pos: -20.5,-16.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8029 components: - type: Transform @@ -74170,7 +72638,7 @@ entities: pos: -22.5,-10.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8030 components: - type: Transform @@ -74178,7 +72646,7 @@ entities: pos: -22.5,-13.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8031 components: - type: Transform @@ -74186,7 +72654,7 @@ entities: pos: -22.5,-11.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8032 components: - type: Transform @@ -74194,7 +72662,7 @@ entities: pos: -22.5,-14.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8037 components: - type: Transform @@ -74202,7 +72670,7 @@ entities: pos: -22.5,-19.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8041 components: - type: Transform @@ -74210,7 +72678,7 @@ entities: pos: -20.5,-15.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8042 components: - type: Transform @@ -74218,7 +72686,7 @@ entities: pos: -17.5,-15.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8049 components: - type: Transform @@ -74226,7 +72694,7 @@ entities: pos: -27.5,-5.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8050 components: - type: Transform @@ -74234,7 +72702,7 @@ entities: pos: -29.5,-13.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8057 components: - type: Transform @@ -74242,28 +72710,28 @@ entities: pos: -20.5,-12.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8060 components: - type: Transform pos: -28.5,-6.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8061 components: - type: Transform pos: -11.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8065 components: - type: Transform pos: -28.5,-7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8066 components: - type: Transform @@ -74271,7 +72739,7 @@ entities: pos: -20.5,-21.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8067 components: - type: Transform @@ -74279,7 +72747,7 @@ entities: pos: -18.5,-15.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8068 components: - type: Transform @@ -74287,7 +72755,7 @@ entities: pos: -20.5,-19.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8072 components: - type: Transform @@ -74295,14 +72763,14 @@ entities: pos: -22.5,-17.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8077 components: - type: Transform pos: -28.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8088 components: - type: Transform @@ -74310,7 +72778,7 @@ entities: pos: -20.5,-14.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8091 components: - type: Transform @@ -74318,14 +72786,14 @@ entities: pos: -22.5,-20.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8094 components: - type: Transform pos: -13.5,-18.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8095 components: - type: Transform @@ -74333,7 +72801,7 @@ entities: pos: -15.5,-15.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8097 components: - type: Transform @@ -74341,14 +72809,14 @@ entities: pos: -24.5,-16.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8098 components: - type: Transform pos: -13.5,-19.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8099 components: - type: Transform @@ -74356,7 +72824,7 @@ entities: pos: -21.5,-22.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8105 components: - type: Transform @@ -74364,7 +72832,7 @@ entities: pos: -23.5,-17.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8106 components: - type: Transform @@ -74372,7 +72840,7 @@ entities: pos: -20.5,-15.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8141 components: - type: Transform @@ -74380,7 +72848,7 @@ entities: pos: -20.5,-11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8142 components: - type: Transform @@ -74388,7 +72856,7 @@ entities: pos: -20.5,-13.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8213 components: - type: Transform @@ -74396,7 +72864,7 @@ entities: pos: -26.5,-5.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8214 components: - type: Transform @@ -74404,7 +72872,7 @@ entities: pos: -25.5,-5.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8217 components: - type: Transform @@ -74412,7 +72880,7 @@ entities: pos: -20.5,-5.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8218 components: - type: Transform @@ -74420,7 +72888,7 @@ entities: pos: -21.5,-5.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8221 components: - type: Transform @@ -74428,7 +72896,7 @@ entities: pos: -24.5,-4.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8222 components: - type: Transform @@ -74436,7 +72904,61 @@ entities: pos: -22.5,-4.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' + - uid: 8264 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -17.5,-41.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 8269 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,-41.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 8359 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -18.5,-41.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 8361 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -12.5,-40.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 8384 + components: + - type: Transform + pos: -13.5,-43.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 8393 + components: + - type: Transform + pos: -13.5,-42.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 8422 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -11.5,-40.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' - uid: 8543 components: - type: Transform @@ -74450,7 +72972,7 @@ entities: pos: -33.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8575 components: - type: Transform @@ -74800,7 +73322,7 @@ entities: pos: 9.5,-23.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8778 components: - type: Transform @@ -74808,7 +73330,7 @@ entities: pos: 11.5,-24.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8780 components: - type: Transform @@ -74816,7 +73338,7 @@ entities: pos: 12.5,-23.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8782 components: - type: Transform @@ -74824,7 +73346,7 @@ entities: pos: 14.5,-23.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8783 components: - type: Transform @@ -74832,7 +73354,7 @@ entities: pos: 15.5,-23.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8785 components: - type: Transform @@ -74840,7 +73362,7 @@ entities: pos: 16.5,-22.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8787 components: - type: Transform @@ -74848,7 +73370,7 @@ entities: pos: 17.5,-21.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8788 components: - type: Transform @@ -74856,7 +73378,7 @@ entities: pos: 18.5,-21.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8789 components: - type: Transform @@ -74864,46 +73386,7 @@ entities: pos: 19.5,-21.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 8794 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,-39.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 8795 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,-53.5 - parent: 30 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 8798 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,-53.5 - parent: 30 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 8799 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,-49.5 - parent: 30 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 8807 - components: - - type: Transform - pos: -9.5,-54.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8839 components: - type: Transform @@ -74911,7 +73394,7 @@ entities: pos: 14.5,-24.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8840 components: - type: Transform @@ -74919,7 +73402,7 @@ entities: pos: 13.5,-24.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8841 components: - type: Transform @@ -74927,7 +73410,7 @@ entities: pos: 13.5,-23.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8842 components: - type: Transform @@ -74935,7 +73418,7 @@ entities: pos: 15.5,-24.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8843 components: - type: Transform @@ -74943,7 +73426,7 @@ entities: pos: 12.5,-24.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8844 components: - type: Transform @@ -74951,7 +73434,7 @@ entities: pos: 10.5,-23.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8846 components: - type: Transform @@ -74959,7 +73442,7 @@ entities: pos: 9.5,-24.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8854 components: - type: Transform @@ -74967,7 +73450,7 @@ entities: pos: -1.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8855 components: - type: Transform @@ -74975,7 +73458,7 @@ entities: pos: -0.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8856 components: - type: Transform @@ -74983,7 +73466,7 @@ entities: pos: 0.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8857 components: - type: Transform @@ -74991,7 +73474,7 @@ entities: pos: 1.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8858 components: - type: Transform @@ -74999,7 +73482,7 @@ entities: pos: 2.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8859 components: - type: Transform @@ -75007,7 +73490,7 @@ entities: pos: 3.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8860 components: - type: Transform @@ -75015,7 +73498,7 @@ entities: pos: 3.5,-1.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8861 components: - type: Transform @@ -75023,7 +73506,7 @@ entities: pos: 3.5,-0.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8862 components: - type: Transform @@ -75031,7 +73514,7 @@ entities: pos: 3.5,0.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8864 components: - type: Transform @@ -75039,7 +73522,7 @@ entities: pos: 4.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8865 components: - type: Transform @@ -75047,21 +73530,21 @@ entities: pos: 5.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8867 components: - type: Transform pos: 7.5,-4.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8873 components: - type: Transform pos: 7.5,-25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8874 components: - type: Transform @@ -75069,14 +73552,14 @@ entities: pos: 8.5,-23.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8875 components: - type: Transform pos: 7.5,-22.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8878 components: - type: Transform @@ -75084,7 +73567,7 @@ entities: pos: 5.5,-20.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8879 components: - type: Transform @@ -75092,7 +73575,7 @@ entities: pos: 8.5,-18.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8880 components: - type: Transform @@ -75100,7 +73583,7 @@ entities: pos: 9.5,-18.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8881 components: - type: Transform @@ -75108,7 +73591,7 @@ entities: pos: 10.5,-18.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8882 components: - type: Transform @@ -75116,7 +73599,7 @@ entities: pos: 11.5,-17.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8883 components: - type: Transform @@ -75124,7 +73607,7 @@ entities: pos: 11.5,-16.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8885 components: - type: Transform @@ -75132,7 +73615,7 @@ entities: pos: 11.5,-14.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8886 components: - type: Transform @@ -75140,7 +73623,7 @@ entities: pos: 11.5,-13.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8887 components: - type: Transform @@ -75148,7 +73631,7 @@ entities: pos: 11.5,-12.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8888 components: - type: Transform @@ -75156,7 +73639,7 @@ entities: pos: 10.5,-11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8889 components: - type: Transform @@ -75164,7 +73647,7 @@ entities: pos: 9.5,-11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8890 components: - type: Transform @@ -75172,42 +73655,42 @@ entities: pos: 8.5,-11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8891 components: - type: Transform pos: 7.5,-10.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8892 components: - type: Transform pos: 7.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8894 components: - type: Transform pos: 7.5,-7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8895 components: - type: Transform pos: 7.5,-6.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8896 components: - type: Transform pos: 7.5,-5.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8897 components: - type: Transform @@ -75215,7 +73698,7 @@ entities: pos: 11.5,-10.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8898 components: - type: Transform @@ -75223,7 +73706,7 @@ entities: pos: 11.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8899 components: - type: Transform @@ -75231,7 +73714,7 @@ entities: pos: 11.5,-8.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8900 components: - type: Transform @@ -75239,7 +73722,7 @@ entities: pos: 11.5,-7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8902 components: - type: Transform @@ -75247,7 +73730,7 @@ entities: pos: 11.5,-5.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8904 components: - type: Transform @@ -75255,7 +73738,7 @@ entities: pos: 11.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8905 components: - type: Transform @@ -75263,7 +73746,7 @@ entities: pos: 11.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8906 components: - type: Transform @@ -75271,7 +73754,7 @@ entities: pos: 11.5,-1.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8907 components: - type: Transform @@ -75279,7 +73762,7 @@ entities: pos: 11.5,-0.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8908 components: - type: Transform @@ -75287,7 +73770,7 @@ entities: pos: 11.5,0.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8909 components: - type: Transform @@ -75295,7 +73778,7 @@ entities: pos: 11.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8910 components: - type: Transform @@ -75303,7 +73786,7 @@ entities: pos: 11.5,2.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8913 components: - type: Transform @@ -75311,7 +73794,7 @@ entities: pos: 10.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8914 components: - type: Transform @@ -75319,7 +73802,7 @@ entities: pos: -0.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8915 components: - type: Transform @@ -75327,7 +73810,7 @@ entities: pos: 0.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8916 components: - type: Transform @@ -75335,7 +73818,7 @@ entities: pos: 1.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8917 components: - type: Transform @@ -75343,7 +73826,7 @@ entities: pos: 2.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8918 components: - type: Transform @@ -75351,7 +73834,7 @@ entities: pos: 3.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8921 components: - type: Transform @@ -75359,7 +73842,7 @@ entities: pos: 6.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8922 components: - type: Transform @@ -75367,7 +73850,7 @@ entities: pos: 7.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8923 components: - type: Transform @@ -75375,7 +73858,7 @@ entities: pos: 8.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8924 components: - type: Transform @@ -75383,7 +73866,7 @@ entities: pos: 5.5,-1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8925 components: - type: Transform @@ -75391,7 +73874,7 @@ entities: pos: 5.5,-0.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8926 components: - type: Transform @@ -75399,7 +73882,7 @@ entities: pos: 5.5,0.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8927 components: - type: Transform @@ -75407,7 +73890,7 @@ entities: pos: 8.5,-24.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8928 components: - type: Transform @@ -75415,7 +73898,7 @@ entities: pos: 5.5,-27.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8929 components: - type: Transform @@ -75423,14 +73906,14 @@ entities: pos: 4.5,-27.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8930 components: - type: Transform pos: 7.5,-26.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8931 components: - type: Transform @@ -75438,7 +73921,7 @@ entities: pos: 3.5,-27.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8932 components: - type: Transform @@ -75446,7 +73929,7 @@ entities: pos: 5.5,-22.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8933 components: - type: Transform @@ -75464,7 +73947,7 @@ entities: pos: 7.5,-23.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8935 components: - type: Transform @@ -75472,7 +73955,7 @@ entities: pos: 6.5,-18.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8937 components: - type: Transform @@ -75480,7 +73963,7 @@ entities: pos: 6.5,-20.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8938 components: - type: Transform @@ -75488,7 +73971,7 @@ entities: pos: 8.5,-20.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8941 components: - type: Transform @@ -75496,7 +73979,7 @@ entities: pos: 10.5,-20.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8942 components: - type: Transform @@ -75504,7 +73987,7 @@ entities: pos: 11.5,-20.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8943 components: - type: Transform @@ -75512,7 +73995,7 @@ entities: pos: 12.5,-20.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8945 components: - type: Transform @@ -75520,7 +74003,7 @@ entities: pos: 13.5,-19.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8946 components: - type: Transform @@ -75528,7 +74011,7 @@ entities: pos: 13.5,-18.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8948 components: - type: Transform @@ -75536,7 +74019,7 @@ entities: pos: 13.5,-16.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8949 components: - type: Transform @@ -75544,7 +74027,7 @@ entities: pos: 13.5,-15.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8950 components: - type: Transform @@ -75552,7 +74035,7 @@ entities: pos: 13.5,-14.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8951 components: - type: Transform @@ -75560,7 +74043,7 @@ entities: pos: 13.5,-13.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8952 components: - type: Transform @@ -75568,7 +74051,7 @@ entities: pos: 13.5,-12.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8953 components: - type: Transform @@ -75576,7 +74059,7 @@ entities: pos: 13.5,-11.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8954 components: - type: Transform @@ -75584,7 +74067,7 @@ entities: pos: 13.5,-10.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8956 components: - type: Transform @@ -75592,7 +74075,7 @@ entities: pos: 13.5,-8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8958 components: - type: Transform @@ -75600,7 +74083,7 @@ entities: pos: 13.5,-6.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8959 components: - type: Transform @@ -75608,7 +74091,7 @@ entities: pos: 13.5,-5.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8961 components: - type: Transform @@ -75616,7 +74099,7 @@ entities: pos: 13.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8962 components: - type: Transform @@ -75624,7 +74107,7 @@ entities: pos: 13.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8963 components: - type: Transform @@ -75632,7 +74115,7 @@ entities: pos: 13.5,-1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8964 components: - type: Transform @@ -75640,7 +74123,7 @@ entities: pos: 13.5,-0.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8965 components: - type: Transform @@ -75648,7 +74131,7 @@ entities: pos: 13.5,0.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8967 components: - type: Transform @@ -75656,7 +74139,7 @@ entities: pos: 11.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8969 components: - type: Transform @@ -75664,7 +74147,7 @@ entities: pos: 12.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8970 components: - type: Transform @@ -75672,7 +74155,7 @@ entities: pos: 11.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8971 components: - type: Transform @@ -75680,7 +74163,7 @@ entities: pos: 10.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8972 components: - type: Transform @@ -75688,7 +74171,7 @@ entities: pos: 9.5,-8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8973 components: - type: Transform @@ -75696,7 +74179,7 @@ entities: pos: 9.5,-7.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8974 components: - type: Transform @@ -75704,7 +74187,7 @@ entities: pos: 9.5,-6.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8975 components: - type: Transform @@ -75712,7 +74195,7 @@ entities: pos: 9.5,-5.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8976 components: - type: Transform @@ -75720,7 +74203,7 @@ entities: pos: 9.5,-4.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8977 components: - type: Transform @@ -75728,7 +74211,7 @@ entities: pos: 9.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 9015 components: - type: Transform @@ -75778,7 +74261,7 @@ entities: pos: -22.5,-22.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 9036 components: - type: Transform @@ -75786,7 +74269,7 @@ entities: pos: -29.5,-14.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 9039 components: - type: Transform @@ -75794,21 +74277,21 @@ entities: pos: -29.5,-15.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 9050 components: - type: Transform pos: -13.5,-16.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 9052 components: - type: Transform pos: -13.5,-17.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 9053 components: - type: Transform @@ -75816,23 +74299,7 @@ entities: pos: -14.5,-15.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 9062 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -2.5,-49.5 - parent: 30 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 9065 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -10.5,-53.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' + color: '#0000FFFF' - uid: 9075 components: - type: Transform @@ -75840,13 +74307,71 @@ entities: parent: 30 - type: AtmosPipeColor color: '#EB9834FF' + - uid: 9174 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,-48.5 + parent: 30 + - type: AtmosPipeColor + color: '#EB9834FF' + - uid: 9182 + components: + - type: Transform + pos: 1.5,-54.5 + parent: 30 + - uid: 9213 + components: + - type: Transform + pos: -3.5,-54.5 + parent: 30 + - uid: 9216 + components: + - type: Transform + pos: -4.5,-54.5 + parent: 30 + - uid: 9217 + components: + - type: Transform + pos: 2.5,-54.5 + parent: 30 + - uid: 9218 + components: + - type: Transform + pos: 3.5,-54.5 + parent: 30 - uid: 9261 components: - type: Transform pos: 7.5,-21.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' + - uid: 9293 + components: + - type: Transform + pos: -2.5,-54.5 + parent: 30 + - uid: 9294 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,-49.5 + parent: 30 + - uid: 9295 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,-50.5 + parent: 30 + - uid: 9320 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,-48.5 + parent: 30 + - type: AtmosPipeColor + color: '#EB9834FF' - uid: 9341 components: - type: Transform @@ -75854,31 +74379,175 @@ entities: pos: -49.5,-8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 9623 + color: '#0000FFFF' + - uid: 9416 + components: + - type: Transform + pos: -24.5,-44.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 9417 + components: + - type: Transform + pos: -24.5,-45.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 9424 + components: + - type: Transform + pos: -18.5,-49.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 9425 + components: + - type: Transform + pos: -18.5,-45.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 9426 + components: + - type: Transform + pos: -18.5,-46.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 9431 + components: + - type: Transform + pos: -12.5,-42.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 9432 + components: + - type: Transform + pos: -24.5,-46.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 9433 + components: + - type: Transform + pos: -22.5,-42.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 9435 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -9.5,-45.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 9445 components: - type: Transform rot: -1.5707963267948966 rad - pos: -0.5,-39.5 + pos: -14.5,-30.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9659 + color: '#FF0000FF' + - uid: 9447 + components: + - type: Transform + pos: -13.5,-36.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 9449 + components: + - type: Transform + pos: -13.5,-37.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 9450 + components: + - type: Transform + pos: -13.5,-38.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 9564 + components: + - type: Transform + pos: -22.5,-44.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 9565 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -19.5,-41.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 9566 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -20.5,-41.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 9589 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,-38.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 9590 components: - type: Transform rot: 1.5707963267948966 rad - pos: -4.5,-52.5 + pos: -7.5,-39.5 parent: 30 - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 9660 + color: '#0000FFFF' + - uid: 9608 components: - type: Transform rot: 1.5707963267948966 rad - pos: -3.5,-52.5 + pos: -8.5,-39.5 parent: 30 - type: AtmosPipeColor - color: '#03FCD3FF' + color: '#0000FFFF' + - uid: 9638 + components: + - type: Transform + pos: 2.5,-37.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 9639 + components: + - type: Transform + pos: 2.5,-38.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 9640 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-39.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 9651 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,-51.5 + parent: 30 - uid: 9670 components: - type: Transform @@ -75886,7 +74555,15 @@ entities: pos: -29.5,-16.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' + - uid: 9683 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,-47.5 + parent: 30 + - type: AtmosPipeColor + color: '#EB9834FF' - uid: 9685 components: - type: Transform @@ -75894,7 +74571,7 @@ entities: pos: -23.5,-16.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 9687 components: - type: Transform @@ -75902,7 +74579,7 @@ entities: pos: -24.5,-17.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 9688 components: - type: Transform @@ -75910,15 +74587,15 @@ entities: pos: -24.5,-21.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 9702 + color: '#0000FFFF' + - uid: 9701 components: - type: Transform - rot: 3.141592653589793 rad - pos: -5.5,-51.5 + rot: 1.5707963267948966 rad + pos: 7.5,-42.5 parent: 30 - type: AtmosPipeColor - color: '#03FCD3FF' + color: '#EB9834FF' - uid: 9729 components: - type: Transform @@ -75926,7 +74603,7 @@ entities: pos: 3.5,-18.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 9730 components: - type: Transform @@ -75934,7 +74611,7 @@ entities: pos: 2.5,-18.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 9731 components: - type: Transform @@ -75942,7 +74619,7 @@ entities: pos: 1.5,-18.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 9732 components: - type: Transform @@ -75950,7 +74627,7 @@ entities: pos: 0.5,-18.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 9733 components: - type: Transform @@ -75958,7 +74635,7 @@ entities: pos: -0.5,-18.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 9734 components: - type: Transform @@ -75966,7 +74643,7 @@ entities: pos: -1.5,-18.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 9735 components: - type: Transform @@ -75974,70 +74651,70 @@ entities: pos: -2.5,-18.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 9736 components: - type: Transform pos: -3.5,-19.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 9737 components: - type: Transform pos: -3.5,-20.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 9738 components: - type: Transform pos: -3.5,-21.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 9739 components: - type: Transform pos: -3.5,-22.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 9740 components: - type: Transform pos: -3.5,-23.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 9741 components: - type: Transform pos: -3.5,-24.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 9742 components: - type: Transform pos: -3.5,-25.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 9743 components: - type: Transform pos: -3.5,-26.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 9745 components: - type: Transform pos: -3.5,-28.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 9747 components: - type: Transform @@ -76045,7 +74722,7 @@ entities: pos: -2.5,-30.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 9748 components: - type: Transform @@ -76053,7 +74730,7 @@ entities: pos: -1.5,-30.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 9749 components: - type: Transform @@ -76061,7 +74738,7 @@ entities: pos: -0.5,-30.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 9755 components: - type: Transform @@ -76069,7 +74746,7 @@ entities: pos: -1.5,-25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 9756 components: - type: Transform @@ -76077,7 +74754,7 @@ entities: pos: -1.5,-24.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 9757 components: - type: Transform @@ -76085,7 +74762,7 @@ entities: pos: -1.5,-23.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 9758 components: - type: Transform @@ -76093,7 +74770,7 @@ entities: pos: -1.5,-22.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 9759 components: - type: Transform @@ -76101,7 +74778,7 @@ entities: pos: -1.5,-21.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 9760 components: - type: Transform @@ -76109,7 +74786,7 @@ entities: pos: -0.5,-20.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 9761 components: - type: Transform @@ -76117,7 +74794,7 @@ entities: pos: 0.5,-20.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 9762 components: - type: Transform @@ -76125,7 +74802,7 @@ entities: pos: 1.5,-20.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 9764 components: - type: Transform @@ -76133,7 +74810,7 @@ entities: pos: 3.5,-20.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 9765 components: - type: Transform @@ -76141,7 +74818,7 @@ entities: pos: 4.5,-20.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 9766 components: - type: Transform @@ -76149,7 +74826,7 @@ entities: pos: -0.5,-27.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 9767 components: - type: Transform @@ -76157,7 +74834,7 @@ entities: pos: 0.5,-27.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 9768 components: - type: Transform @@ -76165,139 +74842,138 @@ entities: pos: 1.5,-27.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 9771 components: - type: Transform pos: 2.5,-28.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 9772 components: - type: Transform pos: 2.5,-29.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 9773 components: - type: Transform pos: 2.5,-30.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 9775 components: - type: Transform pos: 2.5,-31.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 9776 components: - type: Transform pos: 0.5,-31.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 9777 components: - type: Transform pos: 0.5,-32.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 9778 components: - type: Transform pos: 0.5,-33.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 9780 components: - type: Transform pos: 0.5,-35.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 9781 components: - type: Transform pos: 0.5,-36.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9782 - components: - - type: Transform - pos: 0.5,-37.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9783 - components: - - type: Transform - pos: 0.5,-38.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 9784 components: - type: Transform pos: 2.5,-33.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 9785 components: - type: Transform pos: 2.5,-34.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 9786 components: - type: Transform pos: 2.5,-35.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 9787 components: - type: Transform pos: 2.5,-36.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 9788 components: - type: Transform - pos: 2.5,-37.5 + rot: 3.141592653589793 rad + pos: 8.5,-44.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 9789 + color: '#EB9834FF' + - uid: 9794 components: - type: Transform - pos: 2.5,-38.5 + rot: 3.141592653589793 rad + pos: 2.5,-40.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 9790 + color: '#0000FFFF' + - uid: 9795 components: - type: Transform - pos: 2.5,-39.5 + rot: 3.141592653589793 rad + pos: 2.5,-41.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 9806 components: - type: Transform rot: 3.141592653589793 rad - pos: -2.5,-57.5 + pos: 2.5,-42.5 parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 9807 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,-38.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' - uid: 9810 components: - type: Transform @@ -76305,14 +74981,14 @@ entities: pos: -54.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 9834 components: - type: Transform pos: -34.5,-5.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 9853 components: - type: Transform @@ -76320,7 +74996,7 @@ entities: pos: -23.5,-21.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 9860 components: - type: Transform @@ -76328,7 +75004,7 @@ entities: pos: -23.5,-22.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 9861 components: - type: Transform @@ -76336,15 +75012,7 @@ entities: pos: -24.5,-22.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9863 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,-53.5 - parent: 30 - - type: AtmosPipeColor - color: '#03FCD3FF' + color: '#FF0000FF' - uid: 9865 components: - type: Transform @@ -76352,215 +75020,129 @@ entities: pos: -18.5,-5.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 9868 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 2.5,-53.5 - parent: 30 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 9871 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,-49.5 - parent: 30 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 9872 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,-49.5 - parent: 30 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 9873 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,-49.5 - parent: 30 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 9874 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,-49.5 - parent: 30 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 9875 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 3.5,-52.5 - parent: 30 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 9877 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 3.5,-50.5 - parent: 30 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 9878 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,-54.5 - parent: 30 - - type: AtmosPipeColor - color: '#EB9834FF' - - uid: 9879 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 0.5,-54.5 - parent: 30 - - type: AtmosPipeColor - color: '#EB9834FF' - - uid: 9880 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,-54.5 - parent: 30 - - type: AtmosPipeColor - color: '#EB9834FF' - - uid: 9881 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 2.5,-54.5 - parent: 30 - - type: AtmosPipeColor - color: '#EB9834FF' - - uid: 9882 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 3.5,-54.5 - parent: 30 - - type: AtmosPipeColor - color: '#EB9834FF' - - uid: 9884 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,-53.5 - parent: 30 - - type: AtmosPipeColor - color: '#EB9834FF' - - uid: 9885 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,-52.5 - parent: 30 - - type: AtmosPipeColor - color: '#EB9834FF' + color: '#0000FFFF' - uid: 9886 components: - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,-51.5 + pos: -22.5,-46.5 parent: 30 - type: AtmosPipeColor - color: '#EB9834FF' + color: '#FF0000FF' - uid: 9887 components: - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,-50.5 + rot: -1.5707963267948966 rad + pos: -0.5,-39.5 parent: 30 - type: AtmosPipeColor - color: '#EB9834FF' - - uid: 9888 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,-49.5 - parent: 30 - - type: AtmosPipeColor - color: '#EB9834FF' - - uid: 9889 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,-48.5 - parent: 30 - - type: AtmosPipeColor - color: '#EB9834FF' - - uid: 9890 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 4.5,-47.5 - parent: 30 - - type: AtmosPipeColor - color: '#EB9834FF' - - uid: 9891 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 5.5,-45.5 - parent: 30 - - type: AtmosPipeColor - color: '#EB9834FF' - - uid: 9892 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 5.5,-44.5 - parent: 30 - - type: AtmosPipeColor - color: '#EB9834FF' + color: '#0000FFFF' - uid: 9893 components: - type: Transform - rot: 3.141592653589793 rad - pos: 5.5,-43.5 + rot: 1.5707963267948966 rad + pos: -15.5,-29.5 parent: 30 - type: AtmosPipeColor - color: '#EB9834FF' - - uid: 9894 + color: '#0000FFFF' + - uid: 9900 components: - type: Transform - rot: 3.141592653589793 rad - pos: 5.5,-42.5 + rot: 1.5707963267948966 rad + pos: -10.5,-39.5 parent: 30 - type: AtmosPipeColor - color: '#EB9834FF' - - uid: 9895 + color: '#0000FFFF' + - uid: 9901 components: - type: Transform - rot: 3.141592653589793 rad - pos: 5.5,-41.5 + rot: 1.5707963267948966 rad + pos: -9.5,-39.5 parent: 30 - type: AtmosPipeColor - color: '#EB9834FF' - - uid: 9896 + color: '#0000FFFF' + - uid: 9904 components: - type: Transform - rot: 3.141592653589793 rad - pos: 5.5,-40.5 + rot: -1.5707963267948966 rad + pos: -4.5,-39.5 parent: 30 - type: AtmosPipeColor - color: '#EB9834FF' - - uid: 9897 + color: '#0000FFFF' + - uid: 9906 components: - type: Transform - rot: 3.141592653589793 rad - pos: 5.5,-39.5 + rot: -1.5707963267948966 rad + pos: -3.5,-39.5 parent: 30 - type: AtmosPipeColor - color: '#EB9834FF' + color: '#0000FFFF' + - uid: 9907 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,-39.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 9920 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -13.5,-29.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 9921 + components: + - type: Transform + pos: -11.5,-30.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 9922 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -12.5,-29.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 9923 + components: + - type: Transform + pos: -11.5,-32.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 9924 + components: + - type: Transform + pos: -11.5,-33.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 9925 + components: + - type: Transform + pos: -11.5,-36.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 9936 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-39.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 9979 + components: + - type: Transform + pos: -22.5,-45.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' - uid: 9980 components: - type: Transform @@ -76578,508 +75160,520 @@ entities: pos: 5.5,-21.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 9984 components: - type: Transform pos: 5.5,-19.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' + - uid: 9988 + components: + - type: Transform + pos: -16.5,-43.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 10019 + components: + - type: Transform + pos: -11.5,-34.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 10020 + components: + - type: Transform + pos: -11.5,-37.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 10021 + components: + - type: Transform + pos: -11.5,-38.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' - uid: 10091 components: - type: Transform pos: 5.5,-20.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11072 + color: '#FF0000FF' + - uid: 10120 + components: + - type: Transform + pos: -18.5,-44.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 10128 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 8.5,-45.5 + parent: 30 + - type: AtmosPipeColor + color: '#EB9834FF' + - uid: 10129 + components: + - type: Transform + pos: 6.5,-38.5 + parent: 30 + - type: AtmosPipeColor + color: '#EB9834FF' + - uid: 10130 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-39.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 10131 components: - type: Transform rot: -1.5707963267948966 rad pos: -2.5,-39.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11074 + color: '#0000FFFF' + - uid: 10132 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -4.5,-39.5 + rot: 1.5707963267948966 rad + pos: -22.5,-43.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11075 + color: '#0000FFFF' + - uid: 10133 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -5.5,-39.5 + rot: 1.5707963267948966 rad + pos: -14.5,-29.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11076 + color: '#0000FFFF' + - uid: 10167 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -6.5,-39.5 + rot: 3.141592653589793 rad + pos: 0.5,-37.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11077 + color: '#FF0000FF' + - uid: 10171 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -7.5,-39.5 + pos: -16.5,-48.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11079 + color: '#FF0000FF' + - uid: 10172 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -9.5,-39.5 + pos: -16.5,-47.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11081 + color: '#FF0000FF' + - uid: 10173 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -10.5,-39.5 + pos: -16.5,-45.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11082 + color: '#FF0000FF' + - uid: 10174 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -12.5,-39.5 + pos: -16.5,-44.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11083 + color: '#FF0000FF' + - uid: 10175 + components: + - type: Transform + pos: -18.5,-50.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 10212 + components: + - type: Transform + pos: 6.5,-40.5 + parent: 30 + - type: AtmosPipeColor + color: '#EB9834FF' + - uid: 10213 + components: + - type: Transform + pos: 6.5,-41.5 + parent: 30 + - type: AtmosPipeColor + color: '#EB9834FF' + - uid: 10215 components: - type: Transform rot: -1.5707963267948966 rad + pos: -2.5,-40.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 10216 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -9.5,-43.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 10217 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -19.5,-43.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 10218 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -14.5,-43.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 10219 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -17.5,-43.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 10220 + components: + - type: Transform + pos: -12.5,-41.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 10262 + components: + - type: Transform + pos: -13.5,-32.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 10263 + components: + - type: Transform + pos: -12.5,-44.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 10264 + components: + - type: Transform + pos: -12.5,-45.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 10267 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -12.5,-44.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 10272 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.5,-43.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 10273 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -11.5,-43.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 10275 + components: + - type: Transform + pos: -18.5,-51.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 10276 + components: + - type: Transform + pos: -16.5,-51.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 10277 + components: + - type: Transform + pos: -16.5,-50.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 10278 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-40.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 10280 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-38.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 10281 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,-40.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 10282 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -13.5,-43.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 10290 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -15.5,-43.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 10397 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -16.5,-43.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 10435 + components: + - type: Transform + pos: -12.5,-40.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 10436 + components: + - type: Transform pos: -13.5,-39.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11084 + color: '#FF0000FF' + - uid: 10437 + components: + - type: Transform + pos: -12.5,-46.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 10438 + components: + - type: Transform + pos: -11.5,-46.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 10535 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -21.5,-43.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 10536 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -20.5,-43.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 10557 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 8.5,-43.5 + parent: 30 + - type: AtmosPipeColor + color: '#EB9834FF' + - uid: 10603 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-29.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 10607 components: - type: Transform rot: -1.5707963267948966 rad - pos: -14.5,-39.5 + pos: -3.5,-40.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11085 + color: '#FF0000FF' + - uid: 10608 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.5,-45.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 10609 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-39.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 10610 + components: + - type: Transform + pos: -13.5,-31.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 10635 components: - type: Transform rot: -1.5707963267948966 rad - pos: -15.5,-39.5 + pos: -7.5,-40.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11086 + color: '#FF0000FF' + - uid: 10642 components: - type: Transform rot: -1.5707963267948966 rad - pos: -16.5,-39.5 + pos: -6.5,-40.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11089 + color: '#FF0000FF' + - uid: 10643 components: - type: Transform - pos: -18.5,-40.5 + rot: 3.141592653589793 rad + pos: -8.5,-39.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11091 + color: '#FF0000FF' + - uid: 10793 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -19.5,-41.5 + pos: 6.5,-39.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11092 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -20.5,-41.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11093 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -21.5,-41.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11095 - components: - - type: Transform - pos: -17.5,-38.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11096 - components: - - type: Transform - pos: -17.5,-37.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' + color: '#EB9834FF' - uid: 11100 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -4.5,-29.5 + rot: 3.141592653589793 rad + pos: 2.5,-43.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11103 + color: '#0000FFFF' + - uid: 11102 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -6.5,-30.5 + pos: -16.5,-49.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11104 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -7.5,-30.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11105 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -8.5,-30.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11106 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -9.5,-30.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11108 - components: - - type: Transform - pos: -8.5,-38.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11109 components: - type: Transform pos: -8.5,-37.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11110 - components: - - type: Transform - pos: -8.5,-36.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11111 - components: - - type: Transform - pos: -8.5,-40.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11112 - components: - - type: Transform - pos: -8.5,-41.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11113 - components: - - type: Transform - pos: -8.5,-42.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11116 - components: - - type: Transform - pos: 2.5,-40.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' + color: '#FF0000FF' - uid: 11118 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,-41.5 + rot: 1.5707963267948966 rad + pos: -10.5,-40.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#FF0000FF' - uid: 11119 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,-41.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11120 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,-41.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11121 components: - type: Transform rot: 1.5707963267948966 rad - pos: -1.5,-41.5 + pos: -9.5,-40.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11123 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -4.5,-41.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11124 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -3.5,-41.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11125 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -5.5,-41.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11127 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -7.5,-41.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11128 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -8.5,-41.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11129 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -9.5,-41.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11130 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -10.5,-41.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' + color: '#FF0000FF' - uid: 11131 components: - type: Transform rot: -1.5707963267948966 rad - pos: -11.5,-41.5 + pos: 7.5,-46.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#EB9834FF' + - uid: 11132 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-43.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' - uid: 11133 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -13.5,-41.5 + rot: 3.141592653589793 rad + pos: 2.5,-44.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11134 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -14.5,-41.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11135 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -15.5,-41.5 + rot: 3.141592653589793 rad + pos: -1.5,-41.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11136 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -16.5,-41.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11139 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -18.5,-42.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11141 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -20.5,-42.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11142 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -21.5,-42.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11143 - components: - - type: Transform - pos: -17.5,-43.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11144 - components: - - type: Transform - pos: -17.5,-44.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11145 - components: - - type: Transform - pos: -17.5,-45.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11146 - components: - - type: Transform - pos: -17.5,-46.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11147 - components: - - type: Transform - pos: -19.5,-41.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11148 - components: - - type: Transform - pos: -19.5,-40.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11149 - components: - - type: Transform - pos: -19.5,-39.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11150 - components: - - type: Transform - pos: -19.5,-38.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11151 - components: - - type: Transform - pos: -19.5,-37.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11156 - components: - - type: Transform - pos: -6.5,-42.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11157 - components: - - type: Transform - pos: -6.5,-40.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11158 - components: - - type: Transform - pos: -6.5,-39.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11159 - components: - - type: Transform - pos: -6.5,-38.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' + color: '#FF0000FF' - uid: 11160 components: - type: Transform pos: -6.5,-37.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11161 - components: - - type: Transform - pos: -6.5,-36.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11168 components: - type: Transform @@ -77096,54 +75690,6 @@ entities: parent: 30 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 11170 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -4.5,-28.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11171 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -5.5,-28.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11172 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -6.5,-28.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11173 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -7.5,-28.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11174 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -8.5,-28.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11175 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -9.5,-28.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 11181 components: - type: Transform @@ -77151,7 +75697,7 @@ entities: pos: 10.5,-25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11182 components: - type: Transform @@ -77159,7 +75705,7 @@ entities: pos: 10.5,-26.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11183 components: - type: Transform @@ -77167,7 +75713,7 @@ entities: pos: 10.5,-27.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11184 components: - type: Transform @@ -77175,7 +75721,7 @@ entities: pos: 11.5,-24.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11185 components: - type: Transform @@ -77183,7 +75729,7 @@ entities: pos: 11.5,-25.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11186 components: - type: Transform @@ -77191,7 +75737,7 @@ entities: pos: 11.5,-26.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11187 components: - type: Transform @@ -77199,7 +75745,7 @@ entities: pos: 11.5,-27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11202 components: - type: Transform @@ -77207,7 +75753,7 @@ entities: pos: 9.5,-19.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11203 components: - type: Transform @@ -77215,7 +75761,7 @@ entities: pos: 9.5,-18.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11204 components: - type: Transform @@ -77223,7 +75769,7 @@ entities: pos: 9.5,-17.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11205 components: - type: Transform @@ -77231,7 +75777,7 @@ entities: pos: 9.5,-16.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11206 components: - type: Transform @@ -77239,7 +75785,7 @@ entities: pos: 7.5,-17.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11207 components: - type: Transform @@ -77247,7 +75793,7 @@ entities: pos: 7.5,-16.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11212 components: - type: Transform @@ -77255,7 +75801,7 @@ entities: pos: 20.5,-20.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11338 components: - type: Transform @@ -77263,7 +75809,7 @@ entities: pos: 29.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11640 components: - type: Transform @@ -77271,7 +75817,7 @@ entities: pos: 28.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11641 components: - type: Transform @@ -77279,7 +75825,7 @@ entities: pos: 34.5,-11.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11665 components: - type: Transform @@ -77287,7 +75833,7 @@ entities: pos: 26.5,-11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11672 components: - type: Transform @@ -77295,7 +75841,7 @@ entities: pos: 30.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11686 components: - type: Transform @@ -77303,7 +75849,7 @@ entities: pos: 27.5,-11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11696 components: - type: Transform @@ -77311,21 +75857,28 @@ entities: pos: 25.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' + - uid: 11701 + components: + - type: Transform + pos: -16.5,-42.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' - uid: 11711 components: - type: Transform pos: 33.5,-4.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11713 components: - type: Transform pos: 29.5,-5.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11745 components: - type: Transform @@ -77333,7 +75886,7 @@ entities: pos: 27.5,-6.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11781 components: - type: Transform @@ -77341,7 +75894,7 @@ entities: pos: 28.5,-11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11802 components: - type: Transform @@ -77349,7 +75902,7 @@ entities: pos: 29.5,-11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11858 components: - type: Transform @@ -77357,7 +75910,7 @@ entities: pos: 30.5,-11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11862 components: - type: Transform @@ -77365,7 +75918,7 @@ entities: pos: 35.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11870 components: - type: Transform @@ -77373,7 +75926,7 @@ entities: pos: 28.5,-6.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11875 components: - type: Transform @@ -77381,14 +75934,14 @@ entities: pos: 34.5,-10.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11878 components: - type: Transform pos: 21.5,-4.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11880 components: - type: Transform @@ -77396,14 +75949,14 @@ entities: pos: 22.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11881 components: - type: Transform pos: 29.5,-4.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11897 components: - type: Transform @@ -77411,7 +75964,7 @@ entities: pos: 12.5,-11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11898 components: - type: Transform @@ -77419,7 +75972,7 @@ entities: pos: 13.5,-11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11899 components: - type: Transform @@ -77427,7 +75980,7 @@ entities: pos: 14.5,-11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11900 components: - type: Transform @@ -77435,7 +75988,7 @@ entities: pos: 26.5,-5.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11901 components: - type: Transform @@ -77443,7 +75996,7 @@ entities: pos: 15.5,-11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11902 components: - type: Transform @@ -77451,7 +76004,7 @@ entities: pos: 17.5,-11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11903 components: - type: Transform @@ -77459,7 +76012,7 @@ entities: pos: 18.5,-11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11905 components: - type: Transform @@ -77467,7 +76020,7 @@ entities: pos: 20.5,-11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11906 components: - type: Transform @@ -77475,7 +76028,7 @@ entities: pos: 14.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11907 components: - type: Transform @@ -77483,7 +76036,7 @@ entities: pos: 15.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11908 components: - type: Transform @@ -77491,7 +76044,7 @@ entities: pos: 16.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11909 components: - type: Transform @@ -77499,7 +76052,7 @@ entities: pos: 29.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11910 components: - type: Transform @@ -77507,7 +76060,7 @@ entities: pos: 18.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11911 components: - type: Transform @@ -77515,7 +76068,7 @@ entities: pos: 19.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11912 components: - type: Transform @@ -77523,7 +76076,7 @@ entities: pos: 22.5,-6.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11913 components: - type: Transform @@ -77531,7 +76084,7 @@ entities: pos: 21.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11914 components: - type: Transform @@ -77539,7 +76092,7 @@ entities: pos: 22.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11915 components: - type: Transform @@ -77547,7 +76100,7 @@ entities: pos: 23.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11916 components: - type: Transform @@ -77555,14 +76108,14 @@ entities: pos: 23.5,-6.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11917 components: - type: Transform pos: 29.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11918 components: - type: Transform @@ -77570,7 +76123,7 @@ entities: pos: 26.5,-4.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11919 components: - type: Transform @@ -77578,7 +76131,7 @@ entities: pos: 35.5,-5.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11921 components: - type: Transform @@ -77586,7 +76139,7 @@ entities: pos: 27.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11927 components: - type: Transform @@ -77594,7 +76147,7 @@ entities: pos: 22.5,-11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11928 components: - type: Transform @@ -77602,42 +76155,42 @@ entities: pos: 23.5,-11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11943 components: - type: Transform pos: 21.5,-10.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11946 components: - type: Transform pos: 21.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11947 components: - type: Transform pos: 21.5,-8.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11948 components: - type: Transform pos: 21.5,-7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11949 components: - type: Transform pos: 20.5,-8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11951 components: - type: Transform @@ -77645,7 +76198,7 @@ entities: pos: 14.5,-7.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11952 components: - type: Transform @@ -77653,7 +76206,7 @@ entities: pos: 15.5,-7.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11953 components: - type: Transform @@ -77661,7 +76214,7 @@ entities: pos: 16.5,-7.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11954 components: - type: Transform @@ -77669,7 +76222,7 @@ entities: pos: 17.5,-7.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11955 components: - type: Transform @@ -77677,7 +76230,7 @@ entities: pos: 18.5,-7.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11956 components: - type: Transform @@ -77685,7 +76238,7 @@ entities: pos: 19.5,-7.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11957 components: - type: Transform @@ -77693,7 +76246,7 @@ entities: pos: 12.5,-6.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11958 components: - type: Transform @@ -77701,7 +76254,7 @@ entities: pos: 13.5,-6.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11959 components: - type: Transform @@ -77709,7 +76262,7 @@ entities: pos: 15.5,-6.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11960 components: - type: Transform @@ -77717,7 +76270,7 @@ entities: pos: 14.5,-6.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11961 components: - type: Transform @@ -77725,7 +76278,7 @@ entities: pos: 16.5,-6.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11962 components: - type: Transform @@ -77733,7 +76286,7 @@ entities: pos: 17.5,-6.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11963 components: - type: Transform @@ -77741,7 +76294,7 @@ entities: pos: 18.5,-6.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11964 components: - type: Transform @@ -77749,7 +76302,7 @@ entities: pos: 19.5,-6.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11965 components: - type: Transform @@ -77757,77 +76310,77 @@ entities: pos: 20.5,-6.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11969 components: - type: Transform pos: 21.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11970 components: - type: Transform pos: 21.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11971 components: - type: Transform pos: 21.5,-1.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11972 components: - type: Transform pos: 21.5,-0.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11973 components: - type: Transform pos: 21.5,0.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11974 components: - type: Transform pos: 20.5,-6.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11975 components: - type: Transform pos: 20.5,-5.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11976 components: - type: Transform pos: 20.5,-4.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11977 components: - type: Transform pos: 20.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11980 components: - type: Transform pos: 20.5,-0.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11983 components: - type: Transform @@ -77835,7 +76388,7 @@ entities: pos: 20.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11984 components: - type: Transform @@ -77843,7 +76396,7 @@ entities: pos: 19.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11986 components: - type: Transform @@ -77851,7 +76404,7 @@ entities: pos: 21.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11988 components: - type: Transform @@ -77859,7 +76412,7 @@ entities: pos: 23.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11989 components: - type: Transform @@ -77867,7 +76420,7 @@ entities: pos: 27.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11990 components: - type: Transform @@ -77875,7 +76428,7 @@ entities: pos: 26.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11992 components: - type: Transform @@ -77883,7 +76436,7 @@ entities: pos: 28.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11993 components: - type: Transform @@ -77891,7 +76444,7 @@ entities: pos: 31.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12000 components: - type: Transform @@ -77899,7 +76452,7 @@ entities: pos: 25.5,-6.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12004 components: - type: Transform @@ -77907,7 +76460,7 @@ entities: pos: 30.5,-1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12005 components: - type: Transform @@ -77915,7 +76468,7 @@ entities: pos: 30.5,-0.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12006 components: - type: Transform @@ -77923,7 +76476,7 @@ entities: pos: 30.5,0.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12008 components: - type: Transform @@ -77931,7 +76484,7 @@ entities: pos: 25.5,-1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12009 components: - type: Transform @@ -77939,7 +76492,7 @@ entities: pos: 25.5,-0.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12016 components: - type: Transform @@ -77947,14 +76500,14 @@ entities: pos: 31.5,-11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12021 components: - type: Transform pos: 29.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12022 components: - type: Transform @@ -77962,7 +76515,7 @@ entities: pos: 26.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12023 components: - type: Transform @@ -77970,7 +76523,7 @@ entities: pos: 26.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12024 components: - type: Transform @@ -77978,7 +76531,7 @@ entities: pos: 36.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12036 components: - type: Transform @@ -77986,7 +76539,7 @@ entities: pos: 26.5,-1.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12037 components: - type: Transform @@ -77994,7 +76547,7 @@ entities: pos: 26.5,-0.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12040 components: - type: Transform @@ -78002,7 +76555,7 @@ entities: pos: 29.5,-1.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12041 components: - type: Transform @@ -78010,7 +76563,7 @@ entities: pos: 29.5,-0.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12042 components: - type: Transform @@ -78018,7 +76571,7 @@ entities: pos: 29.5,0.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12061 components: - type: Transform @@ -78026,7 +76579,7 @@ entities: pos: 32.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12065 components: - type: Transform @@ -78034,7 +76587,7 @@ entities: pos: 34.5,-5.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12066 components: - type: Transform @@ -78042,7 +76595,7 @@ entities: pos: 36.5,-5.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12082 components: - type: Transform @@ -78050,7 +76603,7 @@ entities: pos: 7.5,-23.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12101 components: - type: Transform @@ -78058,7 +76611,7 @@ entities: pos: 34.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12127 components: - type: Transform @@ -78066,7 +76619,7 @@ entities: pos: 31.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12130 components: - type: Transform @@ -78074,7 +76627,7 @@ entities: pos: 34.5,-13.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12236 components: - type: Transform @@ -78082,63 +76635,63 @@ entities: pos: 32.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12464 components: - type: Transform pos: 10.5,26.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12465 components: - type: Transform pos: 10.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12466 components: - type: Transform pos: 10.5,28.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12467 components: - type: Transform pos: 10.5,29.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12468 components: - type: Transform pos: 10.5,30.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12469 components: - type: Transform pos: 10.5,31.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12470 components: - type: Transform pos: 8.5,28.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12471 components: - type: Transform pos: 8.5,29.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12474 components: - type: Transform @@ -78146,7 +76699,7 @@ entities: pos: 8.5,30.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12475 components: - type: Transform @@ -78154,7 +76707,7 @@ entities: pos: 10.5,32.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12476 components: - type: Transform @@ -78162,7 +76715,7 @@ entities: pos: 8.5,32.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12477 components: - type: Transform @@ -78170,7 +76723,7 @@ entities: pos: 8.5,33.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12478 components: - type: Transform @@ -78178,7 +76731,7 @@ entities: pos: 8.5,34.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12479 components: - type: Transform @@ -78186,7 +76739,7 @@ entities: pos: 8.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12480 components: - type: Transform @@ -78194,7 +76747,7 @@ entities: pos: 8.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12481 components: - type: Transform @@ -78202,7 +76755,7 @@ entities: pos: 8.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12482 components: - type: Transform @@ -78210,7 +76763,7 @@ entities: pos: 8.5,38.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12483 components: - type: Transform @@ -78218,7 +76771,7 @@ entities: pos: 10.5,34.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12484 components: - type: Transform @@ -78226,7 +76779,7 @@ entities: pos: 10.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12485 components: - type: Transform @@ -78234,7 +76787,7 @@ entities: pos: 10.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12486 components: - type: Transform @@ -78242,7 +76795,7 @@ entities: pos: 10.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12487 components: - type: Transform @@ -78250,7 +76803,7 @@ entities: pos: 10.5,38.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12494 components: - type: Transform @@ -78258,7 +76811,7 @@ entities: pos: 9.5,40.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12496 components: - type: Transform @@ -78266,7 +76819,7 @@ entities: pos: 9.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12497 components: - type: Transform @@ -78274,7 +76827,7 @@ entities: pos: 10.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12498 components: - type: Transform @@ -78282,7 +76835,7 @@ entities: pos: 11.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12499 components: - type: Transform @@ -78290,7 +76843,7 @@ entities: pos: 12.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12500 components: - type: Transform @@ -78298,7 +76851,7 @@ entities: pos: 13.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12501 components: - type: Transform @@ -78306,7 +76859,7 @@ entities: pos: 14.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12502 components: - type: Transform @@ -78314,7 +76867,7 @@ entities: pos: 15.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12504 components: - type: Transform @@ -78322,7 +76875,7 @@ entities: pos: 17.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12505 components: - type: Transform @@ -78330,7 +76883,7 @@ entities: pos: 19.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12506 components: - type: Transform @@ -78338,7 +76891,7 @@ entities: pos: 20.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12507 components: - type: Transform @@ -78346,7 +76899,7 @@ entities: pos: 18.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12508 components: - type: Transform @@ -78354,7 +76907,7 @@ entities: pos: 21.5,28.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12509 components: - type: Transform @@ -78362,7 +76915,7 @@ entities: pos: 21.5,29.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12510 components: - type: Transform @@ -78370,7 +76923,7 @@ entities: pos: 21.5,30.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12511 components: - type: Transform @@ -78378,7 +76931,7 @@ entities: pos: 21.5,31.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12512 components: - type: Transform @@ -78386,7 +76939,7 @@ entities: pos: 21.5,32.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12516 components: - type: Transform @@ -78394,7 +76947,7 @@ entities: pos: 11.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12517 components: - type: Transform @@ -78402,7 +76955,7 @@ entities: pos: 12.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12518 components: - type: Transform @@ -78410,7 +76963,7 @@ entities: pos: 13.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12519 components: - type: Transform @@ -78418,7 +76971,7 @@ entities: pos: 14.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12520 components: - type: Transform @@ -78426,7 +76979,7 @@ entities: pos: 15.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12521 components: - type: Transform @@ -78434,7 +76987,7 @@ entities: pos: 16.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12522 components: - type: Transform @@ -78442,7 +76995,7 @@ entities: pos: 17.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12524 components: - type: Transform @@ -78450,7 +77003,7 @@ entities: pos: 19.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12525 components: - type: Transform @@ -78458,7 +77011,7 @@ entities: pos: 20.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12526 components: - type: Transform @@ -78466,7 +77019,7 @@ entities: pos: 21.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12527 components: - type: Transform @@ -78474,7 +77027,7 @@ entities: pos: 22.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12529 components: - type: Transform @@ -78482,7 +77035,7 @@ entities: pos: 23.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12530 components: - type: Transform @@ -78490,7 +77043,7 @@ entities: pos: 23.5,28.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12531 components: - type: Transform @@ -78498,7 +77051,7 @@ entities: pos: 23.5,30.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12532 components: - type: Transform @@ -78506,7 +77059,7 @@ entities: pos: 23.5,29.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12533 components: - type: Transform @@ -78514,7 +77067,7 @@ entities: pos: 23.5,31.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12534 components: - type: Transform @@ -78522,7 +77075,7 @@ entities: pos: 23.5,32.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12535 components: - type: Transform @@ -78530,7 +77083,7 @@ entities: pos: 23.5,33.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12546 components: - type: Transform @@ -78538,7 +77091,7 @@ entities: pos: 21.5,34.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12547 components: - type: Transform @@ -78546,7 +77099,7 @@ entities: pos: 21.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12548 components: - type: Transform @@ -78554,7 +77107,7 @@ entities: pos: 21.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12549 components: - type: Transform @@ -78562,7 +77115,7 @@ entities: pos: 21.5,38.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12550 components: - type: Transform @@ -78570,7 +77123,7 @@ entities: pos: 23.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12551 components: - type: Transform @@ -78578,7 +77131,7 @@ entities: pos: 23.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12552 components: - type: Transform @@ -78586,7 +77139,7 @@ entities: pos: 21.5,40.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12553 components: - type: Transform @@ -78594,7 +77147,7 @@ entities: pos: 21.5,41.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12554 components: - type: Transform @@ -78602,7 +77155,7 @@ entities: pos: 21.5,42.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12555 components: - type: Transform @@ -78610,7 +77163,7 @@ entities: pos: 20.5,41.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12556 components: - type: Transform @@ -78618,7 +77171,7 @@ entities: pos: 20.5,42.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12557 components: - type: Transform @@ -78626,7 +77179,7 @@ entities: pos: 21.5,40.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12558 components: - type: Transform @@ -78634,14 +77187,14 @@ entities: pos: 22.5,40.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12560 components: - type: Transform pos: 23.5,39.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12561 components: - type: Transform @@ -78649,7 +77202,7 @@ entities: pos: 22.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12562 components: - type: Transform @@ -78657,7 +77210,7 @@ entities: pos: 21.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12563 components: - type: Transform @@ -78665,7 +77218,7 @@ entities: pos: 20.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12564 components: - type: Transform @@ -78673,7 +77226,7 @@ entities: pos: 19.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12565 components: - type: Transform @@ -78681,7 +77234,7 @@ entities: pos: 20.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12566 components: - type: Transform @@ -78689,7 +77242,7 @@ entities: pos: 19.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12567 components: - type: Transform @@ -78697,7 +77250,7 @@ entities: pos: 20.5,33.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12568 components: - type: Transform @@ -78705,7 +77258,7 @@ entities: pos: 19.5,33.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12569 components: - type: Transform @@ -78713,7 +77266,7 @@ entities: pos: 22.5,34.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12570 components: - type: Transform @@ -78721,7 +77274,7 @@ entities: pos: 21.5,34.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12571 components: - type: Transform @@ -78729,7 +77282,7 @@ entities: pos: 20.5,34.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12572 components: - type: Transform @@ -78737,7 +77290,7 @@ entities: pos: 19.5,34.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12573 components: - type: Transform @@ -78745,7 +77298,7 @@ entities: pos: 20.5,39.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12574 components: - type: Transform @@ -78753,7 +77306,7 @@ entities: pos: 19.5,39.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12575 components: - type: Transform @@ -78761,7 +77314,7 @@ entities: pos: 19.5,40.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12585 components: - type: Transform @@ -78769,14 +77322,14 @@ entities: pos: 24.5,40.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12586 components: - type: Transform pos: 25.5,41.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12590 components: - type: Transform @@ -78784,7 +77337,7 @@ entities: pos: 26.5,38.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12591 components: - type: Transform @@ -78792,7 +77345,7 @@ entities: pos: 26.5,39.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12592 components: - type: Transform @@ -78800,7 +77353,7 @@ entities: pos: 27.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12593 components: - type: Transform @@ -78808,7 +77361,7 @@ entities: pos: 28.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12594 components: - type: Transform @@ -78816,7 +77369,7 @@ entities: pos: 29.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12595 components: - type: Transform @@ -78824,7 +77377,7 @@ entities: pos: 30.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12596 components: - type: Transform @@ -78832,7 +77385,7 @@ entities: pos: 22.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12597 components: - type: Transform @@ -78840,7 +77393,7 @@ entities: pos: 23.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12598 components: - type: Transform @@ -78848,7 +77401,7 @@ entities: pos: 25.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12601 components: - type: Transform @@ -78856,7 +77409,7 @@ entities: pos: 27.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12602 components: - type: Transform @@ -78864,7 +77417,7 @@ entities: pos: 28.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12603 components: - type: Transform @@ -78872,7 +77425,7 @@ entities: pos: 29.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12604 components: - type: Transform @@ -78880,7 +77433,7 @@ entities: pos: 30.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12607 components: - type: Transform @@ -78888,7 +77441,7 @@ entities: pos: 24.5,26.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12608 components: - type: Transform @@ -78896,7 +77449,7 @@ entities: pos: 25.5,26.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12609 components: - type: Transform @@ -78904,63 +77457,63 @@ entities: pos: 26.5,26.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12612 components: - type: Transform pos: 26.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12613 components: - type: Transform pos: 26.5,34.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12614 components: - type: Transform pos: 26.5,33.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12615 components: - type: Transform pos: 26.5,32.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12616 components: - type: Transform pos: 26.5,31.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12617 components: - type: Transform pos: 26.5,30.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12655 components: - type: Transform pos: 28.5,18.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12658 components: - type: Transform pos: 28.5,17.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12677 components: - type: Transform @@ -78968,14 +77521,14 @@ entities: pos: 26.5,18.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12745 components: - type: Transform pos: 16.5,56.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12752 components: - type: Transform @@ -78995,7 +77548,7 @@ entities: pos: 27.5,20.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12812 components: - type: Transform @@ -79003,14 +77556,14 @@ entities: pos: 26.5,20.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12825 components: - type: Transform pos: 28.5,16.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12873 components: - type: Transform @@ -79018,7 +77571,7 @@ entities: pos: 23.5,20.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12876 components: - type: Transform @@ -79026,7 +77579,7 @@ entities: pos: 24.5,20.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12879 components: - type: Transform @@ -79034,7 +77587,7 @@ entities: pos: 22.5,20.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12880 components: - type: Transform @@ -79042,7 +77595,7 @@ entities: pos: 21.5,19.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12884 components: - type: Transform @@ -79050,7 +77603,7 @@ entities: pos: 24.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12887 components: - type: Transform @@ -79058,7 +77611,7 @@ entities: pos: 25.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12888 components: - type: Transform @@ -79066,7 +77619,7 @@ entities: pos: 27.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12907 components: - type: Transform @@ -79079,7 +77632,7 @@ entities: pos: 26.5,8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12924 components: - type: Transform @@ -79092,7 +77645,7 @@ entities: pos: 12.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12939 components: - type: Transform @@ -79100,7 +77653,7 @@ entities: pos: 13.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12941 components: - type: Transform @@ -79108,7 +77661,7 @@ entities: pos: 15.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12942 components: - type: Transform @@ -79116,15 +77669,7 @@ entities: pos: 16.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 12943 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 17.5,15.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12945 components: - type: Transform @@ -79132,7 +77677,7 @@ entities: pos: 19.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12946 components: - type: Transform @@ -79140,7 +77685,7 @@ entities: pos: 20.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12947 components: - type: Transform @@ -79148,7 +77693,7 @@ entities: pos: 21.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12948 components: - type: Transform @@ -79156,7 +77701,7 @@ entities: pos: 22.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12950 components: - type: Transform @@ -79164,7 +77709,7 @@ entities: pos: 23.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12952 components: - type: Transform @@ -79172,7 +77717,7 @@ entities: pos: 23.5,12.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12953 components: - type: Transform @@ -79180,7 +77725,7 @@ entities: pos: 23.5,11.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12955 components: - type: Transform @@ -79188,7 +77733,7 @@ entities: pos: 23.5,9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12957 components: - type: Transform @@ -79196,7 +77741,7 @@ entities: pos: 25.5,8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12958 components: - type: Transform @@ -79204,7 +77749,7 @@ entities: pos: 24.5,8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12962 components: - type: Transform @@ -79212,7 +77757,7 @@ entities: pos: 27.5,8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12964 components: - type: Transform @@ -79220,7 +77765,7 @@ entities: pos: 29.5,8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12965 components: - type: Transform @@ -79228,7 +77773,7 @@ entities: pos: 30.5,8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12966 components: - type: Transform @@ -79236,21 +77781,21 @@ entities: pos: 31.5,8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12967 components: - type: Transform pos: 32.5,9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12968 components: - type: Transform pos: 32.5,10.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12969 components: - type: Transform @@ -79258,7 +77803,7 @@ entities: pos: 33.5,8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12970 components: - type: Transform @@ -79266,7 +77811,7 @@ entities: pos: 34.5,8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12971 components: - type: Transform @@ -79274,7 +77819,7 @@ entities: pos: 35.5,8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12972 components: - type: Transform @@ -79282,7 +77827,7 @@ entities: pos: 36.5,8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12977 components: - type: Transform @@ -79290,7 +77835,7 @@ entities: pos: 22.5,10.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12978 components: - type: Transform @@ -79298,7 +77843,7 @@ entities: pos: 21.5,10.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12979 components: - type: Transform @@ -79306,7 +77851,7 @@ entities: pos: 20.5,10.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12980 components: - type: Transform @@ -79314,7 +77859,7 @@ entities: pos: 19.5,10.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12981 components: - type: Transform @@ -79322,7 +77867,7 @@ entities: pos: 18.5,10.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12982 components: - type: Transform @@ -79330,21 +77875,21 @@ entities: pos: 17.5,10.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12984 components: - type: Transform pos: 23.5,16.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12985 components: - type: Transform pos: 23.5,17.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12987 components: - type: Transform @@ -79352,7 +77897,7 @@ entities: pos: 14.5,16.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12988 components: - type: Transform @@ -79360,7 +77905,7 @@ entities: pos: 14.5,17.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12990 components: - type: Transform @@ -79368,7 +77913,7 @@ entities: pos: 14.5,19.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12992 components: - type: Transform @@ -79376,7 +77921,7 @@ entities: pos: 15.5,20.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12993 components: - type: Transform @@ -79384,7 +77929,7 @@ entities: pos: 16.5,20.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12994 components: - type: Transform @@ -79392,7 +77937,7 @@ entities: pos: 17.5,20.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12998 components: - type: Transform @@ -79400,7 +77945,7 @@ entities: pos: 22.5,19.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12999 components: - type: Transform @@ -79408,7 +77953,7 @@ entities: pos: 21.5,19.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13000 components: - type: Transform @@ -79416,7 +77961,7 @@ entities: pos: 20.5,19.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13001 components: - type: Transform @@ -79424,7 +77969,7 @@ entities: pos: 19.5,19.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13008 components: - type: Transform @@ -79432,7 +77977,7 @@ entities: pos: 9.5,17.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13009 components: - type: Transform @@ -79440,7 +77985,7 @@ entities: pos: 10.5,17.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13010 components: - type: Transform @@ -79448,7 +77993,7 @@ entities: pos: 11.5,17.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13012 components: - type: Transform @@ -79456,7 +78001,7 @@ entities: pos: 12.5,18.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13013 components: - type: Transform @@ -79464,7 +78009,7 @@ entities: pos: 12.5,19.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13014 components: - type: Transform @@ -79472,7 +78017,7 @@ entities: pos: 12.5,20.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13015 components: - type: Transform @@ -79480,7 +78025,7 @@ entities: pos: 12.5,21.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13018 components: - type: Transform @@ -79488,7 +78033,7 @@ entities: pos: 14.5,22.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13019 components: - type: Transform @@ -79496,7 +78041,7 @@ entities: pos: 15.5,22.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13020 components: - type: Transform @@ -79504,14 +78049,14 @@ entities: pos: 16.5,22.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13021 components: - type: Transform pos: 17.5,19.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13023 components: - type: Transform @@ -79519,7 +78064,7 @@ entities: pos: 12.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13025 components: - type: Transform @@ -79527,7 +78072,7 @@ entities: pos: 13.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13026 components: - type: Transform @@ -79535,7 +78080,7 @@ entities: pos: 14.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13027 components: - type: Transform @@ -79543,7 +78088,7 @@ entities: pos: 15.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13028 components: - type: Transform @@ -79551,7 +78096,7 @@ entities: pos: 16.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13029 components: - type: Transform @@ -79559,7 +78104,7 @@ entities: pos: 17.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13031 components: - type: Transform @@ -79567,7 +78112,7 @@ entities: pos: 19.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13032 components: - type: Transform @@ -79575,21 +78120,21 @@ entities: pos: 20.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13040 components: - type: Transform pos: 17.5,20.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13041 components: - type: Transform pos: 17.5,21.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13042 components: - type: Transform @@ -79597,7 +78142,7 @@ entities: pos: 18.5,18.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13043 components: - type: Transform @@ -79605,7 +78150,7 @@ entities: pos: 19.5,18.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13044 components: - type: Transform @@ -79613,7 +78158,7 @@ entities: pos: 20.5,18.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13045 components: - type: Transform @@ -79621,7 +78166,7 @@ entities: pos: 21.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13046 components: - type: Transform @@ -79629,7 +78174,7 @@ entities: pos: 21.5,16.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13047 components: - type: Transform @@ -79637,23 +78182,7 @@ entities: pos: 21.5,17.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 13048 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 21.5,12.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 13049 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 21.5,13.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13050 components: - type: Transform @@ -79661,7 +78190,7 @@ entities: pos: 20.5,11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13051 components: - type: Transform @@ -79669,7 +78198,7 @@ entities: pos: 19.5,11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13052 components: - type: Transform @@ -79677,7 +78206,7 @@ entities: pos: 18.5,11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13053 components: - type: Transform @@ -79685,28 +78214,28 @@ entities: pos: 17.5,11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13054 components: - type: Transform pos: 21.5,8.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13055 components: - type: Transform pos: 21.5,9.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13056 components: - type: Transform pos: 21.5,10.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13057 components: - type: Transform @@ -79714,7 +78243,7 @@ entities: pos: 22.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13058 components: - type: Transform @@ -79722,7 +78251,7 @@ entities: pos: 23.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13060 components: - type: Transform @@ -79730,7 +78259,7 @@ entities: pos: 24.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13061 components: - type: Transform @@ -79738,7 +78267,7 @@ entities: pos: 26.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13062 components: - type: Transform @@ -79746,7 +78275,7 @@ entities: pos: 28.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13063 components: - type: Transform @@ -79754,7 +78283,7 @@ entities: pos: 29.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13064 components: - type: Transform @@ -79762,7 +78291,7 @@ entities: pos: 30.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13065 components: - type: Transform @@ -79770,7 +78299,7 @@ entities: pos: 31.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13066 components: - type: Transform @@ -79778,7 +78307,7 @@ entities: pos: 32.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13067 components: - type: Transform @@ -79786,7 +78315,7 @@ entities: pos: 33.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13068 components: - type: Transform @@ -79794,7 +78323,7 @@ entities: pos: 34.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13069 components: - type: Transform @@ -79802,7 +78331,7 @@ entities: pos: 35.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13070 components: - type: Transform @@ -79810,7 +78339,7 @@ entities: pos: 36.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13071 components: - type: Transform @@ -79818,7 +78347,7 @@ entities: pos: 37.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13089 components: - type: Transform @@ -79826,7 +78355,7 @@ entities: pos: 24.5,18.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13090 components: - type: Transform @@ -79834,14 +78363,14 @@ entities: pos: 25.5,18.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13152 components: - type: Transform pos: 28.5,19.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13337 components: - type: Transform @@ -79849,7 +78378,7 @@ entities: pos: 25.5,20.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13339 components: - type: Transform @@ -79857,7 +78386,7 @@ entities: pos: 39.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13348 components: - type: Transform @@ -79865,7 +78394,7 @@ entities: pos: 40.5,8.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13349 components: - type: Transform @@ -79873,7 +78402,7 @@ entities: pos: 40.5,9.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13350 components: - type: Transform @@ -79881,7 +78410,7 @@ entities: pos: 40.5,10.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13351 components: - type: Transform @@ -79889,7 +78418,7 @@ entities: pos: 40.5,11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13352 components: - type: Transform @@ -79897,14 +78426,14 @@ entities: pos: 40.5,12.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13468 components: - type: Transform pos: 16.5,55.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13635 components: - type: Transform @@ -79912,7 +78441,7 @@ entities: pos: 51.5,19.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13636 components: - type: Transform @@ -79920,7 +78449,7 @@ entities: pos: 49.5,19.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13637 components: - type: Transform @@ -79928,7 +78457,7 @@ entities: pos: 47.5,19.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13638 components: - type: Transform @@ -79936,7 +78465,7 @@ entities: pos: 45.5,19.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13639 components: - type: Transform @@ -79944,7 +78473,7 @@ entities: pos: 43.5,19.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13640 components: - type: Transform @@ -79952,7 +78481,7 @@ entities: pos: 34.5,5.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13641 components: - type: Transform @@ -79960,7 +78489,7 @@ entities: pos: 36.5,5.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13754 components: - type: Transform @@ -79968,7 +78497,7 @@ entities: pos: 32.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13755 components: - type: Transform @@ -79976,7 +78505,7 @@ entities: pos: 33.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13756 components: - type: Transform @@ -79984,7 +78513,7 @@ entities: pos: 34.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13758 components: - type: Transform @@ -79992,7 +78521,7 @@ entities: pos: 36.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13759 components: - type: Transform @@ -80000,7 +78529,7 @@ entities: pos: 37.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13760 components: - type: Transform @@ -80008,7 +78537,7 @@ entities: pos: 38.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13761 components: - type: Transform @@ -80016,7 +78545,7 @@ entities: pos: 39.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13762 components: - type: Transform @@ -80024,7 +78553,7 @@ entities: pos: 40.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13763 components: - type: Transform @@ -80032,7 +78561,7 @@ entities: pos: 41.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13764 components: - type: Transform @@ -80040,7 +78569,7 @@ entities: pos: 42.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13766 components: - type: Transform @@ -80048,7 +78577,7 @@ entities: pos: 44.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13769 components: - type: Transform @@ -80056,7 +78585,7 @@ entities: pos: 32.5,38.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13770 components: - type: Transform @@ -80064,7 +78593,7 @@ entities: pos: 33.5,38.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13771 components: - type: Transform @@ -80072,7 +78601,7 @@ entities: pos: 34.5,38.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13773 components: - type: Transform @@ -80080,7 +78609,7 @@ entities: pos: 36.5,38.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13774 components: - type: Transform @@ -80088,7 +78617,7 @@ entities: pos: 37.5,38.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13775 components: - type: Transform @@ -80096,7 +78625,7 @@ entities: pos: 38.5,38.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13777 components: - type: Transform @@ -80104,7 +78633,7 @@ entities: pos: 40.5,38.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13778 components: - type: Transform @@ -80112,7 +78641,7 @@ entities: pos: 41.5,38.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13779 components: - type: Transform @@ -80120,7 +78649,7 @@ entities: pos: 42.5,38.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13780 components: - type: Transform @@ -80128,7 +78657,7 @@ entities: pos: 43.5,38.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13781 components: - type: Transform @@ -80136,28 +78665,28 @@ entities: pos: 44.5,38.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13785 components: - type: Transform pos: 30.5,39.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13786 components: - type: Transform pos: 30.5,40.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13787 components: - type: Transform pos: 30.5,41.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13792 components: - type: Transform @@ -80165,7 +78694,7 @@ entities: pos: 29.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13793 components: - type: Transform @@ -80173,7 +78702,7 @@ entities: pos: 29.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13794 components: - type: Transform @@ -80181,7 +78710,7 @@ entities: pos: 29.5,38.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13795 components: - type: Transform @@ -80189,7 +78718,7 @@ entities: pos: 29.5,39.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13796 components: - type: Transform @@ -80197,7 +78726,7 @@ entities: pos: 29.5,40.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13797 components: - type: Transform @@ -80205,28 +78734,144 @@ entities: pos: 29.5,41.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' + - uid: 13956 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-44.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 14362 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -53.5,-60.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 14448 + components: + - type: Transform + pos: 21.5,12.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 14454 + components: + - type: Transform + pos: -25.5,8.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 14461 + components: + - type: Transform + pos: 21.5,13.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 14466 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -61.5,-60.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 14472 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -61.5,-61.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 14475 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -58.5,-59.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 14498 + components: + - type: Transform + pos: -25.5,11.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 14500 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 18.5,15.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 14501 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -61.5,-62.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 14502 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -64.5,-60.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 14503 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -59.5,-60.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 14511 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 15.5,12.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 14517 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 16.5,11.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' - uid: 14974 components: - type: Transform pos: 16.5,45.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 14975 components: - type: Transform pos: 16.5,47.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 14977 components: - type: Transform pos: 16.5,44.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 14980 components: - type: Transform @@ -80234,7 +78879,7 @@ entities: pos: 19.5,43.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 14981 components: - type: Transform @@ -80242,63 +78887,63 @@ entities: pos: 18.5,43.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 14988 components: - type: Transform pos: 16.5,52.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 14990 components: - type: Transform pos: 16.5,53.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 15018 components: - type: Transform pos: 16.5,49.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 15049 components: - type: Transform pos: 16.5,51.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 15053 components: - type: Transform pos: 16.5,50.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 15054 components: - type: Transform pos: 16.5,46.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 15055 components: - type: Transform pos: 16.5,54.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 15061 components: - type: Transform pos: 16.5,48.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 15453 components: - type: Transform @@ -80306,7 +78951,7 @@ entities: pos: 50.5,19.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 15454 components: - type: Transform @@ -80314,7 +78959,7 @@ entities: pos: 48.5,19.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 15455 components: - type: Transform @@ -80322,7 +78967,7 @@ entities: pos: 46.5,19.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 15456 components: - type: Transform @@ -80330,7 +78975,7 @@ entities: pos: 44.5,19.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 15457 components: - type: Transform @@ -80338,7 +78983,7 @@ entities: pos: 33.5,5.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 15458 components: - type: Transform @@ -80346,7 +78991,7 @@ entities: pos: 35.5,5.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 15459 components: - type: Transform @@ -80354,7 +78999,7 @@ entities: pos: 37.5,5.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 15618 components: - type: Transform @@ -80362,7 +79007,7 @@ entities: pos: 52.5,22.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 15624 components: - type: Transform @@ -80370,21 +79015,21 @@ entities: pos: 38.5,5.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 15734 components: - type: Transform pos: 42.5,18.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 15735 components: - type: Transform pos: 42.5,17.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 15740 components: - type: Transform @@ -80392,7 +79037,7 @@ entities: pos: 39.5,5.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 15741 components: - type: Transform @@ -80400,7 +79045,7 @@ entities: pos: 40.5,5.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 15743 components: - type: Transform @@ -80408,35 +79053,35 @@ entities: pos: 41.5,5.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 15744 components: - type: Transform pos: 42.5,6.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 15745 components: - type: Transform pos: 42.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 15746 components: - type: Transform pos: 42.5,8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 15747 components: - type: Transform pos: 42.5,9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 15748 components: - type: Transform @@ -80444,14 +79089,14 @@ entities: pos: 52.5,21.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 15994 components: - type: Transform pos: 32.5,6.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 16101 components: - type: Transform @@ -80459,7 +79104,7 @@ entities: pos: 34.5,-12.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 16102 components: - type: Transform @@ -80467,7 +79112,7 @@ entities: pos: 26.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 16122 components: - type: Transform @@ -80475,7 +79120,7 @@ entities: pos: 24.5,-11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 16783 components: - type: Transform @@ -80483,56 +79128,79 @@ entities: pos: 17.5,43.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' + - uid: 17715 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -54.5,-60.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 18077 + components: + - type: Transform + pos: 16.5,11.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 18211 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 15.5,11.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' - uid: 18377 components: - type: Transform pos: -45.5,-14.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18378 components: - type: Transform pos: -45.5,-15.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18379 components: - type: Transform pos: -45.5,-16.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18381 components: - type: Transform pos: -45.5,-18.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18382 components: - type: Transform pos: -45.5,-19.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18383 components: - type: Transform pos: -45.5,-20.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18384 components: - type: Transform pos: -45.5,-21.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18388 components: - type: Transform @@ -80540,7 +79208,7 @@ entities: pos: -60.5,-22.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18389 components: - type: Transform @@ -80548,7 +79216,7 @@ entities: pos: -59.5,-22.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18390 components: - type: Transform @@ -80556,7 +79224,7 @@ entities: pos: -58.5,-22.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18392 components: - type: Transform @@ -80564,7 +79232,7 @@ entities: pos: -56.5,-22.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18393 components: - type: Transform @@ -80572,7 +79240,7 @@ entities: pos: -55.5,-22.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18394 components: - type: Transform @@ -80580,7 +79248,7 @@ entities: pos: -54.5,-22.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18395 components: - type: Transform @@ -80588,7 +79256,7 @@ entities: pos: -53.5,-22.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18396 components: - type: Transform @@ -80596,7 +79264,7 @@ entities: pos: -52.5,-22.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18398 components: - type: Transform @@ -80604,7 +79272,7 @@ entities: pos: -50.5,-22.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18399 components: - type: Transform @@ -80612,7 +79280,7 @@ entities: pos: -51.5,-24.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18400 components: - type: Transform @@ -80620,7 +79288,7 @@ entities: pos: -48.5,-22.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18401 components: - type: Transform @@ -80628,7 +79296,7 @@ entities: pos: -47.5,-22.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18402 components: - type: Transform @@ -80636,91 +79304,91 @@ entities: pos: -46.5,-22.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18404 components: - type: Transform pos: -44.5,-12.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18405 components: - type: Transform pos: -44.5,-14.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18406 components: - type: Transform pos: -44.5,-15.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18407 components: - type: Transform pos: -44.5,-16.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18408 components: - type: Transform pos: -44.5,-17.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18409 components: - type: Transform pos: -44.5,-18.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18410 components: - type: Transform pos: -44.5,-19.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18411 components: - type: Transform pos: -44.5,-20.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18413 components: - type: Transform pos: -44.5,-22.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18414 components: - type: Transform pos: -44.5,-23.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18417 components: - type: Transform pos: -62.5,-24.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18418 components: - type: Transform pos: -62.5,-23.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18419 components: - type: Transform @@ -80728,7 +79396,7 @@ entities: pos: -60.5,-24.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18420 components: - type: Transform @@ -80736,7 +79404,7 @@ entities: pos: -59.5,-24.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18422 components: - type: Transform @@ -80744,7 +79412,7 @@ entities: pos: -57.5,-24.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18423 components: - type: Transform @@ -80752,7 +79420,7 @@ entities: pos: -56.5,-24.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18424 components: - type: Transform @@ -80760,7 +79428,7 @@ entities: pos: -55.5,-24.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18425 components: - type: Transform @@ -80768,7 +79436,7 @@ entities: pos: -54.5,-24.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18427 components: - type: Transform @@ -80776,7 +79444,7 @@ entities: pos: -52.5,-24.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18428 components: - type: Transform @@ -80784,7 +79452,7 @@ entities: pos: -49.5,-22.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18429 components: - type: Transform @@ -80792,7 +79460,7 @@ entities: pos: -50.5,-24.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18431 components: - type: Transform @@ -80800,7 +79468,7 @@ entities: pos: -48.5,-24.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18432 components: - type: Transform @@ -80808,7 +79476,7 @@ entities: pos: -47.5,-24.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18433 components: - type: Transform @@ -80816,7 +79484,7 @@ entities: pos: -46.5,-24.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18434 components: - type: Transform @@ -80824,7 +79492,7 @@ entities: pos: -45.5,-24.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18443 components: - type: Transform @@ -80832,21 +79500,21 @@ entities: pos: -62.5,-24.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18444 components: - type: Transform pos: -63.5,-23.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18445 components: - type: Transform pos: -63.5,-22.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18448 components: - type: Transform @@ -80854,189 +79522,189 @@ entities: pos: -63.5,-20.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18452 components: - type: Transform pos: -62.5,-25.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18453 components: - type: Transform pos: -62.5,-26.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18454 components: - type: Transform pos: -62.5,-27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18455 components: - type: Transform pos: -62.5,-28.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18456 components: - type: Transform pos: -62.5,-29.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18457 components: - type: Transform pos: -62.5,-30.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18458 components: - type: Transform pos: -62.5,-31.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18459 components: - type: Transform pos: -62.5,-32.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18460 components: - type: Transform pos: -62.5,-33.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18461 components: - type: Transform pos: -62.5,-34.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18462 components: - type: Transform pos: -62.5,-35.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18463 components: - type: Transform pos: -62.5,-36.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18464 components: - type: Transform pos: -62.5,-37.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18465 components: - type: Transform pos: -61.5,-37.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18466 components: - type: Transform pos: -61.5,-36.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18467 components: - type: Transform pos: -61.5,-35.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18468 components: - type: Transform pos: -61.5,-34.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18469 components: - type: Transform pos: -61.5,-33.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18470 components: - type: Transform pos: -61.5,-32.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18471 components: - type: Transform pos: -61.5,-31.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18472 components: - type: Transform pos: -61.5,-30.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18473 components: - type: Transform pos: -61.5,-29.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18474 components: - type: Transform pos: -61.5,-28.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18475 components: - type: Transform pos: -61.5,-27.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18476 components: - type: Transform pos: -61.5,-26.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18477 components: - type: Transform pos: -61.5,-25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18480 components: - type: Transform @@ -81044,7 +79712,7 @@ entities: pos: -63.5,-38.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18481 components: - type: Transform @@ -81052,7 +79720,7 @@ entities: pos: -60.5,-38.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18482 components: - type: Transform @@ -81060,7 +79728,7 @@ entities: pos: -59.5,-38.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18483 components: - type: Transform @@ -81068,49 +79736,49 @@ entities: pos: -64.5,-38.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18486 components: - type: Transform pos: -65.5,-39.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18487 components: - type: Transform pos: -65.5,-40.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18488 components: - type: Transform pos: -65.5,-41.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18489 components: - type: Transform pos: -65.5,-42.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18490 components: - type: Transform pos: -65.5,-43.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18491 components: - type: Transform pos: -65.5,-44.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18494 components: - type: Transform @@ -81118,28 +79786,28 @@ entities: pos: -63.5,-45.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18495 components: - type: Transform pos: -62.5,-46.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18496 components: - type: Transform pos: -62.5,-47.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18497 components: - type: Transform pos: -62.5,-48.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18499 components: - type: Transform @@ -81147,7 +79815,7 @@ entities: pos: -66.5,-45.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18500 components: - type: Transform @@ -81155,7 +79823,7 @@ entities: pos: -67.5,-45.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18502 components: - type: Transform @@ -81163,7 +79831,7 @@ entities: pos: -69.5,-45.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18503 components: - type: Transform @@ -81171,7 +79839,7 @@ entities: pos: -70.5,-45.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18504 components: - type: Transform @@ -81179,7 +79847,7 @@ entities: pos: -71.5,-45.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18505 components: - type: Transform @@ -81187,7 +79855,7 @@ entities: pos: -72.5,-45.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18506 components: - type: Transform @@ -81195,7 +79863,7 @@ entities: pos: -73.5,-45.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18507 components: - type: Transform @@ -81203,7 +79871,7 @@ entities: pos: -74.5,-45.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18508 components: - type: Transform @@ -81211,7 +79879,7 @@ entities: pos: -75.5,-45.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18509 components: - type: Transform @@ -81219,21 +79887,21 @@ entities: pos: -76.5,-45.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18511 components: - type: Transform pos: -77.5,-46.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18512 components: - type: Transform pos: -77.5,-47.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18514 components: - type: Transform @@ -81241,7 +79909,7 @@ entities: pos: -78.5,-44.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18515 components: - type: Transform @@ -81249,7 +79917,7 @@ entities: pos: -78.5,-43.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18516 components: - type: Transform @@ -81257,7 +79925,7 @@ entities: pos: -78.5,-42.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18517 components: - type: Transform @@ -81265,7 +79933,7 @@ entities: pos: -78.5,-41.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18518 components: - type: Transform @@ -81273,7 +79941,7 @@ entities: pos: -78.5,-40.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18522 components: - type: Transform @@ -81281,7 +79949,7 @@ entities: pos: -68.5,-43.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18527 components: - type: Transform @@ -81289,7 +79957,7 @@ entities: pos: -64.5,-49.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18528 components: - type: Transform @@ -81297,7 +79965,7 @@ entities: pos: -65.5,-49.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18529 components: - type: Transform @@ -81305,63 +79973,63 @@ entities: pos: -66.5,-49.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18530 components: - type: Transform pos: -67.5,-50.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18531 components: - type: Transform pos: -67.5,-51.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18532 components: - type: Transform pos: -67.5,-52.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18533 components: - type: Transform pos: -67.5,-53.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18535 components: - type: Transform pos: -67.5,-55.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18536 components: - type: Transform pos: -67.5,-56.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18537 components: - type: Transform pos: -67.5,-57.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18538 components: - type: Transform pos: -67.5,-58.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18539 components: - type: Transform @@ -81369,7 +80037,7 @@ entities: pos: -66.5,-59.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18540 components: - type: Transform @@ -81377,7 +80045,7 @@ entities: pos: -65.5,-59.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18541 components: - type: Transform @@ -81385,7 +80053,7 @@ entities: pos: -64.5,-59.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18543 components: - type: Transform @@ -81393,15 +80061,7 @@ entities: pos: -62.5,-59.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 18544 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -61.5,-59.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18545 components: - type: Transform @@ -81409,7 +80069,7 @@ entities: pos: -60.5,-59.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18546 components: - type: Transform @@ -81417,7 +80077,7 @@ entities: pos: -59.5,-59.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18548 components: - type: Transform @@ -81425,7 +80085,7 @@ entities: pos: -57.5,-59.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18549 components: - type: Transform @@ -81433,7 +80093,7 @@ entities: pos: -56.5,-58.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18551 components: - type: Transform @@ -81441,7 +80101,7 @@ entities: pos: -56.5,-56.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18552 components: - type: Transform @@ -81449,7 +80109,7 @@ entities: pos: -56.5,-55.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18553 components: - type: Transform @@ -81457,7 +80117,7 @@ entities: pos: -56.5,-54.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18555 components: - type: Transform @@ -81465,7 +80125,7 @@ entities: pos: -56.5,-51.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18556 components: - type: Transform @@ -81473,7 +80133,7 @@ entities: pos: -56.5,-52.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18557 components: - type: Transform @@ -81481,7 +80141,7 @@ entities: pos: -56.5,-50.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18558 components: - type: Transform @@ -81489,7 +80149,7 @@ entities: pos: -57.5,-49.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18559 components: - type: Transform @@ -81497,7 +80157,7 @@ entities: pos: -58.5,-49.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18560 components: - type: Transform @@ -81505,7 +80165,7 @@ entities: pos: -59.5,-49.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18561 components: - type: Transform @@ -81513,7 +80173,7 @@ entities: pos: -60.5,-49.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18562 components: - type: Transform @@ -81521,63 +80181,63 @@ entities: pos: -61.5,-49.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18563 components: - type: Transform pos: -55.5,-59.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18564 components: - type: Transform pos: -55.5,-58.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18565 components: - type: Transform pos: -55.5,-57.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18567 components: - type: Transform pos: -55.5,-55.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18569 components: - type: Transform pos: -55.5,-53.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18571 components: - type: Transform pos: -55.5,-51.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18572 components: - type: Transform pos: -55.5,-50.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18573 components: - type: Transform pos: -55.5,-49.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18574 components: - type: Transform @@ -81585,7 +80245,7 @@ entities: pos: -56.5,-48.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18575 components: - type: Transform @@ -81593,7 +80253,7 @@ entities: pos: -57.5,-48.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18576 components: - type: Transform @@ -81601,7 +80261,7 @@ entities: pos: -58.5,-48.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18577 components: - type: Transform @@ -81609,7 +80269,7 @@ entities: pos: -59.5,-48.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18579 components: - type: Transform @@ -81617,7 +80277,7 @@ entities: pos: -62.5,-48.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18580 components: - type: Transform @@ -81625,7 +80285,7 @@ entities: pos: -63.5,-48.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18581 components: - type: Transform @@ -81633,7 +80293,7 @@ entities: pos: -64.5,-48.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18582 components: - type: Transform @@ -81641,7 +80301,7 @@ entities: pos: -65.5,-48.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18583 components: - type: Transform @@ -81649,7 +80309,7 @@ entities: pos: -66.5,-48.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18584 components: - type: Transform @@ -81657,7 +80317,7 @@ entities: pos: -67.5,-48.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18585 components: - type: Transform @@ -81665,7 +80325,7 @@ entities: pos: -68.5,-49.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18586 components: - type: Transform @@ -81673,7 +80333,7 @@ entities: pos: -68.5,-50.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18587 components: - type: Transform @@ -81681,7 +80341,7 @@ entities: pos: -68.5,-51.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18588 components: - type: Transform @@ -81689,7 +80349,7 @@ entities: pos: -68.5,-52.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18589 components: - type: Transform @@ -81697,7 +80357,7 @@ entities: pos: -68.5,-53.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18590 components: - type: Transform @@ -81705,7 +80365,7 @@ entities: pos: -68.5,-54.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18592 components: - type: Transform @@ -81713,7 +80373,7 @@ entities: pos: -68.5,-56.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18593 components: - type: Transform @@ -81721,7 +80381,7 @@ entities: pos: -68.5,-57.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18594 components: - type: Transform @@ -81729,7 +80389,7 @@ entities: pos: -68.5,-59.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18595 components: - type: Transform @@ -81737,7 +80397,7 @@ entities: pos: -68.5,-58.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18596 components: - type: Transform @@ -81745,7 +80405,7 @@ entities: pos: -67.5,-60.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18597 components: - type: Transform @@ -81753,7 +80413,7 @@ entities: pos: -66.5,-60.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18598 components: - type: Transform @@ -81761,7 +80421,7 @@ entities: pos: -65.5,-60.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18600 components: - type: Transform @@ -81769,15 +80429,7 @@ entities: pos: -63.5,-60.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 18601 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -62.5,-60.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18602 components: - type: Transform @@ -81785,7 +80437,7 @@ entities: pos: -61.5,-60.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18605 components: - type: Transform @@ -81793,7 +80445,7 @@ entities: pos: -58.5,-60.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18606 components: - type: Transform @@ -81801,7 +80453,7 @@ entities: pos: -57.5,-60.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18607 components: - type: Transform @@ -81809,7 +80461,7 @@ entities: pos: -56.5,-60.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18617 components: - type: Transform @@ -81817,7 +80469,7 @@ entities: pos: -61.5,-47.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18619 components: - type: Transform @@ -81825,7 +80477,7 @@ entities: pos: -60.5,-46.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18620 components: - type: Transform @@ -81833,7 +80485,7 @@ entities: pos: -59.5,-46.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18622 components: - type: Transform @@ -81841,7 +80493,7 @@ entities: pos: -58.5,-45.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18624 components: - type: Transform @@ -81849,7 +80501,7 @@ entities: pos: -58.5,-43.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18625 components: - type: Transform @@ -81857,7 +80509,7 @@ entities: pos: -58.5,-42.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18626 components: - type: Transform @@ -81865,7 +80517,7 @@ entities: pos: -58.5,-41.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18627 components: - type: Transform @@ -81873,7 +80525,7 @@ entities: pos: -58.5,-40.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18628 components: - type: Transform @@ -81881,7 +80533,7 @@ entities: pos: -58.5,-39.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18631 components: - type: Transform @@ -81889,7 +80541,7 @@ entities: pos: -62.5,-46.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18632 components: - type: Transform @@ -81897,7 +80549,7 @@ entities: pos: -63.5,-46.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18633 components: - type: Transform @@ -81905,7 +80557,7 @@ entities: pos: -64.5,-46.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18634 components: - type: Transform @@ -81913,7 +80565,7 @@ entities: pos: -65.5,-46.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18635 components: - type: Transform @@ -81921,7 +80573,7 @@ entities: pos: -66.5,-46.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18638 components: - type: Transform @@ -81929,7 +80581,7 @@ entities: pos: -69.5,-46.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18639 components: - type: Transform @@ -81937,7 +80589,7 @@ entities: pos: -70.5,-46.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18640 components: - type: Transform @@ -81945,7 +80597,7 @@ entities: pos: -71.5,-46.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18641 components: - type: Transform @@ -81953,7 +80605,7 @@ entities: pos: -72.5,-46.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18642 components: - type: Transform @@ -81961,7 +80613,7 @@ entities: pos: -73.5,-46.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18643 components: - type: Transform @@ -81969,7 +80621,7 @@ entities: pos: -74.5,-46.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18645 components: - type: Transform @@ -81977,7 +80629,7 @@ entities: pos: -76.5,-46.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18646 components: - type: Transform @@ -81985,7 +80637,7 @@ entities: pos: -77.5,-46.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18647 components: - type: Transform @@ -81993,7 +80645,7 @@ entities: pos: -78.5,-46.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18649 components: - type: Transform @@ -82001,7 +80653,7 @@ entities: pos: -79.5,-45.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18650 components: - type: Transform @@ -82009,7 +80661,7 @@ entities: pos: -79.5,-44.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18651 components: - type: Transform @@ -82017,7 +80669,7 @@ entities: pos: -79.5,-43.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18652 components: - type: Transform @@ -82025,7 +80677,7 @@ entities: pos: -79.5,-42.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18653 components: - type: Transform @@ -82033,7 +80685,7 @@ entities: pos: -79.5,-41.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18654 components: - type: Transform @@ -82041,28 +80693,28 @@ entities: pos: -79.5,-40.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18656 components: - type: Transform pos: -75.5,-45.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18657 components: - type: Transform pos: -75.5,-44.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18659 components: - type: Transform pos: -75.5,-42.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18660 components: - type: Transform @@ -82070,7 +80722,7 @@ entities: pos: -76.5,-43.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18664 components: - type: Transform @@ -82078,7 +80730,7 @@ entities: pos: -67.5,-45.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18665 components: - type: Transform @@ -82086,7 +80738,7 @@ entities: pos: -67.5,-44.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18666 components: - type: Transform @@ -82094,7 +80746,7 @@ entities: pos: -67.5,-43.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18669 components: - type: Transform @@ -82102,7 +80754,7 @@ entities: pos: -56.5,-48.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18670 components: - type: Transform @@ -82110,7 +80762,7 @@ entities: pos: -56.5,-47.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18671 components: - type: Transform @@ -82118,7 +80770,7 @@ entities: pos: -56.5,-46.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18672 components: - type: Transform @@ -82126,7 +80778,7 @@ entities: pos: -55.5,-47.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18673 components: - type: Transform @@ -82134,7 +80786,7 @@ entities: pos: -55.5,-46.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18680 components: - type: Transform @@ -82142,7 +80794,7 @@ entities: pos: -54.5,-52.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18681 components: - type: Transform @@ -82150,7 +80802,7 @@ entities: pos: -53.5,-52.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18682 components: - type: Transform @@ -82158,7 +80810,7 @@ entities: pos: -55.5,-53.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18683 components: - type: Transform @@ -82166,7 +80818,7 @@ entities: pos: -54.5,-53.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18684 components: - type: Transform @@ -82174,7 +80826,7 @@ entities: pos: -53.5,-53.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18685 components: - type: Transform @@ -82182,7 +80834,7 @@ entities: pos: -54.5,-56.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18686 components: - type: Transform @@ -82190,7 +80842,7 @@ entities: pos: -53.5,-56.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18687 components: - type: Transform @@ -82198,7 +80850,7 @@ entities: pos: -54.5,-57.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18688 components: - type: Transform @@ -82206,7 +80858,7 @@ entities: pos: -53.5,-57.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18689 components: - type: Transform @@ -82214,7 +80866,7 @@ entities: pos: -55.5,-57.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18690 components: - type: Transform @@ -82222,7 +80874,7 @@ entities: pos: -55.5,-54.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18701 components: - type: Transform @@ -82230,7 +80882,7 @@ entities: pos: -69.5,-60.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18702 components: - type: Transform @@ -82238,7 +80890,7 @@ entities: pos: -70.5,-60.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18703 components: - type: Transform @@ -82246,7 +80898,7 @@ entities: pos: -71.5,-60.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18705 components: - type: Transform @@ -82254,7 +80906,7 @@ entities: pos: -68.5,-59.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18706 components: - type: Transform @@ -82262,7 +80914,7 @@ entities: pos: -69.5,-59.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18707 components: - type: Transform @@ -82270,7 +80922,7 @@ entities: pos: -70.5,-59.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18708 components: - type: Transform @@ -82278,7 +80930,7 @@ entities: pos: -71.5,-59.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18709 components: - type: Transform @@ -82286,7 +80938,7 @@ entities: pos: -72.5,-59.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18710 components: - type: Transform @@ -82294,7 +80946,7 @@ entities: pos: -73.5,-60.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18712 components: - type: Transform @@ -82302,7 +80954,7 @@ entities: pos: -75.5,-60.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18713 components: - type: Transform @@ -82310,7 +80962,7 @@ entities: pos: -76.5,-60.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18714 components: - type: Transform @@ -82318,7 +80970,7 @@ entities: pos: -77.5,-60.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18715 components: - type: Transform @@ -82326,7 +80978,7 @@ entities: pos: -78.5,-60.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18716 components: - type: Transform @@ -82334,7 +80986,7 @@ entities: pos: -79.5,-60.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18718 components: - type: Transform @@ -82342,7 +80994,7 @@ entities: pos: -81.5,-60.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18719 components: - type: Transform @@ -82350,7 +81002,7 @@ entities: pos: -82.5,-60.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18721 components: - type: Transform @@ -82358,7 +81010,7 @@ entities: pos: -76.5,-59.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18722 components: - type: Transform @@ -82366,7 +81018,7 @@ entities: pos: -74.5,-59.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18723 components: - type: Transform @@ -82374,7 +81026,7 @@ entities: pos: -73.5,-59.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18724 components: - type: Transform @@ -82382,7 +81034,7 @@ entities: pos: -72.5,-60.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18725 components: - type: Transform @@ -82390,7 +81042,7 @@ entities: pos: -77.5,-59.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18726 components: - type: Transform @@ -82398,7 +81050,7 @@ entities: pos: -78.5,-59.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18727 components: - type: Transform @@ -82406,7 +81058,7 @@ entities: pos: -79.5,-59.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18728 components: - type: Transform @@ -82414,7 +81066,7 @@ entities: pos: -75.5,-60.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18735 components: - type: Transform @@ -82422,7 +81074,7 @@ entities: pos: -68.5,-54.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18736 components: - type: Transform @@ -82430,7 +81082,7 @@ entities: pos: -69.5,-54.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18737 components: - type: Transform @@ -82438,7 +81090,7 @@ entities: pos: -70.5,-54.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18738 components: - type: Transform @@ -82446,7 +81098,7 @@ entities: pos: -71.5,-54.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18740 components: - type: Transform @@ -82454,7 +81106,7 @@ entities: pos: -73.5,-54.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18741 components: - type: Transform @@ -82462,7 +81114,7 @@ entities: pos: -74.5,-54.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18742 components: - type: Transform @@ -82470,7 +81122,7 @@ entities: pos: -75.5,-54.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18746 components: - type: Transform @@ -82478,7 +81130,7 @@ entities: pos: -69.5,-55.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18747 components: - type: Transform @@ -82486,7 +81138,7 @@ entities: pos: -70.5,-55.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18749 components: - type: Transform @@ -82494,7 +81146,7 @@ entities: pos: -72.5,-55.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18750 components: - type: Transform @@ -82502,7 +81154,7 @@ entities: pos: -73.5,-55.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18751 components: - type: Transform @@ -82510,7 +81162,7 @@ entities: pos: -74.5,-55.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18752 components: - type: Transform @@ -82518,7 +81170,7 @@ entities: pos: -75.5,-55.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18755 components: - type: Transform @@ -82526,7 +81178,7 @@ entities: pos: -71.5,-54.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18760 components: - type: Transform @@ -82534,102 +81186,41 @@ entities: parent: 30 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 18761 - components: - - type: Transform - pos: -59.5,-62.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 18762 - components: - - type: Transform - pos: -59.5,-63.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 18764 - components: - - type: Transform - pos: -58.5,-60.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 18765 - components: - - type: Transform - pos: -58.5,-61.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 18766 - components: - - type: Transform - pos: -58.5,-62.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 18767 - components: - - type: Transform - pos: -58.5,-63.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 18768 - components: - - type: Transform - pos: -58.5,-64.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 18771 - components: - - type: Transform - pos: -64.5,-61.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 18773 - components: - - type: Transform - pos: -64.5,-63.5 - parent: 30 - uid: 20329 components: - type: Transform pos: 4.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 20330 components: - type: Transform pos: 4.5,-4.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 20331 components: - type: Transform pos: 4.5,-5.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 20332 components: - type: Transform pos: 4.5,-6.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 20333 components: - type: Transform pos: 4.5,-7.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 21264 components: - type: Transform @@ -82637,7 +81228,7 @@ entities: pos: 22.5,-18.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 21265 components: - type: Transform @@ -82645,7 +81236,7 @@ entities: pos: 23.5,-18.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 21266 components: - type: Transform @@ -82653,7 +81244,7 @@ entities: pos: 24.5,-18.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 21267 components: - type: Transform @@ -82661,7 +81252,7 @@ entities: pos: 25.5,-18.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 21268 components: - type: Transform @@ -82669,7 +81260,7 @@ entities: pos: 26.5,-18.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 21271 components: - type: Transform @@ -82677,7 +81268,7 @@ entities: pos: 27.5,-19.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 21272 components: - type: Transform @@ -82685,7 +81276,7 @@ entities: pos: 26.5,-20.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 21273 components: - type: Transform @@ -82693,28 +81284,28 @@ entities: pos: 25.5,-20.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 21546 components: - type: Transform pos: 39.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 21547 components: - type: Transform pos: 39.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 21548 components: - type: Transform pos: 39.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 21550 components: - type: Transform @@ -82722,7 +81313,7 @@ entities: pos: 43.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 21551 components: - type: Transform @@ -82730,7 +81321,7 @@ entities: pos: 43.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 21552 components: - type: Transform @@ -82738,7 +81329,7 @@ entities: pos: 43.5,38.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 21987 components: - type: Transform @@ -82746,7 +81337,7 @@ entities: pos: -0.5,38.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 21988 components: - type: Transform @@ -82754,7 +81345,7 @@ entities: pos: -0.5,39.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 21989 components: - type: Transform @@ -82762,7 +81353,7 @@ entities: pos: -0.5,40.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 21990 components: - type: Transform @@ -82770,7 +81361,7 @@ entities: pos: -0.5,41.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 21991 components: - type: Transform @@ -82778,7 +81369,7 @@ entities: pos: -0.5,42.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 21992 components: - type: Transform @@ -82786,7 +81377,7 @@ entities: pos: -0.5,43.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 21993 components: - type: Transform @@ -82794,7 +81385,7 @@ entities: pos: -0.5,44.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 21994 components: - type: Transform @@ -82802,7 +81393,7 @@ entities: pos: -0.5,45.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 21995 components: - type: Transform @@ -82810,7 +81401,7 @@ entities: pos: -0.5,46.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 21996 components: - type: Transform @@ -82818,7 +81409,7 @@ entities: pos: -0.5,47.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 21997 components: - type: Transform @@ -82826,7 +81417,7 @@ entities: pos: -0.5,48.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 21998 components: - type: Transform @@ -82834,7 +81425,7 @@ entities: pos: -0.5,49.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 21999 components: - type: Transform @@ -82842,7 +81433,7 @@ entities: pos: -0.5,50.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 22000 components: - type: Transform @@ -82850,7 +81441,7 @@ entities: pos: -0.5,51.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 22001 components: - type: Transform @@ -82858,7 +81449,7 @@ entities: pos: -0.5,52.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 22002 components: - type: Transform @@ -82866,7 +81457,7 @@ entities: pos: -0.5,53.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 22003 components: - type: Transform @@ -82874,7 +81465,7 @@ entities: pos: -0.5,54.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 22004 components: - type: Transform @@ -82882,7 +81473,7 @@ entities: pos: -0.5,55.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 22005 components: - type: Transform @@ -82890,7 +81481,7 @@ entities: pos: -0.5,56.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 22006 components: - type: Transform @@ -82898,7 +81489,7 @@ entities: pos: -0.5,57.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 22007 components: - type: Transform @@ -82906,7 +81497,7 @@ entities: pos: -0.5,58.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 22008 components: - type: Transform @@ -82914,7 +81505,7 @@ entities: pos: -0.5,59.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 22009 components: - type: Transform @@ -82922,7 +81513,7 @@ entities: pos: -0.5,60.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 22010 components: - type: Transform @@ -82930,7 +81521,7 @@ entities: pos: -0.5,61.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 22011 components: - type: Transform @@ -82938,7 +81529,7 @@ entities: pos: -0.5,62.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 22012 components: - type: Transform @@ -82946,7 +81537,7 @@ entities: pos: -0.5,63.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 22013 components: - type: Transform @@ -82954,316 +81545,106 @@ entities: pos: -0.5,64.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 22015 components: - type: Transform pos: -0.5,66.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 22016 components: - type: Transform pos: -0.5,67.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 22017 components: - type: Transform pos: -0.5,68.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 22018 components: - type: Transform pos: -0.5,69.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 22019 components: - type: Transform pos: -0.5,70.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 22020 components: - type: Transform pos: -0.5,71.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 22021 components: - type: Transform pos: -0.5,72.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 22022 components: - type: Transform pos: -0.5,73.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 22267 components: - type: Transform pos: 43.5,11.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 22268 components: - type: Transform pos: 43.5,12.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 22269 components: - type: Transform pos: 43.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 22270 components: - type: Transform pos: 43.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 22271 components: - type: Transform pos: 43.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 22769 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -17.5,-48.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 22770 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -17.5,-49.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 22771 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -17.5,-50.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 22772 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -17.5,-51.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 22773 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -17.5,-52.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 22774 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -17.5,-53.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 22775 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -17.5,-54.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 22776 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -17.5,-55.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 22777 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -17.5,-56.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 22778 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -17.5,-57.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 22779 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -18.5,-58.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 22780 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -19.5,-58.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 22781 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -20.5,-58.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 22782 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -21.5,-58.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 22783 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -22.5,-58.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 22784 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -23.5,-58.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 22785 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -24.5,-58.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 22786 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -25.5,-58.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 22789 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -30.5,-59.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 22790 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -31.5,-60.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 22791 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -32.5,-60.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 22792 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -33.5,-60.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 22793 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -34.5,-60.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 22794 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -35.5,-60.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 22796 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -29.5,-58.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 22797 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -28.5,-58.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 22798 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -27.5,-58.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - proto: GasPipeTJunction entities: + - uid: 336 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -53.5,-63.5 + parent: 30 - uid: 924 components: - type: Transform @@ -83271,17 +81652,7 @@ entities: pos: -45.5,-5.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 925 - components: - - type: Transform - anchored: False - rot: -1.5707963267948966 rad - pos: -11.5,-56.5 - parent: 30 - - type: Physics - canCollide: True - bodyType: Dynamic + color: '#FF0000FF' - uid: 962 components: - type: Transform @@ -83289,14 +81660,7 @@ entities: pos: -45.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 1938 - components: - - type: Transform - pos: -5.5,-49.5 - parent: 30 - - type: AtmosPipeColor - color: '#03FCD3FF' + color: '#FF0000FF' - uid: 2431 components: - type: Transform @@ -83304,7 +81668,7 @@ entities: pos: -34.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2440 components: - type: Transform @@ -83312,7 +81676,7 @@ entities: pos: -34.5,31.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2441 components: - type: Transform @@ -83320,7 +81684,7 @@ entities: pos: -36.5,32.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2442 components: - type: Transform @@ -83328,28 +81692,28 @@ entities: pos: -34.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2456 components: - type: Transform pos: -42.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2458 components: - type: Transform pos: -41.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2459 components: - type: Transform pos: -41.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2463 components: - type: Transform @@ -83357,7 +81721,7 @@ entities: pos: -45.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2496 components: - type: Transform @@ -83365,7 +81729,7 @@ entities: pos: -36.5,40.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2497 components: - type: Transform @@ -83373,28 +81737,28 @@ entities: pos: -34.5,39.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2507 components: - type: Transform pos: -36.5,44.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2508 components: - type: Transform pos: -34.5,42.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2509 components: - type: Transform pos: -35.5,44.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2510 components: - type: Transform @@ -83402,7 +81766,7 @@ entities: pos: -33.5,42.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2512 components: - type: Transform @@ -83410,7 +81774,7 @@ entities: pos: -33.5,44.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2513 components: - type: Transform @@ -83418,7 +81782,7 @@ entities: pos: -31.5,42.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2519 components: - type: Transform @@ -83426,7 +81790,7 @@ entities: pos: -33.5,46.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2520 components: - type: Transform @@ -83434,7 +81798,7 @@ entities: pos: -31.5,46.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2521 components: - type: Transform @@ -83442,7 +81806,7 @@ entities: pos: -31.5,48.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2527 components: - type: Transform @@ -83450,7 +81814,7 @@ entities: pos: -33.5,47.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2532 components: - type: Transform @@ -83458,7 +81822,7 @@ entities: pos: -38.5,47.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2542 components: - type: Transform @@ -83466,7 +81830,7 @@ entities: pos: -40.5,48.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2553 components: - type: Transform @@ -83474,7 +81838,7 @@ entities: pos: -31.5,49.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2554 components: - type: Transform @@ -83482,49 +81846,49 @@ entities: pos: -33.5,51.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2582 components: - type: Transform pos: -34.5,53.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2583 components: - type: Transform pos: -30.5,53.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2596 components: - type: Transform pos: -38.5,42.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2597 components: - type: Transform pos: -40.5,44.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2598 components: - type: Transform pos: -42.5,42.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2599 components: - type: Transform pos: -44.5,44.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2600 components: - type: Transform @@ -83532,7 +81896,7 @@ entities: pos: -46.5,42.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2601 components: - type: Transform @@ -83540,7 +81904,7 @@ entities: pos: -48.5,44.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2619 components: - type: Transform @@ -83548,14 +81912,14 @@ entities: pos: -41.5,42.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2628 components: - type: Transform pos: -43.5,44.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2654 components: - type: Transform @@ -83563,7 +81927,7 @@ entities: pos: -48.5,50.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2658 components: - type: Transform @@ -83571,7 +81935,7 @@ entities: pos: -48.5,51.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2659 components: - type: Transform @@ -83579,7 +81943,7 @@ entities: pos: -46.5,52.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2662 components: - type: Transform @@ -83587,7 +81951,7 @@ entities: pos: -46.5,49.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2667 components: - type: Transform @@ -83595,7 +81959,7 @@ entities: pos: -48.5,56.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2668 components: - type: Transform @@ -83603,7 +81967,7 @@ entities: pos: -46.5,56.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2677 components: - type: Transform @@ -83611,7 +81975,7 @@ entities: pos: -46.5,57.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2688 components: - type: Transform @@ -83619,7 +81983,7 @@ entities: pos: -50.5,61.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2689 components: - type: Transform @@ -83627,14 +81991,14 @@ entities: pos: -46.5,61.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2709 components: - type: Transform pos: -48.5,58.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2717 components: - type: Transform @@ -83642,7 +82006,7 @@ entities: pos: -51.5,60.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2718 components: - type: Transform @@ -83650,14 +82014,14 @@ entities: pos: -47.5,60.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2729 components: - type: Transform pos: -48.5,64.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2750 components: - type: Transform @@ -83665,7 +82029,7 @@ entities: pos: -36.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2753 components: - type: Transform @@ -83673,7 +82037,7 @@ entities: pos: -36.5,24.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2760 components: - type: Transform @@ -83681,7 +82045,7 @@ entities: pos: -36.5,17.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2762 components: - type: Transform @@ -83689,7 +82053,7 @@ entities: pos: -36.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2767 components: - type: Transform @@ -83697,7 +82061,7 @@ entities: pos: -34.5,9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2777 components: - type: Transform @@ -83705,7 +82069,7 @@ entities: pos: -34.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2779 components: - type: Transform @@ -83713,7 +82077,7 @@ entities: pos: -32.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2786 components: - type: Transform @@ -83721,7 +82085,7 @@ entities: pos: -27.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2788 components: - type: Transform @@ -83729,7 +82093,7 @@ entities: pos: -21.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2796 components: - type: Transform @@ -83737,28 +82101,28 @@ entities: pos: -17.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2802 components: - type: Transform pos: -8.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2812 components: - type: Transform pos: 1.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2814 components: - type: Transform pos: 3.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2819 components: - type: Transform @@ -83766,7 +82130,7 @@ entities: pos: 8.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2831 components: - type: Transform @@ -83774,7 +82138,7 @@ entities: pos: 10.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2833 components: - type: Transform @@ -83782,7 +82146,7 @@ entities: pos: 10.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2842 components: - type: Transform @@ -83790,7 +82154,7 @@ entities: pos: 8.5,26.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2851 components: - type: Transform @@ -83798,14 +82162,14 @@ entities: pos: 3.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2854 components: - type: Transform pos: -2.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2857 components: - type: Transform @@ -83813,7 +82177,7 @@ entities: pos: -4.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2866 components: - type: Transform @@ -83821,7 +82185,7 @@ entities: pos: -14.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2871 components: - type: Transform @@ -83829,21 +82193,21 @@ entities: pos: -23.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2873 components: - type: Transform pos: -21.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2879 components: - type: Transform pos: -27.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2888 components: - type: Transform @@ -83851,7 +82215,7 @@ entities: pos: -34.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2893 components: - type: Transform @@ -83859,7 +82223,7 @@ entities: pos: -34.5,26.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2899 components: - type: Transform @@ -83867,7 +82231,7 @@ entities: pos: -34.5,19.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2905 components: - type: Transform @@ -83875,7 +82239,7 @@ entities: pos: -34.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2913 components: - type: Transform @@ -83883,21 +82247,21 @@ entities: pos: -34.5,5.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2919 components: - type: Transform pos: -31.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2924 components: - type: Transform pos: -24.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2932 components: - type: Transform @@ -83905,21 +82269,21 @@ entities: pos: -19.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2935 components: - type: Transform pos: -14.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2941 components: - type: Transform pos: -6.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2962 components: - type: Transform @@ -83927,7 +82291,7 @@ entities: pos: 10.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2975 components: - type: Transform @@ -83935,7 +82299,7 @@ entities: pos: 8.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2985 components: - type: Transform @@ -83943,21 +82307,21 @@ entities: pos: 10.5,24.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2994 components: - type: Transform pos: 0.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2997 components: - type: Transform pos: -0.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3000 components: - type: Transform @@ -83965,7 +82329,7 @@ entities: pos: -3.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3012 components: - type: Transform @@ -83973,28 +82337,28 @@ entities: pos: -15.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3019 components: - type: Transform pos: -22.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3020 components: - type: Transform pos: -19.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3022 components: - type: Transform pos: -26.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3023 components: - type: Transform @@ -84002,14 +82366,14 @@ entities: pos: -25.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3027 components: - type: Transform pos: -30.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3084 components: - type: Transform @@ -84017,28 +82381,28 @@ entities: pos: -42.5,5.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3087 components: - type: Transform pos: -41.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3091 components: - type: Transform pos: -39.5,5.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3093 components: - type: Transform pos: -39.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3097 components: - type: Transform @@ -84046,14 +82410,14 @@ entities: pos: -44.5,5.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3098 components: - type: Transform pos: -45.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3120 components: - type: Transform @@ -84061,19 +82425,7 @@ entities: pos: -51.5,9.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 3130 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -5.5,-57.5 - parent: 30 - - uid: 3131 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -3.5,-56.5 - parent: 30 + color: '#FF0000FF' - uid: 3134 components: - type: Transform @@ -84081,7 +82433,7 @@ entities: pos: -52.5,10.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3137 components: - type: Transform @@ -84089,7 +82441,7 @@ entities: pos: -44.5,4.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3138 components: - type: Transform @@ -84097,7 +82449,7 @@ entities: pos: -45.5,6.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3154 components: - type: Transform @@ -84105,7 +82457,7 @@ entities: pos: -44.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3213 components: - type: Transform @@ -84113,7 +82465,7 @@ entities: pos: -44.5,-8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3241 components: - type: Transform @@ -84121,7 +82473,7 @@ entities: pos: -44.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3245 components: - type: Transform @@ -84129,7 +82481,7 @@ entities: pos: -43.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3246 components: - type: Transform @@ -84137,14 +82489,14 @@ entities: pos: -42.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3255 components: - type: Transform pos: -41.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3268 components: - type: Transform @@ -84152,7 +82504,7 @@ entities: pos: -49.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3275 components: - type: Transform @@ -84160,14 +82512,14 @@ entities: pos: -50.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3278 components: - type: Transform pos: -52.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3283 components: - type: Transform @@ -84175,7 +82527,7 @@ entities: pos: -57.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3284 components: - type: Transform @@ -84183,7 +82535,7 @@ entities: pos: -57.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3285 components: - type: Transform @@ -84191,7 +82543,7 @@ entities: pos: -57.5,21.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3294 components: - type: Transform @@ -84199,7 +82551,7 @@ entities: pos: -57.5,18.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3306 components: - type: Transform @@ -84207,22 +82559,14 @@ entities: pos: -49.5,16.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3333 components: - type: Transform pos: -19.5,6.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 3348 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -27.5,10.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3349 components: - type: Transform @@ -84230,14 +82574,14 @@ entities: pos: -23.5,9.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3353 components: - type: Transform pos: -21.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3381 components: - type: Transform @@ -84245,7 +82589,7 @@ entities: pos: -17.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3388 components: - type: Transform @@ -84253,7 +82597,7 @@ entities: pos: -16.5,10.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3397 components: - type: Transform @@ -84261,7 +82605,7 @@ entities: pos: -17.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3399 components: - type: Transform @@ -84269,7 +82613,7 @@ entities: pos: -16.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3404 components: - type: Transform @@ -84283,7 +82627,7 @@ entities: pos: -3.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3420 components: - type: Transform @@ -84291,21 +82635,21 @@ entities: pos: -1.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3423 components: - type: Transform pos: -3.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3424 components: - type: Transform pos: -1.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3442 components: - type: Transform @@ -84313,21 +82657,21 @@ entities: pos: -4.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3452 components: - type: Transform pos: -0.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3458 components: - type: Transform pos: -8.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3459 components: - type: Transform @@ -84335,7 +82679,7 @@ entities: pos: -10.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3460 components: - type: Transform @@ -84343,7 +82687,7 @@ entities: pos: -9.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3461 components: - type: Transform @@ -84351,13 +82695,7 @@ entities: pos: -12.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 5444 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -5.5,-58.5 - parent: 30 + color: '#FF0000FF' - uid: 5857 components: - type: Transform @@ -84377,14 +82715,14 @@ entities: pos: -8.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6111 components: - type: Transform pos: -10.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6132 components: - type: Transform @@ -84392,7 +82730,7 @@ entities: pos: -14.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6140 components: - type: Transform @@ -84400,21 +82738,21 @@ entities: pos: -4.5,32.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6151 components: - type: Transform pos: -11.5,40.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6153 components: - type: Transform pos: -9.5,40.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6170 components: - type: Transform @@ -84422,7 +82760,7 @@ entities: pos: -15.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6172 components: - type: Transform @@ -84430,7 +82768,7 @@ entities: pos: -15.5,39.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6179 components: - type: Transform @@ -84438,7 +82776,7 @@ entities: pos: -3.5,31.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6185 components: - type: Transform @@ -84446,7 +82784,7 @@ entities: pos: -3.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6193 components: - type: Transform @@ -84454,7 +82792,7 @@ entities: pos: -9.5,42.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6199 components: - type: Transform @@ -84462,14 +82800,14 @@ entities: pos: -7.5,41.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6234 components: - type: Transform pos: -20.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6240 components: - type: Transform @@ -84477,14 +82815,14 @@ entities: pos: -20.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6252 components: - type: Transform pos: -19.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6254 components: - type: Transform @@ -84492,7 +82830,7 @@ entities: pos: -21.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6261 components: - type: Transform @@ -84500,29 +82838,14 @@ entities: pos: -26.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 6600 - components: - - type: Transform - pos: -11.5,-53.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 6601 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -5.5,-52.5 - parent: 30 - - type: AtmosPipeColor - color: '#03FCD3FF' + color: '#FF0000FF' - uid: 6666 components: - type: Transform pos: -30.5,-16.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6687 components: - type: Transform @@ -84530,7 +82853,7 @@ entities: pos: -17.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6713 components: - type: Transform @@ -84538,7 +82861,7 @@ entities: pos: -13.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6933 components: - type: Transform @@ -84546,7 +82869,7 @@ entities: pos: -18.5,-10.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7014 components: - type: Transform @@ -84554,7 +82877,7 @@ entities: pos: -23.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7044 components: - type: Transform @@ -84562,14 +82885,14 @@ entities: pos: -19.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7045 components: - type: Transform pos: -22.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7058 components: - type: Transform @@ -84577,64 +82900,28 @@ entities: pos: -30.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7061 components: - type: Transform pos: -19.5,-10.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7074 components: - type: Transform pos: -20.5,-10.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 7096 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -9.5,-57.5 - parent: 30 - - uid: 7097 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -9.5,-58.5 - parent: 30 - - uid: 7124 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,-52.5 - parent: 30 - - type: AtmosPipeColor - color: '#03FCD3FF' + color: '#FF0000FF' - uid: 7147 components: - type: Transform pos: -28.5,-17.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 7223 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -3.5,-49.5 - parent: 30 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 7228 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -12.5,-51.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7310 components: - type: Transform @@ -84642,7 +82929,7 @@ entities: pos: -8.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7311 components: - type: Transform @@ -84650,7 +82937,7 @@ entities: pos: -3.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7321 components: - type: Transform @@ -84658,7 +82945,7 @@ entities: pos: -1.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7322 components: - type: Transform @@ -84666,7 +82953,7 @@ entities: pos: -10.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7323 components: - type: Transform @@ -84674,7 +82961,7 @@ entities: pos: -2.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7337 components: - type: Transform @@ -84682,7 +82969,7 @@ entities: pos: -11.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7338 components: - type: Transform @@ -84690,21 +82977,21 @@ entities: pos: -12.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7351 components: - type: Transform pos: -18.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7374 components: - type: Transform pos: -7.5,-10.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7534 components: - type: Transform @@ -84712,14 +82999,14 @@ entities: pos: -17.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7545 components: - type: Transform pos: -23.5,-10.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7593 components: - type: Transform @@ -84733,7 +83020,7 @@ entities: pos: -29.5,-18.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7819 components: - type: Transform @@ -84741,14 +83028,14 @@ entities: pos: -28.5,-21.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7878 components: - type: Transform pos: -13.5,-10.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7886 components: - type: Transform @@ -84756,7 +83043,7 @@ entities: pos: -12.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7924 components: - type: Transform @@ -84764,7 +83051,7 @@ entities: pos: -22.5,-21.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7926 components: - type: Transform @@ -84772,7 +83059,7 @@ entities: pos: -22.5,-15.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7946 components: - type: Transform @@ -84780,14 +83067,14 @@ entities: pos: -25.5,-17.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7948 components: - type: Transform pos: -29.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7949 components: - type: Transform @@ -84795,7 +83082,7 @@ entities: pos: -28.5,-10.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7961 components: - type: Transform @@ -84803,7 +83090,7 @@ entities: pos: -17.5,-5.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8018 components: - type: Transform @@ -84811,7 +83098,7 @@ entities: pos: -20.5,-20.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8028 components: - type: Transform @@ -84819,7 +83106,7 @@ entities: pos: -22.5,-16.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8089 components: - type: Transform @@ -84827,14 +83114,14 @@ entities: pos: -30.5,-7.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8104 components: - type: Transform pos: -21.5,-17.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8107 components: - type: Transform @@ -84842,46 +83129,7 @@ entities: pos: -20.5,-17.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 8234 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -8.5,-51.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 8235 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -6.5,-51.5 - parent: 30 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 8237 - components: - - type: Transform - pos: -9.5,-49.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 8239 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -8.5,-49.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 8269 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -17.5,-47.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' + color: '#FF0000FF' - uid: 8299 components: - type: Transform @@ -84889,7 +83137,14 @@ entities: pos: 20.5,-19.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' + - uid: 8360 + components: + - type: Transform + pos: -16.5,-41.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' - uid: 8376 components: - type: Transform @@ -84897,7 +83152,23 @@ entities: pos: -1.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' + - uid: 8408 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -13.5,-40.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 8427 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -13.5,-41.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' - uid: 8790 components: - type: Transform @@ -84905,14 +83176,21 @@ entities: pos: 20.5,-21.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' + - uid: 8820 + components: + - type: Transform + pos: -21.5,-41.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' - uid: 8853 components: - type: Transform pos: -2.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8872 components: - type: Transform @@ -84920,7 +83198,7 @@ entities: pos: 9.5,-20.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8876 components: - type: Transform @@ -84928,14 +83206,14 @@ entities: pos: 7.5,-24.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8877 components: - type: Transform pos: 2.5,-27.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8884 components: - type: Transform @@ -84943,7 +83221,7 @@ entities: pos: 11.5,-15.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8893 components: - type: Transform @@ -84951,7 +83229,7 @@ entities: pos: 9.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8901 components: - type: Transform @@ -84959,7 +83237,7 @@ entities: pos: 11.5,-6.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8903 components: - type: Transform @@ -84967,7 +83245,7 @@ entities: pos: 11.5,-4.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8912 components: - type: Transform @@ -84975,14 +83253,14 @@ entities: pos: 12.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8919 components: - type: Transform pos: 4.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8920 components: - type: Transform @@ -84990,21 +83268,21 @@ entities: pos: 6.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8936 components: - type: Transform pos: 5.5,-18.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8939 components: - type: Transform pos: 7.5,-20.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8940 components: - type: Transform @@ -85012,7 +83290,7 @@ entities: pos: 7.5,-18.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8947 components: - type: Transform @@ -85020,7 +83298,7 @@ entities: pos: 13.5,-17.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8957 components: - type: Transform @@ -85028,7 +83306,7 @@ entities: pos: 20.5,-7.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8960 components: - type: Transform @@ -85036,14 +83314,14 @@ entities: pos: 13.5,-4.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8968 components: - type: Transform pos: 9.5,3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8979 components: - type: Transform @@ -85051,7 +83329,7 @@ entities: pos: 7.5,-8.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 9085 components: - type: Transform @@ -85059,29 +83337,36 @@ entities: pos: 3.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9658 + color: '#FF0000FF' + - uid: 9444 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -2.5,-52.5 + pos: -13.5,-30.5 parent: 30 - type: AtmosPipeColor - color: '#03FCD3FF' + color: '#FF0000FF' + - uid: 9446 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -13.5,-34.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' - uid: 9689 components: - type: Transform pos: -25.5,-21.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 9694 components: - type: Transform pos: -25.5,-22.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 9697 components: - type: Transform @@ -85089,7 +83374,7 @@ entities: pos: -25.5,-16.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 9728 components: - type: Transform @@ -85097,7 +83382,7 @@ entities: pos: 2.5,-20.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 9744 components: - type: Transform @@ -85105,23 +83390,7 @@ entities: pos: -1.5,-26.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 9746 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -3.5,-29.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9753 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -1.5,-27.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 9754 components: - type: Transform @@ -85129,14 +83398,14 @@ entities: pos: -3.5,-27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 9763 components: - type: Transform pos: 4.5,-18.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 9774 components: - type: Transform @@ -85144,7 +83413,7 @@ entities: pos: 0.5,-34.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 9779 components: - type: Transform @@ -85152,7 +83421,7 @@ entities: pos: 2.5,-32.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 9847 components: - type: Transform @@ -85160,7 +83429,7 @@ entities: pos: -11.5,-10.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 9850 components: - type: Transform @@ -85168,22 +83437,93 @@ entities: pos: -29.5,-17.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9867 + color: '#FF0000FF' + - uid: 9885 components: - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,-53.5 + rot: 1.5707963267948966 rad + pos: -18.5,-48.5 parent: 30 - type: AtmosPipeColor - color: '#03FCD3FF' + color: '#0000FFFF' + - uid: 9896 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -16.5,-46.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 9918 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -11.5,-35.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' - uid: 9981 components: - type: Transform pos: 6.5,-27.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' + - uid: 9992 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,-40.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 10137 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -11.5,-31.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 10160 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,-40.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 10214 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-39.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 10265 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -23.5,-43.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 10266 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,-39.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 10279 + components: + - type: Transform + pos: -1.5,-40.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' - uid: 10388 components: - type: Transform @@ -85191,7 +83531,7 @@ entities: pos: 21.5,-17.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 10402 components: - type: Transform @@ -85199,68 +83539,29 @@ entities: pos: 21.5,-18.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11073 + color: '#FF0000FF' + - uid: 10430 components: - type: Transform - pos: -11.5,-39.5 + pos: -18.5,-43.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11080 + color: '#0000FFFF' + - uid: 10440 components: - type: Transform - pos: -3.5,-39.5 + rot: 1.5707963267948966 rad + pos: -11.5,-45.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11087 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -17.5,-39.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11122 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -2.5,-41.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11132 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -12.5,-41.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11138 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -17.5,-42.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11140 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -19.5,-42.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' + color: '#FF0000FF' - uid: 11193 components: - type: Transform pos: 6.5,-23.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11694 components: - type: Transform @@ -85268,7 +83569,7 @@ entities: pos: 25.5,-11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11746 components: - type: Transform @@ -85276,14 +83577,14 @@ entities: pos: 33.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11763 components: - type: Transform pos: 24.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11776 components: - type: Transform @@ -85291,7 +83592,7 @@ entities: pos: 6.5,-24.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11859 components: - type: Transform @@ -85299,7 +83600,7 @@ entities: pos: 24.5,-6.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11860 components: - type: Transform @@ -85307,7 +83608,7 @@ entities: pos: 26.5,-6.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11861 components: - type: Transform @@ -85315,7 +83616,7 @@ entities: pos: 25.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11877 components: - type: Transform @@ -85323,7 +83624,7 @@ entities: pos: 21.5,-5.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11879 components: - type: Transform @@ -85331,7 +83632,7 @@ entities: pos: 20.5,-1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11904 components: - type: Transform @@ -85339,7 +83640,7 @@ entities: pos: 19.5,-11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11934 components: - type: Transform @@ -85347,14 +83648,14 @@ entities: pos: 16.5,-11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11935 components: - type: Transform pos: 17.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11936 components: - type: Transform @@ -85362,7 +83663,7 @@ entities: pos: 21.5,-11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11950 components: - type: Transform @@ -85370,7 +83671,7 @@ entities: pos: 13.5,-7.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11968 components: - type: Transform @@ -85378,7 +83679,7 @@ entities: pos: 20.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11999 components: - type: Transform @@ -85386,21 +83687,21 @@ entities: pos: 6.5,-25.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12018 components: - type: Transform pos: 24.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12020 components: - type: Transform pos: 33.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12062 components: - type: Transform @@ -85408,7 +83709,7 @@ entities: pos: 29.5,-6.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12472 components: - type: Transform @@ -85416,7 +83717,7 @@ entities: pos: 8.5,31.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12473 components: - type: Transform @@ -85424,21 +83725,21 @@ entities: pos: 10.5,33.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12488 components: - type: Transform pos: 10.5,39.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12503 components: - type: Transform pos: 16.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12513 components: - type: Transform @@ -85446,7 +83747,7 @@ entities: pos: 21.5,33.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12523 components: - type: Transform @@ -85454,7 +83755,7 @@ entities: pos: 18.5,25.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12528 components: - type: Transform @@ -85462,7 +83763,7 @@ entities: pos: 23.5,26.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12540 components: - type: Transform @@ -85470,7 +83771,7 @@ entities: pos: 23.5,34.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12542 components: - type: Transform @@ -85478,7 +83779,7 @@ entities: pos: 23.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12543 components: - type: Transform @@ -85486,14 +83787,14 @@ entities: pos: 21.5,39.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12544 components: - type: Transform pos: 23.5,40.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12545 components: - type: Transform @@ -85501,7 +83802,7 @@ entities: pos: 20.5,40.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12559 components: - type: Transform @@ -85509,7 +83810,7 @@ entities: pos: 24.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12582 components: - type: Transform @@ -85517,7 +83818,7 @@ entities: pos: 20.5,43.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12584 components: - type: Transform @@ -85525,7 +83826,7 @@ entities: pos: 25.5,40.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12599 components: - type: Transform @@ -85533,19 +83834,26 @@ entities: pos: 23.5,38.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12600 components: - type: Transform pos: 26.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12754 components: - type: Transform pos: 32.5,14.5 parent: 30 + - uid: 12835 + components: + - type: Transform + pos: -61.5,-59.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' - uid: 12882 components: - type: Transform @@ -85553,14 +83861,14 @@ entities: pos: 23.5,18.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12885 components: - type: Transform pos: 28.5,20.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12940 components: - type: Transform @@ -85568,15 +83876,7 @@ entities: pos: 14.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 12944 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 18.5,15.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12951 components: - type: Transform @@ -85584,7 +83884,7 @@ entities: pos: 23.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12954 components: - type: Transform @@ -85592,14 +83892,14 @@ entities: pos: 23.5,10.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12963 components: - type: Transform pos: 28.5,8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12989 components: - type: Transform @@ -85607,7 +83907,7 @@ entities: pos: 14.5,18.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12991 components: - type: Transform @@ -85615,14 +83915,14 @@ entities: pos: 14.5,20.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12997 components: - type: Transform pos: 23.5,19.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13007 components: - type: Transform @@ -85630,7 +83930,7 @@ entities: pos: 8.5,17.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13011 components: - type: Transform @@ -85638,14 +83938,14 @@ entities: pos: 12.5,17.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13017 components: - type: Transform pos: 13.5,22.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13022 components: - type: Transform @@ -85653,7 +83953,7 @@ entities: pos: 12.5,16.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13030 components: - type: Transform @@ -85661,7 +83961,7 @@ entities: pos: 18.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13033 components: - type: Transform @@ -85669,7 +83969,7 @@ entities: pos: 21.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13059 components: - type: Transform @@ -85677,7 +83977,7 @@ entities: pos: 25.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13076 components: - type: Transform @@ -85685,7 +83985,7 @@ entities: pos: 38.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13634 components: - type: Transform @@ -85693,21 +83993,21 @@ entities: pos: 52.5,20.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13753 components: - type: Transform pos: 31.5,38.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13757 components: - type: Transform pos: 35.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13765 components: - type: Transform @@ -85715,7 +84015,7 @@ entities: pos: 43.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13768 components: - type: Transform @@ -85723,7 +84023,7 @@ entities: pos: 31.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13772 components: - type: Transform @@ -85731,14 +84031,14 @@ entities: pos: 35.5,38.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13776 components: - type: Transform pos: 39.5,38.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13784 components: - type: Transform @@ -85746,7 +84046,7 @@ entities: pos: 30.5,38.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13790 components: - type: Transform @@ -85754,7 +84054,43 @@ entities: pos: 30.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' + - uid: 14440 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -55.5,-60.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 14455 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -25.5,10.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 14512 + components: + - type: Transform + pos: 17.5,15.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 16802 + components: + - type: Transform + pos: -62.5,-60.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 17718 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -53.5,-64.5 + parent: 30 - uid: 18380 components: - type: Transform @@ -85762,7 +84098,7 @@ entities: pos: -45.5,-17.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18387 components: - type: Transform @@ -85770,14 +84106,14 @@ entities: pos: -61.5,-22.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18391 components: - type: Transform pos: -57.5,-22.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18397 components: - type: Transform @@ -85785,7 +84121,7 @@ entities: pos: -53.5,-24.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18403 components: - type: Transform @@ -85793,7 +84129,7 @@ entities: pos: -44.5,-13.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18412 components: - type: Transform @@ -85801,14 +84137,14 @@ entities: pos: -44.5,-21.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18416 components: - type: Transform pos: -61.5,-24.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18421 components: - type: Transform @@ -85816,14 +84152,14 @@ entities: pos: -58.5,-24.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18426 components: - type: Transform pos: -51.5,-22.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18430 components: - type: Transform @@ -85831,7 +84167,7 @@ entities: pos: -49.5,-24.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18446 components: - type: Transform @@ -85839,7 +84175,7 @@ entities: pos: -63.5,-21.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18492 components: - type: Transform @@ -85847,7 +84183,7 @@ entities: pos: -65.5,-45.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18493 components: - type: Transform @@ -85855,7 +84191,7 @@ entities: pos: -64.5,-45.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18501 components: - type: Transform @@ -85863,14 +84199,14 @@ entities: pos: -68.5,-45.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18510 components: - type: Transform pos: -77.5,-45.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18521 components: - type: Transform @@ -85878,7 +84214,7 @@ entities: pos: -68.5,-44.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18525 components: - type: Transform @@ -85886,14 +84222,14 @@ entities: pos: -62.5,-49.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18526 components: - type: Transform pos: -60.5,-48.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18542 components: - type: Transform @@ -85901,14 +84237,7 @@ entities: pos: -60.5,-60.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 18547 - components: - - type: Transform - pos: -59.5,-60.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18550 components: - type: Transform @@ -85916,7 +84245,7 @@ entities: pos: -56.5,-53.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18554 components: - type: Transform @@ -85924,7 +84253,7 @@ entities: pos: -56.5,-57.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18566 components: - type: Transform @@ -85932,7 +84261,7 @@ entities: pos: -55.5,-52.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18568 components: - type: Transform @@ -85940,7 +84269,7 @@ entities: pos: -67.5,-54.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18570 components: - type: Transform @@ -85948,7 +84277,7 @@ entities: pos: -55.5,-56.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18578 components: - type: Transform @@ -85956,7 +84285,7 @@ entities: pos: -63.5,-49.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18591 components: - type: Transform @@ -85964,28 +84293,14 @@ entities: pos: -68.5,-55.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 18599 - components: - - type: Transform - pos: -64.5,-60.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18603 components: - type: Transform pos: -63.5,-59.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 18604 - components: - - type: Transform - pos: -58.5,-59.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18610 components: - type: Transform @@ -85993,7 +84308,7 @@ entities: pos: -67.5,-59.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18611 components: - type: Transform @@ -86001,7 +84316,7 @@ entities: pos: -68.5,-60.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18614 components: - type: Transform @@ -86009,7 +84324,7 @@ entities: pos: -56.5,-49.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18615 components: - type: Transform @@ -86017,7 +84332,7 @@ entities: pos: -55.5,-48.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18616 components: - type: Transform @@ -86025,14 +84340,14 @@ entities: pos: -61.5,-48.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18618 components: - type: Transform pos: -61.5,-46.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18623 components: - type: Transform @@ -86040,7 +84355,7 @@ entities: pos: -58.5,-44.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18636 components: - type: Transform @@ -86048,7 +84363,7 @@ entities: pos: -67.5,-46.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18637 components: - type: Transform @@ -86056,7 +84371,7 @@ entities: pos: -68.5,-46.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18644 components: - type: Transform @@ -86064,7 +84379,7 @@ entities: pos: -75.5,-46.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18658 components: - type: Transform @@ -86072,28 +84387,28 @@ entities: pos: -75.5,-43.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18704 components: - type: Transform pos: -74.5,-60.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18711 components: - type: Transform pos: -75.5,-59.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18717 components: - type: Transform pos: -80.5,-60.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18739 components: - type: Transform @@ -86101,7 +84416,7 @@ entities: pos: -72.5,-54.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18748 components: - type: Transform @@ -86109,18 +84424,7 @@ entities: pos: -71.5,-55.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 18780 - components: - - type: Transform - pos: -65.5,-64.5 - parent: 30 - - uid: 18781 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -64.5,-64.5 - parent: 30 + color: '#0000FFFF' - uid: 22014 components: - type: Transform @@ -86128,35 +84432,9 @@ entities: pos: -0.5,65.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 22787 - components: - - type: Transform - pos: -26.5,-58.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 22788 - components: - - type: Transform - pos: -30.5,-58.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - proto: GasPort entities: - - uid: 6670 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -10.5,-48.5 - parent: 30 - - uid: 6711 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -11.5,-48.5 - parent: 30 - uid: 6757 components: - type: Transform @@ -86169,34 +84447,6 @@ entities: rot: 1.5707963267948966 rad pos: -38.5,-10.5 parent: 30 - - uid: 8800 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -10.5,-51.5 - parent: 30 - - uid: 8801 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -4.5,-51.5 - parent: 30 - - uid: 9064 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,-51.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9676 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -3.5,-51.5 - parent: 30 - - type: AtmosPipeColor - color: '#03FCD3FF' - uid: 10390 components: - type: Transform @@ -86204,7 +84454,7 @@ entities: pos: 20.5,-17.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 10392 components: - type: Transform @@ -86212,7 +84462,7 @@ entities: pos: 20.5,-16.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11744 components: - type: Transform @@ -86220,7 +84470,7 @@ entities: pos: 5.5,-25.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11869 components: - type: Transform @@ -86228,7 +84478,13 @@ entities: pos: 5.5,-24.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' + - uid: 12699 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -52.5,-63.5 + parent: 30 - uid: 12867 components: - type: Transform @@ -86247,28 +84503,22 @@ entities: rot: 3.141592653589793 rad pos: 38.5,9.5 parent: 30 + - uid: 14363 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -52.5,-65.5 + parent: 30 - uid: 16775 components: - type: Transform pos: 36.5,10.5 parent: 30 - - uid: 18776 + - uid: 18772 components: - type: Transform - rot: 3.141592653589793 rad - pos: -64.5,-65.5 - parent: 30 - - uid: 18777 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -65.5,-65.5 - parent: 30 - - uid: 18778 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -66.5,-65.5 + rot: -1.5707963267948966 rad + pos: -52.5,-64.5 parent: 30 - uid: 19440 components: @@ -86278,6 +84528,14 @@ entities: parent: 30 - proto: GasPressurePump entities: + - uid: 337 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -52.5,-61.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' - uid: 7140 components: - type: MetaData @@ -86306,7 +84564,7 @@ entities: pos: -30.5,-10.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8781 components: - type: Transform @@ -86314,7 +84572,7 @@ entities: pos: 16.5,-24.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8792 components: - type: Transform @@ -86362,32 +84620,6 @@ entities: parent: 30 - type: AtmosPipeColor color: '#EB9834FF' - - uid: 9066 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -9.5,-51.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9102 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -5.5,-51.5 - parent: 30 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 9862 - components: - - type: MetaData - name: mix to sme loop - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,-54.5 - parent: 30 - - type: AtmosPipeColor - color: '#34E5EBFF' - uid: 12922 components: - type: Transform @@ -86399,14 +84631,6 @@ entities: - type: Transform pos: 38.5,10.5 parent: 30 - - uid: 18772 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -64.5,-62.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - proto: GasThermoMachineFreezer entities: - uid: 482 @@ -86419,33 +84643,24 @@ entities: - type: Transform pos: -36.5,-9.5 parent: 30 - - uid: 6659 + - uid: 905 components: - type: Transform - pos: -10.5,-47.5 + rot: -1.5707963267948966 rad + pos: 4.5,-53.5 parent: 30 - - uid: 7109 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 0.5,-51.5 - parent: 30 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 7112 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 0.5,-52.5 - parent: 30 - - type: AtmosPipeColor - color: '#03FCD3FF' - uid: 7598 components: - type: Transform rot: 3.141592653589793 rad pos: -34.5,-13.5 parent: 30 + - uid: 11013 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-52.5 + parent: 30 - uid: 12038 components: - type: Transform @@ -86470,10 +84685,11 @@ entities: parent: 30 - proto: GasThermoMachineHeater entities: - - uid: 6642 + - uid: 9997 components: - type: Transform - pos: -11.5,-47.5 + rot: 1.5707963267948966 rad + pos: -5.5,-53.5 parent: 30 - uid: 12085 components: @@ -86481,66 +84697,14 @@ entities: rot: -1.5707963267948966 rad pos: 17.5,-35.5 parent: 30 + - uid: 13960 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,-52.5 + parent: 30 - proto: GasValve entities: - - uid: 6714 - components: - - type: Transform - pos: -11.5,-55.5 - parent: 30 - - type: GasValve - open: False - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 7222 - components: - - type: MetaData - name: Emergency Dump Valve - - type: Transform - rot: -1.5707963267948966 rad - pos: -7.5,-48.5 - parent: 30 - - type: GasValve - open: False - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 8278 - components: - - type: MetaData - name: Cold Loop Valve - - type: Transform - rot: -1.5707963267948966 rad - pos: -4.5,-49.5 - parent: 30 - - type: GasValve - open: False - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 9657 - components: - - type: Transform - pos: -9.5,-55.5 - parent: 30 - - type: GasValve - open: False - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 9807 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -5.5,-55.5 - parent: 30 - - type: GasValve - open: False - - uid: 9808 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -3.5,-55.5 - parent: 30 - - type: GasValve - open: False - uid: 21274 components: - type: MetaData @@ -86552,7 +84716,7 @@ entities: - type: GasValve open: False - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - proto: GasVentPump entities: - uid: 2451 @@ -86562,7 +84726,7 @@ entities: pos: -35.5,31.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2454 components: - type: Transform @@ -86570,7 +84734,7 @@ entities: pos: -35.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2482 components: - type: Transform @@ -86578,7 +84742,7 @@ entities: pos: -49.5,32.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2491 components: - type: Transform @@ -86586,14 +84750,14 @@ entities: pos: -41.5,32.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2493 components: - type: Transform pos: -45.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2503 components: - type: Transform @@ -86601,14 +84765,14 @@ entities: pos: -35.5,39.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2523 components: - type: Transform pos: -33.5,43.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2524 components: - type: Transform @@ -86616,7 +84780,7 @@ entities: pos: -30.5,46.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2544 components: - type: Transform @@ -86624,14 +84788,14 @@ entities: pos: -41.5,48.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2551 components: - type: Transform pos: -40.5,51.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2573 components: - type: Transform @@ -86639,7 +84803,7 @@ entities: pos: -25.5,49.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2592 components: - type: Transform @@ -86647,7 +84811,7 @@ entities: pos: -31.5,57.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2594 components: - type: Transform @@ -86655,7 +84819,7 @@ entities: pos: -30.5,52.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2638 components: - type: Transform @@ -86663,7 +84827,7 @@ entities: pos: -38.5,40.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2639 components: - type: Transform @@ -86671,7 +84835,7 @@ entities: pos: -42.5,40.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2640 components: - type: Transform @@ -86679,14 +84843,14 @@ entities: pos: -46.5,40.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2644 components: - type: Transform pos: -41.5,43.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2669 components: - type: Transform @@ -86694,7 +84858,7 @@ entities: pos: -47.5,49.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2676 components: - type: Transform @@ -86702,14 +84866,14 @@ entities: pos: -50.5,52.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2705 components: - type: Transform pos: -48.5,68.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2706 components: - type: Transform @@ -86717,7 +84881,7 @@ entities: pos: -48.5,66.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2707 components: - type: Transform @@ -86725,7 +84889,7 @@ entities: pos: -49.5,61.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2708 components: - type: Transform @@ -86733,7 +84897,7 @@ entities: pos: -45.5,61.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2734 components: - type: Transform @@ -86741,7 +84905,7 @@ entities: pos: -47.5,56.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2743 components: - type: Transform @@ -86749,14 +84913,14 @@ entities: pos: -28.5,42.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 2862 components: - type: Transform pos: -8.5,26.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3042 components: - type: Transform @@ -86764,7 +84928,7 @@ entities: pos: -26.5,31.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3050 components: - type: Transform @@ -86772,7 +84936,7 @@ entities: pos: -30.5,22.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3056 components: - type: Transform @@ -86780,7 +84944,7 @@ entities: pos: -26.5,23.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3062 components: - type: Transform @@ -86788,7 +84952,7 @@ entities: pos: -22.5,23.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3064 components: - type: Transform @@ -86796,7 +84960,7 @@ entities: pos: -35.5,26.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3066 components: - type: Transform @@ -86804,7 +84968,7 @@ entities: pos: -35.5,19.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3069 components: - type: Transform @@ -86812,21 +84976,21 @@ entities: pos: -35.5,8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3077 components: - type: Transform pos: -40.5,10.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3099 components: - type: Transform pos: -42.5,6.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3111 components: - type: Transform @@ -86834,7 +84998,7 @@ entities: pos: -39.5,0.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3135 components: - type: Transform @@ -86842,7 +85006,7 @@ entities: pos: -53.5,9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3148 components: - type: Transform @@ -86850,7 +85014,7 @@ entities: pos: -45.5,4.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3171 components: - type: Transform @@ -86858,7 +85022,7 @@ entities: pos: -45.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3228 components: - type: Transform @@ -86866,28 +85030,28 @@ entities: pos: -31.5,8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3230 components: - type: Transform pos: -32.5,2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3253 components: - type: Transform pos: -43.5,18.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3266 components: - type: Transform pos: -44.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3302 components: - type: Transform @@ -86895,7 +85059,7 @@ entities: pos: -60.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3303 components: - type: Transform @@ -86903,7 +85067,7 @@ entities: pos: -60.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3304 components: - type: Transform @@ -86911,7 +85075,7 @@ entities: pos: -60.5,21.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3305 components: - type: Transform @@ -86919,7 +85083,7 @@ entities: pos: -60.5,23.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3323 components: - type: Transform @@ -86927,43 +85091,35 @@ entities: pos: -56.5,18.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3324 components: - type: Transform pos: -50.5,18.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3325 components: - type: Transform pos: -27.5,2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3327 components: - type: Transform pos: -17.5,2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 3357 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -26.5,10.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3376 components: - type: Transform pos: -26.5,16.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3401 components: - type: Transform @@ -86971,21 +85127,21 @@ entities: pos: -13.5,10.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3407 components: - type: Transform pos: -10.5,2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3410 components: - type: Transform pos: 5.5,2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3422 components: - type: Transform @@ -86993,14 +85149,14 @@ entities: pos: -0.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3469 components: - type: Transform pos: -16.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3479 components: - type: Transform @@ -87008,14 +85164,14 @@ entities: pos: -8.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3480 components: - type: Transform pos: -9.5,18.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3481 components: - type: Transform @@ -87023,7 +85179,7 @@ entities: pos: 3.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 3485 components: - type: Transform @@ -87031,21 +85187,21 @@ entities: pos: -0.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6109 components: - type: Transform pos: -23.5,26.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6113 components: - type: Transform pos: 3.5,26.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6123 components: - type: Transform @@ -87053,14 +85209,14 @@ entities: pos: -0.5,21.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6205 components: - type: Transform pos: -9.5,43.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6214 components: - type: Transform @@ -87068,7 +85224,7 @@ entities: pos: -7.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6223 components: - type: Transform @@ -87076,7 +85232,7 @@ entities: pos: 0.5,31.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6229 components: - type: Transform @@ -87084,7 +85240,7 @@ entities: pos: -19.5,39.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6239 components: - type: Transform @@ -87092,7 +85248,7 @@ entities: pos: -25.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6245 components: - type: Transform @@ -87100,7 +85256,7 @@ entities: pos: -20.5,31.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6246 components: - type: Transform @@ -87108,7 +85264,7 @@ entities: pos: -19.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6834 components: - type: Transform @@ -87116,7 +85272,7 @@ entities: pos: -25.5,-22.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6900 components: - type: Transform @@ -87124,7 +85280,7 @@ entities: pos: -28.5,-1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6920 components: - type: Transform @@ -87132,7 +85288,7 @@ entities: pos: -33.5,-16.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 6939 components: - type: Transform @@ -87140,14 +85296,25 @@ entities: pos: -18.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' + - uid: 7099 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,-40.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 13957 + - type: AtmosPipeColor + color: '#0000FFFF' - uid: 7115 components: - type: Transform pos: -28.5,-20.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7136 components: - type: Transform @@ -87157,7 +85324,7 @@ entities: deviceLists: - 8267 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7137 components: - type: Transform @@ -87167,14 +85334,14 @@ entities: deviceLists: - 8267 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7340 components: - type: Transform pos: -12.5,-1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7373 components: - type: Transform @@ -87182,7 +85349,7 @@ entities: pos: -7.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 7424 components: - type: Transform @@ -87190,7 +85357,18 @@ entities: pos: -35.5,-1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' + - uid: 7443 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,-43.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 13957 + - type: AtmosPipeColor + color: '#0000FFFF' - uid: 7569 components: - type: Transform @@ -87201,14 +85379,14 @@ entities: deviceLists: - 8254 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8033 components: - type: Transform pos: -13.5,-8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8100 components: - type: Transform @@ -87216,14 +85394,36 @@ entities: pos: -13.5,-20.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 8224 components: - type: Transform pos: -22.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' + - uid: 8297 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -24.5,-47.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 13958 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 8311 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -18.5,-52.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 19570 + - type: AtmosPipeColor + color: '#0000FFFF' - uid: 8316 components: - type: Transform @@ -87231,14 +85431,36 @@ entities: pos: -29.5,-7.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' + - uid: 8335 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -17.5,-48.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 19570 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 8454 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.5,-47.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 13957 + - type: AtmosPipeColor + color: '#0000FFFF' - uid: 9046 components: - type: Transform pos: -25.5,-15.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 9686 components: - type: Transform @@ -87249,7 +85471,7 @@ entities: deviceLists: - 9671 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 9811 components: - type: Transform @@ -87257,44 +85479,76 @@ entities: pos: -54.5,-8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11153 + color: '#0000FFFF' + - uid: 9884 + components: + - type: Transform + pos: -23.5,-42.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 13958 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 9903 components: - type: Transform rot: 1.5707963267948966 rad - pos: -22.5,-42.5 + pos: -12.5,-35.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 13966 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11154 + color: '#0000FFFF' + - uid: 9908 components: - type: Transform - pos: -12.5,-40.5 + rot: 1.5707963267948966 rad + pos: -16.5,-29.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 13966 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11155 + color: '#0000FFFF' + - uid: 10022 components: - type: Transform - pos: -2.5,-40.5 + rot: 1.5707963267948966 rad + pos: -12.5,-31.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 13966 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11162 - components: - - type: Transform - pos: -6.5,-35.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11163 + color: '#0000FFFF' + - uid: 10233 components: - type: Transform rot: 3.141592653589793 rad - pos: -6.5,-43.5 + pos: -63.5,-63.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' + - uid: 11026 + components: + - type: Transform + pos: -6.5,-36.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' + - uid: 11134 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-45.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 9996 + - type: AtmosPipeColor + color: '#0000FFFF' - uid: 11165 components: - type: Transform @@ -87302,15 +85556,7 @@ entities: pos: 1.5,-32.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11176 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -10.5,-28.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11178 components: - type: Transform @@ -87318,36 +85564,42 @@ entities: pos: -2.5,-26.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11180 components: - type: Transform pos: 10.5,-23.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 10010 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11188 components: - type: Transform rot: 3.141592653589793 rad pos: 10.5,-28.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 10010 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11200 components: - type: Transform pos: 2.5,-19.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11208 components: - type: Transform pos: 9.5,-15.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11211 components: - type: Transform @@ -87355,14 +85607,14 @@ entities: pos: 12.5,-17.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11216 components: - type: Transform pos: -2.5,-1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11217 components: - type: Transform @@ -87370,7 +85622,7 @@ entities: pos: 5.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11220 components: - type: Transform @@ -87378,7 +85630,7 @@ entities: pos: 8.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11222 components: - type: Transform @@ -87386,21 +85638,14 @@ entities: pos: 14.5,-4.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11224 components: - type: Transform pos: 12.5,2.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 11227 - components: - - type: Transform - pos: -19.5,-36.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11664 components: - type: Transform @@ -87408,7 +85653,7 @@ entities: pos: 33.5,-10.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11868 components: - type: Transform @@ -87416,7 +85661,7 @@ entities: pos: 24.5,-10.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11872 components: - type: Transform @@ -87424,7 +85669,7 @@ entities: pos: 24.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11922 components: - type: Transform @@ -87432,7 +85677,7 @@ entities: pos: 37.5,-5.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11938 components: - type: Transform @@ -87440,7 +85685,7 @@ entities: pos: 17.5,-10.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11939 components: - type: Transform @@ -87448,14 +85693,14 @@ entities: pos: 20.5,-10.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11981 components: - type: Transform pos: 20.5,0.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 11991 components: - type: Transform @@ -87463,21 +85708,21 @@ entities: pos: 19.5,-1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12007 components: - type: Transform pos: 30.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12010 components: - type: Transform pos: 25.5,0.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12060 components: - type: Transform @@ -87485,7 +85730,7 @@ entities: pos: 37.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12081 components: - type: Transform @@ -87493,7 +85738,7 @@ entities: pos: 30.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12230 components: - type: Transform @@ -87501,7 +85746,7 @@ entities: pos: 34.5,-14.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12491 components: - type: Transform @@ -87509,7 +85754,7 @@ entities: pos: 9.5,33.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12492 components: - type: Transform @@ -87517,14 +85762,14 @@ entities: pos: 11.5,39.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12495 components: - type: Transform pos: 9.5,41.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12537 components: - type: Transform @@ -87532,14 +85777,14 @@ entities: pos: 9.5,24.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12538 components: - type: Transform pos: 18.5,26.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12579 components: - type: Transform @@ -87547,7 +85792,7 @@ entities: pos: 18.5,40.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12580 components: - type: Transform @@ -87555,7 +85800,7 @@ entities: pos: 18.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12581 components: - type: Transform @@ -87563,14 +85808,14 @@ entities: pos: 18.5,34.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12587 components: - type: Transform pos: 25.5,42.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12605 components: - type: Transform @@ -87578,14 +85823,14 @@ entities: pos: 24.5,38.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12611 components: - type: Transform pos: 27.5,27.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12756 components: - type: Transform @@ -87598,7 +85843,7 @@ entities: pos: 32.5,11.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12959 components: - type: Transform @@ -87606,7 +85851,7 @@ entities: pos: 27.5,18.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 12976 components: - type: Transform @@ -87614,23 +85859,18 @@ entities: pos: 37.5,8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 12983 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 16.5,10.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13002 components: - type: Transform rot: 1.5707963267948966 rad pos: 22.5,13.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 14365 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13003 components: - type: Transform @@ -87638,7 +85878,7 @@ entities: pos: 28.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13004 components: - type: Transform @@ -87646,14 +85886,14 @@ entities: pos: 24.5,19.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13005 components: - type: Transform pos: 14.5,21.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13006 components: - type: Transform @@ -87661,14 +85901,18 @@ entities: pos: 13.5,18.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 13081 + color: '#0000FFFF' + - uid: 13085 components: - type: Transform - pos: 18.5,16.5 + rot: 3.141592653589793 rad + pos: 17.5,14.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 14365 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13335 components: - type: Transform @@ -87676,7 +85920,7 @@ entities: pos: 9.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13360 components: - type: Transform @@ -87684,28 +85928,28 @@ entities: pos: 26.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13469 components: - type: Transform pos: 16.5,57.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13470 components: - type: Transform pos: 20.5,44.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13593 components: - type: Transform pos: 35.5,39.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13783 components: - type: Transform @@ -87713,7 +85957,7 @@ entities: pos: 45.5,38.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13788 components: - type: Transform @@ -87721,14 +85965,22 @@ entities: pos: 30.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 13789 components: - type: Transform pos: 30.5,42.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' + - uid: 14510 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -26.5,10.5 + parent: 30 + - type: AtmosPipeColor + color: '#0000FFFF' - uid: 15441 components: - type: Transform @@ -87736,14 +85988,14 @@ entities: pos: 51.5,20.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 15619 components: - type: Transform pos: 52.5,23.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 16096 components: - type: Transform @@ -87751,7 +86003,18 @@ entities: pos: 6.5,-28.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' + - uid: 18074 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 14.5,12.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 14365 + - type: AtmosPipeColor + color: '#0000FFFF' - uid: 18436 components: - type: Transform @@ -87759,7 +86022,7 @@ entities: pos: -45.5,-13.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18437 components: - type: Transform @@ -87767,35 +86030,35 @@ entities: pos: -45.5,-21.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18438 components: - type: Transform pos: -58.5,-23.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18439 components: - type: Transform pos: -49.5,-23.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18440 components: - type: Transform pos: -53.5,-23.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18449 components: - type: Transform pos: -63.5,-19.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18450 components: - type: Transform @@ -87803,7 +86066,7 @@ entities: pos: -62.5,-21.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18629 components: - type: Transform @@ -87811,49 +86074,49 @@ entities: pos: -59.5,-44.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18655 components: - type: Transform pos: -79.5,-39.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18662 components: - type: Transform pos: -77.5,-42.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18663 components: - type: Transform pos: -75.5,-41.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18667 components: - type: Transform pos: -68.5,-45.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18668 components: - type: Transform pos: -67.5,-42.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18674 components: - type: Transform pos: -55.5,-45.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18678 components: - type: Transform @@ -87861,7 +86124,7 @@ entities: pos: -52.5,-56.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18679 components: - type: Transform @@ -87869,7 +86132,7 @@ entities: pos: -52.5,-52.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18720 components: - type: Transform @@ -87877,7 +86140,7 @@ entities: pos: -83.5,-60.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18731 components: - type: Transform @@ -87885,7 +86148,7 @@ entities: pos: -80.5,-61.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18732 components: - type: Transform @@ -87893,7 +86156,7 @@ entities: pos: -74.5,-61.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18753 components: - type: Transform @@ -87901,21 +86164,21 @@ entities: pos: -76.5,-55.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18754 components: - type: Transform pos: -71.5,-53.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18757 components: - type: Transform pos: -60.5,-59.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 18758 components: - type: Transform @@ -87923,15 +86186,7 @@ entities: pos: -60.5,-49.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 18769 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -59.5,-64.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 20335 components: - type: Transform @@ -87939,7 +86194,7 @@ entities: pos: 4.5,-8.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 21549 components: - type: Transform @@ -87947,14 +86202,14 @@ entities: pos: 39.5,34.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 22023 components: - type: Transform pos: -0.5,74.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 22024 components: - type: Transform @@ -87962,46 +86217,14 @@ entities: pos: 0.5,65.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - uid: 22025 components: - type: Transform pos: -1.5,38.5 parent: 30 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 22768 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -16.5,-47.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 22799 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -26.5,-59.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 22800 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -31.5,-58.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 22801 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -36.5,-60.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0000FFFF' - proto: GasVentScrubber entities: - uid: 2324 @@ -88016,7 +86239,7 @@ entities: pos: -35.5,32.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2453 components: - type: Transform @@ -88024,7 +86247,7 @@ entities: pos: -35.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2483 components: - type: Transform @@ -88032,7 +86255,7 @@ entities: pos: -50.5,32.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2490 components: - type: Transform @@ -88040,7 +86263,7 @@ entities: pos: -42.5,32.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2492 components: - type: Transform @@ -88048,7 +86271,7 @@ entities: pos: -41.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2504 components: - type: Transform @@ -88056,7 +86279,7 @@ entities: pos: -35.5,40.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2525 components: - type: Transform @@ -88064,7 +86287,7 @@ entities: pos: -35.5,43.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2526 components: - type: Transform @@ -88072,7 +86295,7 @@ entities: pos: -34.5,46.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2545 components: - type: Transform @@ -88080,14 +86303,14 @@ entities: pos: -41.5,47.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2552 components: - type: Transform pos: -38.5,51.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2574 components: - type: Transform @@ -88095,7 +86318,7 @@ entities: pos: -25.5,51.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2593 components: - type: Transform @@ -88103,7 +86326,7 @@ entities: pos: -33.5,57.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2595 components: - type: Transform @@ -88111,7 +86334,7 @@ entities: pos: -34.5,52.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2641 components: - type: Transform @@ -88119,7 +86342,7 @@ entities: pos: -48.5,40.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2642 components: - type: Transform @@ -88127,7 +86350,7 @@ entities: pos: -44.5,40.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2643 components: - type: Transform @@ -88135,7 +86358,7 @@ entities: pos: -40.5,40.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2645 components: - type: Transform @@ -88143,7 +86366,7 @@ entities: pos: -43.5,43.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2670 components: - type: Transform @@ -88151,7 +86374,7 @@ entities: pos: -47.5,50.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2675 components: - type: Transform @@ -88159,7 +86382,7 @@ entities: pos: -50.5,51.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2730 components: - type: Transform @@ -88167,7 +86390,7 @@ entities: pos: -48.5,63.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2731 components: - type: Transform @@ -88175,7 +86398,7 @@ entities: pos: -50.5,60.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2732 components: - type: Transform @@ -88183,7 +86406,7 @@ entities: pos: -46.5,60.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2733 components: - type: Transform @@ -88191,7 +86414,7 @@ entities: pos: -49.5,56.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 2742 components: - type: Transform @@ -88199,7 +86422,7 @@ entities: pos: -28.5,43.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3006 components: - type: Transform @@ -88207,7 +86430,7 @@ entities: pos: -10.5,26.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3041 components: - type: Transform @@ -88215,7 +86438,7 @@ entities: pos: -30.5,31.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3049 components: - type: Transform @@ -88223,7 +86446,7 @@ entities: pos: -31.5,22.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3055 components: - type: Transform @@ -88231,7 +86454,7 @@ entities: pos: -27.5,23.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3063 components: - type: Transform @@ -88239,7 +86462,7 @@ entities: pos: -21.5,22.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3065 components: - type: Transform @@ -88247,7 +86470,7 @@ entities: pos: -35.5,24.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3067 components: - type: Transform @@ -88255,7 +86478,7 @@ entities: pos: -35.5,17.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3068 components: - type: Transform @@ -88263,7 +86486,7 @@ entities: pos: -35.5,10.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3076 components: - type: Transform @@ -88271,7 +86494,7 @@ entities: pos: -39.5,10.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3100 components: - type: Transform @@ -88279,7 +86502,7 @@ entities: pos: -39.5,6.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3112 components: - type: Transform @@ -88287,7 +86510,7 @@ entities: pos: -41.5,0.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3136 components: - type: Transform @@ -88295,7 +86518,7 @@ entities: pos: -52.5,9.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3147 components: - type: Transform @@ -88303,7 +86526,7 @@ entities: pos: -44.5,6.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3170 components: - type: Transform @@ -88311,7 +86534,7 @@ entities: pos: -44.5,-5.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3229 components: - type: Transform @@ -88319,7 +86542,7 @@ entities: pos: -31.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3231 components: - type: Transform @@ -88327,14 +86550,14 @@ entities: pos: -31.5,2.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3254 components: - type: Transform pos: -42.5,18.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3267 components: - type: Transform @@ -88342,7 +86565,7 @@ entities: pos: -41.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3317 components: - type: Transform @@ -88350,7 +86573,7 @@ entities: pos: -53.5,16.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3318 components: - type: Transform @@ -88358,7 +86581,7 @@ entities: pos: -53.5,20.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3326 components: - type: Transform @@ -88366,7 +86589,7 @@ entities: pos: -24.5,2.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3328 components: - type: Transform @@ -88374,7 +86597,7 @@ entities: pos: -14.5,2.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3358 components: - type: Transform @@ -88382,7 +86605,7 @@ entities: pos: -24.5,9.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3377 components: - type: Transform @@ -88390,14 +86613,14 @@ entities: pos: -24.5,16.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3398 components: - type: Transform pos: -17.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3400 components: - type: Transform @@ -88405,7 +86628,7 @@ entities: pos: -13.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3408 components: - type: Transform @@ -88413,7 +86636,7 @@ entities: pos: -6.5,2.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3409 components: - type: Transform @@ -88421,7 +86644,7 @@ entities: pos: 1.5,2.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3421 components: - type: Transform @@ -88429,21 +86652,21 @@ entities: pos: -4.5,7.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3482 components: - type: Transform pos: -12.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3483 components: - type: Transform pos: -10.5,17.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3484 components: - type: Transform @@ -88451,14 +86674,14 @@ entities: pos: 3.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 3486 components: - type: Transform pos: -4.5,14.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 5029 components: - type: Transform @@ -88466,7 +86689,7 @@ entities: pos: -28.5,39.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6108 components: - type: Transform @@ -88474,7 +86697,7 @@ entities: pos: -19.5,26.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6112 components: - type: Transform @@ -88482,7 +86705,7 @@ entities: pos: 0.5,26.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6122 components: - type: Transform @@ -88490,7 +86713,7 @@ entities: pos: -2.5,21.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6204 components: - type: Transform @@ -88498,7 +86721,7 @@ entities: pos: -9.5,39.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6213 components: - type: Transform @@ -88506,7 +86729,7 @@ entities: pos: -11.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6222 components: - type: Transform @@ -88514,7 +86737,7 @@ entities: pos: 0.5,32.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6265 components: - type: Transform @@ -88522,7 +86745,7 @@ entities: pos: -27.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6266 components: - type: Transform @@ -88530,7 +86753,7 @@ entities: pos: -21.5,34.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6268 components: - type: Transform @@ -88538,14 +86761,14 @@ entities: pos: -19.5,31.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6911 components: - type: Transform pos: -28.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 6935 components: - type: Transform @@ -88553,7 +86776,28 @@ entities: pos: -33.5,-18.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' + - uid: 7098 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -8.5,-45.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 13957 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 7100 + components: + - type: Transform + pos: -5.5,-39.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 13957 + - type: AtmosPipeColor + color: '#FF0000FF' - uid: 7119 components: - type: Transform @@ -88561,7 +86805,7 @@ entities: pos: -28.5,-18.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7130 components: - type: Transform @@ -88572,7 +86816,7 @@ entities: deviceLists: - 8267 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7131 components: - type: Transform @@ -88583,14 +86827,47 @@ entities: deviceLists: - 8267 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' + - uid: 7222 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -17.5,-46.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 19570 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 7224 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -16.5,-52.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 19570 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 7226 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -21.5,-42.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 13958 + - type: AtmosPipeColor + color: '#FF0000FF' - uid: 7339 components: - type: Transform pos: -11.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7377 components: - type: Transform @@ -88598,7 +86875,7 @@ entities: pos: -7.5,-11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7378 components: - type: Transform @@ -88606,7 +86883,7 @@ entities: pos: -5.5,-11.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7407 components: - type: Transform @@ -88614,7 +86891,7 @@ entities: pos: -18.5,-1.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7567 components: - type: Transform @@ -88622,7 +86899,7 @@ entities: pos: -17.5,-20.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7571 components: - type: Transform @@ -88632,7 +86909,7 @@ entities: deviceLists: - 8254 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 7572 components: - type: Transform @@ -88640,21 +86917,32 @@ entities: pos: -13.5,-12.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 8223 components: - type: Transform pos: -24.5,-3.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' + - uid: 8609 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,-47.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 13957 + - type: AtmosPipeColor + color: '#FF0000FF' - uid: 9049 components: - type: Transform pos: -25.5,-16.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 9713 components: - type: Transform @@ -88662,7 +86950,18 @@ entities: pos: -25.5,-23.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' + - uid: 9793 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-45.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 9996 + - type: AtmosPipeColor + color: '#FF0000FF' - uid: 9846 components: - type: Transform @@ -88670,7 +86969,7 @@ entities: pos: -29.5,-5.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 9864 components: - type: Transform @@ -88681,7 +86980,29 @@ entities: deviceLists: - 9671 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' + - uid: 9897 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -22.5,-47.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 13958 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 9899 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -15.5,-30.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 13966 + - type: AtmosPipeColor + color: '#FF0000FF' - uid: 10039 components: - type: Transform @@ -88689,61 +87010,36 @@ entities: pos: -55.5,-9.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11094 + color: '#FF0000FF' + - uid: 10042 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -22.5,-41.5 + rot: -1.5707963267948966 rad + pos: -12.5,-34.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 13966 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11097 + color: '#FF0000FF' + - uid: 10043 components: - type: Transform - pos: -17.5,-36.5 + rot: -1.5707963267948966 rad + pos: -12.5,-30.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 13966 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11098 + color: '#FF0000FF' + - uid: 10752 components: - type: Transform - rot: 3.141592653589793 rad - pos: -3.5,-40.5 + pos: -8.5,-36.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11099 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -11.5,-40.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11107 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -10.5,-30.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11114 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -8.5,-43.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 11115 - components: - - type: Transform - pos: -8.5,-35.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11166 components: - type: Transform @@ -88751,7 +87047,7 @@ entities: pos: 1.5,-34.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11179 components: - type: Transform @@ -88759,23 +87055,29 @@ entities: pos: -2.5,-27.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11189 components: - type: Transform rot: 3.141592653589793 rad pos: 11.5,-28.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 10010 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11192 components: - type: Transform rot: 3.141592653589793 rad pos: 12.5,-23.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 10010 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11201 components: - type: Transform @@ -88783,14 +87085,14 @@ entities: pos: 4.5,-19.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11209 components: - type: Transform pos: 7.5,-15.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11210 components: - type: Transform @@ -88798,14 +87100,14 @@ entities: pos: 12.5,-15.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11214 components: - type: Transform pos: 20.5,-18.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11215 components: - type: Transform @@ -88813,14 +87115,14 @@ entities: pos: -2.5,-4.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11218 components: - type: Transform pos: 6.5,-2.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11219 components: - type: Transform @@ -88828,7 +87130,7 @@ entities: pos: 8.5,-8.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11221 components: - type: Transform @@ -88836,7 +87138,7 @@ entities: pos: 12.5,-4.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11223 components: - type: Transform @@ -88844,14 +87146,14 @@ entities: pos: 9.5,2.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11681 components: - type: Transform pos: 25.5,-10.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11714 components: - type: Transform @@ -88859,35 +87161,35 @@ entities: pos: 6.5,-26.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11764 components: - type: Transform pos: 24.5,-5.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11797 components: - type: Transform pos: 32.5,-10.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11944 components: - type: Transform pos: 19.5,-10.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11945 components: - type: Transform pos: 16.5,-10.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 11985 components: - type: Transform @@ -88895,28 +87197,28 @@ entities: pos: 18.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12043 components: - type: Transform pos: 29.5,1.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12044 components: - type: Transform pos: 26.5,0.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12489 components: - type: Transform pos: 8.5,39.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12490 components: - type: Transform @@ -88924,7 +87226,7 @@ entities: pos: 9.5,31.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12536 components: - type: Transform @@ -88932,7 +87234,7 @@ entities: pos: 9.5,26.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12539 components: - type: Transform @@ -88940,7 +87242,7 @@ entities: pos: 16.5,26.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12576 components: - type: Transform @@ -88948,7 +87250,7 @@ entities: pos: 18.5,33.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12577 components: - type: Transform @@ -88956,7 +87258,7 @@ entities: pos: 18.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12578 components: - type: Transform @@ -88964,21 +87266,21 @@ entities: pos: 18.5,39.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12583 components: - type: Transform pos: 21.5,43.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12606 components: - type: Transform pos: 24.5,37.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12619 components: - type: Transform @@ -88986,7 +87288,7 @@ entities: pos: 27.5,29.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12755 components: - type: Transform @@ -89000,7 +87302,7 @@ entities: pos: 29.5,20.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 12824 components: - type: Transform @@ -89008,15 +87310,7 @@ entities: pos: 28.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 13078 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 16.5,11.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13079 components: - type: Transform @@ -89024,7 +87318,7 @@ entities: pos: 13.5,21.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13080 components: - type: Transform @@ -89032,14 +87326,17 @@ entities: pos: 13.5,16.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13082 components: - type: Transform pos: 18.5,15.5 parent: 30 + - type: DeviceNetwork + deviceLists: + - 14365 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13084 components: - type: Transform @@ -89047,22 +87344,14 @@ entities: pos: 22.5,18.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 13085 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 22.5,11.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13086 components: - type: Transform pos: 25.5,8.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13336 components: - type: Transform @@ -89070,21 +87359,21 @@ entities: pos: 9.5,15.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13353 components: - type: Transform pos: 40.5,13.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13355 components: - type: Transform pos: 38.5,8.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13782 components: - type: Transform @@ -89092,21 +87381,32 @@ entities: pos: 45.5,35.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13798 components: - type: Transform pos: 29.5,42.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 13799 components: - type: Transform pos: 30.5,36.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' + - uid: 14522 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,11.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 14365 + - type: AtmosPipeColor + color: '#FF0000FF' - uid: 14540 components: - type: Transform @@ -89114,14 +87414,25 @@ entities: pos: 20.5,-5.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18060 components: - type: Transform pos: 30.5,-5.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' + - uid: 18214 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 14.5,11.5 + parent: 30 + - type: DeviceNetwork + deviceLists: + - 14365 + - type: AtmosPipeColor + color: '#FF0000FF' - uid: 18435 components: - type: Transform @@ -89129,7 +87440,7 @@ entities: pos: -44.5,-17.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18441 components: - type: Transform @@ -89137,7 +87448,7 @@ entities: pos: -57.5,-23.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18442 components: - type: Transform @@ -89145,14 +87456,14 @@ entities: pos: -51.5,-23.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18451 components: - type: Transform pos: -61.5,-21.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18519 components: - type: Transform @@ -89160,28 +87471,36 @@ entities: pos: -77.5,-48.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18520 components: - type: Transform pos: -78.5,-39.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18523 components: - type: Transform pos: -68.5,-42.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18524 components: - type: Transform pos: -64.5,-44.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' + - uid: 18547 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -61.5,-63.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' - uid: 18630 components: - type: Transform @@ -89189,14 +87508,14 @@ entities: pos: -67.5,-44.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18675 components: - type: Transform pos: -56.5,-45.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18676 components: - type: Transform @@ -89204,7 +87523,7 @@ entities: pos: -52.5,-53.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18677 components: - type: Transform @@ -89212,7 +87531,7 @@ entities: pos: -52.5,-57.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18729 components: - type: Transform @@ -89220,7 +87539,7 @@ entities: pos: -80.5,-59.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18730 components: - type: Transform @@ -89228,21 +87547,21 @@ entities: pos: -75.5,-61.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18744 components: - type: Transform pos: -76.5,-53.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18745 components: - type: Transform pos: -72.5,-53.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18756 components: - type: Transform @@ -89250,22 +87569,14 @@ entities: pos: -63.5,-60.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 18759 components: - type: Transform pos: -63.5,-48.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 18770 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -59.5,-65.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 21545 components: - type: Transform @@ -89273,37 +87584,33 @@ entities: pos: 35.5,34.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - uid: 21553 components: - type: Transform pos: 43.5,39.5 parent: 30 - type: AtmosPipeColor - color: '#FF1212FF' + color: '#FF0000FF' - proto: GasVolumePump entities: - - uid: 8255 + - uid: 9790 components: - type: Transform - pos: -9.5,-50.5 + pos: 0.5,-49.5 parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' - - uid: 8258 + - uid: 10044 components: - type: Transform rot: 3.141592653589793 rad - pos: -5.5,-50.5 + pos: -1.5,-51.5 parent: 30 - - type: AtmosPipeColor - color: '#03FCD3FF' - proto: GeneratorRTG entities: - - uid: 22223 + - uid: 2402 components: - type: Transform - pos: -67.5,-64.5 + pos: -53.5,-59.5 parent: 30 - proto: Girder entities: @@ -89397,11 +87704,6 @@ entities: - type: Transform pos: -66.5,-52.5 parent: 30 - - uid: 194 - components: - - type: Transform - pos: -11.5,-56.5 - parent: 30 - uid: 317 components: - type: Transform @@ -89412,6 +87714,11 @@ entities: - type: Transform pos: -19.5,8.5 parent: 30 + - uid: 331 + components: + - type: Transform + pos: -62.5,-66.5 + parent: 30 - uid: 348 components: - type: Transform @@ -89527,6 +87834,11 @@ entities: - type: Transform pos: 6.5,0.5 parent: 30 + - uid: 399 + components: + - type: Transform + pos: -56.5,-18.5 + parent: 30 - uid: 425 components: - type: Transform @@ -90462,41 +88774,26 @@ entities: - type: Transform pos: -53.5,72.5 parent: 30 - - uid: 2402 - components: - - type: Transform - pos: -34.5,66.5 - parent: 30 - - uid: 2403 - components: - - type: Transform - pos: -33.5,66.5 - parent: 30 - uid: 2933 components: - type: Transform pos: -15.5,-16.5 parent: 30 + - uid: 3348 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -61.5,-70.5 + parent: 30 - uid: 3712 components: - type: Transform pos: -46.5,3.5 parent: 30 - - uid: 4241 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -34.5,-67.5 - parent: 30 - uid: 4370 components: - type: Transform - pos: -34.5,67.5 - parent: 30 - - uid: 4371 - components: - - type: Transform - pos: -35.5,67.5 + pos: -79.5,42.5 parent: 30 - uid: 4390 components: @@ -90513,27 +88810,6 @@ entities: - type: Transform pos: -46.5,-5.5 parent: 30 - - uid: 4412 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -35.5,-67.5 - parent: 30 - - uid: 4424 - components: - - type: Transform - pos: -36.5,68.5 - parent: 30 - - uid: 4426 - components: - - type: Transform - pos: -35.5,68.5 - parent: 30 - - uid: 4455 - components: - - type: Transform - pos: -32.5,65.5 - parent: 30 - uid: 4789 components: - type: Transform @@ -90850,11 +89126,6 @@ entities: - type: Transform pos: -50.5,4.5 parent: 30 - - uid: 5732 - components: - - type: Transform - pos: 4.5,-42.5 - parent: 30 - uid: 5771 components: - type: Transform @@ -91003,7 +89274,8 @@ entities: - uid: 6496 components: - type: Transform - pos: -32.5,64.5 + rot: -1.5707963267948966 rad + pos: -85.5,40.5 parent: 30 - uid: 6534 components: @@ -91127,7 +89399,8 @@ entities: - uid: 6717 components: - type: Transform - pos: -31.5,64.5 + rot: -1.5707963267948966 rad + pos: -88.5,40.5 parent: 30 - uid: 6746 components: @@ -91196,16 +89469,6 @@ entities: - type: Transform pos: -12.5,-13.5 parent: 30 - - uid: 7110 - components: - - type: Transform - pos: 2.5,-48.5 - parent: 30 - - uid: 7111 - components: - - type: Transform - pos: -0.5,-48.5 - parent: 30 - uid: 7172 components: - type: Transform @@ -91282,11 +89545,6 @@ entities: - type: Transform pos: -63.5,42.5 parent: 30 - - uid: 7449 - components: - - type: Transform - pos: -89.5,42.5 - parent: 30 - uid: 7457 components: - type: Transform @@ -91362,6 +89620,12 @@ entities: - type: Transform pos: 47.5,12.5 parent: 30 + - uid: 7751 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -21.5,-79.5 + parent: 30 - uid: 7839 components: - type: Transform @@ -91398,11 +89662,6 @@ entities: - type: Transform pos: -32.5,-5.5 parent: 30 - - uid: 8256 - components: - - type: Transform - pos: -20.5,-47.5 - parent: 30 - uid: 8271 components: - type: Transform @@ -91448,11 +89707,6 @@ entities: - type: Transform pos: 7.5,-12.5 parent: 30 - - uid: 8361 - components: - - type: Transform - pos: -0.5,-43.5 - parent: 30 - uid: 8373 components: - type: Transform @@ -91493,16 +89747,6 @@ entities: rot: 1.5707963267948966 rad pos: 1.5,-26.5 parent: 30 - - uid: 8418 - components: - - type: Transform - pos: 16.5,-20.5 - parent: 30 - - uid: 8422 - components: - - type: Transform - pos: 15.5,-18.5 - parent: 30 - uid: 8423 components: - type: Transform @@ -91523,11 +89767,6 @@ entities: - type: Transform pos: 17.5,-16.5 parent: 30 - - uid: 8427 - components: - - type: Transform - pos: 17.5,-18.5 - parent: 30 - uid: 8446 components: - type: Transform @@ -91862,11 +90101,6 @@ entities: rot: 1.5707963267948966 rad pos: 11.5,-35.5 parent: 30 - - uid: 9104 - components: - - type: Transform - pos: -4.5,-56.5 - parent: 30 - uid: 9105 components: - type: Transform @@ -91908,16 +90142,6 @@ entities: rot: -1.5707963267948966 rad pos: -53.5,35.5 parent: 30 - - uid: 9129 - components: - - type: Transform - pos: -5.5,-56.5 - parent: 30 - - uid: 9164 - components: - - type: Transform - pos: -9.5,-56.5 - parent: 30 - uid: 9165 components: - type: Transform @@ -91928,11 +90152,6 @@ entities: - type: Transform pos: -1.5,-31.5 parent: 30 - - uid: 9174 - components: - - type: Transform - pos: -2.5,-56.5 - parent: 30 - uid: 9185 components: - type: Transform @@ -91963,170 +90182,241 @@ entities: - type: Transform pos: -0.5,-32.5 parent: 30 - - uid: 9295 - components: - - type: Transform - pos: 4.5,-44.5 - parent: 30 - uid: 9297 components: - type: Transform pos: 4.5,-38.5 parent: 30 - - uid: 9342 + - uid: 9324 components: - type: Transform - pos: -3.5,-56.5 + rot: 3.141592653589793 rad + pos: -3.5,-60.5 parent: 30 - - uid: 9343 + - uid: 9326 components: - type: Transform - pos: -12.5,-56.5 + rot: 3.141592653589793 rad + pos: -0.5,-60.5 + parent: 30 + - uid: 9328 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-60.5 + parent: 30 + - uid: 9329 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,-60.5 + parent: 30 + - uid: 9348 + components: + - type: Transform + pos: 13.5,-52.5 parent: 30 - uid: 9362 components: - type: Transform pos: -8.5,-37.5 parent: 30 + - uid: 9364 + components: + - type: Transform + pos: 11.5,-45.5 + parent: 30 - uid: 9365 components: - type: Transform pos: -6.5,-37.5 parent: 30 - - uid: 9424 + - uid: 9371 components: - type: Transform - pos: -20.5,-43.5 + pos: 8.5,-58.5 parent: 30 - - uid: 9425 + - uid: 9372 components: - type: Transform - pos: -20.5,-40.5 + pos: 8.5,-55.5 parent: 30 - - uid: 9589 + - uid: 9398 components: - type: Transform - pos: -17.5,-37.5 + pos: 8.5,-57.5 parent: 30 - - uid: 9590 + - uid: 9399 components: - type: Transform - pos: -19.5,-37.5 + pos: 8.5,-54.5 + parent: 30 + - uid: 9409 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-44.5 + parent: 30 + - uid: 9504 + components: + - type: Transform + pos: 13.5,-49.5 + parent: 30 + - uid: 9505 + components: + - type: Transform + pos: 13.5,-47.5 + parent: 30 + - uid: 9572 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -18.5,-49.5 + parent: 30 + - uid: 9573 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,-42.5 + parent: 30 + - uid: 9579 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -14.5,-39.5 + parent: 30 + - uid: 9580 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -22.5,-45.5 + parent: 30 + - uid: 9584 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -18.5,-45.5 + parent: 30 + - uid: 9585 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -24.5,-45.5 + parent: 30 + - uid: 9586 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -16.5,-45.5 + parent: 30 + - uid: 9587 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -16.5,-49.5 + parent: 30 + - uid: 9588 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -14.5,-44.5 + parent: 30 + - uid: 9645 + components: + - type: Transform + pos: 12.5,-45.5 + parent: 30 + - uid: 9649 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-60.5 + parent: 30 + - uid: 9650 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,-60.5 parent: 30 - uid: 9662 components: - type: Transform pos: 12.5,37.5 parent: 30 - - uid: 9682 - components: - - type: Transform - pos: 1.5,-55.5 - parent: 30 - uid: 9719 components: - type: Transform pos: 12.5,36.5 parent: 30 - - uid: 9814 - components: - - type: Transform - pos: 0.5,-55.5 - parent: 30 - - uid: 9815 - components: - - type: Transform - pos: 0.5,-47.5 - parent: 30 - uid: 9816 components: - type: Transform - pos: 1.5,-47.5 + rot: -1.5707963267948966 rad + pos: -1.5,-42.5 parent: 30 - uid: 9819 components: - type: Transform - pos: 1.5,-45.5 + rot: -1.5707963267948966 rad + pos: 2.5,-42.5 parent: 30 - - uid: 9820 + - uid: 9823 components: - type: Transform - pos: 3.5,-45.5 + rot: 1.5707963267948966 rad + pos: -16.5,-57.5 parent: 30 - - uid: 9918 + - uid: 9824 components: - type: Transform rot: -1.5707963267948966 rad - pos: 2.5,-54.5 + pos: -9.5,-45.5 parent: 30 - - uid: 9919 + - uid: 9825 components: - type: Transform rot: -1.5707963267948966 rad - pos: 2.5,-53.5 + pos: -9.5,-43.5 parent: 30 - - uid: 9920 + - uid: 9826 components: - type: Transform rot: -1.5707963267948966 rad - pos: 2.5,-52.5 + pos: -7.5,-42.5 parent: 30 - - uid: 9921 + - uid: 9827 components: - type: Transform rot: -1.5707963267948966 rad - pos: 2.5,-50.5 + pos: -5.5,-42.5 parent: 30 - - uid: 9922 + - uid: 9828 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,-49.5 + rot: 1.5707963267948966 rad + pos: -17.5,-57.5 parent: 30 - - uid: 9936 + - uid: 9829 components: - type: Transform - pos: -0.5,-54.5 + rot: 1.5707963267948966 rad + pos: -15.5,-57.5 parent: 30 - - uid: 9937 + - uid: 9867 components: - type: Transform - pos: -0.5,-52.5 + rot: 1.5707963267948966 rad + pos: -18.5,-57.5 parent: 30 - - uid: 9938 + - uid: 9973 components: - type: Transform - pos: -0.5,-51.5 + pos: 11.5,-54.5 parent: 30 - - uid: 9939 + - uid: 9975 components: - type: Transform - pos: -0.5,-50.5 - parent: 30 - - uid: 9945 - components: - - type: Transform - pos: -10.5,-56.5 - parent: 30 - - uid: 9989 - components: - - type: Transform - pos: -8.5,-42.5 - parent: 30 - - uid: 9990 - components: - - type: Transform - pos: -6.5,-42.5 - parent: 30 - - uid: 9991 - components: - - type: Transform - pos: -10.5,-42.5 - parent: 30 - - uid: 9992 - components: - - type: Transform - pos: -4.5,-42.5 + pos: 10.5,-54.5 parent: 30 - uid: 10068 components: @@ -92163,70 +90453,17 @@ entities: - type: Transform pos: -57.5,-10.5 parent: 30 - - uid: 10137 + - uid: 10191 components: - type: Transform - pos: -18.5,-49.5 + rot: -1.5707963267948966 rad + pos: -14.5,-29.5 parent: 30 - - uid: 10138 + - uid: 10193 components: - type: Transform - pos: -16.5,-49.5 - parent: 30 - - uid: 10139 - components: - - type: Transform - pos: -16.5,-52.5 - parent: 30 - - uid: 10140 - components: - - type: Transform - pos: -18.5,-52.5 - parent: 30 - - uid: 10147 - components: - - type: Transform - pos: -38.5,68.5 - parent: 30 - - uid: 10148 - components: - - type: Transform - pos: -36.5,66.5 - parent: 30 - - uid: 10149 - components: - - type: Transform - pos: -37.5,67.5 - parent: 30 - - uid: 10187 - components: - - type: Transform - pos: -37.5,65.5 - parent: 30 - - uid: 10188 - components: - - type: Transform - pos: -36.5,64.5 - parent: 30 - - uid: 10189 - components: - - type: Transform - pos: -37.5,64.5 - parent: 30 - - uid: 10207 - components: - - type: Transform - pos: -37.5,68.5 - parent: 30 - - uid: 10209 - components: - - type: Transform - pos: -38.5,67.5 - parent: 30 - - uid: 10210 - components: - - type: Transform - pos: -34.5,65.5 + rot: -1.5707963267948966 rad + pos: -14.5,-28.5 parent: 30 - uid: 10221 components: @@ -92243,61 +90480,11 @@ entities: - type: Transform pos: -62.5,8.5 parent: 30 - - uid: 10227 - components: - - type: Transform - pos: -37.5,66.5 - parent: 30 - - uid: 10228 - components: - - type: Transform - pos: -38.5,66.5 - parent: 30 - - uid: 10229 - components: - - type: Transform - pos: -38.5,65.5 - parent: 30 - - uid: 10230 - components: - - type: Transform - pos: -34.5,64.5 - parent: 30 - - uid: 10231 - components: - - type: Transform - pos: -36.5,65.5 - parent: 30 - - uid: 10232 - components: - - type: Transform - pos: -35.5,66.5 - parent: 30 - - uid: 10233 - components: - - type: Transform - pos: -35.5,65.5 - parent: 30 - uid: 10234 components: - type: Transform pos: -57.5,-7.5 parent: 30 - - uid: 10235 - components: - - type: Transform - pos: -36.5,67.5 - parent: 30 - - uid: 10236 - components: - - type: Transform - pos: -33.5,64.5 - parent: 30 - - uid: 10237 - components: - - type: Transform - pos: -33.5,65.5 - parent: 30 - uid: 10288 components: - type: Transform @@ -92309,40 +90496,48 @@ entities: - type: Transform pos: 23.5,-16.5 parent: 30 - - uid: 10435 + - uid: 10553 components: - type: Transform - pos: -25.5,-67.5 + pos: 13.5,-51.5 parent: 30 - - uid: 10436 + - uid: 10555 components: - type: Transform - pos: -26.5,-67.5 + pos: 12.5,-54.5 parent: 30 - - uid: 10437 + - uid: 10582 components: - type: Transform - pos: -27.5,-67.5 + rot: 3.141592653589793 rad + pos: 4.5,-60.5 parent: 30 - - uid: 10438 + - uid: 10614 components: - type: Transform - pos: -28.5,-67.5 + pos: 7.5,-59.5 parent: 30 - - uid: 10439 + - uid: 10639 components: - type: Transform - pos: -29.5,-67.5 + pos: 10.5,-45.5 parent: 30 - - uid: 10440 + - uid: 10641 components: - type: Transform - pos: -33.5,-67.5 + rot: 3.141592653589793 rad + pos: -3.5,-61.5 parent: 30 - - uid: 10441 + - uid: 10655 components: - type: Transform - pos: -32.5,-67.5 + rot: 3.141592653589793 rad + pos: 16.5,-19.5 + parent: 30 + - uid: 10657 + components: + - type: Transform + pos: -8.5,-64.5 parent: 30 - uid: 10738 components: @@ -92350,6 +90545,146 @@ entities: rot: 1.5707963267948966 rad pos: 2.5,-26.5 parent: 30 + - uid: 11030 + components: + - type: Transform + pos: -32.5,-52.5 + parent: 30 + - uid: 11031 + components: + - type: Transform + pos: -31.5,-52.5 + parent: 30 + - uid: 11033 + components: + - type: Transform + pos: -30.5,-52.5 + parent: 30 + - uid: 11034 + components: + - type: Transform + pos: -28.5,-53.5 + parent: 30 + - uid: 11036 + components: + - type: Transform + pos: -27.5,-53.5 + parent: 30 + - uid: 11040 + components: + - type: Transform + pos: -24.5,-76.5 + parent: 30 + - uid: 11041 + components: + - type: Transform + pos: -15.5,-76.5 + parent: 30 + - uid: 11043 + components: + - type: Transform + pos: -8.5,-68.5 + parent: 30 + - uid: 11044 + components: + - type: Transform + pos: -34.5,-52.5 + parent: 30 + - uid: 11045 + components: + - type: Transform + pos: -35.5,-52.5 + parent: 30 + - uid: 11046 + components: + - type: Transform + pos: -37.5,-52.5 + parent: 30 + - uid: 11047 + components: + - type: Transform + pos: -38.5,-52.5 + parent: 30 + - uid: 11048 + components: + - type: Transform + pos: -40.5,-52.5 + parent: 30 + - uid: 11049 + components: + - type: Transform + pos: -40.5,-51.5 + parent: 30 + - uid: 11050 + components: + - type: Transform + pos: -40.5,-50.5 + parent: 30 + - uid: 11051 + components: + - type: Transform + pos: -43.5,-54.5 + parent: 30 + - uid: 11052 + components: + - type: Transform + pos: -44.5,-54.5 + parent: 30 + - uid: 11053 + components: + - type: Transform + pos: -44.5,-56.5 + parent: 30 + - uid: 11054 + components: + - type: Transform + pos: -44.5,-58.5 + parent: 30 + - uid: 11055 + components: + - type: Transform + pos: -45.5,-58.5 + parent: 30 + - uid: 11056 + components: + - type: Transform + pos: -46.5,-58.5 + parent: 30 + - uid: 11085 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -14.5,-57.5 + parent: 30 + - uid: 11105 + components: + - type: Transform + pos: -11.5,-32.5 + parent: 30 + - uid: 11111 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -12.5,-32.5 + parent: 30 + - uid: 11137 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -19.5,-57.5 + parent: 30 + - uid: 11163 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 16.5,-17.5 + parent: 30 + - uid: 11173 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -29.5,-72.5 + parent: 30 - uid: 11194 components: - type: Transform @@ -92361,15 +90696,41 @@ entities: rot: 1.5707963267948966 rad pos: 26.5,-12.5 parent: 30 - - uid: 11257 + - uid: 11264 components: - type: Transform - pos: -18.5,-45.5 + rot: 3.141592653589793 rad + pos: -7.5,-78.5 parent: 30 - - uid: 11258 + - uid: 11265 components: - type: Transform - pos: -16.5,-45.5 + rot: 3.141592653589793 rad + pos: -8.5,-78.5 + parent: 30 + - uid: 11266 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,-78.5 + parent: 30 + - uid: 11267 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.5,-79.5 + parent: 30 + - uid: 11276 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -28.5,-76.5 + parent: 30 + - uid: 11279 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -26.5,-78.5 parent: 30 - uid: 11293 components: @@ -92403,6 +90764,12 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,-22.5 parent: 30 + - uid: 11309 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,-31.5 + parent: 30 - uid: 11580 components: - type: Transform @@ -92524,15 +90891,17 @@ entities: - type: Transform pos: 47.5,6.5 parent: 30 - - uid: 12629 + - uid: 12442 components: - type: Transform - pos: 13.5,13.5 + rot: 1.5707963267948966 rad + pos: -20.5,-57.5 parent: 30 - uid: 12650 components: - type: Transform - pos: 15.5,13.5 + rot: -1.5707963267948966 rad + pos: -88.5,42.5 parent: 30 - uid: 12662 components: @@ -92581,6 +90950,12 @@ entities: - type: Transform pos: 19.5,24.5 parent: 30 + - uid: 12860 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -62.5,-71.5 + parent: 30 - uid: 12863 components: - type: Transform @@ -92606,6 +90981,11 @@ entities: - type: Transform pos: 35.5,11.5 parent: 30 + - uid: 12929 + components: + - type: Transform + pos: -61.5,-18.5 + parent: 30 - uid: 13097 components: - type: Transform @@ -92816,6 +91196,42 @@ entities: - type: Transform pos: 40.5,36.5 parent: 30 + - uid: 13973 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,-72.5 + parent: 30 + - uid: 13979 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -29.5,-71.5 + parent: 30 + - uid: 13980 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -28.5,-77.5 + parent: 30 + - uid: 13981 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -28.5,-78.5 + parent: 30 + - uid: 13982 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -27.5,-78.5 + parent: 30 + - uid: 14358 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 15.5,12.5 + parent: 30 - uid: 14514 components: - type: Transform @@ -92826,11 +91242,6 @@ entities: - type: Transform pos: 54.5,23.5 parent: 30 - - uid: 14517 - components: - - type: Transform - pos: 49.5,23.5 - parent: 30 - uid: 14518 components: - type: Transform @@ -92851,6 +91262,36 @@ entities: - type: Transform pos: 47.5,27.5 parent: 30 + - uid: 14526 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -32.5,65.5 + parent: 30 + - uid: 14527 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -37.5,68.5 + parent: 30 + - uid: 14528 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -35.5,65.5 + parent: 30 + - uid: 14529 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -37.5,66.5 + parent: 30 + - uid: 14534 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -31.5,65.5 + parent: 30 - uid: 14536 components: - type: Transform @@ -92861,11 +91302,6 @@ entities: - type: Transform pos: 15.5,65.5 parent: 30 - - uid: 14538 - components: - - type: Transform - pos: -26.5,-54.5 - parent: 30 - uid: 14778 components: - type: Transform @@ -92896,6 +91332,18 @@ entities: - type: Transform pos: 20.5,60.5 parent: 30 + - uid: 14845 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -38.5,69.5 + parent: 30 + - uid: 14970 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -35.5,64.5 + parent: 30 - uid: 14971 components: - type: Transform @@ -92906,6 +91354,24 @@ entities: - type: Transform pos: 41.5,24.5 parent: 30 + - uid: 15073 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -39.5,66.5 + parent: 30 + - uid: 15166 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -33.5,65.5 + parent: 30 + - uid: 15180 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -37.5,69.5 + parent: 30 - uid: 15207 components: - type: Transform @@ -92926,6 +91392,12 @@ entities: - type: Transform pos: 17.5,63.5 parent: 30 + - uid: 15280 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -31.5,63.5 + parent: 30 - uid: 15336 components: - type: Transform @@ -92951,6 +91423,18 @@ entities: - type: Transform pos: 52.5,31.5 parent: 30 + - uid: 15349 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -39.5,67.5 + parent: 30 + - uid: 15353 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -67.5,-70.5 + parent: 30 - uid: 15445 components: - type: Transform @@ -93231,6 +91715,17 @@ entities: - type: Transform pos: 47.5,9.5 parent: 30 + - uid: 15985 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -37.5,65.5 + parent: 30 + - uid: 16133 + components: + - type: Transform + pos: -75.5,42.5 + parent: 30 - uid: 16259 components: - type: Transform @@ -93442,6 +91937,12 @@ entities: rot: 3.141592653589793 rad pos: 36.5,11.5 parent: 30 + - uid: 16795 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -61.5,-71.5 + parent: 30 - uid: 16807 components: - type: Transform @@ -94005,6 +92506,11 @@ entities: - type: Transform pos: -79.5,-37.5 parent: 30 + - uid: 17734 + components: + - type: Transform + pos: -66.5,-18.5 + parent: 30 - uid: 17796 components: - type: Transform @@ -94053,6 +92559,11 @@ entities: rot: -1.5707963267948966 rad pos: -47.5,-22.5 parent: 30 + - uid: 17810 + components: + - type: Transform + pos: -85.5,-44.5 + parent: 30 - uid: 17975 components: - type: Transform @@ -94178,6 +92689,21 @@ entities: - type: Transform pos: -37.5,-38.5 parent: 30 + - uid: 18070 + components: + - type: Transform + pos: -71.5,42.5 + parent: 30 + - uid: 18072 + components: + - type: Transform + pos: -57.5,-18.5 + parent: 30 + - uid: 18086 + components: + - type: Transform + pos: -85.5,-46.5 + parent: 30 - uid: 18154 components: - type: Transform @@ -94253,15 +92779,11 @@ entities: - type: Transform pos: -85.5,-59.5 parent: 30 - - uid: 18187 + - uid: 18206 components: - type: Transform - pos: -59.5,-69.5 - parent: 30 - - uid: 18188 - components: - - type: Transform - pos: -58.5,-69.5 + rot: 3.141592653589793 rad + pos: 15.5,10.5 parent: 30 - uid: 18260 components: @@ -94368,6 +92890,40 @@ entities: - type: Transform pos: -52.5,-40.5 parent: 30 + - uid: 18358 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -65.5,-71.5 + parent: 30 + - uid: 18789 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -65.5,-70.5 + parent: 30 + - uid: 18797 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -64.5,-71.5 + parent: 30 + - uid: 18801 + components: + - type: Transform + pos: -64.5,-66.5 + parent: 30 + - uid: 18802 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -81.5,40.5 + parent: 30 + - uid: 18803 + components: + - type: Transform + pos: -63.5,-66.5 + parent: 30 - uid: 18816 components: - type: Transform @@ -94378,11 +92934,107 @@ entities: - type: Transform pos: -74.5,-67.5 parent: 30 + - uid: 18835 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -83.5,40.5 + parent: 30 - uid: 19067 components: - type: Transform pos: -51.5,-40.5 parent: 30 + - uid: 19190 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,-77.5 + parent: 30 + - uid: 19191 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,-62.5 + parent: 30 + - uid: 19192 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,-76.5 + parent: 30 + - uid: 19193 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -29.5,-64.5 + parent: 30 + - uid: 19194 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,-63.5 + parent: 30 + - uid: 19231 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -29.5,-63.5 + parent: 30 + - uid: 19232 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,-64.5 + parent: 30 + - uid: 19233 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -29.5,-62.5 + parent: 30 + - uid: 19236 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -22.5,-79.5 + parent: 30 + - uid: 19237 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -20.5,-79.5 + parent: 30 + - uid: 19238 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -14.5,-79.5 + parent: 30 + - uid: 19239 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -13.5,-79.5 + parent: 30 + - uid: 19423 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,-70.5 + parent: 30 + - uid: 19425 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,-71.5 + parent: 30 + - uid: 19426 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -29.5,-70.5 + parent: 30 - uid: 19641 components: - type: Transform @@ -94948,96 +93600,6 @@ entities: - type: Transform pos: -40.5,32.5 parent: 30 - - uid: 21392 - components: - - type: Transform - pos: -25.5,-54.5 - parent: 30 - - uid: 21393 - components: - - type: Transform - pos: -24.5,-54.5 - parent: 30 - - uid: 21394 - components: - - type: Transform - pos: -23.5,-54.5 - parent: 30 - - uid: 21397 - components: - - type: Transform - pos: -10.5,-63.5 - parent: 30 - - uid: 21398 - components: - - type: Transform - pos: -9.5,-63.5 - parent: 30 - - uid: 21399 - components: - - type: Transform - pos: -8.5,-63.5 - parent: 30 - - uid: 21400 - components: - - type: Transform - pos: -7.5,-63.5 - parent: 30 - - uid: 21401 - components: - - type: Transform - pos: -6.5,-63.5 - parent: 30 - - uid: 21402 - components: - - type: Transform - pos: -5.5,-63.5 - parent: 30 - - uid: 21403 - components: - - type: Transform - pos: -4.5,-63.5 - parent: 30 - - uid: 21404 - components: - - type: Transform - pos: 6.5,-54.5 - parent: 30 - - uid: 21405 - components: - - type: Transform - pos: 6.5,-53.5 - parent: 30 - - uid: 21406 - components: - - type: Transform - pos: 6.5,-52.5 - parent: 30 - - uid: 21407 - components: - - type: Transform - pos: 6.5,-51.5 - parent: 30 - - uid: 21408 - components: - - type: Transform - pos: 6.5,-50.5 - parent: 30 - - uid: 21409 - components: - - type: Transform - pos: 6.5,-49.5 - parent: 30 - - uid: 21410 - components: - - type: Transform - pos: 6.5,-48.5 - parent: 30 - - uid: 21411 - components: - - type: Transform - pos: 6.5,-55.5 - parent: 30 - uid: 21412 components: - type: Transform @@ -95098,21 +93660,11 @@ entities: - type: Transform pos: 10.5,-42.5 parent: 30 - - uid: 21424 - components: - - type: Transform - pos: 6.5,-44.5 - parent: 30 - uid: 21425 components: - type: Transform pos: 23.5,-41.5 parent: 30 - - uid: 21426 - components: - - type: Transform - pos: 6.5,-41.5 - parent: 30 - uid: 21427 components: - type: Transform @@ -95123,16 +93675,6 @@ entities: - type: Transform pos: 8.5,-41.5 parent: 30 - - uid: 21429 - components: - - type: Transform - pos: 7.5,-44.5 - parent: 30 - - uid: 21430 - components: - - type: Transform - pos: 8.5,-44.5 - parent: 30 - uid: 21431 components: - type: Transform @@ -95213,11 +93755,6 @@ entities: - type: Transform pos: 19.5,65.5 parent: 30 - - uid: 21457 - components: - - type: Transform - pos: -14.5,-43.5 - parent: 30 - uid: 21516 components: - type: Transform @@ -95263,16 +93800,6 @@ entities: - type: Transform pos: -69.5,-52.5 parent: 30 - - uid: 22211 - components: - - type: Transform - pos: -69.5,-60.5 - parent: 30 - - uid: 22212 - components: - - type: Transform - pos: -69.5,-59.5 - parent: 30 - uid: 22273 components: - type: Transform @@ -95288,261 +93815,6 @@ entities: - type: Transform pos: 3.5,62.5 parent: 30 - - uid: 22623 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -32.5,-63.5 - parent: 30 - - uid: 22624 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -32.5,-62.5 - parent: 30 - - uid: 22625 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -32.5,-61.5 - parent: 30 - - uid: 22626 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -33.5,-61.5 - parent: 30 - - uid: 22627 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -31.5,-61.5 - parent: 30 - - uid: 22628 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -31.5,-59.5 - parent: 30 - - uid: 22629 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -32.5,-59.5 - parent: 30 - - uid: 22630 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -33.5,-59.5 - parent: 30 - - uid: 22651 - components: - - type: Transform - pos: -32.5,-57.5 - parent: 30 - - uid: 22652 - components: - - type: Transform - pos: -32.5,-58.5 - parent: 30 - - uid: 22653 - components: - - type: Transform - pos: -30.5,-61.5 - parent: 30 - - uid: 22856 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -36.5,-67.5 - parent: 30 - - uid: 22857 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -37.5,-67.5 - parent: 30 - - uid: 22858 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -38.5,-67.5 - parent: 30 - - uid: 22859 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -39.5,-67.5 - parent: 30 - - uid: 22860 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -40.5,-67.5 - parent: 30 - - uid: 22861 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -41.5,-67.5 - parent: 30 - - uid: 22862 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -44.5,-66.5 - parent: 30 - - uid: 22863 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -44.5,-65.5 - parent: 30 - - uid: 22864 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -44.5,-64.5 - parent: 30 - - uid: 22865 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -44.5,-63.5 - parent: 30 - - uid: 22866 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -44.5,-62.5 - parent: 30 - - uid: 22867 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -44.5,-61.5 - parent: 30 - - uid: 22868 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -44.5,-60.5 - parent: 30 - - uid: 22869 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -44.5,-59.5 - parent: 30 - - uid: 22870 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -44.5,-58.5 - parent: 30 - - uid: 22871 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -44.5,-57.5 - parent: 30 - - uid: 22872 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -44.5,-56.5 - parent: 30 - - uid: 22873 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -44.5,-55.5 - parent: 30 - - uid: 22874 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -44.5,-54.5 - parent: 30 - - uid: 22875 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -41.5,-53.5 - parent: 30 - - uid: 22876 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -40.5,-53.5 - parent: 30 - - uid: 22877 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -39.5,-53.5 - parent: 30 - - uid: 22878 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -38.5,-53.5 - parent: 30 - - uid: 22879 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -37.5,-53.5 - parent: 30 - - uid: 22880 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -36.5,-53.5 - parent: 30 - - uid: 22881 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -35.5,-53.5 - parent: 30 - - uid: 22882 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -34.5,-53.5 - parent: 30 - - uid: 22883 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -33.5,-53.5 - parent: 30 - - uid: 22884 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -32.5,-53.5 - parent: 30 - - uid: 22885 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -31.5,-53.5 - parent: 30 - - uid: 22886 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -30.5,-53.5 - parent: 30 - - uid: 22887 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -29.5,-53.5 - parent: 30 - proto: GrilleBroken entities: - uid: 695 @@ -95630,29 +93902,16 @@ entities: - type: Transform pos: -62.5,9.5 parent: 30 - - uid: 10529 + - uid: 11042 + components: + - type: Transform + pos: -26.5,-70.5 + parent: 30 + - uid: 13978 components: - type: Transform rot: 3.141592653589793 rad - pos: -33.5,-68.5 - parent: 30 - - uid: 10530 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -31.5,-67.5 - parent: 30 - - uid: 10531 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -30.5,-67.5 - parent: 30 - - uid: 10532 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -24.5,-67.5 + pos: -8.5,-72.5 parent: 30 - uid: 15444 components: @@ -95733,6 +93992,12 @@ entities: rot: 3.141592653589793 rad pos: 56.5,39.5 parent: 30 + - uid: 16132 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -88.5,41.5 + parent: 30 - uid: 16410 components: - type: Transform @@ -95880,6 +94145,12 @@ entities: rot: -1.5707963267948966 rad pos: -65.5,-21.5 parent: 30 + - uid: 18599 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -87.5,40.5 + parent: 30 - uid: 19643 components: - type: Transform @@ -95955,10 +94226,10 @@ entities: - type: Transform pos: -32.534565,30.536125 parent: 30 - - uid: 9421 + - uid: 18923 components: - type: Transform - pos: -22.512821,-47.59407 + pos: -15.53532,-37.702564 parent: 30 - proto: HandheldHealthAnalyzer entities: @@ -96018,35 +94289,6 @@ entities: - type: Transform pos: -43.530403,66.65333 parent: 30 -- proto: HeatExchanger - entities: - - uid: 3118 - components: - - type: Transform - pos: -3.5,-58.5 - parent: 30 - - uid: 3155 - components: - - type: Transform - pos: -3.5,-57.5 - parent: 30 - - uid: 7104 - components: - - type: Transform - pos: -11.5,-58.5 - parent: 30 - - uid: 8295 - components: - - type: Transform - pos: 3.5,-51.5 - parent: 30 - - type: AtmosPipeColor - color: '#03FCD3FF' - - uid: 9621 - components: - - type: Transform - pos: -11.5,-57.5 - parent: 30 - proto: HighSecCommandLocked entities: - uid: 2128 @@ -96210,16 +94452,16 @@ entities: parent: 30 - proto: HydroponicsToolMiniHoe entities: - - uid: 434 - components: - - type: Transform - pos: -25.483442,11.482555 - parent: 30 - uid: 2347 components: - type: Transform pos: -45.453583,69.54325 parent: 30 + - uid: 18857 + components: + - type: Transform + pos: -28.537731,11.513851 + parent: 30 - uid: 19544 components: - type: Transform @@ -96234,16 +94476,16 @@ entities: parent: 30 - proto: HydroponicsToolSpade entities: - - uid: 435 - components: - - type: Transform - pos: -25.499067,11.52943 - parent: 30 - uid: 697 components: - type: Transform pos: -45.386658,69.59978 parent: 30 + - uid: 18858 + components: + - type: Transform + pos: -28.478325,11.558405 + parent: 30 - uid: 19542 components: - type: Transform @@ -96266,56 +94508,6 @@ entities: - type: Transform pos: -21.5,12.5 parent: 30 - - uid: 331 - components: - - type: Transform - pos: -25.5,5.5 - parent: 30 - - uid: 332 - components: - - type: Transform - pos: -26.5,5.5 - parent: 30 - - uid: 333 - components: - - type: Transform - pos: -27.5,5.5 - parent: 30 - - uid: 334 - components: - - type: Transform - pos: -28.5,5.5 - parent: 30 - - uid: 335 - components: - - type: Transform - pos: -28.5,7.5 - parent: 30 - - uid: 336 - components: - - type: Transform - pos: -28.5,8.5 - parent: 30 - - uid: 337 - components: - - type: Transform - pos: -28.5,9.5 - parent: 30 - - uid: 338 - components: - - type: Transform - pos: -28.5,10.5 - parent: 30 - - uid: 339 - components: - - type: Transform - pos: -28.5,11.5 - parent: 30 - - uid: 340 - components: - - type: Transform - pos: -28.5,13.5 - parent: 30 - uid: 341 components: - type: Transform @@ -96366,6 +94558,51 @@ entities: - type: Transform pos: -47.5,69.5 parent: 30 + - uid: 16138 + components: + - type: Transform + pos: -28.5,12.5 + parent: 30 + - uid: 16139 + components: + - type: Transform + pos: -27.5,11.5 + parent: 30 + - uid: 16163 + components: + - type: Transform + pos: -26.5,11.5 + parent: 30 + - uid: 16165 + components: + - type: Transform + pos: -28.5,10.5 + parent: 30 + - uid: 16172 + components: + - type: Transform + pos: -27.5,9.5 + parent: 30 + - uid: 16242 + components: + - type: Transform + pos: -26.5,9.5 + parent: 30 + - uid: 18174 + components: + - type: Transform + pos: -26.5,7.5 + parent: 30 + - uid: 18184 + components: + - type: Transform + pos: -27.5,7.5 + parent: 30 + - uid: 18856 + components: + - type: Transform + pos: -28.5,8.5 + parent: 30 - proto: InflatableDoorStack entities: - uid: 9249 @@ -96511,23 +94748,12 @@ entities: rot: -1.5707963267948966 rad pos: 8.5,-33.5 parent: 30 - - uid: 22291 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -14.5,-37.5 - parent: 30 - uid: 22514 components: - type: Transform rot: 1.5707963267948966 rad pos: -1.5,82.5 parent: 30 - - uid: 22657 - components: - - type: Transform - pos: -29.5,-56.5 - parent: 30 - proto: IntercomMedical entities: - uid: 7346 @@ -96549,11 +94775,11 @@ entities: parent: 30 - proto: IntercomScience entities: - - uid: 22287 + - uid: 14357 components: - type: Transform rot: -1.5707963267948966 rad - pos: 16.5,14.5 + pos: 16.5,17.5 parent: 30 - uid: 22288 components: @@ -98041,12 +96267,6 @@ entities: rot: 3.141592653589793 rad pos: 15.5,-7.5 parent: 30 - - uid: 961 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 15.5,16.5 - parent: 30 - uid: 1753 components: - type: Transform @@ -98058,17 +96278,18 @@ entities: rot: -1.5707963267948966 rad pos: -8.5,-0.5 parent: 30 + - uid: 16403 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 13.5,14.5 + parent: 30 - proto: JetpackBlueFilled entities: - - uid: 8311 + - uid: 5722 components: - type: Transform - pos: -20.563852,-46.460617 - parent: 30 - - uid: 21590 - components: - - type: Transform - pos: -17.545162,-28.366238 + pos: -10.241633,-47.32097 parent: 30 - proto: JetpackMini entities: @@ -98094,6 +96315,13 @@ entities: - type: Transform pos: -39.62777,56.71206 parent: 30 +- proto: KitchenElectricGrill + entities: + - uid: 18855 + components: + - type: Transform + pos: -14.5,7.5 + parent: 30 - proto: KitchenMicrowave entities: - uid: 483 @@ -98309,16 +96537,16 @@ entities: - type: Transform pos: -57.474648,-39.373875 parent: 30 + - uid: 18354 + components: + - type: Transform + pos: -62.42038,-64.31795 + parent: 30 - uid: 19504 components: - type: Transform pos: -77.46411,-65.291664 parent: 30 - - uid: 19505 - components: - - type: Transform - pos: -60.62825,-65.170204 - parent: 30 - uid: 21649 components: - type: Transform @@ -98338,11 +96566,6 @@ entities: - type: Transform pos: -51.439194,-51.2885 parent: 30 - - uid: 19431 - components: - - type: Transform - pos: -57.92594,-62.49692 - parent: 30 - uid: 21670 components: - type: Transform @@ -98621,40 +96844,11 @@ entities: - 0 - proto: LockerChiefEngineerFilled entities: - - uid: 9604 + - uid: 11058 components: - type: Transform - pos: -19.5,-34.5 + pos: -5.5,-36.5 parent: 30 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 9329 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: LockerChiefMedicalOfficerFilledHardsuit entities: - uid: 6941 @@ -98689,6 +96883,11 @@ entities: - 0 - proto: LockerElectricalSuppliesFilled entities: + - uid: 11061 + components: + - type: Transform + pos: -4.5,-45.5 + parent: 30 - uid: 16994 components: - type: Transform @@ -98712,72 +96911,44 @@ entities: - 0 - 0 - 0 - - uid: 16995 - components: - - type: Transform - pos: -5.5,-36.5 - parent: 30 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - proto: LockerEngineerFilled entities: - - uid: 9048 + - uid: 10760 components: - type: Transform - pos: 3.5,-42.5 + pos: -22.5,-50.5 parent: 30 - - uid: 9435 + - uid: 10762 components: - type: Transform - pos: 3.5,-41.5 + pos: -23.5,-50.5 + parent: 30 + - uid: 15013 + components: + - type: Transform + pos: -25.5,-48.5 + parent: 30 + - uid: 16038 + components: + - type: Transform + pos: -25.5,-49.5 + parent: 30 + - uid: 19408 + components: + - type: Transform + pos: -21.5,-50.5 parent: 30 - proto: LockerEngineerFilledHardsuit entities: - - uid: 8835 + - uid: 10763 components: - type: Transform - pos: -25.5,-43.5 + pos: 3.5,-40.5 parent: 30 - - uid: 8836 + - uid: 10766 components: - type: Transform - pos: -25.5,-42.5 - parent: 30 - - uid: 8837 - components: - - type: Transform - pos: -25.5,-44.5 - parent: 30 - - uid: 9700 - components: - - type: Transform - pos: -21.5,-39.5 - parent: 30 - - uid: 9701 - components: - - type: Transform - pos: -22.5,-39.5 - parent: 30 - - uid: 20804 - components: - - type: Transform - pos: -15.5,-38.5 + pos: 3.5,-39.5 parent: 30 - proto: LockerEvidence entities: @@ -99669,6 +97840,11 @@ entities: - type: Transform pos: -42.5,-23.5 parent: 30 + - uid: 10587 + components: + - type: Transform + pos: -4.5,-43.5 + parent: 30 - uid: 15047 components: - type: Transform @@ -99692,29 +97868,6 @@ entities: - 0 - 0 - 0 - - uid: 16996 - components: - - type: Transform - pos: -9.5,-36.5 - parent: 30 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - proto: MachineAnomalyGenerator entities: - uid: 22436 @@ -99769,48 +97922,6 @@ entities: - type: Transform pos: -6.5,-12.5 parent: 30 -- proto: MachineParticleAcceleratorEmitterForeCircuitboard - entities: - - uid: 10198 - components: - - type: Transform - pos: -20.589485,-68.29703 - parent: 30 -- proto: MachineParticleAcceleratorEmitterPortCircuitboard - entities: - - uid: 10199 - components: - - type: Transform - pos: -20.433235,-68.45328 - parent: 30 -- proto: MachineParticleAcceleratorEmitterStarboardCircuitboard - entities: - - uid: 10203 - components: - - type: Transform - pos: -20.29261,-68.60953 - parent: 30 -- proto: MachineParticleAcceleratorEndCapCircuitboard - entities: - - uid: 10204 - components: - - type: Transform - pos: -20.620735,-69.29703 - parent: 30 -- proto: MachineParticleAcceleratorFuelChamberCircuitboard - entities: - - uid: 10200 - components: - - type: Transform - pos: -20.495735,-69.42203 - parent: 30 -- proto: MachineParticleAcceleratorPowerBoxCircuitboard - entities: - - uid: 10201 - components: - - type: Transform - pos: -20.370735,-69.56265 - parent: 30 - proto: MagazinePistolSubMachineGunTopMounted entities: - uid: 1999 @@ -99912,6 +98023,11 @@ entities: parent: 30 - proto: MaintenancePlantSpawner entities: + - uid: 10188 + components: + - type: Transform + pos: -54.5,-64.5 + parent: 30 - uid: 20805 components: - type: Transform @@ -99927,11 +98043,6 @@ entities: - type: Transform pos: 2.5,-13.5 parent: 30 - - uid: 20808 - components: - - type: Transform - pos: -63.5,-64.5 - parent: 30 - proto: MaintenanceToolSpawner entities: - uid: 9197 @@ -100592,10 +98703,15 @@ entities: - type: Transform pos: -7.520787,46.572483 parent: 30 - - uid: 10008 + - uid: 9396 components: - type: Transform - pos: -13.775943,-44.693085 + pos: -2.6778464,-45.34802 + parent: 30 + - uid: 9502 + components: + - type: Transform + pos: -11.53326,-33.503338 parent: 30 - uid: 11733 components: @@ -100607,11 +98723,6 @@ entities: - type: Transform pos: -52.471344,41.489742 parent: 30 - - uid: 22843 - components: - - type: Transform - pos: -31.465784,-57.403034 - parent: 30 - proto: MysteryFigureBox entities: - uid: 20788 @@ -100626,11 +98737,6 @@ entities: - type: Transform pos: -19.5,23.5 parent: 30 - - uid: 7770 - components: - - type: Transform - pos: -11.5,-37.5 - parent: 30 - uid: 8771 components: - type: Transform @@ -100641,10 +98747,15 @@ entities: - type: Transform pos: 21.5,-19.5 parent: 30 - - uid: 10397 + - uid: 10560 components: - type: Transform - pos: -14.5,-46.5 + pos: -5.5,-48.5 + parent: 30 + - uid: 11113 + components: + - type: Transform + pos: -11.5,-37.5 parent: 30 - uid: 15154 components: @@ -100673,15 +98784,10 @@ entities: parent: 30 - proto: NitrogenTankFilled entities: - - uid: 8247 + - uid: 7230 components: - type: Transform - pos: -10.592361,-38.446224 - parent: 30 - - uid: 8266 - components: - - type: Transform - pos: -10.592361,-38.446224 + pos: -9.3813,-38.5809 parent: 30 - proto: NitrousOxideCanister entities: @@ -100753,13 +98859,6 @@ entities: - Uranium - Gold - Silver -- proto: OrganHumanAppendix - entities: - - uid: 2088 - components: - - type: Transform - pos: -51.46508,-63.54434 - parent: 30 - proto: OxygenCanister entities: - uid: 778 @@ -100817,25 +98916,25 @@ entities: - type: Transform pos: 21.5,-13.5 parent: 30 - - uid: 9427 + - uid: 9676 components: - type: Transform - pos: -13.5,-37.5 + pos: -5.5,-47.5 parent: 30 - uid: 9845 components: - type: Transform pos: -38.5,-10.5 parent: 30 - - uid: 10444 + - uid: 11112 components: - type: Transform - pos: -14.5,-48.5 + pos: -13.5,-37.5 parent: 30 - - uid: 11266 + - uid: 13968 components: - type: Transform - pos: -18.5,-50.5 + pos: -16.5,-50.5 parent: 30 - uid: 15155 components: @@ -100869,25 +98968,20 @@ entities: parent: 30 - proto: OxygenTankFilled entities: - - uid: 8226 + - uid: 7228 components: - type: Transform - pos: -10.326736,-38.446224 + pos: -9.625428,-38.389084 parent: 30 - - uid: 8260 + - uid: 9061 components: - type: Transform - pos: -10.326736,-38.446224 + pos: 4.148211,-46.341225 parent: 30 - - uid: 10012 + - uid: 9659 components: - type: Transform - pos: -1.4952288,-44.42826 - parent: 30 - - uid: 11333 - components: - - type: Transform - pos: -1.4344845,-44.759243 + pos: 4.462089,-46.463287 parent: 30 - uid: 19791 components: @@ -101154,26 +99248,6 @@ entities: - type: Transform pos: -82.50391,-46.268623 parent: 30 - - uid: 19426 - components: - - type: Transform - pos: -60.607536,-67.34395 - parent: 30 - - uid: 19427 - components: - - type: Transform - pos: -60.545036,-67.39082 - parent: 30 - - uid: 19428 - components: - - type: Transform - pos: -60.420036,-67.48457 - parent: 30 - - uid: 19429 - components: - - type: Transform - pos: -60.34191,-67.51582 - parent: 30 - uid: 19499 components: - type: Transform @@ -101238,12 +99312,54 @@ entities: - type: Transform pos: 12.5,58.5 parent: 30 -- proto: ParticleAcceleratorComputerCircuitboard +- proto: ParticleAcceleratorControlBoxUnfinished entities: - - uid: 11445 + - uid: 10674 components: - type: Transform - pos: -21.580353,-68.38637 + pos: -18.5,-53.5 + parent: 30 +- proto: ParticleAcceleratorEmitterForeUnfinished + entities: + - uid: 8247 + components: + - type: Transform + pos: -17.5,-55.5 + parent: 30 +- proto: ParticleAcceleratorEmitterPortUnfinished + entities: + - uid: 6659 + components: + - type: Transform + pos: -16.5,-55.5 + parent: 30 +- proto: ParticleAcceleratorEmitterStarboardUnfinished + entities: + - uid: 10682 + components: + - type: Transform + pos: -18.5,-55.5 + parent: 30 +- proto: ParticleAcceleratorEndCapUnfinished + entities: + - uid: 11159 + components: + - type: Transform + pos: -17.5,-52.5 + parent: 30 +- proto: ParticleAcceleratorFuelChamberUnfinished + entities: + - uid: 10650 + components: + - type: Transform + pos: -17.5,-53.5 + parent: 30 +- proto: ParticleAcceleratorPowerBoxUnfinished + entities: + - uid: 11310 + components: + - type: Transform + pos: -17.5,-54.5 parent: 30 - proto: PartRodMetal entities: @@ -101252,26 +99368,6 @@ entities: - type: Transform pos: 13.637659,-25.423977 parent: 30 - - uid: 9420 - components: - - type: Transform - pos: -22.434696,-47.53157 - parent: 30 - - uid: 10193 - components: - - type: Transform - pos: -14.444823,-68.47732 - parent: 30 - - uid: 10196 - components: - - type: Transform - pos: -14.444823,-68.47732 - parent: 30 - - uid: 10197 - components: - - type: Transform - pos: -14.444823,-68.47732 - parent: 30 - uid: 10312 components: - type: Transform @@ -101287,21 +99383,6 @@ entities: - type: Transform pos: -38.461082,27.525124 parent: 30 - - uid: 11283 - components: - - type: Transform - pos: 0.5099411,-44.458656 - parent: 30 - - uid: 11284 - components: - - type: Transform - pos: 0.5099411,-44.458656 - parent: 30 - - uid: 18789 - components: - - type: Transform - pos: -62.4926,-63.50162 - parent: 30 - proto: PartRodMetal1 entities: - uid: 7881 @@ -101402,11 +99483,6 @@ entities: - type: Transform pos: 14.729029,-15.188093 parent: 30 - - uid: 9617 - components: - - type: Transform - pos: -17.887093,-35.280422 - parent: 30 - uid: 9624 components: - type: Transform @@ -101422,29 +99498,26 @@ entities: - type: Transform pos: 25.341276,2.226799 parent: 30 + - uid: 16951 + components: + - type: Transform + pos: -62.22052,-64.60359 + parent: 30 + - uid: 16966 + components: + - type: Transform + pos: -65.47299,-63.534283 + parent: 30 - uid: 17651 components: - type: Transform pos: -82.31641,-46.003 parent: 30 - - uid: 19425 - components: - - type: Transform - pos: -60.52941,-65.45332 - parent: 30 - uid: 19563 components: - type: Transform pos: -72.2945,-65.28793 parent: 30 -- proto: PercentileDie - entities: - - uid: 19473 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -57.4998,-65.351234 - parent: 30 - proto: PersonalAI entities: - uid: 5854 @@ -101462,10 +99535,10 @@ entities: - type: Transform pos: 23.590357,36.58234 parent: 30 - - uid: 19523 + - uid: 17527 components: - type: Transform - pos: -54.530502,-64.54973 + pos: -67.27615,-65.55618 parent: 30 - uid: 20308 components: @@ -101484,6 +99557,11 @@ entities: - type: Transform pos: -17.480167,35.60341 parent: 30 + - uid: 11129 + components: + - type: Transform + pos: -17.39583,-32.28552 + parent: 30 - proto: PianoInstrument entities: - uid: 555 @@ -101575,33 +99653,23 @@ entities: - type: Transform pos: 18.5,-14.5 parent: 30 + - uid: 9656 + components: + - type: Transform + pos: -5.5,-49.5 + parent: 30 - uid: 9696 components: - type: Transform pos: 18.5,-13.5 parent: 30 - - uid: 10510 - components: - - type: Transform - pos: -14.5,-51.5 - parent: 30 - uid: 17005 components: - type: Transform pos: 27.5,-30.5 parent: 30 - - uid: 20465 - components: - - type: Transform - pos: -25.5,-48.5 - parent: 30 - proto: PlasticFlapsAirtightClear entities: - - uid: 1952 - components: - - type: Transform - pos: 48.5,24.5 - parent: 30 - uid: 11228 components: - type: Transform @@ -101647,6 +99715,11 @@ entities: - type: Transform pos: 39.5,12.5 parent: 30 + - uid: 17886 + components: + - type: Transform + pos: 48.5,25.5 + parent: 30 - proto: PlushieCarp entities: - uid: 17654 @@ -101689,10 +99762,10 @@ entities: parent: 30 - proto: PlushieSharkPink entities: - - uid: 22194 + - uid: 17526 components: - type: Transform - pos: -54.4992,-66.45244 + pos: -58.458496,-65.4756 parent: 30 - uid: 22217 components: @@ -101739,6 +99812,16 @@ entities: parent: 30 - proto: PortableGeneratorJrPacman entities: + - uid: 11157 + components: + - type: Transform + pos: -7.5,-48.5 + parent: 30 + - uid: 14479 + components: + - type: Transform + pos: -54.5,-62.5 + parent: 30 - uid: 17594 components: - type: Transform @@ -101749,16 +99832,6 @@ entities: - type: Transform pos: -23.5,-28.5 parent: 30 - - uid: 19474 - components: - - type: Transform - pos: -15.5,-32.5 - parent: 30 - - uid: 19475 - components: - - type: Transform - pos: -65.5,-63.5 - parent: 30 - uid: 19476 components: - type: Transform @@ -101786,17 +99859,17 @@ entities: parent: 30 - proto: PortableGeneratorPacman entities: - - uid: 9408 + - uid: 10787 components: - type: Transform - pos: -25.5,-46.5 + pos: -19.5,-36.5 parent: 30 - proto: PortableGeneratorSuperPacman entities: - - uid: 9389 + - uid: 19415 components: - type: Transform - pos: -25.5,-47.5 + pos: -19.5,-37.5 parent: 30 - uid: 21948 components: @@ -101830,11 +99903,6 @@ entities: - type: Transform pos: 40.5,14.5 parent: 30 - - uid: 22802 - components: - - type: Transform - pos: -27.5,-61.5 - parent: 30 - proto: PosterContrabandAtmosiaDeclarationIndependence entities: - uid: 9181 @@ -101896,13 +99964,6 @@ entities: - type: Transform pos: -28.5,34.5 parent: 30 -- proto: PosterContrabandHighEffectEngineering - entities: - - uid: 8360 - components: - - type: Transform - pos: -10.5,-37.5 - parent: 30 - proto: PosterContrabandInterdyne entities: - uid: 12243 @@ -102014,13 +100075,6 @@ entities: - type: Transform pos: -17.5,-13.5 parent: 30 -- proto: PosterLegitBuild - entities: - - uid: 10142 - components: - - type: Transform - pos: -18.5,-33.5 - parent: 30 - proto: PosterLegitCarpMount entities: - uid: 14968 @@ -102252,10 +100306,11 @@ entities: - type: Transform pos: -22.5,-38.5 parent: 30 - - uid: 22543 + - uid: 18185 components: - type: Transform - pos: 19.5,16.5 + rot: 3.141592653589793 rad + pos: 20.5,9.5 parent: 30 - proto: PosterLegitSafetyInternals entities: @@ -102269,17 +100324,11 @@ entities: - type: Transform pos: 3.5,-35.5 parent: 30 - - uid: 22544 + - uid: 19795 components: - type: Transform - pos: 19.5,14.5 - parent: 30 -- proto: PosterLegitSafetyMothDelam - entities: - - uid: 10087 - components: - - type: Transform - pos: -20.5,-39.5 + rot: -1.5707963267948966 rad + pos: 13.5,13.5 parent: 30 - proto: PosterLegitSafetyMothEpi entities: @@ -102315,11 +100364,6 @@ entities: rot: 1.5707963267948966 rad pos: 10.5,-21.5 parent: 30 - - uid: 10088 - components: - - type: Transform - pos: -0.5,-46.5 - parent: 30 - proto: PosterLegitSafetyReport entities: - uid: 2412 @@ -102332,6 +100376,13 @@ entities: - type: Transform pos: 6.5,-14.5 parent: 30 +- proto: PosterLegitSecWatch + entities: + - uid: 20637 + components: + - type: Transform + pos: -6.5,-50.5 + parent: 30 - proto: PosterLegitSpaceCops entities: - uid: 2411 @@ -102509,11 +100560,6 @@ entities: - type: Transform pos: 14.5,-13.5 parent: 30 - - uid: 12668 - components: - - type: Transform - pos: 20.5,16.5 - parent: 30 - uid: 12764 components: - type: Transform @@ -102524,16 +100570,21 @@ entities: - type: Transform pos: 33.5,9.5 parent: 30 - - uid: 12925 - components: - - type: Transform - pos: 12.5,10.5 - parent: 30 - uid: 13376 components: - type: Transform pos: 12.5,18.5 parent: 30 + - uid: 16402 + components: + - type: Transform + pos: 16.5,12.5 + parent: 30 + - uid: 18609 + components: + - type: Transform + pos: 23.5,16.5 + parent: 30 - uid: 20139 components: - type: Transform @@ -102718,6 +100769,16 @@ entities: - type: ContainerContainer containers: stash: !type:ContainerSlot {} + - uid: 7103 + components: + - type: Transform + pos: 0.5,-37.5 + parent: 30 + - uid: 7110 + components: + - type: Transform + pos: 1.5,-41.5 + parent: 30 - uid: 8613 components: - type: Transform @@ -102734,6 +100795,36 @@ entities: - type: ContainerContainer containers: stash: !type:ContainerSlot {} + - uid: 10653 + components: + - type: Transform + pos: -22.5,-44.5 + parent: 30 + - uid: 11068 + components: + - type: Transform + pos: -21.5,-49.5 + parent: 30 + - uid: 11080 + components: + - type: Transform + pos: -3.5,-41.5 + parent: 30 + - uid: 11145 + components: + - type: Transform + pos: -10.5,-45.5 + parent: 30 + - uid: 11146 + components: + - type: Transform + pos: -24.5,-46.5 + parent: 30 + - uid: 13971 + components: + - type: Transform + pos: -19.5,-44.5 + parent: 30 - uid: 16045 components: - type: Transform @@ -102766,6 +100857,11 @@ entities: - type: ContainerContainer containers: stash: !type:ContainerSlot {} + - uid: 16798 + components: + - type: Transform + pos: -63.5,-65.5 + parent: 30 - uid: 16920 components: - type: Transform @@ -102854,38 +100950,16 @@ entities: - type: ContainerContainer containers: stash: !type:ContainerSlot {} - - uid: 17910 + - uid: 18880 components: - type: Transform - pos: -55.5,-60.5 + pos: -19.5,-39.5 parent: 30 - - type: ContainerContainer - containers: - stash: !type:ContainerSlot {} - - uid: 17911 + - uid: 18991 components: - type: Transform - pos: -68.5,-60.5 + pos: -25.5,-39.5 parent: 30 - - type: ContainerContainer - containers: - stash: !type:ContainerSlot {} - - uid: 19415 - components: - - type: Transform - pos: -57.5,-62.5 - parent: 30 - - type: ContainerContainer - containers: - stash: !type:ContainerSlot {} - - uid: 19416 - components: - - type: Transform - pos: -60.5,-62.5 - parent: 30 - - type: ContainerContainer - containers: - stash: !type:ContainerSlot {} - uid: 19527 components: - type: Transform @@ -102934,21 +101008,6 @@ entities: - type: ContainerContainer containers: stash: !type:ContainerSlot {} -- proto: PottedPlantRandomPlastic - entities: - - uid: 9615 - components: - - type: Transform - pos: -16.5,-38.5 - parent: 30 - - type: ContainerContainer - containers: - stash: !type:ContainerSlot {} - - uid: 22844 - components: - - type: Transform - pos: -30.5,-57.5 - parent: 30 - proto: PottedPlantRD entities: - uid: 12726 @@ -103010,11 +101069,26 @@ entities: rot: 1.5707963267948966 rad pos: 4.5,-27.5 parent: 30 + - uid: 10005 + components: + - type: Transform + pos: -15.5,-32.5 + parent: 30 - uid: 10311 components: - type: Transform pos: -41.5,27.5 parent: 30 + - uid: 10661 + components: + - type: Transform + pos: -25.5,-42.5 + parent: 30 + - uid: 10795 + components: + - type: Transform + pos: 2.5,-41.5 + parent: 30 - uid: 12106 components: - type: Transform @@ -103030,21 +101104,16 @@ entities: - type: Transform pos: 24.5,10.5 parent: 30 - - uid: 12837 - components: - - type: Transform - pos: 15.5,12.5 - parent: 30 - - uid: 13643 - components: - - type: Transform - pos: -15.5,-43.5 - parent: 30 - uid: 13645 components: - type: Transform pos: 16.5,23.5 parent: 30 + - uid: 18125 + components: + - type: Transform + pos: 16.5,14.5 + parent: 30 - uid: 20992 components: - type: Transform @@ -103052,27 +101121,6 @@ entities: parent: 30 - type: Physics canCollide: False - - uid: 20993 - components: - - type: Transform - pos: -18.5,-35.5 - parent: 30 - - type: Physics - canCollide: False - - uid: 20995 - components: - - type: Transform - pos: -11.5,-35.5 - parent: 30 - - type: Physics - canCollide: False - - uid: 20996 - components: - - type: Transform - pos: 1.5,-44.5 - parent: 30 - - type: Physics - canCollide: False - uid: 20999 components: - type: Transform @@ -103144,6 +101192,18 @@ entities: rot: 3.141592653589793 rad pos: -58.5,-9.5 parent: 30 + - uid: 906 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-52.5 + parent: 30 + - uid: 916 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -25.5,-43.5 + parent: 30 - uid: 3203 components: - type: Transform @@ -104214,12 +102274,6 @@ entities: rot: 1.5707963267948966 rad pos: -9.5,-11.5 parent: 30 - - uid: 9103 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,-47.5 - parent: 30 - uid: 9250 components: - type: Transform @@ -104236,31 +102290,11 @@ entities: parent: 30 - type: ApcPowerReceiver powerLoad: 0 - - uid: 9433 + - uid: 9700 components: - type: Transform rot: 3.141592653589793 rad - pos: -6.5,-55.5 - parent: 30 - - uid: 9447 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -25.5,-42.5 - parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 9619 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5,-51.5 - parent: 30 - - uid: 9705 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,-55.5 + pos: -10.5,-31.5 parent: 30 - uid: 9800 components: @@ -104268,41 +102302,65 @@ entities: rot: -1.5707963267948966 rad pos: -40.5,-12.5 parent: 30 - - uid: 9979 + - uid: 9862 components: - type: Transform rot: 1.5707963267948966 rad - pos: -14.5,-47.5 + pos: -2.5,-46.5 + parent: 30 + - uid: 9868 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,-56.5 parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 10072 components: - type: Transform pos: -56.5,10.5 parent: 30 - - uid: 10092 + - uid: 10585 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -11.5,-34.5 + parent: 30 + - uid: 10591 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -15.5,-53.5 + parent: 30 + - uid: 10622 components: - type: Transform rot: 1.5707963267948966 rad - pos: -13.5,-55.5 + pos: -19.5,-50.5 parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 10095 + - uid: 10637 components: - type: Transform - pos: -12.5,-43.5 + rot: 1.5707963267948966 rad + pos: -19.5,-46.5 parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 10096 + - uid: 10798 components: - type: Transform - pos: -2.5,-43.5 + rot: -1.5707963267948966 rad + pos: 4.5,-56.5 + parent: 30 + - uid: 10799 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-46.5 + parent: 30 + - uid: 10800 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,-52.5 parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 10966 components: - type: Transform @@ -104505,77 +102563,6 @@ entities: parent: 30 - type: ApcPowerReceiver powerLoad: 0 - - uid: 11003 - components: - - type: Transform - pos: -22.5,-39.5 - parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 11009 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -18.5,-46.5 - parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 11011 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -18.5,-50.5 - parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 11013 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -19.5,-44.5 - parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 11020 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -5.5,-41.5 - parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 11021 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -9.5,-41.5 - parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 11024 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 0.5,-42.5 - parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 11025 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,-43.5 - parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 11026 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,-39.5 - parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 11027 components: - type: Transform @@ -104584,44 +102571,6 @@ entities: parent: 30 - type: ApcPowerReceiver powerLoad: 0 - - uid: 11028 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -5.5,-34.5 - parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 11031 - components: - - type: Transform - pos: -6.5,-27.5 - parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 11033 - components: - - type: Transform - pos: -13.5,-27.5 - parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 11034 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -13.5,-34.5 - parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 11036 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -5.5,-31.5 - parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 11037 components: - type: Transform @@ -104630,6 +102579,27 @@ entities: parent: 30 - type: ApcPowerReceiver powerLoad: 0 + - uid: 11077 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,-45.5 + parent: 30 + - uid: 11079 + components: + - type: Transform + pos: -20.5,-39.5 + parent: 30 + - uid: 11083 + components: + - type: Transform + pos: -4.5,-38.5 + parent: 30 + - uid: 11095 + components: + - type: Transform + pos: -10.5,-38.5 + parent: 30 - uid: 11225 components: - type: Transform @@ -104676,30 +102646,6 @@ entities: parent: 30 - type: ApcPowerReceiver powerLoad: 0 - - uid: 11347 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,-38.5 - parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 11348 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -13.5,-38.5 - parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 11349 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -15.5,-38.5 - parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 11427 components: - type: Transform @@ -104708,6 +102654,16 @@ entities: parent: 30 - type: ApcPowerReceiver powerLoad: 0 + - uid: 11444 + components: + - type: Transform + pos: -8.5,-27.5 + parent: 30 + - uid: 11445 + components: + - type: Transform + pos: -17.5,-29.5 + parent: 30 - uid: 11469 components: - type: Transform @@ -104729,6 +102685,17 @@ entities: parent: 30 - type: ApcPowerReceiver powerLoad: 0 + - uid: 11588 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,-39.5 + parent: 30 + - uid: 11614 + components: + - type: Transform + pos: -10.5,-47.5 + parent: 30 - uid: 11769 components: - type: Transform @@ -104942,13 +102909,6 @@ entities: parent: 30 - type: ApcPowerReceiver powerLoad: 0 - - uid: 12654 - components: - - type: Transform - pos: 18.5,12.5 - parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 12763 components: - type: Transform @@ -104964,13 +102924,6 @@ entities: parent: 30 - type: ApcPowerReceiver powerLoad: 0 - - uid: 13077 - components: - - type: Transform - pos: 12.5,12.5 - parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 13363 components: - type: Transform @@ -104986,14 +102939,6 @@ entities: parent: 30 - type: ApcPowerReceiver powerLoad: 0 - - uid: 13365 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 15.5,14.5 - parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 13366 components: - type: Transform @@ -105092,6 +103037,12 @@ entities: parent: 30 - type: ApcPowerReceiver powerLoad: 0 + - uid: 13974 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -15.5,-48.5 + parent: 30 - uid: 14842 components: - type: Transform @@ -105179,6 +103130,48 @@ entities: parent: 30 - type: ApcPowerReceiver powerLoad: 0 + - uid: 18079 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 18.5,10.5 + parent: 30 + - uid: 18762 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 12.5,14.5 + parent: 30 + - uid: 18787 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -66.5,-64.5 + parent: 30 + - uid: 18796 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -62.5,-65.5 + parent: 30 + - uid: 18879 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -15.5,-44.5 + parent: 30 + - uid: 19234 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -21.5,-47.5 + parent: 30 + - uid: 19420 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -25.5,-49.5 + parent: 30 - uid: 19573 components: - type: Transform @@ -105327,29 +103320,29 @@ entities: parent: 30 - type: ApcPowerReceiver powerLoad: 0 - - uid: 22852 - components: - - type: Transform - pos: -36.5,-57.5 - parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 22853 +- proto: PoweredlightExterior + entities: + - uid: 833 components: - type: Transform rot: 1.5707963267948966 rad - pos: -41.5,-60.5 + pos: 6.5,-52.5 parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 22854 + - uid: 10166 components: - type: Transform - rot: 3.141592653589793 rad - pos: -36.5,-63.5 + pos: -22.5,-58.5 + parent: 30 + - uid: 10801 + components: + - type: Transform + pos: 7.5,-46.5 + parent: 30 + - uid: 11147 + components: + - type: Transform + pos: -12.5,-58.5 parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - proto: PoweredlightLED entities: - uid: 10291 @@ -105481,12 +103474,6 @@ entities: rot: 1.5707963267948966 rad pos: -5.5,15.5 parent: 30 - - uid: 3196 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -9.5,-59.5 - parent: 30 - uid: 3201 components: - type: Transform @@ -105499,6 +103486,17 @@ entities: rot: 1.5707963267948966 rad pos: -52.5,5.5 parent: 30 + - uid: 4126 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -53.5,-61.5 + parent: 30 + - uid: 4127 + components: + - type: Transform + pos: -54.5,-62.5 + parent: 30 - uid: 4237 components: - type: Transform @@ -105832,12 +103830,6 @@ entities: rot: 1.5707963267948966 rad pos: -38.5,-11.5 parent: 30 - - uid: 7912 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -54.5,-64.5 - parent: 30 - uid: 8313 components: - type: Transform @@ -105845,17 +103837,11 @@ entities: parent: 30 - type: ApcPowerReceiver powerLoad: 0 - - uid: 9059 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -7.5,-58.5 - parent: 30 - - uid: 9060 + - uid: 9161 components: - type: Transform rot: 1.5707963267948966 rad - pos: -5.5,-59.5 + pos: 12.5,11.5 parent: 30 - uid: 9225 components: @@ -105865,11 +103851,15 @@ entities: parent: 30 - type: ApcPowerReceiver powerLoad: 0 - - uid: 9634 + - uid: 9998 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -72.5,-59.5 + pos: 16.5,-18.5 + parent: 30 + - uid: 10045 + components: + - type: Transform + pos: -17.5,-34.5 parent: 30 - uid: 10046 components: @@ -105877,6 +103867,11 @@ entities: rot: 1.5707963267948966 rad pos: 23.5,42.5 parent: 30 + - uid: 10170 + components: + - type: Transform + pos: -23.5,-55.5 + parent: 30 - uid: 10252 components: - type: Transform @@ -105889,6 +103884,18 @@ entities: rot: 1.5707963267948966 rad pos: -20.5,15.5 parent: 30 + - uid: 10598 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,-56.5 + parent: 30 + - uid: 10797 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,-56.5 + parent: 30 - uid: 10997 components: - type: Transform @@ -105897,44 +103904,6 @@ entities: parent: 30 - type: ApcPowerReceiver powerLoad: 0 - - uid: 11005 - components: - - type: Transform - pos: -22.5,-46.5 - parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 11007 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -25.5,-50.5 - parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 11014 - components: - - type: Transform - pos: -18.5,-34.5 - parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 11015 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -15.5,-35.5 - parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 11030 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -17.5,-30.5 - parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 11303 components: - type: Transform @@ -105985,6 +103954,18 @@ entities: parent: 30 - type: ApcPowerReceiver powerLoad: 0 + - uid: 12822 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -48.5,-22.5 + parent: 30 + - uid: 12925 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -54.5,-24.5 + parent: 30 - uid: 15014 components: - type: Transform @@ -106045,13 +104026,6 @@ entities: parent: 30 - type: ApcPowerReceiver powerLoad: 0 - - uid: 15349 - components: - - type: Transform - pos: 50.5,24.5 - parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 15350 components: - type: Transform @@ -106203,6 +104177,12 @@ entities: parent: 30 - type: ApcPowerReceiver powerLoad: 0 + - uid: 16131 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -77.5,-59.5 + parent: 30 - uid: 16168 components: - type: Transform @@ -106398,6 +104378,46 @@ entities: parent: 30 - type: ApcPowerReceiver powerLoad: 0 + - uid: 17730 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -68.5,-57.5 + parent: 30 + - uid: 17789 + components: + - type: Transform + pos: -70.5,-58.5 + parent: 30 + - uid: 18210 + components: + - type: Transform + pos: -36.5,-39.5 + parent: 30 + - uid: 18359 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -60.5,-60.5 + parent: 30 + - uid: 18375 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 48.5,22.5 + parent: 30 + - uid: 18793 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -58.5,-63.5 + parent: 30 + - uid: 18794 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -58.5,-65.5 + parent: 30 - uid: 18821 components: - type: Transform @@ -106588,49 +104608,8 @@ entities: - uid: 18854 components: - type: Transform - pos: -63.5,-62.5 + pos: -69.5,-62.5 parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 18855 - components: - - type: Transform - pos: -66.5,-62.5 - parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 18856 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -54.5,-66.5 - parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 18857 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -60.5,-67.5 - parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 18858 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -60.5,-63.5 - parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 19490 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -70.5,-59.5 - parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 19579 components: - type: Transform @@ -106807,60 +104786,6 @@ entities: parent: 30 - type: ApcPowerReceiver powerLoad: 0 - - uid: 22845 - components: - - type: Transform - pos: -30.5,-57.5 - parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 22846 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -30.5,-63.5 - parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 22847 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -27.5,-59.5 - parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 22848 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -25.5,-59.5 - parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 22849 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -26.5,-63.5 - parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 22850 - components: - - type: Transform - pos: -22.5,-57.5 - parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 22851 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -20.5,-59.5 - parent: 30 - - type: ApcPowerReceiver - powerLoad: 0 - proto: PoweredSmallLightEmpty entities: - uid: 15072 @@ -106929,11 +104854,6 @@ entities: - type: Transform pos: -3.5,22.5 parent: 30 - - uid: 905 - components: - - type: Transform - pos: -17.5,-32.5 - parent: 30 - uid: 1340 components: - type: Transform @@ -106964,11 +104884,6 @@ entities: - type: Transform pos: -37.5,55.5 parent: 30 - - uid: 5615 - components: - - type: Transform - pos: -13.5,-35.5 - parent: 30 - uid: 6276 components: - type: Transform @@ -106989,15 +104904,15 @@ entities: - type: Transform pos: -38.5,-22.5 parent: 30 - - uid: 8263 + - uid: 7227 components: - type: Transform - pos: -10.5,-38.5 + pos: -9.5,-38.5 parent: 30 - - uid: 8335 + - uid: 8456 components: - type: Transform - pos: -4.5,-38.5 + pos: -5.5,-38.5 parent: 30 - uid: 9196 components: @@ -107019,56 +104934,31 @@ entities: - type: Transform pos: 9.5,-22.5 parent: 30 - - uid: 9417 - components: - - type: Transform - pos: -22.5,-47.5 - parent: 30 - uid: 9439 components: - type: Transform pos: 5.5,-23.5 parent: 30 - - uid: 10194 + - uid: 10126 components: - type: Transform - pos: -14.5,-68.5 + pos: -8.5,-43.5 parent: 30 - - uid: 10202 + - uid: 11086 components: - type: Transform - pos: -20.5,-68.5 - parent: 30 - - uid: 10215 - components: - - type: Transform - pos: -20.5,-69.5 + pos: -9.5,-41.5 parent: 30 - uid: 11255 components: - type: Transform pos: -3.5,-35.5 parent: 30 - - uid: 11265 - components: - - type: Transform - pos: -16.5,-50.5 - parent: 30 - - uid: 11300 - components: - - type: Transform - pos: -18.5,-48.5 - parent: 30 - uid: 11421 components: - type: Transform pos: 1.5,-15.5 parent: 30 - - uid: 11444 - components: - - type: Transform - pos: -21.5,-68.5 - parent: 30 - uid: 11737 components: - type: Transform @@ -107084,6 +104974,28 @@ entities: - type: Transform pos: 17.5,-9.5 parent: 30 + - uid: 12821 + components: + - type: Transform + pos: -52.5,-62.5 + parent: 30 + - uid: 13953 + components: + - type: Transform + pos: -11.5,-33.5 + parent: 30 + - uid: 13967 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.5,-26.5 + parent: 30 + - uid: 13969 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -19.5,-50.5 + parent: 30 - uid: 15019 components: - type: Transform @@ -107174,6 +105086,12 @@ entities: - type: Transform pos: -53.5,48.5 parent: 30 + - uid: 19413 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -15.5,-37.5 + parent: 30 - uid: 19616 components: - type: Transform @@ -107234,23 +105152,49 @@ entities: - type: Transform pos: 4.5,20.5 parent: 30 - - uid: 22836 +- proto: RadiationCollectorFullTank + entities: + - uid: 9419 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -29.5,-57.5 + pos: -15.5,-60.5 + parent: 30 + - uid: 10677 + components: + - type: Transform + pos: -14.5,-60.5 + parent: 30 + - uid: 11087 + components: + - type: Transform + pos: -19.5,-60.5 + parent: 30 + - uid: 11104 + components: + - type: Transform + pos: -16.5,-60.5 + parent: 30 + - uid: 11108 + components: + - type: Transform + pos: -18.5,-60.5 + parent: 30 + - uid: 19830 + components: + - type: Transform + pos: -20.5,-60.5 parent: 30 - proto: RadioHandheld entities: - - uid: 11289 + - uid: 11081 components: - type: Transform - pos: -19.595512,-44.335434 + pos: -21.680277,-41.431904 parent: 30 - - uid: 11290 + - uid: 19817 components: - type: Transform - pos: -19.361137,-44.44481 + pos: -21.453587,-41.32728 parent: 30 - proto: Railing entities: @@ -107288,6 +105232,30 @@ entities: rot: -1.5707963267948966 rad pos: 7.5,-7.5 parent: 30 + - uid: 13990 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -26.5,6.5 + parent: 30 + - uid: 14043 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -27.5,6.5 + parent: 30 + - uid: 14457 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -28.5,6.5 + parent: 30 + - uid: 18844 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -23.5,4.5 + parent: 30 - uid: 21323 components: - type: Transform @@ -107310,8 +105278,34 @@ entities: - type: Transform pos: 6.5,-10.5 parent: 30 +- proto: RailingCorner + entities: + - uid: 13389 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -24.5,5.5 + parent: 30 + - uid: 13751 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -25.5,6.5 + parent: 30 - proto: RailingCornerSmall entities: + - uid: 14433 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -25.5,5.5 + parent: 30 + - uid: 18842 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -24.5,4.5 + parent: 30 - uid: 21325 components: - type: Transform @@ -107352,11 +105346,6 @@ entities: - type: Transform pos: -5.5,23.5 parent: 30 - - uid: 22547 - components: - - type: Transform - pos: 41.5,13.5 - parent: 30 - proto: RandomBoard entities: - uid: 5616 @@ -107381,6 +105370,11 @@ entities: parent: 30 - proto: RandomFoodMeal entities: + - uid: 338 + components: + - type: Transform + pos: 18.5,10.5 + parent: 30 - uid: 5003 components: - type: Transform @@ -107410,6 +105404,11 @@ entities: - type: Transform pos: -32.5,23.5 parent: 30 + - uid: 3341 + components: + - type: Transform + pos: -55.5,-67.5 + parent: 30 - uid: 12463 components: - type: Transform @@ -107420,11 +105419,6 @@ entities: - type: Transform pos: -61.5,29.5 parent: 30 - - uid: 18375 - components: - - type: Transform - pos: -63.5,-67.5 - parent: 30 - proto: RandomPainting entities: - uid: 19149 @@ -107464,6 +105458,11 @@ entities: - type: Transform pos: -20.5,-32.5 parent: 30 + - uid: 20623 + components: + - type: Transform + pos: -14.5,-38.5 + parent: 30 - proto: RandomPosterContraband entities: - uid: 2421 @@ -107673,6 +105672,21 @@ entities: - type: Transform pos: 47.5,41.5 parent: 30 + - uid: 20636 + components: + - type: Transform + pos: -26.5,-43.5 + parent: 30 + - uid: 20638 + components: + - type: Transform + pos: -10.5,-46.5 + parent: 30 + - uid: 20639 + components: + - type: Transform + pos: -14.5,-53.5 + parent: 30 - uid: 22088 components: - type: Transform @@ -107724,6 +105738,11 @@ entities: - type: Transform pos: 39.5,19.5 parent: 30 + - uid: 14366 + components: + - type: Transform + pos: 53.5,22.5 + parent: 30 - uid: 15160 components: - type: Transform @@ -107919,16 +105938,6 @@ entities: - type: Transform pos: 45.5,31.5 parent: 30 - - uid: 15990 - components: - - type: Transform - pos: 53.5,24.5 - parent: 30 - - uid: 15991 - components: - - type: Transform - pos: 51.5,24.5 - parent: 30 - uid: 15992 components: - type: Transform @@ -108124,22 +106133,22 @@ entities: parent: 30 - proto: RCD entities: - - uid: 9601 + - uid: 10545 components: - type: Transform - pos: -15.481125,-35.377903 + pos: -5.524026,-35.43381 parent: 30 - proto: RCDAmmo entities: - - uid: 9602 + - uid: 9491 components: - type: Transform - pos: -15.3405,-34.940403 + pos: -5.614659,-35.18134 parent: 30 - - uid: 9603 + - uid: 11059 components: - type: Transform - pos: -15.606125,-34.956028 + pos: -5.3324804,-35.19619 parent: 30 - proto: ReagentContainerFlourSmall entities: @@ -108152,11 +106161,11 @@ entities: tags: [] - proto: Recycler entities: - - uid: 14530 + - uid: 12974 components: - type: Transform rot: 1.5707963267948966 rad - pos: 53.5,22.5 + pos: 49.5,23.5 parent: 30 - proto: ReinforcedGirder entities: @@ -108167,35 +106176,11 @@ entities: parent: 30 - proto: ReinforcedPlasmaWindow entities: - - uid: 3583 + - uid: 4893 components: - type: Transform rot: 1.5707963267948966 rad - pos: -5.5,-56.5 - parent: 30 - - uid: 4406 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,-56.5 - parent: 30 - - uid: 4895 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -11.5,-56.5 - parent: 30 - - uid: 6271 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -12.5,-56.5 - parent: 30 - - uid: 7208 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -3.5,-56.5 + pos: 2.5,-54.5 parent: 30 - uid: 8537 components: @@ -108274,23 +106259,23 @@ entities: - type: Transform pos: 24.5,-22.5 parent: 30 - - uid: 9058 + - uid: 11122 components: - type: Transform rot: 1.5707963267948966 rad - pos: -9.5,-56.5 + pos: 1.5,-54.5 parent: 30 - - uid: 9061 + - uid: 11130 components: - type: Transform rot: 1.5707963267948966 rad - pos: -10.5,-56.5 + pos: -2.5,-54.5 parent: 30 - - uid: 9063 + - uid: 11136 components: - type: Transform rot: 1.5707963267948966 rad - pos: -4.5,-56.5 + pos: -3.5,-54.5 parent: 30 - uid: 12898 components: @@ -108323,6 +106308,18 @@ entities: - type: Transform pos: 35.5,14.5 parent: 30 + - uid: 13954 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,-54.5 + parent: 30 + - uid: 13955 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,-54.5 + parent: 30 - uid: 17012 components: - type: Transform @@ -108430,11 +106427,6 @@ entities: - type: Transform pos: -64.5,12.5 parent: 30 - - uid: 795 - components: - - type: Transform - pos: -33.5,-61.5 - parent: 30 - uid: 843 components: - type: Transform @@ -109721,31 +107713,6 @@ entities: - type: Transform pos: -14.5,-17.5 parent: 30 - - uid: 7094 - components: - - type: Transform - pos: -0.5,-52.5 - parent: 30 - - uid: 7095 - components: - - type: Transform - pos: -0.5,-54.5 - parent: 30 - - uid: 7107 - components: - - type: Transform - pos: 1.5,-45.5 - parent: 30 - - uid: 7108 - components: - - type: Transform - pos: 3.5,-45.5 - parent: 30 - - uid: 7125 - components: - - type: Transform - pos: -0.5,-51.5 - parent: 30 - uid: 7158 components: - type: Transform @@ -109817,6 +107784,12 @@ entities: - type: Transform pos: -14.5,-13.5 parent: 30 + - uid: 7912 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 15.5,12.5 + parent: 30 - uid: 7996 components: - type: Transform @@ -109873,11 +107846,6 @@ entities: - type: Transform pos: -65.5,42.5 parent: 30 - - uid: 8359 - components: - - type: Transform - pos: -32.5,-61.5 - parent: 30 - uid: 8377 components: - type: Transform @@ -109935,11 +107903,6 @@ entities: rot: 1.5707963267948966 rad pos: 2.5,-26.5 parent: 30 - - uid: 8408 - components: - - type: Transform - pos: 15.5,-18.5 - parent: 30 - uid: 8409 components: - type: Transform @@ -109955,11 +107918,6 @@ entities: - type: Transform pos: 16.5,-12.5 parent: 30 - - uid: 8419 - components: - - type: Transform - pos: 17.5,-18.5 - parent: 30 - uid: 8420 components: - type: Transform @@ -109980,16 +107938,6 @@ entities: - type: Transform pos: 7.5,-22.5 parent: 30 - - uid: 8455 - components: - - type: Transform - pos: -32.5,-62.5 - parent: 30 - - uid: 8456 - components: - - type: Transform - pos: -32.5,-63.5 - parent: 30 - uid: 8457 components: - type: Transform @@ -110290,11 +108238,6 @@ entities: rot: 3.141592653589793 rad pos: -3.5,-31.5 parent: 30 - - uid: 9194 - components: - - type: Transform - pos: 16.5,-20.5 - parent: 30 - uid: 9277 components: - type: Transform @@ -110315,6 +108258,18 @@ entities: - type: Transform pos: -0.5,-32.5 parent: 30 + - uid: 9303 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,-50.5 + parent: 30 + - uid: 9316 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,-51.5 + parent: 30 - uid: 9321 components: - type: Transform @@ -110330,15 +108285,10 @@ entities: - type: Transform pos: -49.5,-10.5 parent: 30 - - uid: 9585 + - uid: 9495 components: - type: Transform - pos: -17.5,-37.5 - parent: 30 - - uid: 9586 - components: - - type: Transform - pos: -19.5,-37.5 + pos: -16.5,-45.5 parent: 30 - uid: 9597 components: @@ -110350,86 +108300,28 @@ entities: - type: Transform pos: -38.5,-36.5 parent: 30 - - uid: 9638 - components: - - type: Transform - pos: -0.5,-43.5 - parent: 30 - - uid: 9639 - components: - - type: Transform - pos: -14.5,-43.5 - parent: 30 - - uid: 9640 - components: - - type: Transform - pos: 2.5,-53.5 - parent: 30 - - uid: 9641 - components: - - type: Transform - pos: 2.5,-52.5 - parent: 30 - - uid: 9642 - components: - - type: Transform - pos: 2.5,-54.5 - parent: 30 - - uid: 9643 - components: - - type: Transform - pos: -0.5,-50.5 - parent: 30 - - uid: 9644 - components: - - type: Transform - pos: 2.5,-50.5 - parent: 30 - - uid: 9645 - components: - - type: Transform - pos: 2.5,-49.5 - parent: 30 - - uid: 9646 - components: - - type: Transform - pos: 0.5,-47.5 - parent: 30 - - uid: 9647 - components: - - type: Transform - pos: -0.5,-48.5 - parent: 30 - - uid: 9648 - components: - - type: Transform - pos: 2.5,-48.5 - parent: 30 - - uid: 9649 - components: - - type: Transform - pos: -10.5,-42.5 - parent: 30 - - uid: 9650 - components: - - type: Transform - pos: -8.5,-42.5 - parent: 30 - - uid: 9651 - components: - - type: Transform - pos: -6.5,-42.5 - parent: 30 - - uid: 9652 - components: - - type: Transform - pos: -4.5,-42.5 - parent: 30 - uid: 9664 components: - type: Transform pos: 4.5,37.5 parent: 30 + - uid: 9679 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,-48.5 + parent: 30 + - uid: 9680 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,-49.5 + parent: 30 + - uid: 9702 + components: + - type: Transform + pos: -18.5,-45.5 + parent: 30 - uid: 9706 components: - type: Transform @@ -110450,20 +108342,17 @@ entities: - type: Transform pos: -57.5,5.5 parent: 30 - - uid: 9813 + - uid: 9815 components: - type: Transform - pos: 1.5,-47.5 + rot: -1.5707963267948966 rad + pos: -1.5,-42.5 parent: 30 - - uid: 9817 + - uid: 9820 components: - type: Transform - pos: 1.5,-55.5 - parent: 30 - - uid: 9818 - components: - - type: Transform - pos: 0.5,-55.5 + rot: -1.5707963267948966 rad + pos: 2.5,-42.5 parent: 30 - uid: 9848 components: @@ -110480,21 +108369,41 @@ entities: - type: Transform pos: -32.5,-7.5 parent: 30 + - uid: 10053 + components: + - type: Transform + pos: -15.5,-57.5 + parent: 30 + - uid: 10054 + components: + - type: Transform + pos: -17.5,-57.5 + parent: 30 + - uid: 10058 + components: + - type: Transform + pos: -16.5,-57.5 + parent: 30 + - uid: 10059 + components: + - type: Transform + pos: -19.5,-57.5 + parent: 30 + - uid: 10088 + components: + - type: Transform + pos: -14.5,-57.5 + parent: 30 - uid: 10089 components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,-26.5 parent: 30 - - uid: 10090 + - uid: 10094 components: - type: Transform - pos: 4.5,-44.5 - parent: 30 - - uid: 10097 - components: - - type: Transform - pos: 4.5,-42.5 + pos: -18.5,-57.5 parent: 30 - uid: 10098 components: @@ -110506,79 +108415,103 @@ entities: - type: Transform pos: 4.5,-38.5 parent: 30 - - uid: 10114 + - uid: 10124 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -18.5,-45.5 + rot: -1.5707963267948966 rad + pos: -14.5,-31.5 parent: 30 - - uid: 10115 + - uid: 10139 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -16.5,-45.5 + pos: -20.5,-57.5 parent: 30 - - uid: 10131 + - uid: 10152 components: - type: Transform - pos: -16.5,-49.5 + pos: -14.5,-39.5 parent: 30 - - uid: 10132 + - uid: 10185 components: - type: Transform - pos: -18.5,-49.5 - parent: 30 - - uid: 10133 - components: - - type: Transform - pos: -18.5,-52.5 - parent: 30 - - uid: 10134 - components: - - type: Transform - pos: -16.5,-52.5 - parent: 30 - - uid: 10262 - components: - - type: Transform - pos: -33.5,-59.5 - parent: 30 - - uid: 10263 - components: - - type: Transform - pos: -32.5,-59.5 - parent: 30 - - uid: 10264 - components: - - type: Transform - pos: -32.5,-58.5 - parent: 30 - - uid: 10265 - components: - - type: Transform - pos: -32.5,-57.5 - parent: 30 - - uid: 10266 - components: - - type: Transform - pos: -31.5,-59.5 - parent: 30 - - uid: 10267 - components: - - type: Transform - pos: -31.5,-61.5 + rot: -1.5707963267948966 rad + pos: -14.5,-28.5 parent: 30 - uid: 10395 components: - type: Transform pos: 23.5,-16.5 parent: 30 + - uid: 10623 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,-29.5 + parent: 30 + - uid: 10656 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 16.5,-19.5 + parent: 30 - uid: 10743 components: - type: Transform rot: 1.5707963267948966 rad pos: 3.5,-21.5 parent: 30 + - uid: 11073 + components: + - type: Transform + pos: -9.5,-45.5 + parent: 30 + - uid: 11076 + components: + - type: Transform + pos: -16.5,-49.5 + parent: 30 + - uid: 11091 + components: + - type: Transform + pos: -9.5,-43.5 + parent: 30 + - uid: 11106 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -12.5,-32.5 + parent: 30 + - uid: 11125 + components: + - type: Transform + pos: -18.5,-49.5 + parent: 30 + - uid: 11139 + components: + - type: Transform + pos: -7.5,-42.5 + parent: 30 + - uid: 11140 + components: + - type: Transform + pos: -5.5,-42.5 + parent: 30 + - uid: 11164 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 16.5,-17.5 + parent: 30 + - uid: 11270 + components: + - type: Transform + pos: -11.5,-32.5 + parent: 30 + - uid: 11308 + components: + - type: Transform + pos: -14.5,-44.5 + parent: 30 - uid: 11438 components: - type: Transform @@ -110675,10 +108608,11 @@ entities: - type: Transform pos: 28.5,-12.5 parent: 30 - - uid: 12680 + - uid: 12656 components: - type: Transform - pos: 15.5,13.5 + rot: 1.5707963267948966 rad + pos: 15.5,10.5 parent: 30 - uid: 12695 components: @@ -110697,11 +108631,6 @@ entities: rot: -1.5707963267948966 rad pos: 31.5,13.5 parent: 30 - - uid: 12727 - components: - - type: Transform - pos: 13.5,13.5 - parent: 30 - uid: 12729 components: - type: Transform @@ -110727,6 +108656,11 @@ entities: - type: Transform pos: 27.5,17.5 parent: 30 + - uid: 12837 + components: + - type: Transform + pos: -64.5,-66.5 + parent: 30 - uid: 12857 components: - type: Transform @@ -110977,6 +108911,11 @@ entities: - type: Transform pos: 10.5,55.5 parent: 30 + - uid: 13984 + components: + - type: Transform + pos: -6.5,-42.5 + parent: 30 - uid: 14338 components: - type: Transform @@ -110992,11 +108931,6 @@ entities: - type: Transform pos: 27.5,12.5 parent: 30 - - uid: 14513 - components: - - type: Transform - pos: 49.5,23.5 - parent: 30 - uid: 14515 components: - type: Transform @@ -111017,6 +108951,11 @@ entities: - type: Transform pos: 16.5,63.5 parent: 30 + - uid: 14915 + components: + - type: Transform + pos: -22.5,-45.5 + parent: 30 - uid: 15328 components: - type: Transform @@ -111102,6 +109041,11 @@ entities: - type: Transform pos: -56.5,48.5 parent: 30 + - uid: 16803 + components: + - type: Transform + pos: -62.5,-66.5 + parent: 30 - uid: 17039 components: - type: Transform @@ -111594,6 +109538,12 @@ entities: - type: Transform pos: -79.5,-37.5 parent: 30 + - uid: 17593 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-44.5 + parent: 30 - uid: 18006 components: - type: Transform @@ -111714,26 +109664,36 @@ entities: - type: Transform pos: -74.5,-67.5 parent: 30 - - uid: 18185 - components: - - type: Transform - pos: -59.5,-69.5 - parent: 30 - - uid: 18186 - components: - - type: Transform - pos: -58.5,-69.5 - parent: 30 - uid: 18343 components: - type: Transform pos: -52.5,-38.5 parent: 30 + - uid: 18372 + components: + - type: Transform + pos: -63.5,-66.5 + parent: 30 + - uid: 18763 + components: + - type: Transform + pos: -85.5,-46.5 + parent: 30 + - uid: 18764 + components: + - type: Transform + pos: -85.5,-44.5 + parent: 30 - uid: 19066 components: - type: Transform pos: -51.5,-40.5 parent: 30 + - uid: 19373 + components: + - type: Transform + pos: -24.5,-45.5 + parent: 30 - uid: 19632 components: - type: Transform @@ -111979,11 +109939,6 @@ entities: - type: Transform pos: -41.5,-28.5 parent: 30 - - uid: 22637 - components: - - type: Transform - pos: -30.5,-61.5 - parent: 30 - proto: ResearchAndDevelopmentServer entities: - uid: 12746 @@ -112127,10 +110082,10 @@ entities: - type: Transform pos: -42.32744,-20.937243 parent: 30 - - uid: 12822 + - uid: 18172 components: - type: Transform - pos: 16.462046,12.553694 + pos: 17.569016,13.6063385 parent: 30 - proto: SecurityTechFab entities: @@ -112146,16 +110101,16 @@ entities: - Steel - proto: SeedExtractor entities: - - uid: 415 - components: - - type: Transform - pos: -25.5,8.5 - parent: 30 - uid: 2345 components: - type: Transform pos: -45.5,68.5 parent: 30 + - uid: 16134 + components: + - type: Transform + pos: -28.5,7.5 + parent: 30 - uid: 19535 components: - type: Transform @@ -112163,49 +110118,39 @@ entities: parent: 30 - proto: SheetGlass entities: - - uid: 9419 + - uid: 5635 components: - type: Transform - pos: -22.481571,-47.56282 + pos: -25.515194,-43.69366 parent: 30 - - uid: 11281 + - uid: 18170 components: - type: Transform - pos: 0.5411911,-43.91178 - parent: 30 - - uid: 11282 - components: - - type: Transform - pos: 0.5411911,-43.91178 - parent: 30 - - uid: 12820 - components: - - type: Transform - pos: 19.709492,12.540524 - parent: 30 - - uid: 12821 - components: - - type: Transform - pos: 19.80086,12.477194 + pos: 18.613844,13.552378 parent: 30 - uid: 18790 components: - type: Transform - pos: -62.64885,-62.517246 + pos: -52.31846,-62.49577 + parent: 30 + - uid: 18878 + components: + - type: Transform + pos: -15.490766,-37.49464 parent: 30 - proto: SheetPlasma entities: - - uid: 9418 - components: - - type: Transform - pos: -22.465946,-47.515945 - parent: 30 - uid: 11365 components: - type: Transform parent: 11364 - type: Physics canCollide: False + - uid: 18692 + components: + - type: Transform + pos: -15.565023,-37.405533 + parent: 30 - uid: 21729 components: - type: Transform @@ -112233,30 +110178,22 @@ entities: - type: Transform pos: -39.48265,27.446999 parent: 30 - - uid: 11277 - components: - - type: Transform - pos: 0.5568161,-43.31803 - parent: 30 - - uid: 11278 - components: - - type: Transform - pos: 0.5568161,-43.31803 - parent: 30 - uid: 11736 components: - type: Transform pos: 19.262014,2.5731275 parent: 30 - - uid: 12816 + - uid: 19410 components: - type: Transform - pos: 19.2153,12.5261135 + pos: -21.505291,-47.848297 parent: 30 - - uid: 12817 +- proto: SheetPlasteel10 + entities: + - uid: 15989 components: - type: Transform - pos: 19.152752,12.557497 + pos: 19.503614,13.556404 parent: 30 - proto: SheetPlastic entities: @@ -112265,6 +110202,11 @@ entities: - type: Transform pos: 24.539536,9.582489 parent: 30 + - uid: 14827 + components: + - type: Transform + pos: -25.500341,-44.0501 + parent: 30 - proto: SheetRGlass entities: - uid: 779 @@ -112294,20 +110236,40 @@ entities: - type: Transform pos: -37.50003,55.530113 parent: 30 + - uid: 5615 + components: + - type: Transform + pos: -25.544897,-43.30752 + parent: 30 - uid: 6680 components: - type: Transform pos: -38.50112,-3.4785028 parent: 30 - - uid: 8384 + - uid: 9353 components: - type: Transform - pos: 14.431295,-25.50531 + pos: 2.554779,-46.49939 parent: 30 - - uid: 9246 + - uid: 9373 components: - type: Transform - pos: 14.418909,-25.502102 + pos: 3.0953474,-46.49939 + parent: 30 + - uid: 9966 + components: + - type: Transform + pos: 3.409225,-46.49939 + parent: 30 + - uid: 9977 + components: + - type: Transform + pos: 2.432715,-46.481953 + parent: 30 + - uid: 10018 + components: + - type: Transform + pos: 12.534329,-26.430252 parent: 30 - uid: 10245 components: @@ -112324,57 +110286,52 @@ entities: - type: Transform pos: -39.967026,27.431374 parent: 30 - - uid: 11279 + - uid: 10556 components: - type: Transform - pos: 0.5099411,-42.56803 + pos: 2.7814693,-46.481953 parent: 30 - - uid: 11280 + - uid: 10761 components: - type: Transform - pos: 0.5099411,-42.56803 + pos: -21.470598,-47.509216 parent: 30 - - uid: 11701 + - uid: 11289 components: - type: Transform - pos: 14.431295,-25.50531 + pos: 12.415517,-26.22233 + parent: 30 + - uid: 11299 + components: + - type: Transform + pos: 12.593735,-26.22233 parent: 30 - uid: 11735 components: - type: Transform pos: 19.908981,2.569995 parent: 30 - - uid: 12818 - components: - - type: Transform - pos: 18.621367,12.577154 - parent: 30 - - uid: 12819 - components: - - type: Transform - pos: 18.711626,12.51626 - parent: 30 - uid: 15528 components: - type: Transform pos: 17.501102,60.54593 parent: 30 + - uid: 17884 + components: + - type: Transform + pos: 18.973642,13.552378 + parent: 30 - uid: 18791 components: - type: Transform - pos: -62.6176,-62.579746 - parent: 30 - - uid: 20450 - components: - - type: Transform - pos: -23.542912,-39.421722 + pos: -52.674896,-62.391804 parent: 30 - proto: SheetUranium entities: - - uid: 10290 + - uid: 19800 components: - type: Transform - pos: -22.492691,-47.491028 + pos: -15.342251,-37.568897 parent: 30 - proto: Shovel entities: @@ -112724,26 +110681,11 @@ entities: - type: Transform pos: -5.5,12.5 parent: 30 - - uid: 12656 - components: - - type: Transform - pos: 14.5,13.5 - parent: 30 - - uid: 12657 - components: - - type: Transform - pos: 13.5,13.5 - parent: 30 - uid: 12810 components: - type: Transform pos: 24.5,15.5 parent: 30 - - uid: 13075 - components: - - type: Transform - pos: 15.5,13.5 - parent: 30 - uid: 14340 components: - type: Transform @@ -112759,6 +110701,60 @@ entities: - type: Transform pos: 26.5,12.5 parent: 30 + - uid: 14530 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 15.5,39.5 + parent: 30 + - uid: 14844 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 15.5,34.5 + parent: 30 + - uid: 15075 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 15.5,40.5 + parent: 30 + - uid: 15213 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 15.5,36.5 + parent: 30 + - uid: 15986 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 15.5,33.5 + parent: 30 + - uid: 15987 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 15.5,37.5 + parent: 30 + - uid: 18696 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 16.5,16.5 + parent: 30 + - uid: 18733 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 16.5,15.5 + parent: 30 + - uid: 18734 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 16.5,14.5 + parent: 30 - uid: 20394 components: - type: Transform @@ -112807,35 +110803,25 @@ entities: parent: 30 - proto: ShuttersRadiationOpen entities: - - uid: 9182 + - uid: 9408 components: - type: Transform - pos: -10.5,-42.5 + pos: -16.5,-49.5 parent: 30 - - uid: 9339 + - uid: 9410 components: - type: Transform - pos: -14.5,-43.5 + pos: -18.5,-45.5 parent: 30 - - uid: 10741 + - uid: 9411 components: - type: Transform - pos: -4.5,-42.5 + pos: -16.5,-45.5 parent: 30 - - uid: 10742 + - uid: 9415 components: - type: Transform - pos: -6.5,-42.5 - parent: 30 - - uid: 11152 - components: - - type: Transform - pos: -8.5,-42.5 - parent: 30 - - uid: 18692 - components: - - type: Transform - pos: -0.5,-43.5 + pos: -18.5,-49.5 parent: 30 - proto: SignAi entities: @@ -112915,18 +110901,6 @@ entities: - type: Transform pos: -39.5,9.5 parent: 30 - - uid: 3598 - components: - - type: MetaData - name: Janitorial Service Light - - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,-38.5 - parent: 30 - - type: DeviceLinkSource - linkedPorts: - 844: - - Pressed: Toggle - uid: 8570 components: - type: Transform @@ -112936,32 +110910,6 @@ entities: linkedPorts: 9068: - Pressed: Toggle - - uid: 8818 - components: - - type: Transform - pos: -13.5,-56.5 - parent: 30 - - type: DeviceLinkSource - linkedPorts: - 9827: - - Pressed: Toggle - 9826: - - Pressed: Toggle - 9825: - - Pressed: Toggle - - uid: 8821 - components: - - type: Transform - pos: -1.5,-56.5 - parent: 30 - - type: DeviceLinkSource - linkedPorts: - 9830: - - Pressed: Toggle - 9829: - - Pressed: Toggle - 9828: - - Pressed: Toggle - uid: 9038 components: - type: Transform @@ -113082,24 +111030,6 @@ entities: - Pressed: Toggle 13729: - Pressed: Toggle - - uid: 15985 - components: - - type: Transform - pos: 50.5,25.5 - parent: 30 - - type: DeviceLinkSource - linkedPorts: - 13751: - - Pressed: Toggle - - uid: 15986 - components: - - type: Transform - pos: 53.5,25.5 - parent: 30 - - type: DeviceLinkSource - linkedPorts: - 14512: - - Pressed: Toggle - uid: 20392 components: - type: Transform @@ -113131,21 +111061,6 @@ entities: linkedPorts: 5556: - Pressed: Toggle - - uid: 20399 - components: - - type: MetaData - name: Shutters - - type: Transform - pos: 16.5,13.5 - parent: 30 - - type: DeviceLinkSource - linkedPorts: - 12656: - - Pressed: Toggle - 12657: - - Pressed: Toggle - 13075: - - Pressed: Toggle - uid: 20446 components: - type: Transform @@ -113180,17 +111095,6 @@ entities: - Pressed: Toggle - proto: SignalButtonDirectional entities: - - uid: 3115 - components: - - type: MetaData - name: Janitorial Service Light - - type: Transform - pos: 12.5,13.5 - parent: 30 - - type: DeviceLinkSource - linkedPorts: - 961: - - Pressed: Toggle - uid: 3180 components: - type: Transform @@ -113358,18 +111262,6 @@ entities: - Pressed: Toggle 7562: - Pressed: Toggle - - uid: 8393 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -26.5,-48.5 - parent: 30 - - type: DeviceLinkSource - linkedPorts: - 9404: - - Pressed: Toggle - 9405: - - Pressed: Toggle - uid: 8607 components: - type: Transform @@ -113380,20 +111272,6 @@ entities: linkedPorts: 6882: - Pressed: Toggle - - uid: 8609 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -22.5,-45.5 - parent: 30 - - type: SignalSwitch - state: True - - type: DeviceLinkSource - linkedPorts: - 9405: - - Pressed: Toggle - 9404: - - Pressed: Toggle - uid: 8610 components: - type: Transform @@ -113461,6 +111339,17 @@ entities: linkedPorts: 6415: - Pressed: DoorBolt + - uid: 18213 + components: + - type: MetaData + name: janitor light button + - type: Transform + pos: 18.5,17.5 + parent: 30 + - type: DeviceLinkSource + linkedPorts: + 16403: + - Pressed: Toggle - uid: 20432 components: - type: Transform @@ -113489,6 +111378,141 @@ entities: - Pressed: Toggle 2313: - Pressed: Toggle +- proto: SignalSwitch + entities: + - uid: 11021 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -15.5,-38.5 + parent: 30 + - type: DeviceLinkSource + linkedPorts: + 9533: + - On: Open + - Off: Close + 11028: + - On: Open + - Off: Close + 11015: + - On: Open + - Off: Close +- proto: SignalSwitchDirectional + entities: + - uid: 402 + components: + - type: MetaData + name: shutters switch + - type: Transform + pos: 17.5,17.5 + parent: 30 + - type: DeviceLinkSource + linkedPorts: + 18696: + - On: Open + - Off: Close + 18733: + - On: Open + - Off: Close + 18734: + - On: Open + - Off: Close + - uid: 3131 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -20.5,-47.5 + parent: 30 + - type: DeviceLinkSource + linkedPorts: + 9415: + - On: Open + - Off: Close + 9408: + - On: Open + - Off: Close + 9410: + - On: Open + - Off: Close + 9411: + - On: Open + - Off: Close + - uid: 9164 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-54.5 + parent: 30 + - type: DeviceLinkSource + linkedPorts: + 9678: + - On: Open + - Off: Close + 9065: + - On: Open + - Off: Close + 9064: + - On: Open + - Off: Close + - uid: 9214 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-54.5 + parent: 30 + - type: DeviceLinkSource + linkedPorts: + 9690: + - On: Open + - Off: Close + 9302: + - On: Open + - Off: Close + 9691: + - On: Open + - Off: Close + - uid: 12697 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.5,35.5 + parent: 30 + - type: DeviceLinkSource + linkedPorts: + 15213: + - On: Open + - Off: Close + 15987: + - On: Open + - Off: Close + - uid: 14525 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.5,32.5 + parent: 30 + - type: DeviceLinkSource + linkedPorts: + 15986: + - On: Open + - Off: Close + 14844: + - On: Open + - Off: Close + - uid: 15975 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.5,38.5 + parent: 30 + - type: DeviceLinkSource + linkedPorts: + 14530: + - On: Open + - Off: Close + 15075: + - On: Open + - Off: Close - proto: SignArmory entities: - uid: 1927 @@ -113532,6 +111556,18 @@ entities: - type: Transform pos: -2.5,28.5 parent: 30 +- proto: SignCans + entities: + - uid: 20624 + components: + - type: Transform + pos: 18.5,-20.5 + parent: 30 + - uid: 20627 + components: + - type: Transform + pos: 15.5,-19.5 + parent: 30 - proto: SignCargo entities: - uid: 8405 @@ -113575,17 +111611,6 @@ entities: parent: 30 - proto: SignCryogenicsMed entities: - - uid: 6679 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -9.5,-42.5 - parent: 30 - - uid: 9950 - components: - - type: Transform - pos: 2.5,-51.5 - parent: 30 - uid: 15233 components: - type: Transform @@ -113593,12 +111618,6 @@ entities: parent: 30 - proto: SignDangerMed entities: - - uid: 6678 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -5.5,-42.5 - parent: 30 - uid: 17038 components: - type: Transform @@ -114046,43 +112065,16 @@ entities: - type: Transform pos: -41.5,20.5 parent: 30 - - uid: 6684 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -2.5,-42.5 - parent: 30 - - uid: 6699 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -12.5,-42.5 - parent: 30 - uid: 6889 components: - type: Transform pos: -36.5,-1.5 parent: 30 - - uid: 9363 - components: - - type: Transform - pos: -5.5,-37.5 - parent: 30 - - uid: 9449 - components: - - type: Transform - pos: -25.5,-45.5 - parent: 30 - uid: 9464 components: - type: Transform pos: -4.5,-28.5 parent: 30 - - uid: 9465 - components: - - type: Transform - pos: -11.5,-36.5 - parent: 30 - uid: 15973 components: - type: Transform @@ -114093,6 +112085,23 @@ entities: - type: Transform pos: -62.5,44.5 parent: 30 + - uid: 20628 + components: + - type: Transform + pos: -9.5,-42.5 + parent: 30 +- proto: SignEngine + entities: + - uid: 20633 + components: + - type: Transform + pos: -8.5,-42.5 + parent: 30 + - uid: 20634 + components: + - type: Transform + pos: -13.5,-46.5 + parent: 30 - proto: SignEngineering entities: - uid: 9193 @@ -114121,17 +112130,28 @@ entities: parent: 30 - proto: SignFire entities: - - uid: 6639 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -11.5,-42.5 - parent: 30 - uid: 9264 components: - type: Transform pos: 23.5,-15.5 parent: 30 + - uid: 20621 + components: + - type: Transform + pos: 3.5,-42.5 + parent: 30 +- proto: SignFlammableMed + entities: + - uid: 20631 + components: + - type: Transform + pos: 4.5,-54.5 + parent: 30 + - uid: 20632 + components: + - type: Transform + pos: -5.5,-54.5 + parent: 30 - proto: SignGravity entities: - uid: 5603 @@ -114182,7 +112202,12 @@ entities: - uid: 18813 components: - type: Transform - pos: -57.5,-61.5 + pos: -71.5,-58.5 + parent: 30 + - uid: 20629 + components: + - type: Transform + pos: -63.5,-61.5 parent: 30 - proto: SignMagneticsMed entities: @@ -114302,16 +112327,16 @@ entities: - type: Transform pos: 12.5,43.5 parent: 30 - - uid: 10143 - components: - - type: Transform - pos: -19.5,-45.5 - parent: 30 - - uid: 10144 + - uid: 20622 components: - type: Transform pos: -15.5,-45.5 parent: 30 + - uid: 20630 + components: + - type: Transform + pos: -19.5,-45.5 + parent: 30 - proto: SignRedOne entities: - uid: 16140 @@ -114364,10 +112389,11 @@ entities: - type: Transform pos: 11.5,13.5 parent: 30 - - uid: 13389 + - uid: 17707 components: - type: Transform - pos: 16.5,16.5 + rot: 3.141592653589793 rad + pos: 15.5,13.5 parent: 30 - proto: SignSecurearea entities: @@ -114473,30 +112499,16 @@ entities: - type: Transform pos: 21.5,-20.5 parent: 30 + - uid: 9194 + components: + - type: Transform + pos: -0.5,-42.5 + parent: 30 - uid: 10386 components: - type: Transform pos: 17.5,-15.5 parent: 30 - - uid: 21458 - components: - - type: Transform - pos: -13.5,-42.5 - parent: 30 -- proto: SignSomethingOld - entities: - - uid: 10018 - components: - - type: Transform - pos: -1.5,-42.5 - parent: 30 -- proto: SignSomethingOld2 - entities: - - uid: 10017 - components: - - type: Transform - pos: -3.5,-42.5 - parent: 30 - proto: SignSpace entities: - uid: 385 @@ -114566,20 +112578,10 @@ entities: parent: 30 - proto: SignTelecomms entities: - - uid: 22655 + - uid: 20635 components: - type: Transform - pos: -19.5,-47.5 - parent: 30 - - uid: 22656 - components: - - type: Transform - pos: -28.5,-59.5 - parent: 30 - - uid: 22803 - components: - - type: Transform - pos: -21.5,-57.5 + pos: -11.5,-36.5 parent: 30 - proto: SignToolStorage entities: @@ -114597,25 +112599,13 @@ entities: parent: 30 - proto: SingularityGenerator entities: - - uid: 9407 + - uid: 19419 components: - type: Transform - pos: -22.5,-48.5 + pos: -16.5,-34.5 parent: 30 - proto: Sink entities: - - uid: 402 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -28.5,6.5 - parent: 30 - - uid: 403 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -28.5,12.5 - parent: 30 - uid: 449 components: - type: Transform @@ -114715,6 +112705,24 @@ entities: - type: Transform pos: -12.5,11.5 parent: 30 + - uid: 11065 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -15.5,-47.5 + parent: 30 + - uid: 12640 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -23.5,8.5 + parent: 30 + - uid: 17714 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 12.5,10.5 + parent: 30 - uid: 18011 components: - type: Transform @@ -114726,12 +112734,6 @@ entities: - type: Transform pos: -56.5,52.5 parent: 30 - - uid: 22541 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 18.5,14.5 - parent: 30 - proto: SmartFridge entities: - uid: 315 @@ -114756,6 +112758,11 @@ entities: parent: 30 - proto: SMESBasic entities: + - uid: 3115 + components: + - type: Transform + pos: -56.5,-63.5 + parent: 30 - uid: 5472 components: - type: MetaData @@ -114763,36 +112770,35 @@ entities: - type: Transform pos: 12.5,41.5 parent: 30 - - uid: 9410 + - uid: 8237 components: - type: Transform - pos: -24.5,-50.5 + pos: -15.5,-28.5 parent: 30 - - uid: 9411 + - uid: 8819 components: - type: Transform - pos: -24.5,-49.5 + pos: -19.5,-46.5 parent: 30 - - uid: 9496 + - uid: 9581 components: - - type: MetaData - name: SMES Bank 3 - type: Transform - pos: -6.5,-34.5 + pos: -6.5,-43.5 parent: 30 - - uid: 9497 + - uid: 9583 components: - - type: MetaData - name: SMES Bank 2 - type: Transform - pos: -7.5,-34.5 + pos: -5.5,-43.5 parent: 30 - - uid: 9498 + - uid: 11176 components: - - type: MetaData - name: SMES Bank 1 - type: Transform - pos: -8.5,-34.5 + pos: -7.5,-47.5 + parent: 30 + - uid: 11278 + components: + - type: Transform + pos: -7.5,-43.5 parent: 30 - uid: 15299 components: @@ -114801,6 +112807,11 @@ entities: - type: Transform pos: 51.5,31.5 parent: 30 + - uid: 15991 + components: + - type: Transform + pos: -56.5,-62.5 + parent: 30 - uid: 16277 components: - type: MetaData @@ -114808,20 +112819,6 @@ entities: - type: Transform pos: -65.5,44.5 parent: 30 - - uid: 18774 - components: - - type: MetaData - name: Chapelroid SMES 2 - - type: Transform - pos: -69.5,-63.5 - parent: 30 - - uid: 18775 - components: - - type: MetaData - name: Chapelroid SMES 1 - - type: Transform - pos: -69.5,-62.5 - parent: 30 - uid: 20046 components: - type: MetaData @@ -114829,17 +112826,17 @@ entities: - type: Transform pos: -0.5,84.5 parent: 30 - - uid: 20619 +- proto: SMESBasicEmpty + entities: + - uid: 9481 components: - type: Transform - pos: -15.5,-28.5 + pos: -15.5,-35.5 parent: 30 - - uid: 22658 + - uid: 9498 components: - - type: MetaData - name: Telecomms SMES - type: Transform - pos: -25.5,-62.5 + pos: -15.5,-34.5 parent: 30 - proto: SoapHomemade entities: @@ -116261,12 +114258,20 @@ entities: - type: Transform pos: 4.5,34.5 parent: 30 -- proto: SpawnMobCrabAtmos +- proto: SpawnMobCow entities: - - uid: 20359 + - uid: 18819 components: - type: Transform - pos: 17.5,-27.5 + rot: 1.5707963267948966 rad + pos: -26.5,6.5 + parent: 30 +- proto: SpawnMobCrabAtmos + entities: + - uid: 19831 + components: + - type: Transform + pos: 10.5,-25.5 parent: 30 - proto: SpawnMobFoxRenault entities: @@ -116277,10 +114282,11 @@ entities: parent: 30 - proto: SpawnMobGoat entities: - - uid: 7677 + - uid: 14336 components: - type: Transform - pos: -16.5,14.5 + rot: -1.5707963267948966 rad + pos: -27.5,5.5 parent: 30 - proto: SpawnMobKangarooWillow entities: @@ -116352,13 +114358,6 @@ entities: - type: Transform pos: -24.5,52.5 parent: 30 -- proto: SpawnMobSlothPaperwork - entities: - - uid: 19570 - components: - - type: Transform - pos: -57.5,-64.5 - parent: 30 - proto: SpawnMobSmile entities: - uid: 7441 @@ -116483,10 +114482,10 @@ entities: parent: 30 - proto: SpawnPointChiefEngineer entities: - - uid: 9587 + - uid: 9494 components: - type: Transform - pos: -16.5,-35.5 + pos: -7.5,-33.5 parent: 30 - proto: SpawnPointChiefMedicalOfficer entities: @@ -116571,10 +114570,10 @@ entities: parent: 30 - proto: SpawnPointLibrarian entities: - - uid: 19562 + - uid: 18604 components: - type: Transform - pos: -58.5,-65.5 + pos: -66.5,-62.5 parent: 30 - proto: SpawnPointMedicalDoctor entities: @@ -116810,47 +114809,102 @@ entities: parent: 30 - proto: SpawnPointStationEngineer entities: - - uid: 9579 + - uid: 9366 components: - type: Transform - pos: -23.5,-41.5 + pos: -23.5,-48.5 parent: 30 - - uid: 9580 + - uid: 9503 components: - type: Transform - pos: -24.5,-41.5 + pos: -6.5,-44.5 parent: 30 - - uid: 9581 + - uid: 9506 components: - type: Transform - pos: -23.5,-42.5 + pos: -22.5,-48.5 parent: 30 - - uid: 20346 + - uid: 9644 components: - type: Transform - pos: -24.5,-42.5 + pos: -22.5,-49.5 + parent: 30 + - uid: 9646 + components: + - type: Transform + pos: -24.5,-49.5 + parent: 30 + - uid: 9647 + components: + - type: Transform + pos: -23.5,-47.5 + parent: 30 + - uid: 9652 + components: + - type: Transform + pos: -23.5,-49.5 + parent: 30 + - uid: 9890 + components: + - type: Transform + pos: -23.5,-40.5 + parent: 30 + - uid: 9974 + components: + - type: Transform + pos: -24.5,-47.5 + parent: 30 + - uid: 10554 + components: + - type: Transform + pos: -24.5,-48.5 + parent: 30 + - uid: 10613 + components: + - type: Transform + pos: -20.5,-40.5 + parent: 30 + - uid: 11347 + components: + - type: Transform + pos: -22.5,-47.5 parent: 30 - proto: SpawnPointTechnicalAssistant entities: - - uid: 20802 + - uid: 9343 components: - type: Transform - pos: -21.5,-42.5 + pos: -24.5,-48.5 parent: 30 - - uid: 20803 + - uid: 9359 components: - type: Transform - pos: -21.5,-41.5 + pos: -7.5,-44.5 parent: 30 - - uid: 20885 + - uid: 9363 components: - type: Transform - pos: -22.5,-42.5 + pos: -23.5,-48.5 parent: 30 - - uid: 20886 + - uid: 9648 components: - type: Transform - pos: -22.5,-41.5 + pos: -22.5,-48.5 + parent: 30 + - uid: 9986 + components: + - type: Transform + pos: -23.5,-39.5 + parent: 30 + - uid: 10583 + components: + - type: Transform + pos: -23.5,-49.5 + parent: 30 + - uid: 10584 + components: + - type: Transform + pos: -23.5,-47.5 parent: 30 - proto: SpawnPointWarden entities: @@ -116868,6 +114922,16 @@ entities: parent: 30 - proto: SpawnVendingMachineRestockFoodDrink entities: + - uid: 11463 + components: + - type: Transform + pos: -69.5,-58.5 + parent: 30 + - uid: 16130 + components: + - type: Transform + pos: -70.5,-58.5 + parent: 30 - uid: 22422 components: - type: Transform @@ -117363,25 +115427,20 @@ entities: - type: Transform pos: 14.5,-28.5 parent: 30 - - uid: 9794 + - uid: 9066 components: - type: Transform - pos: -12.5,-43.5 + pos: -1.5,-43.5 parent: 30 - - uid: 9998 + - uid: 9882 components: - type: Transform - pos: -13.5,-43.5 + pos: -0.5,-43.5 parent: 30 - - uid: 10000 + - uid: 10561 components: - type: Transform - pos: -11.5,-43.5 - parent: 30 - - uid: 10001 - components: - - type: Transform - pos: -10.5,-43.5 + pos: -2.5,-43.5 parent: 30 - uid: 13342 components: @@ -117493,26 +115552,20 @@ entities: - type: Transform pos: -0.5,-11.5 parent: 30 - - uid: 9406 + - uid: 8239 components: - - type: MetaData - name: West Engineering Substation - type: Transform - pos: -22.5,-46.5 + pos: -16.5,-28.5 parent: 30 - - uid: 9570 + - uid: 9403 components: - - type: MetaData - name: East Engineering Substation - type: Transform - pos: 3.5,-37.5 + pos: -19.5,-48.5 parent: 30 - - uid: 10533 + - uid: 11175 components: - - type: MetaData - name: Singulo Substation - type: Transform - pos: -16.5,-51.5 + pos: -15.5,-39.5 parent: 30 - uid: 11374 components: @@ -117535,12 +115588,10 @@ entities: - type: Transform pos: 12.5,51.5 parent: 30 - - uid: 17718 + - uid: 18769 components: - - type: MetaData - name: Chapelroid Substation - type: Transform - pos: -52.5,-59.5 + pos: -56.5,-65.5 parent: 30 - uid: 18922 components: @@ -117563,12 +115614,12 @@ entities: - type: Transform pos: -24.5,41.5 parent: 30 - - uid: 22659 +- proto: SubstationBasicEmpty + entities: + - uid: 11345 components: - - type: MetaData - name: Telecomms Substation - type: Transform - pos: -27.5,-62.5 + pos: -15.5,-36.5 parent: 30 - proto: SubstationWallBasic entities: @@ -117615,22 +115666,27 @@ entities: parent: 30 - proto: SuitStorageCE entities: - - uid: 773 + - uid: 10649 components: - type: Transform - pos: -19.5,-36.5 + pos: -9.5,-36.5 parent: 30 - proto: SuitStorageEngi entities: - - uid: 9436 + - uid: 7111 components: - type: Transform - pos: -8.5,-38.5 + pos: -8.5,-41.5 parent: 30 - - uid: 9591 + - uid: 7123 components: - type: Transform - pos: -6.5,-38.5 + pos: -6.5,-41.5 + parent: 30 + - uid: 7124 + components: + - type: Transform + pos: -4.5,-41.5 parent: 30 - proto: SuitStorageEVA entities: @@ -117867,50 +115923,6 @@ entities: id: Conference Room - proto: SurveillanceCameraEngineering entities: - - uid: 788 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 1.5,-48.5 - parent: 30 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraEngineering - nameSet: True - id: TEG Cold Loop - - uid: 8233 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -9.5,-57.5 - parent: 30 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraEngineering - nameSet: True - id: TEG West Hot Room - - uid: 8293 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -18.5,-53.5 - parent: 30 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraEngineering - nameSet: True - id: Singulo Walkway - - uid: 8296 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -22.5,-39.5 - parent: 30 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraEngineering - nameSet: True - id: Engi Locker Room - uid: 9253 components: - type: Transform @@ -117922,70 +115934,6 @@ entities: - SurveillanceCameraEngineering nameSet: True id: Atmos Storage - - uid: 9429 - components: - - type: Transform - pos: -8.5,-55.5 - parent: 30 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraEngineering - nameSet: True - id: TEG South - - uid: 9692 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -14.5,-49.5 - parent: 30 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraEngineering - nameSet: True - id: TEG Hot Loop - - uid: 9703 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -5.5,-57.5 - parent: 30 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraEngineering - nameSet: True - id: TEG East Hot Room - - uid: 9704 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -5.5,-43.5 - parent: 30 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraEngineering - nameSet: True - id: TEG North - - uid: 21209 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -9.5,-38.5 - parent: 30 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraEngineering - nameSet: True - id: 'Engineering ' - - uid: 21210 - components: - - type: Transform - pos: -10.5,-31.5 - parent: 30 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraEngineering - nameSet: True - id: AME Room - uid: 21211 components: - type: Transform @@ -118019,23 +115967,6 @@ entities: - SurveillanceCameraEngineering nameSet: True id: Atmospherics Desk - - uid: 21217 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -17.5,-34.5 - parent: 30 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraEngineering - nameSet: True - id: Chief Engineer's Room - - uid: 21218 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -15.5,-42.5 - parent: 30 - uid: 21219 components: - type: Transform @@ -118068,28 +115999,6 @@ entities: - SurveillanceCameraEngineering nameSet: True id: Atmos Tanks - - uid: 21279 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -7.5,-33.5 - parent: 30 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraEngineering - nameSet: True - id: SMES Bank - - uid: 21280 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -22.5,-46.5 - parent: 30 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraEngineering - nameSet: True - id: Engineering Supply - uid: 21281 components: - type: Transform @@ -118111,39 +116020,6 @@ entities: - SurveillanceCameraEngineering nameSet: True id: Atmos Hall - - uid: 22811 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -20.5,-57.5 - parent: 30 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraEngineering - nameSet: True - id: Telecomms Exterior - - uid: 22838 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -41.5,-60.5 - parent: 30 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraEngineering - nameSet: True - id: Telecomms - - uid: 22839 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -29.5,-59.5 - parent: 30 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraEngineering - nameSet: True - id: Telecomms Entrance - proto: SurveillanceCameraGeneral entities: - uid: 1039 @@ -118189,17 +116065,6 @@ entities: - SurveillanceCameraGeneral nameSet: True id: Game Room - - uid: 21229 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -54.5,-64.5 - parent: 30 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraGeneral - nameSet: True - id: Library - uid: 21231 components: - type: Transform @@ -118451,61 +116316,54 @@ entities: id: Psychology - proto: SurveillanceCameraRouterCommand entities: + - uid: 11177 + components: + - type: Transform + pos: -10.5,-31.5 + parent: 30 - uid: 20980 components: - type: Transform pos: 7.5,41.5 parent: 30 - - uid: 22824 - components: - - type: Transform - pos: -38.5,-60.5 - parent: 30 -- proto: SurveillanceCameraRouterConstructed - entities: - - uid: 22832 - components: - - type: Transform - pos: -40.5,-57.5 - parent: 30 - proto: SurveillanceCameraRouterEngineering entities: - - uid: 22807 + - uid: 19183 components: - type: Transform - pos: -38.5,-57.5 + pos: -8.5,-31.5 parent: 30 - proto: SurveillanceCameraRouterGeneral entities: - - uid: 21228 + - uid: 9387 components: - type: Transform - pos: -68.5,-63.5 + pos: -12.5,-31.5 parent: 30 - - uid: 22819 + - uid: 18191 components: - type: Transform - pos: -40.5,-63.5 + pos: -52.5,-59.5 parent: 30 - proto: SurveillanceCameraRouterMedical entities: - - uid: 22809 + - uid: 19184 components: - type: Transform - pos: -38.5,-62.5 + pos: -6.5,-27.5 parent: 30 - proto: SurveillanceCameraRouterScience entities: + - uid: 11156 + components: + - type: Transform + pos: -8.5,-27.5 + parent: 30 - uid: 12747 components: - type: Transform pos: 31.5,15.5 parent: 30 - - uid: 22810 - components: - - type: Transform - pos: -38.5,-63.5 - parent: 30 - proto: SurveillanceCameraRouterSecurity entities: - uid: 1946 @@ -118513,43 +116371,43 @@ entities: - type: Transform pos: -37.5,56.5 parent: 30 - - uid: 22820 + - uid: 9970 components: - type: Transform - pos: -35.5,-63.5 + pos: -6.5,-31.5 parent: 30 - proto: SurveillanceCameraRouterService entities: + - uid: 11348 + components: + - type: Transform + pos: -12.5,-27.5 + parent: 30 - uid: 21220 components: - type: Transform pos: -13.5,17.5 parent: 30 - - uid: 22821 - components: - - type: Transform - pos: -35.5,-57.5 - parent: 30 - proto: SurveillanceCameraRouterSupply entities: - - uid: 22808 + - uid: 10552 components: - type: Transform - pos: -38.5,-58.5 + pos: -10.5,-27.5 parent: 30 - proto: SurveillanceCameraScience entities: - - uid: 21186 + - uid: 9990 components: - type: Transform - rot: 3.141592653589793 rad - pos: 17.5,12.5 + rot: -1.5707963267948966 rad + pos: 17.5,13.5 parent: 30 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraScience nameSet: True - id: RND + id: Reception - uid: 21187 components: - type: Transform @@ -118941,20 +116799,6 @@ entities: - SurveillanceCameraSupply nameSet: True id: Quartermaster's Room -- proto: SurveillanceCameraWirelessRouterConstructed - entities: - - uid: 22831 - components: - - type: Transform - pos: -40.5,-59.5 - parent: 30 -- proto: SurveillanceCameraWirelessRouterEntertainment - entities: - - uid: 22818 - components: - - type: Transform - pos: -40.5,-58.5 - parent: 30 - proto: SynthesizerInstrument entities: - uid: 15112 @@ -119336,6 +117180,11 @@ entities: - type: Transform pos: -51.5,55.5 parent: 30 + - uid: 3130 + components: + - type: Transform + pos: -25.5,-43.5 + parent: 30 - uid: 3528 components: - type: Transform @@ -119346,11 +117195,32 @@ entities: - type: Transform pos: -39.5,18.5 parent: 30 + - uid: 4987 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -15.5,-32.5 + parent: 30 + - uid: 5238 + components: + - type: Transform + pos: -24.5,-44.5 + parent: 30 + - uid: 5240 + components: + - type: Transform + pos: -25.5,-42.5 + parent: 30 - uid: 5414 components: - type: Transform pos: 5.5,29.5 parent: 30 + - uid: 5444 + components: + - type: Transform + pos: -25.5,-44.5 + parent: 30 - uid: 6278 components: - type: Transform @@ -119496,11 +117366,6 @@ entities: - type: Transform pos: 13.5,-25.5 parent: 30 - - uid: 9244 - components: - - type: Transform - pos: 14.5,-25.5 - parent: 30 - uid: 9245 components: - type: Transform @@ -119516,41 +117381,45 @@ entities: - type: Transform pos: 14.5,-15.5 parent: 30 - - uid: 9430 + - uid: 9414 components: - type: Transform - pos: -24.5,-39.5 - parent: 30 - - uid: 9431 - components: - - type: Transform - pos: -23.5,-39.5 + rot: 3.141592653589793 rad + pos: -7.5,-34.5 parent: 30 - uid: 9442 components: - type: Transform pos: 5.5,-26.5 parent: 30 - - uid: 9479 + - uid: 9523 components: - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,-34.5 + parent: 30 + - uid: 9531 + components: + - type: Transform + pos: -5.5,-34.5 + parent: 30 + - uid: 9532 + components: + - type: Transform + pos: -9.5,-34.5 + parent: 30 + - uid: 9591 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -17.5,-32.5 + parent: 30 + - uid: 10123 + components: + - type: Transform + rot: -1.5707963267948966 rad pos: -17.5,-29.5 parent: 30 - - uid: 9480 - components: - - type: Transform - pos: -17.5,-30.5 - parent: 30 - - uid: 9481 - components: - - type: Transform - pos: -17.5,-28.5 - parent: 30 - - uid: 9482 - components: - - type: Transform - pos: -17.5,-31.5 - parent: 30 - uid: 10407 components: - type: Transform @@ -119566,6 +117435,40 @@ entities: - type: Transform pos: -47.5,63.5 parent: 30 + - uid: 10593 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -25.5,-50.5 + parent: 30 + - uid: 10680 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,-47.5 + parent: 30 + - uid: 10790 + components: + - type: Transform + pos: 2.5,-41.5 + parent: 30 + - uid: 10794 + components: + - type: Transform + pos: 3.5,-41.5 + parent: 30 + - uid: 11063 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -24.5,-50.5 + parent: 30 + - uid: 11174 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,-47.5 + parent: 30 - uid: 11247 components: - type: Transform @@ -119581,55 +117484,10 @@ entities: - type: Transform pos: -3.5,-33.5 parent: 30 - - uid: 11272 + - uid: 11336 components: - type: Transform - pos: 0.5,-44.5 - parent: 30 - - uid: 11273 - components: - - type: Transform - pos: 0.5,-43.5 - parent: 30 - - uid: 11274 - components: - - type: Transform - pos: 0.5,-42.5 - parent: 30 - - uid: 11285 - components: - - type: Transform - pos: -19.5,-44.5 - parent: 30 - - uid: 11286 - components: - - type: Transform - pos: -15.5,-44.5 - parent: 30 - - uid: 11287 - components: - - type: Transform - pos: -15.5,-43.5 - parent: 30 - - uid: 11288 - components: - - type: Transform - pos: -15.5,-42.5 - parent: 30 - - uid: 11302 - components: - - type: Transform - pos: 1.5,-44.5 - parent: 30 - - uid: 11306 - components: - - type: Transform - pos: -11.5,-35.5 - parent: 30 - - uid: 11307 - components: - - type: Transform - pos: -11.5,-34.5 + pos: -5.5,-35.5 parent: 30 - uid: 11473 components: @@ -119702,6 +117560,12 @@ entities: - type: Transform pos: 25.5,31.5 parent: 30 + - uid: 12657 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.5,13.5 + parent: 30 - uid: 12761 components: - type: Transform @@ -119712,10 +117576,23 @@ entities: - type: Transform pos: 24.5,10.5 parent: 30 - - uid: 12835 + - uid: 12836 components: - type: Transform - pos: 14.5,10.5 + rot: -1.5707963267948966 rad + pos: -17.5,5.5 + parent: 30 + - uid: 12838 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 16.5,16.5 + parent: 30 + - uid: 12839 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 16.5,15.5 parent: 30 - uid: 12841 components: @@ -119778,6 +117655,16 @@ entities: - type: Transform pos: 15.5,60.5 parent: 30 + - uid: 14868 + components: + - type: Transform + pos: -22.5,-41.5 + parent: 30 + - uid: 14895 + components: + - type: Transform + pos: -22.5,-39.5 + parent: 30 - uid: 15052 components: - type: Transform @@ -119808,6 +117695,12 @@ entities: - type: Transform pos: 47.5,44.5 parent: 30 + - uid: 15988 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 16.5,14.5 + parent: 30 - uid: 16117 components: - type: Transform @@ -119893,11 +117786,39 @@ entities: - type: Transform pos: -81.5,-61.5 parent: 30 + - uid: 18215 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,13.5 + parent: 30 + - uid: 18770 + components: + - type: Transform + pos: 18.5,10.5 + parent: 30 + - uid: 18815 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 18.5,13.5 + parent: 30 + - uid: 18996 + components: + - type: Transform + pos: -21.5,-40.5 + parent: 30 - uid: 19068 components: - type: Transform pos: -51.5,-46.5 parent: 30 + - uid: 19178 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,-47.5 + parent: 30 - uid: 19399 components: - type: Transform @@ -119908,6 +117829,33 @@ entities: - type: Transform pos: -49.5,6.5 parent: 30 + - uid: 19402 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -21.5,-47.5 + parent: 30 + - uid: 19403 + components: + - type: Transform + pos: -21.5,-41.5 + parent: 30 + - uid: 19404 + components: + - type: Transform + pos: -22.5,-40.5 + parent: 30 + - uid: 19405 + components: + - type: Transform + pos: -21.5,-39.5 + parent: 30 + - uid: 19409 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -21.5,-48.5 + parent: 30 - uid: 19528 components: - type: Transform @@ -119948,6 +117896,12 @@ entities: - type: Transform pos: -28.5,-43.5 parent: 30 + - uid: 19782 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 12.5,-26.5 + parent: 30 - uid: 20272 components: - type: Transform @@ -120048,12 +118002,6 @@ entities: - type: Transform pos: -49.5,50.5 parent: 30 - - uid: 22835 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -31.5,-57.5 - parent: 30 - proto: TableCarpet entities: - uid: 1535 @@ -120158,11 +118106,6 @@ entities: parent: 30 - proto: TableGlass entities: - - uid: 416 - components: - - type: Transform - pos: -25.5,11.5 - parent: 30 - uid: 907 components: - type: Transform @@ -120322,26 +118265,6 @@ entities: - type: Transform pos: 27.5,14.5 parent: 30 - - uid: 12830 - components: - - type: Transform - pos: 19.5,12.5 - parent: 30 - - uid: 12838 - components: - - type: Transform - pos: 16.5,12.5 - parent: 30 - - uid: 12839 - components: - - type: Transform - pos: 15.5,12.5 - parent: 30 - - uid: 12840 - components: - - type: Transform - pos: 18.5,12.5 - parent: 30 - uid: 13088 components: - type: Transform @@ -120352,6 +118275,11 @@ entities: - type: Transform pos: -4.5,-10.5 parent: 30 + - uid: 16137 + components: + - type: Transform + pos: -28.5,11.5 + parent: 30 - uid: 20282 components: - type: Transform @@ -120666,30 +118594,30 @@ entities: - type: Transform pos: -27.5,43.5 parent: 30 - - uid: 9326 + - uid: 9059 components: - type: Transform - pos: -18.5,-35.5 + pos: 3.5,-46.5 parent: 30 - - uid: 9328 + - uid: 9658 components: - type: Transform - pos: -15.5,-34.5 + pos: -2.5,-45.5 parent: 30 - - uid: 9359 + - uid: 9660 components: - type: Transform - pos: -15.5,-35.5 + pos: 2.5,-46.5 parent: 30 - - uid: 9576 + - uid: 9674 components: - type: Transform - pos: -19.5,-35.5 + pos: 4.5,-46.5 parent: 30 - - uid: 9609 + - uid: 9682 components: - type: Transform - pos: -17.5,-35.5 + pos: -2.5,-46.5 parent: 30 - uid: 9803 components: @@ -120706,26 +118634,6 @@ entities: - type: Transform pos: -26.5,41.5 parent: 30 - - uid: 10002 - components: - - type: Transform - pos: -1.5,-45.5 - parent: 30 - - uid: 10003 - components: - - type: Transform - pos: -1.5,-44.5 - parent: 30 - - uid: 10004 - components: - - type: Transform - pos: -13.5,-45.5 - parent: 30 - - uid: 10005 - components: - - type: Transform - pos: -13.5,-44.5 - parent: 30 - uid: 10246 components: - type: Transform @@ -120761,11 +118669,6 @@ entities: - type: Transform pos: 4.5,-27.5 parent: 30 - - uid: 12699 - components: - - type: Transform - pos: 14.5,13.5 - parent: 30 - uid: 12847 components: - type: Transform @@ -121085,6 +118988,11 @@ entities: - type: Transform pos: -30.5,51.5 parent: 30 + - uid: 3361 + components: + - type: Transform + pos: -58.5,-63.5 + parent: 30 - uid: 4956 components: - type: Transform @@ -121275,6 +119183,12 @@ entities: - type: Transform pos: -8.5,-20.5 parent: 30 + - uid: 10231 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -62.5,-65.5 + parent: 30 - uid: 11353 components: - type: Transform @@ -121305,11 +119219,36 @@ entities: - type: Transform pos: 2.5,-10.5 parent: 30 + - uid: 12635 + components: + - type: Transform + pos: -66.5,-64.5 + parent: 30 + - uid: 12818 + components: + - type: Transform + pos: -62.5,-64.5 + parent: 30 + - uid: 12830 + components: + - type: Transform + pos: -58.5,-65.5 + parent: 30 - uid: 13583 components: - type: Transform pos: 40.5,40.5 parent: 30 + - uid: 14447 + components: + - type: Transform + pos: -65.5,-64.5 + parent: 30 + - uid: 14505 + components: + - type: Transform + pos: -65.5,-63.5 + parent: 30 - uid: 15238 components: - type: Transform @@ -121420,30 +119359,10 @@ entities: - type: Transform pos: -53.5,-53.5 parent: 30 - - uid: 19417 + - uid: 18356 components: - type: Transform - pos: -57.5,-67.5 - parent: 30 - - uid: 19418 - components: - - type: Transform - pos: -57.5,-65.5 - parent: 30 - - uid: 19419 - components: - - type: Transform - pos: -57.5,-63.5 - parent: 30 - - uid: 19420 - components: - - type: Transform - pos: -60.5,-67.5 - parent: 30 - - uid: 19421 - components: - - type: Transform - pos: -60.5,-65.5 + pos: -69.5,-63.5 parent: 30 - uid: 19495 components: @@ -121505,16 +119424,6 @@ entities: - type: Transform pos: -27.5,15.5 parent: 30 - - uid: 22304 - components: - - type: Transform - pos: -54.5,-63.5 - parent: 30 - - uid: 22305 - components: - - type: Transform - pos: -60.5,-63.5 - parent: 30 - proto: TargetClown entities: - uid: 1228 @@ -121525,191 +119434,156 @@ entities: parent: 30 - proto: TegCenter entities: - - uid: 16040 + - uid: 9817 components: - type: Transform rot: 1.5707963267948966 rad - pos: -7.5,-50.5 + pos: -0.5,-50.5 parent: 30 - proto: TegCirculator entities: - - uid: 15013 + - uid: 11286 components: - type: Transform - pos: -6.5,-50.5 + pos: 0.5,-50.5 parent: 30 - type: PointLight color: '#FF3300FF' - - uid: 16038 + - uid: 11292 components: - type: Transform rot: 3.141592653589793 rad - pos: -8.5,-50.5 + pos: -1.5,-50.5 parent: 30 - type: PointLight color: '#FF3300FF' -- proto: TelecomServer +- proto: TelecomServerFilledCargo entities: - - uid: 22621 + - uid: 10551 components: - type: Transform - pos: -37.5,-58.5 + pos: -10.5,-28.5 parent: 30 - - type: ContainerContainer - containers: - key_slots: !type:Container - showEnts: False - occludes: True - ents: - - 22622 - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - - uid: 22812 +- proto: TelecomServerFilledCommand + entities: + - uid: 9972 components: - type: Transform - pos: -35.5,-61.5 + pos: -10.5,-30.5 parent: 30 - - type: ContainerContainer - containers: - key_slots: !type:Container - showEnts: False - occludes: True - ents: - - 22813 - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - - uid: 22814 +- proto: TelecomServerFilledCommon + entities: + - uid: 9389 components: - type: Transform - pos: -37.5,-60.5 + pos: -12.5,-30.5 parent: 30 - - type: ContainerContainer - containers: - key_slots: !type:Container - showEnts: False - occludes: True - ents: - - 22815 - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - - uid: 22816 +- proto: TelecomServerFilledEngineering + entities: + - uid: 10550 components: - type: Transform - pos: -40.5,-61.5 + pos: -8.5,-30.5 parent: 30 - - type: ContainerContainer - containers: - key_slots: !type:Container - showEnts: False - occludes: True - ents: - - 22817 - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - - uid: 22822 +- proto: TelecomServerFilledMedical + entities: + - uid: 19181 components: - type: Transform - pos: -37.5,-57.5 + pos: -6.5,-28.5 parent: 30 - - type: ContainerContainer - containers: - key_slots: !type:Container - showEnts: False - occludes: True - ents: - - 22823 - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - - uid: 22825 +- proto: TelecomServerFilledScience + entities: + - uid: 19185 components: - type: Transform - pos: -37.5,-63.5 + pos: -8.5,-28.5 parent: 30 - - type: ContainerContainer - containers: - key_slots: !type:Container - showEnts: False - occludes: True - ents: - - 22826 - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - - uid: 22827 +- proto: TelecomServerFilledSecurity + entities: + - uid: 11161 components: - type: Transform - pos: -37.5,-62.5 + pos: -6.5,-30.5 parent: 30 - - type: ContainerContainer - containers: - key_slots: !type:Container - showEnts: False - occludes: True - ents: - - 22828 - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - - uid: 22829 +- proto: TelecomServerFilledService + entities: + - uid: 19179 components: - type: Transform - pos: -35.5,-59.5 + pos: -12.5,-28.5 + parent: 30 +- proto: TeslaCoil + entities: + - uid: 5732 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,-55.5 + parent: 30 + - uid: 6095 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,-56.5 + parent: 30 + - uid: 6271 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,-54.5 + parent: 30 + - uid: 6678 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,-56.5 + parent: 30 + - uid: 6679 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,-55.5 + parent: 30 + - uid: 13902 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,-54.5 + parent: 30 +- proto: TeslaGenerator + entities: + - uid: 19411 + components: + - type: Transform + pos: -16.5,-35.5 + parent: 30 +- proto: TeslaGroundingRod + entities: + - uid: 10004 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,-54.5 + parent: 30 + - uid: 10140 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.5,-54.5 + parent: 30 + - uid: 11110 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,-54.5 + parent: 30 + - uid: 13952 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,-54.5 parent: 30 - - type: ContainerContainer - containers: - key_slots: !type:Container - showEnts: False - occludes: True - ents: - - 22830 - machine_board: !type:Container - showEnts: False - occludes: True - ents: [] - machine_parts: !type:Container - showEnts: False - occludes: True - ents: [] - proto: TintedWindow entities: - uid: 289 @@ -121757,16 +119631,6 @@ entities: - type: Transform pos: -67.5,-41.5 parent: 30 - - uid: 17707 - components: - - type: Transform - pos: -69.5,-60.5 - parent: 30 - - uid: 17709 - components: - - type: Transform - pos: -69.5,-59.5 - parent: 30 - uid: 18697 components: - type: Transform @@ -121863,13 +119727,6 @@ entities: - type: Transform pos: -21.467775,23.567343 parent: 30 -- proto: ToolboxElectrical - entities: - - uid: 11308 - components: - - type: Transform - pos: -11.510529,-34.394146 - parent: 30 - proto: ToolboxElectricalFilled entities: - uid: 1628 @@ -121882,10 +119739,15 @@ entities: - type: Transform pos: -32.56638,31.48925 parent: 30 - - uid: 11313 + - uid: 19180 components: - type: Transform - pos: -24.449165,-39.212135 + pos: 3.3810787,-41.40624 + parent: 30 + - uid: 19374 + components: + - type: Transform + pos: -24.790539,-50.361137 parent: 30 - uid: 20299 components: @@ -121924,6 +119786,11 @@ entities: - type: Transform pos: -6.509716,45.635574 parent: 30 + - uid: 10003 + components: + - type: Transform + pos: -11.488707,-33.250866 + parent: 30 - uid: 11256 components: - type: Transform @@ -121958,10 +119825,10 @@ entities: - type: Transform pos: -24.487177,31.504875 parent: 30 - - uid: 11309 + - uid: 11271 components: - type: Transform - pos: -11.510529,-34.706646 + pos: -8.522053,-43.420155 parent: 30 - uid: 12823 components: @@ -121973,21 +119840,16 @@ entities: - type: Transform pos: -57.478386,27.672016 parent: 30 - - uid: 18793 + - uid: 18771 components: - type: Transform - pos: -67.52385,-62.454746 + pos: -53.3416,-62.69514 parent: 30 - uid: 20300 components: - type: Transform pos: 6.5231524,64.57765 parent: 30 - - uid: 22842 - components: - - type: Transform - pos: -29.484652,-57.340546 - parent: 30 - proto: ToyAi entities: - uid: 20307 @@ -122074,10 +119936,10 @@ entities: - type: Transform pos: -39.368607,18.074919 parent: 30 - - uid: 11269 + - uid: 13976 components: - type: Transform - pos: -17.424835,-30.14346 + pos: -10.716881,-47.33087 parent: 30 - uid: 22448 components: @@ -122213,63 +120075,49 @@ entities: - Left: Forward - Right: Reverse - Middle: Off - - uid: 15987 - components: - - type: Transform - pos: 50.5,23.5 - parent: 30 - - type: DeviceLinkSource - linkedPorts: - 14525: - - Middle: Off - - Right: Reverse - - Left: Forward - 14524: - - Middle: Off - - Right: Reverse - - Left: Forward - 14523: - - Middle: Off - - Right: Reverse - - Left: Forward - 14522: - - Middle: Off - - Right: Reverse - - Left: Forward - - uid: 15988 + - uid: 18373 components: - type: Transform pos: 51.5,23.5 parent: 30 - type: DeviceLinkSource linkedPorts: - 14526: - - Middle: Off - - Right: Reverse + 12943: - Left: Forward - 14527: - - Middle: Off - Right: Reverse - - Left: Forward - 14528: - Middle: Off - - Right: Reverse + 12944: - Left: Forward - 14529: + - Right: Reverse - Middle: Off - - Right: Reverse + 12961: - Left: Forward - - uid: 15989 - components: - - type: Transform - pos: 53.5,23.5 - parent: 30 - - type: DeviceLinkSource - linkedPorts: - 14530: + - Right: Reverse - Middle: Off - - Right: Reverse + 12973: - Left: Forward + - Right: Reverse + - Middle: Off + 18374: + - Left: Forward + - Right: Reverse + - Middle: Off + 12974: + - Left: Reverse + - Right: Forward + - Middle: Off + 12983: + - Left: Forward + - Right: Reverse + - Middle: Off + 13034: + - Left: Forward + - Right: Reverse + - Middle: Off + 13048: + - Left: Forward + - Right: Reverse + - Middle: Off - proto: UnfinishedMachineFrame entities: - uid: 7826 @@ -122282,36 +120130,6 @@ entities: - type: Transform pos: -38.5,-18.5 parent: 30 - - uid: 10191 - components: - - type: Transform - pos: -24.5,-68.5 - parent: 30 - - uid: 10192 - components: - - type: Transform - pos: -25.5,-68.5 - parent: 30 - - uid: 10195 - components: - - type: Transform - pos: -23.5,-68.5 - parent: 30 - - uid: 10211 - components: - - type: Transform - pos: -24.5,-69.5 - parent: 30 - - uid: 10212 - components: - - type: Transform - pos: -23.5,-69.5 - parent: 30 - - uid: 10214 - components: - - type: Transform - pos: -25.5,-69.5 - parent: 30 - uid: 12797 components: - type: Transform @@ -122584,12 +120402,10 @@ entities: - type: Transform pos: -52.5,65.5 parent: 30 - - uid: 12811 + - uid: 17709 components: - - type: MetaData - name: Hot drinks machine - type: Transform - pos: 20.5,14.5 + pos: 20.5,16.5 parent: 30 - uid: 21318 components: @@ -122607,10 +120423,10 @@ entities: parent: 30 - proto: VendingMachineCuraDrobe entities: - - uid: 18842 + - uid: 18357 components: - type: Transform - pos: -59.5,-68.5 + pos: -68.5,-63.5 parent: 30 - proto: VendingMachineDetDrobe entities: @@ -122644,10 +120460,10 @@ entities: parent: 30 - proto: VendingMachineEngiDrobe entities: - - uid: 9432 + - uid: 19406 components: - type: Transform - pos: -25.5,-39.5 + pos: -21.5,-46.5 parent: 30 - proto: VendingMachineEngivend entities: @@ -122734,10 +120550,10 @@ entities: parent: 30 - proto: VendingMachineNutri entities: - - uid: 414 + - uid: 16135 components: - type: Transform - pos: -25.5,9.5 + pos: -28.5,9.5 parent: 30 - proto: VendingMachineRoboDrobe entities: @@ -122764,10 +120580,10 @@ entities: parent: 30 - proto: VendingMachineSciDrobe entities: - - uid: 12842 + - uid: 18761 components: - type: Transform - pos: 17.5,12.5 + pos: 16.5,10.5 parent: 30 - proto: VendingMachineSec entities: @@ -122785,10 +120601,10 @@ entities: parent: 30 - proto: VendingMachineSeeds entities: - - uid: 413 + - uid: 16136 components: - type: Transform - pos: -25.5,10.5 + pos: -28.5,13.5 parent: 30 - proto: VendingMachineSeedsUnlocked entities: @@ -122856,6 +120672,11 @@ entities: - type: Transform pos: 7.5,-27.5 parent: 30 + - uid: 13970 + components: + - type: Transform + pos: -15.5,-44.5 + parent: 30 - proto: VendingMachineTheater entities: - uid: 654 @@ -123124,6 +120945,51 @@ entities: - type: Transform pos: -4.5,24.5 parent: 30 + - uid: 403 + components: + - type: Transform + pos: -51.5,-66.5 + parent: 30 + - uid: 413 + components: + - type: Transform + pos: -51.5,-62.5 + parent: 30 + - uid: 414 + components: + - type: Transform + pos: -51.5,-63.5 + parent: 30 + - uid: 415 + components: + - type: Transform + pos: -56.5,-66.5 + parent: 30 + - uid: 416 + components: + - type: Transform + pos: -55.5,-66.5 + parent: 30 + - uid: 434 + components: + - type: Transform + pos: -57.5,-66.5 + parent: 30 + - uid: 435 + components: + - type: Transform + pos: -54.5,-66.5 + parent: 30 + - uid: 490 + components: + - type: Transform + pos: -51.5,-61.5 + parent: 30 + - uid: 494 + components: + - type: Transform + pos: -53.5,-66.5 + parent: 30 - uid: 570 components: - type: Transform @@ -123274,6 +121140,11 @@ entities: - type: Transform pos: -45.5,9.5 parent: 30 + - uid: 961 + components: + - type: Transform + pos: -51.5,-60.5 + parent: 30 - uid: 992 components: - type: Transform @@ -124163,6 +122034,11 @@ entities: - type: Transform pos: -42.5,58.5 parent: 30 + - uid: 1952 + components: + - type: Transform + pos: -51.5,-65.5 + parent: 30 - uid: 2034 components: - type: Transform @@ -124208,6 +122084,11 @@ entities: - type: Transform pos: -42.5,61.5 parent: 30 + - uid: 2088 + components: + - type: Transform + pos: -51.5,-64.5 + parent: 30 - uid: 2102 components: - type: Transform @@ -124558,6 +122439,12 @@ entities: - type: Transform pos: -51.5,6.5 parent: 30 + - uid: 3153 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -12.5,-26.5 + parent: 30 - uid: 3200 components: - type: Transform @@ -125449,11 +123336,23 @@ entities: - type: Transform pos: -13.5,45.5 parent: 30 + - uid: 6272 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -26.5,-57.5 + parent: 30 - uid: 6273 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -6.5,-57.5 + rot: 3.141592653589793 rad + pos: -25.5,-57.5 + parent: 30 + - uid: 6274 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -26.5,-58.5 parent: 30 - uid: 6294 components: @@ -125635,6 +123534,18 @@ entities: - type: Transform pos: 15.5,47.5 parent: 30 + - uid: 6466 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -26.5,-60.5 + parent: 30 + - uid: 6468 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -22.5,-54.5 + parent: 30 - uid: 6486 components: - type: Transform @@ -125775,17 +123686,29 @@ entities: - type: Transform pos: 28.5,44.5 parent: 30 + - uid: 6600 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -24.5,-55.5 + parent: 30 + - uid: 6601 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -24.5,-54.5 + parent: 30 - uid: 6602 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -7.5,-60.5 + rot: -1.5707963267948966 rad + pos: -21.5,-57.5 parent: 30 - uid: 6603 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -6.5,-56.5 + rot: -1.5707963267948966 rad + pos: -24.5,-56.5 parent: 30 - uid: 6607 components: @@ -125822,6 +123745,12 @@ entities: - type: Transform pos: -4.5,-5.5 parent: 30 + - uid: 6639 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -22.5,-57.5 + parent: 30 - uid: 6647 components: - type: Transform @@ -125907,6 +123836,36 @@ entities: - type: Transform pos: -10.5,-11.5 parent: 30 + - uid: 6670 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -26.5,-61.5 + parent: 30 + - uid: 6684 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -21.5,-56.5 + parent: 30 + - uid: 6699 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -23.5,-54.5 + parent: 30 + - uid: 6711 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -24.5,-57.5 + parent: 30 + - uid: 6714 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -13.5,-53.5 + parent: 30 - uid: 6735 components: - type: Transform @@ -125972,6 +123931,12 @@ entities: - type: Transform pos: -43.5,-22.5 parent: 30 + - uid: 7094 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -26.5,-62.5 + parent: 30 - uid: 7127 components: - type: Transform @@ -125982,18 +123947,6 @@ entities: - type: Transform pos: -3.5,18.5 parent: 30 - - uid: 7219 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -6.5,-59.5 - parent: 30 - - uid: 7220 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -8.5,-59.5 - parent: 30 - uid: 7242 components: - type: Transform @@ -126024,6 +123977,42 @@ entities: - type: Transform pos: -31.5,-22.5 parent: 30 + - uid: 7444 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -22.5,-76.5 + parent: 30 + - uid: 7667 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -21.5,-76.5 + parent: 30 + - uid: 7669 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -20.5,-76.5 + parent: 30 + - uid: 7670 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -26.5,-67.5 + parent: 30 + - uid: 7671 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -26.5,-68.5 + parent: 30 + - uid: 7672 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -26.5,-69.5 + parent: 30 - uid: 7713 components: - type: Transform @@ -126077,6 +124066,18 @@ entities: rot: 3.141592653589793 rad pos: 0.5,-13.5 parent: 30 + - uid: 7770 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -26.5,-71.5 + parent: 30 + - uid: 7771 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -26.5,-72.5 + parent: 30 - uid: 7772 components: - type: Transform @@ -126088,21 +124089,104 @@ entities: - type: Transform pos: -35.5,-27.5 parent: 30 + - uid: 7914 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -26.5,-73.5 + parent: 30 - uid: 7959 components: - type: Transform pos: -34.5,-14.5 parent: 30 + - uid: 7965 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -26.5,-74.5 + parent: 30 - uid: 7969 components: - type: Transform pos: -35.5,-14.5 parent: 30 + - uid: 8004 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -26.5,-75.5 + parent: 30 + - uid: 8005 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -26.5,-76.5 + parent: 30 - uid: 8025 components: - type: Transform pos: -35.5,-26.5 parent: 30 + - uid: 8137 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -25.5,-76.5 + parent: 30 + - uid: 8225 + components: + - type: Transform + pos: -7.5,-63.5 + parent: 30 + - uid: 8226 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -26.5,-64.5 + parent: 30 + - uid: 8228 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -26.5,-63.5 + parent: 30 + - uid: 8230 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -26.5,-65.5 + parent: 30 + - uid: 8231 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -17.5,-28.5 + parent: 30 + - uid: 8255 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -16.5,-76.5 + parent: 30 + - uid: 8258 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -19.5,-76.5 + parent: 30 + - uid: 8260 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -18.5,-76.5 + parent: 30 + - uid: 8263 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -17.5,-76.5 + parent: 30 - uid: 8272 components: - type: Transform @@ -126721,6 +124805,24 @@ entities: - type: Transform pos: 25.5,-35.5 parent: 30 + - uid: 8794 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -26.5,-66.5 + parent: 30 + - uid: 8795 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -23.5,-76.5 + parent: 30 + - uid: 8799 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -26.5,-59.5 + parent: 30 - uid: 8816 components: - type: Transform @@ -126731,24 +124833,6 @@ entities: - type: Transform pos: -41.5,-22.5 parent: 30 - - uid: 8823 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -8.5,-61.5 - parent: 30 - - uid: 8824 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -7.5,-61.5 - parent: 30 - - uid: 8825 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -6.5,-61.5 - parent: 30 - uid: 8826 components: - type: Transform @@ -126811,6 +124895,30 @@ entities: - type: Transform pos: 18.5,-12.5 parent: 30 + - uid: 9102 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,-57.5 + parent: 30 + - uid: 9103 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,-58.5 + parent: 30 + - uid: 9104 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,-52.5 + parent: 30 + - uid: 9129 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,-58.5 + parent: 30 - uid: 9132 components: - type: Transform @@ -126965,6 +125073,18 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,-26.5 parent: 30 + - uid: 9234 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,-53.5 + parent: 30 + - uid: 9244 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,-54.5 + parent: 30 - uid: 9255 components: - type: Transform @@ -127030,10 +125150,17 @@ entities: - type: Transform pos: -4.5,-32.5 parent: 30 - - uid: 9294 + - uid: 9288 components: - type: Transform - pos: 4.5,-43.5 + rot: 1.5707963267948966 rad + pos: 5.5,-58.5 + parent: 30 + - uid: 9289 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-58.5 parent: 30 - uid: 9296 components: @@ -127045,11 +125172,6 @@ entities: - type: Transform pos: 4.5,-39.5 parent: 30 - - uid: 9320 - components: - - type: Transform - pos: -5.5,-37.5 - parent: 30 - uid: 9325 components: - type: Transform @@ -127105,6 +125227,12 @@ entities: - type: Transform pos: -20.5,-32.5 parent: 30 + - uid: 9339 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 7.5,-45.5 + parent: 30 - uid: 9340 components: - type: Transform @@ -127180,30 +125308,17 @@ entities: - type: Transform pos: -16.5,-33.5 parent: 30 - - uid: 9364 + - uid: 9367 components: - type: Transform - pos: -9.5,-37.5 + rot: 1.5707963267948966 rad + pos: 4.5,-54.5 parent: 30 - - uid: 9366 + - uid: 9368 components: - type: Transform - pos: -20.5,-38.5 - parent: 30 - - uid: 9371 - components: - - type: Transform - pos: -20.5,-45.5 - parent: 30 - - uid: 9372 - components: - - type: Transform - pos: -21.5,-45.5 - parent: 30 - - uid: 9373 - components: - - type: Transform - pos: -22.5,-45.5 + rot: 1.5707963267948966 rad + pos: -1.5,-54.5 parent: 30 - uid: 9374 components: @@ -127265,11 +125380,6 @@ entities: - type: Transform pos: -26.5,-45.5 parent: 30 - - uid: 9387 - components: - - type: Transform - pos: -25.5,-45.5 - parent: 30 - uid: 9388 components: - type: Transform @@ -127305,45 +125415,17 @@ entities: - type: Transform pos: -24.5,-51.5 parent: 30 - - uid: 9396 - components: - - type: Transform - pos: -23.5,-51.5 - parent: 30 - - uid: 9397 - components: - - type: Transform - pos: -22.5,-51.5 - parent: 30 - - uid: 9398 - components: - - type: Transform - pos: -21.5,-51.5 - parent: 30 - - uid: 9399 - components: - - type: Transform - pos: -21.5,-50.5 - parent: 30 - - uid: 9400 - components: - - type: Transform - pos: -21.5,-49.5 - parent: 30 - - uid: 9401 - components: - - type: Transform - pos: -21.5,-48.5 - parent: 30 - uid: 9402 components: - type: Transform - pos: -21.5,-47.5 + rot: 3.141592653589793 rad + pos: -12.5,-57.5 parent: 30 - - uid: 9403 + - uid: 9413 components: - type: Transform - pos: -21.5,-46.5 + rot: -1.5707963267948966 rad + pos: -10.5,-33.5 parent: 30 - uid: 9423 components: @@ -127415,11 +125497,6 @@ entities: - type: Transform pos: -17.5,-27.5 parent: 30 - - uid: 9469 - components: - - type: Transform - pos: -18.5,-27.5 - parent: 30 - uid: 9470 components: - type: Transform @@ -127440,21 +125517,83 @@ entities: - type: Transform pos: -18.5,-31.5 parent: 30 + - uid: 9487 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,-53.5 + parent: 30 + - uid: 9507 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-55.5 + parent: 30 + - uid: 9508 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-55.5 + parent: 30 + - uid: 9509 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-54.5 + parent: 30 + - uid: 9510 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,-57.5 + parent: 30 + - uid: 9511 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-57.5 + parent: 30 + - uid: 9513 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-57.5 + parent: 30 + - uid: 9514 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,-55.5 + parent: 30 + - uid: 9515 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,-43.5 + parent: 30 + - uid: 9516 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,-76.5 + parent: 30 + - uid: 9517 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,-76.5 + parent: 30 + - uid: 9528 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -9.5,-53.5 + parent: 30 - uid: 9582 components: - type: Transform pos: -15.5,-33.5 parent: 30 - - uid: 9583 - components: - - type: Transform - pos: -15.5,-37.5 - parent: 30 - - uid: 9584 - components: - - type: Transform - pos: -16.5,-37.5 - parent: 30 - uid: 9599 components: - type: Transform @@ -127465,33 +125604,87 @@ entities: - type: Transform pos: -18.5,-33.5 parent: 30 + - uid: 9601 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -14.5,-76.5 + parent: 30 + - uid: 9602 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -13.5,-76.5 + parent: 30 + - uid: 9603 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.5,-76.5 + parent: 30 + - uid: 9604 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,-76.5 + parent: 30 + - uid: 9605 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,-61.5 + parent: 30 + - uid: 9606 + components: + - type: Transform + pos: -7.5,-71.5 + parent: 30 + - uid: 9607 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,-76.5 + parent: 30 + - uid: 9609 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,-74.5 + parent: 30 + - uid: 9641 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,-56.5 + parent: 30 + - uid: 9642 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-58.5 + parent: 30 + - uid: 9643 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,-58.5 + parent: 30 - uid: 9663 components: - type: Transform pos: -10.5,-5.5 parent: 30 - - uid: 9674 + - uid: 9692 components: - type: Transform - pos: 2.5,-47.5 + rot: 3.141592653589793 rad + pos: 5.5,-45.5 parent: 30 - - uid: 9680 + - uid: 9693 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -8.5,-56.5 - parent: 30 - - uid: 9681 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -8.5,-57.5 - parent: 30 - - uid: 9691 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -7.5,-59.5 + rot: 3.141592653589793 rad + pos: 5.5,-46.5 parent: 30 - uid: 9714 components: @@ -127509,311 +125702,169 @@ entities: rot: 3.141592653589793 rad pos: -53.5,34.5 parent: 30 + - uid: 9822 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,-42.5 + parent: 30 - uid: 9855 components: - type: Transform pos: -31.5,-14.5 parent: 30 - - uid: 9903 + - uid: 9863 components: - type: Transform rot: -1.5707963267948966 rad - pos: 2.5,-55.5 + pos: -6.5,-53.5 parent: 30 - - uid: 9904 + - uid: 9877 components: - type: Transform rot: -1.5707963267948966 rad - pos: -0.5,-55.5 + pos: -12.5,-53.5 parent: 30 - - uid: 9906 + - uid: 9878 components: - type: Transform rot: -1.5707963267948966 rad - pos: 4.5,-45.5 + pos: -11.5,-53.5 parent: 30 - - uid: 9907 + - uid: 9881 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,-45.5 + pos: -27.5,-63.5 parent: 30 - - uid: 9908 + - uid: 9991 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,-51.5 + rot: 3.141592653589793 rad + pos: -7.5,-57.5 parent: 30 - - uid: 9923 + - uid: 10002 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,-47.5 + rot: 3.141592653589793 rad + pos: -8.5,-57.5 parent: 30 - - uid: 9924 + - uid: 10012 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,-46.5 + rot: 3.141592653589793 rad + pos: -8.5,-70.5 parent: 30 - - uid: 9925 + - uid: 10013 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,-45.5 + rot: 3.141592653589793 rad + pos: -8.5,-73.5 parent: 30 - - uid: 9927 + - uid: 10014 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,-45.5 - parent: 30 - - uid: 9959 - components: - - type: Transform - pos: -0.5,-44.5 - parent: 30 - - uid: 9961 - components: - - type: Transform - pos: -0.5,-42.5 - parent: 30 - - uid: 9962 - components: - - type: Transform - pos: -1.5,-42.5 - parent: 30 - - uid: 9963 - components: - - type: Transform - pos: -2.5,-42.5 - parent: 30 - - uid: 9964 - components: - - type: Transform - pos: -3.5,-42.5 - parent: 30 - - uid: 9966 - components: - - type: Transform - pos: -5.5,-42.5 - parent: 30 - - uid: 9970 - components: - - type: Transform - pos: -9.5,-42.5 - parent: 30 - - uid: 9972 - components: - - type: Transform - pos: -11.5,-42.5 - parent: 30 - - uid: 9973 - components: - - type: Transform - pos: -12.5,-42.5 - parent: 30 - - uid: 9974 - components: - - type: Transform - pos: -13.5,-42.5 - parent: 30 - - uid: 9975 - components: - - type: Transform - pos: -14.5,-42.5 - parent: 30 - - uid: 9977 - components: - - type: Transform - pos: -14.5,-44.5 - parent: 30 - - uid: 9978 - components: - - type: Transform - pos: -14.5,-45.5 - parent: 30 - - uid: 9985 - components: - - type: Transform - pos: -14.5,-52.5 - parent: 30 - - uid: 9986 - components: - - type: Transform - pos: -14.5,-53.5 - parent: 30 - - uid: 9987 - components: - - type: Transform - pos: -14.5,-54.5 - parent: 30 - - uid: 9988 - components: - - type: Transform - pos: -14.5,-55.5 - parent: 30 - - uid: 10019 - components: - - type: Transform - pos: -14.5,-56.5 - parent: 30 - - uid: 10020 - components: - - type: Transform - pos: -13.5,-56.5 - parent: 30 - - uid: 10021 - components: - - type: Transform - pos: -0.5,-56.5 - parent: 30 - - uid: 10022 - components: - - type: Transform - pos: -1.5,-56.5 - parent: 30 - - uid: 10042 - components: - - type: Transform - pos: -13.5,-60.5 - parent: 30 - - uid: 10043 - components: - - type: Transform - pos: -12.5,-60.5 - parent: 30 - - uid: 10044 - components: - - type: Transform - pos: -11.5,-60.5 - parent: 30 - - uid: 10045 - components: - - type: Transform - pos: -11.5,-61.5 - parent: 30 - - uid: 10049 - components: - - type: Transform - pos: -1.5,-60.5 + rot: 3.141592653589793 rad + pos: -8.5,-69.5 parent: 30 - uid: 10050 components: - type: Transform - pos: -2.5,-60.5 + rot: -1.5707963267948966 rad + pos: -13.5,-56.5 parent: 30 - uid: 10051 components: - type: Transform - pos: -3.5,-60.5 + rot: -1.5707963267948966 rad + pos: -13.5,-57.5 parent: 30 - uid: 10052 components: - type: Transform - pos: -3.5,-61.5 + rot: -1.5707963267948966 rad + pos: -13.5,-54.5 parent: 30 - - uid: 10053 + - uid: 10092 components: - type: Transform - pos: -4.5,-61.5 + rot: 3.141592653589793 rad + pos: -8.5,-62.5 parent: 30 - - uid: 10054 + - uid: 10096 components: - type: Transform - pos: -5.5,-61.5 + rot: -1.5707963267948966 rad + pos: -8.5,-53.5 parent: 30 - - uid: 10058 + - uid: 10097 components: - type: Transform - pos: -9.5,-61.5 - parent: 30 - - uid: 10059 - components: - - type: Transform - pos: -10.5,-61.5 + rot: -1.5707963267948966 rad + pos: -7.5,-53.5 parent: 30 - uid: 10112 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -19.5,-45.5 + pos: -13.5,-77.5 parent: 30 - uid: 10113 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -15.5,-45.5 + rot: 3.141592653589793 rad + pos: -8.5,-60.5 + parent: 30 + - uid: 10114 + components: + - type: Transform + pos: -27.5,-71.5 + parent: 30 + - uid: 10115 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,-67.5 + parent: 30 + - uid: 10116 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,-65.5 parent: 30 - uid: 10117 components: - type: Transform - pos: -19.5,-52.5 + rot: 3.141592653589793 rad + pos: -8.5,-71.5 parent: 30 - uid: 10118 components: - type: Transform - pos: -19.5,-51.5 + rot: 3.141592653589793 rad + pos: -8.5,-63.5 parent: 30 - uid: 10119 components: - type: Transform - pos: -19.5,-50.5 - parent: 30 - - uid: 10120 - components: - - type: Transform - pos: -19.5,-49.5 + rot: 3.141592653589793 rad + pos: -8.5,-66.5 parent: 30 - uid: 10121 components: - type: Transform - pos: -19.5,-48.5 + rot: 3.141592653589793 rad + pos: -8.5,-59.5 parent: 30 - uid: 10122 components: - type: Transform - pos: -19.5,-47.5 + rot: 3.141592653589793 rad + pos: -8.5,-58.5 parent: 30 - - uid: 10123 + - uid: 10134 components: - type: Transform - pos: -19.5,-46.5 - parent: 30 - - uid: 10124 - components: - - type: Transform - pos: -15.5,-46.5 - parent: 30 - - uid: 10125 - components: - - type: Transform - pos: -15.5,-47.5 - parent: 30 - - uid: 10126 - components: - - type: Transform - pos: -15.5,-48.5 - parent: 30 - - uid: 10127 - components: - - type: Transform - pos: -15.5,-49.5 - parent: 30 - - uid: 10128 - components: - - type: Transform - pos: -15.5,-50.5 - parent: 30 - - uid: 10129 - components: - - type: Transform - pos: -15.5,-51.5 - parent: 30 - - uid: 10130 - components: - - type: Transform - pos: -15.5,-52.5 + rot: 1.5707963267948966 rad + pos: 7.5,-43.5 parent: 30 - uid: 10208 components: @@ -127830,10 +125881,57 @@ entities: - type: Transform pos: -58.5,-10.5 parent: 30 - - uid: 10268 + - uid: 10558 components: - type: Transform - pos: -32.5,-64.5 + rot: 3.141592653589793 rad + pos: 7.5,-44.5 + parent: 30 + - uid: 10640 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,-43.5 + parent: 30 + - uid: 10648 + components: + - type: Transform + pos: -15.5,-38.5 + parent: 30 + - uid: 10651 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,-75.5 + parent: 30 + - uid: 10676 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,-57.5 + parent: 30 + - uid: 10678 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,-57.5 + parent: 30 + - uid: 10726 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -6.5,-55.5 + parent: 30 + - uid: 10727 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -6.5,-54.5 + parent: 30 + - uid: 10768 + components: + - type: Transform + pos: -19.5,-38.5 parent: 30 - uid: 10944 components: @@ -127855,16 +125953,67 @@ entities: - type: Transform pos: 25.5,-21.5 parent: 30 - - uid: 11164 + - uid: 11019 components: - type: Transform - pos: -33.5,-64.5 + pos: -20.5,-38.5 + parent: 30 + - uid: 11039 + components: + - type: Transform + pos: -21.5,-77.5 + parent: 30 + - uid: 11057 + components: + - type: Transform + pos: -14.5,-38.5 + parent: 30 + - uid: 11067 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,-47.5 + parent: 30 + - uid: 11107 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,-56.5 + parent: 30 + - uid: 11123 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,-54.5 + parent: 30 + - uid: 11126 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -21.5,-54.5 + parent: 30 + - uid: 11127 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -20.5,-53.5 + parent: 30 + - uid: 11144 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -20.5,-51.5 parent: 30 - uid: 11195 components: - type: Transform pos: 29.5,-12.5 parent: 30 + - uid: 11260 + components: + - type: Transform + pos: -71.5,-64.5 + parent: 30 - uid: 11371 components: - type: Transform @@ -127895,10 +126044,20 @@ entities: - type: Transform pos: -29.5,-48.5 parent: 30 - - uid: 11588 + - uid: 11460 components: - type: Transform - pos: -34.5,-64.5 + pos: -57.5,-67.5 + parent: 30 + - uid: 11465 + components: + - type: Transform + pos: -58.5,-67.5 + parent: 30 + - uid: 11585 + components: + - type: Transform + pos: -61.5,-67.5 parent: 30 - uid: 11590 components: @@ -128081,11 +126240,6 @@ entities: - type: Transform pos: 23.5,-12.5 parent: 30 - - uid: 12213 - components: - - type: Transform - pos: -35.5,-64.5 - parent: 30 - uid: 12244 components: - type: Transform @@ -128141,6 +126295,11 @@ entities: - type: Transform pos: 12.5,13.5 parent: 30 + - uid: 12629 + components: + - type: Transform + pos: -60.5,-67.5 + parent: 30 - uid: 12630 components: - type: Transform @@ -128166,41 +126325,6 @@ entities: - type: Transform pos: 17.5,9.5 parent: 30 - - uid: 12635 - components: - - type: Transform - pos: 16.5,14.5 - parent: 30 - - uid: 12636 - components: - - type: Transform - pos: 16.5,16.5 - parent: 30 - - uid: 12637 - components: - - type: Transform - pos: 16.5,13.5 - parent: 30 - - uid: 12638 - components: - - type: Transform - pos: 17.5,13.5 - parent: 30 - - uid: 12639 - components: - - type: Transform - pos: 18.5,13.5 - parent: 30 - - uid: 12640 - components: - - type: Transform - pos: 19.5,13.5 - parent: 30 - - uid: 12641 - components: - - type: Transform - pos: 19.5,14.5 - parent: 30 - uid: 12642 components: - type: Transform @@ -128241,6 +126365,12 @@ entities: - type: Transform pos: 24.5,13.5 parent: 30 + - uid: 12663 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -20.5,-52.5 + parent: 30 - uid: 12670 components: - type: Transform @@ -129157,6 +127287,12 @@ entities: - type: Transform pos: 48.5,18.5 parent: 30 + - uid: 13643 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,-57.5 + parent: 30 - uid: 13647 components: - type: Transform @@ -129232,11 +127368,50 @@ entities: - type: Transform pos: 10.5,58.5 parent: 30 + - uid: 13901 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -21.5,-53.5 + parent: 30 + - uid: 14334 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 13.5,13.5 + parent: 30 + - uid: 14506 + components: + - type: Transform + pos: -68.5,-64.5 + parent: 30 + - uid: 14507 + components: + - type: Transform + pos: -69.5,-64.5 + parent: 30 + - uid: 14508 + components: + - type: Transform + pos: -70.5,-64.5 + parent: 30 + - uid: 14538 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -21.5,-51.5 + parent: 30 - uid: 14539 components: - type: Transform pos: 32.5,-12.5 parent: 30 + - uid: 14590 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -22.5,-51.5 + parent: 30 - uid: 14646 components: - type: Transform @@ -129440,6 +127615,12 @@ entities: - type: Transform pos: 46.5,15.5 parent: 30 + - uid: 16040 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-42.5 + parent: 30 - uid: 16104 components: - type: Transform @@ -129584,6 +127765,11 @@ entities: rot: 1.5707963267948966 rad pos: -58.5,37.5 parent: 30 + - uid: 16777 + components: + - type: Transform + pos: -67.5,-66.5 + parent: 30 - uid: 16784 components: - type: Transform @@ -129644,6 +127830,16 @@ entities: - type: Transform pos: -61.5,41.5 parent: 30 + - uid: 16995 + components: + - type: Transform + pos: -5.5,-37.5 + parent: 30 + - uid: 16996 + components: + - type: Transform + pos: -9.5,-37.5 + parent: 30 - uid: 17016 components: - type: Transform @@ -129869,16 +128065,6 @@ entities: - type: Transform pos: -84.5,-43.5 parent: 30 - - uid: 17526 - components: - - type: Transform - pos: -85.5,-44.5 - parent: 30 - - uid: 17527 - components: - - type: Transform - pos: -85.5,-46.5 - parent: 30 - uid: 17528 components: - type: Transform @@ -130037,23 +128223,21 @@ entities: rot: 1.5707963267948966 rad pos: -51.5,-59.5 parent: 30 - - uid: 17714 + - uid: 17728 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -51.5,-60.5 + rot: 3.141592653589793 rad + pos: 15.5,13.5 parent: 30 - - uid: 17715 + - uid: 17775 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -52.5,-60.5 + pos: -68.5,-66.5 parent: 30 - - uid: 17717 + - uid: 17776 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -53.5,-60.5 + pos: -68.5,-65.5 parent: 30 - uid: 17804 components: @@ -130143,20 +128327,11 @@ entities: - type: Transform pos: -35.5,-36.5 parent: 30 - - uid: 18079 - components: - - type: Transform - pos: -53.5,-68.5 - parent: 30 - uid: 18081 components: - type: Transform - pos: -54.5,-68.5 - parent: 30 - - uid: 18085 - components: - - type: Transform - pos: -57.5,-69.5 + rot: 3.141592653589793 rad + pos: 16.5,13.5 parent: 30 - uid: 18103 components: @@ -130268,10 +128443,37 @@ entities: - type: Transform pos: -81.5,-57.5 parent: 30 - - uid: 18184 + - uid: 18186 components: - type: Transform - pos: -60.5,-69.5 + pos: -61.5,-66.5 + parent: 30 + - uid: 18187 + components: + - type: Transform + pos: -66.5,-66.5 + parent: 30 + - uid: 18205 + components: + - type: Transform + pos: -59.5,-67.5 + parent: 30 + - uid: 18765 + components: + - type: Transform + pos: -52.5,-66.5 + parent: 30 + - uid: 18775 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -65.5,-66.5 + parent: 30 + - uid: 18860 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -23.5,-51.5 parent: 30 - uid: 18925 components: @@ -130283,10 +128485,15 @@ entities: - type: Transform pos: -43.5,-24.5 parent: 30 - - uid: 19765 + - uid: 19784 components: - type: Transform - pos: -36.5,-64.5 + pos: -4.5,-37.5 + parent: 30 + - uid: 19794 + components: + - type: Transform + pos: -10.5,-37.5 parent: 30 - uid: 19854 components: @@ -131153,21 +129360,6 @@ entities: - type: Transform pos: -2.5,84.5 parent: 30 - - uid: 20343 - components: - - type: Transform - pos: -37.5,-64.5 - parent: 30 - - uid: 20396 - components: - - type: Transform - pos: -38.5,-64.5 - parent: 30 - - uid: 20397 - components: - - type: Transform - pos: -39.5,-64.5 - parent: 30 - uid: 20442 components: - type: Transform @@ -131343,11 +129535,6 @@ entities: - type: Transform pos: -27.5,-48.5 parent: 30 - - uid: 21469 - components: - - type: Transform - pos: -40.5,-64.5 - parent: 30 - uid: 21592 components: - type: Transform @@ -131358,291 +129545,6 @@ entities: - type: Transform pos: -40.5,-28.5 parent: 30 - - uid: 22438 - components: - - type: Transform - pos: -41.5,-64.5 - parent: 30 - - uid: 22550 - components: - - type: Transform - pos: -42.5,-64.5 - parent: 30 - - uid: 22551 - components: - - type: Transform - pos: -42.5,-63.5 - parent: 30 - - uid: 22552 - components: - - type: Transform - pos: -42.5,-62.5 - parent: 30 - - uid: 22553 - components: - - type: Transform - pos: -42.5,-61.5 - parent: 30 - - uid: 22554 - components: - - type: Transform - pos: -42.5,-60.5 - parent: 30 - - uid: 22555 - components: - - type: Transform - pos: -42.5,-59.5 - parent: 30 - - uid: 22556 - components: - - type: Transform - pos: -42.5,-58.5 - parent: 30 - - uid: 22557 - components: - - type: Transform - pos: -42.5,-57.5 - parent: 30 - - uid: 22558 - components: - - type: Transform - pos: -42.5,-56.5 - parent: 30 - - uid: 22559 - components: - - type: Transform - pos: -41.5,-56.5 - parent: 30 - - uid: 22560 - components: - - type: Transform - pos: -40.5,-56.5 - parent: 30 - - uid: 22561 - components: - - type: Transform - pos: -39.5,-56.5 - parent: 30 - - uid: 22562 - components: - - type: Transform - pos: -38.5,-56.5 - parent: 30 - - uid: 22563 - components: - - type: Transform - pos: -37.5,-56.5 - parent: 30 - - uid: 22564 - components: - - type: Transform - pos: -36.5,-56.5 - parent: 30 - - uid: 22565 - components: - - type: Transform - pos: -35.5,-56.5 - parent: 30 - - uid: 22566 - components: - - type: Transform - pos: -34.5,-56.5 - parent: 30 - - uid: 22567 - components: - - type: Transform - pos: -33.5,-56.5 - parent: 30 - - uid: 22568 - components: - - type: Transform - pos: -32.5,-56.5 - parent: 30 - - uid: 22569 - components: - - type: Transform - pos: -24.5,-59.5 - parent: 30 - - uid: 22570 - components: - - type: Transform - pos: -24.5,-60.5 - parent: 30 - - uid: 22571 - components: - - type: Transform - pos: -24.5,-61.5 - parent: 30 - - uid: 22572 - components: - - type: Transform - pos: -24.5,-62.5 - parent: 30 - - uid: 22573 - components: - - type: Transform - pos: -24.5,-63.5 - parent: 30 - - uid: 22574 - components: - - type: Transform - pos: -24.5,-64.5 - parent: 30 - - uid: 22575 - components: - - type: Transform - pos: -25.5,-64.5 - parent: 30 - - uid: 22576 - components: - - type: Transform - pos: -26.5,-64.5 - parent: 30 - - uid: 22577 - components: - - type: Transform - pos: -27.5,-64.5 - parent: 30 - - uid: 22578 - components: - - type: Transform - pos: -28.5,-64.5 - parent: 30 - - uid: 22579 - components: - - type: Transform - pos: -29.5,-64.5 - parent: 30 - - uid: 22580 - components: - - type: Transform - pos: -30.5,-64.5 - parent: 30 - - uid: 22581 - components: - - type: Transform - pos: -31.5,-64.5 - parent: 30 - - uid: 22582 - components: - - type: Transform - pos: -31.5,-56.5 - parent: 30 - - uid: 22583 - components: - - type: Transform - pos: -30.5,-56.5 - parent: 30 - - uid: 22584 - components: - - type: Transform - pos: -29.5,-56.5 - parent: 30 - - uid: 22585 - components: - - type: Transform - pos: -28.5,-56.5 - parent: 30 - - uid: 22586 - components: - - type: Transform - pos: -27.5,-56.5 - parent: 30 - - uid: 22587 - components: - - type: Transform - pos: -26.5,-56.5 - parent: 30 - - uid: 22588 - components: - - type: Transform - pos: -25.5,-56.5 - parent: 30 - - uid: 22589 - components: - - type: Transform - pos: -24.5,-56.5 - parent: 30 - - uid: 22590 - components: - - type: Transform - pos: -24.5,-57.5 - parent: 30 - - uid: 22591 - components: - - type: Transform - pos: -23.5,-59.5 - parent: 30 - - uid: 22592 - components: - - type: Transform - pos: -23.5,-56.5 - parent: 30 - - uid: 22593 - components: - - type: Transform - pos: -22.5,-56.5 - parent: 30 - - uid: 22594 - components: - - type: Transform - pos: -21.5,-56.5 - parent: 30 - - uid: 22595 - components: - - type: Transform - pos: -21.5,-57.5 - parent: 30 - - uid: 22596 - components: - - type: Transform - pos: -21.5,-59.5 - parent: 30 - - uid: 22597 - components: - - type: Transform - pos: -22.5,-59.5 - parent: 30 - - uid: 22639 - components: - - type: Transform - pos: -28.5,-59.5 - parent: 30 - - uid: 22640 - components: - - type: Transform - pos: -28.5,-60.5 - parent: 30 - - uid: 22641 - components: - - type: Transform - pos: -28.5,-61.5 - parent: 30 - - uid: 22642 - components: - - type: Transform - pos: -28.5,-62.5 - parent: 30 - - uid: 22643 - components: - - type: Transform - pos: -28.5,-63.5 - parent: 30 - - uid: 22644 - components: - - type: Transform - pos: -28.5,-57.5 - parent: 30 - - uid: 22649 - components: - - type: Transform - pos: -33.5,-63.5 - parent: 30 - - uid: 22650 - components: - - type: Transform - pos: -33.5,-57.5 - parent: 30 - proto: WallSolid entities: - uid: 3 @@ -132710,6 +130612,11 @@ entities: - type: Transform pos: -8.5,17.5 parent: 30 + - uid: 801 + components: + - type: Transform + pos: 14.5,-25.5 + parent: 30 - uid: 830 components: - type: Transform @@ -134008,6 +131915,11 @@ entities: rot: -1.5707963267948966 rad pos: -1.5,-5.5 parent: 30 + - uid: 6642 + components: + - type: Transform + pos: -14.5,-53.5 + parent: 30 - uid: 6732 components: - type: Transform @@ -134159,6 +132071,11 @@ entities: - type: Transform pos: -37.5,-19.5 parent: 30 + - uid: 7221 + components: + - type: Transform + pos: -0.5,-37.5 + parent: 30 - uid: 7234 components: - type: Transform @@ -134933,16 +132850,6 @@ entities: - type: Transform pos: 9.5,-30.5 parent: 30 - - uid: 8525 - components: - - type: Transform - pos: 12.5,-26.5 - parent: 30 - - uid: 8526 - components: - - type: Transform - pos: 9.5,-26.5 - parent: 30 - uid: 8534 components: - type: Transform @@ -135004,50 +132911,85 @@ entities: - type: Transform pos: 3.5,-35.5 parent: 30 - - uid: 9288 - components: - - type: Transform - pos: -4.5,-37.5 - parent: 30 - - uid: 9289 - components: - - type: Transform - pos: -0.5,-37.5 - parent: 30 - uid: 9299 components: - type: Transform pos: -42.5,-0.5 parent: 30 - - uid: 9324 + - uid: 9482 components: - type: Transform - pos: -10.5,-37.5 + pos: -6.5,-51.5 parent: 30 - - uid: 9348 + - uid: 9483 components: - type: Transform - pos: -14.5,-28.5 + pos: -5.5,-46.5 parent: 30 - - uid: 9367 + - uid: 9485 components: - type: Transform - pos: -20.5,-39.5 + pos: -9.5,-46.5 parent: 30 - - uid: 9370 + - uid: 9486 components: - type: Transform - pos: -20.5,-44.5 + pos: -6.5,-49.5 parent: 30 - - uid: 9450 + - uid: 9488 components: - type: Transform - pos: -14.5,-30.5 + pos: -13.5,-46.5 parent: 30 - - uid: 9451 + - uid: 9489 components: - type: Transform - pos: -14.5,-31.5 + pos: 3.5,-42.5 + parent: 30 + - uid: 9496 + components: + - type: Transform + pos: -4.5,-42.5 + parent: 30 + - uid: 9497 + components: + - type: Transform + pos: -3.5,-42.5 + parent: 30 + - uid: 9524 + components: + - type: Transform + pos: -6.5,-46.5 + parent: 30 + - uid: 9525 + components: + - type: Transform + pos: -2.5,-42.5 + parent: 30 + - uid: 9526 + components: + - type: Transform + pos: -19.5,-45.5 + parent: 30 + - uid: 9527 + components: + - type: Transform + pos: -6.5,-50.5 + parent: 30 + - uid: 9529 + components: + - type: Transform + pos: -14.5,-46.5 + parent: 30 + - uid: 9530 + components: + - type: Transform + pos: -0.5,-38.5 + parent: 30 + - uid: 9634 + components: + - type: Transform + pos: -57.5,-65.5 parent: 30 - uid: 9684 components: @@ -135084,6 +133026,41 @@ entities: - type: Transform pos: 29.5,43.5 parent: 30 + - uid: 9870 + components: + - type: Transform + pos: -20.5,-46.5 + parent: 30 + - uid: 9871 + components: + - type: Transform + pos: -20.5,-48.5 + parent: 30 + - uid: 9872 + components: + - type: Transform + pos: -20.5,-47.5 + parent: 30 + - uid: 9873 + components: + - type: Transform + pos: -25.5,-45.5 + parent: 30 + - uid: 9874 + components: + - type: Transform + pos: -21.5,-45.5 + parent: 30 + - uid: 9879 + components: + - type: Transform + pos: -20.5,-45.5 + parent: 30 + - uid: 9883 + components: + - type: Transform + pos: -6.5,-47.5 + parent: 30 - uid: 9916 components: - type: Transform @@ -135164,10 +133141,135 @@ entities: - type: Transform pos: -9.5,-15.5 parent: 30 - - uid: 11019 + - uid: 9959 components: - type: Transform - pos: -0.5,-38.5 + pos: -7.5,-46.5 + parent: 30 + - uid: 9961 + components: + - type: Transform + pos: -8.5,-46.5 + parent: 30 + - uid: 9962 + components: + - type: Transform + pos: -10.5,-46.5 + parent: 30 + - uid: 9963 + components: + - type: Transform + pos: -3.5,-46.5 + parent: 30 + - uid: 10011 + components: + - type: Transform + pos: 14.5,-22.5 + parent: 30 + - uid: 10135 + components: + - type: Transform + pos: -6.5,-48.5 + parent: 30 + - uid: 10228 + components: + - type: Transform + pos: -57.5,-64.5 + parent: 30 + - uid: 10236 + components: + - type: Transform + pos: -65.5,-61.5 + parent: 30 + - uid: 10237 + components: + - type: Transform + pos: -59.5,-61.5 + parent: 30 + - uid: 10546 + components: + - type: Transform + pos: -3.5,-45.5 + parent: 30 + - uid: 10548 + components: + - type: Transform + pos: -4.5,-46.5 + parent: 30 + - uid: 10549 + components: + - type: Transform + pos: -0.5,-42.5 + parent: 30 + - uid: 10753 + components: + - type: Transform + pos: -3.5,-43.5 + parent: 30 + - uid: 10756 + components: + - type: Transform + pos: -14.5,-52.5 + parent: 30 + - uid: 10757 + components: + - type: Transform + pos: -14.5,-51.5 + parent: 30 + - uid: 10758 + components: + - type: Transform + pos: -14.5,-50.5 + parent: 30 + - uid: 10759 + components: + - type: Transform + pos: 1.5,-42.5 + parent: 30 + - uid: 11060 + components: + - type: Transform + pos: -6.5,-52.5 + parent: 30 + - uid: 11071 + components: + - type: Transform + pos: -14.5,-45.5 + parent: 30 + - uid: 11072 + components: + - type: Transform + pos: -14.5,-49.5 + parent: 30 + - uid: 11074 + components: + - type: Transform + pos: -14.5,-47.5 + parent: 30 + - uid: 11075 + components: + - type: Transform + pos: -14.5,-48.5 + parent: 30 + - uid: 11089 + components: + - type: Transform + pos: -15.5,-49.5 + parent: 30 + - uid: 11090 + components: + - type: Transform + pos: -15.5,-45.5 + parent: 30 + - uid: 11092 + components: + - type: Transform + pos: -8.5,-42.5 + parent: 30 + - uid: 11141 + components: + - type: Transform + pos: -9.5,-42.5 parent: 30 - uid: 11198 components: @@ -135189,10 +133291,15 @@ entities: - type: Transform pos: 29.5,-0.5 parent: 30 - - uid: 11339 + - uid: 11259 components: - type: Transform - pos: -14.5,-38.5 + pos: -66.5,-61.5 + parent: 30 + - uid: 11261 + components: + - type: Transform + pos: -63.5,-61.5 parent: 30 - uid: 11352 components: @@ -135204,6 +133311,16 @@ entities: - type: Transform pos: 2.5,-7.5 parent: 30 + - uid: 11457 + components: + - type: Transform + pos: -67.5,-61.5 + parent: 30 + - uid: 11459 + components: + - type: Transform + pos: -60.5,-61.5 + parent: 30 - uid: 11597 components: - type: Transform @@ -135339,10 +133456,16 @@ entities: - type: Transform pos: -43.5,-17.5 parent: 30 - - uid: 12659 + - uid: 12636 components: - type: Transform - pos: 20.5,13.5 + pos: -58.5,-61.5 + parent: 30 + - uid: 12638 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -64.5,-61.5 parent: 30 - uid: 12660 components: @@ -135701,6 +133824,31 @@ entities: - type: Transform pos: 21.5,54.5 parent: 30 + - uid: 13983 + components: + - type: Transform + pos: -20.5,-49.5 + parent: 30 + - uid: 13985 + components: + - type: Transform + pos: -20.5,-50.5 + parent: 30 + - uid: 14480 + components: + - type: Transform + pos: -67.5,-63.5 + parent: 30 + - uid: 14481 + components: + - type: Transform + pos: -67.5,-64.5 + parent: 30 + - uid: 14513 + components: + - type: Transform + pos: -54.5,-59.5 + parent: 30 - uid: 14725 components: - type: Transform @@ -135731,6 +133879,11 @@ entities: - type: Transform pos: 14.5,49.5 parent: 30 + - uid: 14808 + components: + - type: Transform + pos: -19.5,-49.5 + parent: 30 - uid: 14966 components: - type: Transform @@ -136259,11 +134412,6 @@ entities: - type: Transform pos: -81.5,-41.5 parent: 30 - - uid: 17544 - components: - - type: Transform - pos: -55.5,-68.5 - parent: 30 - uid: 17569 components: - type: Transform @@ -136274,11 +134422,6 @@ entities: - type: Transform pos: -54.5,-58.5 parent: 30 - - uid: 17685 - components: - - type: Transform - pos: -56.5,-68.5 - parent: 30 - uid: 17686 components: - type: Transform @@ -136414,41 +134557,6 @@ entities: - type: Transform pos: -57.5,-61.5 parent: 30 - - uid: 17723 - components: - - type: Transform - pos: -60.5,-61.5 - parent: 30 - - uid: 17724 - components: - - type: Transform - pos: -61.5,-61.5 - parent: 30 - - uid: 17725 - components: - - type: Transform - pos: -62.5,-61.5 - parent: 30 - - uid: 17726 - components: - - type: Transform - pos: -63.5,-61.5 - parent: 30 - - uid: 17728 - components: - - type: Transform - pos: -65.5,-61.5 - parent: 30 - - uid: 17729 - components: - - type: Transform - pos: -66.5,-61.5 - parent: 30 - - uid: 17730 - components: - - type: Transform - pos: -67.5,-61.5 - parent: 30 - uid: 17731 components: - type: Transform @@ -136459,11 +134567,6 @@ entities: - type: Transform pos: -69.5,-61.5 parent: 30 - - uid: 17734 - components: - - type: Transform - pos: -61.5,-65.5 - parent: 30 - uid: 17736 components: - type: Transform @@ -136579,16 +134682,6 @@ entities: - type: Transform pos: -61.5,-66.5 parent: 30 - - uid: 17775 - components: - - type: Transform - pos: -63.5,-66.5 - parent: 30 - - uid: 17776 - components: - - type: Transform - pos: -62.5,-66.5 - parent: 30 - uid: 17777 components: - type: Transform @@ -136629,11 +134722,6 @@ entities: - type: Transform pos: -66.5,-66.5 parent: 30 - - uid: 17785 - components: - - type: Transform - pos: -61.5,-62.5 - parent: 30 - uid: 17786 components: - type: Transform @@ -136642,22 +134730,12 @@ entities: - uid: 17787 components: - type: Transform - pos: -61.5,-63.5 + pos: -57.5,-62.5 parent: 30 - uid: 17788 components: - type: Transform - pos: -61.5,-64.5 - parent: 30 - - uid: 17790 - components: - - type: Transform - pos: -53.5,-67.5 - parent: 30 - - uid: 17791 - components: - - type: Transform - pos: -53.5,-66.5 + pos: -57.5,-63.5 parent: 30 - uid: 17999 components: @@ -136724,56 +134802,16 @@ entities: - type: Transform pos: -38.5,-30.5 parent: 30 - - uid: 18070 - components: - - type: Transform - pos: -56.5,-62.5 - parent: 30 - - uid: 18071 - components: - - type: Transform - pos: -53.5,-65.5 - parent: 30 - - uid: 18072 - components: - - type: Transform - pos: -53.5,-64.5 - parent: 30 - - uid: 18073 - components: - - type: Transform - pos: -57.5,-68.5 - parent: 30 - - uid: 18074 - components: - - type: Transform - pos: -53.5,-63.5 - parent: 30 - - uid: 18075 - components: - - type: Transform - pos: -53.5,-62.5 - parent: 30 - uid: 18076 components: - type: Transform pos: -54.5,-61.5 parent: 30 - - uid: 18077 - components: - - type: Transform - pos: -54.5,-60.5 - parent: 30 - uid: 18082 components: - type: Transform pos: -61.5,-67.5 parent: 30 - - uid: 18086 - components: - - type: Transform - pos: -64.5,-66.5 - parent: 30 - uid: 18087 components: - type: Transform @@ -136894,21 +134932,11 @@ entities: - type: Transform pos: -76.5,-50.5 parent: 30 - - uid: 18125 - components: - - type: Transform - pos: -61.5,-68.5 - parent: 30 - uid: 18169 components: - type: Transform pos: -71.5,-61.5 parent: 30 - - uid: 18170 - components: - - type: Transform - pos: -71.5,-59.5 - parent: 30 - uid: 18171 components: - type: Transform @@ -137002,21 +135030,6 @@ entities: - type: Transform pos: -43.5,2.5 parent: 30 - - uid: 22216 - components: - - type: Transform - pos: -60.5,-68.5 - parent: 30 - - uid: 22645 - components: - - type: Transform - pos: -27.5,-60.5 - parent: 30 - - uid: 22646 - components: - - type: Transform - pos: -25.5,-60.5 - parent: 30 - proto: WallSolidRust entities: - uid: 223 @@ -137363,6 +135376,13 @@ entities: parent: 30 - type: Physics canCollide: False +- proto: WardrobeAtmosphericsFilled + entities: + - uid: 8418 + components: + - type: Transform + pos: 16.5,-20.5 + parent: 30 - proto: WardrobeBlackFilled entities: - uid: 9942 @@ -137518,29 +135538,16 @@ entities: - 0 - proto: WardrobeEngineeringFilled entities: - - uid: 8228 + - uid: 7112 components: - type: Transform - pos: -9.5,-38.5 + pos: -7.5,-41.5 + parent: 30 + - uid: 7148 + components: + - type: Transform + pos: -5.5,-41.5 parent: 30 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 3.4430928 - - 12.952587 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - proto: WardrobeFormal entities: - uid: 19618 @@ -137932,6 +135939,11 @@ entities: - type: Transform pos: -51.5,69.5 parent: 30 + - uid: 14476 + components: + - type: Transform + pos: -55.5,-65.5 + parent: 30 - uid: 16216 components: - type: Transform @@ -137952,11 +135964,6 @@ entities: - type: Transform pos: -60.5,-20.5 parent: 30 - - uid: 18786 - components: - - type: Transform - pos: -62.5,-65.5 - parent: 30 - uid: 19532 components: - type: Transform @@ -137964,16 +135971,16 @@ entities: parent: 30 - proto: WaterTankHighCapacity entities: - - uid: 399 - components: - - type: Transform - pos: -23.5,5.5 - parent: 30 - uid: 452 components: - type: Transform pos: -30.5,10.5 parent: 30 + - uid: 13365 + components: + - type: Transform + pos: -23.5,5.5 + parent: 30 - proto: WaterVaporCanister entities: - uid: 8773 @@ -138058,13 +136065,6 @@ entities: parent: 30 - type: Physics canCollide: False - - uid: 20994 - components: - - type: Transform - pos: -15.5,-34.5 - parent: 30 - - type: Physics - canCollide: False - uid: 20998 components: - type: Transform @@ -138214,10 +136214,10 @@ entities: parent: 30 - proto: WelderIndustrialAdvanced entities: - - uid: 9596 + - uid: 13977 components: - type: Transform - pos: -17.366865,-29.492481 + pos: -8.390148,-47.43978 parent: 30 - proto: WelderMini entities: @@ -138253,6 +136253,11 @@ entities: - type: Transform pos: 9.5,-25.5 parent: 30 + - uid: 10147 + components: + - type: Transform + pos: -54.5,-65.5 + parent: 30 - uid: 14811 components: - type: Transform @@ -138268,11 +136273,6 @@ entities: - type: Transform pos: -52.5,39.5 parent: 30 - - uid: 18787 - components: - - type: Transform - pos: -63.5,-65.5 - parent: 30 - uid: 19813 components: - type: Transform @@ -138335,12 +136335,6 @@ entities: - type: Transform pos: 4.5,-4.5 parent: 30 - - uid: 12696 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 14.5,13.5 - parent: 30 - uid: 20484 components: - type: Transform @@ -138520,10 +136514,11 @@ entities: - type: Transform pos: 18.5,24.5 parent: 30 - - uid: 12697 + - uid: 13241 components: - type: Transform - pos: 14.5,13.5 + rot: -1.5707963267948966 rad + pos: 16.5,15.5 parent: 30 - uid: 21708 components: @@ -138610,6 +136605,14 @@ entities: rot: 1.5707963267948966 rad pos: -49.5,52.5 parent: 30 +- proto: WindoorSecureServiceLocked + entities: + - uid: 11458 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -65.5,-62.5 + parent: 30 - proto: Window entities: - uid: 5 @@ -138877,16 +136880,6 @@ entities: - type: Transform pos: 10.5,-6.5 parent: 30 - - uid: 9368 - components: - - type: Transform - pos: -20.5,-40.5 - parent: 30 - - uid: 9369 - components: - - type: Transform - pos: -20.5,-43.5 - parent: 30 - uid: 9837 components: - type: Transform @@ -139427,30 +137420,6 @@ entities: - type: Transform pos: -23.5,4.5 parent: 30 - - uid: 9976 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -23.5,4.5 - parent: 30 - - uid: 11259 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -24.5,4.5 - parent: 30 - - uid: 11260 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -25.5,4.5 - parent: 30 - - uid: 11261 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -26.5,4.5 - parent: 30 - uid: 12728 components: - type: Transform @@ -139499,6 +137468,24 @@ entities: rot: 1.5707963267948966 rad pos: 42.5,41.5 parent: 30 + - uid: 14051 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 16.5,16.5 + parent: 30 + - uid: 14329 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 16.5,14.5 + parent: 30 + - uid: 14356 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 52.5,23.5 + parent: 30 - uid: 15152 components: - type: Transform @@ -139866,30 +137853,6 @@ entities: rot: 1.5707963267948966 rad pos: -35.5,-34.5 parent: 30 - - uid: 21191 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -27.5,4.5 - parent: 30 - - uid: 21451 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -28.5,4.5 - parent: 30 - - uid: 21452 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -23.5,4.5 - parent: 30 - - uid: 21453 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -28.5,4.5 - parent: 30 - uid: 22456 components: - type: Transform @@ -139960,11 +137923,6 @@ entities: - type: Transform pos: -14.474685,-24.503119 parent: 30 - - uid: 9483 - components: - - type: Transform - pos: -17.403442,-29.451271 - parent: 30 - uid: 18182 components: - type: Transform From da5918c9519de6c32c9e9082dee5e2bad3774caa Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Mon, 29 Jul 2024 08:19:43 +0200 Subject: [PATCH 002/422] FINALLY FIX APPROVER IN CARGO INVOICE!!! (#29690) * OH DEAR LORD I WASTED 2 HOURS ON THIS STUPID SHIT!!! * change some logic --- Content.Server/Cargo/Systems/CargoSystem.Orders.cs | 14 +++++++------- Content.Shared/Cargo/CargoOrderData.cs | 2 +- .../Locale/en-US/cargo/cargo-console-component.ftl | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs index dd408755e6..7a2a3d474a 100644 --- a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs +++ b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs @@ -177,6 +177,10 @@ namespace Content.Server.Cargo.Systems RaiseLocalEvent(ref ev); ev.FulfillmentEntity ??= station.Value; + _idCardSystem.TryFindIdCard(player, out var idCard); + // ReSharper disable once ConditionalAccessQualifierIsNonNullableAccordingToAPIContract + order.SetApproverData(idCard.Comp?.FullName, idCard.Comp?.JobTitle); + if (!ev.Handled) { ev.FulfillmentEntity = TryFulfillOrder((station.Value, stationData), order, orderDatabase); @@ -189,18 +193,13 @@ namespace Content.Server.Cargo.Systems } } - _idCardSystem.TryFindIdCard(player, out var idCard); - // ReSharper disable once ConditionalAccessQualifierIsNonNullableAccordingToAPIContract - order.SetApproverData(idCard.Comp?.FullName, idCard.Comp?.JobTitle); + order.Approved = true; _audio.PlayPvs(component.ConfirmSound, uid); - var approverName = idCard.Comp?.FullName ?? Loc.GetString("access-reader-unknown-id"); - var approverJob = idCard.Comp?.JobTitle ?? Loc.GetString("access-reader-unknown-id"); var message = Loc.GetString("cargo-console-unlock-approved-order-broadcast", ("productName", Loc.GetString(order.ProductName)), ("orderAmount", order.OrderQuantity), - ("approverName", approverName), - ("approverJob", approverJob), + ("approver", order.Approver ?? string.Empty), ("cost", cost)); _radio.SendRadioMessage(uid, message, component.AnnouncementChannel, uid, escapeMarkup: false); ConsolePopup(args.Actor, Loc.GetString("cargo-console-trade-station", ("destination", MetaData(ev.FulfillmentEntity.Value).EntityName))); @@ -421,6 +420,7 @@ namespace Content.Server.Cargo.Systems // Approve it now order.SetApproverData(dest, sender); + order.Approved = true; // Log order addition _adminLogger.Add(LogType.Action, LogImpact.Low, diff --git a/Content.Shared/Cargo/CargoOrderData.cs b/Content.Shared/Cargo/CargoOrderData.cs index ce05d92236..5645cc454d 100644 --- a/Content.Shared/Cargo/CargoOrderData.cs +++ b/Content.Shared/Cargo/CargoOrderData.cs @@ -48,7 +48,7 @@ namespace Content.Shared.Cargo // public int RequesterId; [DataField] public string Reason { get; private set; } - public bool Approved => Approver is not null; + public bool Approved; [DataField] public string? Approver; diff --git a/Resources/Locale/en-US/cargo/cargo-console-component.ftl b/Resources/Locale/en-US/cargo/cargo-console-component.ftl index 3c032488b5..7114924c02 100644 --- a/Resources/Locale/en-US/cargo/cargo-console-component.ftl +++ b/Resources/Locale/en-US/cargo/cargo-console-component.ftl @@ -30,7 +30,7 @@ cargo-console-snip-snip = Order trimmed to capacity cargo-console-insufficient-funds = Insufficient funds (require {$cost}) cargo-console-unfulfilled = No room to fulfill order cargo-console-trade-station = Sent to {$destination} -cargo-console-unlock-approved-order-broadcast = [bold]{$productName} x{$orderAmount}[/bold], which cost [bold]{$cost}[/bold], was approved by [bold]{$approverName}, {$approverJob}[/bold] +cargo-console-unlock-approved-order-broadcast = [bold]{$productName} x{$orderAmount}[/bold], which cost [bold]{$cost}[/bold], was approved by [bold]{$approver}[/bold] cargo-console-paper-print-name = Order #{$orderNumber} cargo-console-paper-print-text = From 4a13212bc331616ae1a788c03f67624480521ebe Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 29 Jul 2024 06:20:54 +0000 Subject: [PATCH 003/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 49a49dfc7b..f6f8c795f3 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: FungiFellow - changes: - - message: Syndi-Cats now have a Wideswing, 80% Explosion Resist, 6/6/15 Pierce/Slash/Structural - and step over glass shards with trained feline agility. - type: Tweak - id: 6497 - time: '2024-04-29T17:09:30.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27408 - author: ShadowCommander changes: - message: Fixed microwave construction not creating a microwave on completion. @@ -3781,3 +3773,10 @@ id: 6996 time: '2024-07-28T08:32:27.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30424 +- author: lzk228 + changes: + - message: Fixed permanent absence of the approver string in cargo invoice. + type: Fix + id: 6997 + time: '2024-07-29T06:19:43.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29690 From c4ef5e4205f8bcd01e8559c82148ddd9e8e5cbc5 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Mon, 29 Jul 2024 08:31:05 +0200 Subject: [PATCH 004/422] Update marathon (#30442) --- Resources/Maps/marathon.yml | 612 ++++++++++++++++++++++++++++-------- 1 file changed, 485 insertions(+), 127 deletions(-) diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml index 0bb7ea2aed..2d0f821d20 100644 --- a/Resources/Maps/marathon.yml +++ b/Resources/Maps/marathon.yml @@ -608,6 +608,9 @@ entities: 2919: 2,-44 2920: 3,-44 2921: 4,-44 + 3045: 4,-51 + 3049: -4,-48 + 3050: -3,-48 - node: color: '#FFFFFFFF' id: BotGreyscale @@ -648,6 +651,11 @@ entities: 2265: 39,9 2896: -14,-38 2897: -12,-38 + 3035: -5,-54 + 3036: -4,-54 + 3046: -4,-50 + 3047: 4,-49 + 3048: 4,-50 - node: color: '#FFFFFFFF' id: BrickTileDarkBox @@ -4345,7 +4353,6 @@ entities: decals: 2863: 14,-20 2864: 14,-19 - 2933: -3,-52 - node: color: '#FFFFFFFF' id: WarnCornerSmallNW @@ -4629,7 +4636,6 @@ entities: 2423: -47,-10 2424: -47,-9 2880: -14,-52 - 2926: 1,-51 3007: -19,-54 3008: -19,-55 - node: @@ -4675,8 +4681,6 @@ entities: 2928: -1,-52 2929: 0,-52 2930: 0,-52 - 2935: -4,-48 - 2936: -3,-48 2937: -2,-48 2938: -1,-48 2939: 0,-48 @@ -4685,6 +4689,8 @@ entities: 2942: 3,-48 2943: 4,-48 3004: -18,-53 + 3051: -4,-48 + 3052: -3,-48 - node: angle: -3.141592653589793 rad color: '#FFFFFFFF' @@ -10959,7 +10965,7 @@ entities: pos: -20.5,-5.5 parent: 30 - type: Door - secondsUntilStateChange: -17234.736 + secondsUntilStateChange: -19125.69 state: Opening - type: DeviceLinkSource lastSignals: @@ -59650,34 +59656,11 @@ entities: parent: 30 - proto: Emitter entities: - - uid: 194 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -10.5,-71.5 - parent: 30 - - uid: 9818 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -13.5,-74.5 - parent: 30 - uid: 10654 components: - type: Transform pos: -13.5,-60.5 parent: 30 - - uid: 11088 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -24.5,-63.5 - parent: 30 - - uid: 11272 - components: - - type: Transform - pos: -21.5,-60.5 - parent: 30 - uid: 13319 components: - type: Transform @@ -63473,6 +63456,20 @@ entities: parent: 30 - type: AtmosPipeColor color: '#947507FF' + - uid: 9218 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-56.5 + parent: 30 + - uid: 9293 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-56.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' - uid: 12869 components: - type: Transform @@ -64168,6 +64165,14 @@ entities: parent: 30 - type: AtmosPipeColor color: '#EB9834FF' + - uid: 9213 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,-55.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' - uid: 9262 components: - type: Transform @@ -64175,6 +64180,14 @@ entities: parent: 30 - type: AtmosPipeColor color: '#FF0000FF' + - uid: 9295 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,-57.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' - uid: 9428 components: - type: Transform @@ -64244,6 +64257,14 @@ entities: parent: 30 - type: AtmosPipeColor color: '#EB9834FF' + - uid: 9790 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,-57.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' - uid: 9813 components: - type: Transform @@ -64307,6 +64328,14 @@ entities: parent: 30 - type: AtmosPipeColor color: '#FF0000FF' + - uid: 11130 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-52.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' - uid: 11167 components: - type: Transform @@ -64330,6 +64359,14 @@ entities: parent: 30 - type: AtmosPipeColor color: '#FF0000FF' + - uid: 11272 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,-49.5 + parent: 30 + - type: AtmosPipeColor + color: '#03FCD3FF' - uid: 11668 components: - type: Transform @@ -64813,6 +64850,74 @@ entities: parent: 30 - type: AtmosPipeColor color: '#FF0000FF' + - uid: 20642 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,-51.5 + parent: 30 + - type: AtmosPipeColor + color: '#03FCD3FF' + - uid: 20645 + components: + - type: Transform + pos: 7.5,-49.5 + parent: 30 + - type: AtmosPipeColor + color: '#03FCD3FF' + - uid: 20647 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,-52.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 20654 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-50.5 + parent: 30 + - type: AtmosPipeColor + color: '#03FCD3FF' + - uid: 20663 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-51.5 + parent: 30 + - type: AtmosPipeColor + color: '#03FCD3FF' + - uid: 20667 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,-50.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 20671 + components: + - type: Transform + pos: -1.5,-49.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 20672 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,-48.5 + parent: 30 + - uid: 20674 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-49.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' - uid: 21262 components: - type: Transform @@ -74307,39 +74412,14 @@ entities: parent: 30 - type: AtmosPipeColor color: '#EB9834FF' - - uid: 9174 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 4.5,-48.5 - parent: 30 - - type: AtmosPipeColor - color: '#EB9834FF' - - uid: 9182 - components: - - type: Transform - pos: 1.5,-54.5 - parent: 30 - - uid: 9213 - components: - - type: Transform - pos: -3.5,-54.5 - parent: 30 - - uid: 9216 - components: - - type: Transform - pos: -4.5,-54.5 - parent: 30 - uid: 9217 components: - type: Transform - pos: 2.5,-54.5 - parent: 30 - - uid: 9218 - components: - - type: Transform - pos: 3.5,-54.5 + rot: 3.141592653589793 rad + pos: -3.5,-55.5 parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' - uid: 9261 components: - type: Transform @@ -74347,23 +74427,14 @@ entities: parent: 30 - type: AtmosPipeColor color: '#0000FFFF' - - uid: 9293 - components: - - type: Transform - pos: -2.5,-54.5 - parent: 30 - uid: 9294 components: - type: Transform rot: 1.5707963267948966 rad pos: 5.5,-49.5 parent: 30 - - uid: 9295 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 5.5,-50.5 - parent: 30 + - type: AtmosPipeColor + color: '#03FCD3FF' - uid: 9320 components: - type: Transform @@ -74542,12 +74613,6 @@ entities: parent: 30 - type: AtmosPipeColor color: '#0000FFFF' - - uid: 9651 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 5.5,-51.5 - parent: 30 - uid: 9670 components: - type: Transform @@ -75136,6 +75201,14 @@ entities: parent: 30 - type: AtmosPipeColor color: '#0000FFFF' + - uid: 9966 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-54.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' - uid: 9979 components: - type: Transform @@ -75597,6 +75670,14 @@ entities: parent: 30 - type: AtmosPipeColor color: '#EB9834FF' + - uid: 11088 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-54.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' - uid: 11100 components: - type: Transform @@ -78735,6 +78816,14 @@ entities: parent: 30 - type: AtmosPipeColor color: '#FF0000FF' + - uid: 13955 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-49.5 + parent: 30 + - type: AtmosPipeColor + color: '#03FCD3FF' - uid: 13956 components: - type: Transform @@ -81221,6 +81310,103 @@ entities: parent: 30 - type: AtmosPipeColor color: '#0000FFFF' + - uid: 20640 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,-52.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 20641 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,-52.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 20643 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,-51.5 + parent: 30 + - type: AtmosPipeColor + color: '#03FCD3FF' + - uid: 20646 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-51.5 + parent: 30 + - type: AtmosPipeColor + color: '#03FCD3FF' + - uid: 20650 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-52.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 20651 + components: + - type: Transform + pos: 3.5,-54.5 + parent: 30 + - uid: 20652 + components: + - type: Transform + pos: 2.5,-54.5 + parent: 30 + - uid: 20658 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-51.5 + parent: 30 + - type: AtmosPipeColor + color: '#03FCD3FF' + - uid: 20659 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,-49.5 + parent: 30 + - type: AtmosPipeColor + color: '#03FCD3FF' + - uid: 20660 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,-51.5 + parent: 30 + - type: AtmosPipeColor + color: '#03FCD3FF' + - uid: 20661 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,-51.5 + parent: 30 + - type: AtmosPipeColor + color: '#03FCD3FF' + - uid: 20662 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,-49.5 + parent: 30 + - type: AtmosPipeColor + color: '#03FCD3FF' + - uid: 20669 + components: + - type: Transform + pos: -3.5,-51.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' - uid: 21264 components: - type: Transform @@ -83338,6 +83524,13 @@ entities: parent: 30 - type: AtmosPipeColor color: '#FF0000FF' + - uid: 9353 + components: + - type: Transform + pos: 3.5,-49.5 + parent: 30 + - type: AtmosPipeColor + color: '#03FCD3FF' - uid: 9444 components: - type: Transform @@ -83422,6 +83615,14 @@ entities: parent: 30 - type: AtmosPipeColor color: '#0000FFFF' + - uid: 9818 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,-55.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' - uid: 9847 components: - type: Transform @@ -84425,6 +84626,20 @@ entities: parent: 30 - type: AtmosPipeColor color: '#0000FFFF' + - uid: 20668 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,-50.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 20673 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,-48.5 + parent: 30 - uid: 22014 components: - type: Transform @@ -84526,6 +84741,24 @@ entities: rot: 1.5707963267948966 rad pos: -5.5,-8.5 parent: 30 + - uid: 20655 + components: + - type: Transform + pos: -3.5,-47.5 + parent: 30 + - uid: 20656 + components: + - type: Transform + pos: -2.5,-47.5 + parent: 30 + - uid: 20657 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-50.5 + parent: 30 + - type: AtmosPipeColor + color: '#03FCD3FF' - proto: GasPressurePump entities: - uid: 337 @@ -84620,6 +84853,12 @@ entities: parent: 30 - type: AtmosPipeColor color: '#EB9834FF' + - uid: 9182 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-48.5 + parent: 30 - uid: 12922 components: - type: Transform @@ -84631,6 +84870,13 @@ entities: - type: Transform pos: 38.5,10.5 parent: 30 + - uid: 20670 + components: + - type: Transform + pos: -3.5,-49.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' - proto: GasThermoMachineFreezer entities: - uid: 482 @@ -84705,6 +84951,25 @@ entities: parent: 30 - proto: GasValve entities: + - uid: 20648 + components: + - type: Transform + pos: -4.5,-53.5 + parent: 30 + - type: GasValve + open: False + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 20649 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-53.5 + parent: 30 + - type: GasValve + open: False + - type: AtmosPipeColor + color: '#FF0000FF' - uid: 21274 components: - type: MetaData @@ -87594,17 +87859,37 @@ entities: color: '#FF0000FF' - proto: GasVolumePump entities: - - uid: 9790 + - uid: 9216 components: - type: Transform - pos: 0.5,-49.5 + pos: -5.5,-56.5 parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 9373 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,-51.5 + parent: 30 + - type: AtmosPipeColor + color: '#03FCD3FF' - uid: 10044 components: - type: Transform rot: 3.141592653589793 rad pos: -1.5,-51.5 parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 20653 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-49.5 + parent: 30 + - type: AtmosPipeColor + color: '#03FCD3FF' - proto: GeneratorRTG entities: - uid: 2402 @@ -87704,6 +87989,12 @@ entities: - type: Transform pos: -66.5,-52.5 parent: 30 + - uid: 194 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-54.5 + parent: 30 - uid: 317 components: - type: Transform @@ -88861,6 +89152,12 @@ entities: - type: Transform pos: -60.5,5.5 parent: 30 + - uid: 4893 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-54.5 + parent: 30 - uid: 5018 components: - type: Transform @@ -90152,6 +90449,12 @@ entities: - type: Transform pos: -1.5,-31.5 parent: 30 + - uid: 9174 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,-54.5 + parent: 30 - uid: 9185 components: - type: Transform @@ -90667,6 +90970,12 @@ entities: rot: -1.5707963267948966 rad pos: -12.5,-32.5 parent: 30 + - uid: 11136 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-54.5 + parent: 30 - uid: 11137 components: - type: Transform @@ -91196,6 +91505,12 @@ entities: - type: Transform pos: 40.5,36.5 parent: 30 + - uid: 13954 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-54.5 + parent: 30 - uid: 13973 components: - type: Transform @@ -93490,6 +93805,36 @@ entities: - type: Transform pos: -36.5,-36.5 parent: 30 + - uid: 20664 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-54.5 + parent: 30 + - uid: 20666 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,-51.5 + parent: 30 + - uid: 20675 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,-50.5 + parent: 30 + - uid: 20676 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,-49.5 + parent: 30 + - uid: 20677 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,-48.5 + parent: 30 - uid: 20969 components: - type: Transform @@ -94289,6 +94634,29 @@ entities: - type: Transform pos: -43.530403,66.65333 parent: 30 +- proto: HeatExchanger + entities: + - uid: 9651 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-56.5 + parent: 30 + - uid: 11122 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-56.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF0000FF' + - uid: 20644 + components: + - type: Transform + pos: 7.5,-50.5 + parent: 30 + - type: AtmosPipeColor + color: '#03FCD3FF' - proto: HighSecCommandLocked entities: - uid: 2128 @@ -104763,6 +105131,11 @@ entities: parent: 30 - type: ApcPowerReceiver powerLoad: 0 + - uid: 20665 + components: + - type: Transform + pos: 6.5,-44.5 + parent: 30 - uid: 21112 components: - type: Transform @@ -106176,12 +106549,6 @@ entities: parent: 30 - proto: ReinforcedPlasmaWindow entities: - - uid: 4893 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 2.5,-54.5 - parent: 30 - uid: 8537 components: - type: Transform @@ -106259,24 +106626,6 @@ entities: - type: Transform pos: 24.5,-22.5 parent: 30 - - uid: 11122 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,-54.5 - parent: 30 - - uid: 11130 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,-54.5 - parent: 30 - - uid: 11136 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -3.5,-54.5 - parent: 30 - uid: 12898 components: - type: Transform @@ -106308,18 +106657,6 @@ entities: - type: Transform pos: 35.5,14.5 parent: 30 - - uid: 13954 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -4.5,-54.5 - parent: 30 - - uid: 13955 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 3.5,-54.5 - parent: 30 - uid: 17012 components: - type: Transform @@ -106340,6 +106677,42 @@ entities: - type: Transform pos: -59.5,57.5 parent: 30 + - uid: 20678 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,-54.5 + parent: 30 + - uid: 20679 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-54.5 + parent: 30 + - uid: 20680 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-54.5 + parent: 30 + - uid: 20681 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-54.5 + parent: 30 + - uid: 20682 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-54.5 + parent: 30 + - uid: 20683 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-54.5 + parent: 30 - proto: ReinforcedWindow entities: - uid: 66 @@ -110246,21 +110619,6 @@ entities: - type: Transform pos: -38.50112,-3.4785028 parent: 30 - - uid: 9353 - components: - - type: Transform - pos: 2.554779,-46.49939 - parent: 30 - - uid: 9373 - components: - - type: Transform - pos: 3.0953474,-46.49939 - parent: 30 - - uid: 9966 - components: - - type: Transform - pos: 3.409225,-46.49939 - parent: 30 - uid: 9977 components: - type: Transform From 14a8e94f1e8bdfa349ec33a8bca98a02e3ab4439 Mon Sep 17 00:00:00 2001 From: Mervill Date: Sun, 28 Jul 2024 23:35:50 -0700 Subject: [PATCH 005/422] Fix punctuation in anchored / unanchored examine text (#30439) fix punctuation in anchored / unachored examine text --- Resources/Locale/en-US/examine/examine-system.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/en-US/examine/examine-system.ftl b/Resources/Locale/en-US/examine/examine-system.ftl index 243ba57257..fae6360e9b 100644 --- a/Resources/Locale/en-US/examine/examine-system.ftl +++ b/Resources/Locale/en-US/examine/examine-system.ftl @@ -6,6 +6,6 @@ examine-system-cant-see-entity = You can't make out whatever that is. examine-verb-name = Basic -examinable-anchored = It is [color=darkgreen]anchored[/color] to the floor +examinable-anchored = It is [color=darkgreen]anchored[/color] to the floor. -examinable-unanchored = It is [color=darkred]unanchored[/color] from the floor +examinable-unanchored = It is [color=darkred]unanchored[/color] from the floor. From 0dd22c31d185a35b7115a1f37aa3644018bbe2cd Mon Sep 17 00:00:00 2001 From: JIPDawg <51352440+JIPDawg@users.noreply.github.com> Date: Sun, 28 Jul 2024 23:49:28 -0700 Subject: [PATCH 006/422] Change unused OpenScoreboardWindow to ToggleRoundEndSummaryWindow and bind it to F9 (#30438) Change unused OpenScoreboardWindow to ToggleRoundEndSummaryWindow --- Resources/keybinds.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/keybinds.yml b/Resources/keybinds.yml index c11f59d17c..0b38a64922 100644 --- a/Resources/keybinds.yml +++ b/Resources/keybinds.yml @@ -455,8 +455,8 @@ binds: - function: OpenDecalSpawnWindow type: State key: F8 -- function: OpenScoreboardWindow - type: State +- function: ToggleRoundEndSummaryWindow + type: Toggle key: F9 - function: OpenSandboxWindow type: State From c586561a9e29d2d7fa825c9aca8d9c71dd753d0a Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 29 Jul 2024 06:50:35 +0000 Subject: [PATCH 007/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index f6f8c795f3..ee7b78158c 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: ShadowCommander - changes: - - message: Fixed microwave construction not creating a microwave on completion. - type: Fix - id: 6498 - time: '2024-04-30T00:19:08.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27500 - author: lzk228 changes: - message: Barozine is removed from hydroponics mutatuions. @@ -3780,3 +3773,10 @@ id: 6997 time: '2024-07-29T06:19:43.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29690 +- author: JIPDawg + changes: + - message: F9 is correctly bound to the Round End Summary window by default now. + type: Fix + id: 6998 + time: '2024-07-29T06:49:28.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30438 From ec19f9f4a9bbc6b57625314ab55a555775c29d81 Mon Sep 17 00:00:00 2001 From: Mervill Date: Mon, 29 Jul 2024 00:28:17 -0700 Subject: [PATCH 008/422] Make the powered examine text fully client predicted (#30441) * Make the powered examine text fully client predicted * switch to using the Entity API for the examine event --- .../Power/EntitySystems/PowerReceiverSystem.cs | 9 ++++++++- .../Power/EntitySystems/PowerReceiverSystem.cs | 16 +++++----------- .../EntitySystems/SharedPowerReceiverSystem.cs | 13 +++++++++++-- 3 files changed, 24 insertions(+), 14 deletions(-) diff --git a/Content.Client/Power/EntitySystems/PowerReceiverSystem.cs b/Content.Client/Power/EntitySystems/PowerReceiverSystem.cs index 4d56592c23..61e20f751c 100644 --- a/Content.Client/Power/EntitySystems/PowerReceiverSystem.cs +++ b/Content.Client/Power/EntitySystems/PowerReceiverSystem.cs @@ -1,6 +1,7 @@ -using Content.Client.Power.Components; +using Content.Client.Power.Components; using Content.Shared.Power.Components; using Content.Shared.Power.EntitySystems; +using Content.Shared.Examine; using Robust.Shared.GameStates; namespace Content.Client.Power.EntitySystems; @@ -10,9 +11,15 @@ public sealed class PowerReceiverSystem : SharedPowerReceiverSystem public override void Initialize() { base.Initialize(); + SubscribeLocalEvent(OnExamined); SubscribeLocalEvent(OnHandleState); } + private void OnExamined(Entity ent, ref ExaminedEvent args) + { + args.PushMarkup(GetExamineText(ent.Comp.Powered)); + } + private void OnHandleState(EntityUid uid, ApcPowerReceiverComponent component, ref ComponentHandleState args) { if (args.Current is not ApcPowerReceiverComponentState state) diff --git a/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs b/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs index 191d3fc4bd..9b15bdfd28 100644 --- a/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs +++ b/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs @@ -46,6 +46,11 @@ namespace Content.Server.Power.EntitySystems _provQuery = GetEntityQuery(); } + private void OnExamined(Entity ent, ref ExaminedEvent args) + { + args.PushMarkup(GetExamineText(ent.Comp.Powered)); + } + private void OnGetVerbs(EntityUid uid, ApcPowerReceiverComponent component, GetVerbsEvent args) { if (!_adminManager.HasAdminFlag(args.User, AdminFlags.Admin)) @@ -61,17 +66,6 @@ namespace Content.Server.Power.EntitySystems }); } - /// - ///Adds some markup to the examine text of whatever object is using this component to tell you if it's powered or not, even if it doesn't have an icon state to do this for you. - /// - private void OnExamined(EntityUid uid, ApcPowerReceiverComponent component, ExaminedEvent args) - { - args.PushMarkup(Loc.GetString("power-receiver-component-on-examine-main", - ("stateText", Loc.GetString( component.Powered - ? "power-receiver-component-on-examine-powered" - : "power-receiver-component-on-examine-unpowered")))); - } - private void OnProviderShutdown(EntityUid uid, ApcPowerProviderComponent component, ComponentShutdown args) { foreach (var receiver in component.LinkedReceivers) diff --git a/Content.Shared/Power/EntitySystems/SharedPowerReceiverSystem.cs b/Content.Shared/Power/EntitySystems/SharedPowerReceiverSystem.cs index be2a9dc3ab..37ac751889 100644 --- a/Content.Shared/Power/EntitySystems/SharedPowerReceiverSystem.cs +++ b/Content.Shared/Power/EntitySystems/SharedPowerReceiverSystem.cs @@ -1,6 +1,15 @@ -namespace Content.Shared.Power.EntitySystems; +using Content.Shared.Examine; +using Content.Shared.Power.Components; + +namespace Content.Shared.Power.EntitySystems; public abstract class SharedPowerReceiverSystem : EntitySystem { - + protected string GetExamineText(bool powered) + { + return Loc.GetString("power-receiver-component-on-examine-main", + ("stateText", Loc.GetString(powered + ? "power-receiver-component-on-examine-powered" + : "power-receiver-component-on-examine-unpowered"))); + } } From 0e4bc4cefcc79c60ca619078f6942bafe013fe62 Mon Sep 17 00:00:00 2001 From: Maishul <140472900+githubuser508@users.noreply.github.com> Date: Mon, 29 Jul 2024 01:29:27 -0700 Subject: [PATCH 009/422] Candles Crate (#29736) * First attempt at adding crate * Changed loose candles to candle boxes * Corrected minor typo * Removed a change to the development preset * Buffed crate to 2 of each box * Hopefully removes strange not-change in the repo * Updated description to be clearer. --------- Co-authored-by: elee-github --- .../Prototypes/Catalog/Cargo/cargo_service.yml | 9 +++++++++ .../Prototypes/Catalog/Fills/Crates/service.yml | 13 +++++++++++++ 2 files changed, 22 insertions(+) diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml index 0f930ddfd6..4701d50c01 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml @@ -198,3 +198,12 @@ category: cargoproduct-category-name-service group: market +- type: cargoProduct + id: ServiceCandles + icon: + sprite: Objects/Misc/candles.rsi + state: candle-big + product: CrateCandles + cost: 500 + category: cargoproduct-category-name-service + group: market diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml index 3950c4f8fd..693ddab14e 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml @@ -333,3 +333,16 @@ prob: 0.1 - id: ShardGlassPlasma prob: 0.1 + +- type: entity + id: CrateCandles + parent: CrateGenericSteel + name: candles crate + description: Contains 4 boxes of candles, 2 large and 2 small. For atmosphere or something. + components: + - type: StorageFill + contents: + - id: BoxCandle + amount: 2 + - id: BoxCandleSmall + amount: 2 From a9fc5a4b94f32e629b87ee9184a3ad4801f90a64 Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 29 Jul 2024 08:30:33 +0000 Subject: [PATCH 010/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index ee7b78158c..08edf140d0 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: lzk228 - changes: - - message: Barozine is removed from hydroponics mutatuions. - type: Remove - id: 6499 - time: '2024-04-30T03:01:38.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27512 - author: DogZeroX changes: - message: Changed the announcement of the immovable rod event. @@ -3780,3 +3773,10 @@ id: 6998 time: '2024-07-29T06:49:28.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30438 +- author: githubuser508 + changes: + - message: Candles crate and the ability for Cargo to order it. + type: Add + id: 6999 + time: '2024-07-29T08:29:27.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29736 From cf7e6807707f4fe1554d1f1edcc7bacd881d78e8 Mon Sep 17 00:00:00 2001 From: thecopbennet Date: Mon, 29 Jul 2024 04:31:05 -0400 Subject: [PATCH 011/422] turns "nosmoking sign" into "no smoking sign" (#30444) add a space Co-authored-by: thecopbennet --- .../Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml index c6ecb5fd30..1308eff1be 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml @@ -660,7 +660,7 @@ - type: entity parent: BaseSign id: SignNosmoking - name: nosmoking sign + name: no smoking sign description: A sign indicating that smoking is not allowed in the vicinity. components: - type: Sprite From 3db33d944f1c5cb1ecbdd0510282a27e8ff0255c Mon Sep 17 00:00:00 2001 From: Alzore <140123969+Blackern5000@users.noreply.github.com> Date: Mon, 29 Jul 2024 04:57:04 -0500 Subject: [PATCH 012/422] Increase the contents of the emergency oxygen and fire lockers (#29230) * 201 asphyxiation damage * A bit less oxygen --- .../Prototypes/Catalog/Fills/Lockers/misc.yml | 87 ++++++++++++------- 1 file changed, 55 insertions(+), 32 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml index b49fa383bc..a5b06fca03 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml @@ -20,16 +20,16 @@ components: - type: StorageFill contents: - - id: ClothingOuterSuitEmergency - id: ClothingMaskBreath + - id: ClothingOuterSuitEmergency - id: EmergencyOxygenTankFilled - prob: 0.80 - orGroup: EmergencyTankOrRegularTank + prob: 0.5 + orGroup: OxygenTank - id: OxygenTankFilled - prob: 0.20 - orGroup: EmergencyTankOrRegularTank + prob: 0.5 + orGroup: OxygenTank - id: ToolboxEmergencyFilled - prob: 0.4 + prob: 0.5 - id: MedkitOxygenFilled prob: 0.2 - id: WeaponFlareGun @@ -44,16 +44,16 @@ components: - type: StorageFill contents: - - id: ClothingOuterSuitEmergency - id: ClothingMaskBreath + - id: ClothingOuterSuitEmergency - id: EmergencyOxygenTankFilled - prob: 0.80 - orGroup: EmergencyTankOrRegularTank + prob: 0.5 + orGroup: OxygenTank - id: OxygenTankFilled - prob: 0.20 - orGroup: EmergencyTankOrRegularTank + prob: 0.5 + orGroup: OxygenTank - id: ToolboxEmergencyFilled - prob: 0.4 + prob: 0.5 - id: MedkitOxygenFilled prob: 0.2 - id: WeaponFlareGun @@ -69,39 +69,62 @@ - type: StorageFill contents: - id: ClothingMaskBreath + - id: ClothingOuterSuitEmergency - id: EmergencyNitrogenTankFilled - prob: 0.80 - orGroup: EmergencyTankOrRegularTank + prob: 0.5 + orGroup: NitrogenTank - id: NitrogenTankFilled - prob: 0.20 - orGroup: EmergencyTankOrRegularTank + prob: 0.5 + orGroup: NitrogenTank - type: entity id: ClosetFireFilled parent: ClosetFire suffix: Filled components: - - type: StorageFill - contents: - - id: ClothingOuterSuitFire - - id: ClothingHeadHelmetFire - - id: ClothingMaskGas - - id: OxygenTankFilled - - id: FireExtinguisher - prob: 0.25 + - type: StorageFill + contents: + - id: ClothingOuterSuitFire + - id: ClothingHeadHelmetFire + - id: ClothingMaskGas + - id: EmergencyOxygenTankFilled + prob: 0.5 + orGroup: OxygenTank + - id: OxygenTankFilled + prob: 0.5 + orGroup: OxygenTank + - id: CrowbarRed + - id: FireExtinguisher + prob: 0.98 + orGroup: FireExtinguisher + - id: SprayBottleWater #It's just budget cut after budget cut man + prob: 0.02 + orGroup: FireExtinguisher + - type: entity id: ClosetWallFireFilledRandom parent: ClosetWallFire suffix: Filled components: - - type: StorageFill - contents: - - id: ClothingOuterSuitFire - - id: ClothingHeadHelmetFire - - id: ClothingMaskGas - - id: OxygenTankFilled - - id: FireExtinguisher - prob: 0.25 + - type: StorageFill + contents: + - id: ClothingOuterSuitFire + - id: ClothingHeadHelmetFire + - id: ClothingMaskGas + - id: EmergencyOxygenTankFilled + prob: 0.5 + orGroup: OxygenTank + - id: OxygenTankFilled + prob: 0.5 + orGroup: OxygenTank + - id: CrowbarRed + - id: FireExtinguisher + prob: 0.98 + orGroup: FireExtinguisher + - id: SprayBottleWater #It's just budget cut after budget cut man + prob: 0.02 + orGroup: FireExtinguisher + - type: entity id: ClosetMaintenanceFilledRandom suffix: Filled, Random From 7244b9b912404995270fdbee0be9cd7ce0621a60 Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 29 Jul 2024 09:58:10 +0000 Subject: [PATCH 013/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 08edf140d0..827805d951 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: DogZeroX - changes: - - message: Changed the announcement of the immovable rod event. - type: Tweak - id: 6500 - time: '2024-04-30T04:05:14.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27515 - author: DogZeroX changes: - message: Flares looped sound no longer have a massive range, and are much quieter. @@ -3780,3 +3773,10 @@ id: 6999 time: '2024-07-29T08:29:27.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29736 +- author: Blackern5000 + changes: + - message: Emergency oxygen and fire lockers now generally contain more supplies + type: Tweak + id: 7000 + time: '2024-07-29T09:57:04.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29230 From 6114a88628027360b1132f22f292bcfa0600e884 Mon Sep 17 00:00:00 2001 From: end <72604018+laok233@users.noreply.github.com> Date: Mon, 29 Jul 2024 14:37:31 +0200 Subject: [PATCH 014/422] N2O color change (#30383) --- Resources/Prototypes/Atmospherics/gases.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Atmospherics/gases.yml b/Resources/Prototypes/Atmospherics/gases.yml index 4a72f655d8..5c54b5a015 100644 --- a/Resources/Prototypes/Atmospherics/gases.yml +++ b/Resources/Prototypes/Atmospherics/gases.yml @@ -84,7 +84,7 @@ specificHeat: 40 heatCapacityRatio: 1.3 molarMass: 44 - color: 2887E8 + color: 8F00FF reagent: NitrousOxide pricePerMole: 1 From 7761f86b998f63db9320d97a0d84e00a05954a2d Mon Sep 17 00:00:00 2001 From: Moomoobeef <62638182+Moomoobeef@users.noreply.github.com> Date: Mon, 29 Jul 2024 07:52:39 -0500 Subject: [PATCH 015/422] added wearable lizard plushie (#30400) --- .../Prototypes/Entities/Objects/Fun/toys.yml | 6 ++++++ .../Fun/toys.rsi/lizard-equipped-HELMET.png | Bin 0 -> 564 bytes Resources/Textures/Objects/Fun/toys.rsi/meta.json | 6 +++++- 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Objects/Fun/toys.rsi/lizard-equipped-HELMET.png diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 33a322cb25..20c92b0901 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -301,6 +301,12 @@ Quantity: 10 - ReagentId: JuiceThatMakesYouWeh Quantity: 10 + - type: Clothing + quickEquip: false + sprite: Objects/Fun/toys.rsi + equippedPrefix: lizard + slots: + - HEAD - type: entity parent: PlushieLizard diff --git a/Resources/Textures/Objects/Fun/toys.rsi/lizard-equipped-HELMET.png b/Resources/Textures/Objects/Fun/toys.rsi/lizard-equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..a436871b94d44a7a2890a37c9b7599d0277eec8f GIT binary patch literal 564 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zuXwsRhE&XX zd&@BUkb?;Ohx%1B9A5|&6bOoki(B7ReUL72>!y>Lz0Y#7TQ?7$4|uaESnaybwWZFA zvz?E8usRVrmFumwC(oby%evF6E$`W?zL(MXnx6YnOU_L2L)HIx8S@v5w(MhY*wbhD z?%dVa@tJC!9X-2?84jGj%fjFy-Egen*6p>=Lv6mK=YIXQinl=K`Sn7EZ8m!q zG zuIY@&5}tVP+$w8-|3!AdL!*XoJZ^Q%>JN0l0hj+*+ggjao{#co3&$PZ{7WxinWNUw zFy)%0k^cWHGY{MmG?*^BDdn0>`SXfbJ`;AlJh-=Ue~`JG-pjZKU!7II85smx{^jlI z-1Jt&d$T6LU_hSiv4soQF)ovwdHnB!+GW-uxi7K~>{p*5m2l(Bv)sALVy~aA*!JUw zRb8d-SGF9b*IUo4eU50mJnzZJ%jI4IzZRW!DrMW@>1qA-O;M+6e{uaO)uT=>Fi>)F tALG}3C;PW~J`e&%HeYIlXPU1sgBFm@0mLA1DR?r7@^tlcS?83{1OS}J`RD)u literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json index fa118695c2..4975ba0461 100644 --- a/Resources/Textures/Objects/Fun/toys.rsi/meta.json +++ b/Resources/Textures/Objects/Fun/toys.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, orb, orb-inhand-left and orb-inhand-right created by Pancake, plushie_diona and plushie_diona1 created by discord user Deos#5630, toy-mouse-equipped-HELMET is a resprited 1-equipped-HELMET in mouse.rsi by PuroSlavKing (Github), plushie_xeno by LinkUyx#6557, plushie_hampter by RenLou#4333, beachball taken from https://github.com/ss220-space/Paradise/commit/662c08272acd7be79531550919f56f846726eabb, beachb-inhand by ;3#1161, bee hat and in-hand sprites drawn by Ubaser, plushie_penguin by netwy, plushie_arachnid by PixelTheKermit (github), plushie human by TheShuEd, NanoTrasen Balloon by MACMAN2003, holoplush and magicplush modified by deltanedas (github)", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, orb, orb-inhand-left and orb-inhand-right created by Pancake, plushie_diona and plushie_diona1 created by discord user Deos#5630, toy-mouse-equipped-HELMET is a resprited 1-equipped-HELMET in mouse.rsi by PuroSlavKing (Github), plushie_xeno by LinkUyx#6557, plushie_hampter by RenLou#4333, beachball taken from https://github.com/ss220-space/Paradise/commit/662c08272acd7be79531550919f56f846726eabb, beachb-inhand by ;3#1161, bee hat and in-hand sprites drawn by Ubaser, plushie_penguin by netwy, plushie_arachnid by PixelTheKermit (github), plushie human by TheShuEd, NanoTrasen Balloon by MACMAN2003, holoplush and magicplush modified by deltanedas (github). Lizard hat sprite made by Cinder", "size": { "x": 32, "y": 32 @@ -91,6 +91,10 @@ { "name": "plushie_lizard_mirrored" }, + { + "name": "lizard-equipped-HELMET", + "directions": 4 + }, { "name": "plushie_lamp" }, From 16cbd1a36b4b91ab65fd0aab69752290609827e1 Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 29 Jul 2024 12:53:46 +0000 Subject: [PATCH 016/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 827805d951..b6d8ecffa8 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: DogZeroX - changes: - - message: Flares looped sound no longer have a massive range, and are much quieter. - type: Fix - id: 6501 - time: '2024-04-30T06:49:35.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27521 - author: ERORR404V1 changes: - message: Added chameleon projector in thief toolbox! @@ -3780,3 +3773,10 @@ id: 7000 time: '2024-07-29T09:57:04.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29230 +- author: Moomoobeef + changes: + - message: Added the ability to wear lizard plushies on your head! + type: Add + id: 7001 + time: '2024-07-29T12:52:40.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30400 From 8595f59b835ec37990cf971db46724a26f252abd Mon Sep 17 00:00:00 2001 From: TurboTracker <130304754+TurboTrackerss14@users.noreply.github.com> Date: Mon, 29 Jul 2024 16:16:54 +0100 Subject: [PATCH 017/422] Bring kobold ghostrole chance inline with monkey (#30450) --- Resources/Prototypes/Entities/Mobs/NPCs/animals.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 70c65dcb8a..1cf1390770 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -1446,7 +1446,7 @@ - type: SentienceTarget flavorKind: station-event-random-sentience-flavor-kobold - type: GhostRole - prob: 0.1 + prob: 0.05 makeSentient: true name: ghost-role-information-kobold-name description: ghost-role-information-kobold-description From 961514dd28f35d1c2ac84430ab845aa0b30f895c Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 29 Jul 2024 15:18:01 +0000 Subject: [PATCH 018/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index b6d8ecffa8..dd02ef2fbb 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: ERORR404V1 - changes: - - message: Added chameleon projector in thief toolbox! - type: Add - id: 6502 - time: '2024-04-30T12:14:06.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27491 - author: DamnFeds changes: - message: honkbot now uses a happy honk meal instead of box of hugs and clown's @@ -3780,3 +3773,10 @@ id: 7001 time: '2024-07-29T12:52:40.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30400 +- author: TurboTrackerss14 + changes: + - message: Reduced Kobold ghostrole chance to mirror Monkey + type: Tweak + id: 7002 + time: '2024-07-29T15:16:54.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30450 From fcaf04d72b99077e945b985577ef4bbb5e83f44a Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Mon, 29 Jul 2024 12:45:42 -0600 Subject: [PATCH 019/422] bagel update (#30461) --- Resources/Maps/bagel.yml | 87 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 82 insertions(+), 5 deletions(-) diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml index 90d0061f77..c7030f6cf5 100644 --- a/Resources/Maps/bagel.yml +++ b/Resources/Maps/bagel.yml @@ -11876,6 +11876,8 @@ entities: rot: 3.141592653589793 rad pos: 0.5,-0.5 parent: 7536 + - type: Door + changeAirtight: False - type: Docking dockJointId: docking43669 dockedWith: 7332 @@ -13198,6 +13200,8 @@ entities: lastSignals: DoorStatus: False DockStatus: True + - type: Door + changeAirtight: False - uid: 12584 components: - type: Transform @@ -122226,6 +122230,21 @@ entities: parent: 60 - proto: SignAi entities: + - uid: 16533 + components: + - type: Transform + pos: -101.5,16.5 + parent: 60 + - uid: 19800 + components: + - type: Transform + pos: -112.5,20.5 + parent: 60 + - uid: 19808 + components: + - type: Transform + pos: -107.5,16.5 + parent: 60 - uid: 21237 components: - type: Transform @@ -122236,6 +122255,18 @@ entities: - type: Transform pos: -60.5,16.5 parent: 60 +- proto: SignAiUpload + entities: + - uid: 21130 + components: + - type: Transform + pos: -110.5,6.5 + parent: 60 + - uid: 23380 + components: + - type: Transform + pos: -112.5,14.5 + parent: 60 - proto: SignalButton entities: - uid: 3803 @@ -123122,11 +123153,12 @@ entities: - type: Transform pos: 2.5,-1.5 parent: 60 -- proto: SignCanisters +- proto: SignCans entities: - - uid: 15171 + - uid: 13825 components: - type: Transform + rot: 3.141592653589793 rad pos: -28.5,37.5 parent: 60 - proto: SignCargo @@ -123183,6 +123215,13 @@ entities: - type: Transform pos: 42.5,-25.5 parent: 60 +- proto: SignCryo + entities: + - uid: 15171 + components: + - type: Transform + pos: -29.5,22.5 + parent: 60 - proto: SignCryogenicsMed entities: - uid: 4111 @@ -123313,11 +123352,11 @@ entities: rot: 1.5707963267948966 rad pos: 42.49971,-21.305145 parent: 60 - - uid: 16533 + - uid: 23381 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -29.5,22.5 + rot: 3.141592653589793 rad + pos: -32.5,18.5 parent: 60 - proto: SignDirectionalDorms entities: @@ -124056,6 +124095,14 @@ entities: - type: Transform pos: -109.5,20.5 parent: 60 +- proto: SignKitchen + entities: + - uid: 23382 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 24.5,-25.5 + parent: 60 - proto: SignLaserMed entities: - uid: 14624 @@ -124094,6 +124141,12 @@ entities: - type: Transform pos: 3.5,-46.5 parent: 60 + - uid: 23969 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 18.5,17.5 + parent: 60 - proto: SignMedical entities: - uid: 2632 @@ -124279,6 +124332,14 @@ entities: - type: Transform pos: -19.5,-11.5 parent: 60 +- proto: SignRestroom + entities: + - uid: 23970 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 18.5,11.5 + parent: 60 - proto: SignRND entities: - uid: 7085 @@ -124537,6 +124598,14 @@ entities: - type: Transform pos: 22.5,6.5 parent: 60 +- proto: SignTheater + entities: + - uid: 24271 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 18.5,-20.5 + parent: 60 - proto: SignToolStorage entities: - uid: 6315 @@ -124544,6 +124613,14 @@ entities: - type: Transform pos: 14.5,10.5 parent: 60 +- proto: SignVault + entities: + - uid: 24268 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-5.5 + parent: 60 - proto: SignVirology entities: - uid: 2969 From 83a56cc74afb57970cea480efc43ac1a9621a5a8 Mon Sep 17 00:00:00 2001 From: Mervill Date: Mon, 29 Jul 2024 17:57:46 -0700 Subject: [PATCH 020/422] Objects that only have a basic description won't have extra line in examine text (#30472) objects that only have a basic description won't have extra line in examine text --- Content.Shared/Examine/ExamineSystemShared.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Shared/Examine/ExamineSystemShared.cs b/Content.Shared/Examine/ExamineSystemShared.cs index 682018949a..f0406c5398 100644 --- a/Content.Shared/Examine/ExamineSystemShared.cs +++ b/Content.Shared/Examine/ExamineSystemShared.cs @@ -352,7 +352,7 @@ namespace Content.Shared.Examine var totalMessage = new FormattedMessage(Message); parts.Sort(Comparison); - if (_hasDescription) + if (_hasDescription && parts.Count > 0) { totalMessage.PushNewline(); } From c5f332ea9f149157825a3ef3770326dcfeb1362c Mon Sep 17 00:00:00 2001 From: Ian Date: Tue, 30 Jul 2024 03:05:26 +0200 Subject: [PATCH 021/422] added a defib to the courser (#30471) --- Resources/Maps/Shuttles/emergency_courser.yml | 206 ++++++++---------- 1 file changed, 92 insertions(+), 114 deletions(-) diff --git a/Resources/Maps/Shuttles/emergency_courser.yml b/Resources/Maps/Shuttles/emergency_courser.yml index 135c95e247..f9ff40b8fa 100644 --- a/Resources/Maps/Shuttles/emergency_courser.yml +++ b/Resources/Maps/Shuttles/emergency_courser.yml @@ -362,85 +362,96 @@ entities: version: 2 data: tiles: - -2,-1: - 0: 61166 - -1,-1: - 0: 65535 - 0,-1: - 0: 65535 -2,-3: - 0: 60620 + 0: 8192 + 1: 34944 -2,-2: - 0: 61102 - 1: 64 + 1: 52936 + -2,-1: + 1: 52430 -2,-4: - 0: 51328 - -1,-4: - 0: 57343 - 1: 8192 - -1,-3: - 0: 65535 - -1,-2: - 0: 49151 - 1: 16384 - 0,-4: - 0: 65535 - 0,-3: - 0: 65535 - 0,-2: - 0: 65535 - 1,-4: - 0: 12560 - 1,-3: - 0: 29491 - 1,-2: - 0: 30551 - 1: 32 - 1,-1: - 0: 30583 + 0: 16512 -2,0: - 0: 61166 - -2,1: - 0: 61102 - 1: 64 - -2,2: - 0: 52300 - 1: 128 - -2,3: - 0: 136 - -1,0: - 0: 65535 - -1,1: - 0: 49151 - 1: 16384 - -1,2: - 0: 65535 - -1,3: - 0: 61439 - 0,0: - 0: 65535 - 0,1: - 0: 57343 - 1: 8192 - 0,2: - 0: 65535 - 0,3: - 0: 32767 - 1,0: - 0: 30583 - 1,1: - 0: 30551 - 1: 32 - 1,2: - 0: 13091 - 1: 16 - 1,3: - 0: 17 + 1: 52940 + -1,-4: + 1: 65260 + -1,-3: + 1: 65372 + -1,-2: + 1: 57297 + -1,-1: + 1: 65489 -1,-5: - 0: 61440 + 0: 4096 + -1,0: + 1: 8191 + 0,-4: + 1: 63347 + 0,-3: + 1: 65443 + 0,-2: + 1: 49080 + 0,-1: + 1: 65464 + 0,0: + 1: 36863 0,-5: - 0: 61440 + 0: 32768 + 1,-4: + 0: 8208 + 1,-3: + 1: 4368 + 0: 16384 + 1,-2: + 1: 14129 + 1,-1: + 1: 13111 + 1,0: + 1: 14131 + -2,1: + 1: 35022 + 0: 8192 + -2,2: + 1: 136 + 0: 16384 + -1,1: + 1: 56829 + -1,2: + 1: 62705 + -2,3: + 0: 128 + -1,3: + 1: 3310 + 0,1: + 1: 48123 + 0,2: + 1: 62200 + 0,3: + 1: 887 + 1,1: + 1: 4407 + 0: 16384 + 1,2: + 1: 17 + 0: 8192 + 1,3: + 0: 16 uniqueMixes: + - volume: 2500 + immutable: True + moles: + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - volume: 2500 temperature: 293.15 moles: @@ -456,21 +467,6 @@ entities: - 0 - 0 - 0 - - volume: 2500 - temperature: 293.15 - moles: - - 19.481253 - - 73.28662 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 chunkSize: 4 - type: RadiationGridResistance - type: GravityShake @@ -485,8 +481,6 @@ entities: - type: Transform pos: 0.5,-12.5 parent: 656 - - type: AtmosDevice - joinedGrid: 656 - proto: AirlockCommandGlassLocked entities: - uid: 601 @@ -2023,6 +2017,14 @@ entities: - type: Transform pos: 0.5,14.5 parent: 656 +- proto: DefibrillatorCabinetFilled + entities: + - uid: 657 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-6.5 + parent: 656 - proto: ExtinguisherCabinetFilled entities: - uid: 517 @@ -2176,8 +2178,6 @@ entities: - type: Transform pos: 0.5,-11.5 parent: 656 - - type: AtmosDevice - joinedGrid: 656 - proto: GasPassiveVent entities: - uid: 521 @@ -2186,8 +2186,6 @@ entities: rot: -1.5707963267948966 rad pos: -0.5,-11.5 parent: 656 - - type: AtmosDevice - joinedGrid: 656 - proto: GasPipeBend entities: - uid: 523 @@ -2536,8 +2534,6 @@ entities: rot: 3.141592653589793 rad pos: 0.5,-12.5 parent: 656 - - type: AtmosDevice - joinedGrid: 656 - proto: GasVentPump entities: - uid: 524 @@ -2546,72 +2542,54 @@ entities: rot: -1.5707963267948966 rad pos: -0.5,-12.5 parent: 656 - - type: AtmosDevice - joinedGrid: 656 - uid: 550 components: - type: Transform rot: 3.141592653589793 rad pos: 3.5,-10.5 parent: 656 - - type: AtmosDevice - joinedGrid: 656 - uid: 551 components: - type: Transform rot: 3.141592653589793 rad pos: -3.5,-10.5 parent: 656 - - type: AtmosDevice - joinedGrid: 656 - uid: 552 components: - type: Transform rot: 1.5707963267948966 rad pos: -4.5,-0.5 parent: 656 - - type: AtmosDevice - joinedGrid: 656 - uid: 553 components: - type: Transform rot: -1.5707963267948966 rad pos: 4.5,-0.5 parent: 656 - - type: AtmosDevice - joinedGrid: 656 - uid: 573 components: - type: Transform rot: -1.5707963267948966 rad pos: 2.5,11.5 parent: 656 - - type: AtmosDevice - joinedGrid: 656 - uid: 574 components: - type: Transform rot: 1.5707963267948966 rad pos: -2.5,11.5 parent: 656 - - type: AtmosDevice - joinedGrid: 656 - uid: 580 components: - type: Transform rot: -1.5707963267948966 rad pos: 4.5,8.5 parent: 656 - - type: AtmosDevice - joinedGrid: 656 - uid: 589 components: - type: Transform rot: 1.5707963267948966 rad pos: -4.5,8.5 parent: 656 - - type: AtmosDevice - joinedGrid: 656 - proto: GeneratorBasic15kW entities: - uid: 66 @@ -3424,7 +3402,7 @@ entities: - type: Transform pos: 1.5,-15.5 parent: 656 -- proto: soda_dispenser +- proto: SodaDispenser entities: - uid: 166 components: From 0bbb099a38d9a6b6f6b31cc04dacedf1df81910e Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 30 Jul 2024 01:06:33 +0000 Subject: [PATCH 022/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index dd02ef2fbb..86d6124554 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: DamnFeds - changes: - - message: honkbot now uses a happy honk meal instead of box of hugs and clown's - rubber stamp. Honk! - type: Tweak - id: 6503 - time: '2024-05-01T03:27:21.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27535 - author: Plykiya changes: - message: Inserting telecrystals no longer announces to everyone around you that @@ -3780,3 +3772,10 @@ id: 7002 time: '2024-07-29T15:16:54.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30450 +- author: Ian321 + changes: + - message: The Courser now comes with a defibrillator. + type: Tweak + id: 7003 + time: '2024-07-30T01:05:27.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30471 From 502ceb69dee1e4981c84410aca2ad85818ac6e82 Mon Sep 17 00:00:00 2001 From: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Date: Tue, 30 Jul 2024 03:22:16 +0200 Subject: [PATCH 023/422] Fix puppy ian steal target (#30474) fix puppy ian steal target --- Resources/Prototypes/Entities/Mobs/NPCs/pets.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml index 718c4236cf..6ac74967ff 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml @@ -100,6 +100,8 @@ - id: FoodMeatCorgi amount: 2 - id: MaterialHideCorgi + - type: StealTarget + stealGroup: AnimalIan - type: entity name: Runtime From b16de9bb3503b26ca6095aef37ee664340c4d120 Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 30 Jul 2024 01:23:23 +0000 Subject: [PATCH 024/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 86d6124554..2bd96473dd 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: Plykiya - changes: - - message: Inserting telecrystals no longer announces to everyone around you that - you inserted it. - type: Tweak - id: 6504 - time: '2024-05-01T15:17:47.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27585 - author: Dezzzix changes: - message: Goldschlager empty bottle renamed to Gildlager empty bottle @@ -3779,3 +3771,10 @@ id: 7003 time: '2024-07-30T01:05:27.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30471 +- author: slarticodefast + changes: + - message: Fixed puppy Ian not counting as a thief steal target. + type: Fix + id: 7004 + time: '2024-07-30T01:22:17.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30474 From 85e36266fa5d24dd742b050e2a64c0a68cdc66db Mon Sep 17 00:00:00 2001 From: themias <89101928+themias@users.noreply.github.com> Date: Mon, 29 Jul 2024 21:49:05 -0400 Subject: [PATCH 025/422] Add envelopes (#30298) * Add envelopes * oops * Remove unused loc string * comments and fixes --- Content.Client/Paper/EnvelopeSystem.cs | 35 ++++++ Content.Shared/Paper/EnvelopeComponent.cs | 63 ++++++++++ Content.Shared/Paper/EnvelopeSystem.cs | 108 ++++++++++++++++++ Resources/Locale/en-US/paper/envelope.ftl | 11 ++ .../Catalog/Fills/Boxes/general.yml | 14 +++ .../Catalog/Fills/Crates/service.yml | 1 + .../VendingMachines/Inventories/cart.yml | 1 + .../Entities/Objects/Misc/paper.yml | 78 +++++++++++++ .../paper_heading_postage_stamp.svg.96dpi.png | Bin 0 -> 2387 bytes ...er_heading_postage_stamp.svg.96dpi.png.yml | 2 + .../Objects/Storage/boxes.rsi/envelope.png | Bin 0 -> 158 bytes .../Objects/Storage/boxes.rsi/meta.json | 3 + 12 files changed, 316 insertions(+) create mode 100644 Content.Client/Paper/EnvelopeSystem.cs create mode 100644 Content.Shared/Paper/EnvelopeComponent.cs create mode 100644 Content.Shared/Paper/EnvelopeSystem.cs create mode 100644 Resources/Locale/en-US/paper/envelope.ftl create mode 100644 Resources/Textures/Interface/Paper/paper_heading_postage_stamp.svg.96dpi.png create mode 100644 Resources/Textures/Interface/Paper/paper_heading_postage_stamp.svg.96dpi.png.yml create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/envelope.png diff --git a/Content.Client/Paper/EnvelopeSystem.cs b/Content.Client/Paper/EnvelopeSystem.cs new file mode 100644 index 0000000000..f405ed1518 --- /dev/null +++ b/Content.Client/Paper/EnvelopeSystem.cs @@ -0,0 +1,35 @@ +using Content.Shared.Paper; +using Robust.Client.GameObjects; + +namespace Content.Client.Paper; + +public sealed class EnvelopeSystem : VisualizerSystem +{ + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(OnAfterAutoHandleState); + } + + private void OnAfterAutoHandleState(Entity ent, ref AfterAutoHandleStateEvent args) + { + UpdateAppearance(ent); + } + + private void UpdateAppearance(Entity ent, SpriteComponent? sprite = null) + { + if (!Resolve(ent.Owner, ref sprite)) + return; + + sprite.LayerSetVisible(EnvelopeVisualLayers.Open, ent.Comp.State == EnvelopeComponent.EnvelopeState.Open); + sprite.LayerSetVisible(EnvelopeVisualLayers.Sealed, ent.Comp.State == EnvelopeComponent.EnvelopeState.Sealed); + sprite.LayerSetVisible(EnvelopeVisualLayers.Torn, ent.Comp.State == EnvelopeComponent.EnvelopeState.Torn); + } + + public enum EnvelopeVisualLayers : byte + { + Open, + Sealed, + Torn + } +} diff --git a/Content.Shared/Paper/EnvelopeComponent.cs b/Content.Shared/Paper/EnvelopeComponent.cs new file mode 100644 index 0000000000..e56fbd85af --- /dev/null +++ b/Content.Shared/Paper/EnvelopeComponent.cs @@ -0,0 +1,63 @@ +using Content.Shared.DoAfter; +using Robust.Shared.Audio; +using Robust.Shared.GameStates; +using Robust.Shared.Serialization; + +namespace Content.Shared.Paper; + +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)] +public sealed partial class EnvelopeComponent : Component +{ + /// + /// The current open/sealed/torn state of the envelope + /// + [ViewVariables, DataField, AutoNetworkedField] + public EnvelopeState State = EnvelopeState.Open; + + [DataField, ViewVariables] + public string SlotId = "letter_slot"; + + /// + /// Stores the current sealing/tearing doafter of the envelope + /// to prevent doafter spam/prediction issues + /// + [DataField, ViewVariables] + public DoAfterId? EnvelopeDoAfter; + + /// + /// How long it takes to seal the envelope closed + /// + [DataField, ViewVariables] + public TimeSpan SealDelay = TimeSpan.FromSeconds(1); + + /// + /// How long it takes to tear open the envelope + /// + [DataField, ViewVariables] + public TimeSpan TearDelay = TimeSpan.FromSeconds(1); + + /// + /// The sound to play when the envelope is sealed closed + /// + [DataField, ViewVariables] + public SoundPathSpecifier? SealSound = new SoundPathSpecifier("/Audio/Effects/packetrip.ogg"); + + /// + /// The sound to play when the envelope is torn open + /// + [DataField, ViewVariables] + public SoundPathSpecifier? TearSound = new SoundPathSpecifier("/Audio/Effects/poster_broken.ogg"); + + [Serializable, NetSerializable] + public enum EnvelopeState : byte + { + Open, + Sealed, + Torn + } +} + +[Serializable, NetSerializable] +public sealed partial class EnvelopeDoAfterEvent : SimpleDoAfterEvent +{ +} diff --git a/Content.Shared/Paper/EnvelopeSystem.cs b/Content.Shared/Paper/EnvelopeSystem.cs new file mode 100644 index 0000000000..560c2c82f9 --- /dev/null +++ b/Content.Shared/Paper/EnvelopeSystem.cs @@ -0,0 +1,108 @@ +using Content.Shared.DoAfter; +using Content.Shared.Containers.ItemSlots; +using Content.Shared.Verbs; +using Robust.Shared.Audio.Systems; +using Content.Shared.Examine; + +namespace Content.Shared.Paper; + +public sealed class EnvelopeSystem : EntitySystem +{ + [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private readonly SharedAudioSystem _audioSystem = default!; + [Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnInsertAttempt); + SubscribeLocalEvent(OnEjectAttempt); + SubscribeLocalEvent>(OnGetAltVerbs); + SubscribeLocalEvent(OnDoAfter); + SubscribeLocalEvent(OnExamine); + } + + private void OnExamine(Entity ent, ref ExaminedEvent args) + { + if (ent.Comp.State == EnvelopeComponent.EnvelopeState.Sealed) + { + args.PushMarkup(Loc.GetString("envelope-sealed-examine", ("envelope", ent.Owner))); + } + else if (ent.Comp.State == EnvelopeComponent.EnvelopeState.Torn) + { + args.PushMarkup(Loc.GetString("envelope-torn-examine", ("envelope", ent.Owner))); + } + } + + private void OnGetAltVerbs(Entity ent, ref GetVerbsEvent args) + { + if (!args.CanAccess || !args.CanInteract || args.Hands == null) + return; + + if (ent.Comp.State == EnvelopeComponent.EnvelopeState.Torn) + return; + + var user = args.User; + args.Verbs.Add(new AlternativeVerb() + { + Text = Loc.GetString(ent.Comp.State == EnvelopeComponent.EnvelopeState.Open ? "envelope-verb-seal" : "envelope-verb-tear"), + IconEntity = GetNetEntity(ent.Owner), + Act = () => + { + TryStartDoAfter(ent, user, ent.Comp.State == EnvelopeComponent.EnvelopeState.Open ? ent.Comp.SealDelay : ent.Comp.TearDelay); + }, + }); + } + + private void OnInsertAttempt(Entity ent, ref ItemSlotInsertAttemptEvent args) + { + args.Cancelled |= ent.Comp.State != EnvelopeComponent.EnvelopeState.Open; + } + + private void OnEjectAttempt(Entity ent, ref ItemSlotEjectAttemptEvent args) + { + args.Cancelled |= ent.Comp.State == EnvelopeComponent.EnvelopeState.Sealed; + } + + private void TryStartDoAfter(Entity ent, EntityUid user, TimeSpan delay) + { + if (ent.Comp.EnvelopeDoAfter.HasValue) + return; + + var doAfterEventArgs = new DoAfterArgs(EntityManager, user, delay, new EnvelopeDoAfterEvent(), ent.Owner, ent.Owner) + { + BreakOnDamage = true, + NeedHand = true, + BreakOnHandChange = true, + MovementThreshold = 0.01f, + DistanceThreshold = 1.0f, + }; + + if (_doAfterSystem.TryStartDoAfter(doAfterEventArgs, out var doAfterId)) + ent.Comp.EnvelopeDoAfter = doAfterId; + } + private void OnDoAfter(Entity ent, ref EnvelopeDoAfterEvent args) + { + ent.Comp.EnvelopeDoAfter = null; + + if (args.Cancelled) + return; + + if (ent.Comp.State == EnvelopeComponent.EnvelopeState.Open) + { + _audioSystem.PlayPredicted(ent.Comp.SealSound, ent.Owner, args.User); + ent.Comp.State = EnvelopeComponent.EnvelopeState.Sealed; + Dirty(ent.Owner, ent.Comp); + } + else if (ent.Comp.State == EnvelopeComponent.EnvelopeState.Sealed) + { + _audioSystem.PlayPredicted(ent.Comp.TearSound, ent.Owner, args.User); + ent.Comp.State = EnvelopeComponent.EnvelopeState.Torn; + Dirty(ent.Owner, ent.Comp); + + if (_itemSlotsSystem.TryGetSlot(ent.Owner, ent.Comp.SlotId, out var slotComp)) + _itemSlotsSystem.TryEjectToHands(ent.Owner, slotComp, args.User); + } + } +} diff --git a/Resources/Locale/en-US/paper/envelope.ftl b/Resources/Locale/en-US/paper/envelope.ftl new file mode 100644 index 0000000000..bb7993d284 --- /dev/null +++ b/Resources/Locale/en-US/paper/envelope.ftl @@ -0,0 +1,11 @@ +envelope-verb-seal = Seal +envelope-verb-tear = Tear + +envelope-letter-slot = Letter + +envelope-sealed-examine = [color=gray]{CAPITALIZE(THE($envelope))} is sealed.[/color] +envelope-torn-examine = [color=yellow]{CAPITALIZE(THE($envelope))} is torn and unusable![/color] + +envelope-default-message = TO: + + FROM: \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml index 85ee9f9ab8..cadf413f47 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml @@ -432,3 +432,17 @@ - id: DartYellow amount: 2 +- type: entity + name: envelope box + parent: BoxCardboard + id: BoxEnvelope + description: A box filled with envelopes. + components: + - type: Sprite + layers: + - state: box + - state: envelope + - type: StorageFill + contents: + - id: Envelope + amount: 9 \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml index 693ddab14e..d922056a8b 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml @@ -128,6 +128,7 @@ - id: BoxFolderRed - id: BoxFolderYellow - id: NewtonCradle + - id: BoxEnvelope - type: entity id: CrateServiceFaxMachine diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml index cb0ef3246d..303b209053 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml @@ -8,6 +8,7 @@ RubberStampApproved: 1 RubberStampDenied: 1 Paper: 10 + Envelope: 10 EncryptionKeyCargo: 2 EncryptionKeyEngineering: 2 EncryptionKeyMedical: 2 diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index 42b850f2b2..12e1a09a0c 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -564,3 +564,81 @@ Blunt: 10 - type: StealTarget stealGroup: BoxFolderQmClipboard + +- type: entity + name: envelope + parent: BaseItem + id: Envelope + description: 'A small envelope for keeping prying eyes off of your sensitive documents.' + components: + - type: Sprite + sprite: Objects/Misc/bureaucracy.rsi + layers: + - state: envelope_open + map: ["enum.EnvelopeVisualLayers.Open"] + - state: envelope_closed + map: ["enum.EnvelopeVisualLayers.Sealed"] + visible: false + - state: envelope_torn + map: ["enum.EnvelopeVisualLayers.Torn"] + visible: false + - state: paper_stamp-generic + map: ["enum.PaperVisualLayers.Stamp"] + visible: false + - type: Paper + escapeFormatting: false + content: envelope-default-message + - type: PaperVisuals + headerImagePath: "/Textures/Interface/Paper/paper_heading_postage_stamp.svg.96dpi.png" + headerMargin: 216.0, 0.0, 0.0, 0.0 + contentMargin: 0.0, 0.0, 0.0, 0.0 + maxWritableArea: 368.0, 256.0 + - type: Envelope + - type: ContainerContainer + containers: + letter_slot: !type:ContainerSlot + - type: ItemSlots + slots: + letter_slot: + name: envelope-letter-slot + insertSound: /Audio/Effects/packetrip.ogg + ejectSound: /Audio/Effects/packetrip.ogg + whitelist: + tags: + - Paper + - type: ActivatableUI + key: enum.PaperUiKey.Key + requireHands: false + - type: UserInterface + interfaces: + enum.PaperUiKey.Key: + type: PaperBoundUserInterface + - type: Item + size: Tiny + - type: Tag + tags: + - Trash + - Document + #- type: Appearance, hide stamp marks until we have some kind of displacement + - type: Flammable + fireSpread: true + canResistFire: false + alwaysCombustible: true + canExtinguish: true + damage: + types: + Heat: 1 + - type: FireVisuals + sprite: Effects/fire.rsi + normalState: fire + - type: Damageable + damageModifierSet: Wood + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 15 + behaviors: + - !type:EmptyAllContainersBehaviour + - !type:DoActsBehavior + acts: [ "Destruction" ] \ No newline at end of file diff --git a/Resources/Textures/Interface/Paper/paper_heading_postage_stamp.svg.96dpi.png b/Resources/Textures/Interface/Paper/paper_heading_postage_stamp.svg.96dpi.png new file mode 100644 index 0000000000000000000000000000000000000000..ec3566f63ea73dc31d7ead72e5d4e6a57e0167b4 GIT binary patch literal 2387 zcmV-Z39R;sP)Px;4M{{nRCt{2olk5PMI6V!FQ8TaL<|y05Vj>oP6kOl62*|{i3k@;+(w0x7!zGU zuTV8#Db;=QV%<`Z{EC_*_qwhf3N#V zNO$+m&dlz9`OVDlH?s@W)YQ~;D~-Gga=l=|Bz@C&a;sZSeq{DgO$8Q5Ex_);`a`rW zG@fo3-sS#50HF7fUTbCcH=jQZ6;>Xej>t@fl0}|nh6oKkeGcZYh1cHG7hYdh`y*?I z8UQdfJJPW~vUW(P+QRbzpy@mE6Oy75g>5n9SymCSmhH(eKLr3>*?Rz4?GGIMJ-dq$ z=!yz(X_lo{3D*mvZQ1|Mthn4iNG+Syd?PDG#l`Q(Ff=;?Adz5sQF82?%S+=B@TCIuEjj75rtwYmy8paPv^uUX1(rng6kXM7`mn1tQ zk_t{oU|EPN4r&QWpDwzu#)9J?N?H0&HtI#1RH5ido{8$F1Jk4m`*19Aoq5^}76Jbs zh7%r|zN6oVE34Rmur6%<=yrlS^27Y7nWcTay!&^6T4Y5EOc(Z^#XgWS3r$4Y`Z9wD zQD3nwFB{@>y&!TcPzw>)RKBt2dg^j*vgYG)0G*b(r_X83Ukkwc=9CYkYGR{U6dfQI z9w51QA`x==iHP+%mQ7?VRs>g7v9Yk%kfL8l(TSj_$}oz+OpI=f9^9?B_L-cTJG|g1 zwEmmVpN{TJ?T1r9trZa-D<+wE(uDOIeA8MaW0Mhn@NHAD2Xi~5!!-n zp?&_)5$SJtKRcH?|45XaLzxa_=;+k-hN62Yya8#OqB5a-EomYR8htcn-ZDR2+9p-U zN~us;FvGkfw@AkWFr4l28u`15{5`30&J2L9qym4-61iS5&g3uR5XoaSu0S2p6&z_$ z`r+aPw{6=t0A|7my(xRPt+IOQui?eKTG|cC62x0o59sT0kEyB_C z9p3dJ5+1;bk3FA9H`1VrnU*=yU_vc80TPEVKYAC&S{3557HODlgpE$wnotTK+G2?n zT+?@s({0xa?g046V%>TH&?ft^#eA)hXQW|hcBB*$28!zi7@Jh5$vo1~^qrHg7fg}e zuZ&9*a|i%jFZjA-1Bi&MBMm^--s`b417@4HH}+&h>&u z+nR=MiY%z$2M+WY*=N(K^5{6G5TVxjk>gh<0|R8?tGk-#Cyg`=@M|a#-Xo(4n3SgP z{7f=<9xXpzuPnU*(TKGm61zYwj8?V%a4JmWqpSP(3y<$vI4(TS!irHN(h%L-#Dj*W z@5~@{4#V|==VFr2Fx$P7G`(o`=Zd5U(*28qg0k6BMpt7 zJ}2t)s4QKa$aEqN6q>Gw2v5hd=|Jnx_!VnEoP?4`8al-$YZl7{d(ZL`+*xLOJNYN# z5VJj#O;yAc8EL@mNLwFH)ahoSA{%vo1HJ*UAr$1n4;}>2vRFL4<#X1o0{}dG{moR@ zz>~@kmjU|#Tq4`586UkmnYmuD9Yma@Uzv&`A`KlY-0N!ICD$|uJmfG~48P^Nwov{(M=mnWy z=X$|z>b9{#y{4g^2Z(JQBm0$E)6n#tlK|j)!Ap?$=S=7&e=oUS5QWHSIcX{Tnuh5U zC))OJZ2k@auw}_p!t`_Z@8R2bU+*|RCP=Fy$(n|xfc6B%%A<;?6d7q4BJYN?%@@N1 z@re{r3r3sLf97uk0FJCbql`2#vtBxUnnm~FbO#V7M9sA81*@9AGpu=Dk&y;%KOD>S z#6;VEO9Y+POT^BjrvLyyUiqo*_|02k@aw%lZcES2Ji+$hTYd)s@Z$Ox@~V;+qBRYC$2rk7C1%~jup~)zoSo3g<#7qX)4F9cc?M`LJJdpR zLA21%#^qyDY+QNl%bAtu(EbxYKW^RQYXAV7mTdxn4of$8{~iF~>c3Y30KeS+we9zn z_Z|VzY4Mi*_b341?I*9-jUrS00rYxTiZRuJ#zAqOyuWhn%%*vVu8Pqkxj#ia#PXZR-3keH; zds3>G*~kP}#>dlLO!G+NE_%g|ZwTaBgiBUlRmRw7%d;-Psq>573u z>N+$LeTuv*;QMcYrKvqS!EsYjWRYhTpn_vVT|Ir_byjJgTDD9C$C7krhA!PGG7&_0 z{6gZ&?DIkcm(V)4g|}FQ*6rl>5KRSG3#_K5rlzJ^{0}WV>4vxNEHVH9002ovPDHLk FV1g7~g);yE literal 0 HcmV?d00001 diff --git a/Resources/Textures/Interface/Paper/paper_heading_postage_stamp.svg.96dpi.png.yml b/Resources/Textures/Interface/Paper/paper_heading_postage_stamp.svg.96dpi.png.yml new file mode 100644 index 0000000000..5c43e23305 --- /dev/null +++ b/Resources/Textures/Interface/Paper/paper_heading_postage_stamp.svg.96dpi.png.yml @@ -0,0 +1,2 @@ +sample: + filter: true diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/envelope.png b/Resources/Textures/Objects/Storage/boxes.rsi/envelope.png new file mode 100644 index 0000000000000000000000000000000000000000..93d52099fc2feb4c11840f0a4caf5dcbc41e18ca GIT binary patch literal 158 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}5uPrNArY-_ zFFJBH81T4U)QYnzZg_HImzGA?jFgx4yMty)UNU50IB;M0CVSep{de76vYt)THQ4$4 zsm@B1^tEmCnN{y{)n2`IKqrtlU-SjrcCL{B(hMJ-FesFWEL&Fa6yy>HPgg&ebxsLQ E04{1c0ssI2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json index 6963a9cdad..cdae38099d 100644 --- a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json +++ b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json @@ -220,6 +220,9 @@ }, { "name": "vials" + }, + { + "name": "envelope" } ] } From ca8ee5fb7759923066a51dce6d88ec55f566392b Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 30 Jul 2024 01:50:11 +0000 Subject: [PATCH 026/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 2bd96473dd..63513d85c3 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Dezzzix - changes: - - message: Goldschlager empty bottle renamed to Gildlager empty bottle - type: Tweak - id: 6505 - time: '2024-05-01T15:24:05.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27581 - author: FungiFellow changes: - message: Grilles now take Structural Damage @@ -3778,3 +3771,10 @@ id: 7004 time: '2024-07-30T01:22:17.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30474 +- author: themias + changes: + - message: Added envelopes to the PTech and bureaucracy crate + type: Add + id: 7005 + time: '2024-07-30T01:49:05.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30298 From 18370c3d1c7a599153fa71b5ca6037579edfd975 Mon Sep 17 00:00:00 2001 From: TheKittehJesus <29379890+SamGithubAccount@users.noreply.github.com> Date: Mon, 29 Jul 2024 21:14:11 -0500 Subject: [PATCH 027/422] Four cooking recipes changed to use liquid egg instead of whole egg, and 5u of milk added to cake batter (#30262) * Changed four cooking recipes to use egg fluid instead of whole eggs, see issue #30123 * Added 5u of milk to cake batter due to it becoming a subset of brownie recipe and occurring in beaker --- Resources/Prototypes/Recipes/Cooking/meal_recipes.yml | 10 ++++++---- Resources/Prototypes/Recipes/Reactions/food.yml | 2 ++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index b092005599..3c750e0190 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -646,12 +646,13 @@ name: chow mein recipe result: FoodNoodlesChowmein time: 10 + reagents: + Egg: 6 solids: FoodNoodlesBoiled: 1 FoodEggplant: 1 FoodCarrot: 1 FoodCorn: 1 - FoodEgg: 1 - type: microwaveMealRecipe id: RecipeOatmeal @@ -711,9 +712,10 @@ name: egg-fried rice recipe result: FoodRiceEgg time: 15 + reagents: + Egg: 6 solids: FoodRiceBoiled: 1 - FoodEgg: 1 FoodCarrot: 1 - type: microwaveMealRecipe @@ -1447,10 +1449,10 @@ reagents: Flour: 15 Sugar: 30 + Egg: 18 solids: FoodButter: 2 FoodSnackChocolateBar: 2 - FoodEgg: 3 #Donks i guess - type: microwaveMealRecipe @@ -1887,10 +1889,10 @@ reagents: Flour: 15 Sugar: 30 + Egg: 18 solids: FoodCannabisButter: 2 FoodSnackChocolateBar: 2 - FoodEgg: 3 - type: microwaveMealRecipe id: RecipeCornInButter diff --git a/Resources/Prototypes/Recipes/Reactions/food.yml b/Resources/Prototypes/Recipes/Reactions/food.yml index 5080039569..ce89131c7b 100644 --- a/Resources/Prototypes/Recipes/Reactions/food.yml +++ b/Resources/Prototypes/Recipes/Reactions/food.yml @@ -84,6 +84,8 @@ amount: 12 Sugar: amount: 5 + Milk: + amount: 5 effects: - !type:CreateEntityReactionEffect entity: FoodCakeBatter From 2f42e1d18e0b5d34e07f4c7c08046431e1ba89bd Mon Sep 17 00:00:00 2001 From: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com> Date: Tue, 30 Jul 2024 05:14:34 +0300 Subject: [PATCH 028/422] Vanquish inaccurate docs (#30449) --- Content.Server/Preferences/Managers/ServerPreferencesManager.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs index 8de458b6ee..2583ed0221 100644 --- a/Content.Server/Preferences/Managers/ServerPreferencesManager.cs +++ b/Content.Server/Preferences/Managers/ServerPreferencesManager.cs @@ -250,7 +250,6 @@ namespace Content.Server.Preferences.Managers /// /// Retrieves preferences for the given username from storage. - /// Creates and saves default preferences if they are not found, then returns them. /// public PlayerPreferences GetPreferences(NetUserId userId) { @@ -265,7 +264,6 @@ namespace Content.Server.Preferences.Managers /// /// Retrieves preferences for the given username from storage or returns null. - /// Creates and saves default preferences if they are not found, then returns them. /// public PlayerPreferences? GetPreferencesOrNull(NetUserId? userId) { From 3104215ced23bd486a35f2beee1d653800a8d059 Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 30 Jul 2024 02:15:17 +0000 Subject: [PATCH 029/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 63513d85c3..5cda1fc519 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: FungiFellow - changes: - - message: Grilles now take Structural Damage - type: Tweak - id: 6506 - time: '2024-05-01T22:23:42.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27596 - author: lzk228 changes: - message: Immovable rod announce now happens at the end of event. @@ -3778,3 +3771,13 @@ id: 7005 time: '2024-07-30T01:49:05.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30298 +- author: TheKittehJesus + changes: + - message: The recipe for chow mein, egg-fried rice, and both brownies now use liquid + egg instead of a whole egg. + type: Tweak + - message: Cake batter now also requires 5u of milk + type: Tweak + id: 7006 + time: '2024-07-30T02:14:11.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30262 From 031eb9606c43bcdb1e53aec5345d0a45f4ce6460 Mon Sep 17 00:00:00 2001 From: Plykiya <58439124+Plykiya@users.noreply.github.com> Date: Mon, 29 Jul 2024 19:17:27 -0700 Subject: [PATCH 030/422] Make magic mirror do-after longer, add popups to notify the target (#30366) * Make magic mirror do-after longer, add popups to notify the target * Turns out I do have access to the user * More detailed popups * Helmets protecc --------- Co-authored-by: plykiya --- .../MagicMirror/MagicMirrorSystem.cs | 147 +++++++++++++++++- .../MagicMirror/MagicMirrorComponent.cs | 16 +- .../components/magic-mirror-component.ftl | 14 +- 3 files changed, 164 insertions(+), 13 deletions(-) diff --git a/Content.Server/MagicMirror/MagicMirrorSystem.cs b/Content.Server/MagicMirror/MagicMirrorSystem.cs index 8d8a6bfa3b..f4f889e549 100644 --- a/Content.Server/MagicMirror/MagicMirrorSystem.cs +++ b/Content.Server/MagicMirror/MagicMirrorSystem.cs @@ -4,8 +4,12 @@ using Content.Server.Humanoid; using Content.Shared.DoAfter; using Content.Shared.Humanoid; using Content.Shared.Humanoid.Markings; +using Content.Shared.IdentityManagement; using Content.Shared.Interaction; +using Content.Shared.Inventory; using Content.Shared.MagicMirror; +using Content.Shared.Popups; +using Content.Shared.Tag; using Robust.Shared.Audio.Systems; namespace Content.Server.MagicMirror; @@ -19,6 +23,9 @@ public sealed class MagicMirrorSystem : SharedMagicMirrorSystem [Dependency] private readonly DoAfterSystem _doAfterSystem = default!; [Dependency] private readonly MarkingManager _markings = default!; [Dependency] private readonly HumanoidAppearanceSystem _humanoid = default!; + [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private readonly InventorySystem _inventory = default!; + [Dependency] private readonly TagSystem _tagSystem = default!; public override void Initialize() { @@ -46,9 +53,26 @@ public sealed class MagicMirrorSystem : SharedMagicMirrorSystem if (component.Target is not { } target) return; + // Check if the target getting their hair altered has any clothes that hides their hair + if (CheckHeadSlotOrClothes(message.Actor, component.Target.Value)) + { + _popup.PopupEntity( + component.Target == message.Actor + ? Loc.GetString("magic-mirror-blocked-by-hat-self") + : Loc.GetString("magic-mirror-blocked-by-hat-self-target"), + message.Actor, + message.Actor, + PopupType.Medium); + return; + } + _doAfterSystem.Cancel(component.DoAfter); component.DoAfter = null; + var doafterTime = component.SelectSlotTime; + if (component.Target == message.Actor) + doafterTime /= 3; + var doAfter = new MagicMirrorSelectDoAfterEvent() { Category = message.Category, @@ -56,7 +80,7 @@ public sealed class MagicMirrorSystem : SharedMagicMirrorSystem Marking = message.Marking, }; - _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, message.Actor, component.SelectSlotTime, doAfter, uid, target: target, used: uid) + _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, message.Actor, doafterTime, doAfter, uid, target: target, used: uid) { DistanceThreshold = SharedInteractionSystem.InteractionRange, BreakOnDamage = true, @@ -66,6 +90,15 @@ public sealed class MagicMirrorSystem : SharedMagicMirrorSystem }, out var doAfterId); + if (component.Target == message.Actor) + { + _popup.PopupEntity(Loc.GetString("magic-mirror-change-slot-self"), component.Target.Value, component.Target.Value, PopupType.Medium); + } + else + { + _popup.PopupEntity(Loc.GetString("magic-mirror-change-slot-target", ("user", Identity.Name(message.Actor, EntityManager))), component.Target.Value, component.Target.Value, PopupType.Medium); + } + component.DoAfter = doAfterId; _audio.PlayPvs(component.ChangeHairSound, uid); } @@ -102,9 +135,26 @@ public sealed class MagicMirrorSystem : SharedMagicMirrorSystem if (component.Target is not { } target) return; + // Check if the target getting their hair altered has any clothes that hides their hair + if (CheckHeadSlotOrClothes(message.Actor, component.Target.Value)) + { + _popup.PopupEntity( + component.Target == message.Actor + ? Loc.GetString("magic-mirror-blocked-by-hat-self") + : Loc.GetString("magic-mirror-blocked-by-hat-self-target"), + message.Actor, + message.Actor, + PopupType.Medium); + return; + } + _doAfterSystem.Cancel(component.DoAfter); component.DoAfter = null; + var doafterTime = component.ChangeSlotTime; + if (component.Target == message.Actor) + doafterTime /= 3; + var doAfter = new MagicMirrorChangeColorDoAfterEvent() { Category = message.Category, @@ -112,7 +162,7 @@ public sealed class MagicMirrorSystem : SharedMagicMirrorSystem Colors = message.Colors, }; - _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, message.Actor, component.ChangeSlotTime, doAfter, uid, target: target, used: uid) + _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, message.Actor, doafterTime, doAfter, uid, target: target, used: uid) { BreakOnDamage = true, BreakOnMove = true, @@ -121,6 +171,15 @@ public sealed class MagicMirrorSystem : SharedMagicMirrorSystem }, out var doAfterId); + if (component.Target == message.Actor) + { + _popup.PopupEntity(Loc.GetString("magic-mirror-change-color-self"), component.Target.Value, component.Target.Value, PopupType.Medium); + } + else + { + _popup.PopupEntity(Loc.GetString("magic-mirror-change-color-target", ("user", Identity.Name(message.Actor, EntityManager))), component.Target.Value, component.Target.Value, PopupType.Medium); + } + component.DoAfter = doAfterId; } private void OnChangeColorDoAfter(EntityUid uid, MagicMirrorComponent component, MagicMirrorChangeColorDoAfterEvent args) @@ -156,16 +215,33 @@ public sealed class MagicMirrorSystem : SharedMagicMirrorSystem if (component.Target is not { } target) return; + // Check if the target getting their hair altered has any clothes that hides their hair + if (CheckHeadSlotOrClothes(message.Actor, component.Target.Value)) + { + _popup.PopupEntity( + component.Target == message.Actor + ? Loc.GetString("magic-mirror-blocked-by-hat-self") + : Loc.GetString("magic-mirror-blocked-by-hat-self-target"), + message.Actor, + message.Actor, + PopupType.Medium); + return; + } + _doAfterSystem.Cancel(component.DoAfter); component.DoAfter = null; + var doafterTime = component.RemoveSlotTime; + if (component.Target == message.Actor) + doafterTime /= 3; + var doAfter = new MagicMirrorRemoveSlotDoAfterEvent() { Category = message.Category, Slot = message.Slot, }; - _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, message.Actor, component.RemoveSlotTime, doAfter, uid, target: target, used: uid) + _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, message.Actor, doafterTime, doAfter, uid, target: target, used: uid) { DistanceThreshold = SharedInteractionSystem.InteractionRange, BreakOnDamage = true, @@ -174,6 +250,15 @@ public sealed class MagicMirrorSystem : SharedMagicMirrorSystem }, out var doAfterId); + if (component.Target == message.Actor) + { + _popup.PopupEntity(Loc.GetString("magic-mirror-remove-slot-self"), component.Target.Value, component.Target.Value, PopupType.Medium); + } + else + { + _popup.PopupEntity(Loc.GetString("magic-mirror-remove-slot-target", ("user", Identity.Name(message.Actor, EntityManager))), component.Target.Value, component.Target.Value, PopupType.Medium); + } + component.DoAfter = doAfterId; _audio.PlayPvs(component.ChangeHairSound, uid); } @@ -210,15 +295,32 @@ public sealed class MagicMirrorSystem : SharedMagicMirrorSystem if (component.Target == null) return; + // Check if the target getting their hair altered has any clothes that hides their hair + if (CheckHeadSlotOrClothes(message.Actor, component.Target.Value)) + { + _popup.PopupEntity( + component.Target == message.Actor + ? Loc.GetString("magic-mirror-blocked-by-hat-self") + : Loc.GetString("magic-mirror-blocked-by-hat-self-target"), + message.Actor, + message.Actor, + PopupType.Medium); + return; + } + _doAfterSystem.Cancel(component.DoAfter); component.DoAfter = null; + var doafterTime = component.AddSlotTime; + if (component.Target == message.Actor) + doafterTime /= 3; + var doAfter = new MagicMirrorAddSlotDoAfterEvent() { Category = message.Category, }; - _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, message.Actor, component.AddSlotTime, doAfter, uid, target: component.Target.Value, used: uid) + _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, message.Actor, doafterTime, doAfter, uid, target: component.Target.Value, used: uid) { BreakOnDamage = true, BreakOnMove = true, @@ -227,6 +329,15 @@ public sealed class MagicMirrorSystem : SharedMagicMirrorSystem }, out var doAfterId); + if (component.Target == message.Actor) + { + _popup.PopupEntity(Loc.GetString("magic-mirror-add-slot-self"), component.Target.Value, component.Target.Value, PopupType.Medium); + } + else + { + _popup.PopupEntity(Loc.GetString("magic-mirror-add-slot-target", ("user", Identity.Name(message.Actor, EntityManager))), component.Target.Value, component.Target.Value, PopupType.Medium); + } + component.DoAfter = doAfterId; _audio.PlayPvs(component.ChangeHairSound, uid); } @@ -265,4 +376,32 @@ public sealed class MagicMirrorSystem : SharedMagicMirrorSystem ent.Comp.Target = null; Dirty(ent); } + + /// + /// Helper function that checks if the wearer has anything on their head + /// Or if they have any clothes that hides their hair + /// + private bool CheckHeadSlotOrClothes(EntityUid user, EntityUid target) + { + if (TryComp(target, out var inventoryComp)) + { + // any hat whatsoever will block haircutting + if (_inventory.TryGetSlotEntity(target, "head", out var hat, inventoryComp)) + { + return true; + } + + // maybe there's some kind of armor that has the HidesHair tag as well, so check every slot for it + var slots = _inventory.GetSlotEnumerator((target, inventoryComp), SlotFlags.WITHOUT_POCKET); + while (slots.MoveNext(out var slot)) + { + if (slot.ContainedEntity != null && _tagSystem.HasTag(slot.ContainedEntity.Value, "HidesHair")) + { + return true; + } + } + } + + return false; + } } diff --git a/Content.Shared/MagicMirror/MagicMirrorComponent.cs b/Content.Shared/MagicMirror/MagicMirrorComponent.cs index 95b1736979..97738be228 100644 --- a/Content.Shared/MagicMirror/MagicMirrorComponent.cs +++ b/Content.Shared/MagicMirror/MagicMirrorComponent.cs @@ -20,28 +20,28 @@ public sealed partial class MagicMirrorComponent : Component public EntityUid? Target; /// - /// doafter time required to add a new slot + /// Do after time to add a new slot, adding hair to a person /// [DataField, ViewVariables(VVAccess.ReadWrite)] - public TimeSpan AddSlotTime = TimeSpan.FromSeconds(5); + public TimeSpan AddSlotTime = TimeSpan.FromSeconds(7); /// - /// doafter time required to remove a existing slot + /// Do after time to remove a slot, removing hair from a person /// [DataField, ViewVariables(VVAccess.ReadWrite)] - public TimeSpan RemoveSlotTime = TimeSpan.FromSeconds(2); + public TimeSpan RemoveSlotTime = TimeSpan.FromSeconds(7); /// - /// doafter time required to change slot + /// Do after time to change a person's hairstyle /// [DataField, ViewVariables(VVAccess.ReadWrite)] - public TimeSpan SelectSlotTime = TimeSpan.FromSeconds(3); + public TimeSpan SelectSlotTime = TimeSpan.FromSeconds(7); /// - /// doafter time required to recolor slot + /// Do after time to change a person's hair color /// [DataField, ViewVariables(VVAccess.ReadWrite)] - public TimeSpan ChangeSlotTime = TimeSpan.FromSeconds(1); + public TimeSpan ChangeSlotTime = TimeSpan.FromSeconds(7); /// /// Sound emitted when slots are changed diff --git a/Resources/Locale/en-US/character-appearance/components/magic-mirror-component.ftl b/Resources/Locale/en-US/character-appearance/components/magic-mirror-component.ftl index e9018171a4..0906cccee5 100644 --- a/Resources/Locale/en-US/character-appearance/components/magic-mirror-component.ftl +++ b/Resources/Locale/en-US/character-appearance/components/magic-mirror-component.ftl @@ -1,3 +1,15 @@ magic-mirror-component-activate-user-has-no-hair = You can't have any hair! -magic-mirror-window-title = Magic Mirror \ No newline at end of file +magic-mirror-window-title = Magic Mirror +magic-mirror-add-slot-self = You're giving yourself some hair. +magic-mirror-remove-slot-self = You're removing some of your hair. +magic-mirror-change-slot-self = You're changing your hairstyle. +magic-mirror-change-color-self = You're changing your hair color. + +magic-mirror-add-slot-target = Hair is being added to you by {$user}. +magic-mirror-remove-slot-target = Your hair is being cut off by {$user}. +magic-mirror-change-slot-target = Your hairstyle is being changed by {$user}. +magic-mirror-change-color-target = Your hair color is being changed by {$user}. + +magic-mirror-blocked-by-hat-self = You need to take off your hat before changing your hair. +magic-mirror-blocked-by-hat-self-target = You try to change their hair but their clothes gets in the way. From cc3d6441be9cb0dd510b9100e031a4be931c09ea Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 30 Jul 2024 02:18:33 +0000 Subject: [PATCH 031/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 5cda1fc519..30cdab82b6 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: lzk228 - changes: - - message: Immovable rod announce now happens at the end of event. - type: Tweak - id: 6507 - time: '2024-05-01T22:26:22.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27587 - author: metalgearsloth changes: - message: Fix server performance dropping significantly. @@ -3781,3 +3774,15 @@ id: 7006 time: '2024-07-30T02:14:11.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30262 +- author: Plykiya + changes: + - message: Wearing something that covers your head will prevent your hair from being + cut. + type: Add + - message: You now see a popup when your hair is being altered. + type: Add + - message: The doafter for altering other people's hair now takes seven seconds. + type: Tweak + id: 7007 + time: '2024-07-30T02:17:28.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30366 From 669cc55ba477c19fd17ebaf22534ad127d4305b7 Mon Sep 17 00:00:00 2001 From: osjarw <62134478+osjarw@users.noreply.github.com> Date: Tue, 30 Jul 2024 05:18:53 +0300 Subject: [PATCH 032/422] Allow the creation of recursive HTNs (#30138) Allow recursive HTNs --- Content.IntegrationTests/Tests/NPC/NPCTest.cs | 4 ++++ Content.Server/NPC/HTN/HTNCompoundPrototype.cs | 6 ++++++ Content.Server/NPC/HTN/HTNPlanJob.cs | 5 +++++ Content.Server/NPC/HTN/HTNTask.cs | 6 ++++++ 4 files changed, 21 insertions(+) diff --git a/Content.IntegrationTests/Tests/NPC/NPCTest.cs b/Content.IntegrationTests/Tests/NPC/NPCTest.cs index 83321fe613..064fd6c5bf 100644 --- a/Content.IntegrationTests/Tests/NPC/NPCTest.cs +++ b/Content.IntegrationTests/Tests/NPC/NPCTest.cs @@ -45,6 +45,10 @@ public sealed class NPCTest var count = counts.GetOrNew(compound.ID); count++; + // Compound tasks marked with AllowRecursion are only evaluated once + if (counts.ContainsKey(compound.ID) && compound.AllowRecursion) + continue; + Assert.That(count, Is.LessThan(50)); counts[compound.ID] = count; Count(protoManager.Index(compoundTask.Task), counts, htnSystem, protoManager); diff --git a/Content.Server/NPC/HTN/HTNCompoundPrototype.cs b/Content.Server/NPC/HTN/HTNCompoundPrototype.cs index 29cfb96f97..69f8441973 100644 --- a/Content.Server/NPC/HTN/HTNCompoundPrototype.cs +++ b/Content.Server/NPC/HTN/HTNCompoundPrototype.cs @@ -12,4 +12,10 @@ public sealed partial class HTNCompoundPrototype : IPrototype [DataField("branches", required: true)] public List Branches = new(); + + /// + /// Exclude this compound task from the CompoundRecursion integration test. + /// + [DataField] + public bool AllowRecursion = false; } diff --git a/Content.Server/NPC/HTN/HTNPlanJob.cs b/Content.Server/NPC/HTN/HTNPlanJob.cs index 8158303524..9c62f5840a 100644 --- a/Content.Server/NPC/HTN/HTNPlanJob.cs +++ b/Content.Server/NPC/HTN/HTNPlanJob.cs @@ -63,8 +63,13 @@ public sealed class HTNPlanJob : Job // How many primitive tasks we've added since last record. var primitiveCount = 0; + int tasksProcessed = 0; + while (tasksToProcess.TryDequeue(out var currentTask)) { + if (tasksProcessed++ > _rootTask.MaximumTasks) + throw new Exception("HTN Planner exceeded maximum tasks"); + switch (currentTask) { case HTNCompoundTask compound: diff --git a/Content.Server/NPC/HTN/HTNTask.cs b/Content.Server/NPC/HTN/HTNTask.cs index 0f7c0a377e..c09849d079 100644 --- a/Content.Server/NPC/HTN/HTNTask.cs +++ b/Content.Server/NPC/HTN/HTNTask.cs @@ -3,4 +3,10 @@ namespace Content.Server.NPC.HTN; [ImplicitDataDefinitionForInheritors] public abstract partial class HTNTask { + /// + /// Limit the amount of tasks the planner considers. Exceeding this value sleeps the NPC and throws an exception. + /// The expected way to hit this limit is with badly written recursive tasks. + /// + [DataField] + public int MaximumTasks = 1000; } From ad81c30dcb8c5774fbb25ace76b6f5ba3b9867a5 Mon Sep 17 00:00:00 2001 From: Cojoke <83733158+Cojoke-dot@users.noreply.github.com> Date: Mon, 29 Jul 2024 21:48:28 -0500 Subject: [PATCH 033/422] Lets Hamlet Dance (#30478) Allow Ghost Roles that have NPC to turn on Combat Mode --- Content.Shared/CombatMode/SharedCombatModeSystem.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Content.Shared/CombatMode/SharedCombatModeSystem.cs b/Content.Shared/CombatMode/SharedCombatModeSystem.cs index 60d1362bb0..5eed8ee242 100644 --- a/Content.Shared/CombatMode/SharedCombatModeSystem.cs +++ b/Content.Shared/CombatMode/SharedCombatModeSystem.cs @@ -1,4 +1,5 @@ using Content.Shared.Actions; +using Content.Shared.Mind; using Content.Shared.MouseRotator; using Content.Shared.Movement.Components; using Content.Shared.Popups; @@ -13,6 +14,7 @@ public abstract class SharedCombatModeSystem : EntitySystem [Dependency] private readonly INetManager _netMan = default!; [Dependency] private readonly SharedActionsSystem _actionsSystem = default!; [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private readonly SharedMindSystem _mind = default!; public override void Initialize() { @@ -82,7 +84,7 @@ public abstract class SharedCombatModeSystem : EntitySystem _actionsSystem.SetToggled(component.CombatToggleActionEntity, component.IsInCombatMode); // Change mouse rotator comps if flag is set - if (!component.ToggleMouseRotator || IsNpc(entity)) + if (!component.ToggleMouseRotator || IsNpc(entity) && !_mind.TryGetMind(entity, out _, out _)) return; SetMouseRotatorComponents(entity, value); From 16ec6443f6959262cb8a387b0223db6fff1a76dc Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 30 Jul 2024 02:49:34 +0000 Subject: [PATCH 034/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 30cdab82b6..2a3c77c49a 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: metalgearsloth - changes: - - message: Fix server performance dropping significantly. - type: Fix - id: 6508 - time: '2024-05-02T00:18:38.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27528 - author: metalgearsloth changes: - message: Fix muzzle flash rotations. @@ -3786,3 +3779,10 @@ id: 7007 time: '2024-07-30T02:17:28.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30366 +- author: Cojoke-dot + changes: + - message: Hamlet and other ghost rolls can now spin when they enter combat mode + type: Fix + id: 7008 + time: '2024-07-30T02:48:28.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30478 From 92210ff51bd61cb7c4efd118a99b17e56fdcf162 Mon Sep 17 00:00:00 2001 From: themias <89101928+themias@users.noreply.github.com> Date: Mon, 29 Jul 2024 23:04:17 -0400 Subject: [PATCH 035/422] Fix ACC wire light not appearing (#30453) --- Content.Server/Access/LogWireAction.cs | 2 +- Content.Shared/Access/SharedAccessWire.cs | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Content.Server/Access/LogWireAction.cs b/Content.Server/Access/LogWireAction.cs index 1e97d5c9d6..837cf420d5 100644 --- a/Content.Server/Access/LogWireAction.cs +++ b/Content.Server/Access/LogWireAction.cs @@ -25,7 +25,7 @@ public sealed partial class LogWireAction : ComponentWireAction AccessWireActionKey.Status; + public override object StatusKey => LogWireActionKey.Status; public override void Initialize() { diff --git a/Content.Shared/Access/SharedAccessWire.cs b/Content.Shared/Access/SharedAccessWire.cs index d5d1b48c70..a0bb316028 100644 --- a/Content.Shared/Access/SharedAccessWire.cs +++ b/Content.Shared/Access/SharedAccessWire.cs @@ -10,3 +10,12 @@ public enum AccessWireActionKey : byte Pulsed, PulseCancel } + +[Serializable, NetSerializable] +public enum LogWireActionKey : byte +{ + Key, + Status, + Pulsed, + PulseCancel +} From fc65acc7a05197bdcd7a35ec5fc1b2b3a98ecfed Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 30 Jul 2024 03:05:23 +0000 Subject: [PATCH 036/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 2a3c77c49a..39a40a9417 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,13 +1,4 @@ Entries: -- author: metalgearsloth - changes: - - message: Fix muzzle flash rotations. - type: Fix - - message: Fix large client performance drop. - type: Fix - id: 6509 - time: '2024-05-02T02:40:07.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27533 - author: ElectroJr changes: - message: Fix gas analyzers not opening their UI when used in-hand. @@ -3786,3 +3777,10 @@ id: 7008 time: '2024-07-30T02:48:28.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30478 +- author: themias + changes: + - message: Fixed the ACC wire not appearing in vending machine wire layouts + type: Fix + id: 7009 + time: '2024-07-30T03:04:17.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30453 From c4c4a934af7655a3c9c936210c9ea5a777ae167e Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Tue, 30 Jul 2024 00:03:46 -0400 Subject: [PATCH 037/422] fix lathe screen animations (#30479) --- Content.Client/Lathe/LatheSystem.cs | 28 +++++++---- Content.Shared/Lathe/LatheComponent.cs | 6 +++ .../Entities/Structures/Machines/lathe.yml | 4 ++ .../Machines/autolathe.rsi/meta.json | 34 +++++++++---- .../Machines/autolathe.rsi/unlit-building.png | Bin 0 -> 521 bytes .../Machines/autolathe_hypercon.rsi/meta.json | 34 +++++++++---- .../autolathe_hypercon.rsi/unlit-building.png | Bin 0 -> 859 bytes .../Machines/protolathe.rsi/meta.json | 46 +++++++++++++----- .../protolathe.rsi/unlit-building.png | Bin 0 -> 604 bytes .../protolathe_hypercon.rsi/meta.json | 37 ++++++++++---- .../unlit-building.png | Bin 0 -> 1236 bytes 11 files changed, 138 insertions(+), 51 deletions(-) create mode 100644 Resources/Textures/Structures/Machines/autolathe.rsi/unlit-building.png create mode 100644 Resources/Textures/Structures/Machines/autolathe_hypercon.rsi/unlit-building.png create mode 100644 Resources/Textures/Structures/Machines/protolathe.rsi/unlit-building.png create mode 100644 Resources/Textures/Structures/Machines/protolathe_hypercon.rsi/unlit-building.png diff --git a/Content.Client/Lathe/LatheSystem.cs b/Content.Client/Lathe/LatheSystem.cs index c72f01b39b..386520c198 100644 --- a/Content.Client/Lathe/LatheSystem.cs +++ b/Content.Client/Lathe/LatheSystem.cs @@ -22,21 +22,29 @@ public sealed class LatheSystem : SharedLatheSystem if (args.Sprite == null) return; + // Lathe specific stuff + if (_appearance.TryGetData(uid, LatheVisuals.IsRunning, out var isRunning, args.Component)) + { + if (args.Sprite.LayerMapTryGet(LatheVisualLayers.IsRunning, out var runningLayer) && + component.RunningState != null && + component.IdleState != null) + { + var state = isRunning ? component.RunningState : component.IdleState; + args.Sprite.LayerSetState(runningLayer, state); + } + } + if (_appearance.TryGetData(uid, PowerDeviceVisuals.Powered, out var powered, args.Component) && args.Sprite.LayerMapTryGet(PowerDeviceVisualLayers.Powered, out var powerLayer)) { args.Sprite.LayerSetVisible(powerLayer, powered); - } - // Lathe specific stuff - if (_appearance.TryGetData(uid, LatheVisuals.IsRunning, out var isRunning, args.Component) && - args.Sprite.LayerMapTryGet(LatheVisualLayers.IsRunning, out var runningLayer) && - component.RunningState != null && - component.IdleState != null) - { - var state = isRunning ? component.RunningState : component.IdleState; - args.Sprite.LayerSetAnimationTime(runningLayer, 0f); - args.Sprite.LayerSetState(runningLayer, state); + if (component.UnlitIdleState != null && + component.UnlitRunningState != null) + { + var state = isRunning ? component.UnlitRunningState : component.UnlitIdleState; + args.Sprite.LayerSetState(powerLayer, state); + } } } diff --git a/Content.Shared/Lathe/LatheComponent.cs b/Content.Shared/Lathe/LatheComponent.cs index 88ac8c05bf..5039e78cb0 100644 --- a/Content.Shared/Lathe/LatheComponent.cs +++ b/Content.Shared/Lathe/LatheComponent.cs @@ -39,6 +39,12 @@ namespace Content.Shared.Lathe [DataField] public string? RunningState; + + [DataField] + public string? UnlitIdleState; + + [DataField] + public string? UnlitRunningState; #endregion /// diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 66f4f684e9..8abcc657cd 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -115,6 +115,8 @@ - type: Lathe idleState: icon runningState: building + unlitIdleState: unlit + unlitRunningState: unlit-building staticRecipes: - Wirecutter - Igniter @@ -266,6 +268,8 @@ - type: Lathe idleState: icon runningState: building + unlitIdleState: unlit + unlitRunningState: unlit-building staticRecipes: - LargeBeaker - Dropper diff --git a/Resources/Textures/Structures/Machines/autolathe.rsi/meta.json b/Resources/Textures/Structures/Machines/autolathe.rsi/meta.json index b53c89c7a6..2e28bba287 100644 --- a/Resources/Textures/Structures/Machines/autolathe.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/autolathe.rsi/meta.json @@ -20,15 +20,31 @@ "name": "building", "delays": [ [ - 0.5, - 0.5, - 0.5, - 0.5, - 0.5, - 0.5, - 0.5, - 0.5, - 0.5 + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15 + ] + ] + }, + { + "name": "unlit-building", + "delays": [ + [ + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15, + 0.15 ] ] }, diff --git a/Resources/Textures/Structures/Machines/autolathe.rsi/unlit-building.png b/Resources/Textures/Structures/Machines/autolathe.rsi/unlit-building.png new file mode 100644 index 0000000000000000000000000000000000000000..5b17c682dc21acc38e09671d72c55d6c5ef9a2be GIT binary patch literal 521 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D%z4|}>ehE&XX zd)MBN$x-C^$MzGf8QZ?`wY7xtC-|qju9oHG6+3q1+^sI{0tSs7k3B43&8C@%C7bTx zdF(drsqM6%b+Z&_Pq;t(udv3wHyuFJ!Jt8fH!U|@W^3=KzRZ2k{^%#Ohj-8G&@oTe z*nN6Y>(kA9Lfr%9^{+4cIqUQKkPjRE57d8pe}DhBKHv7(t$zaV6<$s(e_k>5&kNxT zEE|Oj%x*sRJT2;;3nbUhwK)CfQN|&Ym^%F?*KPZMg#BE~wt3rY`!BH;Sx?u`{WEiY z;h{q@@%~r;bl2|R5cTEBt7paOA{Q&O^5lQdzVq{Tk@o+eFMsSmn7D4eyS6;cy&&4b zdFhq;@{2A1XOx$C{rzbOa@vOd&WFr$&;G0VzcZrQwQeKZ)~}4y_WtyI68-)7@_G69 zQ|*L*y2Ozr)Dy{xCl^O)AwAltyeJ2j}jF0$?hYc0Px&6-h)vRCt{2-OW$aa2&_+Z%0vM;(vToh^FJ(f?A{SyD5=Ed zmk#Q!voGf~|LVz+3IILwVt=P~+52339(xJY;#Cz9*_@rQcBu^IZ!g7u?uYe76%kpR zv6p}0_)*~d$LIUs|8U}BvV8x;Z&dH9h)DI*)<17dvjfsv{ZdmAk?G|-8eE^O^8LKH z{O}I2o1cikb3{aHbM}s`LCKe|w*&dt`4I#F0000000000000nT)T!==e!i#LD#m7= zKRY$9PDGMPzR`R@X{`CSQlOKcWih7wH@~4G^WU?Z3-CR>Tdj5s~vlogI9UXTWLw_-;?5^n3o?x4Hx`L780l0HBYg>Bsx^ z?d{oX)_yF#+<%>TJ|J~JKY?&PK0g2bt0yWVvQbFb;`TT0h}4W%?FgnhC|ixtb6*8M_oA=QLJCcYz^!+qK)PQ+I#u7d-|v4pY8IqB9c76 zz^}+3YiD(NYx4nh&t5q!$^HAgDarE-M8ey_=JOK(px*^6+kXH4Bp){x)Ai#m=kIMk zv;O>m@be3nV?TFy?Wu~0Y$bhuLaU#@)a=Kv>}|%*2b{J6(n@>({;uV(49I+d&B>EN l$q&va)Os+V000<#e*ni-<1RzX3)}zz002ovPDHLkV1hu5u`vJu literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/protolathe.rsi/meta.json b/Resources/Textures/Structures/Machines/protolathe.rsi/meta.json index 17832603ef..57f80369d0 100644 --- a/Resources/Textures/Structures/Machines/protolathe.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/protolathe.rsi/meta.json @@ -20,19 +20,39 @@ "name": "building", "delays": [ [ - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8, - 0.8 + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10 + ] + ] + }, + { + "name": "unlit-building", + "delays": [ + [ + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10 ] ] }, diff --git a/Resources/Textures/Structures/Machines/protolathe.rsi/unlit-building.png b/Resources/Textures/Structures/Machines/protolathe.rsi/unlit-building.png new file mode 100644 index 0000000000000000000000000000000000000000..b72d06d65465e7baf9b41d9be12de9b6bfd5ffd5 GIT binary patch literal 604 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-HD>U=s6maSW-L z^Y+e0ujoVxwg>vY#mst*d3!swgjz00znHgj^6V0xjt6%vqt(+FI_EiXxq4~!oy$8E zS;Z{tw_G@>r(lWYfBEy3^PcuI*6zRGpmzATE6@%wm}@Ze`{}EjSO2`6bm7CumI z*Z#cv_)5m|Q+TcHzuHOrKk6UI-v09Fba}zRE58|+Ki~W5o8GC*pW~+eZ`}Rho8G2- zw%K)GA3c{^bn5Kf`M1}d`KUCxa=*==qKI|#1vB+bfM)*4i3xk2a!>zw`s0-SC%)c! z_4>-s()a(%1_Jp{9CTQTHf?r?sR_szs2T-=WYE`ryG@Liov|k(6Dq>?5x%D`u4H^j+GT$ z?fyT%?$7i5dO6$j!ad=;<#g?1>lXiJT&1{bSJA4vJ%4`v?0v_6 z{`l$gv;DpgHSPUQo}bOXCG1_@u0LmfGs4YhsBqnNrT=}^zP}8z=eNr*c>MDl^9lAF z)9(B&0kO8rGu+q*VI#Bzgukn^dHLo^9mA!}r*#akvcJ|bFibji&tF~tZ%ISgC4Y8? b2C*OPH7DL_mDhUnfHZo#`njxgN@xNAvt23t literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/protolathe_hypercon.rsi/meta.json b/Resources/Textures/Structures/Machines/protolathe_hypercon.rsi/meta.json index b0326326f9..775b298d5a 100644 --- a/Resources/Textures/Structures/Machines/protolathe_hypercon.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/protolathe_hypercon.rsi/meta.json @@ -20,16 +20,33 @@ "name": "building", "delays": [ [ - 1.0, - 1.0, - 1.0, - 1.0, - 1.0, - 1.0, - 1.0, - 1.0, - 1.0, - 1.0 + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10 + ] + ] + }, + { + "name": "unlit-building", + "delays": [ + [ + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10, + 0.10 ] ] }, diff --git a/Resources/Textures/Structures/Machines/protolathe_hypercon.rsi/unlit-building.png b/Resources/Textures/Structures/Machines/protolathe_hypercon.rsi/unlit-building.png new file mode 100644 index 0000000000000000000000000000000000000000..bce4888e2a702546a41a8f8d7ea6c88415b7d9d2 GIT binary patch literal 1236 zcmZvceNYm17{`Ckm+LgbGDoGUX)3dpN;M59sEKbSl&NWiR2Se`1ioa5Ae?QfZBu*E zP7^UtSH8hgqf14s&E@9FTFp^-t~C*B zTQMd6ZYaww;$5|W1#sWy+SaRWi{ZN=(b<|N>^T|NLaaNsI^Hvc%*==Q)&{1Bl@_N^ z{0G*lLb12#)3?$WxcZJt>57s!*64YY?;8~Q1wwnb>paCc19#{VZ7QdrM$!5)PuuX0 zo_yiRb}IywQ&`*i(y+&p^~Cvw!F$AbvKn2n#7-Ry5>aR;`X1t3=MDG^jQyk_vmTx4 zFt^fsqli(V|2mn5Y^{BhSv}&n6|ffGKYcK*@msJ4Sk7zx$3Ytl?ZrBdUPiIgL+wGU zjY8iNe?N~v6b-HxQr3ig=nV}d>?(9`ju}&ShySEkXBB~4YrnkSH*aiHm?dT4%)k_F z>OoV2*H-{Z?p=8MIIYN>sEsl5r#VHlu*(zs`O9ZJWd5={YHZ8RWVRu3o1UNr&k`K8 z{rL;1sjdjsa@~2TIjzwhk3QN7>v})ITGGC$s_hHhYpW51;zrpaW}1f$RST| z4Netl;K2W()9)U3(T6tevhywjBI{wPNhs8>2W?}sC72=RYE}f*0&sA=)+x&kFN9A8+b3f`+HL>SLQk$SY z1PMBJX|da~*;fFy)vY?@1$a7S0F*7Ry=x;|+ zgqS~63UHS*6Qrt^FcF|%3VXSI4U^IIK3a@$;$}^b!CrNjY9PgjocEU0JGobR5|PuF zOu6l-E`&knbLkNR9G{*fBxWa&=R}KFg+*25?|iQ8&AzdGLu_eLI=2J34%L!8Cf;~$ z1N6Ch#RJdtE2q{;$>Q`ZZ|)D&9>6-_1UlASbY?DXr!{5BJNt@4(o{E3p!?XcXq2+A z8z;oMWHHJdMTh&I*k?n^@{YxP(ZB!J+a1^R^9$|2tPMZse{g$w zoK2E@rA1q1LApBL4Y=&yiEoMzr^?C|nowN{wV~&r^67@%GujgOBxN8pR_I{UlxtjnB`^pOg2v tYgo&q21yEeedAFizcPdE`kCrcIfocLW* Date: Mon, 29 Jul 2024 23:40:39 -0500 Subject: [PATCH 038/422] Security biosuit sprite fix (#30151) sec biosuit fix --- .../Bio/security.rsi/equipped-HELMET.png | Bin 1003 -> 968 bytes .../Head/Hoods/Bio/security.rsi/icon.png | Bin 367 -> 396 bytes .../Hoods/Bio/security.rsi/inhand-left.png | Bin 829 -> 920 bytes .../Hoods/Bio/security.rsi/inhand-right.png | Bin 834 -> 922 bytes .../Head/Hoods/Bio/security.rsi/meta.json | 2 +- .../security.rsi/equipped-OUTERCLOTHING.png | Bin 2233 -> 2285 bytes .../OuterClothing/Bio/security.rsi/icon.png | Bin 819 -> 875 bytes .../Bio/security.rsi/inhand-left.png | Bin 723 -> 571 bytes .../Bio/security.rsi/inhand-right.png | Bin 703 -> 576 bytes .../OuterClothing/Bio/security.rsi/meta.json | 2 +- 10 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/equipped-HELMET.png index d48c6efc300482af2a9181e93633234e46f7738f..71f6196ebc6be2cc2f4fa74f0003c9d1f24fbd80 100644 GIT binary patch delta 947 zcmV;k15Etu2gnDIBYyw^b5ch_0Itp)=>Px&f=NU{RCt{2+OcaJcND#8B4 zs8cLRkqB7I5DhuonB+n>Q%VO}h6t*uTQaoi;Qj##R!RSWE_FbIR1c+;424j&G^sUI zf#xJIc9xS#p~8sR=b%_Va1-Up0*zmwkky?^K9WPA_A+wG8_H+}Kt z=gw+v)jK{ha)KLQf8#6G|D8Xe`iALL(n)>%32U1h-rD=`zQ<~9)%m`#(DNpAJHJu` zrc+7h>g6kxs|J<%e92vpWoERim#+Zyv8Wt=md5mG1!nR@(+(yUm{OZ=#N`fO}IHNsPvcWoEP{=zk6#nyrm|Fxv#Z33@Cu zqa{Y;z1*v3eSQ6v$M>c#D#hyf3aHoXtZiz>)ZGS2p#xzaB;jm_!CW+BFYnvO? z>vg3KsN@H*T3bA}w_#V&kL_*xT3dTw*Qt)LfKVtzb}mb~YEZ}*00@V}02F^IQmz_g z=dy%CA*Btd0qFrX65r-28x>vta9e0K2Jr?at06sxtx+U5q&8`GP|7&QElsJ1$HD;$SC4bIdbMr)phFQujlqxIB1P>qa_NGd? z0hN_yez_Db}ROsCR1Q<=hB)5F3anAKk{J}|%8{`S@FXZn3^X*}b$n#bFpkXCj} zOz?qP{nrPK4!rIlRctk}_4`7MD{jZIGu(J)waWLyP@h#fujMzyCVD_x27o zfz_GJJckdsRdU;2lwh!3qQNDR{NVY#3?86|B-#`w?5nJZ$==;Gf46l*rd55deR=tX zO|dI0<2Rewva>WhW_a@cZ0frb!^N;bgNs4ow`O;ZWBar#0z7Q3EFDk$&n`V6;k+`$ z$@{kCbB(E92|bFY(}m9IZ{Z0uHnhz9oN|2Qzu&Fd%>Tsw{^T=eG5~{m3F8%}6%*M4 zxEHudIp{V>p$OJvihf*T*H9c&-+%o!Lus_~1J7E9sWeK^kK!i@J4>__j9g4zkMz1 zTwRcU_*SvNn6*sj=a(_)xQ)!WZ2n;oWmNZkBD(nRZPHn>>eZ9Y+q6xi zf{HbLdi=R0-@p9!BO>Wa-_fKCrLuK4jCDu8?eVue(0}~?`5T)YnxYs?FEL~>Uh!aF o!5W~zopr0O$wD_y7O^ diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/icon.png b/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/icon.png index b38151333306f11df3847de520aee4b87de25181..a31ae8553d5a7c1b21ca44883ba36d9e73cb89ef 100644 GIT binary patch delta 370 zcmV-&0ge9e0*nKYBYyw^b5ch_0Itp)=>Px$MoC0LR9J=Wls!+vKp21@)WLz6kdO{W z+8;nzWMMH1adQv{pnn1e#UDY9{s^a{3yX<^fz_ohgo%lEqQQh*nivzwIfzYk>UGiK zp5@KG_whb?b9bQ8Xf&EXCX;5<#pSsS{2(3|%mUX}H>u9rQh(jhY&B%-^o&I$;#@wv zL*NJUu79sAp(N03HDtHl!JCZn-9el;?K<6d2S8aOvB2-*wcWjVZs-ocCY3~Df&GUk zyjm6C9Z<>T38Oc%n;D{&q>{_?yp~W!`3?ZQu08;GU-2WRVI%3nmy=`4#S*4nXDXK5 ziaC$llBrlS6>CdOyH2@SQWi+ufiMhNMB=N64F{IRY&OGM$8xd6A`*mQs3efM1BPMX z^c=j&n7-Qwz_Kg=M#B-_WQ@~uFbqRUAl2sqa8x~%-^J3re~m_?(fk`e0o@pQU`l7C QKmY&$07*qoM6N<$g5BM%djJ3c delta 341 zcmV-b0jmCt1MdQmBYy!lNklYE90%}k#8I5&7OB}pJOYJ0hJO~H!i09} zu8s|zS}uJByDF|tUf`w>k#4bwa19j0?QxIo3J2^N01mKTZ-s^Oc%73if+uPa2U^L8~OII0T zs9Z)xIgcYSe^&0h&LM1SVK5p(6;XKx*2~-Uw0xL91CJy0I$iiekt9jE z+SEcSGYBD+08W)>fDi(&?}5h=Cbts+9|!;lrU7^y!RvbPx&Qb|NXRCt{2+TTlCXBfcoZ*5n#U2M{Z z2%{#*(2HppZEnO6rlof}=b$Ds{0G{h7n{59F6(~4essGZ43f1Mr9;?7nU1jy1}Toy zvySHK#H$4x%|y}CC{7pdGnrgUVqN}f)GLoA%qY@2qA=c zz8rI+(s$o`$68OX+sA$WK0f;3;{$(db#>ML{O$7HeethPOxf{cV`IwNdO}%E+oG`< zEB3~lY!vf$nfJvW*3;|OH;G%%?C>wXylE}YFYJr|@Uu^?YggY^{)Z{;fM{&STAW`X zscWR;ckFWi?0+Kcpl3yyTcaa9%VP5#nL=jnI#(C_MD z?U!FE_nzg-v$JbNu$lL#|9t@yX548^*V)Lsdl=m+#rh zk9fRfiWSP0zsM9TjCj1H<9A5v+JSX6N`A-iz#vIow#muq@_f8w&LCIbpb zKqix6qnQ6E$yta50vLutVEa8Z6l9~ACzHuEjRz>ys+8(muq)|OeT$A-^{MZvqHF~C zd_Ij%J+p3w6Cojl5JCtcgb+dqA;j~=v4^6n$iq^HwfzX# zEgGA#_Ld!H@4-PFSsQdhG&W<6Um6GgU2uW_wtx4a5oOEcPJ7kmxt?CrNUv#}>G#v; z>!oIzlxtNyXFZ%geX6Bpb7f0oPI_x3Y+dm7a>3inD`z}B{Q5QzQjc(*>;!1Kq<$Dj z<`k%I)u@`#c^q6XblK&ulbt+BJ!-k$Bhdj*>L#V_JqL9YI(7}*!uG0htB%Ae@Z{w_ za(m?pxpIY4t;YH2B*O!P|2ug&0wW+C8MUweI~pb5>b`-tz6*pSqt@Kq9EC!GP$)!q zcQ)+uk>@y7EIyx52ib2!$h~RxlVu(=>ki@#nU0uOq^d(S0*OA%qft Y1HJH9?y=(1>;M1&07*qoM6N<$f|u9I&Hw-a delta 807 zcmV+?1K9kS2fYT6BYy(~NkltcmzLic>$!ES-RwR!K=9sIkRN43dTl8v9LIA)N6nC;{6}vgTsO^F_?A8A4I-Xgnz24RqX*l-`&C1{vM!d*4Wnm z9$I&IDn7>xZhL?r2#{hDGFb(3Tm}G$q6h#;t)`I4Dv)9l1VN~3FUMst#!x5}(Asv| zDuqG;j4{Y@xvITgTssO+PE8o5vu?bHiCm0RP(of*=Tj zAP9mW2!Dbgh<{DP-`hFOKd5zS+VnRr?~^35ny3)-iQoD0Q?TP0M2s< zJo5;YHvKD033X*Dp{_8-tp0qdh{!<1cG%n#0!Yu($dT2j;O#&~+WaK@vrI@`W6iZAYUU{wRF&)(s;V3_?*9%uLT7*AS diff --git a/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/inhand-right.png index 1c14b44f98595701a6c32119ef2bbb60b63f8d70..7188fe7eaa601cceecf43e5a4e326177b4703a75 100644 GIT binary patch delta 900 zcmV-~1AF|!2AT(uBYyw^b5ch_0Itp)=>Px&R7pfZRCt{2+RaPbU>pbVuf?~qx#5r; z#x#eahuL1{MHHEeH}~RTwuSi*sOVvH$DKUcy&N{S9fg6T*@U@?uz{#U93EB=#v<5L z6bCD=XxdI&Q?oK4pQ-n@OS4)pb>#sBQpOSPxFH!c380@xj$>OfyVJYEs2 z?lIP00DwO+1pp9*Zg@PEmhcqjkH*HRTec@sW)6IIR* z)YaPZ8S8;Eo2u41_0(tf3!!XuFNAcyh$Y?A z-TU7^a#C2bcRAgt0QnAp5JCtcgb+dqA>_Dao#HZb(=k!LZ<=Ov=I;pUPK{-w{i~_Z z5opXjgPh7x0Ra8y2qa0;R!u#Pp2$!E?2b;grGK@BC0|xtf+gPyW`{?Ne`%f=j@4RS zgC~Q7004*6f#s1=T)$L~lA_{xhx$hK{rsHiM}gsk;F50zpB6=opDzUfloiF7@=g?y z-RRLocMJ}77MN2C@%h^#+YZMRC{PfNDcDm^#zO^%+FdQeFfIe&i%S6eEi8|WLfKDz z?|oV&@N@nsV$3N+1xTG^4@M*LM^hf$PikNPwXV+1{xJ1%z|bx*GyT0ln~MkHr@vq{ z0-oo=^E|9pD}uowy1Kg1*wmmNX~aj&(4}y;%iG4L2GwS>K@>%peFWs>l)ay{>4!fd a1pfdud}x}q4fF&60000V4{0Cg=%`u@OYen=T^%5&XL3lbG5@sOl#@LI*!$@px z_Linu<9;7_NS~L4@9#_Vyapf$f*=TjAP9mW2;#8e%VaVYJ%1n;i#a01E|u!{J0rup z9I+~#o_VRy=jY9QfDhny`yHQasw!kZ`pXQMm>k!8y1KErykwT0YdDRuXHWG9_aD~0 z3H#OWx4Jo-lkt4)W8O&FoQ$5XZcI#$>n_A#n_~T^jvY7CPWt^;H>Z+H{$z8@oRLyV zrRGg2)-MJ_C4Y5dFtn`+rU75(&X)wQYYPAXU0Xo03AKz>@CJqnmuKFTlv{R!zkb#M z2mq@vuk{X#trbiIE?xYAX!tGwnNKC(mNjha;P_}bg7j?KO?|e|G!2c7jh6XO?Kg3) zsI6&$q9|BgUP3e+0U+~&Ab>Fj;~EV|u(-SgMN!;}V}D;5x(e%SSlQeFG|jAA+1!AC zeXXROf!POe90w^bA)Awtm`VTu1VI1*q-WE}=44252^_~&Hxiq09EZeI0*o=JstSMo z2{Wmx3dR@`Q;9PD+fIcChX!<`@lNBv*Qdgkoge@V4h+@&q{j&k{aSzwIA{R`K@bE% z5ClOG1b;ygZnNvYpVz-1*o{NKBednufPnKnj q3?+}&bnrkG*8*M$9-ze#8Sn?_hFiXm2Ls;#0000BYyw^b5ch_0Itp)=>Px-r%6OXRCt{2ntf~&=N-pChwZwU#BQ9( zfW!S!FsYR~FA6MgFqBLRL@G=sbHDHJ`Q3BR z^SiqTk|arzBuSDaNs@dw5!6<^?`J=e0iw|;4u^y1w*FDMcEiTUyWe?N zwOy_H2`VZolzq3`eNA00`g*nE6%`e@99c@4*=$xETDqi6DfhOu0?3mYgzM>V-}#cV z|Jz^wYTWu`27lms;sAEL9goLDPEO7><-_VtN)SfVudc4fVzCekg(jr0QzI^lB5h~S zV6&zJ5Q<*HVzF@K$PvoQ%BZXV7pGcJb9tJ8)Z2q7iezMDV47k2z1QP?T0?tP>30M= znQNbe=@uhtsb)F?ous9jfuSCtMSs))3>UW;r}NI9cYjGuyA7K)ooGA;Kt@Ie7K?>> z^X5^I?LzA9!R>ZaR$Pj4hG{}U7^#2w_%SX|6R=s+mBuC*-guwSM?tnrwf?AGWNS*A z?9v&qeeic`>T1c|_BMB!qkIrHD%-yS}df}PGphBl{KoLu9foqO0M09i-2Y{iwA-(Vn&DG1a zwq3RU^%}2L|Asx_L8HL2m>zF@kml-TELgCByu3Ut#_5Ejm+<@jN*4`9FVWoG%qO3G zLf$_P;L;gbq>u4RR33K^7_Q&@>opV<6foC5M}Mi)bFq)~8L7%~N1&5WKm8Qzj$Nwt zN1X*W_J1X8?7w=vJ~LC6BniLY52DDn{T}>h8vyvzBWv;d{Ya8TW@hHN8a$T%29Oht zoNJ%MKy>I%4@3vJ)p#o%fzE5LRjZ>a4*+=nxotus8F9Pa_``9EN>Ajm>7m z?|=7CNfMMG5{UqCxTyiF)r!yO!)CJ~Ns_YFis}HY-|(nBZQ3-PPA4muS6w}^1X|hN9E_A+csrE5JeGD6ahGY{ycekdCEDz-;dAd(`0YdL2xA9-Q75yPDD{86um?! zdWo94T4i4pMVwA2-QC@q9MD2jV-ulZH-Dly2T`2E`Sa(M{ZO!*rp6}CHdXh4nKNes z(Ae0B-EPO{^AQXNal73(olXLQ0Cu}wsW%lA78UXzPcyX#>q$vTAvPG}#TWlfe}6x- zXV0dvs8DkcP#pk(($W&bQV*f%B@P`r1VAttB$29`ZRwgF(5mlpWZ`XVRrI4@M}H|R zD;u}I>PG+|EcH-RSF5~zz4gZ51Q;3=YwBtVOFf#zwKCFvLVvXLYS0t_0H@Q5UazNH z8hX~drEc_kJx-@nv-m_9u0Ih}2f(^xmy&Bc91fNo8p;8d9BRPfaNzU#@V2#L-LY#z z4vnQ>Q&+3#4&T<))s9PF^>kHdv46>n^fA0WGYDCt04xtlLY>7X16V>vTI92+Z2EkXNGNklF99%ksQtpipLdqb=qTssW3--kLw)K-FNs=T)liK zIeerK2kYHJNolcshw}~sfq-&Os}GtgCmO$H(`Kb?)0RIFkH-;35rf{qYp?E_(jcr| zw?-a}4dVCv(dl&G@CCF5L3PEYl@+qxZs(!ZYXCTUvWfcodMYa`i9{lN^wCFDRaN2j zc&97~YuBxjT{$jlYilVlFMr2mGATYRURVggUtZruAP`U;1kE2s6V%t&EBhvsiSqJt zydLj(&8f!g@lsx1&Z$$U=<4eFhA&#t6oC0(o?(7s;im*x$R2h zvm!?7XV{o4`$?=N*ng6JJAxo^;&{X4tP)Eg%QAO+T3KWiNbBhp0DiQxOn$k4Ci(gK z*p^pe1I`})7#@Fed@US<*yFz=>&lY6-nv>|{`_-NQc`%erbXD;4_~EQ<-0wt?9a)% zv7uq89s|r4Gy8M0l*R+RSM$DLv)Pz6YZd^T_cXElM2l*1t$*x3(Zc3ELw|s0&6QWZRI&p9 z*#@@ne2K2Eu2C06jOOe0Q2hwR24m#r<^sqKCmIE~nj0h*OdLG?F>P%JREulna@zs! zE6G(>rb?2;@P7=nxTHwV&CMk?7*lOi(_ppk!L>3#OG^uaAaKvU_po?jA^&tApr@yY zNF>6WufH{=nc%9`56C8yiS+bzeps=LqbHl#w|5`1EGKRdufFoyiy zqd}t$&07JO9Tj-9^}o#I7J_`uXG|y4AJl4Q!Xz|@`?4>ZI>uGsL~{TD+F~X?i^;%r w&I#(LoXO^#5QBl~0Ho?o-#xzP(E~qD9bQ2^;CmnGu!1Wh#1f` z&L*=^YfH_FMpKgA3lp17)Xi#a0(zmio33l=x-s@@ZL*sZK6bMOq~P4tkF^R&l%YDp zKrqt`^8pt#P(B1bdoi9PsMK=?=p-x8&3Vtq{GaDM^MBv-e}B(;HNh$`uQFnyEg;%h zG9cOlqKzd3qAeiWSTZ2m0-}v21EMV;+K5$p;r@<8BEaP2BxbXj^0Yr_q;scyXGE9F zMSOfb0H5c5rkNv5#E|$U*laerZMWNJU8{y)qofqx-*HH^*=%H(-;|GCy7GNLV{hsehH?1aRxt4U(YWh9j%jeYc&uPF+@_*#`MC^9^ED`XuAKGj-c5Z(k z2=~Y2_{4de@GQU6>6H1?O{-^JEA4l?dT=_Os`%&Z0@trk;0+}3$?-($n;LL*8xYoH z@M%>w+uq$n^TldXe|Cq!P`13k?cF^%x*gOvHL!F0`~30C1p0d?AWyvk&+<2aJq0nd z`DGnx8-EG-+MjHv0OkC1W1Dk z$q9a#o?>}y90~CW@<7jwp zyV*w27eEkJBM7S*8XA(@L0^Ejn{BFNDu2#^w6rt;Zr;3!$z;OmbmH^*u-oleEEYT- z4-C91aa)e9c7=JVA>mw_Dqs6ak5Ui>GliZdBK)6mH2@TNS8y31) zSPXu}rSShNUip`zO9n(+K(w)BK(qx!8%qX6TR^n2WI(h9L>o&6L|Z_#v1C9bKPs;K zKs@L;IVR(rl)Yb-7H(S>^Us}bw&SB ztU+-Gl(v?MCX-1fyw=f1Mdb;Ki;J;Zt+?H8GBPtbe6M2BGU4#O3Na%y1Gn3a)oP`< zxR{E{6I|;Ee-EgvIF89=Qh${R5f6ebEiH08DJco7)k?RcJJN89(e3EQYPFJ-l=MO^ zYN6_tSjVlE)Ei!7=eCCc6c-n>B`+TcXT)2-c#FZo!HC7Y3@cZy#Aq}kilWR5PYtMV zevOV>D=`^8ieoA^;QsyPq_5wIL4OUOe+{8vh{k3Ef4}grC*S7Xq<^Muq`&tH8k-IBx`6SK5I(;TgZ=@jX&bqJe*lV<#Z=q{Ohzx`BWG!BHgL5=V05g2 z{@%Lh7APz>W^#oMuVZwqfU6w>jm-weN6un0Dj(PtXMiY*40?_1wwftVU85=g&By%q zzaNRCqhGM?og8*f*p#<)nZe@4%`Db zs5*ZRuh%>0f{3}az6grD!1UBKSy@>W)s~2@yS~!E)7n5O_v%Z#*krDd(`e-bvThyDE@ZMLY;<|O~&}y}OxN{fRI@)MyX(1F0A!Vmh zsICNc$vSd!a^ylpy7{=cIJKc7MqFGReSLk5jEn%VC4VoUoSYn0gP#P|284nkdDI8E zclRCu|K9fHPx9~2nG6a*2-EU!P5GGXbXroUU>ul2Qs}8dMtRyq5uE@07*qoM6N<$g0cHPIRF3v diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/icon.png index eea15cfb0a9e2381791ff65af893665ad2ac880d..ecead67e9b98fc37e9336bd0a53b0332dc6e0542 100644 GIT binary patch delta 853 zcmV-b1FHP92I~fpBYyw^b5ch_0Itp)=>Px&B}qgu4xJq2|`T2Qr)(ep@olb|{{cCgi z$X~5(1B7u!JXOGx$N>z)pi-$YH8u5^|B-XCM5N-7o2E(a_HXE8;{fW-fdvpHu+a)QAdVjiRhW4i=)TFTxtmY=C`aC)_7^sC@(GaqIh}+-cu87v=yqIJ<3Z9%*@O%Jw1)49>EVignwXXX9vSDqI1t&0Kn|*ahkG$AG9bI zivZN?b-JTEt&ih4PG16ImjIwC8>|-Aux%TFFFyY=0btuUtA#b1ve6fL-vR)H5Gaa* zCl6}vNe@L)5JL1#-j{%}E7zhFz6;vYPDuUG;pNQ@C21gj7%Z3Jy9OR`8|p(a^!NP0+eu<;PG zS~a>`m0tQT^JaFK_wAdR-3sa zA-@B&5aZm1Y2?cY7cXU)oP5N^OBv+L2pH# z9SjE1bsZrDcb+U@FTDle{=|7~+r~6aR##WKw)4ur)q$>!&rh_45ZJcOhx!)|96V0x z!y95lTYnfB7$BF+`4S;t0N-ceM@@jvp06hZo@;^QIBxoDtp>GLgJe48`a%eFUB_`8 zuS)_xYC$v_1z>h|7FAU-O_OrDjFb{x*I8a(MpadJ-aiKbh{q37uT-hE8qCbh08lQM z=}L9~z&1?N^abFn9M>yVlIavuN&p`0z7>Fu`hO+UDe9G~ui(A`0CZg^6bj)~I(zL@ z973TGx~}^U?h7E1D7q(I(=--8c546PM+HsOFin%ZRUnZl`U3EL28KsYVHPyz-i66L zpJQwP5CB{Ihq!xhp(D*fjp32sOYgb?01{I-UB3$eojS2nU*c1-1M0_oDdGRH4S$qw bI2OQHWQ0+c0cxnC00000NkvXXu0mjf0d{KI diff --git a/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-left.png index 36bd1257f2e613cda87063774382aeb668100b8f..14e15bcd349f2df4367eba515a9bf4c340e01a38 100644 GIT binary patch delta 547 zcmV+;0^I%61-k^0BYyw^b5ch_0Itp)=>Px$^+`lQRCt{2+COUJKokb>w~N&ogtJvD zW2TF-e1~D@K0#3H187N(5NwfD62fGQiJCn?ino=7|Hg{+;wSt&)1<4_oe zYd7e+?w5<8wPx3K*T%vyWXEwxDOJ0uyEHDq>cfvmqpkVzX!NBb6c4{I>pP0jh}Z3L zmSy~4o%7#cXZ&EDmp4{i=f<$t?Nz#AuiN9?m@=;zU(L_5ta9EVjo$$4{*IC)p?B|= zK3-nw>g}0)-+$-a82)&9rFZX^=5b8c{axj}c^sE{xiRefK3}~(Q<0Y>N#(plMD~E< zb)CoY+IVrj>vcY6-e(#YAWc)Uh8N}a<@F6c{prx<^-Vcu4KFB7)Blop$PbB-Vngcp z`&)C%<&ubqrqgNV-;&Nd3avFqQN+11Jef>5H-@7qs(=06md@KpWDi(1k7F7P23za* zRPr`;q=IbQrp01WuFctOMoKBNZTlqh0000000000005xPr1}xW&jpS_vL8Y0T;NzX z`w@OWKCaEL9GvpW9iK^%?nh|d5|HjkXk7t_WcvqNR{-h$fmUu3t?VC=Ce=UCx+Sow lY5zd${u~Ds&_4hm;vY36cM|)kcGmy^002ovPDHLkV1lI05Jmt1 delta 700 zcmV;t0z>_~1k(kOBYy&#Nkl-q%qpXz>S$pQV>Bh7O2=ZQSca87M?C@V%@YI zc9PNeb#=~x&%^h5_&%JA=K&#v5JCtcgb+dqA%qb6b#-@Y@qcJUi$^2cox8VppS!v{ zwOsRmJ{wVQNj?Yb>h9D$9uEK;U$>Z>n?qGqYHDiu^<8`Me55Fwd}3u8@AVrbR+gzc zdMvBF9(i4W#qmln^Y3AP-cNG19T>?nU&Xr_cssQNEMl*l`D?w6rnk2Tw{x2c^Ef`=0(M(0=ILU^Jmw%f9nL-`iis4 z>yg)X%E;{3(%K7{)oGTNmdK@bpFVq{t*@_>PN#RjJ-GMKkXrNF0U3&-;PH4ctJ5fo zf}$un<>Qla+S*(Ics!R;H&i3a1Poe$rX~jfsZ{E>_kU~+c>9UPCP<}H#9|W+c>D8S zV}>CMpr+RdhrA%S&YU}~S*=zq77L@kQQk~U7VKPfYc+H?Zzz iiBHKR`(27CSU&(sh6r|u&5A1k0000Px$`bk7VRCt{2+A&V!Kokbxw+MHUtUyH- zMbm*|&On2d(ubfKiHN-U^sSrJzBqY?BE|z_a?l zZpN|o&(nAm$&UyC000000001hh=`<={BbUdB5s=R0x2a&QGZm+wk_{T+rxa{-1%piD%F~|wga5$gcfN^Z@~k- zKfh3^6o+BRw|}os^#1%pZ@~j)Sw_xua?EuZbEXr@vaHH``}#y-7;>o;>%5CJZOz+w z2I#G{NYjmZJ#N}+KWU%5wF2aMPR`Y3HNLsKr{8~0>E`afnscr$DbMr$QXj~^d4Dxc z>H}ji7}Tzq#MbWu znr%G;ri=<;ThGA3+14|#3!@!iThG8QjL!hudIn4x6~MNhfn6AXGqFVEop{qj8D%QFx{2qAX`wv)L zU7_?`aoYZU8xUJ-WNd5<>~5ftSS(J-1rKvyU~X=N*jghnoTKIZx&8g6e4d7nlSyEi z>dI-;etYVmx__z+pKqQb$2e}+Hm$9jVM;2KonWfj|H~v7WWqY}oA`=pVGDj?EO9O^)~r@xR{!;N9pJ zKaz!(M`qJb{|o?6pUvQ^zjVY!LI@#*5JCtcgb+dqAw+(2s*2IBwdKWs1}xXEwHc96 z&~U1X(SPIZHeS4Zp0^ue`f2Pilb=ojpsFg)x*H^uNlT-0$@J6MVNM*MV8q{yZzxFL z$*9#$IhD~90MP5bYFqmH)~0ooP+V7HWm8UNv;h?r6~N9xSX*_4+Oyv*jmis7RWTx= zpwV%sJ#P;{_={ISRaF2M78WdvISLsaf&iobGa-!nmswgmZDo%TIrbBZ;{VlJR4MHM O0000 Date: Mon, 29 Jul 2024 23:41:21 -0500 Subject: [PATCH 039/422] Recolor the defibrillator (#29964) * tide-ification * metajoson --- .../Objects/Specific/Medical/defib.rsi/icon.png | Bin 808 -> 435 bytes .../Specific/Medical/defib.rsi/inhand-left.png | Bin 364 -> 331 bytes .../Specific/Medical/defib.rsi/inhand-right.png | Bin 364 -> 331 bytes .../Specific/Medical/defib.rsi/meta.json | 4 ++-- 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Textures/Objects/Specific/Medical/defib.rsi/icon.png b/Resources/Textures/Objects/Specific/Medical/defib.rsi/icon.png index 7ad5415f588b43f5aa07ca983e8629e38ed6ac25..0b9d3770edaada6cf7173ebb22ddd641a11e90a5 100644 GIT binary patch delta 420 zcmZ3%wwZZ?WIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$g>fKP~P ze}Dgr7cYv7i;o;R5;bkNgM&kDZSCsSt7p!fDK9U7PF5JG(8ym2MDdga`33(+00yD^ z=gtAeISV`@iy0XB4ude`@%sD~DL|VUJY5_^Ec~}lx;U*xfya5_R;3UB|L^u(*>|D|0|%u+P^PluJqDtQ7$`=_-Qcw;F|7o_6RG7&)p4qv+qu1JushP zTkPzPx9v3o>|UV^95+H6W!B1y3o_KQ1zcLda$!GH$hY0^8!8$(B1Cg`PMBU_!CLc& z^}>0^rkQ%$45t}oq}sgH8}ck0IA0y%^x3@kDPNZwgQCNcGt4oTjrMgc3agnrE^{!L zF?faKzT{+SWN2{+>OH%MVPh5J_m;^o7{Vs+Nq)?C=AN~%U#f!Ef_AF{&&n?hmKO^* z9FwrvZL!SqpmxF{i60NHEOd7|5uey8TYvw6^MAfGKiNHZDFjS3tQH4`5re0zpUXO@ GgeCw`1gpvb delta 796 zcmV+%1LOR&1E>a&8Gi-<0047(dh`GQ00DDSM?wIu&K&6g00QDkL_t(oh3!^NNE<;E z{!)7M(6vG>EEpjOf~fdYK?3Gd6(LZt&Ba?z1}SY2DcV9QNJ}VUO9|;o=)p^jCdE^AcnGqg=j#RLOo9p$t*LwvztvU^iV$t*?BuV?|*ymd-G<1Tl`~qT1|NI zcAL=W&+nohJ6or?+sgUc@)Bzz<&uVge+rXBKF*ds+`17Fp>wTPCt9se4vzBV;3#j5 zXP>NcV`}Tfk7EV^ARLJS03s`k0DzOzDtcz;k%;dj(X{WKU884q9$u|T2ITR!vLPfu zQy-4RkUiY;uz%6*on7PJj~t$@EaLK_hD3ZH08r72SP0CZzfT6xnD2&&g#dMaa$4o= zlS4j>?f!#@h%|{LQ$T;83`y!n=;<_c{R+S;X+`3W-HSwg--v!E@rsN7@!Xt+2mnY@ zw_#(ST@x^;o_%MI-b~i#>*8$5RNj>Y9D#C4;~cq({(thK1^`X%8_@MDRJ39%-vCTC z&}3}U%_;h1Di5Epi%WU@+b-0C;%X;YijX?LN%Zvl!4a98FY21MeSoI0ljyfUyaxcb zTT&1+30nfcG!_0}2-D%$ZAVXggTiDW;GaUXt#c$CJ7H5tqX~_T4jWs}Nqe=R006Rw z%wo&|#($z^D^?4NN9y&Gi~?koV=M$_Fg7|2pfS!U$9VJdIj6m7opMRT+VT>V-1qhf zutWeL1CVO0;f;x__Z`eA{rISLtZ7UX$ z5xuKuMZ@ucJTCm6+WoFk7-5{R7AAHYXfe>BMbha)k3{JLx0s?76U5fG7}kb1pjKpr=C0qYz921jI+ zOB(2zkV_{m618=cHIvZKRgZTfKv)8O;UIqQq;1!Tu5WNB}Z^Uko>0A6i a_!R@&PpiMMXs^Ej0000NS%G|^0G|-o zBS((Bc=4jRxOn>F4f*x`K;fcli48!Ctt7}V_&*3RY~H_QKTw3Tz$3Dlfr0NZ2s0kf zUy%Y7+~Dcr7!u+BcB-S$VFeD?#v{M$<99Y5Vd=QCu?pi}> zCE=aL;(BkVJ1{gdF|u$0O)+oG<=Ogp@*c2cI`KEIe5?N-Ssr>ixc7!*1G=xVRHUKvceB$$87yX9^b3$*tNTWu4nLc^>bP0 Hl+XkK_uYQR delta 348 zcmV-i0i*uQ0_*~i8Gi-<0063Kaozv`00DDSM?wIu&K&6g00AaRL_t(|obB2%PQx%1 z#_;*nu-t8~`RZ<{Th<7S@i8ky7~*W^$EEu4|`q9HIYj zieB_=zbEA_jsySz0001hLv_>Ix@m3hoKmhrFT38@Rkhha-+$g*Uz}QSOioF`2CS-$ zs@IqObBr-LC0&+2z$smCY}cEl&nYEm)(sfWk=U7%niKp4Bx$!ZG5emKbIkkawNS%G|^0G|-o zBS((Bc=4jRxOn>F4f*x`K;fcli48!Ctt7}V_&*3RY~H_QKTw3Tz$3Dlfr0NZ2s0kf zUy%Y7+~Dcr7!u+BcB-S$VFeD?#v{M$<99Y5Vd=QCu?pi}> zCE=aL;(BkVJ1{gdF|u$0O)+oG<=Ogp@*c2cI`KEIe5?N-Ssr>ixc7!*1G=xVRHUKvceB$$87yX9^b3$*tNTWu4nLc^>bP0 Hl+XkK_uYQR delta 348 zcmV-i0i*uQ0_*~i8Gi-<0063Kaozv`00DDSM?wIu&K&6g00AaRL_t(|obB2%PQx%1 z#_;*nu-t8~`RZ<{Th<7S@i8ky7~*W^$EEu4|`q9HIYj zieB_=zbEA_jsySz0001hLv_>Ix@m3hoKmhrFT38@Rkhha-+$g*Uz}QSOioF`2CS-$ zs@IqObBr-LC0&+2z$smCY}cEl&nYEm)(sfWk=U7%niKp4Bx$!ZG5emKbIkkaw Date: Tue, 30 Jul 2024 04:42:27 +0000 Subject: [PATCH 040/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 39a40a9417..9ced9860f3 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: ElectroJr - changes: - - message: Fix gas analyzers not opening their UI when used in-hand. - type: Fix - id: 6510 - time: '2024-05-02T06:00:01.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27610 - author: Plykiya changes: - message: Disarming a player now causes them to throw the disarmed item away from @@ -3784,3 +3777,10 @@ id: 7009 time: '2024-07-30T03:04:17.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30453 +- author: Blackern5000 + changes: + - message: The defibrillator has been recolored slightly + type: Tweak + id: 7010 + time: '2024-07-30T04:41:21.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29964 From 9a46c24854c708b0b05e447390d02fc1037abe81 Mon Sep 17 00:00:00 2001 From: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com> Date: Tue, 30 Jul 2024 06:22:33 +0000 Subject: [PATCH 041/422] tweak(SyndicateReinforcements): Replace combat knife with throwing knife (#30466) * . * Update Resources/Prototypes/Catalog/Fills/Items/misc.yml Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> * ugh Co-authored-by:James Quiaoit * ugh Co-authored-by: James Quiaoit --------- Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: James Quiaoit --- Resources/Prototypes/Catalog/Fills/Items/misc.yml | 10 ++++++++++ Resources/Prototypes/Roles/Antags/traitor.yml | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/Fills/Items/misc.yml b/Resources/Prototypes/Catalog/Fills/Items/misc.yml index 816f3ba8d4..4ec546caef 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/misc.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/misc.yml @@ -1,5 +1,6 @@ - type: entity id: ClothingShoesBootsCombatFilled + suffix: Filled, Combat Knife parent: - ClothingShoesBootsCombat - ClothingShoesBootsSecFilled @@ -38,3 +39,12 @@ item: - KukriKnife +- type: entity + id: ClothingShoesBootsSyndieFilled + parent: ClothingShoesBootsCombat + suffix: Filled, Throwing Knife + components: + - type: ContainerFill + containers: + item: + - ThrowingKnife diff --git a/Resources/Prototypes/Roles/Antags/traitor.yml b/Resources/Prototypes/Roles/Antags/traitor.yml index e40466d57f..cb2fd4b13e 100644 --- a/Resources/Prototypes/Roles/Antags/traitor.yml +++ b/Resources/Prototypes/Roles/Antags/traitor.yml @@ -41,7 +41,7 @@ equipment: jumpsuit: ClothingUniformJumpsuitOperative back: ClothingBackpackSyndicate - shoes: ClothingShoesBootsCombatFilled + shoes: ClothingShoesBootsSyndieFilled gloves: ClothingHandsGlovesColorBlack - type: startingGear From 2fc9a65da6563d2b5b0ed14a51f482249225bec0 Mon Sep 17 00:00:00 2001 From: TurboTracker <130304754+TurboTrackerss14@users.noreply.github.com> Date: Tue, 30 Jul 2024 07:41:52 +0100 Subject: [PATCH 042/422] Update migration to remove maint detective armor (#30486) Jensen migration --- Resources/migration.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/migration.yml b/Resources/migration.yml index 23e7e8e230..a4276c7f10 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -350,7 +350,7 @@ DoorRemoteFirefight: null AirlockServiceCaptainLocked: AirlockCaptainLocked # 2024-06-15 -ClothingOuterCoatInspector: ClothingOuterCoatDetectiveLoadout +ClothingOuterCoatInspector: ClothingOuterCoatJensen # 2024-06-23 FloorTileItemReinforced: PartRodMetal1 From a72445c4193fc50974b0d4fd168525abeab2e591 Mon Sep 17 00:00:00 2001 From: Repo <47093363+Titian3@users.noreply.github.com> Date: Tue, 30 Jul 2024 20:28:32 +1200 Subject: [PATCH 043/422] aHelp fixes and improvements (#28639) * Clear search criteria on loading aHelp window * Pinning technology. * Relay to aHelp window and discord if a user disconnect/reconnect * Fix pinning localization * Log disconnect, reconnects, bans to relay and admin in aHelp * Drop to 5min to hold active conversations * Update Content.Server/Administration/Systems/BwoinkSystem.cs Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com> * discord text styling if diconnect,reconnect,banned message. * Pin icons instead of text * Better Icons * space * Move button generation in to its own XAML * List entry control * Fix spaces * Remove from active conversations on banned * Discord if else block cleanup * Better pin icons * Move icons to stylesheet styleclass * Better field order. * PR review fixes * fixes --------- Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com> Co-authored-by: metalgearsloth --- .../UI/Bwoink/BwoinkWindow.xaml.cs | 6 +- .../CustomControls/PlayerListControl.xaml.cs | 281 +++++++++--------- .../UI/CustomControls/PlayerListEntry.xaml | 6 + .../UI/CustomControls/PlayerListEntry.xaml.cs | 58 ++++ Content.Client/Stylesheets/StyleNano.cs | 20 ++ .../Administration/Systems/BwoinkSystem.cs | 265 +++++++++++++++-- Content.Shared/Administration/PlayerInfo.cs | 2 + .../Locale/en-US/administration/bwoink.ftl | 3 + .../Textures/Interface/Bwoink/pinned.png | Bin 0 -> 2267 bytes .../Textures/Interface/Bwoink/pinned2.png | Bin 0 -> 2028 bytes .../Textures/Interface/Bwoink/un_pinned.png | Bin 0 -> 2151 bytes 11 files changed, 471 insertions(+), 170 deletions(-) create mode 100644 Content.Client/Administration/UI/CustomControls/PlayerListEntry.xaml create mode 100644 Content.Client/Administration/UI/CustomControls/PlayerListEntry.xaml.cs create mode 100644 Resources/Textures/Interface/Bwoink/pinned.png create mode 100644 Resources/Textures/Interface/Bwoink/pinned2.png create mode 100644 Resources/Textures/Interface/Bwoink/un_pinned.png diff --git a/Content.Client/Administration/UI/Bwoink/BwoinkWindow.xaml.cs b/Content.Client/Administration/UI/Bwoink/BwoinkWindow.xaml.cs index 30f9d24df1..e8653843c7 100644 --- a/Content.Client/Administration/UI/Bwoink/BwoinkWindow.xaml.cs +++ b/Content.Client/Administration/UI/Bwoink/BwoinkWindow.xaml.cs @@ -30,7 +30,11 @@ namespace Content.Client.Administration.UI.Bwoink } }; - OnOpen += () => Bwoink.PopulateList(); + OnOpen += () => + { + Bwoink.ChannelSelector.StopFiltering(); + Bwoink.PopulateList(); + }; } } } diff --git a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs index 12522d552d..b09cd727ef 100644 --- a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs +++ b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs @@ -4,154 +4,155 @@ using Content.Client.UserInterface.Controls; using Content.Client.Verbs.UI; using Content.Shared.Administration; using Robust.Client.AutoGenerated; +using Robust.Client.GameObjects; using Robust.Client.Graphics; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.XAML; using Robust.Shared.Input; +using Robust.Shared.Utility; -namespace Content.Client.Administration.UI.CustomControls +namespace Content.Client.Administration.UI.CustomControls; + +[GenerateTypedNameReferences] +public sealed partial class PlayerListControl : BoxContainer { - [GenerateTypedNameReferences] - public sealed partial class PlayerListControl : BoxContainer + private readonly AdminSystem _adminSystem; + + private readonly IEntityManager _entManager; + private readonly IUserInterfaceManager _uiManager; + + private PlayerInfo? _selectedPlayer; + + private List _playerList = new(); + private readonly List _sortedPlayerList = new(); + + public Comparison? Comparison; + public Func? OverrideText; + + public PlayerListControl() { - private readonly AdminSystem _adminSystem; - - private List _playerList = new(); - private readonly List _sortedPlayerList = new(); - - public event Action? OnSelectionChanged; - public IReadOnlyList PlayerInfo => _playerList; - - public Func? OverrideText; - public Comparison? Comparison; - - private IEntityManager _entManager; - private IUserInterfaceManager _uiManager; - - private PlayerInfo? _selectedPlayer; - - public PlayerListControl() - { - _entManager = IoCManager.Resolve(); - _uiManager = IoCManager.Resolve(); - _adminSystem = _entManager.System(); - RobustXamlLoader.Load(this); - // Fill the Option data - PlayerListContainer.ItemPressed += PlayerListItemPressed; - PlayerListContainer.ItemKeyBindDown += PlayerListItemKeyBindDown; - PlayerListContainer.GenerateItem += GenerateButton; - PlayerListContainer.NoItemSelected += PlayerListNoItemSelected; - PopulateList(_adminSystem.PlayerList); - FilterLineEdit.OnTextChanged += _ => FilterList(); - _adminSystem.PlayerListChanged += PopulateList; - BackgroundPanel.PanelOverride = new StyleBoxFlat {BackgroundColor = new Color(32, 32, 40)}; - } - - private void PlayerListNoItemSelected() - { - _selectedPlayer = null; - OnSelectionChanged?.Invoke(null); - } - - private void PlayerListItemPressed(BaseButton.ButtonEventArgs? args, ListData? data) - { - if (args == null || data is not PlayerListData {Info: var selectedPlayer}) - return; - - if (selectedPlayer == _selectedPlayer) - return; - - if (args.Event.Function != EngineKeyFunctions.UIClick) - return; - - OnSelectionChanged?.Invoke(selectedPlayer); - _selectedPlayer = selectedPlayer; - - // update label text. Only required if there is some override (e.g. unread bwoink count). - if (OverrideText != null && args.Button.Children.FirstOrDefault()?.Children?.FirstOrDefault() is Label label) - label.Text = GetText(selectedPlayer); - } - - private void PlayerListItemKeyBindDown(GUIBoundKeyEventArgs? args, ListData? data) - { - if (args == null || data is not PlayerListData { Info: var selectedPlayer }) - return; - - if (args.Function != EngineKeyFunctions.UIRightClick || selectedPlayer.NetEntity == null) - return; - - _uiManager.GetUIController().OpenVerbMenu(selectedPlayer.NetEntity.Value, true); - args.Handle(); - } - - public void StopFiltering() - { - FilterLineEdit.Text = string.Empty; - } - - private void FilterList() - { - _sortedPlayerList.Clear(); - foreach (var info in _playerList) - { - var displayName = $"{info.CharacterName} ({info.Username})"; - if (info.IdentityName != info.CharacterName) - displayName += $" [{info.IdentityName}]"; - if (!string.IsNullOrEmpty(FilterLineEdit.Text) - && !displayName.ToLowerInvariant().Contains(FilterLineEdit.Text.Trim().ToLowerInvariant())) - continue; - _sortedPlayerList.Add(info); - } - - if (Comparison != null) - _sortedPlayerList.Sort((a, b) => Comparison(a, b)); - - PlayerListContainer.PopulateList(_sortedPlayerList.Select(info => new PlayerListData(info)).ToList()); - if (_selectedPlayer != null) - PlayerListContainer.Select(new PlayerListData(_selectedPlayer)); - } - - public void PopulateList(IReadOnlyList? players = null) - { - players ??= _adminSystem.PlayerList; - - _playerList = players.ToList(); - if (_selectedPlayer != null && !_playerList.Contains(_selectedPlayer)) - _selectedPlayer = null; - - FilterList(); - } - - private string GetText(PlayerInfo info) - { - var text = $"{info.CharacterName} ({info.Username})"; - if (OverrideText != null) - text = OverrideText.Invoke(info, text); - return text; - } - - private void GenerateButton(ListData data, ListContainerButton button) - { - if (data is not PlayerListData { Info: var info }) - return; - - button.AddChild(new BoxContainer - { - Orientation = LayoutOrientation.Vertical, - Children = - { - new Label - { - ClipText = true, - Text = GetText(info) - } - } - }); - - button.AddStyleClass(ListContainer.StyleClassListContainerButton); - } + _entManager = IoCManager.Resolve(); + _uiManager = IoCManager.Resolve(); + _adminSystem = _entManager.System(); + RobustXamlLoader.Load(this); + // Fill the Option data + PlayerListContainer.ItemPressed += PlayerListItemPressed; + PlayerListContainer.ItemKeyBindDown += PlayerListItemKeyBindDown; + PlayerListContainer.GenerateItem += GenerateButton; + PlayerListContainer.NoItemSelected += PlayerListNoItemSelected; + PopulateList(_adminSystem.PlayerList); + FilterLineEdit.OnTextChanged += _ => FilterList(); + _adminSystem.PlayerListChanged += PopulateList; + BackgroundPanel.PanelOverride = new StyleBoxFlat { BackgroundColor = new Color(32, 32, 40) }; } - public record PlayerListData(PlayerInfo Info) : ListData; + public IReadOnlyList PlayerInfo => _playerList; + + public event Action? OnSelectionChanged; + + private void PlayerListNoItemSelected() + { + _selectedPlayer = null; + OnSelectionChanged?.Invoke(null); + } + + private void PlayerListItemPressed(BaseButton.ButtonEventArgs? args, ListData? data) + { + if (args == null || data is not PlayerListData { Info: var selectedPlayer }) + return; + + if (selectedPlayer == _selectedPlayer) + return; + + if (args.Event.Function != EngineKeyFunctions.UIClick) + return; + + OnSelectionChanged?.Invoke(selectedPlayer); + _selectedPlayer = selectedPlayer; + + // update label text. Only required if there is some override (e.g. unread bwoink count). + if (OverrideText != null && args.Button.Children.FirstOrDefault()?.Children?.FirstOrDefault() is Label label) + label.Text = GetText(selectedPlayer); + } + + private void PlayerListItemKeyBindDown(GUIBoundKeyEventArgs? args, ListData? data) + { + if (args == null || data is not PlayerListData { Info: var selectedPlayer }) + return; + + if (args.Function != EngineKeyFunctions.UIRightClick || selectedPlayer.NetEntity == null) + return; + + _uiManager.GetUIController().OpenVerbMenu(selectedPlayer.NetEntity.Value, true); + args.Handle(); + } + + public void StopFiltering() + { + FilterLineEdit.Text = string.Empty; + } + + private void FilterList() + { + _sortedPlayerList.Clear(); + foreach (var info in _playerList) + { + var displayName = $"{info.CharacterName} ({info.Username})"; + if (info.IdentityName != info.CharacterName) + displayName += $" [{info.IdentityName}]"; + if (!string.IsNullOrEmpty(FilterLineEdit.Text) + && !displayName.ToLowerInvariant().Contains(FilterLineEdit.Text.Trim().ToLowerInvariant())) + continue; + _sortedPlayerList.Add(info); + } + + if (Comparison != null) + _sortedPlayerList.Sort((a, b) => Comparison(a, b)); + + // Ensure pinned players are always at the top + _sortedPlayerList.Sort((a, b) => a.IsPinned != b.IsPinned && a.IsPinned ? -1 : 1); + + PlayerListContainer.PopulateList(_sortedPlayerList.Select(info => new PlayerListData(info)).ToList()); + if (_selectedPlayer != null) + PlayerListContainer.Select(new PlayerListData(_selectedPlayer)); + } + + public void PopulateList(IReadOnlyList? players = null) + { + players ??= _adminSystem.PlayerList; + + _playerList = players.ToList(); + if (_selectedPlayer != null && !_playerList.Contains(_selectedPlayer)) + _selectedPlayer = null; + + FilterList(); + } + + + private string GetText(PlayerInfo info) + { + var text = $"{info.CharacterName} ({info.Username})"; + if (OverrideText != null) + text = OverrideText.Invoke(info, text); + return text; + } + + private void GenerateButton(ListData data, ListContainerButton button) + { + if (data is not PlayerListData { Info: var info }) + return; + + var entry = new PlayerListEntry(); + entry.Setup(info, OverrideText); + entry.OnPinStatusChanged += _ => + { + FilterList(); + }; + + button.AddChild(entry); + button.AddStyleClass(ListContainer.StyleClassListContainerButton); + } } + +public record PlayerListData(PlayerInfo Info) : ListData; diff --git a/Content.Client/Administration/UI/CustomControls/PlayerListEntry.xaml b/Content.Client/Administration/UI/CustomControls/PlayerListEntry.xaml new file mode 100644 index 0000000000..af13ccc0e0 --- /dev/null +++ b/Content.Client/Administration/UI/CustomControls/PlayerListEntry.xaml @@ -0,0 +1,6 @@ + + diff --git a/Content.Client/Administration/UI/CustomControls/PlayerListEntry.xaml.cs b/Content.Client/Administration/UI/CustomControls/PlayerListEntry.xaml.cs new file mode 100644 index 0000000000..cd6a56ea71 --- /dev/null +++ b/Content.Client/Administration/UI/CustomControls/PlayerListEntry.xaml.cs @@ -0,0 +1,58 @@ +using Content.Client.Stylesheets; +using Content.Shared.Administration; +using Robust.Client.AutoGenerated; +using Robust.Client.GameObjects; +using Robust.Client.UserInterface.Controls; +using Robust.Client.UserInterface.XAML; +using Robust.Shared.Utility; + +namespace Content.Client.Administration.UI.CustomControls; + +[GenerateTypedNameReferences] +public sealed partial class PlayerListEntry : BoxContainer +{ + public PlayerListEntry() + { + RobustXamlLoader.Load(this); + } + + public event Action? OnPinStatusChanged; + + public void Setup(PlayerInfo info, Func? overrideText) + { + Update(info, overrideText); + PlayerEntryPinButton.OnPressed += HandlePinButtonPressed(info); + } + + private Action HandlePinButtonPressed(PlayerInfo info) + { + return args => + { + info.IsPinned = !info.IsPinned; + UpdatePinButtonTexture(info.IsPinned); + OnPinStatusChanged?.Invoke(info); + }; + } + + private void Update(PlayerInfo info, Func? overrideText) + { + PlayerEntryLabel.Text = overrideText?.Invoke(info, $"{info.CharacterName} ({info.Username})") ?? + $"{info.CharacterName} ({info.Username})"; + + UpdatePinButtonTexture(info.IsPinned); + } + + private void UpdatePinButtonTexture(bool isPinned) + { + if (isPinned) + { + PlayerEntryPinButton?.RemoveStyleClass(StyleNano.StyleClassPinButtonUnpinned); + PlayerEntryPinButton?.AddStyleClass(StyleNano.StyleClassPinButtonPinned); + } + else + { + PlayerEntryPinButton?.RemoveStyleClass(StyleNano.StyleClassPinButtonPinned); + PlayerEntryPinButton?.AddStyleClass(StyleNano.StyleClassPinButtonUnpinned); + } + } +} diff --git a/Content.Client/Stylesheets/StyleNano.cs b/Content.Client/Stylesheets/StyleNano.cs index dba48a119d..0c04a55059 100644 --- a/Content.Client/Stylesheets/StyleNano.cs +++ b/Content.Client/Stylesheets/StyleNano.cs @@ -151,6 +151,11 @@ namespace Content.Client.Stylesheets public static readonly Color ChatBackgroundColor = Color.FromHex("#25252ADD"); + //Bwoink + public const string StyleClassPinButtonPinned = "pinButtonPinned"; + public const string StyleClassPinButtonUnpinned = "pinButtonUnpinned"; + + public override Stylesheet Stylesheet { get; } public StyleNano(IResourceCache resCache) : base(resCache) @@ -1608,6 +1613,21 @@ namespace Content.Client.Stylesheets { BackgroundColor = FancyTreeSelectedRowColor, }), + // Pinned button style + new StyleRule( + new SelectorElement(typeof(TextureButton), new[] { StyleClassPinButtonPinned }, null, null), + new[] + { + new StyleProperty(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Bwoink/pinned.png")) + }), + + // Unpinned button style + new StyleRule( + new SelectorElement(typeof(TextureButton), new[] { StyleClassPinButtonUnpinned }, null, null), + new[] + { + new StyleProperty(TextureButton.StylePropertyTexture, resCache.GetTexture("/Textures/Interface/Bwoink/un_pinned.png")) + }) }).ToList()); } } diff --git a/Content.Server/Administration/Systems/BwoinkSystem.cs b/Content.Server/Administration/Systems/BwoinkSystem.cs index 0a797aa02a..6709403177 100644 --- a/Content.Server/Administration/Systems/BwoinkSystem.cs +++ b/Content.Server/Administration/Systems/BwoinkSystem.cs @@ -7,11 +7,13 @@ using System.Text.RegularExpressions; using System.Threading.Tasks; using Content.Server.Administration.Managers; using Content.Server.Afk; +using Content.Server.Database; using Content.Server.Discord; using Content.Server.GameTicking; using Content.Server.Players.RateLimiting; using Content.Shared.Administration; using Content.Shared.CCVar; +using Content.Shared.GameTicking; using Content.Shared.Mind; using JetBrains.Annotations; using Robust.Server.Player; @@ -38,6 +40,7 @@ namespace Content.Server.Administration.Systems [Dependency] private readonly GameTicker _gameTicker = default!; [Dependency] private readonly SharedMindSystem _minds = default!; [Dependency] private readonly IAfkManager _afkManager = default!; + [Dependency] private readonly IServerDbManager _dbManager = default!; [Dependency] private readonly PlayerRateLimitManager _rateLimit = default!; [GeneratedRegex(@"^https://discord\.com/api/webhooks/(\d+)/((?!.*/).*)$")] @@ -50,7 +53,11 @@ namespace Content.Server.Administration.Systems private string _footerIconUrl = string.Empty; private string _avatarUrl = string.Empty; private string _serverName = string.Empty; - private readonly Dictionary _relayMessages = new(); + + private readonly + Dictionary _relayMessages = new(); + private Dictionary _oldMessageIds = new(); private readonly Dictionary> _messageQueues = new(); private readonly HashSet _processingChannels = new(); @@ -69,6 +76,7 @@ namespace Content.Server.Administration.Systems private const string TooLongText = "... **(too long)**"; private int _maxAdditionalChars; + private readonly Dictionary _activeConversations = new(); public override void Initialize() { @@ -79,13 +87,22 @@ namespace Content.Server.Administration.Systems Subs.CVar(_config, CVars.GameHostName, OnServerNameChanged, true); Subs.CVar(_config, CCVars.AdminAhelpOverrideClientName, OnOverrideChanged, true); _sawmill = IoCManager.Resolve().GetSawmill("AHELP"); - _maxAdditionalChars = GenerateAHelpMessage("", "", true, _gameTicker.RoundDuration().ToString("hh\\:mm\\:ss"), _gameTicker.RunLevel, playedSound: false).Length; + var defaultParams = new AHelpMessageParams( + string.Empty, + string.Empty, + true, + _gameTicker.RoundDuration().ToString("hh\\:mm\\:ss"), + _gameTicker.RunLevel, + playedSound: false + ); + _maxAdditionalChars = GenerateAHelpMessage(defaultParams).Length; _playerManager.PlayerStatusChanged += OnPlayerStatusChanged; SubscribeLocalEvent(OnGameRunLevelChanged); SubscribeNetworkEvent(OnClientTypingUpdated); + SubscribeLocalEvent(_ => _activeConversations.Clear()); - _rateLimit.Register( + _rateLimit.Register( RateLimitKey, new RateLimitRegistration { @@ -107,14 +124,129 @@ namespace Content.Server.Administration.Systems _overrideClientName = obj; } - private void OnPlayerStatusChanged(object? sender, SessionStatusEventArgs e) + private async void OnPlayerStatusChanged(object? sender, SessionStatusEventArgs e) { + if (e.NewStatus == SessionStatus.Disconnected) + { + if (_activeConversations.TryGetValue(e.Session.UserId, out var lastMessageTime)) + { + var timeSinceLastMessage = DateTime.Now - lastMessageTime; + if (timeSinceLastMessage > TimeSpan.FromMinutes(5)) + { + _activeConversations.Remove(e.Session.UserId); + return; // Do not send disconnect message if timeout exceeded + } + } + + // Check if the user has been banned + var ban = await _dbManager.GetServerBanAsync(null, e.Session.UserId, null); + if (ban != null) + { + var banMessage = Loc.GetString("bwoink-system-player-banned", ("banReason", ban.Reason)); + NotifyAdmins(e.Session, banMessage, PlayerStatusType.Banned); + _activeConversations.Remove(e.Session.UserId); + return; + } + } + + // Notify all admins if a player disconnects or reconnects + var message = e.NewStatus switch + { + SessionStatus.Connected => Loc.GetString("bwoink-system-player-reconnecting"), + SessionStatus.Disconnected => Loc.GetString("bwoink-system-player-disconnecting"), + _ => null + }; + + if (message != null) + { + var statusType = e.NewStatus == SessionStatus.Connected + ? PlayerStatusType.Connected + : PlayerStatusType.Disconnected; + NotifyAdmins(e.Session, message, statusType); + } + if (e.NewStatus != SessionStatus.InGame) return; RaiseNetworkEvent(new BwoinkDiscordRelayUpdated(!string.IsNullOrWhiteSpace(_webhookUrl)), e.Session); } + private void NotifyAdmins(ICommonSession session, string message, PlayerStatusType statusType) + { + if (!_activeConversations.ContainsKey(session.UserId)) + { + // If the user is not part of an active conversation, do not notify admins. + return; + } + + // Get the current timestamp + var timestamp = DateTime.Now.ToString("HH:mm:ss"); + var roundTime = _gameTicker.RoundDuration().ToString("hh\\:mm\\:ss"); + + // Determine the icon based on the status type + string icon = statusType switch + { + PlayerStatusType.Connected => ":green_circle:", + PlayerStatusType.Disconnected => ":red_circle:", + PlayerStatusType.Banned => ":no_entry:", + _ => ":question:" + }; + + // Create the message parameters for Discord + var messageParams = new AHelpMessageParams( + session.Name, + message, + true, + roundTime, + _gameTicker.RunLevel, + playedSound: true, + icon: icon + ); + + // Create the message for in-game with username + var color = statusType switch + { + PlayerStatusType.Connected => Color.Green.ToHex(), + PlayerStatusType.Disconnected => Color.Yellow.ToHex(), + PlayerStatusType.Banned => Color.Orange.ToHex(), + _ => Color.Gray.ToHex(), + }; + var inGameMessage = $"[color={color}]{session.Name} {message}[/color]"; + + var bwoinkMessage = new BwoinkTextMessage( + userId: session.UserId, + trueSender: SystemUserId, + text: inGameMessage, + sentAt: DateTime.Now, + playSound: false + ); + + var admins = GetTargetAdmins(); + foreach (var admin in admins) + { + RaiseNetworkEvent(bwoinkMessage, admin); + } + + // Enqueue the message for Discord relay + if (_webhookUrl != string.Empty) + { + // if (!_messageQueues.ContainsKey(session.UserId)) + // _messageQueues[session.UserId] = new Queue(); + // + // var escapedText = FormattedMessage.EscapeText(message); + // messageParams.Message = escapedText; + // + // var discordMessage = GenerateAHelpMessage(messageParams); + // _messageQueues[session.UserId].Enqueue(discordMessage); + + var queue = _messageQueues.GetOrNew(session.UserId); + var escapedText = FormattedMessage.EscapeText(message); + messageParams.Message = escapedText; + var discordMessage = GenerateAHelpMessage(messageParams); + queue.Enqueue(discordMessage); + } + } + private void OnGameRunLevelChanged(GameRunLevelChangedEvent args) { // Don't make a new embed if we @@ -209,7 +341,8 @@ namespace Content.Server.Administration.Systems var content = await response.Content.ReadAsStringAsync(); if (!response.IsSuccessStatusCode) { - _sawmill.Log(LogLevel.Error, $"Discord returned bad status code when trying to get webhook data (perhaps the webhook URL is invalid?): {response.StatusCode}\nResponse: {content}"); + _sawmill.Log(LogLevel.Error, + $"Discord returned bad status code when trying to get webhook data (perhaps the webhook URL is invalid?): {response.StatusCode}\nResponse: {content}"); return; } @@ -233,7 +366,7 @@ namespace Content.Server.Administration.Systems // Whether the message will become too long after adding these new messages var tooLong = exists && messages.Sum(msg => Math.Min(msg.Length, MessageLengthCap) + "\n".Length) - + existingEmbed.description.Length > DescriptionMax; + + existingEmbed.description.Length > DescriptionMax; // If there is no existing embed, or it is getting too long, we create a new embed if (!exists || tooLong) @@ -242,7 +375,8 @@ namespace Content.Server.Administration.Systems if (lookup == null) { - _sawmill.Log(LogLevel.Error, $"Unable to find player for NetUserId {userId} when sending discord webhook."); + _sawmill.Log(LogLevel.Error, + $"Unable to find player for NetUserId {userId} when sending discord webhook."); _relayMessages.Remove(userId); return; } @@ -254,11 +388,13 @@ namespace Content.Server.Administration.Systems { if (tooLong && existingEmbed.id != null) { - linkToPrevious = $"**[Go to previous embed of this round](https://discord.com/channels/{guildId}/{channelId}/{existingEmbed.id})**\n"; + linkToPrevious = + $"**[Go to previous embed of this round](https://discord.com/channels/{guildId}/{channelId}/{existingEmbed.id})**\n"; } else if (_oldMessageIds.TryGetValue(userId, out var id) && !string.IsNullOrEmpty(id)) { - linkToPrevious = $"**[Go to last round's conversation with this player](https://discord.com/channels/{guildId}/{channelId}/{id})**\n"; + linkToPrevious = + $"**[Go to last round's conversation with this player](https://discord.com/channels/{guildId}/{channelId}/{id})**\n"; } } @@ -274,7 +410,8 @@ namespace Content.Server.Administration.Systems GameRunLevel.PreRoundLobby => "\n\n:arrow_forward: _**Pre-round lobby started**_\n", GameRunLevel.InRound => "\n\n:arrow_forward: _**Round started**_\n", GameRunLevel.PostRound => "\n\n:stop_button: _**Post-round started**_\n", - _ => throw new ArgumentOutOfRangeException(nameof(_gameTicker.RunLevel), $"{_gameTicker.RunLevel} was not matched."), + _ => throw new ArgumentOutOfRangeException(nameof(_gameTicker.RunLevel), + $"{_gameTicker.RunLevel} was not matched."), }; existingEmbed.lastRunLevel = _gameTicker.RunLevel; @@ -290,7 +427,9 @@ namespace Content.Server.Administration.Systems existingEmbed.description += $"\n{message}"; } - var payload = GeneratePayload(existingEmbed.description, existingEmbed.username, existingEmbed.characterName); + var payload = GeneratePayload(existingEmbed.description, + existingEmbed.username, + existingEmbed.characterName); // If there is no existing embed, create a new one // Otherwise patch (edit) it @@ -302,7 +441,8 @@ namespace Content.Server.Administration.Systems var content = await request.Content.ReadAsStringAsync(); if (!request.IsSuccessStatusCode) { - _sawmill.Log(LogLevel.Error, $"Discord returned bad status code when posting message (perhaps the message is too long?): {request.StatusCode}\nResponse: {content}"); + _sawmill.Log(LogLevel.Error, + $"Discord returned bad status code when posting message (perhaps the message is too long?): {request.StatusCode}\nResponse: {content}"); _relayMessages.Remove(userId); return; } @@ -310,7 +450,8 @@ namespace Content.Server.Administration.Systems var id = JsonNode.Parse(content)?["id"]; if (id == null) { - _sawmill.Log(LogLevel.Error, $"Could not find id in json-content returned from discord webhook: {content}"); + _sawmill.Log(LogLevel.Error, + $"Could not find id in json-content returned from discord webhook: {content}"); _relayMessages.Remove(userId); return; } @@ -325,7 +466,8 @@ namespace Content.Server.Administration.Systems if (!request.IsSuccessStatusCode) { var content = await request.Content.ReadAsStringAsync(); - _sawmill.Log(LogLevel.Error, $"Discord returned bad status code when patching message (perhaps the message is too long?): {request.StatusCode}\nResponse: {content}"); + _sawmill.Log(LogLevel.Error, + $"Discord returned bad status code when patching message (perhaps the message is too long?): {request.StatusCode}\nResponse: {content}"); _relayMessages.Remove(userId); return; } @@ -355,7 +497,8 @@ namespace Content.Server.Administration.Systems : $"pre-round lobby for round {_gameTicker.RoundId + 1}", GameRunLevel.InRound => $"round {_gameTicker.RoundId}", GameRunLevel.PostRound => $"post-round {_gameTicker.RoundId}", - _ => throw new ArgumentOutOfRangeException(nameof(_gameTicker.RunLevel), $"{_gameTicker.RunLevel} was not matched."), + _ => throw new ArgumentOutOfRangeException(nameof(_gameTicker.RunLevel), + $"{_gameTicker.RunLevel} was not matched."), }; return new WebhookPayload @@ -401,6 +544,7 @@ namespace Content.Server.Administration.Systems protected override void OnBwoinkTextMessage(BwoinkTextMessage message, EntitySessionEventArgs eventArgs) { base.OnBwoinkTextMessage(message, eventArgs); + _activeConversations[message.UserId] = DateTime.Now; var senderSession = eventArgs.SenderSession; // TODO: Sanitize text? @@ -422,7 +566,9 @@ namespace Content.Server.Administration.Systems string bwoinkText; - if (senderAdmin is not null && senderAdmin.Flags == AdminFlags.Adminhelp) // Mentor. Not full admin. That's why it's colored differently. + if (senderAdmin is not null && + senderAdmin.Flags == + AdminFlags.Adminhelp) // Mentor. Not full admin. That's why it's colored differently. { bwoinkText = $"[color=purple]{senderSession.Name}[/color]"; } @@ -461,7 +607,9 @@ namespace Content.Server.Administration.Systems { string overrideMsgText; // Doing the same thing as above, but with the override name. Theres probably a better way to do this. - if (senderAdmin is not null && senderAdmin.Flags == AdminFlags.Adminhelp) // Mentor. Not full admin. That's why it's colored differently. + if (senderAdmin is not null && + senderAdmin.Flags == + AdminFlags.Adminhelp) // Mentor. Not full admin. That's why it's colored differently. { overrideMsgText = $"[color=purple]{_overrideClientName}[/color]"; } @@ -476,7 +624,11 @@ namespace Content.Server.Administration.Systems overrideMsgText = $"{(message.PlaySound ? "" : "(S) ")}{overrideMsgText}: {escapedText}"; - RaiseNetworkEvent(new BwoinkTextMessage(message.UserId, senderSession.UserId, overrideMsgText, playSound: playSound), session.Channel); + RaiseNetworkEvent(new BwoinkTextMessage(message.UserId, + senderSession.UserId, + overrideMsgText, + playSound: playSound), + session.Channel); } else RaiseNetworkEvent(msg, session.Channel); @@ -496,8 +648,18 @@ namespace Content.Server.Administration.Systems { str = str[..(DescriptionMax - _maxAdditionalChars - unameLength)]; } + var nonAfkAdmins = GetNonAfkAdmins(); - _messageQueues[msg.UserId].Enqueue(GenerateAHelpMessage(senderSession.Name, str, !personalChannel, _gameTicker.RoundDuration().ToString("hh\\:mm\\:ss"), _gameTicker.RunLevel, playedSound: playSound, noReceivers: nonAfkAdmins.Count == 0)); + var messageParams = new AHelpMessageParams( + senderSession.Name, + str, + !personalChannel, + _gameTicker.RoundDuration().ToString("hh\\:mm\\:ss"), + _gameTicker.RunLevel, + playedSound: playSound, + noReceivers: nonAfkAdmins.Count == 0 + ); + _messageQueues[msg.UserId].Enqueue(GenerateAHelpMessage(messageParams)); } if (admins.Count != 0 || sendsWebhook) @@ -512,7 +674,8 @@ namespace Content.Server.Administration.Systems private IList GetNonAfkAdmins() { return _adminManager.ActiveAdmins - .Where(p => (_adminManager.GetAdminData(p)?.HasFlag(AdminFlags.Adminhelp) ?? false) && !_afkManager.IsAfk(p)) + .Where(p => (_adminManager.GetAdminData(p)?.HasFlag(AdminFlags.Adminhelp) ?? false) && + !_afkManager.IsAfk(p)) .Select(p => p.Channel) .ToList(); } @@ -525,25 +688,69 @@ namespace Content.Server.Administration.Systems .ToList(); } - private static string GenerateAHelpMessage(string username, string message, bool admin, string roundTime, GameRunLevel roundState, bool playedSound, bool noReceivers = false) + private static string GenerateAHelpMessage(AHelpMessageParams parameters) { var stringbuilder = new StringBuilder(); - if (admin) + if (parameters.Icon != null) + stringbuilder.Append(parameters.Icon); + else if (parameters.IsAdmin) stringbuilder.Append(":outbox_tray:"); - else if (noReceivers) + else if (parameters.NoReceivers) stringbuilder.Append(":sos:"); else stringbuilder.Append(":inbox_tray:"); - if(roundTime != string.Empty && roundState == GameRunLevel.InRound) - stringbuilder.Append($" **{roundTime}**"); - if (!playedSound) + if (parameters.RoundTime != string.Empty && parameters.RoundState == GameRunLevel.InRound) + stringbuilder.Append($" **{parameters.RoundTime}**"); + if (!parameters.PlayedSound) stringbuilder.Append(" **(S)**"); - stringbuilder.Append($" **{username}:** "); - stringbuilder.Append(message); + + if (parameters.Icon == null) + stringbuilder.Append($" **{parameters.Username}:** "); + else + stringbuilder.Append($" **{parameters.Username}** "); + stringbuilder.Append(parameters.Message); return stringbuilder.ToString(); } } -} + public sealed class AHelpMessageParams + { + public string Username { get; set; } + public string Message { get; set; } + public bool IsAdmin { get; set; } + public string RoundTime { get; set; } + public GameRunLevel RoundState { get; set; } + public bool PlayedSound { get; set; } + public bool NoReceivers { get; set; } + public string? Icon { get; set; } + + public AHelpMessageParams( + string username, + string message, + bool isAdmin, + string roundTime, + GameRunLevel roundState, + bool playedSound, + bool noReceivers = false, + string? icon = null) + { + Username = username; + Message = message; + IsAdmin = isAdmin; + RoundTime = roundTime; + RoundState = roundState; + PlayedSound = playedSound; + NoReceivers = noReceivers; + Icon = icon; + } + } + + public enum PlayerStatusType + { + Connected, + Disconnected, + Banned, + } +} diff --git a/Content.Shared/Administration/PlayerInfo.cs b/Content.Shared/Administration/PlayerInfo.cs index 93f1aa0b39..ed54d57bbe 100644 --- a/Content.Shared/Administration/PlayerInfo.cs +++ b/Content.Shared/Administration/PlayerInfo.cs @@ -18,6 +18,8 @@ namespace Content.Shared.Administration { private string? _playtimeString; + public bool IsPinned { get; set; } + public string PlaytimeString => _playtimeString ??= OverallPlaytime?.ToString("%d':'hh':'mm") ?? Loc.GetString("generic-unknown-title"); diff --git a/Resources/Locale/en-US/administration/bwoink.ftl b/Resources/Locale/en-US/administration/bwoink.ftl index 3a92f58ad1..e43932dc1d 100644 --- a/Resources/Locale/en-US/administration/bwoink.ftl +++ b/Resources/Locale/en-US/administration/bwoink.ftl @@ -16,3 +16,6 @@ admin-bwoink-play-sound = Bwoink? bwoink-title-none-selected = None selected bwoink-system-rate-limited = System: you are sending messages too quickly. +bwoink-system-player-disconnecting = has disconnected. +bwoink-system-player-reconnecting = has reconnected. +bwoink-system-player-banned = has been banned for: {$banReason} diff --git a/Resources/Textures/Interface/Bwoink/pinned.png b/Resources/Textures/Interface/Bwoink/pinned.png new file mode 100644 index 0000000000000000000000000000000000000000..80c8a202005649d8b1f81cba5a9a67e8c38b8118 GIT binary patch literal 2267 zcmV<12qgE3P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+T~YSk}D|;{O1&N1SAlG$tTVzM0-4Gy~+CZUJvgk)bH%((!ek| z& z{?&fWkoI7+Zf*@;!BP`=Ip*$Q#+%(n;O5V}j6C2?4xpwF%Hqf@lif%_$ldhL+}c}$ z?npjM<|F%;(g*T6Z@c@zW!M~{@UVg8G5L$)n}OX05#KjhMfy0M{TrjjG5RsP>;o7L zdqr7uvNQX@v4C>7x&m9;R!H7#wFRkCA_mFBkf%nO2KAL!s(|RZvm$4% z?3OJ$<;2xZo%~ERSY2|>MQB;M8|Pr=3l>`ArZrxrh>;t?6}zcoVE#Ip?;2l8W{f&1 zA{#GU0T<7eJ2y3yn{RkQ5E@%ISp=VH%WrSi50)wvltpvI1hXwih$3`dTW;y>;3vqB zEks7!4giWUwg3z{C}0CQp+Hudl?XgW2$X>w`-BS=AQ5f=$=vKGj#Lp=yma)!ewb zhGU|IrY*MAawpSqQgq*?hps*L)bqev8*ca^BMcpJq>(SGZB;*|7gVFI8ZV`$pI%gh z)u^5!XdWjrHG^X835x4f01KL@W;T-dJe8Z8*~His!T>2#8`Eei1_^y9mO&TouF5^7 zo00gGZv2ySW=i)P${9%aS+@tOwRz9grP#3xC#Tk7_o2PVY&hn5spWU`|3jcrCS{;5 zp0$GO;`w0aeKe&HXlL>P0Z7nh2lhb47VyGha?&2R_Gu{oCo9 zXUY5twRwk{1KnXV*S4>xcHeeRv~Y;lN&dBUbOyS?H%jlRd6{3T9Y@sRh@)#4mLKl( zLZO6?Du8JtFY~6I-Dct4+z93?+QwJ~e6Y2Fs~E>Lpus=~zT#o~T;O&IW!}ef2GV-5 zOmM9XvSL4iN95 zL071D!#-Wt(ow&0v_Hf$pM(E|>+xbR-}Jdm`Z(00D(*LqkwWLqi~Na&Km7Y-Iodc$|Ha zJxIeq9K~N#wIVGJ77=mCP{qN5sEDIfu?QAQTcK44lS@B@CJjl7i=*ILaPVWX>fqw6 ztAnc`2!4P#J2)x2NQwVT3N2zhIPS;0dyl(!fKV?p)$AAtRLwF{@tBy+t%!kFbRmd- zj3Oj4Q%|H9GVmN<_we!cF3PjK&;2<j1(z*&EwtO?Y;eb zrrF;QeARNRr}{r<00006VoOIv0GI#(0G#2B2*CgV010qNS#tmY4#NNd4#NS*Z>VGd z000McNliru=mrcHGYl3ZkB$HU0@O)FK~z}7?U&6<6=4*{e`jWHew3+5H!w>Q`dUa} zw21DeMHy|{NB>g07X1s+qE(w()S`uvMG<6DY4)L}rI}sxe#|^AJVT=y-Z2pZ54_Cf zW!`h1_dL%zXD;m6j{Pqt$$S;I(r=XG-4GZ6Vo6hGHn|l5f*kK20xkj9fm4#&whe$J z^K6|34g!~f!;-org_6SUpkN6o07ak#bOFP_2jG>YNnjb6GqXgJnVB*d*bUTyO1j@L z05g-M4&bMsIR^9qgTNPH9GC{40~3Ck|Zg*^VuXx+9b8c zalBNiRC?n$J|2c)Z;sNnb!e^uO{+v01VKM=TT+uNJdpHRQZvwQX7k{=1LCBQyMS@%PKyIo!jeWh`Tf*`o%>f8&=d+Brn zWv}a2Gi!2j)iWtga(2?d1=ybI3m^)^@EY*aowxe!%6?#vtG@}j;?3t=hK5}8%)wVA z1!)F0v{I=Q3=Iv1lKLb)kW`hFD8D6=MkNin26B($(+(isAW)nMC`n}(^}M9VlFoQz z%iW62X|gqGP3cHnU}bMY6<`#22fPRRox(8pF!GcwcoT`;iM*~C{5kExX1()G_}*Iw zegU`&d~$uooB1HA`N66Wo-rRp&pg;XFy+}On^`@bijs!?%;KslXpn+LQUrYUEZhZd z0uOyJ29~oOE=!+3$0QZZthN~n448B-?*mVOJHYpb%V`BfZPOi1QVVbZIFX9W%&PzT pNoG0AF`Z;Gv--||g&o@p`vtnIzN(0dzC-{3002ovPDHLkV1iqBA)o*N literal 0 HcmV?d00001 diff --git a/Resources/Textures/Interface/Bwoink/pinned2.png b/Resources/Textures/Interface/Bwoink/pinned2.png new file mode 100644 index 0000000000000000000000000000000000000000..11c4b62f123e9a93fedc231390652f33f76f6d9b GIT binary patch literal 2028 zcmV-P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+RayKvhyem{I65Y5kPF>IILB3gE{^*7$?s1y*SC6 zsxcLVg+NWWz%jLd{_gY_E>>d6x*$G!uW;FDBPTROZC9Lkt?azdi&qz(Z|rpGV3-VQ zvpt5i{1fc%I$)2X^R1m^^{}joR>wY}8Ieb{dISkOZ+30hM6qoRA0-^2<^{DZ#|dTq zO50YbSFrI+M}rMusXBNW=4N2Voy|gE#?P9B+Hd#ahceoVP&u=&6@=U@Z?Ba)5_CiI z-lBW8{(Xi!Oj@xp6?vT-Z#T zn81+>^wCfbMRyJ+nrZ~P6>ek<%zVM3XWTgB6)lKdHC$O^GCjrqL!qBK-zn6485C(H z7p{PdN9F>?P;T7e1wnLQy17a4UY7jokUvOODCj25f(0g(w<)sI*W5BwX9GWndfP&p zLR}MpBE)t8qYV^LUK^*qR)INa4ITvoB_PK>;S2?|b6f$Et-)@gz``Ro#socm*|Fzg z#@PfR9ClWKHqj)AWvxU01S`m)guP{*bKV6f$F8C0Fgcy<- zvEsx_5RoV;ax^#tUGyKvgDXkLHZP1T=69oDY2x= z)l?i4)z?s^#+sU@hLfV%=9+JzNsBFY4qS{jRp}e7*UaIj_YWRhV zYOqoW`xJT{CvIp4#n@^n9)x*_* zqf0INkX}r|ZxAp&EqTG5% zv&(quna29|$8S*4+XH(Zu}9>EY3slifkCOX^DsvQUEmQw|e zG`_LofP=pQXE(+*<7h46xGi36y!)eO8$vH*okT|84gd1J_PY~x{Aa?qJN*k`)Ac+q zF0x+$00D(*LqkwWLqi~Na&Km7Y-Iodc$|HaJxIeq7>3`bYE>!@b`WvMP@OD@iaJUa zi(sL&6$HXu!xG|1K!l7cN+`oZgm#S- z6G=LcdiaMNe}Y^xxk_N5?HilAo54&jasg^i5e{;1=jz zbNkjj$LRx*rd}=I00)P_Xo0fVJ>K2j-nV~in*I9$q3&|J-eT-O00006VoOIv0GI#( z0G#2B2*CgV010qNS#tmY4#NNd4#NS*Z>VGd000McNliru=mrJ~0R)c;>Ae5|0sTot zK~z}7?bbbO6j2n$@sk+xDv79|rnN{4UkVEa1EL^^bqYIetYRV2fQ1GX1q(lcSl9@H zA3y{fK|$;Uwb3FVh`K_8#JtYT&%y}~VK?s1?jlH@W*Fw)`9J60bI&~yoBE%Ge(XVS zy>mKS2=9o9LlJQ=A|}xDFIHd}4^hD-bQjFE9li~x@Yrw7VG4ci26y2I?&3XG{m~q5 zV6a{AQCz`mEUB(}+`&*Q!P{{T&+sD$Wol~?x3INYa5qlmiS}J%TEcY<)C(KJLF`3u zzT7wQ0jYBOxjrYlYDF3mrz7HWM0|;eHxY3-B92Bx+4KD>BHl*CnTU9jzt@a@3&!y| zcb*iYSS=CxSDZx;j$>CnThNEeDtn!kFz^7o%bxLzm~8_74kw$*{60+Q=eZFRt9j;6 zH(d?$TkaaZHE7}~Mq5>UcH%`9$Vv_PCyckO`pwMDOjbGn*#<@DcFV4097~d9J$OEU z7EP=fe2$TJ!Pj)5Mov_4z8&zDEX&}2{%s&HtFr}olJ^6{ErF+LS`|JvHrADo*@3Hh z)Uc3Wz5T6(Cq;OTPH3u7wqIgjGw^{VNm9tNEZqoRm@|lpyfJx%{iO|5DwQrQq-nZX z54>m`2QaeMjQ*vAu3i6^mzO^_0xz-3o%IarDEagDx8R# zaB^>EX>4U6ba`-PAZ2)IW&i+q+SONCvcx6~{MRXR1dtHRaWG3&Zjj@r!FaYe>zkx1 zF*ODYkeY6R$JGA%v(q2A*d#|zL-fgegUcnCIHM8Gex-T0#?AY@cy;0V%1);ahDlJ% z{uuHapJCVYgd>LCuI&_8569(bbsP?5L>|%VB}mwLw_CRyrM5SGis2IKwxE_Za6(x> zZ%tUv_PKbbOM?qwsVV{qa}z5Dcb0`f#?MJc?Qyq)X=4o9PMBuLu~rarwY;M?=8~W* zl8+YMvVUsbkk5J9<%UbYI6~uYht>P!Pl_)B%Lx%*cl2<$`bl!{HTK^2)n(_ws9zan z=wN3$>2(9;GN*Zz;Z)HMvm}&gvMG?fnqoGTVv}Vs-pM*!ZMNOESr=OX(Q)H|nz^t{ zTa>_wiwvFID7JHuBvm4`EZj(BhT&>z5L*Gp3KYNw618I&F$ZhGV}w8%$gxj&g928SD?qXn@l1gukJy+K>>SI=o`)G{ z6NFIgtN?A2WQgUQB7cI5$f2yFPF1}IjigDl7w^1!?}HzQTn-Xk(BMM|F{F^AL>D#s z7-Ebm=EO;G25Rytq?l65nJFVshOdnA8J3MV+1#d^-@+ERwB>^IDXwVoC6riF$(5^A z923>oP-9IsH%kpCMRQG?Z=uDOTJFfTF5PwQzK0%r>iMMFQuRmqKsCEm^M$zXa>dDStuTc0!U~cnwe;wBg^=qaoctp&UWFpSs;qt&aCxnTqYZaByk_yAS;>X5yH~OD%s}{|6jxt#>qg z98Z0tvA*N+8&vf9!~w;aJYp|Yql;GG=-IwO_c2FDxZ5teK>QUddRLjn%)_DdfX|Q7 z(e2ugyf{C-!m`(t_nBwg?&C(>*LdmuOnHT95AZqxpE~OCb!NX_>a6Kajh^!LyS?@R zA$^cVyXg+t!7+V(sO|0xnOysCrpG&E|K>o-oD$x#Ds!<|+rImE=AYIFghxZ@9Uqeg zkIy4MBXGdv&k-7Rn57lT7h*khD(ztxy$uK-K6ts}RqVi%-Xg+zbSLb-x1J!pgX|4N z$K1B%3LJTSi=_bve;3Z1gg)97Kc7xx>D4>*fAsGEcO7;7k-`T({SBq(`(sWK`yv1U z0flKpLr_UWLm+T+Z)Rz1WdHzpoPCi!NW(xJ#a~mkA}tOU5pl>+#leE8h@(`o2o_3P zp;ZTyOFx7r4M~cNqu^R_@ME#+;Nq;SgR3A2et=*}B%`#H)n3&D2h=EshA&7pAA|x?WPox(z@El+F@bUF7%Co%B{W(HP-eiDJ zB%WouVG*wrPj6Z}=Y8TZD@h9RIq{f57bJe%gm2FkDyrBx%vM2hxf z9{xecpCp$|t_?79%%cJolH&*egWuhng~G?f?T%x@1U>#(DV?)@U^STxLpyDn@E|)m z$z&$8*V=2}4&2x^o6XaiyT?ERoSRvw@=rA9fbIhCfG6%AT?c_vUDEhw69Tj8-bb#$L5;h}ns%RUE zJ^>uq2fDzS6xmcd0?-nPEbl9s5;y{Czy?s4bAS^`eK3mB-Mb2KQ#j8qUVAG~!X^~e zZAsYI^E&WY&j$Pj4uFoC^-Fx*0$xce>7O2NW} zlBp?ODB_=H7R>C>%mxz&k!E=Z_@;i&+XnDLIWCKS5ok*O6Q$~G>PaXix~lN3(7q!Q zNlE>ThEh_Z&KxVv9;VL7;3 zbm;CoD$0i1ud-bt(ChU=yuOW literal 0 HcmV?d00001 From fda852d2e0ef04f5005122194b5029deeca48029 Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 30 Jul 2024 08:29:40 +0000 Subject: [PATCH 044/422] Automatic changelog update --- Resources/Changelog/Admin.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml index 56b708a79e..6625e7ae7f 100644 --- a/Resources/Changelog/Admin.yml +++ b/Resources/Changelog/Admin.yml @@ -367,5 +367,16 @@ Entries: id: 45 time: '2024-07-11T05:14:01.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29896 +- author: Repo + changes: + - message: Added aHelp player pinning. + type: Add + - message: Added disconnection, reconnection, banning notice on relay and ahelp. + type: Add + - message: Fixed search clears on aHelp close. + type: Fix + id: 46 + time: '2024-07-30T08:28:32.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/28639 Name: Admin Order: 1 From 517598f72dbc615ba9b3269ec75e907640b5ee77 Mon Sep 17 00:00:00 2001 From: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com> Date: Tue, 30 Jul 2024 01:31:59 -0700 Subject: [PATCH 045/422] Fix climbing not ending when any contacts still exist (#30488) --- .../Climbing/Systems/ClimbSystem.cs | 34 +++++++++++++++++-- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/Content.Shared/Climbing/Systems/ClimbSystem.cs b/Content.Shared/Climbing/Systems/ClimbSystem.cs index 726cdc2468..635bf36049 100644 --- a/Content.Shared/Climbing/Systems/ClimbSystem.cs +++ b/Content.Shared/Climbing/Systems/ClimbSystem.cs @@ -1,5 +1,4 @@ using Content.Shared.ActionBlocker; -using Content.Shared.Body.Systems; using Content.Shared.Buckle.Components; using Content.Shared.Climbing.Components; using Content.Shared.Climbing.Events; @@ -44,6 +43,7 @@ public sealed partial class ClimbSystem : VirtualController private const string ClimbingFixtureName = "climb"; private const int ClimbingCollisionGroup = (int) (CollisionGroup.TableLayer | CollisionGroup.LowImpassable); + private EntityQuery _climbableQuery; private EntityQuery _fixturesQuery; private EntityQuery _xformQuery; @@ -51,6 +51,7 @@ public sealed partial class ClimbSystem : VirtualController { base.Initialize(); + _climbableQuery = GetEntityQuery(); _fixturesQuery = GetEntityQuery(); _xformQuery = GetEntityQuery(); @@ -350,12 +351,39 @@ public sealed partial class ClimbSystem : VirtualController { if (args.OurFixtureId != ClimbingFixtureName || !component.IsClimbing - || component.NextTransition != null - || args.OurFixture.Contacts.Count > 1) + || component.NextTransition != null) { return; } + if (args.OurFixture.Contacts.Count > 1) + { + foreach (var contact in args.OurFixture.Contacts.Values) + { + if (!contact.IsTouching) + continue; + + var otherEnt = contact.EntityA; + var otherFixture = contact.FixtureA; + var otherFixtureId = contact.FixtureAId; + if (uid == contact.EntityA) + { + otherEnt = contact.EntityB; + otherFixture = contact.FixtureB; + otherFixtureId = contact.FixtureBId; + } + + if (args.OtherEntity == otherEnt && args.OtherFixtureId == otherFixtureId) + continue; + + if (otherFixture is { Hard: true } && + _climbableQuery.HasComp(otherEnt)) + { + return; + } + } + } + foreach (var otherFixture in args.OurFixture.Contacts.Keys) { // If it's the other fixture then ignore em From 648f94f4bb0d1f56b7b9262b5537b89c41581f02 Mon Sep 17 00:00:00 2001 From: themias <89101928+themias@users.noreply.github.com> Date: Tue, 30 Jul 2024 04:35:30 -0400 Subject: [PATCH 046/422] Fix fingerprint transfer on weapon attack (#30257) * Fix fingerprint transfer on weapon attack * Switch to just not raising the event * one more --- Content.Shared/Interaction/SharedInteractionSystem.cs | 6 +++--- Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs index c32b4bcf78..aca078687a 100644 --- a/Content.Shared/Interaction/SharedInteractionSystem.cs +++ b/Content.Shared/Interaction/SharedInteractionSystem.cs @@ -952,7 +952,7 @@ namespace Content.Shared.Interaction RaiseLocalEvent(target, interactUsingEvent, true); DoContactInteraction(user, used, interactUsingEvent); DoContactInteraction(user, target, interactUsingEvent); - DoContactInteraction(used, target, interactUsingEvent); + // Contact interactions are currently only used for forensics, so we don't raise used -> target if (interactUsingEvent.Handled) return; @@ -973,7 +973,7 @@ namespace Content.Shared.Interaction if (canReach) { DoContactInteraction(user, target, afterInteractEvent); - DoContactInteraction(used, target, afterInteractEvent); + // Contact interactions are currently only used for forensics, so we don't raise used -> target } if (afterInteractEvent.Handled) @@ -989,7 +989,7 @@ namespace Content.Shared.Interaction if (canReach) { DoContactInteraction(user, target, afterInteractUsingEvent); - DoContactInteraction(used, target, afterInteractUsingEvent); + // Contact interactions are currently only used for forensics, so we don't raise used -> target } } diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs index 42b6a3c9c7..72cf4ec550 100644 --- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs +++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs @@ -485,7 +485,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem var weapon = GetEntity(ev.Weapon); - Interaction.DoContactInteraction(weapon, target); + // We skip weapon -> target interaction, as forensics system applies DNA on hit Interaction.DoContactInteraction(user, weapon); // If the user is using a long-range weapon, this probably shouldn't be happening? But I'll interpret melee as a @@ -616,7 +616,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem // For stuff that cares about it being attacked. foreach (var target in targets) { - Interaction.DoContactInteraction(weapon, target); + // We skip weapon -> target interaction, as forensics system applies DNA on hit // If the user is using a long-range weapon, this probably shouldn't be happening? But I'll interpret melee as a // somewhat messy scuffle. See also, light attacks. From 89b8ec713ad3b53dfc678dbca5b6032cb4283780 Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 30 Jul 2024 08:36:37 +0000 Subject: [PATCH 047/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 9ced9860f3..7d0c591658 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: Plykiya - changes: - - message: Disarming a player now causes them to throw the disarmed item away from - them. - type: Tweak - id: 6511 - time: '2024-05-02T12:32:47.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27589 - author: fujiwaranao changes: - message: Renault now has additional fox noises. @@ -3784,3 +3776,10 @@ id: 7010 time: '2024-07-30T04:41:21.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29964 +- author: themias + changes: + - message: Fixed victim's fingerprints transferring onto an attacker's weapon + type: Fix + id: 7011 + time: '2024-07-30T08:35:30.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30257 From 0b95de1efcf7ce551eae2cb59f18652c907ac7b4 Mon Sep 17 00:00:00 2001 From: chavonadelal <156101927+chavonadelal@users.noreply.github.com> Date: Tue, 30 Jul 2024 14:29:32 +0300 Subject: [PATCH 048/422] Adding an AccessReader to a particle accelerator with engineering access (#30394) Adding an AccessReader to a particle accelerator --- .../UI/ParticleAcceleratorControlMenu.xaml.cs | 17 ++++++++++++++--- .../Power/Generation/PA/control_box.yml | 2 ++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.xaml.cs b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.xaml.cs index 9c2b51dcae..8b21e7d94b 100644 --- a/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.xaml.cs +++ b/Content.Client/ParticleAccelerator/UI/ParticleAcceleratorControlMenu.xaml.cs @@ -3,6 +3,7 @@ using Content.Client.Message; using Content.Client.Resources; using Content.Client.UserInterface.Controls; using Content.Shared.Singularity.Components; +using Content.Shared.Access.Systems; using Robust.Client.Animations; using Robust.Client.AutoGenerated; using Robust.Client.Graphics; @@ -13,6 +14,7 @@ using Robust.Client.UserInterface.XAML; using Robust.Shared.Noise; using Robust.Shared.Prototypes; using Robust.Shared.Timing; +using Robust.Client.Player; namespace Content.Client.ParticleAccelerator.UI; @@ -21,6 +23,11 @@ public sealed partial class ParticleAcceleratorControlMenu : FancyWindow { [Dependency] private readonly IResourceCache _cache = default!; + [Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private readonly IPlayerManager _player = default!; + + private readonly AccessReaderSystem _accessReader; + private readonly FastNoiseLite _drawNoiseGenerator; private readonly Animation _alarmControlAnimation; @@ -44,6 +51,7 @@ public sealed partial class ParticleAcceleratorControlMenu : FancyWindow RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); + _accessReader = _entityManager.System(); _drawNoiseGenerator = new(); _drawNoiseGenerator.SetFractalType(FastNoiseLite.FractalType.FBm); _drawNoiseGenerator.SetFrequency(0.5f); @@ -150,7 +158,7 @@ public sealed partial class ParticleAcceleratorControlMenu : FancyWindow private bool StrengthSpinBoxValid(int n) { - return n >= 0 && n <= _maxStrength ; + return n >= 0 && n <= _maxStrength; } protected override DragMode GetDragModeFor(Vector2 relativeMousePos) @@ -201,13 +209,16 @@ public sealed partial class ParticleAcceleratorControlMenu : FancyWindow private void UpdateUI(bool assembled, bool blocked, bool enabled, bool powerBlock) { + bool hasAccess = _player.LocalSession?.AttachedEntity is {} player + && _accessReader.IsAllowed(player, _entity); + OnButton.Pressed = enabled; OffButton.Pressed = !enabled; - var cantUse = !assembled || blocked || powerBlock; + var cantUse = !assembled || blocked || powerBlock || !hasAccess; OnButton.Disabled = cantUse; OffButton.Disabled = cantUse; - ScanButton.Disabled = blocked; + ScanButton.Disabled = blocked || !hasAccess; var cantChangeLevel = !assembled || blocked || !enabled || cantUse; StateSpinBox.SetButtonDisabled(cantChangeLevel); diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/control_box.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/control_box.yml index 96392ecd00..ae3fc96774 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/PA/control_box.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/PA/control_box.yml @@ -25,6 +25,8 @@ - type: Wires boardName: wires-board-name-pa layoutId: ParticleAccelerator + - type: AccessReader + access: [["Engineering"]] # Unfinished From 04b7b802108d527e2a371cefdc2ddd266c521f60 Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 30 Jul 2024 11:30:38 +0000 Subject: [PATCH 049/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 7d0c591658..7703e5baad 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: fujiwaranao - changes: - - message: Renault now has additional fox noises. - type: Add - id: 6512 - time: '2024-05-02T12:35:11.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27578 - author: Doc-Michael changes: - message: CMO's Lab coat is now more resistant to chemical spills and minor cuts @@ -3783,3 +3776,10 @@ id: 7011 time: '2024-07-30T08:35:30.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30257 +- author: to4no_fix + changes: + - message: Now engineering access is needed to interact with the particle accelerator + type: Tweak + id: 7012 + time: '2024-07-30T11:29:32.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30394 From 247222beabacd3ad540b35c26c1101c0fdc7bd61 Mon Sep 17 00:00:00 2001 From: Cojoke <83733158+Cojoke-dot@users.noreply.github.com> Date: Tue, 30 Jul 2024 08:53:44 -0500 Subject: [PATCH 050/422] Remove Walking out of Containers while You can't Walk (#30391) * Require Standing to Exit Containers * whoops, forgot a not * You can't walk out if cuffed * GUAH(requested stuff) * bwomp(tiny cleanup) --- .../Disposal/Unit/EntitySystems/DisposalUnitSystem.cs | 7 +++---- Content.Server/Resist/ResistLockerSystem.cs | 5 +++++ Content.Shared/Burial/BurialSystem.cs | 6 +++++- .../Storage/EntitySystems/SharedEntityStorageSystem.cs | 10 +++++----- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs index aa1ab3dacc..37a5ba2ef8 100644 --- a/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs +++ b/Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs @@ -25,7 +25,6 @@ using Content.Shared.Interaction; using Content.Shared.Item; using Content.Shared.Movement.Events; using Content.Shared.Popups; -using Content.Shared.Throwing; using Content.Shared.Verbs; using Robust.Server.Audio; using Robust.Server.GameObjects; @@ -35,7 +34,6 @@ using Robust.Shared.Map.Components; using Robust.Shared.Physics.Components; using Robust.Shared.Physics.Events; using Robust.Shared.Player; -using Robust.Shared.Random; using Robust.Shared.Utility; namespace Content.Server.Disposal.Unit.EntitySystems; @@ -331,12 +329,13 @@ public sealed class DisposalUnitSystem : SharedDisposalUnitSystem { var currentTime = GameTiming.CurTime; + if (!_actionBlockerSystem.CanMove(args.Entity)) + return; + if (!TryComp(args.Entity, out HandsComponent? hands) || hands.Count == 0 || currentTime < component.LastExitAttempt + ExitAttemptDelay) - { return; - } component.LastExitAttempt = currentTime; Remove(uid, component, args.Entity); diff --git a/Content.Server/Resist/ResistLockerSystem.cs b/Content.Server/Resist/ResistLockerSystem.cs index 2ab277d0f1..8294ecc5f9 100644 --- a/Content.Server/Resist/ResistLockerSystem.cs +++ b/Content.Server/Resist/ResistLockerSystem.cs @@ -8,6 +8,7 @@ using Content.Shared.Popups; using Content.Shared.Resist; using Content.Shared.Tools.Components; using Content.Shared.Tools.Systems; +using Content.Shared.ActionBlocker; namespace Content.Server.Resist; @@ -18,6 +19,7 @@ public sealed class ResistLockerSystem : EntitySystem [Dependency] private readonly PopupSystem _popupSystem = default!; [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; [Dependency] private readonly WeldableSystem _weldable = default!; + [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!; public override void Initialize() { @@ -34,6 +36,9 @@ public sealed class ResistLockerSystem : EntitySystem if (!TryComp(uid, out EntityStorageComponent? storageComponent)) return; + if (!_actionBlocker.CanMove(args.Entity)) + return; + if (TryComp(uid, out var lockComponent) && lockComponent.Locked || _weldable.IsWelded(uid)) { AttemptResist(args.Entity, uid, storageComponent, component); diff --git a/Content.Shared/Burial/BurialSystem.cs b/Content.Shared/Burial/BurialSystem.cs index 45a89f3be9..5cf7d8820e 100644 --- a/Content.Shared/Burial/BurialSystem.cs +++ b/Content.Shared/Burial/BurialSystem.cs @@ -1,3 +1,4 @@ +using Content.Shared.ActionBlocker; using Content.Shared.Burial; using Content.Shared.Burial.Components; using Content.Shared.DoAfter; @@ -8,7 +9,6 @@ using Content.Shared.Popups; using Content.Shared.Storage.Components; using Content.Shared.Storage.EntitySystems; using Robust.Shared.Audio.Systems; -using Robust.Shared.Player; namespace Content.Server.Burial.Systems; @@ -18,6 +18,7 @@ public sealed class BurialSystem : EntitySystem [Dependency] private readonly SharedEntityStorageSystem _storageSystem = default!; [Dependency] private readonly SharedAudioSystem _audioSystem = default!; [Dependency] private readonly SharedPopupSystem _popupSystem = default!; + [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!; public override void Initialize() { @@ -162,6 +163,9 @@ public sealed class BurialSystem : EntitySystem if (component.HandDiggingDoAfter != null) return; + if (!_actionBlocker.CanMove(args.Entity)) + return; + var doAfterEventArgs = new DoAfterArgs(EntityManager, args.Entity, component.DigDelay / component.DigOutByHandModifier, new GraveDiggingDoAfterEvent(), uid, target: uid) { NeedHand = false, diff --git a/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs index bb49725e04..4932613d0e 100644 --- a/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs +++ b/Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs @@ -16,16 +16,14 @@ using Content.Shared.Tools.Systems; using Content.Shared.Verbs; using Content.Shared.Wall; using Content.Shared.Whitelist; -using Robust.Shared.Audio; +using Content.Shared.ActionBlocker; using Robust.Shared.Audio.Systems; using Robust.Shared.Containers; using Robust.Shared.GameStates; using Robust.Shared.Map; using Robust.Shared.Network; using Robust.Shared.Physics; -using Robust.Shared.Physics.Components; using Robust.Shared.Physics.Systems; -using Robust.Shared.Prototypes; using Robust.Shared.Timing; using Robust.Shared.Utility; @@ -47,6 +45,7 @@ public abstract class SharedEntityStorageSystem : EntitySystem [Dependency] protected readonly SharedTransformSystem TransformSystem = default!; [Dependency] private readonly WeldableSystem _weldable = default!; [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!; public const string ContainerName = "entity_storage"; @@ -132,6 +131,9 @@ public abstract class SharedEntityStorageSystem : EntitySystem if (!HasComp(args.Entity)) return; + if (!_actionBlocker.CanMove(args.Entity)) + return; + if (_timing.CurTime < component.NextInternalOpenAttempt) return; @@ -139,9 +141,7 @@ public abstract class SharedEntityStorageSystem : EntitySystem Dirty(uid, component); if (component.OpenOnMove) - { TryOpenStorage(args.Entity, uid); - } } protected void OnFoldAttempt(EntityUid uid, SharedEntityStorageComponent component, ref FoldAttemptEvent args) From 5607c357445b736871bc9468d894a7e08b38ad85 Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 30 Jul 2024 13:54:51 +0000 Subject: [PATCH 051/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 7703e5baad..5ca55be22d 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Doc-Michael - changes: - - message: CMO's Lab coat is now more resistant to chemical spills and minor cuts - type: Tweak - id: 6513 - time: '2024-05-02T12:37:12.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27551 - author: Vasilis changes: - message: Removed airtight flaps from the construction menu. @@ -3783,3 +3776,11 @@ id: 7012 time: '2024-07-30T11:29:32.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30394 +- author: Cojoke-dot + changes: + - message: You can no longer get out of a disposal chute or container while knocked + over by trying to walk + type: Fix + id: 7013 + time: '2024-07-30T13:53:44.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30391 From 1a672c9c6d726f3cdde77e90d677dd4514c269fb Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Tue, 30 Jul 2024 15:55:21 +0200 Subject: [PATCH 052/422] add more logic gates prototypes for mapping (#30385) * Add more logic gates types for mapping * i forgor * me stupid * nuh --- .../Prototypes/Entities/Structures/gates.yml | 68 ++++++++++++++++++- .../Construction/Graphs/tools/logic_gate.yml | 2 +- Resources/migration.yml | 3 + 3 files changed, 71 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/gates.yml b/Resources/Prototypes/Entities/Structures/gates.yml index 22ab745a1e..6b02840ba0 100644 --- a/Resources/Prototypes/Entities/Structures/gates.yml +++ b/Resources/Prototypes/Entities/Structures/gates.yml @@ -15,9 +15,10 @@ - type: entity parent: BaseLogicItem - id: LogicGate + id: LogicGateOr name: logic gate description: A logic gate with two inputs and one output. Technicians can change its mode of operation using a screwdriver. + suffix: Or components: - type: Sprite layers: @@ -51,6 +52,71 @@ Nand: { state: nand } Xnor: { state: xnor } +- type: entity + parent: LogicGateOr + id: LogicGateAnd + suffix: And + components: + - type: Sprite + layers: + - state: base + - state: and + map: [ "enum.LogicGateLayers.Gate" ] + - type: LogicGate + gate: And + +- type: entity + parent: LogicGateOr + id: LogicGateXor + suffix: Xor + components: + - type: Sprite + layers: + - state: base + - state: xor + map: [ "enum.LogicGateLayers.Gate" ] + - type: LogicGate + gate: Xor + +- type: entity + parent: LogicGateOr + id: LogicGateNor + suffix: Nor + components: + - type: Sprite + layers: + - state: base + - state: nor + map: [ "enum.LogicGateLayers.Gate" ] + - type: LogicGate + gate: Nor + +- type: entity + parent: LogicGateOr + id: LogicGateNand + suffix: Nand + components: + - type: Sprite + layers: + - state: base + - state: nand + map: [ "enum.LogicGateLayers.Gate" ] + - type: LogicGate + gate: Nand + +- type: entity + parent: LogicGateOr + id: LogicGateXnor + suffix: Xnor + components: + - type: Sprite + layers: + - state: base + - state: xnor + map: [ "enum.LogicGateLayers.Gate" ] + - type: LogicGate + gate: Xnor + - type: entity parent: BaseLogicItem id: EdgeDetector diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml b/Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml index 6e64f061eb..d366a2ea59 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/tools/logic_gate.yml @@ -34,7 +34,7 @@ state: icon name: a multitool - node: logic_gate - entity: LogicGate + entity: LogicGateOr - node: edge_detector entity: EdgeDetector - node: power_sensor diff --git a/Resources/migration.yml b/Resources/migration.yml index a4276c7f10..92b2ca6d3b 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -377,3 +377,6 @@ SignDrones: SignMaterials SignShield: null # what was this even for? SignHydro2: SignHydro1 SignHydro3: SignHydro1 + +# 2024-07-27 +LogicGate: LogicGateOr From 9e1e9b8c34598aaf463b8294ece53df5d9842aef Mon Sep 17 00:00:00 2001 From: chavonadelal <156101927+chavonadelal@users.noreply.github.com> Date: Tue, 30 Jul 2024 17:05:19 +0300 Subject: [PATCH 053/422] Localization of the Salvage Expedition Console (#30339) * Localization of the Salvage Expedition Console * Localization of the Salvage Expedition Console 2 --- ...vageExpeditionConsoleBoundUserInterface.cs | 21 ++++++++- .../Expeditions/Modifiers/ISalvageMod.cs | 2 +- .../Expeditions/Modifiers/SalvageAirMod.cs | 2 +- .../Modifiers/SalvageBiomeModPrototype.cs | 2 +- .../Modifiers/SalvageDungeonModPrototype.cs | 2 +- .../Expeditions/Modifiers/SalvageLightMod.cs | 2 +- .../Expeditions/Modifiers/SalvageMod.cs | 2 +- .../Modifiers/SalvageTemperatureMod.cs | 2 +- .../Modifiers/SalvageWeatherMod.cs | 2 +- .../Expeditions/SalvageFactionPrototype.cs | 2 +- Content.Shared/Salvage/SharedSalvageSystem.cs | 6 +-- .../Locale/en-US/procedural/expeditions.ftl | 31 +++++++++++++ .../en-US/procedural/salvage-faction.ftl | 2 + .../Procedural/salvage_factions.yml | 2 + .../Prototypes/Procedural/salvage_mods.yml | 43 ++++++++++++------- 15 files changed, 94 insertions(+), 29 deletions(-) create mode 100644 Resources/Locale/en-US/procedural/salvage-faction.ftl diff --git a/Content.Client/Salvage/UI/SalvageExpeditionConsoleBoundUserInterface.cs b/Content.Client/Salvage/UI/SalvageExpeditionConsoleBoundUserInterface.cs index 663bde15b0..fe48b042f3 100644 --- a/Content.Client/Salvage/UI/SalvageExpeditionConsoleBoundUserInterface.cs +++ b/Content.Client/Salvage/UI/SalvageExpeditionConsoleBoundUserInterface.cs @@ -102,12 +102,21 @@ public sealed class SalvageExpeditionConsoleBoundUserInterface : BoundUserInterf offering.AddContent(new Label { - Text = faction, + Text = string.IsNullOrWhiteSpace(Loc.GetString(_protoManager.Index(faction).Description)) + ? LogAndReturnDefaultFactionDescription(faction) + : Loc.GetString(_protoManager.Index(faction).Description), FontColorOverride = StyleNano.NanoGold, HorizontalAlignment = Control.HAlignment.Left, Margin = new Thickness(0f, 0f, 0f, 5f), }); + string LogAndReturnDefaultFactionDescription(string faction) + { + Logger.Error($"Description is null or white space for SalvageFactionPrototype: {faction}"); + return Loc.GetString(_protoManager.Index(faction).ID); + } + + // Duration offering.AddContent(new Label { @@ -132,12 +141,20 @@ public sealed class SalvageExpeditionConsoleBoundUserInterface : BoundUserInterf offering.AddContent(new Label { - Text = Loc.GetString(_protoManager.Index(biome).ID), + Text = string.IsNullOrWhiteSpace(Loc.GetString(_protoManager.Index(biome).Description)) + ? LogAndReturnDefaultBiomDescription(biome) + : Loc.GetString(_protoManager.Index(biome).Description), FontColorOverride = StyleNano.NanoGold, HorizontalAlignment = Control.HAlignment.Left, Margin = new Thickness(0f, 0f, 0f, 5f), }); + string LogAndReturnDefaultBiomDescription(string biome) + { + Logger.Error($"Description is null or white space for SalvageBiomeModPrototype: {biome}"); + return Loc.GetString(_protoManager.Index(biome).ID); + } + // Modifiers offering.AddContent(new Label { diff --git a/Content.Shared/Salvage/Expeditions/Modifiers/ISalvageMod.cs b/Content.Shared/Salvage/Expeditions/Modifiers/ISalvageMod.cs index aa27f83f03..6233b179b3 100644 --- a/Content.Shared/Salvage/Expeditions/Modifiers/ISalvageMod.cs +++ b/Content.Shared/Salvage/Expeditions/Modifiers/ISalvageMod.cs @@ -5,7 +5,7 @@ public interface ISalvageMod /// /// Player-friendly version describing this modifier. /// - string Description { get; } + LocId Description { get; } /// /// Cost for difficulty modifiers. diff --git a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageAirMod.cs b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageAirMod.cs index c9f038e38f..fda08281b0 100644 --- a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageAirMod.cs +++ b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageAirMod.cs @@ -17,7 +17,7 @@ public sealed partial class SalvageAirMod : IPrototype, IBiomeSpecificMod /// [DataField("desc")] - public string Description { get; private set; } = string.Empty; + public LocId Description { get; private set; } = string.Empty; /// [DataField("cost")] diff --git a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageBiomeModPrototype.cs b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageBiomeModPrototype.cs index 1d4efbd18d..3235741f11 100644 --- a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageBiomeModPrototype.cs +++ b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageBiomeModPrototype.cs @@ -12,7 +12,7 @@ public sealed partial class SalvageBiomeModPrototype : IPrototype, ISalvageMod { [IdDataField] public string ID { get; } = default!; - [DataField("desc")] public string Description { get; private set; } = string.Empty; + [DataField("desc")] public LocId Description { get; private set; } = string.Empty; /// /// Cost for difficulty modifiers. diff --git a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageDungeonModPrototype.cs b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageDungeonModPrototype.cs index ee3233c551..713bdf08b3 100644 --- a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageDungeonModPrototype.cs +++ b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageDungeonModPrototype.cs @@ -10,7 +10,7 @@ public sealed partial class SalvageDungeonModPrototype : IPrototype, IBiomeSpeci { [IdDataField] public string ID { get; } = default!; - [DataField("desc")] public string Description { get; private set; } = string.Empty; + [DataField("desc")] public LocId Description { get; private set; } = string.Empty; /// [DataField("cost")] diff --git a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageLightMod.cs b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageLightMod.cs index a7c38b258d..d744d5c308 100644 --- a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageLightMod.cs +++ b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageLightMod.cs @@ -8,7 +8,7 @@ public sealed partial class SalvageLightMod : IPrototype, IBiomeSpecificMod { [IdDataField] public string ID { get; } = default!; - [DataField("desc")] public string Description { get; private set; } = string.Empty; + [DataField("desc")] public LocId Description { get; private set; } = string.Empty; /// [DataField("cost")] diff --git a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageMod.cs b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageMod.cs index 3cc4488684..5226824ed5 100644 --- a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageMod.cs +++ b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageMod.cs @@ -10,7 +10,7 @@ public sealed partial class SalvageMod : IPrototype, ISalvageMod { [IdDataField] public string ID { get; } = default!; - [DataField("desc")] public string Description { get; private set; } = string.Empty; + [DataField("desc")] public LocId Description { get; private set; } = string.Empty; /// /// Cost for difficulty modifiers. diff --git a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageTemperatureMod.cs b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageTemperatureMod.cs index 17e9af038f..e8b7235511 100644 --- a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageTemperatureMod.cs +++ b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageTemperatureMod.cs @@ -8,7 +8,7 @@ public sealed partial class SalvageTemperatureMod : IPrototype, IBiomeSpecificMo { [IdDataField] public string ID { get; } = default!; - [DataField("desc")] public string Description { get; private set; } = string.Empty; + [DataField("desc")] public LocId Description { get; private set; } = string.Empty; /// [DataField("cost")] diff --git a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageWeatherMod.cs b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageWeatherMod.cs index 1629d02b08..fc704d49e4 100644 --- a/Content.Shared/Salvage/Expeditions/Modifiers/SalvageWeatherMod.cs +++ b/Content.Shared/Salvage/Expeditions/Modifiers/SalvageWeatherMod.cs @@ -10,7 +10,7 @@ public sealed partial class SalvageWeatherMod : IPrototype, IBiomeSpecificMod { [IdDataField] public string ID { get; } = default!; - [DataField("desc")] public string Description { get; private set; } = string.Empty; + [DataField("desc")] public LocId Description { get; private set; } = string.Empty; /// [DataField("cost")] diff --git a/Content.Shared/Salvage/Expeditions/SalvageFactionPrototype.cs b/Content.Shared/Salvage/Expeditions/SalvageFactionPrototype.cs index 4c594945f0..71be4f7bd0 100644 --- a/Content.Shared/Salvage/Expeditions/SalvageFactionPrototype.cs +++ b/Content.Shared/Salvage/Expeditions/SalvageFactionPrototype.cs @@ -7,7 +7,7 @@ public sealed partial class SalvageFactionPrototype : IPrototype { [IdDataField] public string ID { get; } = default!; - [DataField("desc")] public string Description { get; private set; } = string.Empty; + [DataField("desc")] public LocId Description { get; private set; } = string.Empty; [ViewVariables(VVAccess.ReadWrite), DataField("entries", required: true)] public List MobGroups = new(); diff --git a/Content.Shared/Salvage/SharedSalvageSystem.cs b/Content.Shared/Salvage/SharedSalvageSystem.cs index 5f5fc875d6..0c56f4f556 100644 --- a/Content.Shared/Salvage/SharedSalvageSystem.cs +++ b/Content.Shared/Salvage/SharedSalvageSystem.cs @@ -55,18 +55,18 @@ public abstract partial class SharedSalvageSystem : EntitySystem if (air.Description != string.Empty) { - mods.Add(air.Description); + mods.Add(Loc.GetString(air.Description)); } // only show the description if there is an atmosphere since wont matter otherwise if (temp.Description != string.Empty && !air.Space) { - mods.Add(temp.Description); + mods.Add(Loc.GetString(temp.Description)); } if (light.Description != string.Empty) { - mods.Add(light.Description); + mods.Add(Loc.GetString(light.Description)); } var duration = TimeSpan.FromSeconds(CfgManager.GetCVar(CCVars.SalvageExpeditionDuration)); diff --git a/Resources/Locale/en-US/procedural/expeditions.ftl b/Resources/Locale/en-US/procedural/expeditions.ftl index b7bbdbce2f..56776e351d 100644 --- a/Resources/Locale/en-US/procedural/expeditions.ftl +++ b/Resources/Locale/en-US/procedural/expeditions.ftl @@ -32,3 +32,34 @@ salvage-expedition-announcement-countdown-seconds = {$duration} seconds remainin salvage-expedition-announcement-dungeon = Dungeon is located {$direction}. salvage-expedition-completed = Expedition is completed. salvage-expedition-reward-description = Mission completion reward + +# Salvage biome mod +salvage-biome-mod-caves = Caves +salvage-biome-mod-grasslands = Grasslands +salvage-biome-mod-snow = Snow +salvage-biome-mod-lava = Lava + +# Salvage mods +salvage-light-mod-daylight = Daylight +salvage-light-mod-evening = Evening +salvage-light-mod-night = Night time + +salvage-temperature-mod-room-temperature = Room temperature +salvage-temperature-mod-hot = Hot +salvage-temperature-mod-high-temperature = High temperature +salvage-temperature-mod-extreme-heat = Extreme heat +salvage-temperature-mod-cold = Cold +salvage-temperature-mod-low-temperature = Low temperature +salvage-temperature-mod-extreme-cold = Extreme cold + +salvage-air-mod-no-atmosphere = No atmosphere +salvage-air-mod-breathable-atmosphere = Breathable atmosphere +salvage-air-mod-dangerous-atmosphere = Dangerous atmosphere +salvage-air-mod-toxic-atmosphere = Toxic atmosphere +salvage-air-mod-volatile-atmosphere = Volatile atmosphere + +salvage-dungeon-mod-lava-brig = Lava Brig +salvage-dungeon-mod-snowy-labs = Snowy labs +salvage-dungeon-mod-experiment = Experiment +salvage-dungeon-mod-haunted = Haunted +salvage-dungeon-mod-mineshaft = Mineshaft diff --git a/Resources/Locale/en-US/procedural/salvage-faction.ftl b/Resources/Locale/en-US/procedural/salvage-faction.ftl new file mode 100644 index 0000000000..d3bed816f6 --- /dev/null +++ b/Resources/Locale/en-US/procedural/salvage-faction.ftl @@ -0,0 +1,2 @@ +salvage-faction-xenos = Xenos +salvage-faction-carps = Carps diff --git a/Resources/Prototypes/Procedural/salvage_factions.yml b/Resources/Prototypes/Procedural/salvage_factions.yml index 847a40ac02..f1e29375aa 100644 --- a/Resources/Prototypes/Procedural/salvage_factions.yml +++ b/Resources/Prototypes/Procedural/salvage_factions.yml @@ -1,5 +1,6 @@ - type: salvageFaction id: Xenos + desc: salvage-faction-xenos entries: - proto: MobXeno - proto: MobXenoDrone @@ -24,6 +25,7 @@ - type: salvageFaction id: Carps + desc: salvage-faction-carps entries: - proto: MobCarpDungeon # These do too much damage for salvage, need nerfs diff --git a/Resources/Prototypes/Procedural/salvage_mods.yml b/Resources/Prototypes/Procedural/salvage_mods.yml index f03c926383..ca64d29a52 100644 --- a/Resources/Prototypes/Procedural/salvage_mods.yml +++ b/Resources/Prototypes/Procedural/salvage_mods.yml @@ -7,19 +7,23 @@ # Biome mods -> at least 1 required - type: salvageBiomeMod id: Caves + desc: salvage-biome-mod-caves biome: Caves - type: salvageBiomeMod id: Grasslands + desc: salvage-biome-mod-grasslands biome: Grasslands - type: salvageBiomeMod id: Snow + desc: salvage-biome-mod-snow cost: 1 biome: Snow - type: salvageBiomeMod id: Lava + desc: salvage-biome-mod-lava cost: 2 biome: Lava @@ -32,36 +36,38 @@ # Light mods -> required - type: salvageLightMod id: Daylight - desc: Daylight + desc: salvage-light-mod-daylight color: "#D8B059" biomes: - Grasslands - type: salvageLightMod id: Lavalight - desc: Daylight + desc: salvage-light-mod-daylight color: "#A34931" biomes: - Lava - type: salvageLightMod id: Evening - desc: Evening + desc: salvage-light-mod-evening color: "#2b3143" - type: salvageLightMod id: Night - desc: Night time + desc: salvage-light-mod-night cost: 1 color: null # Temperatures - type: salvageTemperatureMod id: RoomTemp + desc: salvage-temperature-mod-room-temperature cost: 0 - type: salvageTemperatureMod id: Hot + desc: salvage-temperature-mod-hot cost: 1 temperature: 323.15 # 50C biomes: @@ -72,7 +78,7 @@ - type: salvageTemperatureMod id: Burning - desc: High temperature + desc: salvage-temperature-mod-high-temperature cost: 2 temperature: 423.15 # 200C biomes: @@ -82,7 +88,7 @@ - type: salvageTemperatureMod id: Melting - desc: Extreme heat + desc: salvage-temperature-mod-extreme-heat cost: 4 temperature: 1273.15 # 1000C hot hot hot biomes: @@ -90,6 +96,7 @@ - type: salvageTemperatureMod id: Cold + desc: salvage-temperature-mod-cold cost: 1 temperature: 275.15 # 2C biomes: @@ -100,7 +107,7 @@ - type: salvageTemperatureMod id: Tundra - desc: Low temperature + desc: salvage-temperature-mod-low-temperature cost: 2 temperature: 263.15 # -40C biomes: @@ -109,7 +116,7 @@ - type: salvageTemperatureMod id: Frozen - desc: Extreme cold + desc: salvage-temperature-mod-extreme-cold cost: 4 temperature: 123.15 # -150C biomes: @@ -118,7 +125,7 @@ # Air mixtures - type: salvageAirMod id: Space - desc: No atmosphere + desc: salvage-air-mod-no-atmosphere space: true cost: 2 biomes: @@ -128,6 +135,7 @@ - type: salvageAirMod id: Breathable cost: 0 + desc: salvage-air-mod-breathable-atmosphere gases: - 21.824779 # oxygen - 82.10312 # nitrogen @@ -135,7 +143,7 @@ - type: salvageAirMod id: Sleepy cost: 1 - desc: Dangerous atmosphere + desc: salvage-air-mod-dangerous-atmosphere gases: - 21.824779 # oxygen - 72.10312 # nitrogen @@ -155,7 +163,7 @@ - type: salvageAirMod id: Poisoned cost: 2 - desc: Dangerous atmosphere + desc: salvage-air-mod-dangerous-atmosphere gases: - 21.824779 # oxygen - 77.10312 # nitrogen @@ -170,7 +178,7 @@ - type: salvageAirMod id: Poison cost: 3 - desc: Toxic atmosphere + desc: salvage-air-mod-toxic-atmosphere gases: - 21.824779 # oxygen - 0 @@ -183,7 +191,7 @@ - type: salvageAirMod id: Plasma cost: 4 - desc: Toxic atmosphere + desc: salvage-air-mod-toxic-atmosphere gases: - 0 - 0 @@ -196,7 +204,7 @@ - type: salvageAirMod id: Burnable cost: 5 - desc: Volatile atmosphere + desc: salvage-air-mod-volatile-atmosphere gases: - 21.824779 # oxygen - 0 @@ -220,6 +228,7 @@ # For now just simple 1-dungeon setups - type: salvageDungeonMod id: Experiment + desc: salvage-dungeon-mod-experiment proto: Experiment biomes: #- LowDesert @@ -227,24 +236,28 @@ - type: salvageDungeonMod id: LavaBrig + desc: salvage-dungeon-mod-lava-brig proto: LavaBrig biomes: - Lava - type: salvageDungeonMod id: Mineshaft + desc: salvage-dungeon-mod-mineshaft proto: Mineshaft biomes: - Caves - type: salvageDungeonMod id: SnowyLabs + desc: salvage-dungeon-mod-snowy-labs proto: SnowyLabs biomes: - Snow - + - type: salvageDungeonMod id: Haunted + desc: salvage-dungeon-mod-haunted proto: Haunted biomes: - Caves From ea136838c01eecc25df4d94128492f1b8b17d9c8 Mon Sep 17 00:00:00 2001 From: Cojoke <83733158+Cojoke-dot@users.noreply.github.com> Date: Tue, 30 Jul 2024 09:07:35 -0500 Subject: [PATCH 054/422] Another QSI Fix About Things Being in Places they Should not (#30241) * Another QSI Fix About Things Being in Places they Should not * cleanup --- .../Systems/SwapTeleporterSystem.cs | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs b/Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs index 3852f260f7..0fbaefc31b 100644 --- a/Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs +++ b/Content.Shared/Teleportation/Systems/SwapTeleporterSystem.cs @@ -150,8 +150,11 @@ public sealed class SwapTeleporterSystem : EntitySystem return; } - var (teleEnt, cont) = GetTeleportingEntity((uid, xform)); - var (otherTeleEnt, otherCont) = GetTeleportingEntity((linkedEnt, Transform(linkedEnt))); + var teleEnt = GetTeleportingEntity((uid, xform)); + var otherTeleEnt = GetTeleportingEntity((linkedEnt, Transform(linkedEnt))); + + _container.TryGetOuterContainer(teleEnt, Transform(teleEnt), out var cont); + _container.TryGetOuterContainer(otherTeleEnt, Transform(otherTeleEnt), out var otherCont); if (otherCont != null && !_container.CanInsert(teleEnt, otherCont) || cont != null && !_container.CanInsert(otherTeleEnt, cont)) @@ -195,20 +198,18 @@ public sealed class SwapTeleporterSystem : EntitySystem DestroyLink(linked, user); // the linked one is shown globally } - private (EntityUid, BaseContainer?) GetTeleportingEntity(Entity ent) + private EntityUid GetTeleportingEntity(Entity ent) { var parent = ent.Comp.ParentUid; - if (_container.TryGetOuterContainer(ent, ent, out var container)) - parent = container.Owner; if (HasComp(parent) || HasComp(parent)) - return (ent, container); + return ent; if (!_xformQuery.TryGetComponent(parent, out var parentXform) || parentXform.Anchored) - return (ent, container); + return ent; if (!TryComp(parent, out var body) || body.BodyType == BodyType.Static) - return (ent, container); + return ent; return GetTeleportingEntity((parent, parentXform)); } From 0fddee233d37e9c957750cbb874780798581dbcc Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 30 Jul 2024 14:08:41 +0000 Subject: [PATCH 055/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 5ca55be22d..a2c320aedc 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Vasilis - changes: - - message: Removed airtight flaps from the construction menu. - type: Remove - id: 6514 - time: '2024-05-02T14:49:54.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27619 - author: Lamrr changes: - message: Wine and beer bottles can now be inserted into the booze dispenser. @@ -3784,3 +3777,11 @@ id: 7013 time: '2024-07-30T13:53:44.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30391 +- author: Cojoke-dot + changes: + - message: QSI now swaps the top most valid container instead of QSI when placed + in an anchored container + type: Fix + id: 7014 + time: '2024-07-30T14:07:35.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30241 From f501bd500c33f5020d7e0cfe29fddef9587a286f Mon Sep 17 00:00:00 2001 From: Roudenn <149893554+Roudenn@users.noreply.github.com> Date: Tue, 30 Jul 2024 17:26:18 +0300 Subject: [PATCH 056/422] Grappling gun's ReelRate can be changed (#30493) * Grappling gun ReelRate can be changed Moves ReelRate constant from SharedGrapplingGunSystem to GrapplingGunComponent, so it's Reel speed can be changed. * Add coment + remove redudant --- Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs | 4 +--- .../Weapons/Ranged/Components/GrapplingGunComponent.cs | 6 ++++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs b/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs index 6feffffbe3..75d5300fdb 100644 --- a/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs +++ b/Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs @@ -31,8 +31,6 @@ public abstract class SharedGrapplingGunSystem : EntitySystem public const string GrapplingJoint = "grappling"; - public const float ReelRate = 2.5f; - public override void Initialize() { base.Initialize(); @@ -187,7 +185,7 @@ public abstract class SharedGrapplingGunSystem : EntitySystem } // TODO: This should be on engine. - distance.MaxLength = MathF.Max(distance.MinLength, distance.MaxLength - ReelRate * frameTime); + distance.MaxLength = MathF.Max(distance.MinLength, distance.MaxLength - grappling.ReelRate * frameTime); distance.Length = MathF.Min(distance.MaxLength, distance.Length); _physics.WakeBody(joint.BodyAUid); diff --git a/Content.Shared/Weapons/Ranged/Components/GrapplingGunComponent.cs b/Content.Shared/Weapons/Ranged/Components/GrapplingGunComponent.cs index d0af3e8b36..553f0c10f3 100644 --- a/Content.Shared/Weapons/Ranged/Components/GrapplingGunComponent.cs +++ b/Content.Shared/Weapons/Ranged/Components/GrapplingGunComponent.cs @@ -8,6 +8,12 @@ namespace Content.Shared.Weapons.Ranged.Components; [RegisterComponent, NetworkedComponent, AutoGenerateComponentState] public sealed partial class GrapplingGunComponent : Component { + /// + /// Hook's reeling force and speed - the higher the number, the faster the hook rewinds. + /// + [DataField, AutoNetworkedField] + public float ReelRate = 2.5f; + [DataField("jointId"), AutoNetworkedField] public string Joint = string.Empty; From 23b97bd8b5fe9b1762fb1ab4cbb540dd73168aff Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Tue, 30 Jul 2024 17:41:15 +0300 Subject: [PATCH 057/422] Added diamond into upgraded ore processor (#30499) Update lathe.yml --- Resources/Prototypes/Entities/Structures/Machines/lathe.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 8abcc657cd..b0bf0019b0 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -1208,6 +1208,7 @@ - IngotGold30 - IngotSilver30 - MaterialBananium10 + - MaterialDiamond - type: entity parent: BaseLathe From 7fefcbc6fb3cfbfb1bb7ba49d58a0f4ab8421181 Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 30 Jul 2024 14:42:21 +0000 Subject: [PATCH 058/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index a2c320aedc..3763205030 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Lamrr - changes: - - message: Wine and beer bottles can now be inserted into the booze dispenser. - type: Fix - id: 6515 - time: '2024-05-02T16:17:36.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27626 - author: deltanedas changes: - message: "Ducky slippers now make you waddle. \U0001F986\U0001F986" @@ -3785,3 +3778,10 @@ id: 7014 time: '2024-07-30T14:07:35.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30241 +- author: TheShuEd + changes: + - message: industrial ore processor can now process diamonds + type: Fix + id: 7015 + time: '2024-07-30T14:41:15.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30499 From bea8c1a0b8b9c9915657ecaeafcac8b8eb31ebd7 Mon Sep 17 00:00:00 2001 From: TemporalOroboros Date: Tue, 30 Jul 2024 12:31:55 -0700 Subject: [PATCH 059/422] Relocate TemperatureProtectionComponent (#30437) Moves it from the atmos module to the temperature module where it is actually used. --- .../Components/TemperatureProtectionComponent.cs | 2 +- Content.Server/Temperature/Systems/TemperatureSystem.cs | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) rename Content.Server/{Atmos => Temperature}/Components/TemperatureProtectionComponent.cs (92%) diff --git a/Content.Server/Atmos/Components/TemperatureProtectionComponent.cs b/Content.Server/Temperature/Components/TemperatureProtectionComponent.cs similarity index 92% rename from Content.Server/Atmos/Components/TemperatureProtectionComponent.cs rename to Content.Server/Temperature/Components/TemperatureProtectionComponent.cs index bdee5ff514..437f0f8940 100644 --- a/Content.Server/Atmos/Components/TemperatureProtectionComponent.cs +++ b/Content.Server/Temperature/Components/TemperatureProtectionComponent.cs @@ -1,6 +1,6 @@ using Content.Server.Temperature.Systems; -namespace Content.Server.Atmos.Components; +namespace Content.Server.Temperature.Components; [RegisterComponent] [Access(typeof(TemperatureSystem))] diff --git a/Content.Server/Temperature/Systems/TemperatureSystem.cs b/Content.Server/Temperature/Systems/TemperatureSystem.cs index 23c8cb6783..d33bf6e025 100644 --- a/Content.Server/Temperature/Systems/TemperatureSystem.cs +++ b/Content.Server/Temperature/Systems/TemperatureSystem.cs @@ -1,6 +1,5 @@ using System.Linq; using Content.Server.Administration.Logs; -using Content.Server.Atmos.Components; using Content.Server.Atmos.EntitySystems; using Content.Server.Body.Components; using Content.Server.Temperature.Components; From 50fcde25ddc49cb3d4769d37d1c147189f9e1e4f Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Wed, 31 Jul 2024 02:08:54 +0300 Subject: [PATCH 060/422] Fix Viper yaml (#30513) Update pistols.yml --- .../Entities/Objects/Weapons/Guns/Pistols/pistols.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index e14abcc9d1..07d59aadfa 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -76,9 +76,6 @@ components: - type: Sprite sprite: Objects/Weapons/Guns/Pistols/viper.rsi - availableModes: - - FullAuto - - SemiAuto - type: ItemSlots slots: gun_magazine: From 524dad566b4c1b8b7652f37d0e1b554fbf8631b9 Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Wed, 31 Jul 2024 02:14:23 +0200 Subject: [PATCH 061/422] Rename CLF3 to "chlorine trifluoride" (#30510) Other chemicals like sodium hydroxide are written in full too, why wouldn't ClF3 be. --- Resources/Locale/en-US/reagents/meta/pyrotechnic.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/reagents/meta/pyrotechnic.ftl b/Resources/Locale/en-US/reagents/meta/pyrotechnic.ftl index 87ebe38e21..07bb47678f 100644 --- a/Resources/Locale/en-US/reagents/meta/pyrotechnic.ftl +++ b/Resources/Locale/en-US/reagents/meta/pyrotechnic.ftl @@ -7,7 +7,7 @@ reagent-desc-napalm = It's just a little flammable. reagent-name-phlogiston = phlogiston reagent-desc-phlogiston = Catches you on fire and makes you ignite. -reagent-name-chlorine-trifluoride = CLF3 +reagent-name-chlorine-trifluoride = chlorine trifluoride reagent-desc-chlorine-trifluoride = You really, REALLY don't want to get this shit anywhere near you. reagent-name-foaming-agent = foaming agent From 0ceb99df1ce435bf238f8fdbb4464e6c3b2d6446 Mon Sep 17 00:00:00 2001 From: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Date: Wed, 31 Jul 2024 02:14:49 +0200 Subject: [PATCH 062/422] Fix singularity overlay mouse position correction when zooming (#30509) fix singularity overlay mouse position correction when zooming --- Content.Client/Singularity/SingularityOverlay.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Content.Client/Singularity/SingularityOverlay.cs b/Content.Client/Singularity/SingularityOverlay.cs index c7c6aa2b5b..e71b6e96b8 100644 --- a/Content.Client/Singularity/SingularityOverlay.cs +++ b/Content.Client/Singularity/SingularityOverlay.cs @@ -100,6 +100,8 @@ namespace Content.Client.Singularity /// private void OnProjectFromScreenToMap(ref PixelToMapEvent args) { // Mostly copypasta from the singularity shader. + if (args.Viewport.Eye == null) + return; var maxDistance = MaxDistance * EyeManager.PixelsPerMeter; var finalCoords = args.VisiblePosition; @@ -112,10 +114,11 @@ namespace Content.Client.Singularity // and in local space 'Y' is measured in pixels from the top of the viewport. // As a minor optimization the locations of the singularities are transformed into fragment space in BeforeDraw so the shader doesn't need to. // We need to undo that here or this will transform the cursor position as if the singularities were mirrored vertically relative to the center of the viewport. + var localPosition = _positions[i]; localPosition.Y = args.Viewport.Size.Y - localPosition.Y; var delta = args.VisiblePosition - localPosition; - var distance = (delta / args.Viewport.RenderScale).Length(); + var distance = (delta / (args.Viewport.RenderScale * args.Viewport.Eye.Scale)).Length(); var deformation = _intensities[i] / MathF.Pow(distance, _falloffPowers[i]); From 61e87cb43aa4be57c19c1f7766227a90339011e4 Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 31 Jul 2024 00:15:55 +0000 Subject: [PATCH 063/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 3763205030..13464e833d 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,19 +1,4 @@ Entries: -- author: deltanedas - changes: - - message: "Ducky slippers now make you waddle. \U0001F986\U0001F986" - type: Tweak - id: 6516 - time: '2024-05-02T17:09:38.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27628 -- author: ElectroJr - changes: - - message: Fixed various interactions not prioritizing opening a UI. No more trying - to eat mission critical faxes. - type: Fix - id: 6517 - time: '2024-05-02T23:37:21.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27631 - author: Plykiya changes: - message: Blast grenades have had their manufacturing cost tripled. @@ -3785,3 +3770,18 @@ id: 7015 time: '2024-07-30T14:41:15.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30499 +- author: PJB3005 + changes: + - message: CLF3 is now called "chlorine trifluoride" + type: Tweak + id: 7016 + time: '2024-07-31T00:14:23.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30510 +- author: slarticodefast + changes: + - message: Fixed the mouse position when it is over a singularity distortion effect + while zoomed in or out. + type: Fix + id: 7017 + time: '2024-07-31T00:14:49.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30509 From b784edb7581b2c9e64349c9895013ac387d7778d Mon Sep 17 00:00:00 2001 From: Repo <47093363+Titian3@users.noreply.github.com> Date: Wed, 31 Jul 2024 13:58:31 +1200 Subject: [PATCH 064/422] Fix aHelp menu sorting (#30518) * Keep Pinned status through player status changes. * Fix filtering to be admin optimal. --- .../UI/Bwoink/BwoinkControl.xaml.cs | 41 +++++++++++++++++-- .../CustomControls/PlayerListControl.xaml.cs | 21 +++++++--- 2 files changed, 53 insertions(+), 9 deletions(-) diff --git a/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs b/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs index ddd66623bd..18aa02e9d6 100644 --- a/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs +++ b/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs @@ -88,6 +88,10 @@ namespace Content.Client.Administration.UI.Bwoink var ach = AHelpHelper.EnsurePanel(a.SessionId); var bch = AHelpHelper.EnsurePanel(b.SessionId); + // Pinned players first + if (a.IsPinned != b.IsPinned) + return a.IsPinned ? -1 : 1; + // First, sort by unread. Any chat with unread messages appears first. We just sort based on unread // status, not number of unread messages, so that more recent unread messages take priority. var aUnread = ach.Unread > 0; @@ -99,15 +103,31 @@ namespace Content.Client.Administration.UI.Bwoink if (a.Connected != b.Connected) return a.Connected ? -1 : 1; - // Next, group by whether or not the players have participated in this round. - // The ahelp window shows all players that have connected since server restart, this groups them all towards the bottom. - if (a.ActiveThisRound != b.ActiveThisRound) - return a.ActiveThisRound ? -1 : 1; + // Sort connected players by New Player status, then by Antag status + if (a.Connected && b.Connected) + { + var aNewPlayer = a.OverallPlaytime <= TimeSpan.FromMinutes(_cfg.GetCVar(CCVars.NewPlayerThreshold)); + var bNewPlayer = b.OverallPlaytime <= TimeSpan.FromMinutes(_cfg.GetCVar(CCVars.NewPlayerThreshold)); + + if (aNewPlayer != bNewPlayer) + return aNewPlayer ? -1 : 1; + + if (a.Antag != b.Antag) + return a.Antag ? -1 : 1; + } + + // Sort disconnected players by participation in the round + if (!a.Connected && !b.Connected) + { + if (a.ActiveThisRound != b.ActiveThisRound) + return a.ActiveThisRound ? -1 : 1; + } // Finally, sort by the most recent message. return bch.LastMessage.CompareTo(ach.LastMessage); }; + Bans.OnPressed += _ => { if (_currentPlayer is not null) @@ -253,7 +273,20 @@ namespace Content.Client.Administration.UI.Bwoink public void PopulateList() { + // Maintain existing pin statuses + var pinnedPlayers = ChannelSelector.PlayerInfo.Where(p => p.IsPinned).ToDictionary(p => p.SessionId); + ChannelSelector.PopulateList(); + + // Restore pin statuses + foreach (var player in ChannelSelector.PlayerInfo) + { + if (pinnedPlayers.TryGetValue(player.SessionId, out var pinnedPlayer)) + { + player.IsPinned = pinnedPlayer.IsPinned; + } + } + UpdateButtons(); } } diff --git a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs index b09cd727ef..c7fbf6c2dc 100644 --- a/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs +++ b/Content.Client/Administration/UI/CustomControls/PlayerListControl.xaml.cs @@ -21,11 +21,11 @@ public sealed partial class PlayerListControl : BoxContainer private readonly IEntityManager _entManager; private readonly IUserInterfaceManager _uiManager; - + private PlayerInfo? _selectedPlayer; private List _playerList = new(); - private readonly List _sortedPlayerList = new(); + private List _sortedPlayerList = new(); public Comparison? Comparison; public Func? OverrideText; @@ -110,19 +110,30 @@ public sealed partial class PlayerListControl : BoxContainer if (Comparison != null) _sortedPlayerList.Sort((a, b) => Comparison(a, b)); - // Ensure pinned players are always at the top - _sortedPlayerList.Sort((a, b) => a.IsPinned != b.IsPinned && a.IsPinned ? -1 : 1); - PlayerListContainer.PopulateList(_sortedPlayerList.Select(info => new PlayerListData(info)).ToList()); if (_selectedPlayer != null) PlayerListContainer.Select(new PlayerListData(_selectedPlayer)); } + public void PopulateList(IReadOnlyList? players = null) { + // Maintain existing pin statuses + var pinnedPlayers = _playerList.Where(p => p.IsPinned).ToDictionary(p => p.SessionId); + players ??= _adminSystem.PlayerList; _playerList = players.ToList(); + + // Restore pin statuses + foreach (var player in _playerList) + { + if (pinnedPlayers.TryGetValue(player.SessionId, out var pinnedPlayer)) + { + player.IsPinned = pinnedPlayer.IsPinned; + } + } + if (_selectedPlayer != null && !_playerList.Contains(_selectedPlayer)) _selectedPlayer = null; From f264da89c43801db72264b9255905c93219f626a Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 31 Jul 2024 01:59:37 +0000 Subject: [PATCH 065/422] Automatic changelog update --- Resources/Changelog/Admin.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml index 6625e7ae7f..6788f631b7 100644 --- a/Resources/Changelog/Admin.yml +++ b/Resources/Changelog/Admin.yml @@ -378,5 +378,12 @@ Entries: id: 46 time: '2024-07-30T08:28:32.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/28639 +- author: Repo + changes: + - message: Fixed Ahelp Sorting + type: Fix + id: 47 + time: '2024-07-31T01:58:31.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30518 Name: Admin Order: 1 From 778bfe3355044835e7ee993c00a26cc456673522 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Wed, 31 Jul 2024 21:31:41 +1000 Subject: [PATCH 066/422] Add test for anchored prototypes (#30526) Nothing fails at least but at some point will let us remove some hacky engine code. --- .../Tests/Physics/AnchorPrototypeTest.cs | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 Content.IntegrationTests/Tests/Physics/AnchorPrototypeTest.cs diff --git a/Content.IntegrationTests/Tests/Physics/AnchorPrototypeTest.cs b/Content.IntegrationTests/Tests/Physics/AnchorPrototypeTest.cs new file mode 100644 index 0000000000..a65e7d1fd6 --- /dev/null +++ b/Content.IntegrationTests/Tests/Physics/AnchorPrototypeTest.cs @@ -0,0 +1,43 @@ +using Robust.Shared.GameObjects; +using Robust.Shared.Physics; +using Robust.Shared.Physics.Components; +using Robust.Shared.Prototypes; + +namespace Content.IntegrationTests.Tests.Physics; + +[TestFixture] +public sealed class AnchorPrototypeTest +{ + /// + /// Asserts that entityprototypes marked as anchored are also static physics bodies. + /// + [Test] + public async Task TestStaticAnchorPrototypes() + { + await using var pair = await PoolManager.GetServerClient(); + + var protoManager = pair.Server.ResolveDependency(); + + await pair.Server.WaitAssertion(() => + { + foreach (var ent in protoManager.EnumeratePrototypes()) + { + if (!ent.Components.TryGetComponent("Transform", out var xformComp) || + !ent.Components.TryGetComponent("Physics", out var physicsComp)) + { + continue; + } + + var xform = (TransformComponent)xformComp; + var physics = (PhysicsComponent)physicsComp; + + if (!xform.Anchored) + continue; + + Assert.That(physics.BodyType, Is.EqualTo(BodyType.Static), $"Found entity prototype {ent} marked as anchored but not static for physics."); + } + }); + + await pair.CleanReturnAsync(); + } +} From 5bc9c04a0201bf9ce4a42145a6776a39cb2b0d83 Mon Sep 17 00:00:00 2001 From: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com> Date: Wed, 31 Jul 2024 11:32:19 +0000 Subject: [PATCH 067/422] add(SharedDoAfterSystem): Add a IsRunning "Utility" function (#30512) --- Content.Shared/DoAfter/SharedDoAfterSystem.cs | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Content.Shared/DoAfter/SharedDoAfterSystem.cs b/Content.Shared/DoAfter/SharedDoAfterSystem.cs index 77b4741533..feda662a7a 100644 --- a/Content.Shared/DoAfter/SharedDoAfterSystem.cs +++ b/Content.Shared/DoAfter/SharedDoAfterSystem.cs @@ -393,5 +393,18 @@ public abstract partial class SharedDoAfterSystem : EntitySystem // networking whether a do-after has raised its events or not. return DoAfterStatus.Finished; } + + public bool IsRunning(DoAfterId? id, DoAfterComponent? comp = null) + { + if (id == null) + return false; + + return GetStatus(id.Value.Uid, id.Value.Index, comp) == DoAfterStatus.Running; + } + + public bool IsRunning(EntityUid entity, ushort id, DoAfterComponent? comp = null) + { + return GetStatus(entity, id, comp) == DoAfterStatus.Running; + } #endregion } From 0432f21110e4953f0094f348637b50e72dd7edba Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Thu, 1 Aug 2024 01:14:19 +1000 Subject: [PATCH 068/422] Add sprite exporting (#29874) * Redo of code * Dump IDs on lobby exports --- Content.Client/Lobby/LobbyUIController.cs | 1 + .../Lobby/UI/HumanoidProfileEditor.xaml | 2 + .../Lobby/UI/HumanoidProfileEditor.xaml.cs | 49 +++- Content.Client/Sprite/ContentSpriteSystem.cs | 218 ++++++++++++++++++ .../en-US/administration/admin-verbs.ftl | 2 + .../ui/humanoid-profile-editor.ftl | 2 + 6 files changed, 272 insertions(+), 2 deletions(-) create mode 100644 Content.Client/Sprite/ContentSpriteSystem.cs diff --git a/Content.Client/Lobby/LobbyUIController.cs b/Content.Client/Lobby/LobbyUIController.cs index 824a842d56..1cdaaccc4e 100644 --- a/Content.Client/Lobby/LobbyUIController.cs +++ b/Content.Client/Lobby/LobbyUIController.cs @@ -272,6 +272,7 @@ public sealed class LobbyUIController : UIController, IOnStateEntered - public void SetVelocityDirection(EntityUid entity, InputMoverComponent component, Direction direction, ushort subTick, bool enabled) + public void SetVelocityDirection(Entity entity, Direction direction, ushort subTick, bool enabled) { // Logger.Info($"[{_gameTiming.CurTick}/{subTick}] {direction}: {enabled}"); @@ -417,26 +417,26 @@ namespace Content.Shared.Movement.Systems _ => throw new ArgumentException(nameof(direction)) }; - SetMoveInput(entity, component, subTick, enabled, bit); + SetMoveInput(entity, subTick, enabled, bit); } - private void SetMoveInput(EntityUid entity, InputMoverComponent component, ushort subTick, bool enabled, MoveButtons bit) + private void SetMoveInput(Entity entity, ushort subTick, bool enabled, MoveButtons bit) { // Modifies held state of a movement button at a certain sub tick and updates current tick movement vectors. - ResetSubtick(component); + ResetSubtick(entity.Comp); - if (subTick >= component.LastInputSubTick) + if (subTick >= entity.Comp.LastInputSubTick) { - var fraction = (subTick - component.LastInputSubTick) / (float) ushort.MaxValue; + var fraction = (subTick - entity.Comp.LastInputSubTick) / (float) ushort.MaxValue; - ref var lastMoveAmount = ref component.Sprinting ? ref component.CurTickSprintMovement : ref component.CurTickWalkMovement; + ref var lastMoveAmount = ref entity.Comp.Sprinting ? ref entity.Comp.CurTickSprintMovement : ref entity.Comp.CurTickWalkMovement; - lastMoveAmount += DirVecForButtons(component.HeldMoveButtons) * fraction; + lastMoveAmount += DirVecForButtons(entity.Comp.HeldMoveButtons) * fraction; - component.LastInputSubTick = subTick; + entity.Comp.LastInputSubTick = subTick; } - var buttons = component.HeldMoveButtons; + var buttons = entity.Comp.HeldMoveButtons; if (enabled) { @@ -447,7 +447,7 @@ namespace Content.Shared.Movement.Systems buttons &= ~bit; } - SetMoveInput(component, buttons); + SetMoveInput(entity, buttons); } private void ResetSubtick(InputMoverComponent component) @@ -460,11 +460,11 @@ namespace Content.Shared.Movement.Systems component.LastInputSubTick = 0; } - public void SetSprinting(EntityUid entity, InputMoverComponent component, ushort subTick, bool walking) + public void SetSprinting(Entity entity, ushort subTick, bool walking) { // Logger.Info($"[{_gameTiming.CurTick}/{subTick}] Sprint: {enabled}"); - SetMoveInput(entity, component, subTick, walking, MoveButtons.Walk); + SetMoveInput(entity, subTick, walking, MoveButtons.Walk); } /// diff --git a/Content.Shared/Movement/Systems/SharedMoverController.Relay.cs b/Content.Shared/Movement/Systems/SharedMoverController.Relay.cs index 8568290bff..8156955377 100644 --- a/Content.Shared/Movement/Systems/SharedMoverController.Relay.cs +++ b/Content.Shared/Movement/Systems/SharedMoverController.Relay.cs @@ -12,14 +12,14 @@ public abstract partial class SharedMoverController SubscribeLocalEvent(OnAfterRelayState); } - private void OnAfterRelayTargetState(EntityUid uid, MovementRelayTargetComponent component, ref AfterAutoHandleStateEvent args) + private void OnAfterRelayTargetState(Entity entity, ref AfterAutoHandleStateEvent args) { - Physics.UpdateIsPredicted(uid); + Physics.UpdateIsPredicted(entity.Owner); } - private void OnAfterRelayState(EntityUid uid, RelayInputMoverComponent component, ref AfterAutoHandleStateEvent args) + private void OnAfterRelayState(Entity entity, ref AfterAutoHandleStateEvent args) { - Physics.UpdateIsPredicted(uid); + Physics.UpdateIsPredicted(entity.Owner); } /// @@ -61,30 +61,30 @@ public abstract partial class SharedMoverController Dirty(relayEntity, targetComp); } - private void OnRelayShutdown(EntityUid uid, RelayInputMoverComponent component, ComponentShutdown args) + private void OnRelayShutdown(Entity entity, ref ComponentShutdown args) { - Physics.UpdateIsPredicted(uid); - Physics.UpdateIsPredicted(component.RelayEntity); + Physics.UpdateIsPredicted(entity.Owner); + Physics.UpdateIsPredicted(entity.Comp.RelayEntity); - if (TryComp(component.RelayEntity, out var inputMover)) - SetMoveInput(inputMover, MoveButtons.None); + if (TryComp(entity.Comp.RelayEntity, out var inputMover)) + SetMoveInput((entity.Comp.RelayEntity, inputMover), MoveButtons.None); if (Timing.ApplyingState) return; - if (TryComp(component.RelayEntity, out MovementRelayTargetComponent? target) && target.LifeStage <= ComponentLifeStage.Running) - RemComp(component.RelayEntity, target); + if (TryComp(entity.Comp.RelayEntity, out MovementRelayTargetComponent? target) && target.LifeStage <= ComponentLifeStage.Running) + RemComp(entity.Comp.RelayEntity, target); } - private void OnTargetRelayShutdown(EntityUid uid, MovementRelayTargetComponent component, ComponentShutdown args) + private void OnTargetRelayShutdown(Entity entity, ref ComponentShutdown args) { - Physics.UpdateIsPredicted(uid); - Physics.UpdateIsPredicted(component.Source); + Physics.UpdateIsPredicted(entity.Owner); + Physics.UpdateIsPredicted(entity.Comp.Source); if (Timing.ApplyingState) return; - if (TryComp(component.Source, out RelayInputMoverComponent? relay) && relay.LifeStage <= ComponentLifeStage.Running) - RemComp(component.Source, relay); + if (TryComp(entity.Comp.Source, out RelayInputMoverComponent? relay) && relay.LifeStage <= ComponentLifeStage.Running) + RemComp(entity.Comp.Source, relay); } } From 20cb65f2e6d7d76cecc5e52eb41be7774ead4581 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Fri, 2 Aug 2024 11:33:20 +1000 Subject: [PATCH 098/422] Fix double interaction popups (#30452) The issue is it plays the "you hug xyz" to everyone in range as well as the target client so they overlap. IDK if anything else is broken by this but this control flow is pretty bad so I wouldn't be surprised. --- Content.Shared/Interaction/InteractionPopupSystem.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Shared/Interaction/InteractionPopupSystem.cs b/Content.Shared/Interaction/InteractionPopupSystem.cs index d956ff3d95..2a742d4211 100644 --- a/Content.Shared/Interaction/InteractionPopupSystem.cs +++ b/Content.Shared/Interaction/InteractionPopupSystem.cs @@ -113,7 +113,7 @@ public sealed class InteractionPopupSystem : EntitySystem Spawn(component.InteractFailureSpawn, _transform.GetMapCoordinates(uid)); } - if (component.MessagePerceivedByOthers != null) + if (!string.IsNullOrEmpty(component.MessagePerceivedByOthers)) { var msgOthers = Loc.GetString(component.MessagePerceivedByOthers, ("user", Identity.Entity(user, EntityManager)), ("target", Identity.Entity(uid, EntityManager))); @@ -131,7 +131,7 @@ public sealed class InteractionPopupSystem : EntitySystem return; } - _popupSystem.PopupPredicted(msg, uid, user); + _popupSystem.PopupClient(msg, uid, user); if (sfx == null) return; From a2e945f27236d8ab92dc5c52de5cd936836a87fe Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 2 Aug 2024 01:34:26 +0000 Subject: [PATCH 099/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index aec640d102..c75dae6408 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,13 +1,4 @@ Entries: -- author: TheShuEd - changes: - - message: "Added Pathological Liar trait accent. The accent has a 15% chance of\ - \ inverting your message to the opposite. Replacing \u201CYes\u201D with \u201C\ - No\u201D, \u201CCan\u201D with \u201Ccan't\u201D and so on." - type: Add - id: 6527 - time: '2024-05-04T11:11:46.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27618 - author: Tyzemol changes: - message: Fixed NPCs being able to see and attack you hiding in closed lockers @@ -3775,3 +3766,10 @@ id: 7026 time: '2024-08-01T20:01:05.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30501 +- author: metalgearsloth + changes: + - message: Fix some popups playing twice. + type: Fix + id: 7027 + time: '2024-08-02T01:33:20.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30452 From c99cdf5c5983e643531ba385c11c51b36d9b90e8 Mon Sep 17 00:00:00 2001 From: NakataRin <45946146+NakataRin@users.noreply.github.com> Date: Fri, 2 Aug 2024 09:39:00 +0400 Subject: [PATCH 100/422] susbox locale fix (#30564) --- Resources/Locale/en-US/store/uplink-catalog.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index 07edd8f007..47eb671619 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -245,7 +245,7 @@ uplink-super-surplus-bundle-desc = Contains 125 telecrystals worth of completely # Tools uplink-toolbox-name = Toolbox -uplink-toolbox-desc = A full compliment of tools for the mechanically inclined traitor. Includes a pair of insulated combat gloves, syndicate gas mask and a utility belt. +uplink-toolbox-desc = A full compliment of tools for the mechanically inclined traitor. Includes a pair of insulated combat gloves and a syndicate gas mask as well. uplink-syndicate-jaws-of-life-name = Jaws Of Life uplink-syndicate-jaws-of-life-desc = A combined prying and cutting tool. Useful for entering the station or its departments. From 4179821ffa127d8e103bc5d9493c6b5d90594c14 Mon Sep 17 00:00:00 2001 From: Mervill Date: Thu, 1 Aug 2024 22:42:02 -0700 Subject: [PATCH 101/422] Show the player a server message when they get booted from the arrivals shuttle (#30519) show the player a server message when they get booted from the arrivals shuttle --- .../Shuttles/Systems/ArrivalsSystem.cs | 18 +++++++++++++++--- .../Locale/en-US/game-ticking/game-ticker.ftl | 2 ++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs index 47ccc3c3c4..0cbbc46a4f 100644 --- a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs +++ b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs @@ -1,6 +1,7 @@ using System.Linq; using System.Numerics; using Content.Server.Administration; +using Content.Server.Chat.Managers; using Content.Server.DeviceNetwork.Components; using Content.Server.DeviceNetwork.Systems; using Content.Server.GameTicking; @@ -28,6 +29,7 @@ using Robust.Shared.Collections; using Robust.Shared.Configuration; using Robust.Shared.Console; using Robust.Shared.Map; +using Robust.Shared.Player; using Robust.Shared.Prototypes; using Robust.Shared.Random; using Robust.Shared.Timing; @@ -46,6 +48,7 @@ public sealed class ArrivalsSystem : EntitySystem [Dependency] private readonly IMapManager _mapManager = default!; [Dependency] private readonly IPrototypeManager _protoManager = default!; [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private readonly IChatManager _chat = default!; [Dependency] private readonly BiomeSystem _biomes = default!; [Dependency] private readonly GameTicker _ticker = default!; [Dependency] private readonly MapLoaderSystem _loader = default!; @@ -54,6 +57,7 @@ public sealed class ArrivalsSystem : EntitySystem [Dependency] private readonly ShuttleSystem _shuttles = default!; [Dependency] private readonly StationSpawningSystem _stationSpawning = default!; [Dependency] private readonly StationSystem _station = default!; + [Dependency] private readonly ActorSystem _actor = default!; private EntityQuery _pendingQuery; private EntityQuery _blacklistQuery; @@ -293,16 +297,20 @@ public sealed class ArrivalsSystem : EntitySystem private void DumpChildren(EntityUid uid, ref FTLStartedEvent args) { var toDump = new List>(); - DumpChildren(uid, ref args, toDump); + FindDumpChildren(uid, toDump); foreach (var (ent, xform) in toDump) { var rotation = xform.LocalRotation; _transform.SetCoordinates(ent, new EntityCoordinates(args.FromMapUid!.Value, Vector2.Transform(xform.LocalPosition, args.FTLFrom))); _transform.SetWorldRotation(ent, args.FromRotation + rotation); + if (_actor.TryGetSession(ent, out var session)) + { + _chat.DispatchServerMessage(session!, Loc.GetString("latejoin-arrivals-dumped-from-shuttle")); + } } } - private void DumpChildren(EntityUid uid, ref FTLStartedEvent args, List> toDump) + private void FindDumpChildren(EntityUid uid, List> toDump) { if (_pendingQuery.HasComponent(uid)) return; @@ -318,7 +326,7 @@ public sealed class ArrivalsSystem : EntitySystem var children = xform.ChildEnumerator; while (children.MoveNext(out var child)) { - DumpChildren(child, ref args, toDump); + FindDumpChildren(child, toDump); } } @@ -392,6 +400,10 @@ public sealed class ArrivalsSystem : EntitySystem { // Move the player to a random late-join spawnpoint. _transform.SetCoordinates(player, transform, _random.Pick(possiblePositions)); + if (_actor.TryGetSession(player, out var session)) + { + _chat.DispatchServerMessage(session!, Loc.GetString("latejoin-arrivals-teleport-to-spawn")); + } return true; } diff --git a/Resources/Locale/en-US/game-ticking/game-ticker.ftl b/Resources/Locale/en-US/game-ticking/game-ticker.ftl index 9527ecb57d..9c2d7bcf30 100644 --- a/Resources/Locale/en-US/game-ticking/game-ticker.ftl +++ b/Resources/Locale/en-US/game-ticking/game-ticker.ftl @@ -37,6 +37,8 @@ latejoin-arrival-announcement = {$character} ({$job}) has arrived at the station latejoin-arrival-sender = Station latejoin-arrivals-direction = A shuttle transferring you to your station will arrive shortly. latejoin-arrivals-direction-time = A shuttle transferring you to your station will arrive in {$time}. +latejoin-arrivals-dumped-from-shuttle = A mysterious force prevents you from leaving with the arrivals shuttle. +latejoin-arrivals-teleport-to-spawn = A mysterious force teleports you off the arrivals shuttle. Have a safe shift! preset-not-enough-ready-players = Can't start {$presetName}. Requires {$minimumPlayers} players but we have {$readyPlayersCount}. preset-no-one-ready = Can't start {$presetName}. No players are ready. \ No newline at end of file From 745d90ad73f799bf7ad9ce81d6f4f6e07bf9dde8 Mon Sep 17 00:00:00 2001 From: Kaga-404 <103199482+Kaga-404@users.noreply.github.com> Date: Thu, 1 Aug 2024 22:43:11 -0700 Subject: [PATCH 102/422] Revolver fixes for caseless ammo and wielding (#30117) * handled check * splits Handled and TryResetDelay checks --- .../Ranged/Systems/SharedGunSystem.Revolver.cs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs index 14aaff5bf7..2c0204d946 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Revolver.cs @@ -9,6 +9,8 @@ using Robust.Shared.Utility; using System; using System.Linq; using Content.Shared.Interaction.Events; +using Content.Shared.Wieldable; +using Content.Shared.Wieldable.Components; using JetBrains.Annotations; namespace Content.Shared.Weapons.Ranged.Systems; @@ -31,9 +33,14 @@ public partial class SharedGunSystem private void OnRevolverUse(EntityUid uid, RevolverAmmoProviderComponent component, UseInHandEvent args) { + if (args.Handled) + return; + if (!_useDelay.TryResetDelay(uid)) return; + args.Handled = true; + Cycle(component); UpdateAmmoCount(uid, prediction: false); Dirty(uid, component); @@ -393,10 +400,14 @@ public partial class SharedGunSystem args.Ammo.Add((spawned, EnsureComp(spawned))); if (cartridge.DeleteOnSpawn) + { + component.AmmoSlots[index] = null; component.Chambers[index] = null; + } } else { + component.AmmoSlots[index] = null; component.Chambers[index] = null; args.Ammo.Add((ent.Value, EnsureComp(ent.Value))); } From 67fc8af81418dd942de1b06eb28b3a177d3c7088 Mon Sep 17 00:00:00 2001 From: WarMechanic <69510347+WarMechanic@users.noreply.github.com> Date: Fri, 2 Aug 2024 15:43:40 +1000 Subject: [PATCH 103/422] Adjusts the lethality of meteor explosions (#29199) * make changes * int oops --- .../Objects/Weapons/Guns/Projectiles/meteors.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml index 235010acc9..b4e8e77c51 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml @@ -39,8 +39,11 @@ damageContainer: Inorganic - type: Explosive explosionType: Default - intensitySlope: 4 + intensitySlope: 2 maxIntensity: 100 + maxTileBreak: 1 + tileBreakScale: 2 + - type: entity parent: BaseMeteor @@ -99,7 +102,7 @@ - Impassable - BulletImpassable - type: Explosive - totalIntensity: 100 + totalIntensity: 50 - type: Destructible thresholds: - trigger: @@ -139,7 +142,7 @@ - Impassable - BulletImpassable - type: Explosive - totalIntensity: 200 + totalIntensity: 100 - type: Destructible thresholds: - trigger: @@ -167,7 +170,7 @@ - type: Sprite state: big - type: Explosive - totalIntensity: 300 + totalIntensity: 150 - type: Destructible thresholds: - trigger: From 0b253e94ebc23228ee4dfeca13a36a73c3682f6a Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 2 Aug 2024 05:44:47 +0000 Subject: [PATCH 104/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index c75dae6408..bdf8b5b571 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: Tyzemol - changes: - - message: Fixed NPCs being able to see and attack you hiding in closed lockers - and crates - type: Fix - id: 6528 - time: '2024-05-04T19:57:59.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27677 - author: Blackern5000 changes: - message: Security belts can now hold more items that security commonly uses. @@ -3773,3 +3765,10 @@ id: 7027 time: '2024-08-02T01:33:20.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30452 +- author: WarMechanic + changes: + - message: Adjusted meteors to have less lethal blast fragments. + type: Tweak + id: 7028 + time: '2024-08-02T05:43:41.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29199 From 2c31e03ee3a5da2f8817eddbccc80005aa122aa0 Mon Sep 17 00:00:00 2001 From: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Date: Fri, 2 Aug 2024 07:44:59 +0200 Subject: [PATCH 105/422] Fix borgs being unable to state laws or open other UIs without modules (#30299) borg law 2 state laws all day --- Content.Shared/Interaction/SharedInteractionSystem.cs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs index aca078687a..a57796d87c 100644 --- a/Content.Shared/Interaction/SharedInteractionSystem.cs +++ b/Content.Shared/Interaction/SharedInteractionSystem.cs @@ -165,10 +165,7 @@ namespace Content.Shared.Interaction return; } - if (!uiComp.RequireHands) - return; - - if (!_handsQuery.TryComp(ev.Actor, out var hands) || hands.Hands.Count == 0) + if (uiComp.RequireHands && !_handsQuery.HasComp(ev.Actor)) ev.Cancel(); } From fa5995ddabbcfd77561645d55fbfda3c56714ba2 Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 2 Aug 2024 05:46:05 +0000 Subject: [PATCH 106/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index bdf8b5b571..768acf79bc 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Blackern5000 - changes: - - message: Security belts can now hold more items that security commonly uses. - type: Tweak - id: 6529 - time: '2024-05-04T20:00:22.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27674 - author: Blackern5000 changes: - message: Floodlights now use medium power cells instead of small ones. @@ -3772,3 +3765,11 @@ id: 7028 time: '2024-08-02T05:43:41.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29199 +- author: slarticodefast + changes: + - message: Fixed borgs not being able to state laws or open other UIs without an + active module. + type: Fix + id: 7029 + time: '2024-08-02T05:44:59.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30299 From b4607acea0f6bc1ff25379ad4045811731b67ffa Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Fri, 2 Aug 2024 05:48:04 +0000 Subject: [PATCH 107/422] add flash bounty for revs (#29248) * add flash bounty * escape --------- Co-authored-by: deltanedas <@deltanedas:kde.org> --- Resources/Locale/en-US/cargo/bounties.ftl | 2 ++ Resources/Prototypes/Catalog/Bounties/bounties.yml | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/Resources/Locale/en-US/cargo/bounties.ftl b/Resources/Locale/en-US/cargo/bounties.ftl index 09424e4909..b5eeafb0b3 100644 --- a/Resources/Locale/en-US/cargo/bounties.ftl +++ b/Resources/Locale/en-US/cargo/bounties.ftl @@ -65,6 +65,7 @@ bounty-item-cardboard-box = Cardboard box bounty-item-wine = Wine bottle bounty-item-cotton-boll = Cotton boll bounty-item-microwave-machine-board = Microwave machine board +bounty-item-flash = Flash bounty-description-artifact = NanoTrasen is in some hot water for stealing artifacts from non-spacefaring planets. Return one and we'll compensate you for it. bounty-description-baseball-bat = Baseball fever is going on at CentCom! Be a dear and ship them some baseball bats, so that management can live out their childhood dream. @@ -132,3 +133,4 @@ bounty-description-cardobard-box = "The Cardborgs Cometh" is a new play premieri bounty-description-wine = The new librarian and the Quartermaster are falling head over heels for each other after she caught him disassembling the bookshelves for wood. Send a couple bottles of wine (Or cans, if you must) to help make the date go well. bounty-description-cotton-boll = A massive swarm of mothroaches ate all the paper and cloth on the station. Send us some cotton to help keep our winged crewmembers fed. bounty-description-microwave-machine-board = Mr. Giggles thought it'd be funny to stick forks in all the kitchen microwaves. Help us replace them before the chefs start making clown burgers. +bounty-description-flashes = GREETINGS \[Station] WE REQUIRE 6 FLASHES DUE TO A NORMAL \[TrainingExercise] WITH SECURITY. EVERYTHING IS \[Normal]. diff --git a/Resources/Prototypes/Catalog/Bounties/bounties.yml b/Resources/Prototypes/Catalog/Bounties/bounties.yml index 2099d0e2a8..b4847731df 100644 --- a/Resources/Prototypes/Catalog/Bounties/bounties.yml +++ b/Resources/Prototypes/Catalog/Bounties/bounties.yml @@ -733,3 +733,13 @@ tags: - MicrowaveMachineBoard +- type: cargoBounty + id: BountyFlashes + reward: 5500 + description: bounty-description-flashes + entries: + - name: bounty-item-flash + amount: 6 + whitelist: + components: + - Flash From 5dd3e9b514a1389c6b0796739d92e1e945c84cd7 Mon Sep 17 00:00:00 2001 From: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com> Date: Fri, 2 Aug 2024 05:57:18 +0000 Subject: [PATCH 108/422] tweak(BurialSystem): Don't cancel doafter on keyup (#30507) --- Content.Shared/Burial/BurialSystem.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Shared/Burial/BurialSystem.cs b/Content.Shared/Burial/BurialSystem.cs index 5cf7d8820e..c86b2ec024 100644 --- a/Content.Shared/Burial/BurialSystem.cs +++ b/Content.Shared/Burial/BurialSystem.cs @@ -160,7 +160,7 @@ public sealed class BurialSystem : EntitySystem { // We track a separate doAfter here, as we want someone with a shovel to // be able to come along and help someone trying to claw their way out - if (component.HandDiggingDoAfter != null) + if (_doAfterSystem.IsRunning(component.HandDiggingDoAfter)) return; if (!_actionBlocker.CanMove(args.Entity)) @@ -178,7 +178,7 @@ public sealed class BurialSystem : EntitySystem if (component.Stream == null) component.Stream = _audioSystem.PlayPredicted(component.DigSound, uid, args.Entity)?.Entity; - if (!_doAfterSystem.TryStartDoAfter(doAfterEventArgs)) + if (!_doAfterSystem.TryStartDoAfter(doAfterEventArgs, out component.HandDiggingDoAfter)) { _audioSystem.Stop(component.Stream); return; From d13bcd1faa2950377f61a4c3c6159999f60f5e3a Mon Sep 17 00:00:00 2001 From: "Benny (TropicalHibi)" <24284437+TropicalHibi@users.noreply.github.com> Date: Fri, 2 Aug 2024 01:57:50 -0400 Subject: [PATCH 109/422] WRU and FS autocompletion (#30508) modified: Resources/Locale/en-US/speech/speech-chatsan.ftl modified: Resources/Prototypes/Accents/word_replacements.yml --- Resources/Locale/en-US/speech/speech-chatsan.ftl | 6 ++++++ Resources/Prototypes/Accents/word_replacements.yml | 2 ++ 2 files changed, 8 insertions(+) diff --git a/Resources/Locale/en-US/speech/speech-chatsan.ftl b/Resources/Locale/en-US/speech/speech-chatsan.ftl index 9f3cc9d42d..3e1c3fedb6 100644 --- a/Resources/Locale/en-US/speech/speech-chatsan.ftl +++ b/Resources/Locale/en-US/speech/speech-chatsan.ftl @@ -144,3 +144,9 @@ chatsan-replacement-51 = real quick chatsan-word-52 = dw chatsan-replacement-52 = don't worry + +chatsan-word-53 = wru +chatsan-replacement-53 = where are you + +chatsan-word-54 = fs +chatsan-replacement-54 = for sure diff --git a/Resources/Prototypes/Accents/word_replacements.yml b/Resources/Prototypes/Accents/word_replacements.yml index 5cf097e1a8..1e611a99d3 100644 --- a/Resources/Prototypes/Accents/word_replacements.yml +++ b/Resources/Prototypes/Accents/word_replacements.yml @@ -433,6 +433,8 @@ chatsan-word-50: chatsan-replacement-50 chatsan-word-51: chatsan-replacement-51 chatsan-word-52: chatsan-replacement-52 + chatsan-word-53: chatsan-replacement-53 + chatsan-word-54: chatsan-replacement-54 - type: accent id: liar From bfd47ed69a6286e1c781d2ccb5f834826b3b79ed Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 2 Aug 2024 05:58:56 +0000 Subject: [PATCH 110/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 768acf79bc..aaf7612aac 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Blackern5000 - changes: - - message: Floodlights now use medium power cells instead of small ones. - type: Tweak - id: 6530 - time: '2024-05-04T20:06:16.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27672 - author: lzk228 changes: - message: Grey whistle added to arcade machine prizes. @@ -3773,3 +3766,11 @@ id: 7029 time: '2024-08-02T05:44:59.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30299 +- author: TropicalHibi + changes: + - message: Now fs (for sure) and wru (where are you) are changed to their full version + in text + type: Add + id: 7030 + time: '2024-08-02T05:57:50.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30508 From c36b94316ee0cbed2b52122dc8aba665c46ba764 Mon Sep 17 00:00:00 2001 From: Vasilis Date: Fri, 2 Aug 2024 08:02:24 +0200 Subject: [PATCH 111/422] Add PR guidelines checkbox to PR template (#30283) * Add PR guidelines checkbox to PR template * Update PULL_REQUEST_TEMPLATE.md --- .github/PULL_REQUEST_TEMPLATE.md | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 88ad911c07..7a8129df1a 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -17,10 +17,17 @@ Small fixes/refactors are exempt. Any media may be used in SS14 progress reports, with clear credit given. If you're unsure whether your PR will require media, ask a maintainer. - -Check the box below to confirm that you have in fact seen this (put an X in the brackets, like [X]): --> +## Requirements + +- [ ] I have read and I am following the [Pull Request Guidelines](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html). I understand that not doing so may get my pr closed at maintainer’s discretion - [ ] I have added screenshots/videos to this PR showcasing its changes ingame, **or** this PR does not require an ingame showcase ## Breaking changes From 378d1e5c71fb91e7a083a61bf441fdf210382325 Mon Sep 17 00:00:00 2001 From: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com> Date: Fri, 2 Aug 2024 01:02:56 -0500 Subject: [PATCH 112/422] Adjusts the Bingus steal target to include any of the named cats (#30504) * Adjusts the Bingus steal target to include any of the named cats * Change name of target group --------- Co-authored-by: Velcroboy --- Resources/Prototypes/Entities/Mobs/NPCs/pets.yml | 8 +++++++- Resources/Prototypes/Objectives/stealTargetGroups.yml | 4 ++-- Resources/Prototypes/Objectives/thief.yml | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml index 6ac74967ff..29e81b092a 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml @@ -123,6 +123,8 @@ tags: - CannotSuicide - VimPilot + - type: StealTarget + stealGroup: AnimalNamedCat - type: entity name: Exception @@ -141,6 +143,8 @@ tags: - CannotSuicide - VimPilot + - type: StealTarget + stealGroup: AnimalNamedCat - type: entity name: Floppa @@ -166,6 +170,8 @@ tags: - CannotSuicide - VimPilot + - type: StealTarget + stealGroup: AnimalNamedCat - type: entity name: Bandito @@ -237,7 +243,7 @@ - CannotSuicide - VimPilot - type: StealTarget - stealGroup: AnimalBingus + stealGroup: AnimalNamedCat - type: entity name: McGriff diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml index 52117b9ce9..1a9b4223cb 100644 --- a/Resources/Prototypes/Objectives/stealTargetGroups.yml +++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml @@ -347,8 +347,8 @@ state: ian - type: stealTargetGroup - id: AnimalBingus - name: Bingus + id: AnimalNamedCat + name: CMO's Cat sprite: sprite: Mobs/Pets/bingus.rsi state: bingus diff --git a/Resources/Prototypes/Objectives/thief.yml b/Resources/Prototypes/Objectives/thief.yml index 89334f990b..26e598f121 100644 --- a/Resources/Prototypes/Objectives/thief.yml +++ b/Resources/Prototypes/Objectives/thief.yml @@ -436,7 +436,7 @@ id: BingusStealObjective components: - type: StealCondition - stealGroup: AnimalBingus + stealGroup: AnimalNamedCat - type: Objective difficulty: 1 From 85bcc74bdf5523ab093d322c085d24033ff781a3 Mon Sep 17 00:00:00 2001 From: Plykiya <58439124+Plykiya@users.noreply.github.com> Date: Thu, 1 Aug 2024 23:05:38 -0700 Subject: [PATCH 113/422] Add percentage reading to chargers (#28500) * Add percentage reading to chargers * using args.pushgroup * change message * Update Content.Server/Power/EntitySystems/ChargerSystem.cs --------- Co-authored-by: plykiya Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> --- .../Power/EntitySystems/ChargerSystem.cs | 29 ++++++++++++++++++- .../Locale/en-US/power/components/charger.ftl | 2 ++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/Content.Server/Power/EntitySystems/ChargerSystem.cs b/Content.Server/Power/EntitySystems/ChargerSystem.cs index 038295eac1..d4997f62a2 100644 --- a/Content.Server/Power/EntitySystems/ChargerSystem.cs +++ b/Content.Server/Power/EntitySystems/ChargerSystem.cs @@ -43,7 +43,34 @@ internal sealed class ChargerSystem : EntitySystem private void OnChargerExamine(EntityUid uid, ChargerComponent component, ExaminedEvent args) { - args.PushMarkup(Loc.GetString("charger-examine", ("color", "yellow"), ("chargeRate", (int) component.ChargeRate))); + using (args.PushGroup(nameof(ChargerComponent))) + { + // rate at which the charger charges + args.PushMarkup(Loc.GetString("charger-examine", ("color", "yellow"), ("chargeRate", (int) component.ChargeRate))); + + // try to get contents of the charger + if (!_container.TryGetContainer(uid, component.SlotId, out var container)) + return; + + // if charger is empty and not a power cell type charger, add empty message + // power cells have their own empty message by default, for things like flash lights + if (container.ContainedEntities.Count == 0 && !HasComp(uid)) + { + args.PushMarkup(Loc.GetString("charger-empty")); + } + else + { + // add how much each item is charged it + foreach (var contained in container.ContainedEntities) + { + if (!TryComp(contained, out var battery)) + continue; + + var chargePercentage = (battery.CurrentCharge / battery.MaxCharge) * 100; + args.PushMarkup(Loc.GetString("charger-content", ("chargePercentage", (int) chargePercentage))); + } + } + } } public override void Update(float frameTime) diff --git a/Resources/Locale/en-US/power/components/charger.ftl b/Resources/Locale/en-US/power/components/charger.ftl index 1a6e72f43e..9ac16a2d46 100644 --- a/Resources/Locale/en-US/power/components/charger.ftl +++ b/Resources/Locale/en-US/power/components/charger.ftl @@ -1,2 +1,4 @@ charger-examine = Charges at [color={$color}]{$chargeRate}W[/color]. charger-component-charge-rate = Charge rate +charger-content = Current charge is at [color=#5E7C16]{$chargePercentage}[/color]%. +charger-empty = There is nothing in the charger. From 533c96892875e6103ff0035ea7ff4a86debec448 Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 2 Aug 2024 06:06:44 +0000 Subject: [PATCH 114/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index aaf7612aac..3f83277366 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: lzk228 - changes: - - message: Grey whistle added to arcade machine prizes. - type: Add - id: 6531 - time: '2024-05-05T14:42:35.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27676 - author: Killerqu00 changes: - message: Welding masks can now be put on utility belts. @@ -3774,3 +3767,10 @@ id: 7030 time: '2024-08-02T05:57:50.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30508 +- author: Plykiya + changes: + - message: Rechargers now show the percent charged of the item it is charging. + type: Add + id: 7031 + time: '2024-08-02T06:05:38.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/28500 From 448f3804e60cf51fc966477909034bcfc90559d3 Mon Sep 17 00:00:00 2001 From: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Date: Fri, 2 Aug 2024 08:14:50 +0200 Subject: [PATCH 115/422] Remove duplicate cartridge rsi (#30498) remove duplicate cartridge rsi --- .../cart-ord.png | Bin .../insert_overlay.png | Bin .../Objects/Devices/cartridge.rsi/meta.json | 10 ++- .../Objects/Devices/cartridges.rsi/cart-a.png | Bin 274 -> 0 bytes .../Objects/Devices/cartridges.rsi/cart-b.png | Bin 312 -> 0 bytes .../Objects/Devices/cartridges.rsi/cart-c.png | Bin 305 -> 0 bytes .../Devices/cartridges.rsi/cart-ce.png | Bin 313 -> 0 bytes .../Devices/cartridges.rsi/cart-chem.png | Bin 264 -> 0 bytes .../Devices/cartridges.rsi/cart-clown.png | Bin 313 -> 0 bytes .../Devices/cartridges.rsi/cart-cmo.png | Bin 322 -> 0 bytes .../Objects/Devices/cartridges.rsi/cart-e.png | Bin 266 -> 0 bytes .../Devices/cartridges.rsi/cart-eye.png | Bin 307 -> 0 bytes .../Objects/Devices/cartridges.rsi/cart-h.png | Bin 309 -> 0 bytes .../Devices/cartridges.rsi/cart-hos.png | Bin 305 -> 0 bytes .../Objects/Devices/cartridges.rsi/cart-j.png | Bin 289 -> 0 bytes .../Devices/cartridges.rsi/cart-lib.png | Bin 272 -> 0 bytes .../Objects/Devices/cartridges.rsi/cart-m.png | Bin 281 -> 0 bytes .../Devices/cartridges.rsi/cart-mi.png | Bin 290 -> 0 bytes .../Objects/Devices/cartridges.rsi/cart-q.png | Bin 277 -> 0 bytes .../Devices/cartridges.rsi/cart-rd.png | Bin 335 -> 0 bytes .../Objects/Devices/cartridges.rsi/cart-s.png | Bin 299 -> 0 bytes .../Devices/cartridges.rsi/cart-tear.png | Bin 359 -> 0 bytes .../Objects/Devices/cartridges.rsi/cart.png | Bin 257 -> 0 bytes .../Objects/Devices/cartridges.rsi/meta.json | 77 ------------------ 24 files changed, 8 insertions(+), 79 deletions(-) rename Resources/Textures/Objects/Devices/{cartridges.rsi => cartridge.rsi}/cart-ord.png (100%) rename Resources/Textures/Objects/Devices/{cartridges.rsi => cartridge.rsi}/insert_overlay.png (100%) delete mode 100644 Resources/Textures/Objects/Devices/cartridges.rsi/cart-a.png delete mode 100644 Resources/Textures/Objects/Devices/cartridges.rsi/cart-b.png delete mode 100644 Resources/Textures/Objects/Devices/cartridges.rsi/cart-c.png delete mode 100644 Resources/Textures/Objects/Devices/cartridges.rsi/cart-ce.png delete mode 100644 Resources/Textures/Objects/Devices/cartridges.rsi/cart-chem.png delete mode 100644 Resources/Textures/Objects/Devices/cartridges.rsi/cart-clown.png delete mode 100644 Resources/Textures/Objects/Devices/cartridges.rsi/cart-cmo.png delete mode 100644 Resources/Textures/Objects/Devices/cartridges.rsi/cart-e.png delete mode 100644 Resources/Textures/Objects/Devices/cartridges.rsi/cart-eye.png delete mode 100644 Resources/Textures/Objects/Devices/cartridges.rsi/cart-h.png delete mode 100644 Resources/Textures/Objects/Devices/cartridges.rsi/cart-hos.png delete mode 100644 Resources/Textures/Objects/Devices/cartridges.rsi/cart-j.png delete mode 100644 Resources/Textures/Objects/Devices/cartridges.rsi/cart-lib.png delete mode 100644 Resources/Textures/Objects/Devices/cartridges.rsi/cart-m.png delete mode 100644 Resources/Textures/Objects/Devices/cartridges.rsi/cart-mi.png delete mode 100644 Resources/Textures/Objects/Devices/cartridges.rsi/cart-q.png delete mode 100644 Resources/Textures/Objects/Devices/cartridges.rsi/cart-rd.png delete mode 100644 Resources/Textures/Objects/Devices/cartridges.rsi/cart-s.png delete mode 100644 Resources/Textures/Objects/Devices/cartridges.rsi/cart-tear.png delete mode 100644 Resources/Textures/Objects/Devices/cartridges.rsi/cart.png delete mode 100644 Resources/Textures/Objects/Devices/cartridges.rsi/meta.json diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-ord.png b/Resources/Textures/Objects/Devices/cartridge.rsi/cart-ord.png similarity index 100% rename from Resources/Textures/Objects/Devices/cartridges.rsi/cart-ord.png rename to Resources/Textures/Objects/Devices/cartridge.rsi/cart-ord.png diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/insert_overlay.png b/Resources/Textures/Objects/Devices/cartridge.rsi/insert_overlay.png similarity index 100% rename from Resources/Textures/Objects/Devices/cartridges.rsi/insert_overlay.png rename to Resources/Textures/Objects/Devices/cartridge.rsi/insert_overlay.png diff --git a/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json b/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json index c7eb96d964..f3b02a2b2e 100644 --- a/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/cartridge.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d , cart-log made by Skarletto (github)", + "copyright": "Taken from vgstation at https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d and tgstation at tgstation at https://github.com/tgstation/tgstation/commit/0c15d9dbcf0f2beb230eba5d9d889ef2d1945bb8, cart-log made by Skarletto (github)", "size": { "x": 32, "y": 32 @@ -49,12 +49,18 @@ { "name": "cart-lib" }, + { + "name": "cart-log" + }, { "name": "cart-m" }, { "name": "cart-mi" }, + { + "name": "cart-ord" + }, { "name": "cart-q" }, @@ -74,7 +80,7 @@ "name": "cart-y" }, { - "name": "cart-log" + "name": "insert_overlay" } ] } diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-a.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-a.png deleted file mode 100644 index 567490fdea6318b2b8a0e22e26331a798717593e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 274 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D0sxv z#WAE}&f6=7d`$s7Y!7Bx7)Y&i_`=q5b*60oBfZV;iRopkdl_4%8VI_XZ8?7+p=X)s zy>8F{D_JMiX;$WQ_bp~%)o@_s`l0V2A$QFGz2NDySqxHguE+D|_r|dN7B7kY|83{{ z_YOj44Q#9j2G;iJtAbBC|`f{bm9&v<Y0~fv&T>0+p+@__6nM97Bm31gOtH%|g%@xqVG>7?}bA?Io UfA$ZNK>sj!y85}Sb4q9e05u$D-2eap diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-b.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-b.png deleted file mode 100644 index 90a75aecca7cf27d94ad171329c324651b8852fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 312 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DEP|L z#WAE}PI96|g2AhXK=vN1ge#1T`6QzF3=D&R_xt}lvogBJq?qAE(P>kwAEK=Wf7GuE zs<;rGnTGm&R}(u1$&EU2Q$N8X^-h#Ho87QUo&{R`njxgN@xNA DvSDxP diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-c.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-c.png deleted file mode 100644 index e2fa89e9d56df14a5f18a2282a7a50d15891dad4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 305 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DEQdZ z#WAE}&f6)5T!$P4T-_I474w>PplRtwfj31G{RwYb_c&zrCp>q()Y&Vikm}LZ+Td|V zGw97Ej?KF`5B<^lqxk3enKwR(DTWNp20(P6o>9f~PR*+Ho5_!O84mORmehIXn7(&S z+ytjP0g4{72R>NsXcAbqUgX-gU#~esCYCQaalJshtWEu}@d=JOE^H@CcWj7inAf9s znBm65+Ii*-OWE_-7nyS~DrF;g?15eNV6FD$lqJdE&p`^k5fr0hqkKC?5f!<~CboFyt=akR{0HPCp AbN~PV diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-ce.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-ce.png deleted file mode 100644 index 3eb6762a5ad8cd1d2f8eac28ec23551ae4c499a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 313 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DEQjb z#WAE}&f6=tT!#!q*gvS3yjGg&mG<(H+7ul=xs~13)BTi0tT^Hhc$buF*fz>JScy*e zSmOZZ}^zO+x|)8|7}@;@`g#GJS$i;vm_LpUa(Diaw}bjVIya%A})HLpD*(3%F1M(DGZZj8NRJFV|M0XKa{j<8DoH+hW(i? zwO@^OI~#5_sIbqmsZ4kvbtDnm{r-UW| DqAO!e diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-clown.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-clown.png deleted file mode 100644 index 384d2fbd09928da26dd065ccf51751117cce7fb5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 313 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DEQjb z#WAE}&f6>Y+)WM=Y#*Kf!jeG7HC8c}cPx9WvrRx`zeeuGwXo1Gr z3C}$pzp%gi#PM+6%e~d@zbik@YqWP~HgN!1l&i z4VTTQJ^vK%R&i>|ZW4bP9Bks>S%AIt!BF2+^9X&niKfb;eKitZlE)iz; zl)0-WE#h0p^c?pIZyJJ^_Z__X@X~yVFryWXFL#%}e8OOCtX;v;aDy$tY-fWC`wa=% z)E$){6%KDMpP2CP-{0K_w@kTEv_OXY@X5(0Wegk~o_A9wgyuR3{{A(!@!@gnT(%;H zNL9rXPI-AOvxOWcF;^}B&o(K`BBlQFHO40*n?p(&)*e{F>?RBJB4arNgMo#2M(2G7 RZJ_@dJYD@<);T3K0RRbkewF|L diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-e.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-e.png deleted file mode 100644 index 81573340a3677e5237d0f06321fb17e1a01cca0e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 266 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D7eSd z#WAE}PI96|g2AhXK=vN1ge#1T`6QzF3`|3R_xu0*@-n)|q?qAEQE@T5)2V-xUvW%Y z{NV0x{)nTkEi4iz7*(tpQUWty>ah9wv9-OwFDW6WpO;Ya@sT9+&W03r4eixUy79ZV zNS}HBtgYkj-s;(Qd<~5Y76cjW&5Jc>R&B^(56CjS$;ZHIs_|~|VsCae-i9K_)KrN{ zCrk}Ix5qf-I!t2rn`dKCz^AZ$#?n>H8LV!yV2ASTU}l)P&UDo&rPL~*KNvh+{an^L HB{Ts5Up!l@ diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-eye.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-eye.png deleted file mode 100644 index 52be2688c4df969c503ef6757674a83c19eddd04..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 307 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DEQRV z#WAE}&f6)zT+Idot-&vj34CC9xBJ|&=!)hw#U}X=Bwrosef`e1Vat)w%*utDUiAq< z^%`fQJ!+KCJoi?s-ndbsff0lr>}UA&r{H&3{;bP+h72a}cXfMQ{*t@*ef57{(WWU5 z8G1|S{5ZGM{jJstrTL71G9#x6uh;16KY4~PAav@5DDIgm|L*cOfA2AT&CoO3If7X! zETv&vZtdYhrVn9^2mU4R7yP+#-F$}+3QMnSVi4e)z4hBs=9r#Ec}_jC60U3N1vwQ? z3lz@yy1BmXO7bIh#v?JCH#6y|vL!IE-H>^}*V^v=w|}SmYM_T1JYD@<);T3K0RUNK BezO1o diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-h.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-h.png deleted file mode 100644 index 2cdc132635761b9da6ac00a0a87aff3ed1b39baa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 309 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DEQpd z#WAE}&f6>YT!#!q*gp8bnC5CU^~|lKz8bM2dpeqDH@AOa%4^!&=w47%qG8*(Yr5aj zr9mqKd|hMzTwcN^c+cGAthb_loR`iY3l;?iMh=ID|4cj91@DRGKOB2l!XfWnWwZZ$ z(N!Ezl|3dMzHIf}_l1k3g88fU*S`O(GjWk|ztC%RV4JI@+vGyaZO`ojm>2RS^n|XG zWL}aPwK9$6!t1<(Gk#BZPgr~WtGqx>=d=w1ENzTNF*yhS9KUl|WD{fLrAEIkc}_bY zzP*uM5-)2I{bc&`&q=1{+!uDH?dLKOWfEv$uxFpcn10Ceu&vw8IY2Knc)I$ztaD0e F0suOEd7A(L diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-hos.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-hos.png deleted file mode 100644 index 5d3419fc63cf08d553dab4361d412369852d1317..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 305 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DEQdZ z#WAE}PI96|g2AhXK=vN1ge#1T`6QzF3`|3R_xu0*@-n)|q?qAEQE@T5)2V-xUvW%Y z{NV0x{)nTkEi4iz7*(tpQYOCrwpSym-FB|z304(r2PY>kAN$iM87{}~uS=c4a7jPT zW^q6Bj-5LXZn-i=vcPag@{30d6Z-Sjj~$X#iizP9Tinf@)6-{E^ZR3aqv~_Bt{qb@ z6tRhFinUEv&wRrmATVjy$pd?ZL*KlUZ(K`<`Y_+j*5J}jBH#^^Gn#j`2FWq vxms}I-?FvLCp6PmzG8@KgnEVf9RtILm)0Nh67=o>z02U~>gTe~DWM4f83}XU diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-j.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-j.png deleted file mode 100644 index f676b14b846c3e63865a6872bb498577d9ccab68..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 289 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D0tb^ z#WAE}PI96|g2AhXK=vN1ge#1T`6QzF3`|3R_xu0*@-n)|q?qAEQE@T5)2V-xUvW%Y z{NV0x{)nTkEi4iz7*(tpQUZ5h%WbP)pV#!$C+QW>)axOVCsTye6<1q~&;0ja zrR>qyRKC01SmcDo!VcexP5q81u1;-~aoEH>t^JyjNc_okgKJ@p-M%SnQcwIVXtLv5 zV5V@I(do__=GP3{4ruc5T)M>3xVHS|>jqQtIs=0kh5JEWG6FkyN$zIZTjV&ug~Rz` zx4DGL&IT3smi4pwml-=Ad9J>~B&08mPht6trK^}TSlwj7&gI#`%&;xel>N=$Oedgk O7(8A5T-G@yGywoU&15?O diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-m.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-m.png deleted file mode 100644 index 3956c626a44fec9913b7447f6d595b6671c8716e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 281 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D0te_ z#WAE}PI96|g2AhXK=vN1ge#1T`6QzF3`|3R_xu0*@-n)|q?qAEQE@T5)2V-xUvW%Y z{NV0x{)nTkEi4iz7*(tpQYN;vh|IZP{>s>S%AIt!BF2+^9X&niKfb;eKitZlE)iz; zl)0-WE#h0p^c?pIZyJJ^_Z__X@X~yVFryWXFL#%}e8OOCtX;v;aDy$tY-d9XyH5N* zfq87--rwh47Qd&$&7QrXh;iE-hwU*Axek+<{pQ&i6!0l5pRsfma|WxMEZE&VJD3@S X3Y?w?C^=dJy~W_^>gTe~DWM4fRXb=e diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-mi.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-mi.png deleted file mode 100644 index ad50f4cd308874c37eae9206f716e4ef11319247..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 290 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D0s!w z#WAE}&f6)DT!$3|Ty;xS8TlvFUcdQ7?B0Q`?w{H2DM??y`<&s@q}a@#3!N^Tv~Dz9 zXi%^C&_7{b{PD#%B6$ulfY66{hTQ61^{dP8{tVz@IQ#pb)|4Rm*M`SF%4@M`HeQMG zvi#VdSaB_{N$ZpB0l&G$!v5KNXPkM(aIgBJ$=Nf;$8wlI+^adM%_iV9!?a~PC&M}U z=e;N5S@~D3TBXC#ayo78+{%X2f!Dk{HhM4acpvY=v?AMOPTF6ib(&x2{P1M3JpX1D h!_p%lr|f37VNl4iiTs~ky9nq%22WQ%mvv4FO#lm&bddl6 diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-q.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-q.png deleted file mode 100644 index 5f0e415ca8d24376c4cdae73a88684148177626e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 277 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5D0tk{ z#WAE}PI96|g2AhXK=vN1ge#1T`6QzF3`|3R_xu0*@-n)|q?qBvr&7;b6<1jd4gRQK z6;yFQxR(d-Q@F|aTt!L3M^!>%$+9yHpYzp^8O?cYmKu;` z;U>@C05l`rQZiwimeA}xz6ELvPA~?E{F;};-k{UElu@(Fz42nVsDN7sLyQlTire}a zhEq)oa@zeSb9)pyT-dWZVb>G0jy(--@k`e-pU_NO`HCT`5$as#cMJ@vC+%eFO%w%y PUSjZc^>bP0l+XkK(;{EB diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-rd.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-rd.png deleted file mode 100644 index 3544bf21dfca38cb20fe5553caafd7c07ce3c0d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 335 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv(mfq{|H z)5S5QVoq|RM1sMqhCucntAs0zi}@s?_zX-#fA{in$E29y#3#?mVof*KT)nDM zv_CrfU`brupZXwK$0CtAHkFec{ePM?KUU#1sIR}r-RA9JSX^ApR>W|U@51gV?u~zh zTKLnRUo|qA@qST1^Mh&Z_tO(DuwN?eO4ukYeqz)7GcgxR;_Wml@6ZI*s*n?{yot?uj#5Jcm9gv?i9@NV({d9G54Re$Et@D{`y9i-WO=v(}-(`eKhJLCdZ7h!N(K8J#-;0RPfq>$U^URA44$rjF6*2UngDM8cQpV2 diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/cart-tear.png b/Resources/Textures/Objects/Devices/cartridges.rsi/cart-tear.png deleted file mode 100644 index a4fc0a1747fa19468d4450293cd66a47d3d6124e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 359 zcmV-t0hs=YP)LNKVV6D78Z8?0IkI)%{4Y@EbbRs zrx78Ym95QzS8ZXTr7Wp~lIlcv78B4y*yt(;`-<>*3Cx$-nGNt}c>oXK0X%>Q_+J3s zZtHaK{c5%Oa0Wodl{$cPewBaC*PZF0EsLTs-`GM}b%2U9#*81%en$aE`d6UNfFo>W zJp*~3W4u(Rcz^ptk(}u4wlmHEvMj>_NXQEz>MTi;*8ot_fT2e|Wf4Z@t_FDtfKm$h zjEtxAPkDsPQMd=7Nsr?g-%?%Wl##+PbPGVDVbg!!(N^j~G+t+B4V$RZO-OrRtzKD{ z5)a4ozXMx*BWI_wQa2i=O3TMlf^PUyI~t vg?)}qWx@j)2R}paQ1%O4Fn1NOGcYVzrh9PH?X|~&&S&s+^>bP0l+XkKe$!l8 diff --git a/Resources/Textures/Objects/Devices/cartridges.rsi/meta.json b/Resources/Textures/Objects/Devices/cartridges.rsi/meta.json deleted file mode 100644 index b0f5cd02a7..0000000000 --- a/Resources/Textures/Objects/Devices/cartridges.rsi/meta.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/0c15d9dbcf0f2beb230eba5d9d889ef2d1945bb8", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "insert_overlay" - }, - { - "name": "cart" - }, - { - "name": "cart-e" - }, - { - "name": "cart-m" - }, - { - "name": "cart-chem" - }, - { - "name": "cart-c" - }, - { - "name": "cart-h" - }, - { - "name": "cart-s" - }, - { - "name": "cart-clown" - }, - { - "name": "cart-a" - }, - { - "name": "cart-j" - }, - { - "name": "cart-q" - }, - { - "name": "cart-ord" - }, - { - "name": "cart-tear" - }, - { - "name": "cart-b" - }, - { - "name": "cart-lib" - }, - { - "name": "cart-eye" - }, - { - "name": "cart-mi" - }, - { - "name": "cart-hos" - }, - { - "name": "cart-ce" - }, - { - "name": "cart-cmo" - }, - { - "name": "cart-rd" - } - ] -} \ No newline at end of file From ccdbdee929d08fad5da976154585313f37054192 Mon Sep 17 00:00:00 2001 From: osjarw <62134478+osjarw@users.noreply.github.com> Date: Fri, 2 Aug 2024 09:17:11 +0300 Subject: [PATCH 116/422] Add DoAfter handling to `InteractWithOperator` (#30319) * commit used for the recording, mostly copypaste * Remove recording artifacts, now contains content * use switch expression instead of switch statement Also `ExpectedDoAfter` to fail when doafter isn't raised --- .../Interactions/InteractWithOperator.cs | 63 +++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Interactions/InteractWithOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Interactions/InteractWithOperator.cs index 8e3ab5238a..7d6f000573 100644 --- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Interactions/InteractWithOperator.cs +++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Interactions/InteractWithOperator.cs @@ -1,5 +1,6 @@ using Content.Server.Interaction; using Content.Shared.CombatMode; +using Content.Shared.DoAfter; using Content.Shared.Timing; namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Interactions; @@ -7,6 +8,13 @@ namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Interactions; public sealed partial class InteractWithOperator : HTNOperator { [Dependency] private readonly IEntityManager _entManager = default!; + private SharedDoAfterSystem _doAfterSystem = default!; + + public override void Initialize(IEntitySystemManager sysManager) + { + base.Initialize(sysManager); + _doAfterSystem = sysManager.GetEntitySystem(); + } /// /// Key that contains the target entity. @@ -14,10 +22,53 @@ public sealed partial class InteractWithOperator : HTNOperator [DataField(required: true)] public string TargetKey = default!; + /// + /// Exit with failure if doafter wasn't raised + /// + [DataField] + public bool ExpectDoAfter = false; + + public string CurrentDoAfter = "CurrentInteractWithDoAfter"; + + + // Ensure that CurrentDoAfter doesn't exist as we enter this operator, + // the code currently relies on the result of a TryGetValue + public override void Startup(NPCBlackboard blackboard) + { + blackboard.Remove(CurrentDoAfter); + + } + + // Not really sure if we should clean it up, I guess some operator could use it + public override void TaskShutdown(NPCBlackboard blackboard, HTNOperatorStatus status) + { + blackboard.Remove(CurrentDoAfter); + } + public override HTNOperatorStatus Update(NPCBlackboard blackboard, float frameTime) { var owner = blackboard.GetValue(NPCBlackboard.Owner); + // Handle ongoing doAfter, and store the doAfter.nextId so we can detect if we started one + ushort nextId = 0; + if (_entManager.TryGetComponent(owner, out var doAfter)) + { + // if CurrentDoAfter contains something, we have an active doAfter + if (blackboard.TryGetValue(CurrentDoAfter, out var doAfterId, _entManager)) + { + var status = _doAfterSystem.GetStatus(owner, doAfterId, null); + return status switch + { + DoAfterStatus.Running => HTNOperatorStatus.Continuing, + DoAfterStatus.Finished => HTNOperatorStatus.Finished, + _ => HTNOperatorStatus.Failed + }; + } + + nextId = doAfter.NextId; + } + + if (_entManager.TryGetComponent(owner, out var useDelay) && _entManager.System().IsDelayed((owner, useDelay)) || !blackboard.TryGetValue(TargetKey, out var moveTarget, _entManager) || !_entManager.TryGetComponent(moveTarget, out var targetXform)) @@ -31,6 +82,18 @@ public sealed partial class InteractWithOperator : HTNOperator } _entManager.System().UserInteraction(owner, targetXform.Coordinates, moveTarget); + + // Detect doAfter, save it, and don't exit from this operator + if (doAfter != null && nextId != doAfter.NextId) + { + blackboard.SetValue(CurrentDoAfter, nextId); + return HTNOperatorStatus.Continuing; + } + + // We shouldn't arrive here if we start a doafter, so fail if we expected a doafter + if(ExpectDoAfter) + return HTNOperatorStatus.Failed; + return HTNOperatorStatus.Finished; } } From 1579c8a42488e9e392c453376c99aaf139b7b529 Mon Sep 17 00:00:00 2001 From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> Date: Fri, 2 Aug 2024 00:05:12 -0700 Subject: [PATCH 117/422] Deploy foldable (#30000) * Deploy foldable * Add NetworkedComponent and access to the component * Add handled to afterinteract * Use drop target location instead of setcoordinates * Put back in hand after failed deploy This prevents dropping the bed when clicking while inside a locker. * Created BaseDeployFoldable for folding chairs, body bags, and rollerbeds --- .../Foldable/DeployFoldableComponent.cs | 7 ++++ .../Foldable/DeployFoldableSystem.cs | 39 +++++++++++++++++++ .../Objects/Specific/Medical/morgue.yml | 2 +- .../Entities/Structures/Furniture/chairs.yml | 2 +- .../Structures/Furniture/rollerbeds.yml | 2 +- Resources/Prototypes/Entities/foldable.yml | 8 ++++ 6 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 Content.Shared/Foldable/DeployFoldableComponent.cs create mode 100644 Content.Shared/Foldable/DeployFoldableSystem.cs diff --git a/Content.Shared/Foldable/DeployFoldableComponent.cs b/Content.Shared/Foldable/DeployFoldableComponent.cs new file mode 100644 index 0000000000..4ccca6b742 --- /dev/null +++ b/Content.Shared/Foldable/DeployFoldableComponent.cs @@ -0,0 +1,7 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.Foldable; + +[RegisterComponent, NetworkedComponent] +[Access(typeof(DeployFoldableSystem))] +public sealed partial class DeployFoldableComponent : Component; diff --git a/Content.Shared/Foldable/DeployFoldableSystem.cs b/Content.Shared/Foldable/DeployFoldableSystem.cs new file mode 100644 index 0000000000..fa2e3f8789 --- /dev/null +++ b/Content.Shared/Foldable/DeployFoldableSystem.cs @@ -0,0 +1,39 @@ +using Content.Shared.Hands.Components; +using Content.Shared.Hands.EntitySystems; +using Content.Shared.Interaction; + +namespace Content.Shared.Foldable; + +public sealed class DeployFoldableSystem : EntitySystem +{ + [Dependency] private readonly SharedHandsSystem _hands = default!; + [Dependency] private readonly FoldableSystem _foldable = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnAfterInteract); + } + + private void OnAfterInteract(Entity ent, ref AfterInteractEvent args) + { + if (args.Handled || !args.CanReach) + return; + + if (!TryComp(ent, out var foldable)) + return; + + if (!TryComp(args.User, out HandsComponent? hands) + || !_hands.TryDrop(args.User, args.Used, targetDropLocation: args.ClickLocation, handsComp: hands)) + return; + + if (!_foldable.TrySetFolded(ent, foldable, false)) + { + _hands.TryPickup(args.User, args.Used, handsComp: hands); + return; + } + + args.Handled = true; + } +} diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml index 0656621465..578e071587 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml @@ -1,6 +1,6 @@ - type: entity id: BodyBag - parent: BaseFoldable + parent: BaseDeployFoldable name: body bag description: A plastic bag designed for the storage and transportation of cadavers to stop body decomposition. components: diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml index ac5ec1e83e..c1d767905c 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml @@ -323,7 +323,7 @@ node: chair - type: entity - parent: [SeatBase, BaseFoldable] + parent: [SeatBase, BaseDeployFoldable] id: ChairFolding name: folding chair description: If you carry six of these you become the coolest kid at church. diff --git a/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml b/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml index b3cfe6ade3..f7b1be8ecd 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml @@ -1,6 +1,6 @@ - type: entity id: RollerBed - parent: [BaseItem, BaseFoldable] + parent: [BaseItem, BaseDeployFoldable] name: rollerbed description: Used to carry patients around without damaging them. components: diff --git a/Resources/Prototypes/Entities/foldable.yml b/Resources/Prototypes/Entities/foldable.yml index a0843cd125..260cda799b 100644 --- a/Resources/Prototypes/Entities/foldable.yml +++ b/Resources/Prototypes/Entities/foldable.yml @@ -13,3 +13,11 @@ unfoldedLayer: True: {visible: false} False: {visible: true} + +- type: entity + abstract: true + parent: BaseFoldable + id: BaseDeployFoldable + name: "deploy foldable" + components: + - type: DeployFoldable From 8d23d36e8898d7073a49692ee617fc2983629350 Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 2 Aug 2024 07:06:18 +0000 Subject: [PATCH 118/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 3f83277366..eaf3ab6199 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Killerqu00 - changes: - - message: Welding masks can now be put on utility belts. - type: Tweak - id: 6532 - time: '2024-05-05T23:30:06.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27694 - author: Dutch-VanDerLinde changes: - message: Chemical analysis goggles now show the scanned solution's temperature. @@ -3774,3 +3767,10 @@ id: 7031 time: '2024-08-02T06:05:38.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/28500 +- author: ShadowCommander + changes: + - message: Rollerbeds now deploy when holding them in hand and clicking on the ground. + type: Add + id: 7032 + time: '2024-08-02T07:05:12.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30000 From 36038a1707747b06f82e26471895f795a0dab99d Mon Sep 17 00:00:00 2001 From: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Date: Fri, 2 Aug 2024 03:07:46 -0400 Subject: [PATCH 119/422] Allow ai to understand if its handcuffed. (#30402) * allow ai to understand if its handcuffed. * rerun tests they worky on local * Contained here in, a string of expletives about flaky tests. * on retrospect, default true is probably smorter. * do reviews * I forgor xml * more xml --- .../Preconditions/HandcuffedPrecondition.cs | 26 +++++++++++++++++++ Content.Shared/Cuffs/SharedCuffableSystem.cs | 19 ++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 Content.Server/NPC/HTN/Preconditions/HandcuffedPrecondition.cs diff --git a/Content.Server/NPC/HTN/Preconditions/HandcuffedPrecondition.cs b/Content.Server/NPC/HTN/Preconditions/HandcuffedPrecondition.cs new file mode 100644 index 0000000000..4a56eeb953 --- /dev/null +++ b/Content.Server/NPC/HTN/Preconditions/HandcuffedPrecondition.cs @@ -0,0 +1,26 @@ +using Content.Server.Cuffs; +using Content.Shared.Cuffs.Components; + +namespace Content.Server.NPC.HTN.Preconditions; + +public sealed partial class HandcuffedPrecondition : HTNPrecondition +{ + [Dependency] private readonly IEntityManager _entManager = default!; + + [DataField] + public bool ReactOnlyWhenFullyCuffed = true; + + public override bool IsMet(NPCBlackboard blackboard) + { + var cuffable = _entManager.System(); + var owner = blackboard.GetValue(NPCBlackboard.Owner); + + if (!_entManager.TryGetComponent(owner, out var cuffComp)) + return false; + + var target = (owner, cuffComp); + + return cuffable.IsCuffed(target, ReactOnlyWhenFullyCuffed); + } + +} diff --git a/Content.Shared/Cuffs/SharedCuffableSystem.cs b/Content.Shared/Cuffs/SharedCuffableSystem.cs index 3bf6066f33..8889e0c971 100644 --- a/Content.Shared/Cuffs/SharedCuffableSystem.cs +++ b/Content.Shared/Cuffs/SharedCuffableSystem.cs @@ -521,6 +521,25 @@ namespace Content.Shared.Cuffs return true; } + /// + /// Checks if the target is handcuffed. + /// + /// when true, return false if the target is only partially cuffed (for things with more than 2 hands) + /// + public bool IsCuffed(Entity target, bool requireFullyCuffed = true) + { + if (!TryComp(target, out var hands)) + return false; + + if (target.Comp.CuffedHandCount <= 0) + return false; + + if (requireFullyCuffed && hands.Count > target.Comp.CuffedHandCount) + return false; + + return true; + } + /// /// Attempt to uncuff a cuffed entity. Can be called by the cuffed entity, or another entity trying to help uncuff them. /// If the uncuffing succeeds, the cuffs will drop on the floor. From 029771d6727cd2d3effb70ca2d8ac600ce7e9af5 Mon Sep 17 00:00:00 2001 From: Aiden Date: Fri, 2 Aug 2024 02:14:21 -0500 Subject: [PATCH 120/422] 'Spawn Here' Verb Forces Mind Transfer (#30568) Update AdminVerbSystem.cs --- Content.Server/Administration/Systems/AdminVerbSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.cs b/Content.Server/Administration/Systems/AdminVerbSystem.cs index d7888b491c..3c8f7cd553 100644 --- a/Content.Server/Administration/Systems/AdminVerbSystem.cs +++ b/Content.Server/Administration/Systems/AdminVerbSystem.cs @@ -180,7 +180,7 @@ namespace Content.Server.Administration.Systems if (targetMind != null) { - _mindSystem.TransferTo(targetMind.Value, mobUid); + _mindSystem.TransferTo(targetMind.Value, mobUid, true); } }, ConfirmationPopup = true, From ed4ae1628c1fbea528dd4a320efc6fd402a7ccfd Mon Sep 17 00:00:00 2001 From: Tayrtahn Date: Fri, 2 Aug 2024 03:18:59 -0400 Subject: [PATCH 121/422] Add "fill levels" to spear in-hand/wielded/equipped sprites (#28865) * Add fill level sprite support for equipped items * Add fill sprites for held/equipped spears --- .../SolutionContainerVisualsSystem.cs | 40 ++++++++++++++++++ .../SolutionContainerVisualsComponent.cs | 12 ++++++ .../Entities/Objects/Weapons/Melee/spear.yml | 5 +++ .../bone_spear.rsi/equipped-back-fill-1.png | Bin 0 -> 213 bytes .../equipped-suitstorage-fill-1.png | Bin 0 -> 213 bytes .../bone_spear.rsi/inhand-left-fill-1.png | Bin 0 -> 201 bytes .../bone_spear.rsi/inhand-right-fill-1.png | Bin 0 -> 198 bytes .../Weapons/Melee/bone_spear.rsi/meta.json | 40 ++++++++++++++---- .../wielded-inhand-left-fill-1.png | Bin 0 -> 202 bytes .../wielded-inhand-right-fill-1.png | Bin 0 -> 207 bytes .../plasma_spear.rsi/equipped-back-fill-1.png | Bin 0 -> 213 bytes .../equipped-suitstorage-fill-1.png | Bin 0 -> 213 bytes .../plasma_spear.rsi/inhand-left-fill-1.png | Bin 0 -> 201 bytes .../plasma_spear.rsi/inhand-right-fill-1.png | Bin 0 -> 198 bytes .../Weapons/Melee/plasma_spear.rsi/meta.json | 40 ++++++++++++++---- .../wielded-inhand-left-fill-1.png | Bin 0 -> 202 bytes .../wielded-inhand-right-fill-1.png | Bin 0 -> 207 bytes .../equipped-back-fill-1.png | Bin 0 -> 213 bytes .../equipped-suitstorage-fill-1.png | Bin 0 -> 213 bytes .../inhand-left-fill-1.png | Bin 0 -> 201 bytes .../inhand-right-fill-1.png | Bin 0 -> 198 bytes .../Melee/reinforced_spear.rsi/meta.json | 40 ++++++++++++++---- .../wielded-inhand-left-fill-1.png | Bin 0 -> 202 bytes .../wielded-inhand-right-fill-1.png | Bin 0 -> 207 bytes .../Melee/spear.rsi/equipped-back-fill-1.png | Bin 0 -> 213 bytes .../spear.rsi/equipped-suitstorage-fill-1.png | Bin 0 -> 213 bytes .../Melee/spear.rsi/inhand-left-fill-1.png | Bin 0 -> 201 bytes .../Melee/spear.rsi/inhand-right-fill-1.png | Bin 0 -> 198 bytes .../Objects/Weapons/Melee/spear.rsi/meta.json | 40 ++++++++++++++---- .../spear.rsi/wielded-inhand-left-fill-1.png | Bin 0 -> 202 bytes .../spear.rsi/wielded-inhand-right-fill-1.png | Bin 0 -> 207 bytes .../equipped-back-fill-1.png | Bin 0 -> 213 bytes .../equipped-suitstorage-fill-1.png | Bin 0 -> 213 bytes .../uranium_spear.rsi/inhand-left-fill-1.png | Bin 0 -> 201 bytes .../uranium_spear.rsi/inhand-right-fill-1.png | Bin 0 -> 198 bytes .../Weapons/Melee/uranium_spear.rsi/meta.json | 40 ++++++++++++++---- .../wielded-inhand-left-fill-1.png | Bin 0 -> 202 bytes .../wielded-inhand-right-fill-1.png | Bin 0 -> 207 bytes 38 files changed, 217 insertions(+), 40 deletions(-) create mode 100644 Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-back-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-suitstorage-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-left-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-right-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/wielded-inhand-left-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/wielded-inhand-right-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-back-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-suitstorage-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-left-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-right-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/wielded-inhand-left-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/wielded-inhand-right-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-back-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-suitstorage-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-left-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-right-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/wielded-inhand-left-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/wielded-inhand-right-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-back-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-suitstorage-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/spear.rsi/inhand-left-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/spear.rsi/inhand-right-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/spear.rsi/wielded-inhand-left-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/spear.rsi/wielded-inhand-right-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-back-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-suitstorage-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-left-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-right-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/wielded-inhand-left-fill-1.png create mode 100644 Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/wielded-inhand-right-fill-1.png diff --git a/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs b/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs index 17b88fb5a8..010bfb3184 100644 --- a/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs +++ b/Content.Client/Chemistry/Visualizers/SolutionContainerVisualsSystem.cs @@ -2,6 +2,8 @@ using Content.Client.Items.Systems; using Content.Shared.Chemistry; using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.Reagent; +using Content.Shared.Clothing; +using Content.Shared.Clothing.Components; using Content.Shared.Hands; using Content.Shared.Item; using Content.Shared.Rounding; @@ -20,6 +22,7 @@ public sealed class SolutionContainerVisualsSystem : VisualizerSystem(OnMapInit); SubscribeLocalEvent(OnGetHeldVisuals); + SubscribeLocalEvent(OnGetClothingVisuals); } private void OnMapInit(EntityUid uid, SolutionContainerVisualsComponent component, MapInitEvent args) @@ -174,4 +177,41 @@ public sealed class SolutionContainerVisualsSystem : VisualizerSystem ent, ref GetEquipmentVisualsEvent args) + { + if (ent.Comp.EquippedFillBaseName == null) + return; + + if (!TryComp(ent, out var appearance)) + return; + + if (!TryComp(ent, out var clothing)) + return; + + if (!AppearanceSystem.TryGetData(ent, SolutionContainerVisuals.FillFraction, out var fraction, appearance)) + return; + + var closestFillSprite = ContentHelpers.RoundToLevels(fraction, 1, ent.Comp.EquippedMaxFillLevels + 1); + + if (closestFillSprite > 0) + { + var layer = new PrototypeLayerData(); + + var equippedPrefix = clothing.EquippedPrefix == null ? $"equipped-{args.Slot}" : $" {clothing.EquippedPrefix}-equipped-{args.Slot}"; + var key = equippedPrefix + ent.Comp.EquippedFillBaseName + closestFillSprite; + + // Make sure the sprite state is valid so we don't show a big red error message + // This saves us from having to make fill level sprites for every possible slot the item could be in (including pockets). + if (!TryComp(ent, out var sprite) || sprite.BaseRSI == null || !sprite.BaseRSI.TryGetState(key, out _)) + return; + + layer.State = key; + + if (ent.Comp.ChangeColor && AppearanceSystem.TryGetData(ent, SolutionContainerVisuals.Color, out var color, appearance)) + layer.Color = color; + + args.Layers.Add((key, layer)); + } + } } diff --git a/Content.Shared/Chemistry/Components/SolutionContainerVisualsComponent.cs b/Content.Shared/Chemistry/Components/SolutionContainerVisualsComponent.cs index 100ee3975f..1e3c14bfd4 100644 --- a/Content.Shared/Chemistry/Components/SolutionContainerVisualsComponent.cs +++ b/Content.Shared/Chemistry/Components/SolutionContainerVisualsComponent.cs @@ -53,5 +53,17 @@ namespace Content.Shared.Chemistry.Components /// [DataField] public int InHandsMaxFillLevels = 0; + + /// + /// Optional equipped visuals to show someone is wearing a something with a filled container. + /// + [DataField] + public string? EquippedFillBaseName = null; + + /// + /// A separate max fill levels for equipped items (to reduce number of sprites needed) + /// + [DataField] + public int EquippedMaxFillLevels = 0; } } diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml index 608fb2544a..d6985c018d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml @@ -112,6 +112,11 @@ - type: SolutionContainerVisuals maxFillLevels: 1 fillBaseName: spear + inHandsFillBaseName: -fill- + inHandsMaxFillLevels: 1 + equippedFillBaseName: -fill- + equippedMaxFillLevels: 1 + - type: entity name: reinforced spear diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-back-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-back-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..db23cdc2a4f53d2d1f640043a1196af3dbb03722 GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`Xa)F$xB_W| z{|r)FdD(NBw6(RT^7H>^V2F&2ERQ$T($X@N0Ln9be*F3W|NlQ4AIJhZd?i7C!3;n? z9BhhLe`X1kvG;Uw42fucdvzlxg8>h-qwa&h*Gr%KDG0QP)Nif06KS=$=kC?UZ3c-7 vcNrNP_>bh@=6&rD^@071x(zo2LxRp!UPjiMZBY$CqZmA0{an^LB{Ts5=1)rN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-suitstorage-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/equipped-suitstorage-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..db23cdc2a4f53d2d1f640043a1196af3dbb03722 GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`Xa)F$xB_W| z{|r)FdD(NBw6(RT^7H>^V2F&2ERQ$T($X@N0Ln9be*F3W|NlQ4AIJhZd?i7C!3;n? z9BhhLe`X1kvG;Uw42fucdvzlxg8>h-qwa&h*Gr%KDG0QP)Nif06KS=$=kC?UZ3c-7 vcNrNP_>bh@=6&rD^@071x(zo2LxRp!UPjiMZBY$CqZmA0{an^LB{Ts5=1)rN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..87a1358a8ce64c2c450e7e154192e4e283f5c90d GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`NC)_YxB_W| z{|r)FdD(NBT%4W%GcZI(Mrvzo|NsAgb++jXpfqPmkY6wZkPiZz?DLoX1PZ!)x;TbJ zw7$Kj$j6|-<9zYtz5hp48dm1Y{t;Jj%t`4w#~^?e&P#02h`&8dwrA% o$E->tkEXUiLHr@tm@Dovt&?In=;bs?2q@3s>FVdQ&MBb@0LGq1x&QzG literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/bone_spear.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..4d0d61d0c170ad4c2e7ccfba4d1f5668832dd070 GIT binary patch literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`NC)_YxB_W| z{|r)FdD(NB{xdMRI6G@=Yez;#{{R1fSCT{&P@1zO$S;@y$OnN<_W8?x0tH<>T^vIq zTHjt%k44ofy`glX(f`s08?gxB_W| z{|r)FdD(NBw6(SWGcZI(Mut16PUYu!aBzrslKKDt|AADa??81tB|(0{3_v~EoDBV; nn}A9q+b&SAI|cv^A;&>RL&S3j3^P6k44ofy`glX(f`s0a9jxB_XZ zt-J>R89qP$92prI?x6agfk9han?09lDnGx2gG0QN%>V!YpLffC0V?G!3GxeO0P-`lfp6;Ry rA3C;X9rs*a_i0xB?irbKKhCl2(_^^VSf>9LXb^*^tDnm{r-UW|&V);a literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-back-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-back-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..db23cdc2a4f53d2d1f640043a1196af3dbb03722 GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`Xa)F$xB_W| z{|r)FdD(NBw6(RT^7H>^V2F&2ERQ$T($X@N0Ln9be*F3W|NlQ4AIJhZd?i7C!3;n? z9BhhLe`X1kvG;Uw42fucdvzlxg8>h-qwa&h*Gr%KDG0QP)Nif06KS=$=kC?UZ3c-7 vcNrNP_>bh@=6&rD^@071x(zo2LxRp!UPjiMZBY$CqZmA0{an^LB{Ts5=1)rN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-suitstorage-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/equipped-suitstorage-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..db23cdc2a4f53d2d1f640043a1196af3dbb03722 GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`Xa)F$xB_W| z{|r)FdD(NBw6(RT^7H>^V2F&2ERQ$T($X@N0Ln9be*F3W|NlQ4AIJhZd?i7C!3;n? z9BhhLe`X1kvG;Uw42fucdvzlxg8>h-qwa&h*Gr%KDG0QP)Nif06KS=$=kC?UZ3c-7 vcNrNP_>bh@=6&rD^@071x(zo2LxRp!UPjiMZBY$CqZmA0{an^LB{Ts5=1)rN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..87a1358a8ce64c2c450e7e154192e4e283f5c90d GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`NC)_YxB_W| z{|r)FdD(NBT%4W%GcZI(Mrvzo|NsAgb++jXpfqPmkY6wZkPiZz?DLoX1PZ!)x;TbJ zw7$Kj$j6|-<9zYtz5hp48dm1Y{t;Jj%t`4w#~^?e&P#02h`&8dwrA% o$E->tkEXUiLHr@tm@Dovt&?In=;bs?2q@3s>FVdQ&MBb@0LGq1x&QzG literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/plasma_spear.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..4d0d61d0c170ad4c2e7ccfba4d1f5668832dd070 GIT binary patch literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`NC)_YxB_W| z{|r)FdD(NB{xdMRI6G@=Yez;#{{R1fSCT{&P@1zO$S;@y$OnN<_W8?x0tH<>T^vIq zTHjt%k44ofy`glX(f`s08?gxB_W| z{|r)FdD(NBw6(SWGcZI(Mut16PUYu!aBzrslKKDt|AADa??81tB|(0{3_v~EoDBV; nn}A9q+b&SAI|cv^A;&>RL&S3j3^P6k44ofy`glX(f`s0a9jxB_XZ zt-J>R89qP$92prI?x6agfk9han?09lDnGx2gG0QN%>V!YpLffC0V?G!3GxeO0P-`lfp6;Ry rA3C;X9rs*a_i0xB?irbKKhCl2(_^^VSf>9LXb^*^tDnm{r-UW|&V);a literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-back-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-back-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..db23cdc2a4f53d2d1f640043a1196af3dbb03722 GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`Xa)F$xB_W| z{|r)FdD(NBw6(RT^7H>^V2F&2ERQ$T($X@N0Ln9be*F3W|NlQ4AIJhZd?i7C!3;n? z9BhhLe`X1kvG;Uw42fucdvzlxg8>h-qwa&h*Gr%KDG0QP)Nif06KS=$=kC?UZ3c-7 vcNrNP_>bh@=6&rD^@071x(zo2LxRp!UPjiMZBY$CqZmA0{an^LB{Ts5=1)rN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-suitstorage-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/equipped-suitstorage-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..db23cdc2a4f53d2d1f640043a1196af3dbb03722 GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`Xa)F$xB_W| z{|r)FdD(NBw6(RT^7H>^V2F&2ERQ$T($X@N0Ln9be*F3W|NlQ4AIJhZd?i7C!3;n? z9BhhLe`X1kvG;Uw42fucdvzlxg8>h-qwa&h*Gr%KDG0QP)Nif06KS=$=kC?UZ3c-7 vcNrNP_>bh@=6&rD^@071x(zo2LxRp!UPjiMZBY$CqZmA0{an^LB{Ts5=1)rN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..87a1358a8ce64c2c450e7e154192e4e283f5c90d GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`NC)_YxB_W| z{|r)FdD(NBT%4W%GcZI(Mrvzo|NsAgb++jXpfqPmkY6wZkPiZz?DLoX1PZ!)x;TbJ zw7$Kj$j6|-<9zYtz5hp48dm1Y{t;Jj%t`4w#~^?e&P#02h`&8dwrA% o$E->tkEXUiLHr@tm@Dovt&?In=;bs?2q@3s>FVdQ&MBb@0LGq1x&QzG literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/reinforced_spear.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..4d0d61d0c170ad4c2e7ccfba4d1f5668832dd070 GIT binary patch literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`NC)_YxB_W| z{|r)FdD(NB{xdMRI6G@=Yez;#{{R1fSCT{&P@1zO$S;@y$OnN<_W8?x0tH<>T^vIq zTHjt%k44ofy`glX(f`s08?gxB_W| z{|r)FdD(NBw6(SWGcZI(Mut16PUYu!aBzrslKKDt|AADa??81tB|(0{3_v~EoDBV; nn}A9q+b&SAI|cv^A;&>RL&S3j3^P6k44ofy`glX(f`s0a9jxB_XZ zt-J>R89qP$92prI?x6agfk9han?09lDnGx2gG0QN%>V!YpLffC0V?G!3GxeO0P-`lfp6;Ry rA3C;X9rs*a_i0xB?irbKKhCl2(_^^VSf>9LXb^*^tDnm{r-UW|&V);a literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-back-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-back-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..db23cdc2a4f53d2d1f640043a1196af3dbb03722 GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`Xa)F$xB_W| z{|r)FdD(NBw6(RT^7H>^V2F&2ERQ$T($X@N0Ln9be*F3W|NlQ4AIJhZd?i7C!3;n? z9BhhLe`X1kvG;Uw42fucdvzlxg8>h-qwa&h*Gr%KDG0QP)Nif06KS=$=kC?UZ3c-7 vcNrNP_>bh@=6&rD^@071x(zo2LxRp!UPjiMZBY$CqZmA0{an^LB{Ts5=1)rN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-suitstorage-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/equipped-suitstorage-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..db23cdc2a4f53d2d1f640043a1196af3dbb03722 GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`Xa)F$xB_W| z{|r)FdD(NBw6(RT^7H>^V2F&2ERQ$T($X@N0Ln9be*F3W|NlQ4AIJhZd?i7C!3;n? z9BhhLe`X1kvG;Uw42fucdvzlxg8>h-qwa&h*Gr%KDG0QP)Nif06KS=$=kC?UZ3c-7 vcNrNP_>bh@=6&rD^@071x(zo2LxRp!UPjiMZBY$CqZmA0{an^LB{Ts5=1)rN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..87a1358a8ce64c2c450e7e154192e4e283f5c90d GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`NC)_YxB_W| z{|r)FdD(NBT%4W%GcZI(Mrvzo|NsAgb++jXpfqPmkY6wZkPiZz?DLoX1PZ!)x;TbJ zw7$Kj$j6|-<9zYtz5hp48dm1Y{t;Jj%t`4w#~^?e&P#02h`&8dwrA% o$E->tkEXUiLHr@tm@Dovt&?In=;bs?2q@3s>FVdQ&MBb@0LGq1x&QzG literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/spear.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/spear.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..4d0d61d0c170ad4c2e7ccfba4d1f5668832dd070 GIT binary patch literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`NC)_YxB_W| z{|r)FdD(NB{xdMRI6G@=Yez;#{{R1fSCT{&P@1zO$S;@y$OnN<_W8?x0tH<>T^vIq zTHjt%k44ofy`glX(f`s08?gxB_W| z{|r)FdD(NBw6(SWGcZI(Mut16PUYu!aBzrslKKDt|AADa??81tB|(0{3_v~EoDBV; nn}A9q+b&SAI|cv^A;&>RL&S3j3^P6k44ofy`glX(f`s0a9jxB_XZ zt-J>R89qP$92prI?x6agfk9han?09lDnGx2gG0QN%>V!YpLffC0V?G!3GxeO0P-`lfp6;Ry rA3C;X9rs*a_i0xB?irbKKhCl2(_^^VSf>9LXb^*^tDnm{r-UW|&V);a literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-back-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-back-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..db23cdc2a4f53d2d1f640043a1196af3dbb03722 GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`Xa)F$xB_W| z{|r)FdD(NBw6(RT^7H>^V2F&2ERQ$T($X@N0Ln9be*F3W|NlQ4AIJhZd?i7C!3;n? z9BhhLe`X1kvG;Uw42fucdvzlxg8>h-qwa&h*Gr%KDG0QP)Nif06KS=$=kC?UZ3c-7 vcNrNP_>bh@=6&rD^@071x(zo2LxRp!UPjiMZBY$CqZmA0{an^LB{Ts5=1)rN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-suitstorage-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/equipped-suitstorage-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..db23cdc2a4f53d2d1f640043a1196af3dbb03722 GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`Xa)F$xB_W| z{|r)FdD(NBw6(RT^7H>^V2F&2ERQ$T($X@N0Ln9be*F3W|NlQ4AIJhZd?i7C!3;n? z9BhhLe`X1kvG;Uw42fucdvzlxg8>h-qwa&h*Gr%KDG0QP)Nif06KS=$=kC?UZ3c-7 vcNrNP_>bh@=6&rD^@071x(zo2LxRp!UPjiMZBY$CqZmA0{an^LB{Ts5=1)rN literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-left-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-left-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..87a1358a8ce64c2c450e7e154192e4e283f5c90d GIT binary patch literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`NC)_YxB_W| z{|r)FdD(NBT%4W%GcZI(Mrvzo|NsAgb++jXpfqPmkY6wZkPiZz?DLoX1PZ!)x;TbJ zw7$Kj$j6|-<9zYtz5hp48dm1Y{t;Jj%t`4w#~^?e&P#02h`&8dwrA% o$E->tkEXUiLHr@tm@Dovt&?In=;bs?2q@3s>FVdQ&MBb@0LGq1x&QzG literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-right-fill-1.png b/Resources/Textures/Objects/Weapons/Melee/uranium_spear.rsi/inhand-right-fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..4d0d61d0c170ad4c2e7ccfba4d1f5668832dd070 GIT binary patch literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`NC)_YxB_W| z{|r)FdD(NB{xdMRI6G@=Yez;#{{R1fSCT{&P@1zO$S;@y$OnN<_W8?x0tH<>T^vIq zTHjt%k44ofy`glX(f`s08?gxB_W| z{|r)FdD(NBw6(SWGcZI(Mut16PUYu!aBzrslKKDt|AADa??81tB|(0{3_v~EoDBV; nn}A9q+b&SAI|cv^A;&>RL&S3j3^P6k44ofy`glX(f`s0a9jxB_XZ zt-J>R89qP$92prI?x6agfk9han?09lDnGx2gG0QN%>V!YpLffC0V?G!3GxeO0P-`lfp6;Ry rA3C;X9rs*a_i0xB?irbKKhCl2(_^^VSf>9LXb^*^tDnm{r-UW|&V);a literal 0 HcmV?d00001 From ac4086f9848b93cb48a352d8de887ab07042d8f7 Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Fri, 2 Aug 2024 01:19:25 -0600 Subject: [PATCH 122/422] apc touchup sprite (#30460) * apc touchup * darker borders ofjdsa fjoias --- .../Structures/Power/apc.rsi/base.png | Bin 676 -> 693 bytes .../Structures/Power/apc.rsi/broken.png | Bin 1061 -> 1063 bytes .../Power/apc.rsi/display-charging.png | Bin 809 -> 948 bytes .../Structures/Power/apc.rsi/display-full.png | Bin 381 -> 440 bytes .../Structures/Power/apc.rsi/display-lack.png | Bin 557 -> 659 bytes .../Power/apc.rsi/display-remote.png | Bin 510 -> 619 bytes .../Structures/Power/apc.rsi/emag-unlit.png | Bin 436 -> 505 bytes .../Structures/Power/apc.rsi/frame.png | Bin 610 -> 624 bytes .../Structures/Power/apc.rsi/static.png | Bin 452 -> 463 bytes 9 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Structures/Power/apc.rsi/base.png b/Resources/Textures/Structures/Power/apc.rsi/base.png index 68b83101d21fc74be03e53fcb4682cefeba232d7..17b98b401619a2f40c283e6d387571ace63c2751 100644 GIT binary patch delta 656 zcmV;B0&o4K1+@i`F@JAKL_t(|ob8%1Ya&4u$Nvcdn+;ZBYPFQLvD9>yR`~|o99(O0 zUm(5TU@h$r>=Y}7G~vMQ4s=O#FkB^>#>%Udki?xC$2XJZ-mhBN$L#LgH@oxr4Z!^0 zT!p@YB6_{v{u1NNX0wyed2@*iP$8wna5zN0UPlx~h@$9ZtbbApN-1nM8?;(20KjUs z!eB5cyvCPKz=1}iVH`W1P9eSv+`R(hA5(37DG~qxLI`b)lo9}N_X_;|Z8q+;%T4(v zNfIoVOQdOvBuP-IR6dQnzXcu)$1F_+06@3fMW@rz2R;LMF&nc~6|h(=jN+c+6hHCJ zD7I7y7>~zBaeu$kKK{r@qu5eSf!%Ir6j$`Sd{1c-aQMPsno=ZSyyVsg>tgPRJO>cg>v2_L}iP7St#fI0aUigmxXe!04iJL%R)IP zfXWv6vQW-bfXWv6vQSP5pt40iE!5cwpt422EtK_An93G~vQX9)KxKC;ux#aTQ_2~CZfqb0Fm%Df`PXOkBQ?q>m zS@^zxsA8Nrj!)j_c@;lE$z(D?yWNK8dGI{%WSx`}Qc7&MTYvO=JpjOZy~cPv&K&>G zHvj-SosM#C6h#m>0?l_|b{pl^JJA3D5JKeEq-hEOXubn)&uZhI>0Fd)f*`_`G?smIqwOS|Z zk|a5v|9U*1&jC2R6^`S$CWJVQMkDn5eKZ=4A2qw(4gikl7mLO5csiXTP1DSWoY?>q zVMK)_NtDm$)qW@Q!hGL9R1rpW8X$zwdI(xG;1kL)l7C0u4d|l$4xkDnwkfm|qzEIn zDfBNu5k_oNXa-P(5!)1M07V$FO`#<~5k_pI+yJUDVjHCfP=*oPM+7E48t%C!!V2$3h&dYY>_PsRmu%geY!^dN!)LgmZMa*$h3vh zvcpui$akcL(*8z>$`+ZjP}<)IP}w3=7D{^tP}w3=7D~GTRJO>Jh0Jh0G(CHxu2M4_V^EEG;@K*nwiHQl%{zu*b4*7f@!!VxwEtyQBsw&sl z*8sd|!siND>wi|)et#J1C?!&_*U@#Ig@uK$j;pE)!20?+(Ds;@KfbkB|sZ;>CySsxj@DFI3*0tZUF#xoUkjv#L7K`rWx3;#Z zR4UZ#b)fA5AD7>#I ziD{Y`hJQh=R>QI^wzsz_6bhbwk8~=$y1Hs75((z#=iTft9*?6a3J(tt?s>IZjchiH zq9|0WRp#dA0Jylg0O0KG?Advav;hD#O|yj%Xqv_cA^7>f&?dwy;EMhIx0K6emY0`F zr_-FAoVe}H%}s<5o^$kE0znibesSIf&L>;}KYvj!m#J2(?s=VUKX?voX=%wGMln(< zmHIY-rfD|72O;e}F8tC`c7*pe-`8)S@6&sDTV1OMNX0QiU3LlawsAC@2-GX9LJmi^5W&`t|@> zYEjTCRL@aBmRb~+3e|TQl%*C0twQyj3d>T9!cw97`p;gLS`>x~HBcrfODzggh3eY_ yVEAg$*r`ym)S|Ibp=7B=kqQ+N5fKp)4F3YS+2p@3F^&EJ0000FH_K z*Vn!G>2&&8pWEA8uYGWEz?RKeb`yMK=R%}{44kw&9|VHhkeEq!)fRaF2sHa38c$9(@S`~=L*%+PE$ea9Ue z1K74rxm@P#>1Bi>RtfCX-=#dD**ub93Xhr>3T` zEDO^#sejk&*tX5~_BO?0(Rb{TPKDRj)|_NA$>QRom;FslOrR(VkB^UDzk0n+Hk(CJ z6l%2^3kwSXoS&ZqaC&+#s2C&`TvuhI4QzV{F00U*B^>Bf@RBx-s}g=G{YQR8cXFp80=3FHAX zi+_=*@r?pu6eCd+C=ALhMxw?yw1iQNL`~O;$u35sCU7Pws~CxzKpp_{ijlG55*)Yf zT;jlv1FMeTJzo`_MaRU%#KgqJ#Ke3x^qi;5Qj4Neq54vXWgT6UeI)Kn^ko29YEcv_ z)IjG0WT{1As!#(Rk&&eqg{eXfWB^%eQG1vw)WCzwMSIoGn8*x*C%hSMy=l=B$;~DW^eC6_W?sYSugLB71XPevF9GSmOyrw3n{H)%W zuV33={?GWl?Dp-B-@oS@&b)IZWz%2f%KCjBi*|JHiaU1t^n1Ox*TBlQ&tgz|boob( z-QVwbeVH^>@FwJ^TDp&FYJOz24tVF*$NgB7be-b9jHO{2eMfyZwRC z@%o}^o{m;2pqA)omFO~1FX zT)v)vbGvH9;fQT6m-6p#SH1CTtM0)hn`kBZ(nN2A=%(Ja`Q97&YNMN8_5)dPz47vs zCo+mpUcks+Z}Dc;dwx4mh`z6_d2|2b_3QHM{x5#dd*`0po%{cLPCijnoBa0llb=dm zkMv$uN$TtG|E&fLP4;)+=OIG#tl{+Q*X@7*`}}!*N5_dxnUm@Q*Zj^uyY8>Ddc$4& zy3eowOG~!Z{i=&x7aeKldntcg(3jO&f2~gMdtUz|zWyoi+2@yiOJ2nPi}{th^M(zJ z=C8_qH>5rUe_yR-#(z+??|=Dw`K?SVUSGYZ8W6j_Z)eTwfBRG~X#P6u-yrh$`-`g_o+2>|s%lld04;Z|k-!a2O6U>-A zpOLe^{p}oSyJ^MezkdD7f7?1#&bPhiZLb3Z rGbf$NqxRj7ef#Qm*&#c*VA(&W@2^|t=kEU^2@>~o^>bP0l+XkKoAua3 delta 729 zcmdnOzLIT%K|RxBPZ!6KiaBrZ+6H}cU}$)Fb>SrGnys$q4loui{_=8XV9;U7por?` z2*bzW3K9azNgiT{Kb!pN*mH620l%)h0u1P&;fLI=eFeM!e%}{k*ZQ=m@KepSP{s4} zon!a6UVXLo^Y5=q*RQYt`|r{7>2GSq*Me8&GZ#p1TL9$UONA| z_Wy-FZu^h3AGls$_xamrhhq!n_s5I;4x6PG`0H#~PhI4@_sd__9Q*%qJNuS6_2VyY z)c;xgrF)UpJQl-WkzsRreq8yxiRbv_2Xe>j`~IFYZrF8it6$@*s_(CxU);){&E$JA zzmECHi}_KPugl+(uMzwp&|fO(5+7gx#}3&;0y9+)e);--N4}>)?ccsy?_Jeujik9kx_E;14j1xm`?^zrf-#nJ zn=3gLTP7^?oKiRM{qOd)`~ME`H?05v=h@rmjXloxb^A5Gtu^so^kw#1iNBlf-1on{ z-|}Dob(;lWtt{P+|9hOjG+yNDN0p9?cIP*}N;$Cn-Skw8c`V;8{?+fb&tMC zFDop*5PhROHr_sMf9~bmn!j>q-;3M)|17)1pW5eNAAjSIp0_+xXzBf&qc65e@6b!Sw1$|dzC;Ep00i_>zopr E08vVNjQ{`u diff --git a/Resources/Textures/Structures/Power/apc.rsi/display-full.png b/Resources/Textures/Structures/Power/apc.rsi/display-full.png index 9b1e28db26d9ab8853db0f0d307df28ddcb94d78..2b0f0033b1f0c33107eb5d3b3261de92a7d1621c 100644 GIT binary patch delta 401 zcmey%w1atqVSSOOi(^Q|oVT}Z{SG?_v_0f+d8E?*fN6^6%N50f8kd(Y^l*0P6koV( z@scN6|2&zeD)*RQT60$I)0^KV+rs6tyVh*F@4)~DGj|%St-7%NXRrRT@?#zm|4(gs z6?N;*{Z%tWqs~m+8QC{+hS-+T-W9A68Wt zi^tlyt@`zhP3M{S+pyQ?_U^x~xpY;2Uc(Z<YgvR=Zk-v5t|E^ypZ>oIdVM<9}1@n{SlDrURo1SyMSq&zCFYXNF{a|2~ zE;pI`qk+}*zh)dT?Vm34^PH2ln6snKUb|;_~VZ&#r3Nb tm~Ec?3p@Ce0VMP7wgO0R%1d?yuC$Q$ZO@-DFmN$2c)I$ztaD0e0sz|RyZ-Ns=yzXf&cDC@@25n`d2;jXZL`1ozTk_k zsQ>BlZ{NbA=k30`-yKf3sC~6>*N%HzUe|5ZUSB1`fcXf4E#P6yzVL2##)FS>yYt=lpV9sK{Cs}l^r{WkCE?C}^-jU3 z=JGQz1c>Nv42epDL6Cbuz}O^frRMinQSbgJg*|r*UEXqar(<@}#fF*d&-H3KaIP*s znO$VKGu-cb(Q{_71_SkrCo|vetOja$_HX5)P@Tkg^IyHHsCifXKjb3Q6oc>nqIdaE g*p{CMS?chzjv-|AVV!uxht43~p00i_>zopr0Jy56{r~^~ diff --git a/Resources/Textures/Structures/Power/apc.rsi/display-lack.png b/Resources/Textures/Structures/Power/apc.rsi/display-lack.png index e360f9c6bb03889b661d04fb010294d449fd8beb..eaa25feac9d60862b5e05d9c46dca14de031071d 100644 GIT binary patch delta 622 zcmZ3>GMROPK|PbNr;B4q#hkZy46|-0h_HXSKB=k0@C%QvQ+v_vtNAV@e_^=i zy?l~w`iTo0lg|kVa5eG06wrzBY&$eS&;2}kK4aIWo~vJTQ*^h_ zy6b#m!mFRZ|2J&>{6Fsgxo<$X9B`g@+<9I(mj&z3t$+OM-FAzC{hj9SedEyQtu1pE z;=N}~Gtf=+&O9k)9q%1+`t?Sja4Sg2IJeWvb>FlNjVG@Qu`$%c0t`%VD3}{QYwqV) zTU4K_=X0#wZ1v72?0BhOLr3QNJZbCwR`Y+n+Oc?B%T?dh(p#54|6bGgI+Wq-2g3;2 z?~7i)+7ZW^P!mJtcjR&?9Pv!XZD`gEGE?8gtE{d>OpoqcFFMWPc)I$ztaD0e0supx BHV*&* delta 520 zcmbQtx|U^vK|SMhPZ!6KiaBrZ7-rpZ5Mg^T{Xv6+L`{oKx^%c=Xu*5sT=^i@@VuHi zGKvW-%$ko5RRlhXG`bgAx#aHq)naZhrkAC+c72ayVSs`HE4wLjKVJX(_5SMl{EK(( z_C!_7v`GYYo&Wy*==18;nRU1F%H~HuU;b9DuKurKb$#9a(!!hH*MG`>_kYos1N&Zo zTemmn%A9F);y2ax{PDlP-=*tE`eRp@n6!UWmfB5|`>|iY@}0cnzt2C9`#<>TW?{0w zg4ySA^ohHFgg)K>9d)e#f7DUw2Za)4{c~zx7tea;zkX>d(8_zN^*XucyR%>9$@87l zuVV)~=-)HFU1t{8KYOa0;&=JaNBae(|K`u$J$ZjU#3NxIo;L(PO>NQS3>GTWQ;l5v zd1_0l-S%_gLSkNrrnJnh@SHNq0On~JJ!^$jc3R1uU+%|6`#VlXetNO(+E3Nj$4{)6 zmHoam?dPl|GQWi`kuk)-eP+xI`{=Dh=|-|uceryptWR+oFfeq~PihoE2g&fD%^_J04Bd*2Fb|G$3s xTYu_ZhF|}#-~S%3^_y?O`}q6z5aTwK`EyP#(9ioCY77$aboFyt=aj(M1OO{h`?&xB diff --git a/Resources/Textures/Structures/Power/apc.rsi/display-remote.png b/Resources/Textures/Structures/Power/apc.rsi/display-remote.png index 089eb9345e78d51c68b75681f40f1d1ebb87f34d..42f0f6d685501289c3cb85b104a9b7fda754d28a 100644 GIT binary patch delta 582 zcmeyz{F-HgK|PbIr;B4q#hkZyH|9zkim)YE8EkUf)S&*EVWwiiTphs!lW$BFFIZ(V z^T64iLJkq_#wT|_RzC1PyF@_c?~)HCqF>{@7~o*TVc(P8b$>m)U$Wo(uk-ti)Tig? z{QLPcBd4WC&f6w0FMmorYVLo}Z=a@|JG=dV@VEa<>wio=Z=TwpE@fHWV(OA+zV6|+ zU$XK0W9`3x+pf9ir0V~7rc0;4FZ{Xl=BLl^>(c9L8Sm|lv%mgWe8;rD}7tx{al>QdegXm`7fq7mAmCl_dl0S*R{W1t;=5j-<9>p`+Bea z|7B)HyZ*cL6X@=GAa*cy|MZl9{(FyIf2}9k*L>s1?l@DXvcI@4Z(EJ~C;OQ56)JXC z_b2{20OavM_NepTr~I?MP$mA~2apNqKse)Fp2Xc<@j&z4#Bcmp{H-s4dBd?6O&_ld z%#7X8_Dk+!wwr|Pgh>~9C;seRTrb_Hc_7e@{mFIXKEIB0`4V>vd>H!-tQ4*8zi3lC zF7kk5vGAhLy?GgzVj3>4{r&X(Tz*swzZ8EJ|Mg;DJ}{)Oe?Rwc_q+PN_6zovKVGkB z^!tEm&i6LSh3{j$e*JTOX8!H3_SV>j#b4&0UZ4JExA@%q7rw8zzf#87ccEP0D*pcd z;9T(s9JSvUeg68_`f4bn+xObZ_T_d^>kjC>U$xfIaQ=!{79bH%S3j3^P6b3Swem?#9`+auZ^~-MQ{;%4Jvz4Dc|GrUS{~m_Vr}{5A|NASwptLS;jY9M@{gAi@-T3c&pKY&s-1GE# z)P3(SpV^_#iD;cx^8ETF{rd8sQJ=Cu7rURnKB>OE_Ql^JadUrqOGV6`gcXs~y)lvL?(P!;v|IV7mHrSrI+kMXbdw%d` mRtekhYujsz|HF)Kh}_5cV`0E19UnnSkeH{dpUXO@geCxyB;GUt diff --git a/Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png b/Resources/Textures/Structures/Power/apc.rsi/emag-unlit.png index 140ae850be75c670e691701c33df11db87fc403c..9e1963a5957e2729eecc146b38c18c8ebd604305 100644 GIT binary patch delta 466 zcmdnO{F8ZtVf|)L7srr_Id5;B_hJeZIsP#@B7j9zRrgkl<36{&PTkku^2#r4=Xj$S z^MmV`K(5Iz=L<@2`kORPOvsh-U3RiK&Fx{|{qtEe`o((oZsOl%1Q|e}L3Hv(oha*d zJzMzy)M=#7>pmKoY%$^Va`CI5C$Gz|EDPJ5k^SA}+o$&8`s=k@;+Lu`^*(fXw>$Q< zozU9+g9H|*D4+P(h3UoTVj{P&kHEtj6HWUcgRW(>!)Ut-G`TwJog{*f==JJa8D zKjSr!$e%CSU-!(Jzcqc|?tQWIWAtC~Ubwd1fHh#{vt!}+)@R@UB5IRmCj9erchvnu zA`VyXM+S)n#)~@azg$0Q_r0kidp6mmF@J7JL_t(|obB2@N&`_40N@c+5CS4Z>hH<71z4R6t8)MV0002MKe4KF|5Ou4V^x^@r1nvR diff --git a/Resources/Textures/Structures/Power/apc.rsi/frame.png b/Resources/Textures/Structures/Power/apc.rsi/frame.png index 4f8ba4d56effeee7f96e45ec924337bb6f6d9b2b..4a4723e9ed2c8f1fdcbadec29cba99a11abbfb76 100644 GIT binary patch delta 586 zcmV-Q0=50(1n>lqF@GvaL_t(|ob8&iZo)7ShW}RGh{WibFrs9kkHFp+VD1C(6rI?3 zkVYK1({F`Z5^91gMFZm-w#`5Z)K zT%++3@X?Ie@&N$Y{gn6aTIPA4qpGTF-0y1}jEN;la=t|~Vk*HVlu}MVf>Q-t;A}>k zXj*_P*8c)r%}8jh1>kB%Li6xjVG$s70-o1U zi_Z2qms{l9g>pI{z~vVCbfKIC;Bt$6x=;`A3y1)r69|p-At^4m$d?P{BmkFN0WOo8Du82LK@bE%5QM+@ Y29&(a0?kpB$^ZZW07*qoM6N<$g8wiJy#N3J delta 572 zcmV-C0>l0A1mXmcF@GFML_t(|ob8%1Zo)tiMSr4nSfbn-QzE+|_s9jPa{x|}ijIRI z(OKdIaSBso*Gs+BqzQ-u*6Ur52gma&OCGJqpRt+oUqBc(FWd>(NRs5-#yb1`{^5PT zwQ&JTR;v}_I7Spjh@$9WoG}K*7?fp+G)(~jMNwe6Tw2$EdVc``U^<;T$7WfEG)GbgYXf*O#_tiI{|AGj>od7qzc?SUg&$*4> z2yi?eony7u&au4^;BYuJYJ@HV6h%?Hb}w4t*=&Z%Wb!bss;cYx+vDwa3&7qAKeYe= zpp-gmt?>=u9em$&`FyhJ= z0O04Zynn7`p65BLs=CJA9=l*oEJ>1c8^cJ507|K#A0em$E>I35b=2KJD9--^RKo~2 z&H_*kBiszW6&3-w6X2#%E8N%T+=jCNRKo~2P6AL4BY)h~c7g!yFv3l3V${P3H_q<> zs$qm1rwRzUz_V9?AP9mW2!bFCl*WBJm0QH+LV3BvR9n}mx5VAU+a9NKi@J89g7ybc zxkX*NP(cDvxkX*NP=ogcL;&stxC!1QMdcQCEmf*=TjaF1UVgTv8I)_g4h0000< KMNUMnLSTaQa0vIMTrCt_ zI=FOd)=oP17q}^ILOVzyp-Vx7-9jhv@N2O{N${hdrxm*7neN{A&E0d!6SS$iy+cuR-MJgv1 z@X0;qRLTHo-L%llI_WVy-?jGED+zD`mGULAXpBTWxs{&ICd?Oetfwvj=`nnLs0phH z0I_I{hxbmFxzz>w zxBY_-A|Zsbfb=LX6beg#d_GSmli6A4x^9qPZ8w`g8`N=}; S*xD%o00005o1H=Q6F@JtZL_t(oh3%C+Yr;?zh99A*l@uq*td1cr8B3SWS^6{Vn4#d( z!No13n~wbjZh>q+4H2@qPbjpR1&YZQG_&sh}tdilQ9#2_X_!#DC_CSrmKkn1G4rd6xrNu9g6?n{cDJ-}O9zHrVaHT*U|J-tqv$;qat` zNC+VfAaxXLnnt-?KI#jCAj)r#d%d3xdiGK5`+i1M)wOAw7=}TySUm7dCKG@t@49X@ z?smI`VHmqesZS6Dfpk8}yRTR}09950bR#CcfmEqdr55@It>}rribopV00000NkvXX Hu0mjf=f=ni From af752586018fa7323caa6e2047dcc8f6dbaa6d48 Mon Sep 17 00:00:00 2001 From: Mervill Date: Fri, 2 Aug 2024 00:30:45 -0700 Subject: [PATCH 123/422] Remove obsolete code from Food, Drink and Respirator systems. (#30560) * Remove obsolete code from Food, Drink and Respirator systems * remove obsolete comment --- .../Body/Systems/RespiratorSystem.cs | 12 +++--- .../Nutrition/EntitySystems/DrinkSystem.cs | 9 ++--- .../Nutrition/EntitySystems/FoodSystem.cs | 39 +++++++++---------- .../Body/Systems/SharedBodySystem.Organs.cs | 37 +++--------------- 4 files changed, 34 insertions(+), 63 deletions(-) diff --git a/Content.Server/Body/Systems/RespiratorSystem.cs b/Content.Server/Body/Systems/RespiratorSystem.cs index 5190ba37d5..45074dc826 100644 --- a/Content.Server/Body/Systems/RespiratorSystem.cs +++ b/Content.Server/Body/Systems/RespiratorSystem.cs @@ -287,10 +287,10 @@ public sealed class RespiratorSystem : EntitySystem if (ent.Comp.SuffocationCycles >= ent.Comp.SuffocationCycleThreshold) { // TODO: This is not going work with multiple different lungs, if that ever becomes a possibility - var organs = _bodySystem.GetBodyOrganComponents(ent); - foreach (var (comp, _) in organs) + var organs = _bodySystem.GetBodyOrganEntityComps((ent, null)); + foreach (var entity in organs) { - _alertsSystem.ShowAlert(ent, comp.Alert); + _alertsSystem.ShowAlert(entity.Owner, entity.Comp1.Alert); } } @@ -303,10 +303,10 @@ public sealed class RespiratorSystem : EntitySystem _adminLogger.Add(LogType.Asphyxiation, $"{ToPrettyString(ent):entity} stopped suffocating"); // TODO: This is not going work with multiple different lungs, if that ever becomes a possibility - var organs = _bodySystem.GetBodyOrganComponents(ent); - foreach (var (comp, _) in organs) + var organs = _bodySystem.GetBodyOrganEntityComps((ent, null)); + foreach (var entity in organs) { - _alertsSystem.ClearAlert(ent, comp.Alert); + _alertsSystem.ClearAlert(entity.Owner, entity.Comp1.Alert); } _damageableSys.TryChangeDamage(ent, ent.Comp.DamageRecovery); diff --git a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs index 36c4ef4b55..ab4ce450d8 100644 --- a/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/DrinkSystem.cs @@ -258,7 +258,7 @@ public sealed class DrinkSystem : SharedDrinkSystem if (transferAmount <= 0) return; - if (!_body.TryGetBodyOrganComponents(args.Target.Value, out var stomachs, body)) + if (!_body.TryGetBodyOrganEntityComps((args.Target.Value, body), out var stomachs)) { _popup.PopupEntity(Loc.GetString(forceDrink ? "drink-component-try-use-drink-cannot-drink-other" : "drink-component-try-use-drink-had-enough"), args.Target.Value, args.User); @@ -272,7 +272,7 @@ public sealed class DrinkSystem : SharedDrinkSystem return; } - var firstStomach = stomachs.FirstOrNull(stomach => _stomach.CanTransferSolution(stomach.Comp.Owner, drained, stomach.Comp)); + var firstStomach = stomachs.FirstOrNull(stomach => _stomach.CanTransferSolution(stomach.Owner, drained, stomach.Comp1)); //All stomachs are full or can't handle whatever solution we have. if (firstStomach == null) @@ -321,8 +321,7 @@ public sealed class DrinkSystem : SharedDrinkSystem _audio.PlayPvs(entity.Comp.UseSound, args.Target.Value, AudioParams.Default.WithVolume(-2f)); _reaction.DoEntityReaction(args.Target.Value, solution, ReactionMethod.Ingestion); - //TODO: Grab the stomach UIDs somehow without using Owner - _stomach.TryTransferSolution(firstStomach.Value.Comp.Owner, drained, firstStomach.Value.Comp); + _stomach.TryTransferSolution(firstStomach.Value.Owner, drained, firstStomach.Value.Comp1); _forensics.TransferDna(entity, args.Target.Value); @@ -336,7 +335,7 @@ public sealed class DrinkSystem : SharedDrinkSystem !ev.CanInteract || !ev.CanAccess || !TryComp(ev.User, out var body) || - !_body.TryGetBodyOrganComponents(ev.User, out var stomachs, body)) + !_body.TryGetBodyOrganEntityComps((ev.User, body), out var stomachs)) return; // Make sure the solution exists diff --git a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs index 4d670a3eb7..53c1b39982 100644 --- a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs @@ -1,6 +1,6 @@ using Content.Server.Body.Components; using Content.Server.Body.Systems; -using Content.Server.Chemistry.Containers.EntitySystems; +using Content.Shared.Chemistry.EntitySystems; using Content.Server.Inventory; using Content.Server.Nutrition.Components; using Content.Shared.Nutrition.Components; @@ -53,7 +53,7 @@ public sealed class FoodSystem : EntitySystem [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; [Dependency] private readonly SharedHandsSystem _hands = default!; [Dependency] private readonly SharedInteractionSystem _interaction = default!; - [Dependency] private readonly SolutionContainerSystem _solutionContainer = default!; + [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; [Dependency] private readonly TransformSystem _transform = default!; [Dependency] private readonly StackSystem _stack = default!; [Dependency] private readonly StomachSystem _stomach = default!; @@ -121,7 +121,7 @@ public sealed class FoodSystem : EntitySystem if (!_solutionContainer.TryGetSolution(food, foodComp.Solution, out _, out var foodSolution)) return (false, false); - if (!_body.TryGetBodyOrganComponents(target, out var stomachs, body)) + if (!_body.TryGetBodyOrganEntityComps((target, body), out var stomachs)) return (false, false); // Check for special digestibles @@ -182,12 +182,12 @@ public sealed class FoodSystem : EntitySystem user, target); // logging - _adminLogger.Add(LogType.ForceFeed, LogImpact.Medium, $"{ToPrettyString(user):user} is forcing {ToPrettyString(target):target} to eat {ToPrettyString(food):food} {SolutionContainerSystem.ToPrettyString(foodSolution)}"); + _adminLogger.Add(LogType.ForceFeed, LogImpact.Medium, $"{ToPrettyString(user):user} is forcing {ToPrettyString(target):target} to eat {ToPrettyString(food):food} {SharedSolutionContainerSystem.ToPrettyString(foodSolution)}"); } else { // log voluntary eating - _adminLogger.Add(LogType.Ingestion, LogImpact.Low, $"{ToPrettyString(target):target} is eating {ToPrettyString(food):food} {SolutionContainerSystem.ToPrettyString(foodSolution)}"); + _adminLogger.Add(LogType.Ingestion, LogImpact.Low, $"{ToPrettyString(target):target} is eating {ToPrettyString(food):food} {SharedSolutionContainerSystem.ToPrettyString(foodSolution)}"); } var doAfterArgs = new DoAfterArgs(EntityManager, @@ -220,7 +220,7 @@ public sealed class FoodSystem : EntitySystem if (!TryComp(args.Target.Value, out var body)) return; - if (!_body.TryGetBodyOrganComponents(args.Target.Value, out var stomachs, body)) + if (!_body.TryGetBodyOrganEntityComps((args.Target.Value, body), out var stomachs)) return; if (args.Used is null || !_solutionContainer.TryGetSolution(args.Used.Value, args.Solution, out var soln, out var solution)) @@ -244,23 +244,22 @@ public sealed class FoodSystem : EntitySystem var split = _solutionContainer.SplitSolution(soln.Value, transferAmount); - //TODO: Get the stomach UID somehow without nabbing owner // Get the stomach with the highest available solution volume var highestAvailable = FixedPoint2.Zero; - StomachComponent? stomachToUse = null; - foreach (var (stomach, _) in stomachs) + Entity? stomachToUse = null; + foreach (var ent in stomachs) { - var owner = stomach.Owner; - if (!_stomach.CanTransferSolution(owner, split, stomach)) + var owner = ent.Owner; + if (!_stomach.CanTransferSolution(owner, split, ent.Comp1)) continue; - if (!_solutionContainer.ResolveSolution(owner, StomachSystem.DefaultSolutionName, ref stomach.Solution, out var stomachSol)) + if (!_solutionContainer.ResolveSolution(owner, StomachSystem.DefaultSolutionName, ref ent.Comp1.Solution, out var stomachSol)) continue; if (stomachSol.AvailableVolume <= highestAvailable) continue; - stomachToUse = stomach; + stomachToUse = ent; highestAvailable = stomachSol.AvailableVolume; } @@ -273,7 +272,7 @@ public sealed class FoodSystem : EntitySystem } _reaction.DoEntityReaction(args.Target.Value, solution, ReactionMethod.Ingestion); - _stomach.TryTransferSolution(stomachToUse.Owner, split, stomachToUse); + _stomach.TryTransferSolution(stomachToUse!.Value.Owner, split, stomachToUse); var flavors = args.FlavorMessage; @@ -365,7 +364,7 @@ public sealed class FoodSystem : EntitySystem !ev.CanInteract || !ev.CanAccess || !TryComp(ev.User, out var body) || - !_body.TryGetBodyOrganComponents(ev.User, out var stomachs, body)) + !_body.TryGetBodyOrganEntityComps((ev.User, body), out var stomachs)) return; // have to kill mouse before eating it @@ -399,7 +398,7 @@ public sealed class FoodSystem : EntitySystem if (!Resolve(food, ref foodComp, false)) return false; - if (!_body.TryGetBodyOrganComponents(uid, out var stomachs)) + if (!_body.TryGetBodyOrganEntityComps(uid, out var stomachs)) return false; return IsDigestibleBy(food, foodComp, stomachs); @@ -409,7 +408,7 @@ public sealed class FoodSystem : EntitySystem /// Returns true if has a that whitelists /// this (or if they even have enough stomachs in the first place). /// - private bool IsDigestibleBy(EntityUid food, FoodComponent component, List<(StomachComponent, OrganComponent)> stomachs) + private bool IsDigestibleBy(EntityUid food, FoodComponent component, List> stomachs) { var digestible = true; @@ -418,13 +417,13 @@ public sealed class FoodSystem : EntitySystem return false; // Run through the mobs' stomachs - foreach (var (comp, _) in stomachs) + foreach (var ent in stomachs) { // Find a stomach with a SpecialDigestible - if (comp.SpecialDigestible == null) + if (ent.Comp1.SpecialDigestible == null) continue; // Check if the food is in the whitelist - if (_whitelistSystem.IsWhitelistPass(comp.SpecialDigestible, food)) + if (_whitelistSystem.IsWhitelistPass(ent.Comp1.SpecialDigestible, food)) return true; // They can only eat whitelist food and the food isn't in the whitelist. It's not edible. return false; diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs b/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs index 30fed573b8..1c315869c8 100644 --- a/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs +++ b/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs @@ -157,32 +157,6 @@ public partial class SharedBodySystem return false; } - /// - /// Returns a list of ValueTuples of and OrganComponent on each organ - /// in the given body. - /// - /// The body entity id to check on. - /// The body to check for organs on. - /// The component to check for. - public List<(T Comp, OrganComponent Organ)> GetBodyOrganComponents( - EntityUid uid, - BodyComponent? body = null) - where T : IComponent - { - if (!Resolve(uid, ref body)) - return new List<(T Comp, OrganComponent Organ)>(); - - var query = GetEntityQuery(); - var list = new List<(T Comp, OrganComponent Organ)>(3); - foreach (var organ in GetBodyOrgans(uid, body)) - { - if (query.TryGetComponent(organ.Id, out var comp)) - list.Add((comp, organ.Component)); - } - - return list; - } - /// /// Returns a list of Entity<, > /// for each organ of the body @@ -216,19 +190,18 @@ public partial class SharedBodySystem /// The body to check for organs on. /// The component to check for. /// Whether any were found. - public bool TryGetBodyOrganComponents( - EntityUid uid, - [NotNullWhen(true)] out List<(T Comp, OrganComponent Organ)>? comps, - BodyComponent? body = null) + public bool TryGetBodyOrganEntityComps( + Entity entity, + [NotNullWhen(true)] out List>? comps) where T : IComponent { - if (!Resolve(uid, ref body)) + if (!Resolve(entity.Owner, ref entity.Comp)) { comps = null; return false; } - comps = GetBodyOrganComponents(uid, body); + comps = GetBodyOrganEntityComps(entity); if (comps.Count != 0) return true; From 2a29fea51d5bfba2381c78838965494f2303d570 Mon Sep 17 00:00:00 2001 From: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Date: Fri, 2 Aug 2024 12:02:16 +0200 Subject: [PATCH 124/422] make the digital audio workstation rotatable (#30571) make the DAW rotatable --- .../Entities/Objects/Fun/Instruments/instruments_structures.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_structures.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_structures.yml index 191bb75e50..43fd0e265f 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_structures.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_structures.yml @@ -148,7 +148,7 @@ state: toms - type: entity - parent: [ BasePlaceableInstrument, ConstructibleMachine] + parent: [ BasePlaceableInstrumentRotatable, ConstructibleMachine] id: DawInstrument name: digital audio workstation description: Cutting edge music technology, straight from the 90s. From f153f134fc535b0934ffdeed9747226eb978145d Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 2 Aug 2024 10:03:23 +0000 Subject: [PATCH 125/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index eaf3ab6199..e339e83d1c 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Dutch-VanDerLinde - changes: - - message: Chemical analysis goggles now show the scanned solution's temperature. - type: Tweak - id: 6533 - time: '2024-05-05T23:32:44.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27693 - author: Allen changes: - message: Added new icons for the emote wheel @@ -3774,3 +3767,10 @@ id: 7032 time: '2024-08-02T07:05:12.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30000 +- author: slarticodefast + changes: + - message: The digital audio workstation can now be rotated. + type: Tweak + id: 7033 + time: '2024-08-02T10:02:16.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30571 From 1fd934d5dcab9af62ce2fa384e17c2866e50b292 Mon Sep 17 00:00:00 2001 From: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com> Date: Fri, 2 Aug 2024 07:08:46 -0700 Subject: [PATCH 126/422] Use EntityQuery for footstep modifier and map grid in SharedMoverController (#30575) --- .../Movement/Systems/SharedMoverController.cs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Content.Shared/Movement/Systems/SharedMoverController.cs b/Content.Shared/Movement/Systems/SharedMoverController.cs index 68e384a1b4..1f64717823 100644 --- a/Content.Shared/Movement/Systems/SharedMoverController.cs +++ b/Content.Shared/Movement/Systems/SharedMoverController.cs @@ -57,6 +57,8 @@ namespace Content.Shared.Movement.Systems protected EntityQuery XformQuery; protected EntityQuery CanMoveInAirQuery; protected EntityQuery NoRotateQuery; + protected EntityQuery FootstepModifierQuery; + protected EntityQuery MapGridQuery; /// /// @@ -84,6 +86,8 @@ namespace Content.Shared.Movement.Systems XformQuery = GetEntityQuery(); NoRotateQuery = GetEntityQuery(); CanMoveInAirQuery = GetEntityQuery(); + FootstepModifierQuery = GetEntityQuery(); + MapGridQuery = GetEntityQuery(); InitializeInput(); InitializeRelay(); @@ -181,7 +185,7 @@ namespace Content.Shared.Movement.Systems // Don't bother getting the tiledef here if we're weightless or in-air // since no tile-based modifiers should be applying in that situation - if (TryComp(xform.GridUid, out MapGridComponent? gridComp) + if (MapGridQuery.TryComp(xform.GridUid, out var gridComp) && _mapSystem.TryGetTileRef(xform.GridUid.Value, gridComp, xform.Coordinates, out var tile) && !(weightless || physicsComponent.BodyStatus == BodyStatus.InAir)) { @@ -430,14 +434,14 @@ namespace Content.Shared.Movement.Systems mobMover.StepSoundDistance -= distanceNeeded; - if (TryComp(uid, out var moverModifier)) + if (FootstepModifierQuery.TryComp(uid, out var moverModifier)) { sound = moverModifier.FootstepSoundCollection; return true; } if (_inventory.TryGetSlotEntity(uid, "shoes", out var shoes) && - TryComp(shoes, out var modifier)) + FootstepModifierQuery.TryComp(shoes, out var modifier)) { sound = modifier.FootstepSoundCollection; return true; @@ -456,9 +460,9 @@ namespace Content.Shared.Movement.Systems sound = null; // Fallback to the map? - if (!TryComp(xform.GridUid, out var grid)) + if (!MapGridQuery.TryComp(xform.GridUid, out var grid)) { - if (TryComp(xform.MapUid, out var modifier)) + if (FootstepModifierQuery.TryComp(xform.MapUid, out var modifier)) { sound = modifier.FootstepSoundCollection; return true; @@ -484,7 +488,7 @@ namespace Content.Shared.Movement.Systems return true; } - if (TryComp(maybeFootstep, out var footstep)) + if (FootstepModifierQuery.TryComp(maybeFootstep, out var footstep)) { sound = footstep.FootstepSoundCollection; return true; From 0f33025d34f43f08a24d99457352c4b1f7876f7a Mon Sep 17 00:00:00 2001 From: Mervill Date: Fri, 2 Aug 2024 08:49:08 -0700 Subject: [PATCH 127/422] Debug command to make you thirsty (#30562) * debug command to make you thirsty * pr feedback --- Content.Server/Nutrition/Thirsty.cs | 38 +++++++++++++++++++ .../en-US/nutrition/nutrition-commands.ftl | 6 +++ 2 files changed, 44 insertions(+) create mode 100644 Content.Server/Nutrition/Thirsty.cs create mode 100644 Resources/Locale/en-US/nutrition/nutrition-commands.ftl diff --git a/Content.Server/Nutrition/Thirsty.cs b/Content.Server/Nutrition/Thirsty.cs new file mode 100644 index 0000000000..8725a62be2 --- /dev/null +++ b/Content.Server/Nutrition/Thirsty.cs @@ -0,0 +1,38 @@ +using Content.Server.Administration; +using Content.Shared.Administration; +using Content.Shared.Nutrition.Components; +using Content.Shared.Nutrition.EntitySystems; +using Robust.Shared.Console; + +namespace Content.Server.Nutrition; + +[AdminCommand(AdminFlags.Debug)] +public sealed class Thirsty : LocalizedEntityCommands +{ + public override string Command => "thirsty"; + + public override void Execute(IConsoleShell shell, string argStr, string[] args) + { + var player = shell.Player; + if (player == null) + { + shell.WriteError(Loc.GetString("cmd-nutrition-error-player")); + return; + } + + if (player.AttachedEntity is not {Valid: true} playerEntity) + { + shell.WriteError(Loc.GetString("cmd-nutrition-error-entity")); + return; + } + + if (!EntityManager.TryGetComponent(playerEntity, out ThirstComponent? thirst)) + { + shell.WriteError(Loc.GetString("cmd-nutrition-error-component", ("comp", nameof(ThirstComponent)))); + return; + } + + var thirstyThreshold = thirst.ThirstThresholds[ThirstThreshold.Parched]; + EntityManager.System().SetThirst(playerEntity, thirst, thirstyThreshold); + } +} diff --git a/Resources/Locale/en-US/nutrition/nutrition-commands.ftl b/Resources/Locale/en-US/nutrition/nutrition-commands.ftl new file mode 100644 index 0000000000..8e6712c52f --- /dev/null +++ b/Resources/Locale/en-US/nutrition/nutrition-commands.ftl @@ -0,0 +1,6 @@ +cmd-nutrition-error-player = You cannot use this command unless you are a player. +cmd-nutrition-error-entity = You cannot use this command without an entity. +cmd-nutrition-error-component = Your entity does not have a {$comp} component. + +cmd-thirsty-desc = makes you thirsty +cmd-thirsty-help = sets your thirst level to partched From ea6be02ea3cd468e1b0c218bc0cd37aee8b710d7 Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 2 Aug 2024 15:50:14 +0000 Subject: [PATCH 128/422] Automatic changelog update --- Resources/Changelog/Admin.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml index 6788f631b7..85e37bcb55 100644 --- a/Resources/Changelog/Admin.yml +++ b/Resources/Changelog/Admin.yml @@ -385,5 +385,12 @@ Entries: id: 47 time: '2024-07-31T01:58:31.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30518 +- author: Mervill + changes: + - message: added a debug command to make you thirsty + type: Add + id: 48 + time: '2024-08-02T15:49:08.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30562 Name: Admin Order: 1 From 577f30fb13ae9865bec3743cc5c684cf46e802c3 Mon Sep 17 00:00:00 2001 From: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Date: Fri, 2 Aug 2024 19:12:08 +0200 Subject: [PATCH 129/422] Add haloperidol, potassium iodide (#27454) * add haloperidol, potassium iodide * review fixes * review and tuning * shader review * use timespan and AutoPausedField --- .../Drowsiness/DrowsinessOverlay.cs | 80 +++++++++++++++++ Content.Client/Drowsiness/DrowsinessSystem.cs | 53 +++++++++++ Content.Server/Drowsiness/DrowsinessSystem.cs | 50 +++++++++++ .../RadiationProtectionComponent.cs | 18 ++++ .../Systems/RadiationProtectionSystem.cs | 38 ++++++++ .../DamageProtectionBuffComponent.cs | 17 ++++ .../Systems/DamageProtectionBuffSystem.cs | 19 ++++ .../Drowsiness/DrowsinessComponent.cs | 28 ++++++ Content.Shared/Drowsiness/DrowsinessSystem.cs | 9 ++ .../guidebook/chemistry/statuseffects.ftl | 2 + .../Locale/en-US/reagents/meta/medicine.ftl | 6 ++ .../Catalog/Fills/Items/firstaidkits.yml | 2 +- Resources/Prototypes/Damage/modifier_sets.yml | 6 ++ .../Entities/Mobs/NPCs/simplemob.yml | 24 ++--- .../Prototypes/Entities/Mobs/Species/base.yml | 3 +- .../Objects/Specific/Medical/healing.yml | 37 ++++++++ .../Reagents/Consumable/Drink/alcohol.yml | 24 +++++ .../Reagents/Consumable/Drink/drinks.yml | 35 ++++++++ .../Reagents/Consumable/Drink/soda.yml | 13 +++ Resources/Prototypes/Reagents/medicine.yml | 87 +++++++++++++++++++ Resources/Prototypes/Reagents/narcotics.yml | 24 +++++ Resources/Prototypes/Reagents/toxins.yml | 15 ++-- .../Prototypes/Recipes/Reactions/medicine.yml | 26 ++++++ Resources/Prototypes/Shaders/shaders.yml | 5 ++ Resources/Prototypes/status_effects.yml | 6 ++ Resources/Textures/Shaders/radial_blur.swsl | 14 +++ 26 files changed, 622 insertions(+), 19 deletions(-) create mode 100644 Content.Client/Drowsiness/DrowsinessOverlay.cs create mode 100644 Content.Client/Drowsiness/DrowsinessSystem.cs create mode 100644 Content.Server/Drowsiness/DrowsinessSystem.cs create mode 100644 Content.Server/Radiation/Components/RadiationProtectionComponent.cs create mode 100644 Content.Server/Radiation/Systems/RadiationProtectionSystem.cs create mode 100644 Content.Shared/Damage/Components/DamageProtectionBuffComponent.cs create mode 100644 Content.Shared/Damage/Systems/DamageProtectionBuffSystem.cs create mode 100644 Content.Shared/Drowsiness/DrowsinessComponent.cs create mode 100644 Content.Shared/Drowsiness/DrowsinessSystem.cs create mode 100644 Resources/Textures/Shaders/radial_blur.swsl diff --git a/Content.Client/Drowsiness/DrowsinessOverlay.cs b/Content.Client/Drowsiness/DrowsinessOverlay.cs new file mode 100644 index 0000000000..a316f31ae6 --- /dev/null +++ b/Content.Client/Drowsiness/DrowsinessOverlay.cs @@ -0,0 +1,80 @@ +using Content.Shared.Drowsiness; +using Content.Shared.StatusEffect; +using Robust.Client.Graphics; +using Robust.Client.Player; +using Robust.Shared.Enums; +using Robust.Shared.Prototypes; +using Robust.Shared.Timing; + +namespace Content.Client.Drowsiness; + +public sealed class DrowsinessOverlay : Overlay +{ + [Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private readonly IPlayerManager _playerManager = default!; + [Dependency] private readonly IEntitySystemManager _sysMan = default!; + [Dependency] private readonly IGameTiming _timing = default!; + + public override OverlaySpace Space => OverlaySpace.WorldSpace; + public override bool RequestScreenTexture => true; + private readonly ShaderInstance _drowsinessShader; + + public float CurrentPower = 0.0f; + + private const float PowerDivisor = 250.0f; + private const float Intensity = 0.2f; // for adjusting the visual scale + private float _visualScale = 0; // between 0 and 1 + + public DrowsinessOverlay() + { + IoCManager.InjectDependencies(this); + _drowsinessShader = _prototypeManager.Index("Drowsiness").InstanceUnique(); + } + + protected override void FrameUpdate(FrameEventArgs args) + { + var playerEntity = _playerManager.LocalEntity; + + if (playerEntity == null) + return; + + if (!_entityManager.HasComponent(playerEntity) + || !_entityManager.TryGetComponent(playerEntity, out var status)) + return; + + var statusSys = _sysMan.GetEntitySystem(); + if (!statusSys.TryGetTime(playerEntity.Value, SharedDrowsinessSystem.DrowsinessKey, out var time, status)) + return; + + var curTime = _timing.CurTime; + var timeLeft = (float)(time.Value.Item2 - curTime).TotalSeconds; + + CurrentPower += 8f * (0.5f * timeLeft - CurrentPower) * args.DeltaSeconds / (timeLeft + 1); + } + + protected override bool BeforeDraw(in OverlayDrawArgs args) + { + if (!_entityManager.TryGetComponent(_playerManager.LocalEntity, out EyeComponent? eyeComp)) + return false; + + if (args.Viewport.Eye != eyeComp.Eye) + return false; + + _visualScale = Math.Clamp(CurrentPower / PowerDivisor, 0.0f, 1.0f); + return _visualScale > 0; + } + + protected override void Draw(in OverlayDrawArgs args) + { + if (ScreenTexture == null) + return; + + var handle = args.WorldHandle; + _drowsinessShader.SetParameter("SCREEN_TEXTURE", ScreenTexture); + _drowsinessShader.SetParameter("Strength", _visualScale * Intensity); + handle.UseShader(_drowsinessShader); + handle.DrawRect(args.WorldBounds, Color.White); + handle.UseShader(null); + } +} diff --git a/Content.Client/Drowsiness/DrowsinessSystem.cs b/Content.Client/Drowsiness/DrowsinessSystem.cs new file mode 100644 index 0000000000..bc8862b19d --- /dev/null +++ b/Content.Client/Drowsiness/DrowsinessSystem.cs @@ -0,0 +1,53 @@ +using Content.Shared.Drowsiness; +using Robust.Client.Graphics; +using Robust.Client.Player; +using Robust.Shared.Player; + +namespace Content.Client.Drowsiness; + +public sealed class DrowsinessSystem : SharedDrowsinessSystem +{ + [Dependency] private readonly IPlayerManager _player = default!; + [Dependency] private readonly IOverlayManager _overlayMan = default!; + + private DrowsinessOverlay _overlay = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnDrowsinessInit); + SubscribeLocalEvent(OnDrowsinessShutdown); + + SubscribeLocalEvent(OnPlayerAttached); + SubscribeLocalEvent(OnPlayerDetached); + + _overlay = new(); + } + + private void OnPlayerAttached(EntityUid uid, DrowsinessComponent component, LocalPlayerAttachedEvent args) + { + _overlayMan.AddOverlay(_overlay); + } + + private void OnPlayerDetached(EntityUid uid, DrowsinessComponent component, LocalPlayerDetachedEvent args) + { + _overlay.CurrentPower = 0; + _overlayMan.RemoveOverlay(_overlay); + } + + private void OnDrowsinessInit(EntityUid uid, DrowsinessComponent component, ComponentInit args) + { + if (_player.LocalEntity == uid) + _overlayMan.AddOverlay(_overlay); + } + + private void OnDrowsinessShutdown(EntityUid uid, DrowsinessComponent component, ComponentShutdown args) + { + if (_player.LocalEntity == uid) + { + _overlay.CurrentPower = 0; + _overlayMan.RemoveOverlay(_overlay); + } + } +} diff --git a/Content.Server/Drowsiness/DrowsinessSystem.cs b/Content.Server/Drowsiness/DrowsinessSystem.cs new file mode 100644 index 0000000000..2511bc790e --- /dev/null +++ b/Content.Server/Drowsiness/DrowsinessSystem.cs @@ -0,0 +1,50 @@ +using Content.Shared.Bed.Sleep; +using Content.Shared.Drowsiness; +using Content.Shared.StatusEffect; +using Robust.Shared.Random; +using Robust.Shared.Timing; + +namespace Content.Server.Drowsiness; + +public sealed class DrowsinessSystem : SharedDrowsinessSystem +{ + [ValidatePrototypeId] + private const string SleepKey = "ForcedSleep"; // Same one used by N2O and other sleep chems. + + [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private readonly StatusEffectsSystem _statusEffects = default!; + + /// + public override void Initialize() + { + SubscribeLocalEvent(OnInit); + } + + private void OnInit(EntityUid uid, DrowsinessComponent component, ComponentStartup args) + { + component.NextIncidentTime = _timing.CurTime + TimeSpan.FromSeconds(_random.NextFloat(component.TimeBetweenIncidents.X, component.TimeBetweenIncidents.Y)); + } + public override void Update(float frameTime) + { + base.Update(frameTime); + + var query = EntityQueryEnumerator(); + while (query.MoveNext(out var uid, out var component)) + { + if (_timing.CurTime < component.NextIncidentTime) + continue; + + // Set the new time. + component.NextIncidentTime = _timing.CurTime + TimeSpan.FromSeconds(_random.NextFloat(component.TimeBetweenIncidents.X, component.TimeBetweenIncidents.Y)); + + // sleep duration + var duration = TimeSpan.FromSeconds(_random.NextFloat(component.DurationOfIncident.X, component.DurationOfIncident.Y)); + + // Make sure the sleep time doesn't cut into the time to next incident. + component.NextIncidentTime += duration; + + _statusEffects.TryAddStatusEffect(uid, SleepKey, duration, false); + } + } +} diff --git a/Content.Server/Radiation/Components/RadiationProtectionComponent.cs b/Content.Server/Radiation/Components/RadiationProtectionComponent.cs new file mode 100644 index 0000000000..44b11af834 --- /dev/null +++ b/Content.Server/Radiation/Components/RadiationProtectionComponent.cs @@ -0,0 +1,18 @@ +using Robust.Shared.Prototypes; +using Content.Shared.Damage.Prototypes; + +namespace Content.Server.Radiation.Components; + +/// +/// Exists for use as a status effect. +/// Adds the DamageProtectionBuffComponent to the entity and adds the specified DamageModifierSet to its list of modifiers. +/// +[RegisterComponent] +public sealed partial class RadiationProtectionComponent : Component +{ + /// + /// The radiation damage modifier for entities with this component. + /// + [DataField("modifier")] + public ProtoId RadiationProtectionModifierSetId = "PotassiumIodide"; +} diff --git a/Content.Server/Radiation/Systems/RadiationProtectionSystem.cs b/Content.Server/Radiation/Systems/RadiationProtectionSystem.cs new file mode 100644 index 0000000000..5222c31bfe --- /dev/null +++ b/Content.Server/Radiation/Systems/RadiationProtectionSystem.cs @@ -0,0 +1,38 @@ +using Content.Server.Radiation.Components; +using Content.Shared.Damage.Components; +using Robust.Shared.Prototypes; + +namespace Content.Server.Radiation.EntitySystems; + +public sealed class RadiationProtectionSystem : EntitySystem +{ + [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(OnInit); + SubscribeLocalEvent(OnShutdown); + } + + private void OnInit(EntityUid uid, RadiationProtectionComponent component, ComponentInit args) + { + if (!_prototypeManager.TryIndex(component.RadiationProtectionModifierSetId, out var modifier)) + return; + var buffComp = EnsureComp(uid); + // add the damage modifier if it isn't in the dict yet + if (!buffComp.Modifiers.ContainsKey(component.RadiationProtectionModifierSetId)) + buffComp.Modifiers.Add(component.RadiationProtectionModifierSetId, modifier); + } + + private void OnShutdown(EntityUid uid, RadiationProtectionComponent component, ComponentShutdown args) + { + if (!TryComp(uid, out var buffComp)) + return; + // remove the damage modifier from the dict + buffComp.Modifiers.Remove(component.RadiationProtectionModifierSetId); + // if the dict is empty now, remove the buff component + if (buffComp.Modifiers.Count == 0) + RemComp(uid); + } +} diff --git a/Content.Shared/Damage/Components/DamageProtectionBuffComponent.cs b/Content.Shared/Damage/Components/DamageProtectionBuffComponent.cs new file mode 100644 index 0000000000..99b055a645 --- /dev/null +++ b/Content.Shared/Damage/Components/DamageProtectionBuffComponent.cs @@ -0,0 +1,17 @@ +using Content.Shared.Damage.Prototypes; +using Robust.Shared.GameStates; + +namespace Content.Shared.Damage.Components; + +/// +/// Applies the specified DamageModifierSets when the entity takes damage. +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class DamageProtectionBuffComponent : Component +{ + /// + /// The damage modifiers for entities with this component. + /// + [DataField] + public Dictionary Modifiers = new(); +} diff --git a/Content.Shared/Damage/Systems/DamageProtectionBuffSystem.cs b/Content.Shared/Damage/Systems/DamageProtectionBuffSystem.cs new file mode 100644 index 0000000000..bbb7bfda32 --- /dev/null +++ b/Content.Shared/Damage/Systems/DamageProtectionBuffSystem.cs @@ -0,0 +1,19 @@ +using Content.Shared.Damage.Components; + +namespace Content.Shared.Damage.Systems; + +public sealed class DamageProtectionBuffSystem : EntitySystem +{ + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnDamageModify); + } + + private void OnDamageModify(EntityUid uid, DamageProtectionBuffComponent component, DamageModifyEvent args) + { + foreach (var modifier in component.Modifiers.Values) + args.Damage = DamageSpecifier.ApplyModifierSet(args.Damage, modifier); + } +} diff --git a/Content.Shared/Drowsiness/DrowsinessComponent.cs b/Content.Shared/Drowsiness/DrowsinessComponent.cs new file mode 100644 index 0000000000..7e170ed232 --- /dev/null +++ b/Content.Shared/Drowsiness/DrowsinessComponent.cs @@ -0,0 +1,28 @@ +using System.Numerics; +using Robust.Shared.GameStates; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom; + +namespace Content.Shared.Drowsiness; + +/// +/// Exists for use as a status effect. Adds a shader to the client that scales with the effect duration. +/// +[RegisterComponent, NetworkedComponent, AutoGenerateComponentPause] +public sealed partial class DrowsinessComponent : Component +{ + /// + /// The random time between sleeping incidents, (min, max). + /// + [DataField(required: true)] + public Vector2 TimeBetweenIncidents = new Vector2(5f, 60f); + + /// + /// The duration of sleeping incidents, (min, max). + /// + [DataField(required: true)] + public Vector2 DurationOfIncident = new Vector2(2, 5); + + [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))] + [AutoPausedField] + public TimeSpan NextIncidentTime = TimeSpan.Zero; +} diff --git a/Content.Shared/Drowsiness/DrowsinessSystem.cs b/Content.Shared/Drowsiness/DrowsinessSystem.cs new file mode 100644 index 0000000000..97d7c0952d --- /dev/null +++ b/Content.Shared/Drowsiness/DrowsinessSystem.cs @@ -0,0 +1,9 @@ +using Content.Shared.StatusEffect; + +namespace Content.Shared.Drowsiness; + +public abstract class SharedDrowsinessSystem : EntitySystem +{ + [ValidatePrototypeId] + public const string DrowsinessKey = "Drowsiness"; +} diff --git a/Resources/Locale/en-US/guidebook/chemistry/statuseffects.ftl b/Resources/Locale/en-US/guidebook/chemistry/statuseffects.ftl index 3db8a3c5b0..9a8f2f6c8a 100644 --- a/Resources/Locale/en-US/guidebook/chemistry/statuseffects.ftl +++ b/Resources/Locale/en-US/guidebook/chemistry/statuseffects.ftl @@ -11,3 +11,5 @@ reagent-effect-status-effect-PressureImmunity = pressure immunity reagent-effect-status-effect-Pacified = combat pacification reagent-effect-status-effect-RatvarianLanguage = ratvarian language patterns reagent-effect-status-effect-StaminaModifier = modified stamina +reagent-effect-status-effect-RadiationProtection = radiation protection +reagent-effect-status-effect-Drowsiness = drowsiness diff --git a/Resources/Locale/en-US/reagents/meta/medicine.ftl b/Resources/Locale/en-US/reagents/meta/medicine.ftl index a84e8315fd..1e34411efb 100644 --- a/Resources/Locale/en-US/reagents/meta/medicine.ftl +++ b/Resources/Locale/en-US/reagents/meta/medicine.ftl @@ -141,3 +141,9 @@ reagent-desc-mannitol = Efficiently restores brain damage. reagent-name-psicodine = psicodine reagent-desc-psicodine = Suppresses anxiety and other various forms of mental distress. Overdose causes hallucinations and minor toxin damage. + +reagent-name-potassium-iodide = potassium iodide +reagent-desc-potassium-iodide = Will reduce the damaging effects of radiation by 90%. Prophylactic use only. + +reagent-name-haloperidol = haloperidol +reagent-desc-haloperidol = Removes most stimulating and hallucinogenic drugs. Reduces druggy effects and jitteriness. Causes drowsiness. diff --git a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml index 6400dce5b6..e54010429f 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/firstaidkits.yml @@ -71,7 +71,7 @@ contents: - id: SyringePhalanximine - id: RadAutoInjector - - id: EmergencyMedipen + - id: PillCanisterPotassiumIodide - id: PillCanisterHyronalin - type: entity diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml index 02223b6a9f..671e9d80ea 100644 --- a/Resources/Prototypes/Damage/modifier_sets.yml +++ b/Resources/Prototypes/Damage/modifier_sets.yml @@ -296,3 +296,9 @@ Cellular: 0.0 Heat: 2.5 Caustic: 0.0 + +# protects against radiation +- type: damageModifierSet + id: PotassiumIodide + coefficients: + Radiation: 0.1 diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml index 4936d883e5..41545aef89 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml @@ -26,6 +26,8 @@ - TemporaryBlindness - Pacified - Flashed + - RadiationProtection + - Drowsiness - type: Buckle - type: StandingState - type: Tag @@ -91,16 +93,18 @@ baseDecayRate: 0.04 - type: StatusEffects allowed: - - Stun - - KnockedDown - - SlowedDown - - Stutter - - Electrocution - - ForcedSleep - - TemporaryBlindness - - Pacified - - StaminaModifier - - Flashed + - Stun + - KnockedDown + - SlowedDown + - Stutter + - Electrocution + - ForcedSleep + - TemporaryBlindness + - Pacified + - StaminaModifier + - Flashed + - RadiationProtection + - Drowsiness - type: Bloodstream bloodMaxVolume: 150 - type: MobPrice diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml index d20ae2ff17..99aa2d4bc8 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/base.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml @@ -132,6 +132,8 @@ - Pacified - StaminaModifier - Flashed + - RadiationProtection + - Drowsiness - type: Body prototype: Human requiredLegs: 2 @@ -234,7 +236,6 @@ groups: Brute: -0.07 - type: Fingerprint - - type: Blindable # Other - type: Temperature diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml index d83a292ebe..989fd57705 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml @@ -445,6 +445,39 @@ - id: PillHyronalin amount: 5 +- type: entity + name: pill + suffix: Potassium iodide 10u + parent: Pill + id: PillPotassiumIodide + components: + - type: Pill + pillType: 8 + - type: Sprite + state: pill9 + - type: Label + currentLabel: potassium iodide 10u + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: PotassiumIodide + Quantity: 10 + +- type: entity + name: pill canister + parent: PillCanister + id: PillCanisterPotassiumIodide + suffix: Potassium iodide 10u, 5 + components: + - type: Label + currentLabel: potassium iodide 10u + - type: StorageFill + contents: + - id: PillPotassiumIodide + amount: 5 + - type: entity name: pill suffix: Iron 10u @@ -751,6 +784,10 @@ prob: 0.10 maxAmount: 7 orGroup: RandomPill + - id: PillPotassiumIodide + prob: 0.10 + maxAmount: 7 + orGroup: RandomPill - id: PillIron prob: 0.10 maxAmount: 7 diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index 8028b6376c..1aa03bf4c9 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -1795,6 +1795,10 @@ - !type:AdjustReagent reagent: Theobromine amount: 0.05 + - !type:GenericStatusEffect + key: Drowsiness + time: 1.0 + type: Remove fizziness: 0.25 - type: reagent @@ -1822,6 +1826,10 @@ - !type:AdjustReagent reagent: Theobromine amount: 0.05 + - !type:GenericStatusEffect + key: Drowsiness + time: 1.0 + type: Remove fizziness: 0.15 - type: reagent @@ -1849,6 +1857,10 @@ - !type:AdjustReagent reagent: Theobromine amount: 0.05 + - !type:GenericStatusEffect + key: Drowsiness + time: 1.0 + type: Remove fizziness: 0.15 - type: reagent @@ -1876,6 +1888,10 @@ - !type:AdjustReagent reagent: Theobromine amount: 0.05 + - !type:GenericStatusEffect + key: Drowsiness + time: 1.0 + type: Remove fizziness: 0.25 - type: reagent @@ -1903,6 +1919,10 @@ - !type:AdjustReagent reagent: Theobromine amount: 0.05 + - !type:GenericStatusEffect + key: Drowsiness + time: 1.0 + type: Remove fizziness: 0.15 - type: reagent @@ -1930,4 +1950,8 @@ - !type:AdjustReagent reagent: Theobromine amount: 0.05 + - !type:GenericStatusEffect + key: Drowsiness + time: 1.0 + type: Remove fizziness: 0.25 diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml index 52a01d973f..3f9fb7b53d 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml @@ -12,6 +12,10 @@ effects: - !type:SatiateThirst factor: 2 + - !type:GenericStatusEffect + key: Drowsiness + time: 2.0 + type: Remove - !type:AdjustReagent reagent: Theobromine amount: 0.05 @@ -96,6 +100,15 @@ metamorphicMaxFillLevels: 1 metamorphicFillBaseName: fill- metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:GenericStatusEffect + key: Drowsiness + time: 2.0 + type: Remove - type: reagent id: GreenTea @@ -145,6 +158,15 @@ metamorphicMaxFillLevels: 5 metamorphicFillBaseName: fill- metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:GenericStatusEffect + key: Drowsiness + time: 2.0 + type: Remove - type: reagent id: IcedGreenTea @@ -322,6 +344,10 @@ effects: - !type:SatiateThirst factor: 6 + - !type:GenericStatusEffect + key: Drowsiness + time: 3.0 + type: Remove Poison: effects: - !type:HealthChange @@ -354,6 +380,15 @@ metamorphicMaxFillLevels: 1 metamorphicFillBaseName: fill- metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:GenericStatusEffect + key: Drowsiness + time: 2.0 + type: Remove - type: reagent id: Tea diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml index d78b0351ce..49290677a1 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/soda.yml @@ -13,6 +13,15 @@ metamorphicMaxFillLevels: 5 metamorphicFillBaseName: fill- metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:GenericStatusEffect + key: Drowsiness + time: 1.0 + type: Remove - type: reagent id: RoyRogers @@ -68,6 +77,10 @@ effects: - !type:SatiateThirst factor: 2 + - !type:GenericStatusEffect + key: Drowsiness + time: 2.0 + type: Remove - !type:AdjustReagent reagent: Theobromine amount: 0.1 diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index ad0d39a134..4dcef67f77 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -891,6 +891,10 @@ - !type:GenericStatusEffect key: Stutter component: StutteringAccent + - !type:GenericStatusEffect + key: Drowsiness + time: 10 + type: Remove - !type:ResetNarcolepsy conditions: - !type:ReagentThreshold @@ -912,6 +916,10 @@ metabolisms: Medicine: effects: + - !type:GenericStatusEffect + key: Drowsiness + time: 10 + type: Remove - !type:ResetNarcolepsy conditions: - !type:ReagentThreshold @@ -1284,3 +1292,82 @@ - "psicodine-effect-anxieties-wash-away" - "psicodine-effect-at-peace" probability: 0.2 + +- type: reagent + id: PotassiumIodide + name: reagent-name-potassium-iodide + group: Medicine + desc: reagent-desc-potassium-iodide + physicalDesc: reagent-physical-desc-grainy + flavor: medicine + color: "#baa15d" + metabolisms: + Medicine: + effects: + - !type:GenericStatusEffect + key: RadiationProtection + component: RadiationProtection + time: 2 + type: Add + refresh: false + - !type:HealthChange + conditions: + - !type:ReagentThreshold + min: 20 + damage: + types: + Poison: 1 + +- type: reagent + id: Haloperidol + name: reagent-name-haloperidol + group: Medicine + desc: reagent-desc-haloperidol + physicalDesc: reagent-physical-desc-crystalline + flavor: medicine + color: "#27870a" + metabolisms: + Medicine: + effects: + - !type:Emote + emote: Yawn + showInChat: true + probability: 0.1 + - !type:GenericStatusEffect + key: Drowsiness + component: Drowsiness + time: 4 + type: Add + refresh: false + - !type:GenericStatusEffect + key: Jitter + time: 4.0 + type: Remove + - !type:GenericStatusEffect + key: SeeingRainbows + time: 10.0 + type: Remove + - !type:AdjustReagent + reagent: Desoxyephedrine + amount: -3.0 + - !type:AdjustReagent + reagent: Ephedrine + amount: -3.0 + - !type:AdjustReagent + reagent: Stimulants + amount: -3.0 + - !type:AdjustReagent + reagent: THC + amount: -3.0 + - !type:AdjustReagent + reagent: SpaceDrugs + amount: -3.0 + - !type:AdjustReagent + reagent: Bananadine + amount: -3.0 + - !type:AdjustReagent + reagent: SpaceGlue + amount: -3.0 + - !type:AdjustReagent + reagent: MindbreakerToxin + amount: -3.0 diff --git a/Resources/Prototypes/Reagents/narcotics.yml b/Resources/Prototypes/Reagents/narcotics.yml index bf311f23e7..8e73eb1395 100644 --- a/Resources/Prototypes/Reagents/narcotics.yml +++ b/Resources/Prototypes/Reagents/narcotics.yml @@ -40,6 +40,14 @@ key: KnockedDown time: 3 type: Remove + - !type:GenericStatusEffect + conditions: + - !type:ReagentThreshold + reagent: Haloperidol + max: 0.01 + key: Drowsiness + time: 10 + type: Remove Medicine: effects: - !type:ResetNarcolepsy @@ -80,6 +88,14 @@ key: KnockedDown time: 1 type: Remove + - !type:GenericStatusEffect + conditions: + - !type:ReagentThreshold + reagent: Haloperidol + max: 0.01 + key: Drowsiness + time: 10 + type: Remove - !type:PopupMessage visualType: Medium messages: ["ephedrine-effect-tight-pain", "ephedrine-effect-heart-pounds"] @@ -140,6 +156,14 @@ key: ForcedSleep time: 3 type: Remove + - !type:GenericStatusEffect + conditions: + - !type:ReagentThreshold + reagent: Haloperidol + max: 0.01 + key: Drowsiness + time: 10 + type: Remove Medicine: metabolismRate: 1.0 effects: diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml index 7f4ebc1a75..a83836c5ff 100644 --- a/Resources/Prototypes/Reagents/toxins.yml +++ b/Resources/Prototypes/Reagents/toxins.yml @@ -56,18 +56,19 @@ metabolisms: Poison: effects: + - !type:Emote + emote: Yawn + showInChat: true + probability: 0.1 - !type:MovespeedModifier walkSpeedModifier: 0.65 sprintSpeedModifier: 0.65 - !type:GenericStatusEffect - conditions: - - !type:ReagentThreshold - reagent: ChloralHydrate - min: 10 - key: ForcedSleep - component: ForcedSleeping - refresh: false + key: Drowsiness + component: Drowsiness + time: 4 type: Add + refresh: false - !type:HealthChange conditions: - !type:ReagentThreshold diff --git a/Resources/Prototypes/Recipes/Reactions/medicine.yml b/Resources/Prototypes/Recipes/Reactions/medicine.yml index 2e9b1d4f85..a99015fe90 100644 --- a/Resources/Prototypes/Recipes/Reactions/medicine.yml +++ b/Resources/Prototypes/Recipes/Reactions/medicine.yml @@ -636,3 +636,29 @@ catalyst: true products: Happiness: 4 + +- type: reaction + id: PotassiumIodide + reactants: + Potassium: + amount: 1 + Iodine: + amount: 1 + products: + PotassiumIodide: 2 + +- type: reaction + id: Haloperidol + reactants: + Aluminium: + amount: 1 + Chlorine: + amount: 1 + Fluorine: + amount: 1 + Oil: + amount: 1 + PotassiumIodide: + amount: 1 + products: + Haloperidol: 5 diff --git a/Resources/Prototypes/Shaders/shaders.yml b/Resources/Prototypes/Shaders/shaders.yml index e286dcb7a4..136821efbb 100644 --- a/Resources/Prototypes/Shaders/shaders.yml +++ b/Resources/Prototypes/Shaders/shaders.yml @@ -57,6 +57,11 @@ kind: source path: "/Textures/Shaders/drunk.swsl" +- type: shader + id: Drowsiness + kind: source + path: "/Textures/Shaders/radial_blur.swsl" + - type: shader id: Texture kind: source diff --git a/Resources/Prototypes/status_effects.yml b/Resources/Prototypes/status_effects.yml index 27609b1bb5..96379323fd 100644 --- a/Resources/Prototypes/status_effects.yml +++ b/Resources/Prototypes/status_effects.yml @@ -62,3 +62,9 @@ - type: statusEffect id: Flashed + +- type: statusEffect + id: RadiationProtection + +- type: statusEffect + id: Drowsiness #blurs your vision and makes you randomly fall asleep diff --git a/Resources/Textures/Shaders/radial_blur.swsl b/Resources/Textures/Shaders/radial_blur.swsl new file mode 100644 index 0000000000..f3224ce06c --- /dev/null +++ b/Resources/Textures/Shaders/radial_blur.swsl @@ -0,0 +1,14 @@ +uniform sampler2D SCREEN_TEXTURE; +uniform highp float Strength; +const highp int SampleCount = 10; // a higher number makes the shader look better, but has a big performance impact + +// a simple radial blur +void fragment() { + highp vec2 uv = FRAGCOORD.xy * SCREEN_PIXEL_SIZE.xy; + highp vec2 direction = vec2(0.5, 0.5) - uv; + for (int i=1; i <= SampleCount; i++) + { + COLOR += zTextureSpec(SCREEN_TEXTURE, uv + float(i) * Strength / float(SampleCount) * direction); + } + COLOR = COLOR / float(SampleCount); +} From 858f954c2f04f20527e1f424c12ddc76ad681265 Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 2 Aug 2024 17:13:14 +0000 Subject: [PATCH 130/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index e339e83d1c..a7c6d80c3b 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Allen - changes: - - message: Added new icons for the emote wheel - type: Add - id: 6534 - time: '2024-05-06T01:12:30.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27541 - author: DogZeroX changes: - message: 'Added a new salvage song: Deadline by Bolgarich' @@ -3774,3 +3767,20 @@ id: 7033 time: '2024-08-02T10:02:16.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30571 +- author: slarticodefast + changes: + - message: Added potassium iodide. It gives you short term radiation protection + and can be found in radiation treatment kits. + type: Add + - message: Added haloperidol. It removes most stimulating/hallucinogenic drugs from + the body and makes you drowsy. + type: Add + - message: Added the drowsiness status effect. It blurs your vision and makes you + randomly fall asleep. Drink some coffee or cola to remove it. + type: Add + - message: Chloral hydrate now makes you drowsy instead of forcing you to sleep + instantly. + type: Tweak + id: 7034 + time: '2024-08-02T17:12:08.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/27454 From a2f27f956a635e2c5138b6b2a61bd45566921805 Mon Sep 17 00:00:00 2001 From: Repo <47093363+Titian3@users.noreply.github.com> Date: Sat, 3 Aug 2024 06:58:00 +1200 Subject: [PATCH 131/422] Fix Bwoink Player sorting again.... (#30580) Keep players that have had messages in the round at the top --- .../Administration/UI/Bwoink/BwoinkControl.xaml.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs b/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs index 18aa02e9d6..dd8e3e2212 100644 --- a/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs +++ b/Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs @@ -92,13 +92,18 @@ namespace Content.Client.Administration.UI.Bwoink if (a.IsPinned != b.IsPinned) return a.IsPinned ? -1 : 1; - // First, sort by unread. Any chat with unread messages appears first. We just sort based on unread - // status, not number of unread messages, so that more recent unread messages take priority. + // First, sort by unread. Any chat with unread messages appears first. var aUnread = ach.Unread > 0; var bUnread = bch.Unread > 0; if (aUnread != bUnread) return aUnread ? -1 : 1; + // Sort by recent messages during the current round. + var aRecent = a.ActiveThisRound && ach.LastMessage != DateTime.MinValue; + var bRecent = b.ActiveThisRound && bch.LastMessage != DateTime.MinValue; + if (aRecent != bRecent) + return aRecent ? -1 : 1; + // Next, sort by connection status. Any disconnected players are grouped towards the end. if (a.Connected != b.Connected) return a.Connected ? -1 : 1; From 32d1ea41bf058c61021fce314daac8a0b8156385 Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 2 Aug 2024 18:59:06 +0000 Subject: [PATCH 132/422] Automatic changelog update --- Resources/Changelog/Admin.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml index 85e37bcb55..eaaeaee475 100644 --- a/Resources/Changelog/Admin.yml +++ b/Resources/Changelog/Admin.yml @@ -392,5 +392,12 @@ Entries: id: 48 time: '2024-08-02T15:49:08.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30562 +- author: Repo + changes: + - message: Players that aHelped in Current round stay at top of bwoink list. + type: Fix + id: 49 + time: '2024-08-02T18:58:00.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30580 Name: Admin Order: 1 From 7efc557bb499db8dd383100d5f9f32e7deacd247 Mon Sep 17 00:00:00 2001 From: JustCone <141039037+JustCone14@users.noreply.github.com> Date: Fri, 2 Aug 2024 21:10:05 +0100 Subject: [PATCH 133/422] Marathon had extra pipes under windows (#30584) Deletes extra pipes --- Resources/Maps/marathon.yml | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml index 3139f0630b..35a1740237 100644 --- a/Resources/Maps/marathon.yml +++ b/Resources/Maps/marathon.yml @@ -10987,7 +10987,7 @@ entities: pos: -20.5,-5.5 parent: 30 - type: Door - secondsUntilStateChange: -19847.316 + secondsUntilStateChange: -19887.758 state: Opening - type: DeviceLinkSource lastSignals: @@ -74165,17 +74165,6 @@ entities: parent: 30 - type: AtmosPipeColor color: '#FF0000FF' - - uid: 8933 - components: - - type: Transform - anchored: False - pos: 7.5,-22.5 - parent: 30 - - type: AtmosPipeColor - color: '#0335FCFF' - - type: Physics - canCollide: True - bodyType: Dynamic - uid: 8934 components: - type: Transform @@ -75346,17 +75335,6 @@ entities: parent: 30 - type: AtmosPipeColor color: '#FF0000FF' - - uid: 9980 - components: - - type: Transform - anchored: False - pos: 5.5,-22.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF1212FF' - - type: Physics - canCollide: True - bodyType: Dynamic - uid: 9982 components: - type: Transform From be681aac11ea42743603b1eca04185d638f56c1e Mon Sep 17 00:00:00 2001 From: JustCone <141039037+JustCone14@users.noreply.github.com> Date: Fri, 2 Aug 2024 21:12:07 +0100 Subject: [PATCH 134/422] Packed Singulo Substation & Chemistry Windoors (#30572) * Rearrange Engineering Wires * Replaces chemistry windoors with correct access --- Resources/Maps/packed.yml | 4678 ++++++++++++++++++------------------- 1 file changed, 2272 insertions(+), 2406 deletions(-) diff --git a/Resources/Maps/packed.yml b/Resources/Maps/packed.yml index 2691ed2a78..ac6404412c 100644 --- a/Resources/Maps/packed.yml +++ b/Resources/Maps/packed.yml @@ -89,7 +89,7 @@ entities: version: 6 1,-3: ind: 1,-3 - tiles: egAAAAAAewAAAAAAegAAAAAAegAAAAAAegAAAAAAewAAAAAAegAAAAAAegAAAAAAegAAAAAAewAAAAAAegAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAHQAAAAACHQAAAAABHQAAAAABHQAAAAAAewAAAAAAewAAAAAAewAAAAAAWwAAAAACWwAAAAAAWwAAAAACWwAAAAABWwAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAHQAAAAAAHQAAAAAAewAAAAAAHQAAAAACewAAAAAAewAAAAAAewAAAAAAWwAAAAADewAAAAAAewAAAAAAewAAAAAAWwAAAAADewAAAAAAewAAAAAAewAAAAAAewAAAAAAHQAAAAABHQAAAAABewAAAAAAHQAAAAAAWwAAAAAAWwAAAAADewAAAAAAWwAAAAABHQAAAAAAewAAAAAAHQAAAAADWwAAAAAAewAAAAAAWwAAAAACWwAAAAACewAAAAAAHQAAAAADHQAAAAABewAAAAAAHQAAAAACWwAAAAACWwAAAAAAWwAAAAACWwAAAAACHQAAAAABewAAAAAAHQAAAAACWwAAAAACewAAAAAAWwAAAAADWwAAAAAAewAAAAAAHQAAAAAAHQAAAAACewAAAAAAHQAAAAACWwAAAAADWwAAAAABWwAAAAAAWwAAAAADHQAAAAABewAAAAAAHQAAAAABWwAAAAABWwAAAAACWwAAAAAAWwAAAAAAewAAAAAAHQAAAAABHQAAAAABewAAAAAAHQAAAAACWwAAAAABWwAAAAACewAAAAAAWwAAAAACWwAAAAABWwAAAAACWwAAAAADWwAAAAADewAAAAAAWwAAAAAAWwAAAAAAewAAAAAAHQAAAAAAHQAAAAABHQAAAAAAHQAAAAACewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAWwAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAHQAAAAACWwAAAAADWwAAAAADWwAAAAADWwAAAAAAWwAAAAACWwAAAAACWwAAAAAAWwAAAAADWwAAAAACWwAAAAACWwAAAAAAWwAAAAACWwAAAAAAWwAAAAACWwAAAAADWwAAAAADWwAAAAAAWwAAAAACWwAAAAABWwAAAAABWwAAAAABWwAAAAABWwAAAAAAWwAAAAADWwAAAAABWwAAAAADWwAAAAAAWwAAAAACWwAAAAABWwAAAAADWwAAAAAAWwAAAAACWwAAAAACWwAAAAACWwAAAAABWwAAAAADWwAAAAAAWwAAAAACWwAAAAACewAAAAAAewAAAAAAewAAAAAAWwAAAAADewAAAAAAewAAAAAAewAAAAAAWwAAAAACWwAAAAADWwAAAAADWwAAAAAAWwAAAAADewAAAAAAewAAAAAAWwAAAAADewAAAAAAewAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAewAAAAAAewAAAAAAWwAAAAACewAAAAAAWwAAAAADWwAAAAADewAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAA + tiles: egAAAAAAewAAAAAAegAAAAAAegAAAAAAegAAAAAAewAAAAAAegAAAAAAegAAAAAAegAAAAAAewAAAAAAegAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAHQAAAAACHQAAAAABHQAAAAABHQAAAAAAewAAAAAAewAAAAAAewAAAAAAWwAAAAACWwAAAAAAWwAAAAACWwAAAAABWwAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAHQAAAAAAHQAAAAAAewAAAAAAHQAAAAACewAAAAAAewAAAAAAewAAAAAAWwAAAAADewAAAAAAewAAAAAAewAAAAAAWwAAAAADewAAAAAAewAAAAAAewAAAAAAewAAAAAAHQAAAAABHQAAAAABewAAAAAAHQAAAAAAWwAAAAAAWwAAAAABewAAAAAAWwAAAAAAHQAAAAACewAAAAAAHQAAAAADWwAAAAAAewAAAAAAWwAAAAACWwAAAAACewAAAAAAHQAAAAADHQAAAAABewAAAAAAHQAAAAACWwAAAAACWwAAAAADWwAAAAACWwAAAAAAHQAAAAABewAAAAAAHQAAAAACWwAAAAACewAAAAAAWwAAAAADWwAAAAAAewAAAAAAHQAAAAAAHQAAAAACewAAAAAAHQAAAAACWwAAAAADWwAAAAADWwAAAAAAWwAAAAAAHQAAAAABewAAAAAAHQAAAAABWwAAAAABWwAAAAACWwAAAAACWwAAAAAAewAAAAAAHQAAAAABHQAAAAABewAAAAAAHQAAAAACWwAAAAABWwAAAAACewAAAAAAWwAAAAACWwAAAAABWwAAAAACWwAAAAADWwAAAAADewAAAAAAWwAAAAAAWwAAAAAAewAAAAAAHQAAAAAAHQAAAAACHQAAAAAAHQAAAAACewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAWwAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAHQAAAAACWwAAAAADWwAAAAADWwAAAAADWwAAAAAAWwAAAAACWwAAAAACWwAAAAAAWwAAAAADWwAAAAACWwAAAAACWwAAAAAAWwAAAAACWwAAAAAAWwAAAAACWwAAAAADWwAAAAADWwAAAAAAWwAAAAACWwAAAAABWwAAAAABWwAAAAABWwAAAAABWwAAAAAAWwAAAAADWwAAAAABWwAAAAADWwAAAAAAWwAAAAACWwAAAAABWwAAAAADWwAAAAAAWwAAAAACWwAAAAACWwAAAAACWwAAAAABWwAAAAADWwAAAAAAWwAAAAACWwAAAAACewAAAAAAewAAAAAAewAAAAAAWwAAAAADewAAAAAAewAAAAAAewAAAAAAWwAAAAACWwAAAAADWwAAAAADWwAAAAAAWwAAAAADewAAAAAAewAAAAAAWwAAAAADewAAAAAAewAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAewAAAAAAewAAAAAAWwAAAAACewAAAAAAWwAAAAADWwAAAAADewAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAA version: 6 2,-2: ind: 2,-2 @@ -97,7 +97,7 @@ entities: version: 6 2,-3: ind: 2,-3 - tiles: ewAAAAAAewAAAAAAagAAAAAAagAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATQAAAAAATQAAAAAAewAAAAAAewAAAAAAagAAAAAAagAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATQAAAAAATQAAAAAAewAAAAAAewAAAAAATwAAAAAAagAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATQAAAAAATQAAAAAAHQAAAAACewAAAAAATwAAAAAAagAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATQAAAAAATQAAAAAAHQAAAAACewAAAAAATwAAAAAAagAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAHQAAAAABewAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAewAAAAAAegAAAAAAegAAAAAAHQAAAAADewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAHQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAWwAAAAACWwAAAAACWwAAAAABWwAAAAACWwAAAAADWwAAAAABWwAAAAADWwAAAAADWwAAAAAAewAAAAAAHQAAAAAAawAAAAAAewAAAAAAewAAAAAAewAAAAAAawAAAAAAWwAAAAABWwAAAAAAWwAAAAABWwAAAAACWwAAAAACWwAAAAADWwAAAAABWwAAAAAAWwAAAAABewAAAAAAHQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAWwAAAAABWwAAAAACWwAAAAACWwAAAAACTwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAewAAAAAAHQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAawAAAAAAawAAAAAAawAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAewAAAAAAWwAAAAACewAAAAAAegAAAAAAegAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAWwAAAAAAewAAAAAAegAAAAAAegAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAWwAAAAADewAAAAAAegAAAAAAegAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAegAAAAAAewAAAAAATQAAAAAATQAAAAAATQAAAAAAZAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAA + tiles: ewAAAAAAewAAAAAAagAAAAAAagAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATQAAAAAATQAAAAAAewAAAAAAewAAAAAAagAAAAAAagAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATQAAAAAATQAAAAAAewAAAAAAewAAAAAATwAAAAAAagAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATQAAAAAATQAAAAAAHQAAAAACewAAAAAATwAAAAAAagAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAATQAAAAAATQAAAAAAHQAAAAACewAAAAAATwAAAAAAagAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAHQAAAAABewAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAewAAAAAAegAAAAAAegAAAAAAHQAAAAADewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAHQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAWwAAAAACWwAAAAACWwAAAAABWwAAAAACWwAAAAADWwAAAAABWwAAAAADWwAAAAADWwAAAAAAewAAAAAAHQAAAAABawAAAAAAewAAAAAAewAAAAAAewAAAAAAawAAAAAAWwAAAAADWwAAAAAAWwAAAAABWwAAAAACWwAAAAACWwAAAAADWwAAAAABWwAAAAAAWwAAAAABewAAAAAAHQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAWwAAAAAAWwAAAAAAWwAAAAABWwAAAAADTwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAewAAAAAAHQAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAawAAAAAAawAAAAAAawAAAAAAewAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAewAAAAAAWwAAAAACewAAAAAAegAAAAAAegAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAWwAAAAAAewAAAAAAegAAAAAAegAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAegAAAAAAWwAAAAADewAAAAAAegAAAAAAegAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAegAAAAAAewAAAAAATQAAAAAATQAAAAAATQAAAAAAZAAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAAegAAAAAAegAAAAAAewAAAAAAewAAAAAAewAAAAAAewAAAAAA version: 6 1,1: ind: 1,1 @@ -1811,31 +1811,31 @@ entities: color: '#FFFFFFFF' id: Arrows decals: - 1073: -12,-14 - 1074: -19,-14 + 1028: -12,-14 + 1029: -19,-14 - node: angle: -3.141592653589793 rad color: '#FFFFFFFF' id: Arrows decals: - 1159: -5,0 - 1160: -3,0 - 1519: 24,23 - 2421: 58,-2 - 2422: 60,-2 + 1114: -5,0 + 1115: -3,0 + 1474: 24,23 + 2376: 58,-2 + 2377: 60,-2 - node: color: '#FFFFFFFF' id: Arrows decals: - 798: 21,-16 - 1071: -13,-12 - 1072: -20,-12 + 753: 21,-16 + 1026: -13,-12 + 1027: -20,-12 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' id: Arrows decals: - 1629: 36,18 + 1584: 36,18 - node: color: '#FED83DFF' id: Bot @@ -1851,53 +1851,53 @@ entities: 200: 3,-7 243: 51,9 244: 49,9 - 409: 42,-39 - 410: 42,-38 - 411: 43,-38 - 412: 43,-39 - 413: 44,-39 - 414: 44,-38 - 415: 45,-39 - 416: 45,-38 - 465: 22,-35 - 466: 20,-35 - 467: 19,-35 - 1218: 15,-2 - 1219: 14,-2 - 1220: 13,-2 - 1267: 13,26 - 1268: 11,26 - 1269: 10,26 - 1270: 11,24 - 1271: 12,24 - 1272: 13,24 - 1273: 7,25 - 1368: 12,26 - 1511: 22,22 - 1512: 22,23 - 1513: 22,24 - 1514: 22,25 - 1515: 23,25 - 1626: 37,17 - 1627: 38,17 - 1628: 39,17 - 1840: 10,24 - 2130: 52,17 - 2131: 52,18 - 2244: 68,13 - 2245: 66,13 - 2246: 67,13 - 2609: 46,-46 - 2610: 46,-49 - 2611: 47,-49 - 2612: 48,-49 - 2613: 49,-49 - 2619: 44,-43 - 2620: 43,-43 - 2621: 42,-43 - 2622: 41,-43 - 2623: 38,-43 - 2624: 37,-43 + 405: 42,-39 + 406: 42,-38 + 407: 43,-38 + 408: 43,-39 + 409: 44,-39 + 410: 44,-38 + 411: 45,-39 + 412: 45,-38 + 453: 22,-35 + 454: 20,-35 + 455: 19,-35 + 1173: 15,-2 + 1174: 14,-2 + 1175: 13,-2 + 1222: 13,26 + 1223: 11,26 + 1224: 10,26 + 1225: 11,24 + 1226: 12,24 + 1227: 13,24 + 1228: 7,25 + 1323: 12,26 + 1466: 22,22 + 1467: 22,23 + 1468: 22,24 + 1469: 22,25 + 1470: 23,25 + 1581: 37,17 + 1582: 38,17 + 1583: 39,17 + 1795: 10,24 + 2085: 52,17 + 2086: 52,18 + 2199: 68,13 + 2200: 66,13 + 2201: 67,13 + 2564: 46,-46 + 2565: 46,-49 + 2566: 47,-49 + 2567: 48,-49 + 2568: 49,-49 + 2574: 44,-43 + 2575: 43,-43 + 2576: 42,-43 + 2577: 41,-43 + 2578: 38,-43 + 2579: 37,-43 - node: cleanable: True color: '#FFFFFFFF' @@ -1909,161 +1909,155 @@ entities: color: '#FFFFFFFF' id: BotGreyscale decals: - 1593: 14,39 - 1594: 13,40 - 1595: 14,41 - 1596: 15,40 - 1744: 28,44 - 1745: 26,44 + 1548: 14,39 + 1549: 13,40 + 1550: 14,41 + 1551: 15,40 + 1699: 28,44 + 1700: 26,44 - node: color: '#FFFFFFFF' id: BotLeft decals: 399: 10,-36 400: 10,-37 - 461: 22,-43 - 1918: 10,-6 - 1919: 11,-6 - 1920: 12,-6 - 2241: 68,16 - 2242: 67,16 - 2243: 66,16 + 450: 22,-43 + 1873: 10,-6 + 1874: 11,-6 + 1875: 12,-6 + 2196: 68,16 + 2197: 67,16 + 2198: 66,16 - node: color: '#FFFFFFFF' id: BotLeftGreyscale decals: - 1589: 15,41 - 1590: 13,39 - 1914: 8,-10 - 1915: 8,-9 + 1544: 15,41 + 1545: 13,39 + 1869: 8,-10 + 1870: 8,-9 - node: color: '#FFFFFFFF' id: BotRight decals: - 460: 20,-43 - 1921: 10,-9 - 1922: 11,-9 - 1923: 12,-9 + 449: 20,-43 + 1876: 10,-9 + 1877: 11,-9 + 1878: 12,-9 - node: color: '#FFFFFFFF' id: BotRightGreyscale decals: - 1591: 13,41 - 1592: 15,39 - 1916: 8,-8 - 1917: 8,-6 + 1546: 13,41 + 1547: 15,39 + 1871: 8,-8 + 1872: 8,-6 - node: color: '#FFFFFFFF' id: Box decals: - 459: 21,-43 + 448: 21,-43 - node: color: '#FFFFFFFF' id: BoxGreyscale decals: - 804: 16,-43 - 805: 17,-43 - 806: 25,-43 - 807: 26,-43 - 1597: 14,40 + 759: 16,-43 + 760: 17,-43 + 761: 25,-43 + 762: 26,-43 + 1552: 14,40 - node: color: '#FFFFFFFF' id: BrickTileDarkLineW decals: - 1826: 22,-13 - 1827: 22,-12 - 1828: 22,-11 - 1829: 22,-10 + 1781: 22,-13 + 1782: 22,-12 + 1783: 22,-11 + 1784: 22,-10 - node: color: '#FFFFFFFF' id: BrickTileSteelEndN decals: - 2472: 77,9 - 2473: 78,9 + 2427: 77,9 + 2428: 78,9 - node: color: '#FFFFFFFF' id: BrickTileSteelEndS decals: - 2474: 77,7 - 2475: 78,7 + 2429: 77,7 + 2430: 78,7 - node: color: '#D381C996' id: BrickTileSteelLineE decals: - 2237: 71,13 - 2238: 71,14 - 2239: 71,15 - 2240: 71,16 + 2192: 71,13 + 2193: 71,14 + 2194: 71,15 + 2195: 71,16 - node: color: '#FFFFFFFF' id: BrickTileSteelLineE decals: - 2476: 77,8 - 2477: 78,8 + 2431: 77,8 + 2432: 78,8 - node: color: '#FFFFFFFF' id: BrickTileSteelLineN decals: - 462: 30,-39 - 463: 29,-39 - 464: 28,-39 - 880: 46,-9 - 881: 47,-9 + 451: 30,-39 + 452: 28,-39 + 835: 46,-9 + 836: 47,-9 - node: color: '#D381C996' id: BrickTileSteelLineW decals: - 2233: 69,13 - 2234: 69,14 - 2235: 69,15 - 2236: 69,16 + 2188: 69,13 + 2189: 69,14 + 2190: 69,15 + 2191: 69,16 - node: color: '#FFFFFFFF' id: BrickTileSteelLineW decals: - 2478: 78,8 - 2479: 77,8 + 2433: 78,8 + 2434: 77,8 - node: color: '#334E6DC8' id: BrickTileWhiteCornerNe decals: - 1889: 17,-4 + 1844: 17,-4 - node: color: '#A4610696' id: BrickTileWhiteCornerNe decals: - 1492: 20,24 + 1447: 20,24 - node: color: '#DE3A3A96' id: BrickTileWhiteCornerNe decals: - 1619: 39,19 + 1574: 39,19 - node: color: '#EFCC4193' id: BrickTileWhiteCornerNe decals: 371: 27,-28 389: 13,-34 - - node: - color: '#EFCC4582' - id: BrickTileWhiteCornerNe - decals: - 406: 41,-39 - node: color: '#334E6DC8' id: BrickTileWhiteCornerNw decals: - 1894: 14,-4 + 1849: 14,-4 - node: color: '#A4610696' id: BrickTileWhiteCornerNw decals: - 1491: 17,24 + 1446: 17,24 - node: color: '#DE3A3A96' id: BrickTileWhiteCornerNw decals: - 1618: 36,19 + 1573: 36,19 - node: color: '#EFCC4193' id: BrickTileWhiteCornerNw @@ -2074,22 +2068,22 @@ entities: color: '#334E6DC8' id: BrickTileWhiteCornerSe decals: - 1888: 17,-6 + 1843: 17,-6 - node: color: '#9FED583B' id: BrickTileWhiteCornerSe decals: - 850: 47,-8 + 805: 47,-8 - node: color: '#A4610696' id: BrickTileWhiteCornerSe decals: - 1496: 20,20 + 1451: 20,20 - node: color: '#DE3A3A96' id: BrickTileWhiteCornerSe decals: - 1621: 39,17 + 1576: 39,17 - node: color: '#EFCC4193' id: BrickTileWhiteCornerSe @@ -2100,22 +2094,22 @@ entities: color: '#334E6DC8' id: BrickTileWhiteCornerSw decals: - 1890: 14,-6 + 1845: 14,-6 - node: color: '#9FED583B' id: BrickTileWhiteCornerSw decals: - 854: 41,-8 + 809: 41,-8 - node: color: '#A4610696' id: BrickTileWhiteCornerSw decals: - 1497: 17,20 + 1452: 17,20 - node: color: '#DE3A3A96' id: BrickTileWhiteCornerSw decals: - 1620: 36,17 + 1575: 36,17 - node: color: '#EFCC4193' id: BrickTileWhiteCornerSw @@ -2126,89 +2120,89 @@ entities: color: '#9FED5847' id: BrickTileWhiteEndE decals: - 861: 45,-6 + 816: 45,-6 - node: color: '#9FED5847' id: BrickTileWhiteEndN decals: - 879: 47,-4 + 834: 47,-4 - node: color: '#9FED5847' id: BrickTileWhiteEndW decals: - 862: 43,-6 + 817: 43,-6 - node: color: '#9FED5847' id: BrickTileWhiteInnerNe decals: - 871: 41,-8 + 826: 41,-8 - node: color: '#D381C996' id: BrickTileWhiteInnerNe decals: - 2134: 51,20 + 2089: 51,20 - node: color: '#EFCC4582' id: BrickTileWhiteInnerNe decals: - 408: 41,-40 + 404: 41,-40 - node: color: '#9FED5847' id: BrickTileWhiteInnerNw decals: - 870: 47,-8 + 825: 47,-8 - node: color: '#D381C996' id: BrickTileWhiteInnerNw decals: - 2133: 53,20 + 2088: 53,20 - node: color: '#D381C996' id: BrickTileWhiteInnerSe decals: - 2129: 50,19 + 2084: 50,19 - node: color: '#D381C996' id: BrickTileWhiteInnerSw decals: - 2128: 54,19 + 2083: 54,19 - node: color: '#334E6DC8' id: BrickTileWhiteLineE decals: - 1891: 17,-5 + 1846: 17,-5 - node: color: '#9FED583B' id: BrickTileWhiteLineE decals: - 851: 47,-7 - 852: 47,-6 - 853: 47,-5 + 806: 47,-7 + 807: 47,-6 + 808: 47,-5 - node: color: '#9FED5847' id: BrickTileWhiteLineE decals: - 872: 41,-7 - 873: 41,-6 - 874: 41,-5 - 875: 41,-4 + 827: 41,-7 + 828: 41,-6 + 829: 41,-5 + 830: 41,-4 - node: color: '#A4610696' id: BrickTileWhiteLineE decals: - 1493: 20,23 - 1494: 20,22 - 1495: 20,21 + 1448: 20,23 + 1449: 20,22 + 1450: 20,21 - node: color: '#D381C996' id: BrickTileWhiteLineE decals: - 2121: 50,17 - 2122: 50,18 - 2135: 51,21 - 2136: 56,17 - 2137: 56,19 - 2138: 56,20 + 2076: 50,17 + 2077: 50,18 + 2090: 51,21 + 2091: 56,17 + 2092: 56,19 + 2093: 56,20 - node: color: '#EFCC4193' id: BrickTileWhiteLineE @@ -2218,71 +2212,68 @@ entities: color: '#EFCC4582' id: BrickTileWhiteLineE decals: - 490: 17,-42 - 491: 17,-41 - 494: 26,-42 - 495: 26,-41 - 496: 26,-40 + 472: 26,-42 + 473: 26,-41 - node: color: '#334E6DC8' id: BrickTileWhiteLineN decals: - 1892: 16,-4 - 1893: 15,-4 + 1847: 16,-4 + 1848: 15,-4 - node: color: '#52B4E996' id: BrickTileWhiteLineN decals: - 1163: -13,-12 - 1164: -20,-12 - 1989: 32,36 + 1118: -13,-12 + 1119: -20,-12 + 1944: 32,36 - node: color: '#9FED5847' id: BrickTileWhiteLineN decals: - 863: 44,-6 - 865: 46,-8 - 866: 45,-8 - 867: 44,-8 - 868: 43,-8 - 869: 42,-8 - 882: 47,-9 - 883: 46,-9 + 818: 44,-6 + 820: 46,-8 + 821: 45,-8 + 822: 44,-8 + 823: 43,-8 + 824: 42,-8 + 837: 47,-9 + 838: 46,-9 - node: color: '#9FED5896' id: BrickTileWhiteLineN decals: - 2265: 80,-4 - 2266: 77,-4 + 2220: 80,-4 + 2221: 77,-4 - node: color: '#A4610696' id: BrickTileWhiteLineN decals: - 1503: 18,24 - 1504: 19,24 - 1991: 30,36 + 1458: 18,24 + 1459: 19,24 + 1946: 30,36 - node: color: '#D381C996' id: BrickTileWhiteLineN decals: - 1990: 31,36 - 2101: 52,14 - 2102: 51,14 - 2103: 50,14 - 2104: 49,14 - 2105: 48,14 - 2132: 52,20 - 2227: 66,15 - 2228: 67,15 - 2229: 68,15 + 1945: 31,36 + 2056: 52,14 + 2057: 51,14 + 2058: 50,14 + 2059: 49,14 + 2060: 48,14 + 2087: 52,20 + 2182: 66,15 + 2183: 67,15 + 2184: 68,15 - node: color: '#DE3A3A96' id: BrickTileWhiteLineN decals: - 1161: -3,1 - 1162: -5,1 - 1622: 38,19 - 1623: 37,19 + 1116: -3,1 + 1117: -5,1 + 1577: 38,19 + 1578: 37,19 - node: color: '#EFCC4193' id: BrickTileWhiteLineN @@ -2293,79 +2284,76 @@ entities: color: '#EFCC4582' id: BrickTileWhiteLineN decals: - 403: 38,-39 - 404: 39,-39 - 405: 40,-39 - 407: 42,-40 - 421: 43,-40 - 422: 44,-40 - 423: 45,-40 - 424: 46,-40 + 403: 42,-40 + 417: 43,-40 + 418: 44,-40 + 419: 45,-40 + 420: 46,-40 - node: color: '#FFFFFFFF' id: BrickTileWhiteLineN decals: - 2084: 50,13 - 2085: 49,13 - 2089: 51,13 + 2039: 50,13 + 2040: 49,13 + 2044: 51,13 - node: color: '#334E6DC8' id: BrickTileWhiteLineS decals: - 1896: 16,-6 - 1897: 15,-6 - 1986: 32,35 + 1851: 16,-6 + 1852: 15,-6 + 1941: 32,35 - node: color: '#9FED583B' id: BrickTileWhiteLineS decals: - 846: 46,-8 - 847: 45,-8 - 848: 44,-8 - 849: 43,-8 + 801: 46,-8 + 802: 45,-8 + 803: 44,-8 + 804: 43,-8 - node: color: '#9FED5847' id: BrickTileWhiteLineS decals: - 864: 44,-6 + 819: 44,-6 - node: color: '#9FED5896' id: BrickTileWhiteLineS decals: - 2264: 77,-6 + 2219: 77,-6 - node: color: '#A4610696' id: BrickTileWhiteLineS decals: - 1498: 19,20 - 1499: 18,20 + 1453: 19,20 + 1454: 18,20 - node: color: '#D381C996' id: BrickTileWhiteLineS decals: - 2096: 49,14 - 2097: 50,14 - 2098: 51,14 - 2099: 52,14 - 2100: 48,14 - 2123: 51,19 - 2124: 52,19 - 2125: 53,19 - 2230: 68,14 - 2231: 67,14 - 2232: 66,14 + 2051: 49,14 + 2052: 50,14 + 2053: 51,14 + 2054: 52,14 + 2055: 48,14 + 2078: 51,19 + 2079: 52,19 + 2080: 53,19 + 2185: 68,14 + 2186: 67,14 + 2187: 66,14 - node: color: '#DE3A3A96' id: BrickTileWhiteLineS decals: - 1624: 38,17 - 1625: 37,17 - 1987: 31,35 + 1579: 38,17 + 1580: 37,17 + 1942: 31,35 - node: color: '#EFB34196' id: BrickTileWhiteLineS decals: - 1988: 30,35 + 1943: 30,35 - node: color: '#EFCC4193' id: BrickTileWhiteLineS @@ -2377,53 +2365,53 @@ entities: color: '#FFFFFFFF' id: BrickTileWhiteLineS decals: - 2086: 51,15 - 2087: 50,15 - 2088: 49,15 + 2041: 51,15 + 2042: 50,15 + 2043: 49,15 - node: color: '#334E6DC8' id: BrickTileWhiteLineW decals: - 1895: 14,-5 + 1850: 14,-5 - node: color: '#9FED583B' id: BrickTileWhiteLineW decals: - 855: 41,-7 - 856: 41,-6 - 857: 41,-5 + 810: 41,-7 + 811: 41,-6 + 812: 41,-5 - node: color: '#9FED5847' id: BrickTileWhiteLineW decals: - 876: 47,-7 - 877: 47,-6 - 878: 47,-5 + 831: 47,-7 + 832: 47,-6 + 833: 47,-5 - node: color: '#9FED5896' id: BrickTileWhiteLineW decals: - 2271: 78,-2 - 2272: 78,-1 + 2226: 78,-2 + 2227: 78,-1 - node: color: '#A4610696' id: BrickTileWhiteLineW decals: - 1500: 17,21 - 1501: 17,22 - 1502: 17,23 - 1505: 22,20 - 1506: 22,21 - 1507: 22,22 - 1508: 22,23 - 1509: 22,24 - 1510: 22,25 + 1455: 17,21 + 1456: 17,22 + 1457: 17,23 + 1460: 22,20 + 1461: 22,21 + 1462: 22,22 + 1463: 22,23 + 1464: 22,24 + 1465: 22,25 - node: color: '#D381C996' id: BrickTileWhiteLineW decals: - 2126: 54,17 - 2127: 54,18 + 2081: 54,17 + 2082: 54,18 - node: color: '#EFCC4193' id: BrickTileWhiteLineW @@ -2434,28 +2422,28 @@ entities: color: '#EFCC4582' id: BrickTileWhiteLineW decals: - 492: 25,-42 - 493: 25,-41 - 497: 16,-41 - 498: 16,-40 + 470: 25,-42 + 471: 25,-41 + 474: 16,-41 + 475: 16,-40 - node: color: '#FFFFFFFF' id: BrickTileWhiteLineW decals: - 2269: 78,-2 - 2270: 78,-1 + 2224: 78,-2 + 2225: 78,-1 - node: color: '#FFFFFFFF' id: Caution decals: - 1138: -6,-18 - 1409: 9,27 + 1093: -6,-18 + 1364: 9,27 - node: cleanable: True color: '#FFFFFFFF' id: Caution decals: - 1408: 9,27 + 1363: 9,27 - node: color: '#52B4E996' id: CheckerNESW @@ -2523,99 +2511,99 @@ entities: color: '#9FED5896' id: CheckerNESW decals: - 2273: 80,-3 - 2274: 80,-2 - 2275: 81,-2 - 2276: 81,-3 - 2277: 81,-1 - 2278: 80,-1 - 2279: 76,-9 - 2280: 77,-9 - 2281: 77,-8 - 2282: 76,-8 - 2283: 76,-7 - 2284: 77,-7 + 2228: 80,-3 + 2229: 80,-2 + 2230: 81,-2 + 2231: 81,-3 + 2232: 81,-1 + 2233: 80,-1 + 2234: 76,-9 + 2235: 77,-9 + 2236: 77,-8 + 2237: 76,-8 + 2238: 76,-7 + 2239: 77,-7 - node: color: '#D4D4D428' id: CheckerNESW decals: - 962: 19,13 - 963: 19,14 - 964: 20,14 - 965: 20,13 - 966: 21,13 - 967: 21,14 - 968: 22,14 - 969: 22,13 + 917: 19,13 + 918: 19,14 + 919: 20,14 + 920: 20,13 + 921: 21,13 + 922: 21,14 + 923: 22,14 + 924: 22,13 - node: color: '#F9801D73' id: CheckerNESW decals: - 928: 20,9 - 929: 20,10 + 883: 20,9 + 884: 20,10 - node: color: '#9FED5822' id: CheckerNWSE decals: - 890: 42,-11 - 891: 42,-10 - 892: 43,-11 - 893: 43,-10 - 894: 44,-11 - 895: 44,-10 + 845: 42,-11 + 846: 42,-10 + 847: 43,-11 + 848: 43,-10 + 849: 44,-11 + 850: 44,-10 - node: color: '#9FED5896' id: CheckerNWSE decals: - 2267: 77,-2 - 2268: 77,-1 + 2222: 77,-2 + 2223: 77,-1 - node: color: '#A4610696' id: CheckerNWSE decals: - 1256: 13,30 - 1257: 13,31 - 1258: 12,31 - 1259: 12,30 - 1260: 11,30 - 1261: 11,31 + 1211: 13,30 + 1212: 13,31 + 1213: 12,31 + 1214: 12,30 + 1215: 11,30 + 1216: 11,31 - node: color: '#D381C996' id: CheckerNWSE decals: - 2081: 58,9 - 2082: 58,10 - 2083: 58,11 + 2036: 58,9 + 2037: 58,10 + 2038: 58,11 - node: color: '#EFCC4593' id: CheckerNWSE decals: - 802: 18,-18 - 803: 18,-17 + 757: 18,-18 + 758: 18,-17 - node: color: '#FFFFFF93' id: CheckerNWSE decals: - 808: 33,-10 - 809: 33,-11 - 810: 33,-12 - 811: 33,-13 - 812: 34,-13 - 813: 34,-12 - 814: 34,-11 - 815: 34,-10 - 816: 35,-10 - 817: 35,-11 - 818: 35,-12 - 819: 35,-13 - 820: 36,-13 - 821: 36,-12 - 822: 36,-11 - 823: 36,-10 - 824: 37,-10 - 825: 37,-11 - 826: 37,-12 - 827: 37,-13 + 763: 33,-10 + 764: 33,-11 + 765: 33,-12 + 766: 33,-13 + 767: 34,-13 + 768: 34,-12 + 769: 34,-11 + 770: 34,-10 + 771: 35,-10 + 772: 35,-11 + 773: 35,-12 + 774: 35,-13 + 775: 36,-13 + 776: 36,-12 + 777: 36,-11 + 778: 36,-10 + 779: 37,-10 + 780: 37,-11 + 781: 37,-12 + 782: 37,-13 - node: color: '#FFFFFFFF' id: Delivery @@ -2629,61 +2617,61 @@ entities: 241: 51,8 242: 49,8 385: 5,-7 - 417: 46,-39 - 418: 46,-38 - 419: 39,-41 - 420: 41,-41 - 455: 16,-39 - 456: 17,-39 - 457: 25,-39 - 458: 26,-39 - 1049: 25,-3 - 1050: 26,-3 - 1051: 27,-3 - 1062: 24,13 - 1063: 24,14 - 1064: 19,11 - 1065: 18,11 - 1066: 25,16 - 1067: 26,16 - 1068: 27,16 - 1069: 33,-2 - 1070: 35,-2 - 1142: -8,-15 - 1143: -8,-14 - 1144: -8,-13 - 1165: 2,-2 - 1166: 2,-1 - 1167: 2,0 - 1224: 16,-2 - 1225: 17,-1 - 1226: 17,0 - 1227: 17,1 - 1274: 7,24 - 1275: 7,26 - 1739: 40,12 - 1740: 41,12 - 1741: 42,12 - 1816: 39,-1 - 1817: 39,0 - 1818: 39,1 - 1819: 40,2 - 1820: 41,2 - 1821: 42,2 - 1981: 7,9 - 1982: 7,10 - 1983: 38,13 - 1984: 38,14 - 1985: 38,15 - 2106: 53,13 - 2107: 53,14 - 2108: 53,15 - 2141: 58,16 - 2142: 59,16 - 2143: 60,16 - 2144: 58,21 - 2145: 59,21 - 2146: 60,21 + 413: 46,-39 + 414: 46,-38 + 415: 39,-41 + 416: 41,-41 + 445: 16,-39 + 446: 17,-39 + 447: 25,-39 + 1004: 25,-3 + 1005: 26,-3 + 1006: 27,-3 + 1017: 24,13 + 1018: 24,14 + 1019: 19,11 + 1020: 18,11 + 1021: 25,16 + 1022: 26,16 + 1023: 27,16 + 1024: 33,-2 + 1025: 35,-2 + 1097: -8,-15 + 1098: -8,-14 + 1099: -8,-13 + 1120: 2,-2 + 1121: 2,-1 + 1122: 2,0 + 1179: 16,-2 + 1180: 17,-1 + 1181: 17,0 + 1182: 17,1 + 1229: 7,24 + 1230: 7,26 + 1694: 40,12 + 1695: 41,12 + 1696: 42,12 + 1771: 39,-1 + 1772: 39,0 + 1773: 39,1 + 1774: 40,2 + 1775: 41,2 + 1776: 42,2 + 1936: 7,9 + 1937: 7,10 + 1938: 38,13 + 1939: 38,14 + 1940: 38,15 + 2061: 53,13 + 2062: 53,14 + 2063: 53,15 + 2096: 58,16 + 2097: 59,16 + 2098: 60,16 + 2099: 58,21 + 2100: 59,21 + 2101: 60,21 + 2599: 26,-39 - node: cleanable: True color: '#FFFFFFFF' @@ -2705,147 +2693,145 @@ entities: color: '#FFFFFFFF' id: DeliveryGreyscale decals: - 2109: 52,14 - 2110: 48,14 + 2064: 52,14 + 2065: 48,14 - node: cleanable: True color: '#FFFFFFFF' id: Dirt decals: - 442: 41,-39 - 443: 39,-39 - 444: 46,-40 - 445: 45,-40 - 446: 44,-40 - 447: 44,-41 - 448: 43,-41 - 449: 42,-38 - 450: 43,-39 - 736: 30,-31 - 737: 29,-31 - 738: 30,-32 - 739: 30,-33 - 740: 29,-33 - 741: 29,-32 - 742: 28,-32 - 743: 31,-32 - 744: 32,-31 - 745: 27,-34 - 746: 27,-33 - 747: 26,-33 - 748: 25,-34 - 749: 24,-32 - 750: 23,-32 - 751: 22,-31 - 752: 22,-33 - 753: 24,-33 - 896: 43,-11 - 897: 42,-10 - 898: 30,-13 - 899: 29,-11 - 1060: 21,-31 - 1061: 21,-31 - 1196: -4,-6 - 1197: -4,-5 - 1198: -4,-4 - 1199: -4,-5 - 1279: 6,30 - 1280: 7,31 - 1281: 6,32 - 1282: 9,30 - 1283: 9,29 - 1391: 15,20 - 1392: 14,20 - 1393: 13,23 - 1394: 12,23 - 1395: 11,23 - 1396: 7,22 - 1397: 7,21 - 1398: 10,25 - 1399: 9,27 - 1400: 7,28 - 1401: 13,28 - 1402: 11,28 - 1403: 15,24 - 1404: 12,24 - 1405: 7,24 - 1406: 5,24 - 1407: 7,23 - 1416: 8,17 - 1417: 7,16 - 1418: 5,16 - 1419: 8,18 - 1484: 11,24 - 1485: 10,26 - 1486: 7,25 - 1526: 17,21 - 1527: 18,22 - 1528: 18,23 - 1529: 19,20 - 1564: 22,20 - 1565: 22,25 - 1566: 24,20 - 1567: 24,23 - 1568: 23,24 - 1569: 23,22 - 1570: 23,23 - 1571: 23,21 - 1572: 15,23 - 1573: 14,23 - 1574: 13,24 - 1598: 39,30 - 1599: 40,31 - 1600: 39,33 - 1601: 38,33 - 1602: 37,35 - 1603: 39,35 - 1604: 41,33 - 1605: 40,33 - 1668: 32,17 - 1669: 32,18 - 1670: 33,17 - 1671: 35,20 - 1672: 35,21 - 1673: 33,23 - 1674: 34,24 - 1675: 33,27 - 1676: 32,29 - 1677: 32,30 - 1678: 30,23 - 1679: 30,18 - 1680: 29,17 - 1681: 29,20 - 1682: 30,20 - 1698: 25,18 - 1699: 25,19 - 1700: 25,20 - 1701: 25,22 - 1702: 27,20 - 1703: 25,23 - 1704: 25,24 - 1705: 26,24 - 1706: 27,23 - 1707: 25,25 - 1708: 27,26 - 1844: 8,21 - 1845: 9,21 - 1846: 9,22 - 1847: 9,23 - 1848: 10,23 - 1849: 10,22 - 1850: 8,24 - 1851: 9,24 - 2301: 55,-16 - 2302: 55,-16 - 2303: 56,-16 - 2304: 56,-15 - 2315: 55,-14 - 2316: 57,-16 - 2317: 57,-15 - 2350: 32,-18 - 2351: 33,-17 - 2352: 31,-16 - 2353: 29,-17 + 434: 46,-40 + 435: 45,-40 + 436: 44,-40 + 437: 44,-41 + 438: 43,-41 + 439: 42,-38 + 440: 43,-39 + 691: 30,-31 + 692: 29,-31 + 693: 30,-32 + 694: 30,-33 + 695: 29,-33 + 696: 29,-32 + 697: 28,-32 + 698: 31,-32 + 699: 32,-31 + 700: 27,-34 + 701: 27,-33 + 702: 26,-33 + 703: 25,-34 + 704: 24,-32 + 705: 23,-32 + 706: 22,-31 + 707: 22,-33 + 708: 24,-33 + 851: 43,-11 + 852: 42,-10 + 853: 30,-13 + 854: 29,-11 + 1015: 21,-31 + 1016: 21,-31 + 1151: -4,-6 + 1152: -4,-5 + 1153: -4,-4 + 1154: -4,-5 + 1234: 6,30 + 1235: 7,31 + 1236: 6,32 + 1237: 9,30 + 1238: 9,29 + 1346: 15,20 + 1347: 14,20 + 1348: 13,23 + 1349: 12,23 + 1350: 11,23 + 1351: 7,22 + 1352: 7,21 + 1353: 10,25 + 1354: 9,27 + 1355: 7,28 + 1356: 13,28 + 1357: 11,28 + 1358: 15,24 + 1359: 12,24 + 1360: 7,24 + 1361: 5,24 + 1362: 7,23 + 1371: 8,17 + 1372: 7,16 + 1373: 5,16 + 1374: 8,18 + 1439: 11,24 + 1440: 10,26 + 1441: 7,25 + 1481: 17,21 + 1482: 18,22 + 1483: 18,23 + 1484: 19,20 + 1519: 22,20 + 1520: 22,25 + 1521: 24,20 + 1522: 24,23 + 1523: 23,24 + 1524: 23,22 + 1525: 23,23 + 1526: 23,21 + 1527: 15,23 + 1528: 14,23 + 1529: 13,24 + 1553: 39,30 + 1554: 40,31 + 1555: 39,33 + 1556: 38,33 + 1557: 37,35 + 1558: 39,35 + 1559: 41,33 + 1560: 40,33 + 1623: 32,17 + 1624: 32,18 + 1625: 33,17 + 1626: 35,20 + 1627: 35,21 + 1628: 33,23 + 1629: 34,24 + 1630: 33,27 + 1631: 32,29 + 1632: 32,30 + 1633: 30,23 + 1634: 30,18 + 1635: 29,17 + 1636: 29,20 + 1637: 30,20 + 1653: 25,18 + 1654: 25,19 + 1655: 25,20 + 1656: 25,22 + 1657: 27,20 + 1658: 25,23 + 1659: 25,24 + 1660: 26,24 + 1661: 27,23 + 1662: 25,25 + 1663: 27,26 + 1799: 8,21 + 1800: 9,21 + 1801: 9,22 + 1802: 9,23 + 1803: 10,23 + 1804: 10,22 + 1805: 8,24 + 1806: 9,24 + 2256: 55,-16 + 2257: 55,-16 + 2258: 56,-16 + 2259: 56,-15 + 2270: 55,-14 + 2271: 57,-16 + 2272: 57,-15 + 2305: 32,-18 + 2306: 33,-17 + 2307: 31,-16 + 2308: 29,-17 - node: cleanable: True color: '#FFFFFFFF' @@ -2856,26 +2842,25 @@ entities: 288: 28,-34 289: 28,-33 290: 31,-33 - 431: 40,-41 - 432: 40,-40 - 433: 38,-39 - 434: 41,-40 - 508: 24,-37 - 509: 30,-37 - 510: 31,-36 - 663: 18,-31 - 664: 19,-29 - 1284: 8,29 - 1285: 8,31 - 1369: 12,22 - 1370: 8,20 - 1420: 7,17 - 1421: 8,16 - 1422: 9,19 - 1530: 18,21 - 1552: 23,23 - 1606: 39,32 - 2305: 55,-15 + 426: 40,-41 + 427: 40,-40 + 428: 41,-40 + 482: 24,-37 + 483: 30,-37 + 484: 31,-36 + 618: 18,-31 + 619: 19,-29 + 1239: 8,29 + 1240: 8,31 + 1324: 12,22 + 1325: 8,20 + 1375: 7,17 + 1376: 8,16 + 1377: 9,19 + 1485: 18,21 + 1507: 23,23 + 1561: 39,32 + 2260: 55,-15 - node: cleanable: True color: '#FFFFFFFF' @@ -2888,300 +2873,293 @@ entities: 295: 23,-31 296: 23,-33 297: 31,-31 - 435: 41,-39 - 436: 38,-40 - 437: 42,-41 - 438: 42,-40 - 439: 46,-41 - 440: 44,-39 - 441: 43,-40 - 500: 19,-42 - 501: 19,-41 - 502: 21,-39 - 511: 31,-37 - 515: 32,-36 - 516: 32,-35 - 517: 29,-36 - 518: 29,-37 - 519: 27,-37 - 520: 27,-36 - 521: 25,-37 - 522: 25,-36 - 523: 24,-36 - 524: 23,-37 - 525: 22,-37 - 526: 20,-37 - 527: 17,-36 - 528: 18,-35 - 529: 18,-34 - 530: 16,-42 - 531: 17,-42 - 665: 18,-29 - 666: 19,-28 - 667: 20,-29 - 668: 22,-29 - 669: 21,-29 - 670: 22,-28 - 671: 20,-27 - 672: 21,-26 - 673: 21,-27 - 674: 20,-26 - 675: 14,-27 - 676: 15,-26 - 677: 13,-25 - 678: 15,-27 - 679: 15,-28 - 680: 15,-28 - 681: 16,-29 - 682: 16,-25 - 683: 26,-29 - 684: 26,-28 - 685: 27,-29 - 686: 15,-37 - 687: 16,-37 - 688: 15,-34 - 1290: 9,31 - 1291: 7,32 - 1292: 9,32 - 1293: 6,31 - 1294: 8,29 - 1295: 9,28 - 1296: 10,27 - 1297: 10,28 - 1377: 13,25 - 1378: 11,25 - 1379: 12,27 - 1380: 11,26 - 1381: 12,22 - 1382: 13,23 - 1383: 14,24 - 1384: 15,23 - 1385: 15,22 - 1386: 15,21 - 1387: 14,22 - 1388: 15,21 - 1389: 15,20 - 1390: 14,21 - 1425: 7,16 - 1426: 9,17 - 1427: 9,16 - 1428: 9,15 - 1429: 7,15 - 1430: 9,18 - 1431: 7,19 - 1432: 7,19 - 1433: 8,18 - 1434: 9,17 - 1435: 9,16 - 1537: 18,24 - 1538: 17,23 - 1539: 19,23 - 1540: 20,21 - 1541: 20,20 - 1542: 20,20 - 1543: 17,20 - 1544: 17,21 - 1545: 18,20 - 1546: 16,20 - 1547: 16,22 - 1548: 20,20 - 1549: 21,21 - 1550: 22,20 - 1553: 23,20 - 1554: 24,21 - 1555: 22,21 - 1556: 22,22 - 1557: 24,22 - 1558: 23,24 - 1559: 24,24 - 1560: 24,25 - 1561: 23,23 - 1562: 23,22 - 1563: 22,25 - 1611: 38,35 - 1612: 36,35 - 1613: 38,36 - 1614: 37,34 - 1615: 40,32 - 1616: 40,31 - 1617: 40,30 - 1683: 30,17 - 1684: 30,21 - 1685: 33,18 - 1686: 35,19 - 1687: 34,23 - 1688: 33,25 - 1689: 35,23 - 1690: 30,24 - 1691: 29,23 - 1692: 35,28 - 1693: 34,27 - 1694: 33,30 - 1695: 33,29 - 1696: 37,30 - 1697: 36,22 - 1709: 25,21 - 1710: 26,22 - 1711: 26,23 - 1712: 27,20 - 1713: 26,19 - 1714: 25,15 - 1833: 25,27 - 1834: 26,28 - 1835: 27,30 - 1836: 25,32 - 1837: 25,33 - 1838: 26,34 - 1839: 27,34 - 1852: 9,21 - 1853: 10,22 - 1854: 7,21 - 1855: 8,22 - 1856: 8,24 - 2308: 55,-15 - 2309: 55,-14 - 2310: 54,-14 - 2311: 55,-16 - 2312: 57,-16 - 2313: 57,-15 - 2314: 57,-14 + 429: 42,-41 + 430: 42,-40 + 431: 46,-41 + 432: 44,-39 + 433: 43,-40 + 477: 21,-39 + 485: 31,-37 + 489: 32,-36 + 490: 32,-35 + 491: 29,-36 + 492: 29,-37 + 493: 27,-37 + 494: 27,-36 + 495: 25,-37 + 496: 25,-36 + 497: 24,-36 + 498: 23,-37 + 499: 22,-37 + 500: 20,-37 + 501: 17,-36 + 502: 18,-35 + 503: 18,-34 + 504: 16,-42 + 620: 18,-29 + 621: 19,-28 + 622: 20,-29 + 623: 22,-29 + 624: 21,-29 + 625: 22,-28 + 626: 20,-27 + 627: 21,-26 + 628: 21,-27 + 629: 20,-26 + 630: 14,-27 + 631: 15,-26 + 632: 13,-25 + 633: 15,-27 + 634: 15,-28 + 635: 15,-28 + 636: 16,-29 + 637: 16,-25 + 638: 26,-29 + 639: 26,-28 + 640: 27,-29 + 641: 15,-37 + 642: 16,-37 + 643: 15,-34 + 1245: 9,31 + 1246: 7,32 + 1247: 9,32 + 1248: 6,31 + 1249: 8,29 + 1250: 9,28 + 1251: 10,27 + 1252: 10,28 + 1332: 13,25 + 1333: 11,25 + 1334: 12,27 + 1335: 11,26 + 1336: 12,22 + 1337: 13,23 + 1338: 14,24 + 1339: 15,23 + 1340: 15,22 + 1341: 15,21 + 1342: 14,22 + 1343: 15,21 + 1344: 15,20 + 1345: 14,21 + 1380: 7,16 + 1381: 9,17 + 1382: 9,16 + 1383: 9,15 + 1384: 7,15 + 1385: 9,18 + 1386: 7,19 + 1387: 7,19 + 1388: 8,18 + 1389: 9,17 + 1390: 9,16 + 1492: 18,24 + 1493: 17,23 + 1494: 19,23 + 1495: 20,21 + 1496: 20,20 + 1497: 20,20 + 1498: 17,20 + 1499: 17,21 + 1500: 18,20 + 1501: 16,20 + 1502: 16,22 + 1503: 20,20 + 1504: 21,21 + 1505: 22,20 + 1508: 23,20 + 1509: 24,21 + 1510: 22,21 + 1511: 22,22 + 1512: 24,22 + 1513: 23,24 + 1514: 24,24 + 1515: 24,25 + 1516: 23,23 + 1517: 23,22 + 1518: 22,25 + 1566: 38,35 + 1567: 36,35 + 1568: 38,36 + 1569: 37,34 + 1570: 40,32 + 1571: 40,31 + 1572: 40,30 + 1638: 30,17 + 1639: 30,21 + 1640: 33,18 + 1641: 35,19 + 1642: 34,23 + 1643: 33,25 + 1644: 35,23 + 1645: 30,24 + 1646: 29,23 + 1647: 35,28 + 1648: 34,27 + 1649: 33,30 + 1650: 33,29 + 1651: 37,30 + 1652: 36,22 + 1664: 25,21 + 1665: 26,22 + 1666: 26,23 + 1667: 27,20 + 1668: 26,19 + 1669: 25,15 + 1788: 25,27 + 1789: 26,28 + 1790: 27,30 + 1791: 25,32 + 1792: 25,33 + 1793: 26,34 + 1794: 27,34 + 1807: 9,21 + 1808: 10,22 + 1809: 7,21 + 1810: 8,22 + 1811: 8,24 + 2263: 55,-15 + 2264: 55,-14 + 2265: 54,-14 + 2266: 55,-16 + 2267: 57,-16 + 2268: 57,-15 + 2269: 57,-14 - node: cleanable: True color: '#FFFFFFFF' id: DirtMedium decals: - 425: 38,-41 - 426: 39,-40 - 427: 40,-39 - 428: 45,-41 - 429: 45,-39 - 430: 43,-38 - 503: 17,-41 - 504: 23,-39 - 505: 21,-37 - 506: 18,-36 - 507: 26,-36 - 512: 31,-35 - 513: 30,-36 - 514: 28,-37 - 659: 21,-28 - 660: 14,-26 - 661: 13,-25 - 662: 25,-29 - 1286: 8,30 - 1287: 7,30 - 1288: 7,31 - 1289: 8,32 - 1371: 13,22 - 1372: 13,21 - 1373: 11,22 - 1374: 8,26 - 1375: 12,25 - 1376: 11,27 - 1423: 7,18 - 1424: 8,19 - 1531: 18,20 - 1532: 19,21 - 1533: 19,22 - 1534: 17,22 - 1535: 19,23 - 1536: 17,24 - 1551: 23,21 - 1607: 39,30 - 1608: 37,33 - 1609: 37,34 - 1610: 39,34 - 2306: 56,-14 - 2307: 55,-16 + 421: 38,-41 + 422: 39,-40 + 423: 45,-41 + 424: 45,-39 + 425: 43,-38 + 478: 23,-39 + 479: 21,-37 + 480: 18,-36 + 481: 26,-36 + 486: 31,-35 + 487: 30,-36 + 488: 28,-37 + 614: 21,-28 + 615: 14,-26 + 616: 13,-25 + 617: 25,-29 + 1241: 8,30 + 1242: 7,30 + 1243: 7,31 + 1244: 8,32 + 1326: 13,22 + 1327: 13,21 + 1328: 11,22 + 1329: 8,26 + 1330: 12,25 + 1331: 11,27 + 1378: 7,18 + 1379: 8,19 + 1486: 18,20 + 1487: 19,21 + 1488: 19,22 + 1489: 17,22 + 1490: 19,23 + 1491: 17,24 + 1506: 23,21 + 1562: 39,30 + 1563: 37,33 + 1564: 37,34 + 1565: 39,34 + 2261: 56,-14 + 2262: 55,-16 - node: color: '#FFFFFFFF' id: FlowersBRThree decals: - 844: 46.966167,-9.531703 + 799: 46.966167,-9.531703 - node: color: '#FFFFFFFF' id: FlowersBRTwo decals: - 845: 46.013042,-9.281703 + 800: 46.013042,-9.281703 - node: color: '#FFFFFFFF' id: Flowersy1 decals: - 843: 46.528667,-10.391078 + 798: 46.528667,-10.391078 - node: color: '#FFFFFFFF' id: Flowersy4 decals: - 842: 45.934917,-10.937953 + 797: 45.934917,-10.937953 - node: color: '#00000026' id: FullTileOverlayGreyscale decals: - 994: 24,-6 - 995: 24,-6 - 996: 24,-5 - 997: 24,-5 + 949: 24,-6 + 950: 24,-6 + 951: 24,-5 + 952: 24,-5 - node: color: '#0000004D' id: FullTileOverlayGreyscale decals: - 1575: 24,17 - 1576: 24,17 - 1577: 24,18 - 1578: 24,18 + 1530: 24,17 + 1531: 24,17 + 1532: 24,18 + 1533: 24,18 - node: color: '#9FED581F' id: FullTileOverlayGreyscale decals: - 1753: 31,48 - 1754: 32,48 - 1755: 29,48 - 1756: 30,48 + 1708: 31,48 + 1709: 32,48 + 1710: 29,48 + 1711: 30,48 - node: color: '#9FED5834' id: FullTileOverlayGreyscale decals: - 860: 42,-9 - 884: 42,-11 - 885: 42,-10 - 886: 43,-10 - 887: 43,-11 - 888: 44,-11 - 889: 44,-10 + 815: 42,-9 + 839: 42,-11 + 840: 42,-10 + 841: 43,-10 + 842: 43,-11 + 843: 44,-11 + 844: 44,-10 - node: color: '#9FED5896' id: FullTileOverlayGreyscale decals: - 2344: 53,-2 - 2345: 53,0 - 2382: 68,5 - 2383: 68,6 - 2445: 68,4 - 2446: 68,3 + 2299: 53,-2 + 2300: 53,0 + 2337: 68,5 + 2338: 68,6 + 2400: 68,4 + 2401: 68,3 - node: color: '#A4610696' id: FullTileOverlayGreyscale decals: - 1277: 8,29 - 1278: 9,29 - 1487: 16,20 - 1488: 16,22 - 1489: 21,20 - 1490: 21,21 + 1232: 8,29 + 1233: 9,29 + 1442: 16,20 + 1443: 16,22 + 1444: 21,20 + 1445: 21,21 - node: color: '#D4D4D40C' id: FullTileOverlayGreyscale decals: - 1742: 28,44 - 1743: 26,44 + 1697: 28,44 + 1698: 26,44 - node: color: '#DE3A3A31' id: FullTileOverlayGreyscale decals: - 1757: 25,48 - 1758: 24,48 - 1759: 23,48 - 1760: 22,48 + 1712: 25,48 + 1713: 24,48 + 1714: 23,48 + 1715: 22,48 - node: color: '#DE3A3A96' id: FullTileOverlayGreyscale @@ -3194,13 +3172,13 @@ entities: 64: 32,27 92: 31,18 93: 31,20 - 1658: 27,23 - 1659: 27,24 + 1613: 27,23 + 1614: 27,24 - node: color: '#EFCC4125' id: FullTileOverlayGreyscale decals: - 1059: 21,-31 + 1014: 21,-31 - node: color: '#EFCC4193' id: FullTileOverlayGreyscale @@ -3253,24 +3231,24 @@ entities: color: '#FFFFFFFF' id: Grassd1 decals: - 839: 46.966167,-10.031703 + 794: 46.966167,-10.031703 - node: color: '#FFFFFFFF' id: Grassd3 decals: - 841: 46.075542,-9.266078 + 796: 46.075542,-9.266078 - node: color: '#FFFFFFFF' id: Grasse1 decals: - 840: 46.950542,-9.281703 + 795: 46.950542,-9.281703 - node: color: '#FFFFFFFF' id: Grasse3 decals: - 836: 46.966167,-10.891078 - 837: 46.091167,-10.859828 - 838: 46.263042,-10.062953 + 791: 46.966167,-10.891078 + 792: 46.091167,-10.859828 + 793: 46.263042,-10.062953 - node: color: '#334E6DC8' id: HalfTileOverlayGreyscale @@ -3278,67 +3256,67 @@ entities: 229: 27,46 230: 28,46 231: 26,46 - 1768: 26,37 - 1769: 27,37 - 1770: 28,37 - 1771: 27,36 - 1772: 27,35 - 1908: 10,-6 - 1909: 11,-6 - 1910: 12,-6 + 1723: 26,37 + 1724: 27,37 + 1725: 28,37 + 1726: 27,36 + 1727: 27,35 + 1863: 10,-6 + 1864: 11,-6 + 1865: 12,-6 - node: color: '#52B4E996' id: HalfTileOverlayGreyscale decals: - 2457: 50,4 - 2495: 74,8 - 2496: 73,8 - 2497: 71,8 - 2498: 72,8 + 2412: 50,4 + 2450: 74,8 + 2451: 73,8 + 2452: 71,8 + 2453: 72,8 - node: color: '#9FED5847' id: HalfTileOverlayGreyscale decals: - 1749: 34,46 - 1750: 33,46 - 1751: 31,47 - 1752: 30,47 + 1704: 34,46 + 1705: 33,46 + 1706: 31,47 + 1707: 30,47 - node: color: '#9FED5896' id: HalfTileOverlayGreyscale decals: - 1804: 48,0 - 1805: 49,0 - 1806: 50,0 - 1807: 51,0 - 2249: 78,-4 - 2250: 79,-4 - 2251: 81,-4 - 2358: 77,5 - 2363: 79,2 - 2364: 80,2 - 2365: 81,2 - 2376: 75,2 - 2377: 74,2 - 2378: 73,2 - 2379: 72,2 - 2380: 70,2 - 2381: 69,2 - 2447: 68,2 - 2449: 57,3 - 2450: 55,3 - 2451: 54,3 + 1759: 48,0 + 1760: 49,0 + 1761: 50,0 + 1762: 51,0 + 2204: 78,-4 + 2205: 79,-4 + 2206: 81,-4 + 2313: 77,5 + 2318: 79,2 + 2319: 80,2 + 2320: 81,2 + 2331: 75,2 + 2332: 74,2 + 2333: 73,2 + 2334: 72,2 + 2335: 70,2 + 2336: 69,2 + 2402: 68,2 + 2404: 57,3 + 2405: 55,3 + 2406: 54,3 - node: color: '#A4610696' id: HalfTileOverlayGreyscale decals: 187: 7,19 188: 9,19 - 1240: 10,28 - 1241: 9,28 - 1242: 8,28 - 1249: 14,25 - 1253: 11,28 + 1195: 10,28 + 1196: 9,28 + 1197: 8,28 + 1204: 14,25 + 1208: 11,28 - node: color: '#D0B78BFF' id: HalfTileOverlayGreyscale @@ -3355,24 +3333,24 @@ entities: 26: 62,25 27: 63,25 28: 64,25 - 2111: 53,11 - 2112: 52,11 - 2113: 51,11 - 2114: 50,11 - 2115: 48,11 - 2116: 49,11 - 2117: 55,11 + 2066: 53,11 + 2067: 52,11 + 2068: 51,11 + 2069: 50,11 + 2070: 48,11 + 2071: 49,11 + 2072: 55,11 - node: color: '#D4D4D428' id: HalfTileOverlayGreyscale decals: - 1045: 26,-4 + 1000: 26,-4 - node: color: '#DE3A3A47' id: HalfTileOverlayGreyscale decals: - 1762: 24,47 - 1763: 23,47 + 1717: 24,47 + 1718: 23,47 - node: color: '#DE3A3A96' id: HalfTileOverlayGreyscale @@ -3386,13 +3364,13 @@ entities: 94: 36,31 95: 37,31 178: 36,24 - 1194: -2,-4 + 1149: -2,-4 - node: color: '#EFB34128' id: HalfTileOverlayGreyscale decals: - 1766: 20,46 - 1767: 21,46 + 1721: 20,46 + 1722: 21,46 - node: color: '#EFCC4193' id: HalfTileOverlayGreyscale @@ -3419,63 +3397,63 @@ entities: color: '#EFCC4582' id: HalfTileOverlayGreyscale decals: - 477: 20,-39 - 478: 22,-39 + 463: 20,-39 + 464: 22,-39 - node: color: '#334E6DC8' id: HalfTileOverlayGreyscale180 decals: - 1951: 10,-2 - 1952: 11,-2 - 1953: 12,-2 + 1906: 10,-2 + 1907: 11,-2 + 1908: 12,-2 - node: color: '#52B4E996' id: HalfTileOverlayGreyscale180 decals: - 1812: 50,1 - 2482: 71,4 - 2491: 73,4 - 2492: 72,4 + 1767: 50,1 + 2437: 71,4 + 2446: 73,4 + 2447: 72,4 - node: color: '#9FED5834' id: HalfTileOverlayGreyscale180 decals: - 1911: 12,-9 - 1912: 10,-9 - 1913: 11,-9 + 1866: 12,-9 + 1867: 10,-9 + 1868: 11,-9 - node: color: '#9FED5837' id: HalfTileOverlayGreyscale180 decals: - 921: 46,-2 - 922: 45,-2 - 923: 44,-2 - 924: 43,-2 - 925: 42,-2 + 876: 46,-2 + 877: 45,-2 + 878: 44,-2 + 879: 43,-2 + 880: 42,-2 - node: color: '#9FED5896' id: HalfTileOverlayGreyscale180 decals: - 2257: 81,-8 - 2258: 80,-8 - 2259: 79,-8 - 2348: 53,2 - 2366: 81,1 - 2367: 80,1 - 2368: 79,1 - 2369: 78,1 - 2370: 76,1 - 2371: 75,1 - 2372: 74,1 - 2373: 73,1 - 2374: 70,1 - 2375: 71,1 - 2388: 68,0 - 2389: 67,0 - 2390: 66,0 - 2391: 64,0 - 2392: 63,0 - 2404: 60,-8 + 2212: 81,-8 + 2213: 80,-8 + 2214: 79,-8 + 2303: 53,2 + 2321: 81,1 + 2322: 80,1 + 2323: 79,1 + 2324: 78,1 + 2325: 76,1 + 2326: 75,1 + 2327: 74,1 + 2328: 73,1 + 2329: 70,1 + 2330: 71,1 + 2343: 68,0 + 2344: 67,0 + 2345: 66,0 + 2346: 64,0 + 2347: 63,0 + 2359: 60,-8 - node: color: '#A4610696' id: HalfTileOverlayGreyscale180 @@ -3483,10 +3461,10 @@ entities: 183: 8,15 184: 7,15 192: 9,15 - 1250: 12,21 - 1251: 11,21 - 1252: 10,21 - 1842: 9,21 + 1205: 12,21 + 1206: 11,21 + 1207: 10,21 + 1797: 9,21 - node: color: '#D0B78BFF' id: HalfTileOverlayGreyscale180 @@ -3502,7 +3480,7 @@ entities: color: '#D4D4D428' id: HalfTileOverlayGreyscale180 decals: - 1046: 26,-2 + 1001: 26,-2 - node: color: '#DE3A3A96' id: HalfTileOverlayGreyscale180 @@ -3516,7 +3494,7 @@ entities: 91: 34,17 96: 36,30 99: 37,30 - 1195: -2,-6 + 1150: -2,-6 - node: color: '#EFCC4193' id: HalfTileOverlayGreyscale180 @@ -3539,48 +3517,48 @@ entities: color: '#EFCC4582' id: HalfTileOverlayGreyscale180 decals: - 474: 20,-44 - 475: 21,-44 - 476: 22,-44 + 460: 20,-44 + 461: 21,-44 + 462: 22,-44 - node: color: '#34A2C0B2' id: HalfTileOverlayGreyscale270 decals: - 959: 18,6 - 960: 18,7 - 961: 18,8 + 914: 18,6 + 915: 18,7 + 916: 18,8 - node: color: '#52B4E996' id: HalfTileOverlayGreyscale270 decals: 102: 49,3 103: 49,2 - 2436: 55,-6 - 2441: 55,-4 - 2484: 70,5 - 2485: 70,6 - 2486: 70,7 + 2391: 55,-6 + 2396: 55,-4 + 2439: 70,5 + 2440: 70,6 + 2441: 70,7 - node: color: '#9FED5896' id: HalfTileOverlayGreyscale270 decals: - 2248: 76,-5 - 2262: 78,-7 - 2340: 52,3 - 2341: 54,-2 - 2342: 54,-1 - 2343: 54,0 - 2346: 54,1 - 2356: 76,3 - 2357: 76,4 - 2402: 59,-5 - 2403: 59,-4 - 2464: 65,3 - 2465: 65,4 - 2466: 62,3 - 2467: 62,4 - 2468: 59,3 - 2469: 59,4 + 2203: 76,-5 + 2217: 78,-7 + 2295: 52,3 + 2296: 54,-2 + 2297: 54,-1 + 2298: 54,0 + 2301: 54,1 + 2311: 76,3 + 2312: 76,4 + 2357: 59,-5 + 2358: 59,-4 + 2419: 65,3 + 2420: 65,4 + 2421: 62,3 + 2422: 62,4 + 2423: 59,3 + 2424: 59,4 - node: color: '#A4610696' id: HalfTileOverlayGreyscale270 @@ -3588,12 +3566,12 @@ entities: 185: 7,16 186: 7,17 197: 7,18 - 1228: 7,22 - 1229: 7,23 - 1230: 7,24 - 1231: 7,25 - 1232: 7,26 - 1233: 7,27 + 1183: 7,22 + 1184: 7,23 + 1185: 7,24 + 1186: 7,25 + 1187: 7,26 + 1188: 7,27 - node: color: '#D0B78BFF' id: HalfTileOverlayGreyscale270 @@ -3615,8 +3593,8 @@ entities: 24: 53,24 25: 53,23 29: 58,18 - 2119: 47,10 - 2120: 47,9 + 2074: 47,10 + 2075: 47,9 - node: color: '#DE3A3A96' id: HalfTileOverlayGreyscale270 @@ -3633,15 +3611,15 @@ entities: 86: 32,19 87: 32,18 88: 32,17 - 1193: -3,-5 + 1148: -3,-5 - node: color: '#EFB34196' id: HalfTileOverlayGreyscale270 decals: - 2639: 34,-49 - 2640: 34,-48 - 2641: 34,-47 - 2642: 34,-43 + 2594: 34,-49 + 2595: 34,-48 + 2596: 34,-47 + 2597: 34,-43 - node: color: '#EFCC4193' id: HalfTileOverlayGreyscale270 @@ -3657,32 +3635,30 @@ entities: color: '#EFCC4582' id: HalfTileOverlayGreyscale270 decals: - 471: 19,-43 - 472: 19,-42 - 473: 19,-41 + 459: 19,-43 - node: color: '#34A2C0B2' id: HalfTileOverlayGreyscale90 decals: - 956: 19,6 - 957: 19,8 - 958: 19,7 + 911: 19,6 + 912: 19,8 + 913: 19,7 - node: color: '#52B4E94D' id: HalfTileOverlayGreyscale90 decals: - 998: 24,-6 - 999: 24,-5 + 953: 24,-6 + 954: 24,-5 - node: color: '#52B4E996' id: HalfTileOverlayGreyscale90 decals: - 1814: 51,2 - 1815: 51,3 - 2435: 57,-5 - 2440: 57,-4 - 2493: 74,5 - 2494: 74,6 + 1769: 51,2 + 1770: 51,3 + 2390: 57,-5 + 2395: 57,-4 + 2448: 74,5 + 2449: 74,6 - node: color: '#5A5A5AFF' id: HalfTileOverlayGreyscale90 @@ -3693,25 +3669,25 @@ entities: color: '#9FED5896' id: HalfTileOverlayGreyscale90 decals: - 1809: 52,-1 - 1810: 52,-2 - 2253: 82,-6 - 2254: 82,-5 - 2255: 82,-7 - 2354: 78,3 - 2355: 78,4 - 2393: 62,-1 - 2394: 62,-2 - 2395: 62,-3 - 2396: 62,-4 - 2397: 62,-5 - 2398: 62,-7 - 2458: 67,3 - 2459: 67,4 - 2460: 64,3 - 2461: 64,4 - 2462: 61,3 - 2463: 61,4 + 1764: 52,-1 + 1765: 52,-2 + 2208: 82,-6 + 2209: 82,-5 + 2210: 82,-7 + 2309: 78,3 + 2310: 78,4 + 2348: 62,-1 + 2349: 62,-2 + 2350: 62,-3 + 2351: 62,-4 + 2352: 62,-5 + 2353: 62,-7 + 2413: 67,3 + 2414: 67,4 + 2415: 64,3 + 2416: 64,4 + 2417: 61,3 + 2418: 61,4 - node: color: '#A4610696' id: HalfTileOverlayGreyscale90 @@ -3719,12 +3695,12 @@ entities: 189: 9,18 190: 9,17 191: 9,16 - 1243: 13,27 - 1244: 13,26 - 1245: 15,24 - 1246: 15,23 - 1247: 15,22 - 1248: 15,21 + 1198: 13,27 + 1199: 13,26 + 1200: 15,24 + 1201: 15,23 + 1202: 15,22 + 1203: 15,21 - node: color: '#D0B78BFF' id: HalfTileOverlayGreyscale90 @@ -3760,18 +3736,18 @@ entities: 56: 34,29 57: 34,30 179: 36,23 - 1192: -1,-5 - 1645: 27,17 - 1646: 27,18 - 1647: 27,19 - 1648: 27,20 - 1649: 27,21 - 1650: 27,26 - 1651: 27,27 - 1652: 27,28 - 1653: 27,29 - 1654: 27,30 - 1655: 27,31 + 1147: -1,-5 + 1600: 27,17 + 1601: 27,18 + 1602: 27,19 + 1603: 27,20 + 1604: 27,21 + 1605: 27,26 + 1606: 27,27 + 1607: 27,28 + 1608: 27,29 + 1609: 27,30 + 1610: 27,31 - node: color: '#EFCC4193' id: HalfTileOverlayGreyscale90 @@ -3788,42 +3764,42 @@ entities: color: '#EFCC4582' id: HalfTileOverlayGreyscale90 decals: - 468: 23,-43 - 469: 23,-42 - 470: 23,-41 + 456: 23,-43 + 457: 23,-42 + 458: 23,-41 - node: angle: -3.141592653589793 rad color: '#FFFFFFFF' id: LoadingArea decals: - 1643: 39,24 - 1644: 40,24 + 1598: 39,24 + 1599: 40,24 - node: angle: -1.5707963267948966 rad color: '#FFFFFFFF' id: LoadingArea decals: - 1276: 9,26 - 1518: 23,25 - 1666: 31,18 - 1667: 31,20 - 2339: 52,0 + 1231: 9,26 + 1473: 23,25 + 1621: 31,18 + 1622: 31,20 + 2294: 52,0 - node: color: '#FFFFFFFF' id: LoadingArea decals: - 1516: 22,23 - 1517: 22,24 + 1471: 22,23 + 1472: 22,24 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' id: LoadingArea decals: - 1221: 13,-2 - 1222: 14,-2 - 1223: 15,-2 - 1841: 9,24 - 2338: 52,-2 + 1176: 13,-2 + 1177: 14,-2 + 1178: 15,-2 + 1796: 9,24 + 2293: 52,-2 - node: angle: 4.71238898038469 rad color: '#FFFFFFFF' @@ -3834,7 +3810,7 @@ entities: color: '#FFFFFFFF' id: North decals: - 1200: -17,-14 + 1155: -17,-14 - node: color: '#334E6DC8' id: QuarterTileOverlayGreyscale @@ -3847,48 +3823,48 @@ entities: color: '#52B4E996' id: QuarterTileOverlayGreyscale decals: - 2541: 105,-19 - 2542: 106,-18 - 2543: 107,-19 - 2544: 103,-19 - 2545: 103,-17 - 2546: 106,-17 - 2547: 107,-20 - 2548: 106,-17 - 2549: 104,-16 - 2550: 104,-19 - 2551: 105,-19 - 2552: 104,-17 - 2553: 104,-18 - 2554: 108,-18 - 2555: 108,-16 + 2496: 105,-19 + 2497: 106,-18 + 2498: 107,-19 + 2499: 103,-19 + 2500: 103,-17 + 2501: 106,-17 + 2502: 107,-20 + 2503: 106,-17 + 2504: 104,-16 + 2505: 104,-19 + 2506: 105,-19 + 2507: 104,-17 + 2508: 104,-18 + 2509: 108,-18 + 2510: 108,-16 - node: color: '#797C8250' id: QuarterTileOverlayGreyscale decals: - 2175: 54,15 - 2176: 54,15 - 2177: 55,15 - 2178: 55,15 - 2179: 56,15 - 2180: 56,15 - 2181: 57,15 - 2182: 57,15 - 2183: 58,15 - 2184: 58,15 + 2130: 54,15 + 2131: 54,15 + 2132: 55,15 + 2133: 55,15 + 2134: 56,15 + 2135: 56,15 + 2136: 57,15 + 2137: 57,15 + 2138: 58,15 + 2139: 58,15 - node: color: '#80C71FFF' id: QuarterTileOverlayGreyscale decals: - 2591: 106,-19 - 2592: 107,-17 - 2593: 103,-16 - 2594: 102,-20 + 2546: 106,-19 + 2547: 107,-17 + 2548: 103,-16 + 2549: 102,-20 - node: color: '#9FED5896' id: QuarterTileOverlayGreyscale decals: - 2362: 76,2 + 2317: 76,2 - node: color: '#A4610696' id: QuarterTileOverlayGreyscale @@ -3903,94 +3879,94 @@ entities: color: '#D4D4D428' id: QuarterTileOverlayGreyscale decals: - 1109: -22,-13 - 1110: -21,-13 - 1111: -19,-13 - 1112: -18,-13 - 1113: -17,-13 - 1114: -16,-13 - 1115: -15,-13 - 1116: -14,-13 - 1117: -12,-13 - 1118: -11,-13 - 1119: -10,-13 - 1120: -9,-13 - 1121: -8,-13 - 1122: -7,-13 - 1123: -7,-12 - 1124: -7,-11 - 1125: -7,-10 - 1126: -7,-9 - 1127: -7,-8 - 1128: -7,-7 - 1201: 3,0 - 1202: 3,1 - 1203: 3,2 - 1204: 3,3 - 1205: 3,4 - 1206: 3,5 - 1207: 3,6 - 1208: 3,7 - 1209: 3,8 - 1210: 3,9 - 1211: 3,10 - 1212: 3,11 - 1213: 3,12 - 1214: 3,13 - 1215: 4,13 - 1216: 6,13 - 1217: 5,13 - 1579: 25,17 - 1580: 25,18 - 1581: 25,19 - 1582: 25,20 - 1583: 25,21 - 1584: 25,22 - 1585: 25,23 - 1586: 25,24 - 1587: 25,25 - 1588: 35,29 - 1798: 25,26 - 1992: 18,1 - 1993: 19,1 - 1994: 20,1 - 1995: 21,1 - 1996: 22,1 - 1997: 23,1 - 1998: 24,1 - 1999: 25,1 - 2000: 25,2 - 2001: 25,3 - 2050: 39,15 - 2051: 40,15 - 2052: 41,15 - 2053: 43,15 - 2054: 42,15 - 2055: 44,15 - 2056: 45,15 - 2057: 45,16 - 2058: 45,17 - 2059: 45,18 - 2060: 45,19 - 2061: 46,19 - 2062: 47,19 - 2063: 40,11 - 2064: 40,10 - 2065: 40,8 - 2066: 40,7 - 2067: 40,9 - 2068: 40,6 - 2069: 40,5 - 2070: 40,4 - 2071: 40,3 + 1064: -22,-13 + 1065: -21,-13 + 1066: -19,-13 + 1067: -18,-13 + 1068: -17,-13 + 1069: -16,-13 + 1070: -15,-13 + 1071: -14,-13 + 1072: -12,-13 + 1073: -11,-13 + 1074: -10,-13 + 1075: -9,-13 + 1076: -8,-13 + 1077: -7,-13 + 1078: -7,-12 + 1079: -7,-11 + 1080: -7,-10 + 1081: -7,-9 + 1082: -7,-8 + 1083: -7,-7 + 1156: 3,0 + 1157: 3,1 + 1158: 3,2 + 1159: 3,3 + 1160: 3,4 + 1161: 3,5 + 1162: 3,6 + 1163: 3,7 + 1164: 3,8 + 1165: 3,9 + 1166: 3,10 + 1167: 3,11 + 1168: 3,12 + 1169: 3,13 + 1170: 4,13 + 1171: 6,13 + 1172: 5,13 + 1534: 25,17 + 1535: 25,18 + 1536: 25,19 + 1537: 25,20 + 1538: 25,21 + 1539: 25,22 + 1540: 25,23 + 1541: 25,24 + 1542: 25,25 + 1543: 35,29 + 1753: 25,26 + 1947: 18,1 + 1948: 19,1 + 1949: 20,1 + 1950: 21,1 + 1951: 22,1 + 1952: 23,1 + 1953: 24,1 + 1954: 25,1 + 1955: 25,2 + 1956: 25,3 + 2005: 39,15 + 2006: 40,15 + 2007: 41,15 + 2008: 43,15 + 2009: 42,15 + 2010: 44,15 + 2011: 45,15 + 2012: 45,16 + 2013: 45,17 + 2014: 45,18 + 2015: 45,19 + 2016: 46,19 + 2017: 47,19 + 2018: 40,11 + 2019: 40,10 + 2020: 40,8 + 2021: 40,7 + 2022: 40,9 + 2023: 40,6 + 2024: 40,5 + 2025: 40,4 + 2026: 40,3 - node: color: '#D5188DFF' id: QuarterTileOverlayGreyscale decals: - 2579: 103,-18 - 2580: 106,-16 - 2581: 108,-20 - 2582: 103,-21 + 2534: 103,-18 + 2535: 106,-16 + 2536: 108,-20 + 2537: 103,-21 - node: color: '#DE3A3A96' id: QuarterTileOverlayGreyscale @@ -4000,48 +3976,48 @@ entities: 61: 32,30 72: 33,24 100: 36,30 - 784: 24,-25 - 785: 24,-24 - 1000: 27,5 - 1001: 26,5 - 1002: 25,5 - 1003: 25,6 - 1004: 26,6 - 1005: 26,6 - 1006: 25,6 - 1007: 25,5 - 1008: 26,5 - 1009: 27,5 - 1010: 27,6 - 1011: 27,6 - 1012: 27,7 - 1013: 27,7 - 1014: 26,7 - 1015: 26,7 - 1016: 25,7 - 1017: 25,7 - 1018: 25,8 - 1019: 25,8 - 1020: 26,8 - 1021: 26,8 - 1022: 27,8 - 1023: 27,8 - 1152: -7,0 - 1153: -6,0 - 1154: -2,0 - 1155: -1,0 - 1156: 0,0 - 1157: 1,0 - 1158: 2,0 - 1634: 38,24 - 1635: 38,23 + 739: 24,-25 + 740: 24,-24 + 955: 27,5 + 956: 26,5 + 957: 25,5 + 958: 25,6 + 959: 26,6 + 960: 26,6 + 961: 25,6 + 962: 25,5 + 963: 26,5 + 964: 27,5 + 965: 27,6 + 966: 27,6 + 967: 27,7 + 968: 27,7 + 969: 26,7 + 970: 26,7 + 971: 25,7 + 972: 25,7 + 973: 25,8 + 974: 25,8 + 975: 26,8 + 976: 26,8 + 977: 27,8 + 978: 27,8 + 1107: -7,0 + 1108: -6,0 + 1109: -2,0 + 1110: -1,0 + 1111: 0,0 + 1112: 1,0 + 1113: 2,0 + 1589: 38,24 + 1590: 38,23 - node: color: '#EFB34196' id: QuarterTileOverlayGreyscale decals: - 1944: 12,-8 - 1946: 11,-8 - 1947: 10,-8 + 1899: 12,-8 + 1901: 11,-8 + 1902: 10,-8 - node: color: '#EFCC4193' id: QuarterTileOverlayGreyscale @@ -4052,99 +4028,99 @@ entities: color: '#0E7F1BFF' id: QuarterTileOverlayGreyscale180 decals: - 2583: 102,-21 - 2584: 104,-20 - 2585: 107,-16 - 2586: 108,-18 - 2587: 102,-16 + 2538: 102,-21 + 2539: 104,-20 + 2540: 107,-16 + 2541: 108,-18 + 2542: 102,-16 - node: color: '#334E6DC8' id: QuarterTileOverlayGreyscale180 decals: - 1950: 9,-2 - 2556: 104,-19 + 1905: 9,-2 + 2511: 104,-19 - node: color: '#52B4E996' id: QuarterTileOverlayGreyscale180 decals: - 786: 28,-25 - 787: 28,-24 - 2499: 74,7 + 741: 28,-25 + 742: 28,-24 + 2454: 74,7 - node: color: '#797979AB' id: QuarterTileOverlayGreyscale180 decals: - 1024: 27,5 - 1025: 26,5 - 1026: 25,5 - 1027: 25,6 - 1028: 26,6 - 1029: 27,6 - 1030: 27,7 - 1031: 26,7 - 1032: 25,7 - 1033: 25,8 - 1034: 26,8 - 1035: 27,8 + 979: 27,5 + 980: 26,5 + 981: 25,5 + 982: 25,6 + 983: 26,6 + 984: 27,6 + 985: 27,7 + 986: 26,7 + 987: 25,7 + 988: 25,8 + 989: 26,8 + 990: 27,8 - node: color: '#797C8250' id: QuarterTileOverlayGreyscale180 decals: - 2147: 60,13 - 2148: 60,13 - 2149: 59,13 - 2150: 59,13 - 2151: 58,13 - 2152: 58,13 - 2153: 58,12 - 2154: 58,12 - 2155: 58,8 - 2156: 58,8 - 2185: 64,13 - 2186: 64,13 - 2187: 64,14 - 2188: 64,14 - 2195: 60,17 - 2196: 60,17 - 2197: 60,18 - 2198: 60,18 - 2199: 60,19 - 2200: 60,19 - 2201: 60,20 - 2202: 60,20 - 2219: 54,22 - 2220: 54,22 - 2221: 55,22 - 2222: 55,22 - 2223: 56,22 - 2224: 56,22 - 2225: 57,22 - 2226: 57,22 + 2102: 60,13 + 2103: 60,13 + 2104: 59,13 + 2105: 59,13 + 2106: 58,13 + 2107: 58,13 + 2108: 58,12 + 2109: 58,12 + 2110: 58,8 + 2111: 58,8 + 2140: 64,13 + 2141: 64,13 + 2142: 64,14 + 2143: 64,14 + 2150: 60,17 + 2151: 60,17 + 2152: 60,18 + 2153: 60,18 + 2154: 60,19 + 2155: 60,19 + 2156: 60,20 + 2157: 60,20 + 2174: 54,22 + 2175: 54,22 + 2176: 55,22 + 2177: 55,22 + 2178: 56,22 + 2179: 56,22 + 2180: 57,22 + 2181: 57,22 - node: color: '#80C71FFF' id: QuarterTileOverlayGreyscale180 decals: - 2595: 108,-20 - 2596: 103,-21 + 2550: 108,-20 + 2551: 103,-21 - node: color: '#951710FF' id: QuarterTileOverlayGreyscale180 decals: - 2588: 107,-20 + 2543: 107,-20 - node: color: '#9FED5837' id: QuarterTileOverlayGreyscale180 decals: - 927: 41,-2 + 882: 41,-2 - node: color: '#9FED5896' id: QuarterTileOverlayGreyscale180 decals: - 2386: 69,1 - 2400: 62,0 - 2524: 105,-17 - 2525: 106,-18 - 2526: 103,-19 + 2341: 69,1 + 2355: 62,0 + 2479: 105,-17 + 2480: 106,-18 + 2481: 103,-19 - node: color: '#A4610696' id: QuarterTileOverlayGreyscale180 @@ -4160,85 +4136,85 @@ entities: id: QuarterTileOverlayGreyscale180 decals: 33: 61,13 - 2576: 106,-19 - 2577: 108,-17 - 2578: 108,-19 + 2531: 106,-19 + 2532: 108,-17 + 2533: 108,-19 - node: color: '#D4D4D428' id: QuarterTileOverlayGreyscale180 decals: - 985: 27,-13 - 986: 27,-12 - 987: 27,-11 - 988: 27,-10 - 989: 27,-9 - 990: 27,-8 - 991: 27,-7 - 992: 27,-6 - 993: 27,-5 - 1168: -6,-14 - 1169: -6,-13 - 1170: -6,-12 - 1171: -6,-11 - 1172: -6,-10 - 1173: -6,-9 - 1174: -6,-8 - 1175: -6,-7 - 1176: -6,-6 - 1177: -6,-5 - 1178: -6,-4 - 1179: -6,-3 - 1180: -6,-2 - 1181: -5,-2 - 1182: -4,-2 - 1183: -3,-2 - 1184: -2,-2 - 1185: -1,-2 - 1186: 0,-2 - 1187: 1,-2 - 1799: 27,33 - 1800: 27,34 - 1801: 28,34 - 1802: 28,35 - 1803: 28,36 - 2016: 38,-1 - 2017: 37,-1 - 2018: 36,-1 - 2019: 35,-1 - 2020: 34,-1 - 2021: 33,-1 - 2022: 32,-1 - 2023: 32,-1 - 2024: 31,-1 - 2025: 30,-1 - 2026: 29,-1 - 2027: 28,-1 - 2028: 27,-1 - 2037: 13,-1 - 2038: 14,-1 - 2039: 16,-1 - 2040: 15,-1 + 940: 27,-13 + 941: 27,-12 + 942: 27,-11 + 943: 27,-10 + 944: 27,-9 + 945: 27,-8 + 946: 27,-7 + 947: 27,-6 + 948: 27,-5 + 1123: -6,-14 + 1124: -6,-13 + 1125: -6,-12 + 1126: -6,-11 + 1127: -6,-10 + 1128: -6,-9 + 1129: -6,-8 + 1130: -6,-7 + 1131: -6,-6 + 1132: -6,-5 + 1133: -6,-4 + 1134: -6,-3 + 1135: -6,-2 + 1136: -5,-2 + 1137: -4,-2 + 1138: -3,-2 + 1139: -2,-2 + 1140: -1,-2 + 1141: 0,-2 + 1142: 1,-2 + 1754: 27,33 + 1755: 27,34 + 1756: 28,34 + 1757: 28,35 + 1758: 28,36 + 1971: 38,-1 + 1972: 37,-1 + 1973: 36,-1 + 1974: 35,-1 + 1975: 34,-1 + 1976: 33,-1 + 1977: 32,-1 + 1978: 32,-1 + 1979: 31,-1 + 1980: 30,-1 + 1981: 29,-1 + 1982: 28,-1 + 1983: 27,-1 + 1992: 13,-1 + 1993: 14,-1 + 1994: 16,-1 + 1995: 15,-1 - node: color: '#D4D4D496' id: QuarterTileOverlayGreyscale180 decals: - 1075: -22,-15 - 1076: -21,-15 - 1077: -20,-15 - 1078: -19,-15 - 1079: -18,-15 - 1080: -17,-15 - 1081: -16,-15 - 1082: -15,-15 - 1083: -14,-15 - 1084: -13,-15 - 1085: -12,-15 - 1086: -11,-15 - 1087: -10,-15 - 1088: -9,-15 - 1089: -8,-15 - 1090: -7,-15 - 1091: -6,-15 + 1030: -22,-15 + 1031: -21,-15 + 1032: -20,-15 + 1033: -19,-15 + 1034: -18,-15 + 1035: -17,-15 + 1036: -16,-15 + 1037: -15,-15 + 1038: -14,-15 + 1039: -13,-15 + 1040: -12,-15 + 1041: -11,-15 + 1042: -10,-15 + 1043: -9,-15 + 1044: -8,-15 + 1045: -7,-15 + 1046: -6,-15 - node: color: '#DE3A3A96' id: QuarterTileOverlayGreyscale180 @@ -4248,37 +4224,37 @@ entities: 89: 32,17 97: 37,31 180: 36,24 - 2516: 105,-19 - 2517: 104,-18 - 2518: 106,-16 - 2519: 107,-17 - 2520: 107,-19 - 2521: 103,-17 - 2522: 102,-18 - 2523: 103,-20 + 2471: 105,-19 + 2472: 104,-18 + 2473: 106,-16 + 2474: 107,-17 + 2475: 107,-19 + 2476: 103,-17 + 2477: 102,-18 + 2478: 103,-20 - node: color: '#EFB34196' id: QuarterTileOverlayGreyscale180 decals: - 1945: 11,-7 - 1948: 10,-7 - 1949: 9,-7 + 1900: 11,-7 + 1903: 10,-7 + 1904: 9,-7 - node: color: '#EFCC2E82' id: QuarterTileOverlayGreyscale180 decals: - 768: 27,-14 - 769: 27,-15 - 770: 27,-16 - 771: 27,-17 - 772: 27,-18 - 773: 27,-19 - 774: 27,-20 - 775: 27,-21 - 776: 27,-22 - 777: 27,-23 - 778: 27,-24 - 779: 27,-25 + 723: 27,-14 + 724: 27,-15 + 725: 27,-16 + 726: 27,-17 + 727: 27,-18 + 728: 27,-19 + 729: 27,-20 + 730: 27,-21 + 731: 27,-22 + 732: 27,-23 + 733: 27,-24 + 734: 27,-25 - node: color: '#EFCC4193' id: QuarterTileOverlayGreyscale180 @@ -4288,115 +4264,115 @@ entities: color: '#EFCC4593' id: QuarterTileOverlayGreyscale180 decals: - 793: 22,-20 - 794: 22,-19 - 795: 22,-18 - 796: 22,-17 - 797: 22,-16 + 748: 22,-20 + 749: 22,-19 + 750: 22,-18 + 751: 22,-17 + 752: 22,-16 - node: color: '#FED83DFF' id: QuarterTileOverlayGreyscale180 decals: - 2557: 105,-16 - 2558: 106,-17 - 2559: 105,-20 - 2560: 102,-20 - 2561: 102,-17 + 2512: 105,-16 + 2513: 106,-17 + 2514: 105,-20 + 2515: 102,-20 + 2516: 102,-17 - node: color: '#334E6DC8' id: QuarterTileOverlayGreyscale270 decals: - 1959: 8,-2 + 1914: 8,-2 - node: color: '#3C44AAFF' id: QuarterTileOverlayGreyscale270 decals: - 2566: 104,-16 - 2567: 102,-19 - 2568: 107,-17 - 2569: 108,-16 + 2521: 104,-16 + 2522: 102,-19 + 2523: 107,-17 + 2524: 108,-16 - node: color: '#52B4E996' id: QuarterTileOverlayGreyscale270 decals: - 1092: -22,-15 - 1093: -21,-15 - 1094: -20,-15 - 1095: -19,-15 - 1096: -18,-15 - 1097: -17,-15 - 1098: -16,-15 - 1099: -15,-15 - 1100: -14,-15 - 1101: -13,-15 - 1102: -12,-15 - 1103: -11,-15 - 1104: -10,-15 - 1105: -9,-15 - 1106: -8,-15 - 1107: -7,-15 - 1108: -6,-15 + 1047: -22,-15 + 1048: -21,-15 + 1049: -20,-15 + 1050: -19,-15 + 1051: -18,-15 + 1052: -17,-15 + 1053: -16,-15 + 1054: -15,-15 + 1055: -14,-15 + 1056: -13,-15 + 1057: -12,-15 + 1058: -11,-15 + 1059: -10,-15 + 1060: -9,-15 + 1061: -8,-15 + 1062: -7,-15 + 1063: -6,-15 - node: color: '#797C8250' id: QuarterTileOverlayGreyscale270 decals: - 2157: 57,8 - 2158: 57,8 - 2159: 57,9 - 2160: 57,9 - 2161: 57,10 - 2162: 57,10 - 2163: 57,11 - 2164: 57,11 - 2165: 57,12 - 2166: 57,12 - 2167: 57,13 - 2168: 57,13 - 2169: 56,13 - 2170: 56,13 - 2171: 55,13 - 2172: 55,13 - 2173: 54,13 - 2174: 54,13 - 2203: 58,20 - 2204: 58,20 + 2112: 57,8 + 2113: 57,8 + 2114: 57,9 + 2115: 57,9 + 2116: 57,10 + 2117: 57,10 + 2118: 57,11 + 2119: 57,11 + 2120: 57,12 + 2121: 57,12 + 2122: 57,13 + 2123: 57,13 + 2124: 56,13 + 2125: 56,13 + 2126: 55,13 + 2127: 55,13 + 2128: 54,13 + 2129: 54,13 + 2158: 58,20 + 2159: 58,20 - node: color: '#951710FF' id: QuarterTileOverlayGreyscale270 decals: - 2589: 103,-19 - 2590: 105,-16 + 2544: 103,-19 + 2545: 105,-16 - node: color: '#9FED5837' id: QuarterTileOverlayGreyscale270 decals: - 926: 47,-2 + 881: 47,-2 - node: color: '#9FED5853' id: QuarterTileOverlayGreyscale270 decals: - 1954: 5,-2 - 1955: 6,-2 - 1956: 7,-2 - 1957: 4,-2 - 1958: 3,-2 + 1909: 5,-2 + 1910: 6,-2 + 1911: 7,-2 + 1912: 4,-2 + 1913: 3,-2 - node: color: '#9FED5896' id: QuarterTileOverlayGreyscale270 decals: - 2261: 78,-6 - 2347: 54,2 - 2527: 106,-19 - 2528: 105,-18 - 2529: 103,-16 - 2530: 102,-17 - 2531: 103,-18 + 2216: 78,-6 + 2302: 54,2 + 2482: 106,-19 + 2483: 105,-18 + 2484: 103,-16 + 2485: 102,-17 + 2486: 103,-18 - node: color: '#A4610696' id: QuarterTileOverlayGreyscale270 decals: 195: 7,19 - 1254: 13,21 + 1209: 13,21 - node: color: '#D381C996' id: QuarterTileOverlayGreyscale270 @@ -4407,92 +4383,92 @@ entities: color: '#D4D4D428' id: QuarterTileOverlayGreyscale270 decals: - 930: 8,9 - 931: 9,9 - 932: 10,9 - 933: 11,9 - 934: 12,9 - 935: 13,9 - 936: 14,9 - 937: 15,9 - 938: 16,9 - 939: 17,9 - 940: 18,9 - 941: 19,9 - 970: 22,15 - 971: 21,15 - 972: 20,15 - 976: 25,-13 - 977: 25,-12 - 978: 25,-11 - 979: 25,-10 - 980: 25,-9 - 981: 25,-8 - 982: 25,-7 - 983: 25,-6 - 984: 25,-5 - 1129: -7,-5 - 1130: -7,-4 - 1131: -7,-3 - 1132: -7,-2 - 1133: -7,-1 - 1134: -7,0 - 1725: 37,13 - 1726: 36,13 - 1727: 35,13 - 1728: 34,13 - 1729: 33,13 - 1730: 32,13 - 1731: 31,13 - 1732: 30,13 - 1733: 29,13 - 1734: 28,13 - 1735: 25,12 - 1736: 25,13 - 1737: 25,14 - 1738: 25,15 - 1782: 17,35 - 1783: 18,35 - 1784: 19,35 - 1785: 20,35 - 1786: 21,35 - 1787: 22,35 - 1788: 23,35 - 1789: 24,35 - 1790: 25,35 - 1791: 25,34 - 1792: 25,33 - 1793: 25,32 - 1794: 25,31 - 1795: 25,30 - 1796: 25,29 - 1797: 25,28 - 2029: 25,-1 - 2030: 24,-1 - 2031: 23,-1 - 2032: 22,-1 - 2033: 21,-1 - 2034: 20,-1 - 2035: 19,-1 - 2036: 18,-1 - 2041: 39,13 - 2042: 40,13 - 2043: 41,13 - 2044: 42,13 - 2045: 43,13 - 2046: 44,13 - 2047: 45,13 - 2048: 46,13 - 2049: 47,13 - 2510: 40,-1 - 2511: 41,-1 - 2512: 41,-2 + 885: 8,9 + 886: 9,9 + 887: 10,9 + 888: 11,9 + 889: 12,9 + 890: 13,9 + 891: 14,9 + 892: 15,9 + 893: 16,9 + 894: 17,9 + 895: 18,9 + 896: 19,9 + 925: 22,15 + 926: 21,15 + 927: 20,15 + 931: 25,-13 + 932: 25,-12 + 933: 25,-11 + 934: 25,-10 + 935: 25,-9 + 936: 25,-8 + 937: 25,-7 + 938: 25,-6 + 939: 25,-5 + 1084: -7,-5 + 1085: -7,-4 + 1086: -7,-3 + 1087: -7,-2 + 1088: -7,-1 + 1089: -7,0 + 1680: 37,13 + 1681: 36,13 + 1682: 35,13 + 1683: 34,13 + 1684: 33,13 + 1685: 32,13 + 1686: 31,13 + 1687: 30,13 + 1688: 29,13 + 1689: 28,13 + 1690: 25,12 + 1691: 25,13 + 1692: 25,14 + 1693: 25,15 + 1737: 17,35 + 1738: 18,35 + 1739: 19,35 + 1740: 20,35 + 1741: 21,35 + 1742: 22,35 + 1743: 23,35 + 1744: 24,35 + 1745: 25,35 + 1746: 25,34 + 1747: 25,33 + 1748: 25,32 + 1749: 25,31 + 1750: 25,30 + 1751: 25,29 + 1752: 25,28 + 1984: 25,-1 + 1985: 24,-1 + 1986: 23,-1 + 1987: 22,-1 + 1988: 21,-1 + 1989: 20,-1 + 1990: 19,-1 + 1991: 18,-1 + 1996: 39,13 + 1997: 40,13 + 1998: 41,13 + 1999: 42,13 + 2000: 43,13 + 2001: 44,13 + 2002: 45,13 + 2003: 46,13 + 2004: 47,13 + 2465: 40,-1 + 2466: 41,-1 + 2467: 41,-2 - node: color: '#D4D4D496' id: QuarterTileOverlayGreyscale270 decals: - 780: 24,-25 - 781: 24,-24 + 735: 24,-25 + 736: 24,-24 - node: color: '#DE3A3A96' id: QuarterTileOverlayGreyscale270 @@ -4506,18 +4482,18 @@ entities: color: '#EFCC2E82' id: QuarterTileOverlayGreyscale270 decals: - 756: 25,-25 - 757: 25,-24 - 758: 25,-23 - 759: 25,-22 - 760: 25,-21 - 761: 25,-20 - 762: 25,-19 - 763: 25,-18 - 764: 25,-17 - 765: 25,-16 - 766: 25,-15 - 767: 25,-14 + 711: 25,-25 + 712: 25,-24 + 713: 25,-23 + 714: 25,-22 + 715: 25,-21 + 716: 25,-20 + 717: 25,-19 + 718: 25,-18 + 719: 25,-17 + 720: 25,-16 + 721: 25,-15 + 722: 25,-14 - node: color: '#EFCC4193' id: QuarterTileOverlayGreyscale270 @@ -4527,19 +4503,19 @@ entities: color: '#EFCC4593' id: QuarterTileOverlayGreyscale270 decals: - 788: 20,-20 - 789: 20,-19 - 790: 20,-18 - 791: 20,-17 - 792: 20,-16 + 743: 20,-20 + 744: 20,-19 + 745: 20,-18 + 746: 20,-17 + 747: 20,-16 - node: color: '#F9801DFF' id: QuarterTileOverlayGreyscale270 decals: - 2562: 105,-17 - 2563: 104,-17 - 2564: 107,-18 - 2565: 106,-20 + 2517: 105,-17 + 2518: 104,-17 + 2519: 107,-18 + 2520: 106,-20 - node: color: '#334E6DC8' id: QuarterTileOverlayGreyscale90 @@ -4552,155 +4528,155 @@ entities: color: '#797C8250' id: QuarterTileOverlayGreyscale90 decals: - 2189: 64,16 - 2190: 64,16 - 2191: 63,16 - 2192: 63,16 - 2193: 62,16 - 2194: 62,16 - 2205: 60,25 - 2206: 60,25 - 2207: 59,25 - 2208: 59,25 - 2209: 58,25 - 2210: 58,25 - 2211: 57,25 - 2212: 57,25 - 2213: 56,25 - 2214: 56,25 - 2215: 55,25 - 2216: 55,25 - 2217: 54,25 - 2218: 54,25 + 2144: 64,16 + 2145: 64,16 + 2146: 63,16 + 2147: 63,16 + 2148: 62,16 + 2149: 62,16 + 2160: 60,25 + 2161: 60,25 + 2162: 59,25 + 2163: 59,25 + 2164: 58,25 + 2165: 58,25 + 2166: 57,25 + 2167: 57,25 + 2168: 56,25 + 2169: 56,25 + 2170: 55,25 + 2171: 55,25 + 2172: 54,25 + 2173: 54,25 - node: color: '#8932B8FF' id: QuarterTileOverlayGreyscale90 decals: - 2570: 105,-20 - 2571: 102,-16 - 2572: 107,-18 - 2573: 105,-18 + 2525: 105,-20 + 2526: 102,-16 + 2527: 107,-18 + 2528: 105,-18 - node: color: '#9FED5896' id: QuarterTileOverlayGreyscale90 decals: - 2361: 78,2 - 2452: 53,3 - 2470: 67,2 + 2316: 78,2 + 2407: 53,3 + 2425: 67,2 - node: color: '#A4610696' id: QuarterTileOverlayGreyscale90 decals: 194: 9,15 - 1255: 13,25 + 1210: 13,25 - node: color: '#D381C996' id: QuarterTileOverlayGreyscale90 decals: - 2574: 104,-19 - 2575: 104,-16 + 2529: 104,-19 + 2530: 104,-16 - node: color: '#D4D4D428' id: QuarterTileOverlayGreyscale90 decals: - 942: 8,10 - 943: 9,10 - 944: 10,10 - 945: 11,10 - 946: 12,10 - 947: 13,10 - 948: 14,10 - 949: 15,10 - 950: 16,10 - 951: 17,10 - 952: 18,10 - 953: 19,10 - 973: 19,12 - 974: 20,12 - 975: 21,12 - 1715: 28,15 - 1716: 29,15 - 1717: 30,15 - 1718: 31,15 - 1719: 32,15 - 1720: 33,15 - 1721: 34,15 - 1722: 35,15 - 1723: 36,15 - 1724: 37,15 - 1773: 25,37 - 1774: 24,37 - 1775: 23,37 - 1776: 22,37 - 1777: 21,37 - 1778: 20,37 - 1779: 19,37 - 1780: 18,37 - 1781: 17,37 - 1960: 16,1 - 1961: 15,1 - 1962: 14,1 - 1963: 13,1 - 1964: 12,1 - 1965: 11,1 - 1966: 10,1 - 1967: 9,1 - 1968: 8,1 - 1969: 7,1 - 1970: 6,1 - 1971: 6,2 - 1972: 6,3 - 1973: 6,4 - 1974: 6,5 - 1975: 6,7 - 1976: 6,6 - 1977: 6,8 - 1978: 6,11 - 1979: 6,12 - 1980: 6,13 - 2002: 27,3 - 2003: 27,2 - 2004: 27,1 - 2005: 28,1 - 2006: 29,1 - 2007: 30,1 - 2008: 31,1 - 2009: 32,1 - 2010: 33,1 - 2011: 34,1 - 2012: 35,1 - 2013: 36,1 - 2014: 37,1 - 2015: 38,1 - 2072: 42,3 - 2073: 42,4 - 2074: 42,5 - 2075: 42,6 - 2076: 42,7 - 2077: 42,8 - 2078: 42,9 - 2079: 42,10 - 2080: 42,11 - 2503: 47,0 - 2504: 46,0 - 2505: 45,0 - 2506: 44,0 - 2507: 43,0 - 2508: 42,0 - 2509: 42,1 + 897: 8,10 + 898: 9,10 + 899: 10,10 + 900: 11,10 + 901: 12,10 + 902: 13,10 + 903: 14,10 + 904: 15,10 + 905: 16,10 + 906: 17,10 + 907: 18,10 + 908: 19,10 + 928: 19,12 + 929: 20,12 + 930: 21,12 + 1670: 28,15 + 1671: 29,15 + 1672: 30,15 + 1673: 31,15 + 1674: 32,15 + 1675: 33,15 + 1676: 34,15 + 1677: 35,15 + 1678: 36,15 + 1679: 37,15 + 1728: 25,37 + 1729: 24,37 + 1730: 23,37 + 1731: 22,37 + 1732: 21,37 + 1733: 20,37 + 1734: 19,37 + 1735: 18,37 + 1736: 17,37 + 1915: 16,1 + 1916: 15,1 + 1917: 14,1 + 1918: 13,1 + 1919: 12,1 + 1920: 11,1 + 1921: 10,1 + 1922: 9,1 + 1923: 8,1 + 1924: 7,1 + 1925: 6,1 + 1926: 6,2 + 1927: 6,3 + 1928: 6,4 + 1929: 6,5 + 1930: 6,7 + 1931: 6,6 + 1932: 6,8 + 1933: 6,11 + 1934: 6,12 + 1935: 6,13 + 1957: 27,3 + 1958: 27,2 + 1959: 27,1 + 1960: 28,1 + 1961: 29,1 + 1962: 30,1 + 1963: 31,1 + 1964: 32,1 + 1965: 33,1 + 1966: 34,1 + 1967: 35,1 + 1968: 36,1 + 1969: 37,1 + 1970: 38,1 + 2027: 42,3 + 2028: 42,4 + 2029: 42,5 + 2030: 42,6 + 2031: 42,7 + 2032: 42,8 + 2033: 42,9 + 2034: 42,10 + 2035: 42,11 + 2458: 47,0 + 2459: 46,0 + 2460: 45,0 + 2461: 44,0 + 2462: 43,0 + 2463: 42,0 + 2464: 42,1 - node: color: '#D4D4D496' id: QuarterTileOverlayGreyscale90 decals: - 782: 28,-25 - 783: 28,-24 - 1145: -7,0 - 1146: -6,0 - 1147: -2,0 - 1148: -1,0 - 1149: 0,0 - 1150: 1,0 - 1151: 2,0 + 737: 28,-25 + 738: 28,-24 + 1100: -7,0 + 1101: -6,0 + 1102: -2,0 + 1103: -1,0 + 1104: 0,0 + 1105: 1,0 + 1106: 2,0 - node: color: '#DE3A3A96' id: QuarterTileOverlayGreyscale90 @@ -4710,20 +4686,20 @@ entities: 59: 32,30 98: 37,30 177: 35,24 - 1636: 41,24 + 1591: 41,24 - node: color: '#EFB34196' id: QuarterTileOverlayGreyscale90 decals: - 2532: 107,-19 - 2533: 105,-19 - 2534: 103,-18 - 2535: 103,-19 - 2536: 104,-20 - 2537: 107,-17 - 2538: 104,-17 - 2539: 103,-17 - 2540: 106,-19 + 2487: 107,-19 + 2488: 105,-19 + 2489: 103,-18 + 2490: 103,-19 + 2491: 104,-20 + 2492: 107,-17 + 2493: 104,-17 + 2494: 103,-17 + 2495: 106,-19 - node: color: '#EFCC4193' id: QuarterTileOverlayGreyscale90 @@ -4736,42 +4712,42 @@ entities: color: '#FFFFFFFF' id: Remains decals: - 2515: 11,-11 + 2470: 11,-11 - node: color: '#FFFFFFFF' id: SpaceStationSign1 decals: - 1042: 23,0 + 997: 23,0 - node: color: '#FFFFFFFF' id: SpaceStationSign2 decals: - 1041: 24,0 + 996: 24,0 - node: color: '#FFFFFFFF' id: SpaceStationSign3 decals: - 1040: 25,0 + 995: 25,0 - node: color: '#FFFFFFFF' id: SpaceStationSign4 decals: - 1036: 26,0 + 991: 26,0 - node: color: '#FFFFFFFF' id: SpaceStationSign5 decals: - 1037: 27,0 + 992: 27,0 - node: color: '#FFFFFFFF' id: SpaceStationSign6 decals: - 1038: 28,0 + 993: 28,0 - node: color: '#FFFFFFFF' id: SpaceStationSign7 decals: - 1039: 29,0 + 994: 29,0 - node: color: '#FED83DFF' id: StandClear @@ -4782,57 +4758,57 @@ entities: color: '#FFFFFFFF' id: StandClear decals: - 1137: -6,-17 - 1414: 8,29 - 1415: 9,29 + 1092: -6,-17 + 1369: 8,29 + 1370: 9,29 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale decals: - 2455: 49,4 - 2487: 70,8 + 2410: 49,4 + 2442: 70,8 - node: color: '#9FED5847' id: ThreeQuarterTileOverlayGreyscale decals: - 1746: 29,47 + 1701: 29,47 - node: color: '#9FED5896' id: ThreeQuarterTileOverlayGreyscale decals: - 2263: 76,-4 - 2360: 76,5 - 2454: 52,4 + 2218: 76,-4 + 2315: 76,5 + 2409: 52,4 - node: color: '#A4610696' id: ThreeQuarterTileOverlayGreyscale decals: - 1234: 7,28 + 1189: 7,28 - node: color: '#D381C996' id: ThreeQuarterTileOverlayGreyscale decals: - 2118: 47,11 + 2073: 47,11 - node: color: '#D4D4D428' id: ThreeQuarterTileOverlayGreyscale decals: - 1043: 25,-4 + 998: 25,-4 - node: color: '#DE3A3A47' id: ThreeQuarterTileOverlayGreyscale decals: - 1764: 22,47 + 1719: 22,47 - node: color: '#DE3A3A96' id: ThreeQuarterTileOverlayGreyscale decals: - 1189: -3,-4 + 1144: -3,-4 - node: color: '#EFB34128' id: ThreeQuarterTileOverlayGreyscale decals: - 1765: 19,46 + 1720: 19,46 - node: color: '#EFCC4193' id: ThreeQuarterTileOverlayGreyscale @@ -4844,48 +4820,48 @@ entities: color: '#EFCC4582' id: ThreeQuarterTileOverlayGreyscale decals: - 482: 19,-39 + 468: 19,-39 - node: color: '#34A2C0B2' id: ThreeQuarterTileOverlayGreyscale180 decals: - 955: 19,5 + 910: 19,5 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale180 decals: - 1813: 51,1 - 2434: 57,-8 - 2489: 75,7 - 2490: 74,4 + 1768: 51,1 + 2389: 57,-8 + 2444: 75,7 + 2445: 74,4 - node: color: '#9FED5896' id: ThreeQuarterTileOverlayGreyscale180 decals: - 2256: 82,-8 - 2387: 69,0 - 2399: 62,-8 + 2211: 82,-8 + 2342: 69,0 + 2354: 62,-8 - node: color: '#A4610696' id: ThreeQuarterTileOverlayGreyscale180 decals: - 1237: 15,20 + 1192: 15,20 - node: color: '#D4D4D428' id: ThreeQuarterTileOverlayGreyscale180 decals: - 1048: 27,-2 + 1003: 27,-2 - node: color: '#DE3A3A96' id: ThreeQuarterTileOverlayGreyscale180 decals: - 1191: -1,-6 - 1657: 27,25 + 1146: -1,-6 + 1612: 27,25 - node: color: '#EFCC2E82' id: ThreeQuarterTileOverlayGreyscale180 decals: - 755: 27,-26 + 710: 27,-26 - node: color: '#EFCC4193' id: ThreeQuarterTileOverlayGreyscale180 @@ -4895,48 +4871,48 @@ entities: color: '#EFCC4582' id: ThreeQuarterTileOverlayGreyscale180 decals: - 479: 23,-44 + 465: 23,-44 - node: color: '#34A2C0B2' id: ThreeQuarterTileOverlayGreyscale270 decals: - 954: 18,5 + 909: 18,5 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale270 decals: - 1811: 49,1 - 2433: 55,-8 - 2483: 70,4 + 1766: 49,1 + 2388: 55,-8 + 2438: 70,4 - node: color: '#9FED5896' id: ThreeQuarterTileOverlayGreyscale270 decals: - 2247: 76,-6 - 2260: 78,-8 - 2349: 52,2 - 2401: 59,-8 + 2202: 76,-6 + 2215: 78,-8 + 2304: 52,2 + 2356: 59,-8 - node: color: '#A4610696' id: ThreeQuarterTileOverlayGreyscale270 decals: - 1235: 7,21 - 1236: 13,20 + 1190: 7,21 + 1191: 13,20 - node: color: '#D4D4D428' id: ThreeQuarterTileOverlayGreyscale270 decals: - 1047: 25,-2 + 1002: 25,-2 - node: color: '#DE3A3A96' id: ThreeQuarterTileOverlayGreyscale270 decals: - 1190: -3,-6 + 1145: -3,-6 - node: color: '#EFCC2E82' id: ThreeQuarterTileOverlayGreyscale270 decals: - 754: 25,-26 + 709: 25,-26 - node: color: '#EFCC4193' id: ThreeQuarterTileOverlayGreyscale270 @@ -4947,50 +4923,50 @@ entities: color: '#EFCC4582' id: ThreeQuarterTileOverlayGreyscale270 decals: - 480: 19,-44 + 466: 19,-44 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale90 decals: - 2456: 51,4 - 2488: 75,8 + 2411: 51,4 + 2443: 75,8 - node: color: '#9FED5847' id: ThreeQuarterTileOverlayGreyscale90 decals: - 1747: 32,47 - 1748: 35,46 + 1702: 32,47 + 1703: 35,46 - node: color: '#9FED5896' id: ThreeQuarterTileOverlayGreyscale90 decals: - 1808: 52,0 - 2252: 82,-4 - 2359: 78,5 - 2448: 58,3 - 2453: 53,4 + 1763: 52,0 + 2207: 82,-4 + 2314: 78,5 + 2403: 58,3 + 2408: 53,4 - node: color: '#A4610696' id: ThreeQuarterTileOverlayGreyscale90 decals: - 1238: 15,25 - 1239: 13,28 + 1193: 15,25 + 1194: 13,28 - node: color: '#D4D4D428' id: ThreeQuarterTileOverlayGreyscale90 decals: - 1044: 27,-4 + 999: 27,-4 - node: color: '#DE3A3A47' id: ThreeQuarterTileOverlayGreyscale90 decals: - 1761: 25,47 + 1716: 25,47 - node: color: '#DE3A3A96' id: ThreeQuarterTileOverlayGreyscale90 decals: - 1188: -1,-4 - 1656: 27,22 + 1143: -1,-4 + 1611: 27,22 - node: color: '#EFCC4193' id: ThreeQuarterTileOverlayGreyscale90 @@ -5002,14 +4978,14 @@ entities: color: '#EFCC4582' id: ThreeQuarterTileOverlayGreyscale90 decals: - 481: 23,-39 + 467: 23,-39 - node: color: '#FFFFFFFF' id: VentSmall decals: - 1830: 23,-12 - 1831: 26,-8 - 1832: 30,-11 + 1785: 23,-12 + 1786: 26,-8 + 1787: 30,-11 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' @@ -5038,154 +5014,150 @@ entities: color: '#FFFFFFFF' id: WarnCornerNE decals: - 1632: 40,27 - 2294: 57,-14 + 1587: 40,27 + 2249: 57,-14 - node: color: '#FFFFFFFF' id: WarnCornerNW decals: 236: 55,10 247: 49,9 - 1631: 39,27 - 2293: 54,-14 - 2625: 36,-44 + 1586: 39,27 + 2248: 54,-14 + 2580: 36,-44 - node: color: '#FFFFFFFF' id: WarnCornerSE decals: - 1630: 40,26 - 2291: 57,-16 + 1585: 40,26 + 2246: 57,-16 - node: color: '#FFFFFFFF' id: WarnCornerSW decals: - 1633: 39,26 - 2292: 54,-16 + 1588: 39,26 + 2247: 54,-16 - node: color: '#FFFFFFFF' id: WarnCornerSmallGreyscaleNE decals: - 1935: 9,-7 + 1890: 9,-7 - node: color: '#FFFFFFFF' id: WarnCornerSmallGreyscaleSE decals: - 1936: 9,-8 + 1891: 9,-8 - node: color: '#FFFFFFFF' id: WarnCornerSmallNE decals: - 1413: 7,28 - 1642: 38,24 - 1665: 27,21 - 2606: 39,-49 + 1368: 7,28 + 1597: 38,24 + 1620: 27,21 + 2561: 39,-49 - node: color: '#FFFFFFFF' id: WarnCornerSmallNW decals: 237: 55,9 - 1412: 10,28 - 1641: 41,24 - 2605: 41,-49 + 1367: 10,28 + 1596: 41,24 + 2560: 41,-49 - node: color: '#FFFFFFFF' id: WarnCornerSmallSE decals: - 1136: -7,-15 - 1664: 27,26 - 2608: 39,-45 + 1091: -7,-15 + 1619: 27,26 + 2563: 39,-45 - node: color: '#FFFFFFFF' id: WarnCornerSmallSW decals: - 2607: 41,-45 + 2562: 41,-45 - node: color: '#FFFFFFFF' id: WarnFull decals: - 1639: 40,25 - 1640: 39,25 - 2287: 77,0 - 2290: 77,-3 + 1594: 40,25 + 1595: 39,25 + 2242: 77,0 + 2245: 77,-3 - node: color: '#52B4E996' id: WarnFullGreyscale decals: - 2481: 71,3 + 2436: 71,3 - node: color: '#D381C996' id: WarnFullGreyscale decals: - 2140: 57,18 + 2095: 57,18 - node: color: '#FFFFFFFF' id: WarnFullGreyscale decals: 402: 14,-35 - 451: 31,-38 - 452: 32,-38 - 486: 24,-40 - 487: 18,-40 - 1052: 28,-29 - 1053: 24,-29 - 1054: 31,-30 - 1055: 31,-34 - 1056: 26,-35 - 1057: 21,-34 - 1058: 21,-30 - 1262: 12,29 - 1266: 8,20 - 2471: 61,-9 + 441: 31,-38 + 442: 32,-38 + 1007: 28,-29 + 1008: 24,-29 + 1009: 31,-30 + 1010: 31,-34 + 1011: 26,-35 + 1012: 21,-34 + 1013: 21,-30 + 1217: 12,29 + 1221: 8,20 + 2426: 61,-9 - node: color: '#FFFFFFFF' id: WarnLineE decals: - 1660: 27,22 - 1661: 27,23 - 1662: 27,24 - 1663: 27,25 - 2296: 57,-15 - 2602: 39,-48 - 2603: 39,-46 - 2604: 39,-47 + 1615: 27,22 + 1616: 27,23 + 1617: 27,24 + 1618: 27,25 + 2251: 57,-15 + 2557: 39,-48 + 2558: 39,-46 + 2559: 39,-47 - node: color: '#9FED5896' id: WarnLineGreyscaleE decals: - 2406: 62,-6 + 2361: 62,-6 - node: color: '#D381C996' id: WarnLineGreyscaleE decals: - 2139: 56,18 + 2094: 56,18 - node: color: '#FFFFFFFF' id: WarnLineGreyscaleE decals: 380: 27,-29 401: 13,-35 - 484: 23,-40 - 489: 17,-40 - 1520: 24,20 - 1521: 24,21 - 1522: 24,23 - 1523: 24,22 - 1524: 24,24 - 1525: 24,25 - 1930: 9,-9 - 1931: 9,-10 - 1932: 9,-6 - 1933: 9,-5 - 1934: 9,-4 + 1475: 24,20 + 1476: 24,21 + 1477: 24,23 + 1478: 24,22 + 1479: 24,24 + 1480: 24,25 + 1885: 9,-9 + 1886: 9,-10 + 1887: 9,-6 + 1888: 9,-5 + 1889: 9,-4 - node: color: '#52B4E996' id: WarnLineGreyscaleN decals: - 2412: 61,0 - 2413: 60,0 - 2414: 58,0 - 2415: 57,0 - 2480: 71,2 + 2367: 61,0 + 2368: 60,0 + 2369: 58,0 + 2370: 57,0 + 2435: 71,2 - node: color: '#FFFFFFFF' id: WarnLineGreyscaleN @@ -5194,39 +5166,39 @@ entities: 376: 31,-35 377: 21,-35 378: 26,-28 - 453: 32,-39 - 454: 31,-39 - 485: 21,-39 - 1263: 12,28 - 1265: 8,19 - 1924: 10,-7 - 1925: 11,-7 - 1926: 12,-7 - 2408: 59,-4 - 2409: 60,-4 - 2410: 61,-4 - 2411: 62,-4 - 2442: 57,-4 - 2443: 56,-4 - 2444: 55,-4 + 443: 32,-39 + 444: 31,-39 + 469: 21,-39 + 1218: 12,28 + 1220: 8,19 + 1879: 10,-7 + 1880: 11,-7 + 1881: 12,-7 + 2363: 59,-4 + 2364: 60,-4 + 2365: 61,-4 + 2366: 62,-4 + 2397: 57,-4 + 2398: 56,-4 + 2399: 55,-4 - node: color: '#52B4E996' id: WarnLineGreyscaleS decals: - 2416: 61,-2 - 2417: 60,-2 - 2418: 58,-2 - 2419: 57,-2 - 2420: 59,-2 - 2439: 56,-8 + 2371: 61,-2 + 2372: 60,-2 + 2373: 58,-2 + 2374: 57,-2 + 2375: 59,-2 + 2394: 56,-8 - node: color: '#9FED5896' id: WarnLineGreyscaleS decals: - 2384: 77,1 - 2385: 72,1 - 2405: 61,-8 - 2407: 65,0 + 2339: 77,1 + 2340: 72,1 + 2360: 61,-8 + 2362: 65,0 - node: color: '#FFFFFFFF' id: WarnLineGreyscaleS @@ -5234,21 +5206,21 @@ entities: 381: 21,-29 382: 31,-37 383: 32,-37 - 733: 38,-37 - 734: 39,-37 - 735: 40,-37 - 858: 42,-8 - 1264: 14,20 - 1843: 8,21 - 1927: 12,-8 - 1928: 11,-8 - 1929: 10,-8 + 688: 38,-37 + 689: 39,-37 + 690: 40,-37 + 813: 42,-8 + 1219: 14,20 + 1798: 8,21 + 1882: 12,-8 + 1883: 11,-8 + 1884: 10,-8 - node: color: '#52B4E996' id: WarnLineGreyscaleW decals: - 2437: 55,-7 - 2438: 55,-5 + 2392: 55,-7 + 2393: 55,-5 - node: color: '#FFFFFFFF' id: WarnLineGreyscaleW @@ -5257,56 +5229,54 @@ entities: 384: 15,-35 386: 13,-28 387: 13,-27 - 483: 19,-40 - 488: 25,-40 - 499: 16,-42 - 859: 41,-4 - 1937: 8,-5 - 1938: 8,-4 - 1939: 8,-6 - 1940: 8,-7 - 1941: 8,-8 - 1942: 8,-9 - 1943: 8,-10 - 2500: 69,0 - 2501: 69,1 - 2502: 69,2 + 476: 16,-42 + 814: 41,-4 + 1892: 8,-5 + 1893: 8,-4 + 1894: 8,-6 + 1895: 8,-7 + 1896: 8,-8 + 1897: 8,-9 + 1898: 8,-10 + 2455: 69,0 + 2456: 69,1 + 2457: 69,2 - node: color: '#FFFFFFFF' id: WarnLineN decals: - 1135: -6,-15 - 2090: 51,13 - 2091: 50,13 - 2092: 49,13 - 2288: 78,-2 - 2289: 77,-2 - 2297: 56,-16 - 2298: 55,-16 - 2423: 61,-2 - 2424: 60,-2 - 2425: 59,-2 - 2426: 58,-2 - 2427: 57,-2 - 2597: 40,-45 + 1090: -6,-15 + 2045: 51,13 + 2046: 50,13 + 2047: 49,13 + 2243: 78,-2 + 2244: 77,-2 + 2252: 56,-16 + 2253: 55,-16 + 2378: 61,-2 + 2379: 60,-2 + 2380: 59,-2 + 2381: 58,-2 + 2382: 57,-2 + 2552: 40,-45 - node: color: '#FFFFFFFF' id: WarnLineS decals: - 2295: 54,-15 - 2598: 41,-46 - 2599: 41,-47 - 2600: 41,-48 - 2614: 46,-49 - 2615: 46,-48 - 2616: 46,-47 - 2617: 46,-46 - 2618: 46,-45 - 2634: 36,-49 - 2635: 36,-48 - 2636: 36,-47 - 2637: 36,-46 - 2638: 36,-45 + 2250: 54,-15 + 2553: 41,-46 + 2554: 41,-47 + 2555: 41,-48 + 2569: 46,-49 + 2570: 46,-48 + 2571: 46,-47 + 2572: 46,-46 + 2573: 46,-45 + 2589: 36,-49 + 2590: 36,-48 + 2591: 36,-47 + 2592: 36,-46 + 2593: 36,-45 - node: color: '#FFFFFFFF' id: WarnLineW @@ -5322,34 +5292,34 @@ entities: 240: 52,9 245: 51,9 246: 50,9 - 799: 22,-16 - 800: 21,-16 - 801: 20,-16 - 1410: 8,28 - 1411: 9,28 - 1637: 40,24 - 1638: 39,24 - 2093: 51,15 - 2094: 50,15 - 2095: 49,15 - 2285: 77,-1 - 2286: 78,-1 - 2299: 56,-14 - 2300: 55,-14 - 2428: 61,0 - 2429: 60,0 - 2430: 59,0 - 2431: 58,0 - 2432: 57,0 - 2601: 40,-49 - 2626: 37,-44 - 2627: 38,-44 - 2628: 39,-44 - 2629: 40,-44 - 2630: 41,-44 - 2631: 42,-44 - 2632: 44,-44 - 2633: 43,-44 + 754: 22,-16 + 755: 21,-16 + 756: 20,-16 + 1365: 8,28 + 1366: 9,28 + 1592: 40,24 + 1593: 39,24 + 2048: 51,15 + 2049: 50,15 + 2050: 49,15 + 2240: 77,-1 + 2241: 78,-1 + 2254: 56,-14 + 2255: 55,-14 + 2383: 61,0 + 2384: 60,0 + 2385: 59,0 + 2386: 58,0 + 2387: 57,0 + 2556: 40,-49 + 2581: 37,-44 + 2582: 38,-44 + 2583: 39,-44 + 2584: 40,-44 + 2585: 41,-44 + 2586: 42,-44 + 2587: 44,-44 + 2588: 43,-44 - node: color: '#FED83DFF' id: WarningLine @@ -5383,587 +5353,564 @@ entities: color: '#FFFFFFFF' id: WoodTrimThinCornerNe decals: - 1903: 20,-3 + 1858: 20,-3 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerNw decals: - 1901: 18,-3 + 1856: 18,-3 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerSe decals: - 1906: 20,-6 + 1861: 20,-6 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerSw decals: - 1898: 18,-6 + 1853: 18,-6 - node: color: '#FFFFFFFF' id: WoodTrimThinLineE decals: - 832: 40,-13 - 833: 40,-12 - 834: 40,-11 - 835: 40,-10 - 1822: 21,-13 - 1823: 21,-12 - 1824: 21,-11 - 1825: 21,-10 - 1904: 20,-4 - 1905: 20,-5 + 787: 40,-13 + 788: 40,-12 + 789: 40,-11 + 790: 40,-10 + 1777: 21,-13 + 1778: 21,-12 + 1779: 21,-11 + 1780: 21,-10 + 1859: 20,-4 + 1860: 20,-5 - node: color: '#FFFFFFFF' id: WoodTrimThinLineN decals: - 1139: -2,-11 - 1140: -3,-11 - 1141: -4,-11 - 1902: 19,-3 + 1094: -2,-11 + 1095: -3,-11 + 1096: -4,-11 + 1857: 19,-3 - node: color: '#FFFFFFFF' id: WoodTrimThinLineS decals: - 1907: 19,-6 - 2643: 36,43 + 1862: 19,-6 + 2598: 36,43 - node: color: '#FFFFFFFF' id: WoodTrimThinLineW decals: - 828: 38,-13 - 829: 38,-12 - 830: 38,-11 - 831: 38,-10 - 1899: 18,-5 - 1900: 18,-4 + 783: 38,-13 + 784: 38,-12 + 785: 38,-11 + 786: 38,-10 + 1854: 18,-5 + 1855: 18,-4 - node: cleanable: True angle: -4.71238898038469 rad color: '#00000060' id: footprint decals: - 1319: 8.005591,29.808443 - 1320: 8.443091,30.551498 - 1321: 7.7903137,30.363998 - 1322: 7.5403137,30.107054 - 1323: 6.6653137,30.752888 - 1324: 7.7486477,31.218166 - 1325: 7.929203,31.732056 - 1326: 8.665314,31.08622 - 1327: 7.4153137,31.32233 - 1328: 8.116703,30.454277 - 1329: 8.651425,31.044556 - 1339: 7.8406677,26.12399 - 1340: 8.559418,25.93649 - 1341: 8.918793,26.452114 - 1342: 7.8875427,25.56149 + 1274: 8.005591,29.808443 + 1275: 8.443091,30.551498 + 1276: 7.7903137,30.363998 + 1277: 7.5403137,30.107054 + 1278: 6.6653137,30.752888 + 1279: 7.7486477,31.218166 + 1280: 7.929203,31.732056 + 1281: 8.665314,31.08622 + 1282: 7.4153137,31.32233 + 1283: 8.116703,30.454277 + 1284: 8.651425,31.044556 + 1294: 7.8406677,26.12399 + 1295: 8.559418,25.93649 + 1296: 8.918793,26.452114 + 1297: 7.8875427,25.56149 - node: cleanable: True angle: -3.141592653589793 rad color: '#00000060' id: footprint decals: - 1330: 7.9222584,30.25727 - 1331: 8.206981,29.875326 - 1332: 8.054203,29.31977 - 1333: 8.387536,28.916994 - 1334: 8.068091,28.375326 - 1335: 8.401425,28.000326 - 1336: 8.165314,27.666994 - 1337: 8.540314,27.41005 - 1338: 9.262536,27.312826 + 1285: 7.9222584,30.25727 + 1286: 8.206981,29.875326 + 1287: 8.054203,29.31977 + 1288: 8.387536,28.916994 + 1289: 8.068091,28.375326 + 1290: 8.401425,28.000326 + 1291: 8.165314,27.666994 + 1292: 8.540314,27.41005 + 1293: 9.262536,27.312826 - node: angle: -1.5707963267948966 rad color: '#00000060' id: footprint decals: - 1455: 8.091304,16.603054 - 1456: 8.320471,16.964165 - 1457: 7.820471,17.39472 - 1458: 8.362137,16.922499 - 1459: 8.091304,17.797499 - 1460: 8.132971,18.061386 - 1461: 7.834359,18.25583 - 1462: 8.382971,18.450275 - 1463: 8.445471,17.83222 + 1410: 8.091304,16.603054 + 1411: 8.320471,16.964165 + 1412: 7.820471,17.39472 + 1413: 8.362137,16.922499 + 1414: 8.091304,17.797499 + 1415: 8.132971,18.061386 + 1416: 7.834359,18.25583 + 1417: 8.382971,18.450275 + 1418: 8.445471,17.83222 - node: cleanable: True angle: -1.5707963267948966 rad color: '#00000060' id: footprint decals: - 1308: 6.5194807,30.009832 - 1309: 6.887536,30.565388 - 1310: 7.1514254,30.093164 - 1311: 7.5194807,30.676498 - 1312: 8.200036,30.113998 - 1313: 8.422258,30.940388 - 1314: 9.026425,30.315388 - 1315: 6.450036,31.676498 - 1316: 7.241703,31.891777 - 1317: 8.130591,31.03761 - 1318: 7.026425,31.35011 - 1343: 11.25042,22.296373 - 1344: 12.234795,21.765123 - 1345: 12.703545,22.343248 - 1346: 13.734795,21.671373 - 1347: 14.53167,22.202623 - 1348: 14.93792,21.390123 + 1263: 6.5194807,30.009832 + 1264: 6.887536,30.565388 + 1265: 7.1514254,30.093164 + 1266: 7.5194807,30.676498 + 1267: 8.200036,30.113998 + 1268: 8.422258,30.940388 + 1269: 9.026425,30.315388 + 1270: 6.450036,31.676498 + 1271: 7.241703,31.891777 + 1272: 8.130591,31.03761 + 1273: 7.026425,31.35011 + 1298: 11.25042,22.296373 + 1299: 12.234795,21.765123 + 1300: 12.703545,22.343248 + 1301: 13.734795,21.671373 + 1302: 14.53167,22.202623 + 1303: 14.93792,21.390123 - node: color: '#00000060' id: footprint decals: - 1472: 8.546305,22.79264 - 1473: 10.350877,23.736956 + 1427: 8.546305,22.79264 + 1428: 10.350877,23.736956 - node: cleanable: True color: '#00000060' id: footprint decals: - 1298: 8.831981,27.987852 - 1299: 9.005591,28.265629 - 1300: 8.769481,28.494795 - 1301: 9.054203,28.842018 - 1302: 8.755591,29.147573 - 1303: 9.109758,29.473963 - 1304: 8.762536,29.828129 - 1305: 9.088925,30.078129 - 1306: 8.755591,30.522573 - 1307: 9.081981,30.522573 - 1357: 13.708358,19.952623 - 1358: 14.145858,20.890123 - 1359: 13.630233,21.452623 - 1360: 13.739608,20.593248 - 1361: 14.130233,20.265123 - 1362: 13.661483,21.890123 - 1363: 14.036483,22.343248 - 1364: 13.458358,23.327623 - 1365: 14.020858,23.452623 - 1366: 14.005233,24.218248 - 1367: 13.645858,22.858873 - 1436: 7.237137,16.09611 - 1437: 7.7232485,16.464165 - 1438: 7.362137,16.915554 - 1439: 7.917693,17.665554 - 1440: 7.521859,18.13083 - 1441: 7.980193,18.56833 - 1442: 7.882971,19.109999 - 1474: 10.046046,23.44008 - 1475: 7.2491713,26.34633 - 1476: 8.389796,26.674456 - 1477: 13.452296,20.69008 - 1478: 13.467921,21.31508 - 1479: 8.999171,26.4967 - 1480: 8.046046,27.90295 - 1481: 8.624171,27.59045 - 1482: 8.983546,28.09045 - 1483: 8.608546,29.3092 + 1253: 8.831981,27.987852 + 1254: 9.005591,28.265629 + 1255: 8.769481,28.494795 + 1256: 9.054203,28.842018 + 1257: 8.755591,29.147573 + 1258: 9.109758,29.473963 + 1259: 8.762536,29.828129 + 1260: 9.088925,30.078129 + 1261: 8.755591,30.522573 + 1262: 9.081981,30.522573 + 1312: 13.708358,19.952623 + 1313: 14.145858,20.890123 + 1314: 13.630233,21.452623 + 1315: 13.739608,20.593248 + 1316: 14.130233,20.265123 + 1317: 13.661483,21.890123 + 1318: 14.036483,22.343248 + 1319: 13.458358,23.327623 + 1320: 14.020858,23.452623 + 1321: 14.005233,24.218248 + 1322: 13.645858,22.858873 + 1391: 7.237137,16.09611 + 1392: 7.7232485,16.464165 + 1393: 7.362137,16.915554 + 1394: 7.917693,17.665554 + 1395: 7.521859,18.13083 + 1396: 7.980193,18.56833 + 1397: 7.882971,19.109999 + 1429: 10.046046,23.44008 + 1430: 7.2491713,26.34633 + 1431: 8.389796,26.674456 + 1432: 13.452296,20.69008 + 1433: 13.467921,21.31508 + 1434: 8.999171,26.4967 + 1435: 8.046046,27.90295 + 1436: 8.624171,27.59045 + 1437: 8.983546,28.09045 + 1438: 8.608546,29.3092 - node: angle: 1.5707963267948966 rad color: '#00000060' id: footprint decals: - 1464: 7.966304,16.290554 - 1465: 7.626026,15.89472 - 1466: 6.952415,16.39472 - 1467: 6.9801927,15.866943 - 1468: 6.834359,17.01972 - 1469: 6.876026,17.748886 - 1470: 7.542693,18.01972 - 1471: 7.709359,19.228054 + 1419: 7.966304,16.290554 + 1420: 7.626026,15.89472 + 1421: 6.952415,16.39472 + 1422: 6.9801927,15.866943 + 1423: 6.834359,17.01972 + 1424: 6.876026,17.748886 + 1425: 7.542693,18.01972 + 1426: 7.709359,19.228054 - node: cleanable: True angle: 1.5707963267948966 rad color: '#00000060' id: footprint decals: - 1349: 14.972425,21.077623 - 1350: 14.316175,21.655748 - 1351: 13.8318,21.202623 - 1352: 13.003675,21.843248 - 1353: 12.534925,21.390123 - 1354: 11.6443,21.843248 - 1355: 10.972425,21.468248 + 1304: 14.972425,21.077623 + 1305: 14.316175,21.655748 + 1306: 13.8318,21.202623 + 1307: 13.003675,21.843248 + 1308: 12.534925,21.390123 + 1309: 11.6443,21.843248 + 1310: 10.972425,21.468248 - node: cleanable: True angle: 3.141592653589793 rad color: '#00000060' id: footprint decals: - 1443: 6.8551927,16.728054 - 1444: 7.570471,17.200275 - 1445: 7.1607485,17.623886 - 1446: 8.2649145,17.76972 - 1447: 7.7857485,18.45722 - 1448: 8.2440815,18.929443 - 1449: 8.2232485,18.65861 - 1450: 8.132971,18.03361 - 1451: 7.292692,18.554443 - 1452: 7.8274145,17.075275 - 1453: 7.167692,16.964165 - 1454: 7.4732485,16.31833 + 1398: 6.8551927,16.728054 + 1399: 7.570471,17.200275 + 1400: 7.1607485,17.623886 + 1401: 8.2649145,17.76972 + 1402: 7.7857485,18.45722 + 1403: 8.2440815,18.929443 + 1404: 8.2232485,18.65861 + 1405: 8.132971,18.03361 + 1406: 7.292692,18.554443 + 1407: 7.8274145,17.075275 + 1408: 7.167692,16.964165 + 1409: 7.4732485,16.31833 - node: cleanable: True angle: 6.283185307179586 rad color: '#00000060' id: footprint decals: - 1356: 7.894642,22.655748 + 1311: 7.894642,22.655748 - node: cleanable: True color: '#0000065D' id: footprint decals: - 1857: 8.153207,20.861673 - 1858: 8.434457,21.127298 - 1859: 8.215707,21.486673 - 1860: 8.512582,21.892923 - 1861: 8.309457,22.142923 - 1862: 8.731332,22.627298 - 1863: 8.496957,23.517923 - 1864: 8.262582,24.096048 + 1812: 8.153207,20.861673 + 1813: 8.434457,21.127298 + 1814: 8.215707,21.486673 + 1815: 8.512582,21.892923 + 1816: 8.309457,22.142923 + 1817: 8.731332,22.627298 + 1818: 8.496957,23.517923 + 1819: 8.262582,24.096048 - node: cleanable: True angle: 1.5707963267948966 rad color: '#0000065D' id: footprint decals: - 1879: 9.684457,21.892923 - 1880: 8.856332,22.736673 - 1881: 8.856332,22.721048 - 1882: 10.309457,22.674173 - 1883: 11.246957,22.017923 - 1884: 10.028207,22.033548 - 1885: 10.215707,22.627298 - 1886: 9.262582,22.174173 - 1887: 9.106332,22.221048 + 1834: 9.684457,21.892923 + 1835: 8.856332,22.736673 + 1836: 8.856332,22.721048 + 1837: 10.309457,22.674173 + 1838: 11.246957,22.017923 + 1839: 10.028207,22.033548 + 1840: 10.215707,22.627298 + 1841: 9.262582,22.174173 + 1842: 9.106332,22.221048 - node: cleanable: True angle: 3.141592653589793 rad color: '#0000065D' id: footprint decals: - 1865: 7.856332,21.033548 - 1866: 8.215707,21.408548 - 1867: 7.950082,21.892923 - 1868: 8.762582,22.283548 - 1869: 8.293832,23.142923 - 1870: 8.965707,23.392923 + 1820: 7.856332,21.033548 + 1821: 8.215707,21.408548 + 1822: 7.950082,21.892923 + 1823: 8.762582,22.283548 + 1824: 8.293832,23.142923 + 1825: 8.965707,23.392923 - node: cleanable: True angle: 4.71238898038469 rad color: '#0000065D' id: footprint decals: - 1871: 8.762582,21.236673 - 1872: 9.184457,21.986673 - 1873: 9.731332,21.486673 - 1874: 9.762582,22.346048 - 1875: 10.543832,21.799173 - 1876: 10.918832,22.111673 - 1877: 11.606332,21.705423 - 1878: 12.215707,22.096048 + 1826: 8.762582,21.236673 + 1827: 9.184457,21.986673 + 1828: 9.731332,21.486673 + 1829: 9.762582,22.346048 + 1830: 10.543832,21.799173 + 1831: 10.918832,22.111673 + 1832: 11.606332,21.705423 + 1833: 12.215707,22.096048 - node: cleanable: True angle: -4.71238898038469 rad color: '#47422E3E' id: footprint decals: - 606: 20.73215,-33.21596 - 607: 20.810274,-32.762836 - 608: 21.0759,-33.02846 - 609: 20.904024,-32.09096 - 610: 20.685274,-31.528461 - 611: 21.2634,-31.528461 - 612: 20.622774,-31.559711 - 613: 21.2009,-32.450336 - 614: 20.997774,-31.825336 + 561: 20.73215,-33.21596 + 562: 20.810274,-32.762836 + 563: 21.0759,-33.02846 + 564: 20.904024,-32.09096 + 565: 20.685274,-31.528461 + 566: 21.2634,-31.528461 + 567: 20.622774,-31.559711 + 568: 21.2009,-32.450336 + 569: 20.997774,-31.825336 - node: cleanable: True angle: -3.141592653589793 rad color: '#47422E3E' id: footprint decals: - 643: 18.380388,-29.024849 - 644: 18.271013,-28.618599 - 645: 19.052263,-28.993599 + 598: 18.380388,-29.024849 + 599: 18.271013,-28.618599 + 600: 19.052263,-28.993599 - node: angle: -1.5707963267948966 rad color: '#47422E3E' id: footprint decals: - 540: 18.842302,-40.29173 - 541: 19.203413,-39.833397 - 542: 19.627026,-40.31256 - 543: 20.231192,-39.784786 - 544: 20.363136,-40.22923 + 511: 19.627026,-40.31256 + 512: 20.231192,-39.784786 + 513: 20.363136,-40.22923 - node: cleanable: True angle: -1.5707963267948966 rad color: '#47422E3E' id: footprint decals: - 599: 31.110344,-32.87221 - 600: 30.782219,-32.387836 - 601: 30.672844,-32.825336 - 602: 29.954094,-32.356586 - 603: 29.922844,-32.93471 - 604: 29.204094,-32.37221 - 605: 29.235344,-33.044086 - 646: 19.366499,-28.623808 - 647: 18.387333,-29.09603 - 648: 18.706778,-28.734919 - 649: 19.366499,-29.075195 - 650: 19.838722,-28.554363 - 651: 20.41511,-28.866863 - 652: 20.310944,-28.255753 - 653: 21.019278,-28.776585 - 654: 21.470667,-28.387695 - 655: 21.998444,-28.922419 - 656: 22.352612,-28.540474 - 657: 22.92456,-29.193253 - 658: 23.306505,-28.811308 - 689: 14.771467,-35.430984 - 690: 15.127949,-35.1208 - 691: 15.553875,-35.36617 - 692: 16.271467,-34.86154 - 693: 16.544615,-35.22728 - 694: 17.183504,-34.74117 - 695: 17.502949,-35.222652 - 718: 26.49693,-36.713375 - 719: 27.137554,-36.369625 - 720: 27.46568,-36.69775 - 721: 28.02818,-36.275875 - 722: 28.668804,-36.588375 - 723: 29.15318,-36.088375 - 724: 29.856304,-36.604 - 725: 30.325054,-36.104 - 726: 30.856304,-36.604 - 727: 21.875406,-36.6665 - 728: 22.328531,-36.1665 - 729: 23.266031,-36.604 - 730: 23.500406,-36.119625 - 731: 24.422281,-36.463375 - 732: 25.219156,-36.400875 + 554: 31.110344,-32.87221 + 555: 30.782219,-32.387836 + 556: 30.672844,-32.825336 + 557: 29.954094,-32.356586 + 558: 29.922844,-32.93471 + 559: 29.204094,-32.37221 + 560: 29.235344,-33.044086 + 601: 19.366499,-28.623808 + 602: 18.387333,-29.09603 + 603: 18.706778,-28.734919 + 604: 19.366499,-29.075195 + 605: 19.838722,-28.554363 + 606: 20.41511,-28.866863 + 607: 20.310944,-28.255753 + 608: 21.019278,-28.776585 + 609: 21.470667,-28.387695 + 610: 21.998444,-28.922419 + 611: 22.352612,-28.540474 + 612: 22.92456,-29.193253 + 613: 23.306505,-28.811308 + 644: 14.771467,-35.430984 + 645: 15.127949,-35.1208 + 646: 15.553875,-35.36617 + 647: 16.271467,-34.86154 + 648: 16.544615,-35.22728 + 649: 17.183504,-34.74117 + 650: 17.502949,-35.222652 + 673: 26.49693,-36.713375 + 674: 27.137554,-36.369625 + 675: 27.46568,-36.69775 + 676: 28.02818,-36.275875 + 677: 28.668804,-36.588375 + 678: 29.15318,-36.088375 + 679: 29.856304,-36.604 + 680: 30.325054,-36.104 + 681: 30.856304,-36.604 + 682: 21.875406,-36.6665 + 683: 22.328531,-36.1665 + 684: 23.266031,-36.604 + 685: 23.500406,-36.119625 + 686: 24.422281,-36.463375 + 687: 25.219156,-36.400875 - node: color: '#47422E3E' id: footprint decals: - 545: 20.606192,-39.257008 - 546: 21.106192,-38.76395 - 547: 20.752026,-38.722286 - 548: 21.085358,-39.21534 - 549: 20.606192,-39.21534 - 550: 19.078413,-40.36812 - 551: 16.110773,-41.92628 - 552: 16.312162,-40.836002 - 553: 15.944107,-40.405445 - 554: 16.944107,-39.80128 - 555: 17.013552,-41.03739 - 556: 16.124662,-41.55128 - 557: 16.194107,-40.780445 - 558: 16.582996,-40.947113 - 559: 16.763552,-40.342945 - 572: 21.153759,-38.723778 - 573: 20.771816,-38.58489 - 574: 21.077372,-38.26544 - 575: 20.730148,-37.89044 - 576: 21.209316,-37.64739 - 577: 21.056538,-37.286278 - 578: 21.227804,-36.8777 - 579: 20.790304,-36.912422 - 580: 20.873638,-36.572144 + 514: 20.606192,-39.257008 + 515: 21.106192,-38.76395 + 516: 20.752026,-38.722286 + 517: 21.085358,-39.21534 + 518: 20.606192,-39.21534 + 519: 16.110773,-41.92628 + 520: 16.312162,-40.836002 + 521: 15.944107,-40.405445 + 522: 16.124662,-41.55128 + 523: 16.194107,-40.780445 + 527: 21.153759,-38.723778 + 528: 20.771816,-38.58489 + 529: 21.077372,-38.26544 + 530: 20.730148,-37.89044 + 531: 21.209316,-37.64739 + 532: 21.056538,-37.286278 + 533: 21.227804,-36.8777 + 534: 20.790304,-36.912422 + 535: 20.873638,-36.572144 - node: cleanable: True color: '#47422E3E' id: footprint decals: - 581: 20.741693,-37.148533 - 582: 21.08197,-36.669365 - 583: 21.352804,-37.419365 - 584: 20.998638,-37.009644 - 585: 20.53336,-36.822144 - 586: 21.276415,-36.558254 - 587: 21.200026,-36.23881 - 588: 20.727804,-36.07909 - 589: 20.838915,-35.481865 - 590: 20.991693,-35.842976 - 591: 21.262526,-35.099922 - 592: 25.855373,-34.212444 - 593: 26.214748,-34.056194 - 594: 25.964748,-33.868694 - 595: 26.402248,-33.54057 - 596: 25.995998,-33.337444 - 597: 25.995998,-32.72807 - 598: 26.433498,-32.88432 - 615: 21.16965,-32.87221 - 616: 21.216524,-32.262836 - 617: 20.8259,-31.512836 - 618: 21.23215,-31.059711 - 619: 30.827486,-32.65346 - 620: 31.030611,-32.044086 - 621: 31.233734,-31.387836 - 622: 31.046236,-30.919086 - 623: 30.874361,-30.903461 - 624: 30.796236,-31.653461 - 625: 30.702486,-31.387836 - 626: 21.688553,-32.68471 - 627: 17.800251,-34.731586 - 628: 17.409626,-33.87221 - 629: 17.925251,-33.075336 - 630: 17.409626,-32.606586 - 631: 18.050251,-31.887836 - 632: 17.534626,-31.450336 - 633: 30.89618,-34.87221 - 634: 30.818054,-33.231586 - 635: 31.474304,-32.606586 - 636: 31.17743,-32.106586 - 637: 21.083513,-29.290474 - 638: 20.739763,-28.759224 - 639: 21.536638,-27.946724 - 640: 20.599138,-27.556099 - 641: 21.349138,-26.587349 - 642: 20.724138,-25.931099 + 536: 20.741693,-37.148533 + 537: 21.08197,-36.669365 + 538: 21.352804,-37.419365 + 539: 20.998638,-37.009644 + 540: 20.53336,-36.822144 + 541: 21.276415,-36.558254 + 542: 21.200026,-36.23881 + 543: 20.727804,-36.07909 + 544: 20.838915,-35.481865 + 545: 20.991693,-35.842976 + 546: 21.262526,-35.099922 + 547: 25.855373,-34.212444 + 548: 26.214748,-34.056194 + 549: 25.964748,-33.868694 + 550: 26.402248,-33.54057 + 551: 25.995998,-33.337444 + 552: 25.995998,-32.72807 + 553: 26.433498,-32.88432 + 570: 21.16965,-32.87221 + 571: 21.216524,-32.262836 + 572: 20.8259,-31.512836 + 573: 21.23215,-31.059711 + 574: 30.827486,-32.65346 + 575: 31.030611,-32.044086 + 576: 31.233734,-31.387836 + 577: 31.046236,-30.919086 + 578: 30.874361,-30.903461 + 579: 30.796236,-31.653461 + 580: 30.702486,-31.387836 + 581: 21.688553,-32.68471 + 582: 17.800251,-34.731586 + 583: 17.409626,-33.87221 + 584: 17.925251,-33.075336 + 585: 17.409626,-32.606586 + 586: 18.050251,-31.887836 + 587: 17.534626,-31.450336 + 588: 30.89618,-34.87221 + 589: 30.818054,-33.231586 + 590: 31.474304,-32.606586 + 591: 31.17743,-32.106586 + 592: 21.083513,-29.290474 + 593: 20.739763,-28.759224 + 594: 21.536638,-27.946724 + 595: 20.599138,-27.556099 + 596: 21.349138,-26.587349 + 597: 20.724138,-25.931099 - node: angle: 1.5707963267948966 rad color: '#47422E3E' id: footprint decals: - 564: 17.188082,-40.308224 - 565: 16.083914,-42.09989 - 566: 15.889469,-41.794334 + 525: 16.083914,-42.09989 + 526: 15.889469,-41.794334 - node: cleanable: True angle: 1.5707963267948966 rad color: '#47422E3E' id: footprint decals: - 696: 17.516838,-35.393948 - 697: 16.8548,-34.912464 - 698: 16.808504,-35.310616 - 699: 15.9103565,-34.88006 - 700: 15.822393,-35.71339 - 701: 14.984429,-35.2458 - 702: 15.961281,-35.704132 - 703: 16.516838,-35.61617 - 704: 16.276096,-34.875427 - 705: 17.178875,-34.60228 - 706: 17.512207,-34.14858 - 707: 17.164986,-35.583763 - 708: 18.735516,-36.577396 - 709: 18.00114,-35.858646 - 710: 19.15739,-36.421146 - 711: 19.90739,-36.858646 - 712: 20.079266,-36.608646 - 713: 18.78239,-35.983646 - 714: 19.25114,-36.702396 - 715: 20.266766,-36.03052 - 716: 21.485516,-36.56177 - 717: 20.25114,-36.514896 + 651: 17.516838,-35.393948 + 652: 16.8548,-34.912464 + 653: 16.808504,-35.310616 + 654: 15.9103565,-34.88006 + 655: 15.822393,-35.71339 + 656: 14.984429,-35.2458 + 657: 15.961281,-35.704132 + 658: 16.516838,-35.61617 + 659: 16.276096,-34.875427 + 660: 17.178875,-34.60228 + 661: 17.512207,-34.14858 + 662: 17.164986,-35.583763 + 663: 18.735516,-36.577396 + 664: 18.00114,-35.858646 + 665: 19.15739,-36.421146 + 666: 19.90739,-36.858646 + 667: 20.079266,-36.608646 + 668: 18.78239,-35.983646 + 669: 19.25114,-36.702396 + 670: 20.266766,-36.03052 + 671: 21.485516,-36.56177 + 672: 20.25114,-36.514896 - node: angle: 3.141592653589793 rad color: '#47422E3E' id: footprint decals: - 560: 16.563082,-41.80128 - 561: 16.215858,-41.66239 - 562: 16.806137,-40.704056 - 563: 17.250582,-39.947113 - - node: - angle: 4.71238898038469 rad - color: '#47422E3E' - id: footprint - decals: - 567: 17.215858,-40.42628 - 568: 17.188082,-40.572113 - 569: 17.097803,-39.933224 - 570: 16.792248,-40.336002 - 571: 16.632524,-39.933224 + 524: 16.215858,-41.66239 - node: angle: -4.71238898038469 rad color: '#47422E8B' id: footprint decals: - 536: 19.2243,-40.044228 - 537: 19.432632,-39.67386 - 538: 19.872448,-39.76645 - 539: 20.455782,-39.363674 + 508: 19.432632,-39.67386 + 509: 19.872448,-39.76645 + 510: 20.455782,-39.363674 - node: angle: -3.141592653589793 rad color: '#47422E8B' id: footprint decals: - 532: 16.144655,-41.73583 - 533: 16.436321,-41.476566 - 534: 16.311321,-41.008976 - 535: 16.644655,-40.768234 + 505: 16.144655,-41.73583 + 506: 16.436321,-41.476566 + 507: 16.311321,-41.008976 - node: color: '#FFFFFFFF' id: ghost decals: - 2513: 13,-11 + 2468: 13,-11 - node: color: '#D4D4D428' id: guy decals: - 2514: 40,-19 + 2469: 40,-19 - node: cleanable: True color: '#DE3A3A12' id: splatter decals: - 900: 30.439373,-12.749766 - 901: 30.454998,-12.437266 - 902: 30.751873,-12.421641 - 903: 31.048748,-12.843516 - 904: 30.501873,-12.812266 - 905: 30.361248,-12.640391 - 906: 30.376873,-13.031016 - 907: 30.611248,-12.562266 - 908: 30.908123,-12.390391 - 909: 31.142498,-12.093516 - 910: 30.658123,-11.812266 - 911: 30.454998,-11.890391 - 912: 30.439373,-12.327891 - 913: 30.361248,-12.577891 - 914: 30.017498,-12.343516 - 915: 29.861248,-11.921641 - 916: 30.376873,-11.343516 - 917: 30.876873,-11.531016 + 855: 30.439373,-12.749766 + 856: 30.454998,-12.437266 + 857: 30.751873,-12.421641 + 858: 31.048748,-12.843516 + 859: 30.501873,-12.812266 + 860: 30.361248,-12.640391 + 861: 30.376873,-13.031016 + 862: 30.611248,-12.562266 + 863: 30.908123,-12.390391 + 864: 31.142498,-12.093516 + 865: 30.658123,-11.812266 + 866: 30.454998,-11.890391 + 867: 30.439373,-12.327891 + 868: 30.361248,-12.577891 + 869: 30.017498,-12.343516 + 870: 29.861248,-11.921641 + 871: 30.376873,-11.343516 + 872: 30.876873,-11.531016 - node: cleanable: True color: '#DE3A3A22' id: splatter decals: - 918: 30.736248,-12.531016 - 919: 29.954998,-11.531016 - 920: 29.470623,-11.749766 + 873: 30.736248,-12.531016 + 874: 29.954998,-11.531016 + 875: 29.470623,-11.749766 - node: cleanable: True color: '#DE3A3A34' id: splatter decals: - 2318: 55.674343,-15.3125925 - 2319: 55.455593,-15.1407175 - 2320: 55.830593,-14.9219675 - 2321: 56.018093,-15.0313425 - 2322: 56.205593,-15.2969675 - 2323: 55.65872,-15.3594675 - 2324: 55.50247,-15.4375925 - 2325: 55.861843,-15.3125925 - 2326: 55.893093,-15.3125925 - 2327: 55.68997,-15.3282175 - 2328: 55.75247,-15.1407175 - 2329: 56.12747,-15.1563425 - 2330: 55.40872,-15.7813425 - 2331: 55.34622,-15.6719675 - 2332: 55.111843,-15.8438425 - 2333: 55.09622,-16.531342 - 2334: 55.174343,-14.3750925 - 2335: 55.549343,-14.7657175 - 2336: 56.455593,-14.1563425 - 2337: 57.111843,-16.250092 + 2273: 55.674343,-15.3125925 + 2274: 55.455593,-15.1407175 + 2275: 55.830593,-14.9219675 + 2276: 56.018093,-15.0313425 + 2277: 56.205593,-15.2969675 + 2278: 55.65872,-15.3594675 + 2279: 55.50247,-15.4375925 + 2280: 55.861843,-15.3125925 + 2281: 55.893093,-15.3125925 + 2282: 55.68997,-15.3282175 + 2283: 55.75247,-15.1407175 + 2284: 56.12747,-15.1563425 + 2285: 55.40872,-15.7813425 + 2286: 55.34622,-15.6719675 + 2287: 55.111843,-15.8438425 + 2288: 55.09622,-16.531342 + 2289: 55.174343,-14.3750925 + 2290: 55.549343,-14.7657175 + 2291: 56.455593,-14.1563425 + 2292: 57.111843,-16.250092 - type: OccluderTree - type: Shuttle - type: GridPathfinding @@ -6913,21 +6860,21 @@ entities: parent: 2 - proto: AirlockAtmosphericsGlassLocked entities: - - uid: 4773 + - uid: 4638 + components: + - type: Transform + pos: 38.5,-37.5 + parent: 2 + - uid: 4639 components: - type: Transform pos: 40.5,-37.5 parent: 2 - - uid: 4774 + - uid: 4640 components: - type: Transform pos: 39.5,-37.5 parent: 2 - - uid: 4775 - components: - - type: Transform - pos: 38.5,-37.5 - parent: 2 - uid: 10863 components: - type: Transform @@ -7204,21 +7151,27 @@ entities: - type: Transform pos: 48.5,27.5 parent: 2 - - uid: 4744 - components: - - type: Transform - pos: 44.5,28.5 - parent: 2 - - uid: 5608 + - uid: 4637 components: - type: Transform pos: 18.5,-39.5 parent: 2 - - uid: 5609 + - uid: 4643 components: - type: Transform pos: 24.5,-39.5 parent: 2 + - type: Door + secondsUntilStateChange: -191.21292 + state: Opening + - type: DeviceLinkSource + lastSignals: + DoorStatus: True + - uid: 4744 + components: + - type: Transform + pos: 44.5,28.5 + parent: 2 - uid: 5726 components: - type: Transform @@ -7294,27 +7247,17 @@ entities: - type: Transform pos: 37.5,-39.5 parent: 2 - - type: DeviceLinkSink - invokeCounter: 1 - - type: DeviceLinkSource - linkedPorts: - 4391: - - DoorStatus: DoorBolt - uid: 4391 components: - type: Transform pos: 35.5,-37.5 parent: 2 - type: DeviceLinkSink - invokeCounter: 3 + invokeCounter: 4 - type: DeviceLinkSource linkedPorts: - 4385: - - DoorStatus: DoorBolt 4392: - DoorStatus: DoorBolt - 4390: - - DoorStatus: DoorBolt - proto: AirlockExternalEngineeringLocked entities: - uid: 69 @@ -7398,12 +7341,6 @@ entities: - type: Transform pos: 33.5,-39.5 parent: 2 - - type: DeviceLinkSink - invokeCounter: 1 - - type: DeviceLinkSource - linkedPorts: - 4391: - - DoorStatus: DoorBolt - uid: 4392 components: - type: Transform @@ -24095,40 +24032,15 @@ entities: - type: Transform pos: 21.5,-38.5 parent: 2 - - uid: 4637 - components: - - type: Transform - pos: 17.5,-42.5 - parent: 2 - - uid: 4638 - components: - - type: Transform - pos: 16.5,-42.5 - parent: 2 - - uid: 4639 - components: - - type: Transform - pos: 23.5,-39.5 - parent: 2 - - uid: 4640 - components: - - type: Transform - pos: 24.5,-39.5 - parent: 2 - uid: 4641 components: - type: Transform - pos: 25.5,-39.5 + pos: 37.5,-39.5 parent: 2 - uid: 4642 components: - type: Transform - pos: 26.5,-39.5 - parent: 2 - - uid: 4643 - components: - - type: Transform - pos: 26.5,-38.5 + pos: 21.5,-40.5 parent: 2 - uid: 4644 components: @@ -24270,6 +24182,21 @@ entities: - type: Transform pos: 29.5,-37.5 parent: 2 + - uid: 4773 + components: + - type: Transform + pos: 36.5,-39.5 + parent: 2 + - uid: 4774 + components: + - type: Transform + pos: 38.5,-39.5 + parent: 2 + - uid: 4775 + components: + - type: Transform + pos: 38.5,-38.5 + parent: 2 - uid: 4875 components: - type: Transform @@ -24315,6 +24242,16 @@ entities: - type: Transform pos: 17.5,-35.5 parent: 2 + - uid: 5608 + components: + - type: Transform + pos: 41.5,-38.5 + parent: 2 + - uid: 5609 + components: + - type: Transform + pos: 40.5,-38.5 + parent: 2 - uid: 6455 components: - type: Transform @@ -24375,6 +24312,16 @@ entities: - type: Transform pos: 13.5,-46.5 parent: 2 + - uid: 6940 + components: + - type: Transform + pos: 39.5,-38.5 + parent: 2 + - uid: 6941 + components: + - type: Transform + pos: 21.5,-39.5 + parent: 2 - uid: 6955 components: - type: Transform @@ -26875,16 +26822,6 @@ entities: - type: Transform pos: 41.5,-37.5 parent: 2 - - uid: 9883 - components: - - type: Transform - pos: 40.5,-37.5 - parent: 2 - - uid: 9884 - components: - - type: Transform - pos: 39.5,-37.5 - parent: 2 - uid: 9885 components: - type: Transform @@ -28025,41 +27962,6 @@ entities: - type: Transform pos: 110.5,-14.5 parent: 2 - - uid: 12935 - components: - - type: Transform - pos: 29.5,-38.5 - parent: 2 - - uid: 12936 - components: - - type: Transform - pos: 29.5,-39.5 - parent: 2 - - uid: 12937 - components: - - type: Transform - pos: 30.5,-39.5 - parent: 2 - - uid: 12938 - components: - - type: Transform - pos: 31.5,-39.5 - parent: 2 - - uid: 12939 - components: - - type: Transform - pos: 32.5,-39.5 - parent: 2 - - uid: 12940 - components: - - type: Transform - pos: 33.5,-39.5 - parent: 2 - - uid: 12941 - components: - - type: Transform - pos: 34.5,-39.5 - parent: 2 - uid: 12942 components: - type: Transform @@ -28095,46 +27997,6 @@ entities: - type: Transform pos: 37.5,-41.5 parent: 2 - - uid: 13143 - components: - - type: Transform - pos: 17.5,-41.5 - parent: 2 - - uid: 13144 - components: - - type: Transform - pos: 17.5,-40.5 - parent: 2 - - uid: 13145 - components: - - type: Transform - pos: 17.5,-39.5 - parent: 2 - - uid: 13146 - components: - - type: Transform - pos: 18.5,-39.5 - parent: 2 - - uid: 13147 - components: - - type: Transform - pos: 19.5,-39.5 - parent: 2 - - uid: 13148 - components: - - type: Transform - pos: 19.5,-40.5 - parent: 2 - - uid: 13149 - components: - - type: Transform - pos: 19.5,-41.5 - parent: 2 - - uid: 13150 - components: - - type: Transform - pos: 20.5,-41.5 - parent: 2 - uid: 13151 components: - type: Transform @@ -34078,6 +33940,8 @@ entities: - type: Transform pos: 28.5,-40.5 parent: 2 + - type: Pullable + prevFixedRotation: True - proto: CrateEngineeringCableBulk entities: - uid: 782 @@ -34192,6 +34056,8 @@ entities: - type: Transform pos: 26.5,-38.5 parent: 2 + - type: Pullable + prevFixedRotation: True - uid: 1674 components: - type: Transform @@ -82208,6 +82074,17 @@ entities: parent: 2 - proto: WindoorSecureChemistryLocked entities: + - uid: 5139 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 54.5,-4.5 + parent: 2 + - uid: 5140 + components: + - type: Transform + pos: 50.5,-3.5 + parent: 2 - uid: 12078 components: - type: Transform @@ -82250,17 +82127,6 @@ entities: parent: 2 - proto: WindoorSecureMedicalLocked entities: - - uid: 5139 - components: - - type: Transform - pos: 50.5,-3.5 - parent: 2 - - uid: 5140 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 54.5,-4.5 - parent: 2 - uid: 9615 components: - type: Transform From 4a1b654928a9ee849885875eb7f46ea1b022c7ce Mon Sep 17 00:00:00 2001 From: JustCone <141039037+JustCone14@users.noreply.github.com> Date: Fri, 2 Aug 2024 23:22:51 +0100 Subject: [PATCH 135/422] Toxins Guidebook spelling mistakes (#30585) Corrects spelling mistakes and changes dosages to doses --- Resources/Locale/en-US/reagents/meta/toxins.ftl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Locale/en-US/reagents/meta/toxins.ftl b/Resources/Locale/en-US/reagents/meta/toxins.ftl index 85dd9a3b6f..6d92d81079 100644 --- a/Resources/Locale/en-US/reagents/meta/toxins.ftl +++ b/Resources/Locale/en-US/reagents/meta/toxins.ftl @@ -44,7 +44,7 @@ reagent-name-theobromine = theobromine reagent-desc-theobromine = A bitter alkaloid of the cacao plant, commonly found in chocolate. Do not feed to animals. reagent-name-amatoxin = amatoxin -reagent-desc-amatoxin = A deadly toxin found in some mushrooms, primarily fly amanita. Small dosages can be lethal. +reagent-desc-amatoxin = A deadly toxin found in some mushrooms, primarily fly amanita. Small doses can be lethal. reagent-name-vent-crud = vent crud reagent-desc-vent-crud = A jet black substance found in poorly maintained ventilation systems. Can cause vent cough. @@ -65,13 +65,13 @@ reagent-name-honk = honk reagent-desc-honk = A toxin found in bananium. Causes severe honking and internal bleeding, may also cause the patient to mutate. reagent-name-lead = lead -reagent-desc-lead = A slow-acting but incredibly lethal toxin found in steel, albiet in trace amounts. Tasteless. +reagent-desc-lead = A slow-acting but incredibly lethal toxin found in steel, albeit in trace amounts. Tasteless. reagent-name-bungotoxin = bungotoxin reagent-desc-bungotoxin = A moderately slow-acting poison found within the pit of the bungo fruit. reagent-name-vestine = vestine -reagent-desc-vestine = Has an adverse reaction within the body causing major jittering. While not particularly useful on it's own, it can be used to produce a small variety of chemicals. +reagent-desc-vestine = Has an adverse reaction within the body causing major jittering. While not particularly useful on its own, it can be used to produce a small variety of chemicals. reagent-name-tazinide = tazinide reagent-desc-tazinide = A highly dangerous metallic mixture which can interfere with most movement through an electrifying current. From 0689e16939c65682a8043ca4d844516db78195e8 Mon Sep 17 00:00:00 2001 From: Alzore <140123969+Blackern5000@users.noreply.github.com> Date: Fri, 2 Aug 2024 18:05:18 -0500 Subject: [PATCH 136/422] Recolor winter boots (#30350) * Recolor winter boots * fix inhands * better colors * FOOT --- .../Boots/winterboots.rsi/equipped-FEET.png | Bin 1588 -> 1237 bytes .../Shoes/Boots/winterboots.rsi/icon.png | Bin 1542 -> 1195 bytes .../Boots/winterboots.rsi/inhand-left.png | Bin 1500 -> 1213 bytes .../Boots/winterboots.rsi/inhand-right.png | Bin 1494 -> 1214 bytes .../Shoes/Boots/winterboots.rsi/meta.json | 2 +- .../winterbootscargo.rsi/equipped-FEET.png | Bin 495 -> 351 bytes .../Shoes/Boots/winterbootscargo.rsi/icon.png | Bin 649 -> 308 bytes .../winterbootscargo.rsi/inhand-left.png | Bin 406 -> 324 bytes .../winterbootscargo.rsi/inhand-right.png | Bin 409 -> 323 bytes .../Boots/winterbootscargo.rsi/meta.json | 2 +- .../winterbootsengi.rsi/equipped-FEET.png | Bin 480 -> 351 bytes .../Shoes/Boots/winterbootsengi.rsi/icon.png | Bin 542 -> 308 bytes .../Boots/winterbootsengi.rsi/inhand-left.png | Bin 406 -> 324 bytes .../winterbootsengi.rsi/inhand-right.png | Bin 408 -> 323 bytes .../Shoes/Boots/winterbootsengi.rsi/meta.json | 2 +- .../winterbootsmed.rsi/equipped-FEET.png | Bin 492 -> 349 bytes .../Shoes/Boots/winterbootsmed.rsi/icon.png | Bin 556 -> 308 bytes .../Boots/winterbootsmed.rsi/inhand-left.png | Bin 403 -> 324 bytes .../Boots/winterbootsmed.rsi/inhand-right.png | Bin 406 -> 323 bytes .../Shoes/Boots/winterbootsmed.rsi/meta.json | 2 +- .../winterbootssci.rsi/equipped-FEET.png | Bin 514 -> 351 bytes .../Shoes/Boots/winterbootssci.rsi/icon.png | Bin 542 -> 308 bytes .../Boots/winterbootssci.rsi/inhand-left.png | Bin 415 -> 324 bytes .../Boots/winterbootssci.rsi/inhand-right.png | Bin 418 -> 323 bytes .../Shoes/Boots/winterbootssci.rsi/meta.json | 2 +- .../winterbootssec.rsi/equipped-FEET.png | Bin 491 -> 351 bytes .../Shoes/Boots/winterbootssec.rsi/icon.png | Bin 599 -> 308 bytes .../Boots/winterbootssec.rsi/inhand-left.png | Bin 395 -> 324 bytes .../Boots/winterbootssec.rsi/inhand-right.png | Bin 397 -> 323 bytes .../Shoes/Boots/winterbootssec.rsi/meta.json | 2 +- .../equipped-FEET.png | Bin 456 -> 345 bytes .../Boots/winterbootssyndicate.rsi/icon.png | Bin 489 -> 304 bytes .../winterbootssyndicate.rsi/inhand-left.png | Bin 398 -> 315 bytes .../winterbootssyndicate.rsi/inhand-right.png | Bin 396 -> 317 bytes .../Boots/winterbootssyndicate.rsi/meta.json | 2 +- .../winterbootsweb.rsi/equipped-FEET.png | Bin 481 -> 311 bytes .../Shoes/Boots/winterbootsweb.rsi/icon.png | Bin 574 -> 280 bytes .../Boots/winterbootsweb.rsi/inhand-left.png | Bin 396 -> 303 bytes .../Boots/winterbootsweb.rsi/inhand-right.png | Bin 397 -> 305 bytes .../Shoes/Boots/winterbootsweb.rsi/meta.json | 2 +- 40 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/equipped-FEET.png index 7f0f359ed412df96bfa39a57fc67be94bcd1e3ac..4d981a54c7ca929373017c2e99790d94b68f17fc 100644 GIT binary patch delta 620 zcmdnObCq*~WIZzj1H;_yjcNS%G}f0G|-o z)idjk>{#aJ>SStSl$Dth5grVb3ClYTRLHB9}F0zyqVpALYxI2k;M!Qd~-mU zk$p<=T?Pi`s?3mxk_cZPtK|G#y~K%md}j6)1&PVosU-?Ysp*+{wo31J?^jaDOtDo8 zH}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbW>qnpkbi1SEGk1IbB@ij#F2btb1WYEPcS z=%~)ir2qytDalqPnI$=?K=lw21qGX;lr$^HoD!hWWL_oQ!q{|7@WHX6be)3-?C4|6aM`n@9cFf`+m66OK$4#EkELIQFU;{Qk$i)q4wT*s- zRYh(=ZfZ#)hzAdX)I6ZSi+~<%Hq}c92H^%z7srqY_qWqd^Bq>;Vd*{i=f8US+e_DM zE;(19OmydB(UqDK6Y;X%iIJ6$Rm4Ih;K3bl1y`@*#j3W?Di?-s)jqZ{F7Sg)osj1O zS1B_S&GhE1?mfP3{S2K)IiLM5voU{S_S{oo&$79KJulCGajt7*;*#OgD9~7NVCU=u z`v2E^b@ok|x&862HKlvxSFRBFe0DcS0H5A1#|5fZE@^@iQ3p24vIs6xPTA&Pa4aji czq+1b+VR+_OQ!Mv2Rfd?)78&qol`;+019u(8vp5^KUT$EW*l9`_ewj3fFWusqV zRgqhen_7}+$0fRq#hQVE$=%b%F{Fa=?X2^DQh_4J&L{ZZ>gb%p;?~pT#Px1h&Khmu z|9cv^YZ>JiclKXo-w^wQDd~~lt=L#m&jkh&g0U+)>%;2JwttS5xojx(ye~QC$6Ves zPw#!6`+4`7S2apJLJEw8QH3ar&SX9F{dIxKlP?$DSkq-2IOXQj(CqSTXIV>A$+Kch zFW;K}bZhD2Im>>{^HVd|oi839^EZFh?R(R|R0Q_b%M|~e;mH{H`Q=CcD4z6-TWlMj z&swnJd5_P!C10xqRzk3VZtTYO^S)g5gArx+%fX51^YWin7p*<^dz<-p>J zxy%(N{P7N4b*$Hy3#j#UIzCbKXSlXlrc*h7|A#$HKmOY9Zz}rBbxi!#{NnGyZ#MJ! zGbo*j+2?=CefrBP{!I;lbNwXYBtm#&=%c U$X-835tI)-UHx3vIVCg!04G^qiU0rr diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/icon.png index 31bdf9a1adb15d3f7f837df0d89133a6291445da..f8133ecc16b79c881c343a82ddbb6397f65bfdcc 100644 GIT binary patch delta 570 zcmZqUS3g8xGSL$H5^5J<4VBeIx* zfo~27GqO(!zRSSCT$LFTQ4%pRP0Y-`q98FjJGDe1DK$Ma&sORE?)^#%nJKnP;ikR@ zz6H*y8JQkcMXAA6ej&+K*~ykEO7?cVTobEpnSkUjXCOI=QE{>^qt4`1M(xRS7#-Dl zxfH;_CMDUbB(o$Z6{sE}qM%??l#*uUm{S52n#{{&p@}4;kC1}u*GDp7aw(H8(5}hL zm~=T|nrtR9%TNBxq=XQd?8q!K*^XHpq%x8jhWy- zs7XS%Cih;F|H8a(dt*@Hi9LOfIF{52xFI;x!EDmyaVpw-h<|UBBmm1-j=IhI#1!QvoF$i1=o(v>8 z3p^r=fePk;FeCev;JXYA%sH7M5hW46K32*3xq68y`AMmI6}bgqT@#s=!u8ZB&5=jE)8fEjB61RwbDwIjMFCF`#KSMJZ`kjyWYz z(a9c67D$>v3iMG`fLvgsk7C&5l}x%UAX6vbVAADA7;iJ#fLVUBF0&FuGLYE_MRGl} zTzES6Bf-7(Cc~WwfLj>j)M2MrbaWbd&oYcWG(mI z9Y^?ugbniy)Dm)iwR11lml-Tv%-HHO>*HK&pTtR(HzI$>85KXDSNVQk_4&R02B$R= zL=3njSpSu?u35pPqia)Ueob4#a<=Pk$Jqzp#0VOHf2Xm3&7V0pjGx<7XPI;#I(s{6 zUc?j@k34hjgn)h9duvl|Dl6_^{dlC*{?Lc8znAOnA}{>A zRrX+)-oCZ0g<3`e@<(buW=2>X+;ZuK-<=(GTf@)3JLmuAZE0epSewwvdlTp0kA6}1 z|I44`kBocjHp`q6^<;F**`9mm&R$jH1*eX^sR``h`@oZE^P#YsSzBA)>13rr5!2yL z$30PT?Dy(jmp@jR`bjH)<&ij{@czetIO-ovTKG)VlJVHivceGF2sbCYs%;vb8;)rI zoa~XloN0%J`<^YAex&n#uc=S&YmZmDZ(v zY6A@+7y?`NGoTGe*G3>S3~C{l|3o-b*oo SC9=k#4CU$S=d#Wzp$PzUdS&DQ diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/inhand-left.png index e605ea59bd96fbede05bfb5c4f35b2ab3bd41861..76f3ec144483f970dc4eb1840722b1289fc8209c 100644 GIT binary patch delta 596 zcmcb^y_a)>WIZzj1H;_yjcNS%G}f0G|-o z)idjk>{#aJ>Xen45)mG(qoW0sd6lev0!Xo!1o;L32LlEvZ)P{35NCl$WHAE+-y9HT zWSDS&}ZO0rc+W=T#eP(4IMLBXadCC$n)rvxZ8nU~2z6G=uNAqCa1k7U5)QYKxX zU6YqF>2ks}*-T=VpZu3e2_Z1qky&K29kVz{Wh67mag*mWi`9cP*nrIsa&ZG%ZKGdd zRgqhen_7|x;=zL;H4o_TBA^GGP4&`&K{&(H#W5tp{q41ld<_abu7L{={IB1%MM3kI zL`S#bdp@?7IR}r*Jxyid$N-}IEN@~rJiWT-v!X)Z@r-*v83dg7>X|!)oe)mz5ONLL z#i;3N>cEikbYE_2?bYkWFQju^8yeie=v!#Q*;}3S#Xf}ok-z%ph`h4GjTVOLb9@{V ytP~R%&+sv9_?W=B<KLXJF|C;qciwcxouxoWGI+ZBxvX5^KUT$EW*l9`_ewj3fFWusqV zRgqhen_7}+$0fRq#Tpo#?>$`{Ln;{G&f4q8r3_SjlDNZyjqkCtJaEW$aG%(?cMooTGEzz9$HWL_{n#_YzYAx%G<9ap&%ga?wjZzl+UqCx z&42Q5-fPcPy-i-0?7iFHFTEY{o7W>Jf99drTe*7uTda0EFZ9gXYG=LedcuW@^`(3N zL@|DNw)kSIarjOjmE&&$MD>$@b$%DRd3L>MJ%f7Hj{U};KfXL&xSiMH|H&D3kLSKV z$c7mT7$OjzpUw`cEex6R~QVy}>q5M(p`OnQ$Rm*%{; zHSg|h)q1;i`9hWhNh$jqK5PHx+{0r1*EZHgJpDudtzEy^w}iJhw=LRTpRj^~=T`lL rG7D$c2G#}j2i{6NWQJM&qWyrl{>?1`MK|B`gR+aKtDnm{r-UW|Z74dm diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/inhand-right.png index 6925df6df6c6dd4efbecfbbdb34bebe49568df64..69c30d66e80187145f6ab8a21936dee3d844149c 100644 GIT binary patch delta 597 zcmcb{y^nK(WIZzj1H;_yjcNS%G}f0G|-o z)idjk>{#aJ>Xen45)mG(qoW0sd6lev0!Xo!1o;L32LlEvZ)P{35NCl$WHAE+-y9HT zWSDS&}ZO0rc+W=T#eP(4IMLBXadCC$n)rvxZ8nU~2z6G=uNAqCa1k7U5)QYKxX zU6YqF>2ks}*-T=VpZu3e2_Z1qky&K29kVz{Wh67mag*mWi`9cP*nrIsa&ZG%ZKGdd zRgqhen_7|x;=zL;H4o_TBA^GGP4&`&K{(UX#W5tp{q3}id<_a5uEAIS|9`@=b>U05 zua9oo@_RNNKPzr=$z7qLp^;g}9FAzvQ?yz?Hj=e{-A^O;uIA-i+F_K@?`?=@d)V!T}7eD)`U#R`>cJ7SZ z48H}x|8<-ZFuj)Hc%`;JW$LW`XP6a!G%73=UR4>l-IDvse4r~CJYD@<);T3K0RY~! B#8UtO delta 868 zcmdnTd5wF5qz4-V1H-D!!h1l9u{g-xiDBJ2nU_EgUuuMBny)W|7Ld&W#2|1fcruXW zEbxdd1}c~X!i?-wg6}dgFy~C{mY#UmhKWmIvNWSJGnazG5^KUT$EW*l9`_ewj3fFWusqV zRgqhen_7}+$0fRq#Tpo#FFjoxLn;{G&f4wAt=mhKBxHJ-Ql>)P1+wsrr%O8@-aJV~}QeZ~EC zfhIE-$F25Sz0zi_XqVpK&vB1VwX4oH?>)19wMb{`%eBGFXP-{Ko$WuPX#TUg_0Gj- zJ}Y+p%vMDg(bpgYpPS%be5c8VH9A%j~eHz8Wb;_ ze4pQCa%HHlnQ&y))>m7EPG@|sbJ$R|kAH&eevN0zUzTbP(#@y`u+RHT|fzPrQIhub~H^{a7Yx{3+k4uix!i9ln2Oj%yeE!RB#R n_G`KRoD+=<91URf!sP+;m+CDsMgHn%K^eu<)z4*}Q$iB}{gE&M diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/meta.json index e484bbb13a..bda672d960 100644 --- a/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Boots/winterboots.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "drawn by Ubaser", + "copyright": "drawn by Ubaser and modified by alzore_(discord)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/equipped-FEET.png index b292b07a39d9559c5ea0b1054d44a2cc90af7386..c2c2e4d929c42a1299466416df0aa2a21e85f17c 100644 GIT binary patch delta 307 zcmaFQe4lB8BnLAC1H;_yjc+C@D%8sb_=LEwo>_Nf$1*opCsPxn8HF0Lfv&#JmS^X= z?&vfGD!q5j%^gT_l?3?(|AzsFO=on@14TItJR*x382Ao=Fk{xWPEMfU7Ec$)kO=p; z(+q_UEAX%way0+@|ImZWQ{{l>q+>_l_8j~%L-)=Lq5qsL^#U3K4htL@8jJKDtu7t> z6yv#lr~Q*j#_5sAE7iEqAAQIYa^B77?HZGPE*-O;_SXCp^thy|^r|Y~^|M}O|4w0v z^|`4m$<@MjC-i}aFfp=lu?T3C3%~gAf0fTQL7R`e&io5H_IsL=sM57|jSEEu7x{Qr zT~oA~yuh3L#x~}|P6{tM=6M?U|34vRY|n7bx###2-NI&|4;VaM{an^LB{Ts5gq44q delta 452 zcmV;#0XzQR0`CKm83+ad0063Kao&+3Ab$yPNLh0L01m?d01m?e$8V@)0004mNkl8StI*Q8I7l7D)kSa-RGb9GFW{hqtDnKe!Nt$us-T0r76m753l1#^ z;;1-S99(S0!FuwZIfx-ck|r7S|AX@8(vau4-1eRV00000000000R9KZtC5`S?|)I58Bahduq2<9I)%j&w(8aO}F4v_G@^`erW zgoTm&_8B|bw1nkr{W~IQex#MMFMsTGUd-6744GX`X2&0XNnFBS`` zT>ANL{`_w5)7;A<9{>OV00000008&{67|o5J$b3ptM~rSMOt%+bw0of_T;7J&7bW* zFA!IvuNKym7kPDL{q1kxc?Df>wqt+Lffm4;ot`jt`?#O^BG|J6;^y|rR56kJ0!R(^ uP-w=%4>{z|X_N__(-3ir$MI5$TC00003{fI;Z~xpP2q&H|6fVg?4jgCNYfV`BDOpkSk? zi(`m||J%Mmz6J#z=hUXWg8#pxj=3x|{P%OQs^-G#mnAb!HP|i z{dx}Yum-Ka=Cr*@!>#FxZm~nuHB;5%(>4cml%7qCm5Ml{`qOT0#30R-_p=yf5N^7=o$u3S3j3^P6=KxlK)XjEb?XomUPKo2;2{YT^cECC zojRAcxgabim1NDjY^`AGs*@{~y1J=5P5YkjjT_E7yU@+~UA}qW4Db8@-+vw)9Df`f z9F9E#(~^mfJU3S66R4>@53aorA0u?{mbos}kMVEl8yGH{BQh-st8k(OE1&3vz&Ui? zxna#*>&V{Is`$0M}PJ)7szgJLf7}$3Xm#X7>`a_W|dt)V=!Pmy?X}P z(;ajj8||e!6c%CWzi~lTXa3JWK=8_yNT=73`P7dS%TLhUc$WI)Sh&x_35HR0{FJf_ zAXHaZL2l}#-D;~ps7G4ley}xU7G{U-2nuJO+1wB7ZWl2S@g3?;(^k>YP=Ak(i*vM? z_v#`B^P`Ey;ze_gEP#Y}UClz0DzLM&3q|oFk=n(x2?;kZZK2lhfhZmvV*jXuc>D_< zT$juO2*YpPn3$Zl%(5MU+wF#$OyldqIzGfwsPl`^{}?oUYG#Rs@Sx7t4SFg@zOUu) zKdEPjZ2{AX7521G=!Hl}K}^C6;f368(eY@^hrx)#-W-kX2-u?u>2NE_Nf$1*oprx}GBv4O5<=eh3aG}O`2 z0;==5()t!iah3%61^Disr;B4qg!|iT2l-kQ zcw8?QW^Mfc|LCPdGmLD+(#+C6#fGV#WluWO$Gq;h%Rf$WKJdFL zrgymvLyEZZT5Z*+@caE|8&<5C_K9`MqN@yy3rfEvzy1(jYv1wI|xOQo` zF1kl9q>v@yrSIPG@c)BykJ95VFRxj00ssI2008jcY~<10czBgIcU!WUeM>POw0|$0 zYWn88+RUS=vgS3uJ>I4H&r12`*Ae6dT=sjFOQvb*>Dvy`pvo$Nbxx<8kPX(CV0FO@ZY^XoEw259p)-G=B# zn_sQ9c^AI<>oDC-y#T#)N-towE?0X0_$;mIn-2g000000004jr(Y|G|njZ)<9}t@5 z{6Lf^z;b>d+P{F+{6KUYU_Cz&)iWT({6JJEfcXIc0ANSt58PSBZe!+h7XSbN07*qo IM6N<$f?D&YhyVZp diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/inhand-right.png index d4c3b8602f5c17877526bacd36a2480177346524..da7b5bc6668d2886ca9daca9358ab9948683db45 100644 GIT binary patch delta 279 zcmbQqe3)s1BnLAC1H;_yjc+C@D%48{_=LEwo>_Nf$1*oprx}GBv4O5<=eh3aG}O`2 z0;==5()t!iah3%61^DiMr;B4qg!|iR7x|hE zI9#7kIQ74NW9y~X%-)=R62<)pHE*Z zZq9gC<+84V4mPZFDQ=&Or%e$%leYtB9Q9{m%mXJ%yKViC{~a9D81JK^)e zjfHbMcdI)evJhq!`TehN)=b-;8qTEq_mhlUj!)Ex0J4gvNbNtv@9=@4@dVdz$-2@b Uo2-5U9m?S8>gU3;&MBb@09DCzzyJUM delta 365 zcmV-z0h0d10+|Dl83+ad0063Kao&+3Ab$yPNLh0L01m?d01m?e$8V@)0003lNkl000000001Bs|ufz_})KYWcCOA#`pe# zxI(+-d;dUO;X-}yA26(owLO1#oz*|U_x^z_R=dUdI{*OqJ4C(#!pOyLlndr<00000 LNkvXXu0mjftgEoM diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/meta.json index 8bfe0c1a19..6fda26443e 100644 --- a/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Boots/winterbootscargo.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by UbaserB and edited by Kilk for SS14" , + "copyright": "Made by UbaserB and edited by Kilk for SS14 and modified by alzore_(discord)" , "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/equipped-FEET.png index 467cad3bd895944691ae06adbaa8ee66ef2cb5cc..dee2d7fb3a40cfd1523f42dbef13c045ff39bbc2 100644 GIT binary patch delta 307 zcmaFBe4lB8BnLAC1H;_yjc+C@D%8sb_=LEwUbFY;v5Ri5PNpVCYnvGU6*JsSV)%cM zd7vm~fk$L90|Vay5N6D}*2xJJ+~Vot7!u+B zcABBkVFex*LyqQu{~vmAd8!=HoOJBy+n$3zX6W8|A@rY@3en1$v8doc%>Tm`J)e6Le9JSyj^3m&!uD5)83kYf*zMtm0nflyMETI?B6LY zu|7AICAnI-?u0(j5GF>j^u5qEL;36N- zs%wfilNWe%-`K`{*h%3f$2?C1|NkeXjO`h&Irki2qFdMu^Z|pXtDnm{r-UW|l^B7T delta 437 zcmV;m0ZRVg0^kFX83+ad0063Kao&+3Ab$yPNLh0L01m?d01m?e$8V@)0004XNklgK+6_KC%Z5{0I8m*I$cRAS@$mvT< zdi_Dv-fkH;uCJ`xd#|os(=U6jhEV0!&Q&`&O&0A0i2>FVdQ&MBb@ E0L-Uw761SM delta 499 zcmVm(TCO z^bzX|44#*rF?{#p#Vdx@rdPn0gTSqYKNx~fX)#>6a*gDu1_O}g{||CtV0SlXtl~G5 z82;<&>Y(s92QvJ(vM|6I4@5-)$R{ui0x+MWi-UYlD9+IV-k<@6KrYWdC}0l(+MgRR zR7zfe@-V@aug)M>GUPz@g47>7aRIAc1RVfn!U4#Kpn?Yi7#VnYF;m*E-TT1i>HxDW ph~@+499#|<1*2dTjC8=j004mY{E+&MG-v<-002ovPDHLkV1nKj-FW~2 diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/inhand-left.png index ae66fbf2314b44083bb0f6859a1470cdef5ff819..0adf41be118892c98abb6322b8e201515e846122 100644 GIT binary patch delta 280 zcmbQne1vI&BnLAC1H;_yjc+C@D%48{_=LEwUbFY;v5Ri5PHUSO{uML)Kge-&F@uhd z7EqmV25&Zy;w%aB3;quU48i^tLLk8ckH}&M2EKzJ%(!D>_FIs_o-U3d5$f$|D%@<%`mbNOEXLRl-I;)ntpJV{%=Dj78|B|mObfAAM?83F8?^i`M~e0 znBL_w3@PHqYqeFQ!teK=ZCJ5l+9%d2i>@*-E-3wy{Q5(9t$o|O2VpE66%gdldM&5s z(Svst$&)< z{JM7X)m7Q%b$wfWX8CQUtoiF`8tdV~h8X(pQ?+d;kCd00000002}-_A86m{6Hh~0ZsFqA4u{E z@SGn=_7(7&A4skN#V7J4=Lf9fnSnUA%nu~hE#?OR0DvEnKg1XB>rm?x-~a#s07*qo IM6N<$g2l3{VE_OC diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootsengi.rsi/inhand-right.png index 9fba6eb0ecf46b7c986f59d965d45d4534e8b314..3d2a86f3c8c31004b91c4b8ff6ea1371677db0f1 100644 GIT binary patch delta 279 zcmbQie3)s1BnLAC1H;_yjc+C@D%48{_=LEwUbFY;v5Ri5PHUSO{uML)Kge-&F@uhd z7EqmV25&Zy;w%aB3;quU48i^tLLk8ckH}&M2EKzJ%(!D>_FJIf98VX=kO=p;(=PHg z8*sQjpK$7b{l?Zyt(m$&99>c=KA;O_hACRZKA$601=l+}5zdxV8 zRNS2LtjeLUrw`US88R9gPM;(;<A>gp!j(5W6 zgBuIybnaGnK4c-xD)ReZ->jLoJvE$3_wOeew;Z3S5dmZsO_ADvhTq`>L*ogq-;#Bu VM>bjg1Ui(#)78&~Wt~$(695K(b4maJ delta 364 zcmV-y0h9j20+<7k83+ad0063Kao&+3Ab$yPNLh0L01m?d01m?e$8V@)0003kNkl>VDU+A55}R11 zxiHHutaz7r8-(5D|KQj`Ze@1%x)}ig00000_-~HVb;oEtO=`8OESD>B*Rw`FcYjYv z_Raq|UAN?I*7arao}{k@t4RKtw|RYY_w6AESC>J51x51DJxH(HNiIGoCcZCqL}Oha zhLfNVZ|$4^&S6^TO;f$i$6Cs#74w_wmuGUjY0A^{Ea(FKDu3Oa%umeY#*b|=kNxvd z`Q*P<4Shi?r?h%Db}e4tg8c$w&siS;000000002spuD>zvCj`!nezcZiG6;+<#k)J z&kwk~6ODa-z$%=qZ83ZG-(%gs-}W5*F+=yx3!(p6v4iOH80EGsJowFU<|A(h;>U+?6J@wmkqkG#$Rtjvib7`E`++CIs zu$AxOOqSTF1KVUJ#Jt?)KKL|M{&K%I<0s>f=AP3^HRm=1-Ou3Z>gTe~DWM4fA?%47 delta 449 zcmV;y0Y3iS0_+2j83+ad0063Kao&+3Ab$yPNLh0L01m?d01m?e$8V@)0004jNklYE9Ki8QtI*oIh)4^%xwwfsh@+tIpx`t33Vj8iK~SGT!Ohx1wA8`DKZ`<( z6c8V|_D@EbP}CcYCcmolA31qKxe%vXn*s$kke3Th$WX z=O^{Lajwey3#!>_J1fic+K#K^6XxB+qvOp3W%Mvx``t90xn1l_T)t# r1@JD-c>%|9zW)lNO6$)A1yJe>&&2_{AEkpB00000NkvXXu0mjfDvr~^ diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/icon.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/icon.png index c0775e6f22a2084af9c7084c4ed79ac7f7f4c2f6..2a178b902bac33128fa2a92c5c074ff807d93112 100644 GIT binary patch delta 263 zcmZ3(vW01aBnLAC1B1(wu45Aw73x(2d_r6wKYw%m&J#CRr}eu|nwl7O?Ra1~@t^zL ze><+cS#b2Jj*b>k0|$HiJs`zX666>B9|0JI?w>mc6z44Ph%9Dc;5!Jyj5{V~zXb|5 zdb&781;BiiE$}9N)JL;IrGQ)pA7prP6tbSQC<5Y9qf|t1oToy~@z8&P) z@zby801s=>`fE5^-uILs!L|rpgEk12?Ku77>v{lcsVG{_PV{q@Uxuw}^dAOMrEEPu@e z^RWSvqrlD83GSO8-#;?^`SX{7k&%&sn@12T%E0jb+h>Nqe}6-H3=FI+%nS#QoF&;V ztUy;s>pv(+LD2!ih7_gJ2j0kbRCU4sLP`dZ;YF zDFAKi0Rsa7V1WYI*eJSS00000NkvXXu0mjf D#w6Q( diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/inhand-left.png index 7a85298de151315e4423bdb3b8c45732c3911af2..2802f0724288193c897e51cf1f1949abec647ce1 100644 GIT binary patch delta 280 zcmbQte1vI&BnLAC1H;_yjc+C@D%48{_=LD#zw_kr^EYm;PF*`5xX=B!qkm4)}@(cbC1q{Ld6+$4v0*}aI1_r)^Ak4U9V)k2*!JaOTArbCxuN~xT zQQ&dCSeUi(|NoQ-!A_+#reSR zs+iv8G7Kr=#%r}zqr&g^pKVyNV%jIxDT}T$FfJ(llKlEZc&&Zgy9Z$`92F4c&w4GV z=Hz9jf2Fp3KAV}DzReIw`241UVXZKe*nu|;4HEof4%+AWe(>eFJm6>8EG#>}Zi2(- T+9aS$89ZJ6SY6gRB{Ts5Us!g; delta 359 zcmV-t0hs>80+R!f83+ad0063Kao&+3Ab$yPNLh0L01m?d01m?e$8V@)0003fNklb0t@e|}{AF3;6kTh) zyMJ`5>6`D$d;`u-JL%n9ufC-Dh1Ta4U008WW`~lL4(vHZ&5P$#x002ovPDHLk FV1ll8rNaOK diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootsmed.rsi/inhand-right.png index 903168d47b8cc93af7649c8b8151fe63493fd7b6..33d50cba558701d51400c75b99a255b715a04225 100644 GIT binary patch delta 279 zcmbQne3)s1BnLAC1H;_yjc+C@D%48{_=LD#zw_kr^EYm;PF*`5xX=B!qkm4)}@(cbC1q{Ld6+$4v0*}aI1_r)^Ak4U9V)k30;2cjE$B+p3x6>~2 zH5+iaKA&*vfBnYRORbr`Ir}7v{THdW&Qq&xoF2o%#390=P#=(|ydiayf#?34*S|lX zzEs?t@vO?Bucr^zIT=T14H8puHTY% WrAIbd{RBFc!PC{xg=L*nLK6V3QF&_s delta 362 zcmV-w0hRv40+s`i83+ad0063Kao&+3Ab$yPNLh0L01m?d01m?e$8V@)0003iNklai+_#(i%Uh^+Mz#aH|f}|2yQJnC|zoy zTjYftB$!w)Al%vS2f{l-UU+vGvfL8@00000fdA$oifi7dpFyd3D9fK;iN{*?D1S4@ zCEM0th+;xkvc`|uB8VPymQDSsyLos2vT>4^7pG2t1vd3(PUO1N4kjnVa9kf>iHzd_r7LU%Ybr{zErcCsPxnohL6;s_qStsD1SI z)0x{3fJ#@3xW5EaTqQw%!T(`^Vbd9%^FUF~0*}aI1_r(ZAk3I`t&DsXIqBHZw><}c%+S5_Lg+syOTB=GfWra@hQ=a&N2^N* zKgD=%-)aA3l5u+E@k%xB^G6@Dgq(NtdAr7BpG(KAr@b}*1U)XPD!r=8cm1qa*}qd* zVtsBZOLDbv-3fi5Axw-cTr2__<-#vM{9omBP0;4!t~39Fj{TmdB&u|+UE@Mg!9_lv zRo4`4CNJ>jzOjw@u#>_|j(MI2{{K%%8QU{lbM865M7OXR=mQ2%S3j3^P6FVop`ThPm zQA}>z3cFo?y=kXs%%3e;eGJr*Rq)l55~MdU3z`{-117j&R+WqoW1XV3*lF9Z2z%1o;L3M*s$)`{&L9#W@Q+B8wRq_zr?FRcMuRK?(OHnGA55P2x?dk4}RUCx%bagPq ztSk(0#skq&0P+n8gM9b*AHqCjaS%oim78}SKv~!U3zWtQ4xc&)WkJAAhF}NasK6!; z0u|j;8B!wyL8*@+uBZ+yh7aJ48|3(h0gw+t1rG!;GVt&s@;?mh+Px2Kt`0D3f@nTq p&N+7C0(t3R6pVsVFw6l10|1(CB^kW&b7=qo002ovPDHLkV1hX1(g*+m diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/inhand-left.png index 270f95ccf5fc8a92f482a1251129c953197fc63d..dfbe52f9b96cea2f7dbd9b71dafe60a3cc884eff 100644 GIT binary patch delta 280 zcmbQwe1vI&BnLAC1H;_yjc+C@D%48{_=LEgzIf&K{fBO@PCHLts8rqi=_YX|vS z6nI=O7G`by|NrQvLotKIJtrnx-FIrT^QIiN%Jgo@Gxu)5pB-x640HaX#?7 zDyDb23`2^z@mg)wsPOy!XB$?mnD&Wv%A%_bj0;M?B)|R;UTfd>?m-v}M+F4=vtG-o zIeD4sU#Tsh&t_((Z!-iEKEG*TSS!pVcHj*|g9N{rgZ6p8AAET(5BM223(L;0o8a)d SHVNob22WQ%R+n{72~7Y*hINPl delta 371 zcmV-(0gV2{0-pnr83+ad0063Kao&+3Ab$yPNLh0L01m?d01m?e$8V@)0003rNklpaeGIG`OMd&i--Fi?+b+1|6qrC1N7vSp58DYb$xU1Z9qsp000000000006dcY zm&Iy+Aj*6|Y?ku_N!|d<`GI7A0#@?_$u+=wejup^#F!sQt^v#s0000RB7azt*zzbD R74!fA002ovPDHLkV1k-bs|x@C diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/inhand-right.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/inhand-right.png index eaa7faa88df454b6ed6499a3ea0e2a696e998a82..b4dcef516c2abc5a0e8955ee655464d8511f88a0 100644 GIT binary patch delta 279 zcmZ3)e3)s1BnLAC1H;_yjc+C@D%48{_=LEgzIf&K{fBO@PCHLts8rqi=SQfp>!&OV7^|3#{;^VDh^r^m1`afomz)Cc4#Z%Ex_;JN?i_3zK8 zFBLauJgai(>*<4aPKJzzhSMjBO*!<{MLWOgSdum8o_mk}iPbYRvT(5oXb3ngxZ|Dh z`QXOFIi0)Joex$hZG W>5)xVKY zBw9=BYpHu&GHd?juue(atm^RnBM2XJmQDV|w|RYY_v;}m`#Vm51vdFp4{~&P5Ntlx z^!jz{RMcA4i_0sg4{ywxKX#bC@~-aQc=RdxLQ(&xY!B-4xY3l`PS@!M*yf-5p*B|= zZM{Bk9E(}6eD!rbYn?dVfGqiA4P#K9Q&jiNI_m!6+35!OoF4!H00000003aFGT)N; zK0jb2&IkO(_xXXSOmEBg`GKg+L4BVeFs#Gc-oLxfDy;AG14*nK!2LS_09Xtn6M!z* U@;GLYPXGV_07*qoM6N<$f{^p9&j0`b diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/meta.json index 8bfe0c1a19..6fda26443e 100644 --- a/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Boots/winterbootssci.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by UbaserB and edited by Kilk for SS14" , + "copyright": "Made by UbaserB and edited by Kilk for SS14 and modified by alzore_(discord)" , "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/equipped-FEET.png index 0e03908a0e5f1dc34d9e44031d726af87ba5f48f..53687ff581350978907b0f1e7d7e9d237dcfff25 100644 GIT binary patch delta 307 zcmaFOe4lB8BnLAC1H;_yjc+C@D%8sb_=LEwo!xMB$1*opCsPxnB3@n}A0G<~i?t#m z{Q?3&rJmN3AAl5BNswRge;8ocbVlbqP?WR4BeIx*f$snaGiF`ue9ha zF`nCZ+CQ0OoE~|+QjPok(T6M{=iPkXt})r?(lP64Z_PhJk4vgbud4E0KkHTY?-Z6; zpPR~(TrFI8LLX=d6C(>3i-1PC@QV-sSNU8MwE4K}%)g*xzo#jQDqU;WxKLDZk&kE9 yHAS1r3%t2+Y-2v`r0|kso~MET{}WQi_6*mYdyX&BEo=t*fWgz%&t;ucLK6T`xO{d1 delta 448 zcmV;x0YCoV0_y{i83+ad0063Kao&+3Ab$yPNLh0L01m?d01m?e$8V@)0004iNkl6nS&TIBx#aCzaJ?7TpIE_F1P(p0RR91000000094k000000002|0g3u&!JfQS>D7CG=OV2+#5x~f1$**R^XAX?pBIQL z(N_!W$&0)?vi|nB@4SL;wL7st=tv7-?UhQVHdbqyFM>TQAdZJaQ$_9zAT2f6lNWg` qfOl!m3pkFWD&=vd^;d!gQ0g1gaRKI#Z-8_F0000X`2H&O3$XnN=2N}ea+yt+hxXihN^|nN2tDnm{r-UW| D3vF!f delta 557 zcmV+|0@D4o0@nnP83+ad0047(di0SYAb$yPNLh0L01m?d01m?e$8V@)0005(NklsvF!izhc_4`!bW`sfhPvVuI3Jllf9(N7+r&jU z?O}q_L;-A;gJ=-ICJv$vwGLr=Bh(laKynngxjMmp^W*zRhChG)GB7eSGH~+< zLPZ%EzJL47@b~X;D35`Gm4%t%;E}Uf?II}(K;ZfF7Yv_1e*?#PTTL;;KL!p4>5Df} z#M^5N!QwKPZZUlR`WvU^AV6{mSbtd<{0A8>A|e9jzj^b9LGIEehHFX+3_Lu1SjDeg zxkjBthzu%nqQDpgEZNxLK0y~J1PF!za-4tp{0>Zq-gv;U!_1iB|9{lP{o=(dhQ!BD z801)3!2Cyl{xHmyk-{4ScpU(;-1GD~xPc%5GIW=@F@xL5vl!waFke=Np?@Bj9zXyl zwpv4h;n;}_SnVPh1t3d62Ej0h|M%a2tl}Vy9xBIw{erTv1A-wSaP$O}hX7CX)W9hm z7x-vn$pCZ-13y$RNIk9)Am{)n6AnN={QBiRn9ak(%b={P#qi?!Gls8UzkB{~17vvn0qb_&*dd1p8MAfdmUYB8wRq_zr?Fkr|z_HFMTgt2f`K#)J{wVaxh zmzn;R+Vc5qW@h>}Lm=Vvn+Arp!c1ZZ-Y_&s@QXQUpXd9*m*?_;pJB7G?EJb34xek2 RfG%b5boFC(S?83{1OPWsZW#ao delta 351 zcmV-l0igcG0*eEX83+ad0063Kao&+3Ab$yPNLh0L01m?d01m?e$8V@)0003XNklx$wPSY&M|a1r9lG=jlop)Yl1*{y+NoO+ z>K?g}K$paqz6<#3{|Dh7Nsf1Ud1T26000000Kk7!OQX3_|2b}+oy&T)l-+oB`+wjx zr*FQiqcobzD_-MlJdD%Za{1<$QOOQ?>OB?~`SLm_oYy!1Pq@Ep$DMjTIkK_F^zyHK z^Ie&*B{~17vvn0qb_&*dd1p8MAfdmUYB8wRq_zr?Fa(tpj1dvrUMQZ;UeuobXjVHK%OV*Vh U*<|$-=uievS3eh)bxsLQ0F2#mzW@LL delta 353 zcmV-n0iOQD0*wQZ83+ad0063Kao&+3Ab$yPNLh0L01m?d01m?e$8V@)0003ZNklAs=6u|LU$527soVxlE3Uv|`_d*qiu8!S1bnNcf)xo7-ptRsrOE!yB*G_Iy zuzSi27f3L+xu9@Y|33(KBzfWGUdVD!0000000557i5a&%KHNo(v!<**KO{Z2dVj;6 zF)k^Zf5nU$yMlFmeVRt*HfP!7pIgn_o9ka+@_syV`YYH={)7HybQJ{gk<4{8mz`HM z|E-nicG~ex-2Dck*b*IE4oeD5E~V^uBo-vI!?{~_`NFA3C*E(4kS00000NkvXXu0mjfdE}&D diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/meta.json index 8bfe0c1a19..6fda26443e 100644 --- a/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Boots/winterbootssec.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by UbaserB and edited by Kilk for SS14" , + "copyright": "Made by UbaserB and edited by Kilk for SS14 and modified by alzore_(discord)" , "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/equipped-FEET.png index 248b20735ac6a7b079e0ecf0cfdcf9b947689866..bcff2ee62e4dde85f8f06b8434a545b3387c08ec 100644 GIT binary patch delta 301 zcmX@Xe3NN{BnLAC1H;_yjc+C@D%48{_=LDt` zRF}H@)f6DbSrX(I{2vM!g8eImK!ODxk;M!QdEI;}2IE46jQv9-1geTp^PXA5tt1G=BV)78&qol`;+0NZ(W7ytkO delta 413 zcmV;O0b>5y0>}f983+ad0063Kao&+3Ab$yPNLh0L01m?d01m?e$8V@)00049Nkl zl?g$zqa+Od|D@=P8@JE4(#bXe0000000000z-pM(8RYEfu-re`Gmj5*BYAvrIe)o2 zJtNjHyQGcz@Ag)OE@nvpq@AWfDX}duT>0j$7Nm9yXZ_D-RR8t>#ZLd%7 z(lm87|Ew=p-7i?s>mrld-KkbL%ic9V7Yhmbz6?O_&1|-z`Sd(DMN#zjSCC0mk77jE%?t5%T+$Z2o`x`x5i)z4*}Q$iB}mcwSl delta 446 zcmV;v0YUz-0_g*g83+ad0047(di0SYAb$yPNLh0L01m?d01m?e$8V@)0004gNklk#Ee!{GZY`8fV0}10f0y3q(5XbZU%tRx_@*NkF6ubUT7`obaqzqLcki zy12aS&^h?d7!$^d+ycw8f+QTr@n=N3uKTl2o%62=?5)px&ORs>Gd+DR@h#M4^lbr3 z-rduwWQty1>pi`mo1LL%laXm!-rBYs)N0xET&sn~ktTrPiHXU;A%If^7wI4#H%QZd zFC^EVs+G`tAZ-Coh#+vp2i9RahU<1dc~n4#v;u}*(2P=G!>?QO~ oz@J8f2W$Ud_7oKg#V|wk10!VEo=<<}t^fc407*qoM6N<$f~Hi|ga7~l diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootssyndicate.rsi/inhand-left.png index ebf7810daddb336ace166a4f136c72b67a37a96e..3397fee7b9c070689fc75bc3289c4a22df27e898 100644 GIT binary patch delta 270 zcmeBU-pw>Yl7pFnfno0U#y1lc73w7dd_r8S{Y;isMN3LZE!Ef5*E3X9P~zg^0xB|Z zsk;QEI7)*2g8xGR!@cIckw7ud0*}aI1_r)^Ak4U9V)k30;0#X}$B+p3x7RlEH7M}7 z1|DVl|Nr=%O4fKxfv6c`hViVu}bh@Cz0wAgt-cY`~T6g`ix%`X^?W-Q2V{a&! z^4f@TlhZqg2?|1wS&nENWnf$|?bfzwUqYk%7v_J^U}7-=qb=*1vak95+0wB7(f<`` z>i;Ad+kH7U{C?BGpef8GcHj*IgEYUG!`btEKcsCs4)8b3@z1u*o3rsvyf4s^44$rj JF6*2UngFL+XeG+x3_$= z4h0At_?SNZfj?WBoi>5qsa*F*?$g(?UTc(;Dhf~s_ zJqhyv>J855$lP;(q?HV`2?*Z#YM;KQtCs)qS#@^R-*qRS-z*Bv^v$gg<*$$2wkqTE zq~(vVTl|hx%&nL0-NX34`S~T^bNdfnD&6|G)TD^N`K#5PnHpVM zYgfMAFM0lR5~t;XozoN!5S;-`kG~ZF|NpHIqMM*4dwo>h~FDe`Y@Sk9E#m`3sZQ ygXQMz(zRT1`7?7=5u>M~2H7Ibn zdK>=#-!FW`ZK?Ft?(FY28eDSb@dYR48yT3`m^fx+vKXxusN+jDnn zo@L&}zh^uXe*f#8)F~C^$8`Jq`V;a_$=#wk+up}ZF8!tdnSrBD;Y207r$t`ls@-|o QKxZ;|y85}Sb4q9e0IC6MDF6Tf delta 352 zcmV-m0iXW80*nKY83+ad0063Kao&+3Ab$yPNLh0L01m?d01m?e$8V@)0003YNklND0+kbzz z%oR;9OP=1}(5C;!g$$D<@AqO|?>_fR>c#RyWm)F+ z;tl8iqbSNHq3&ZH{k64ij@mtJ9K&hCDxTHraq8>9Ffs00004K&dYnqsizw2bsbE0000I$_TppPXj)Uw`1|FPBR)I`aMI`uV%PcRQCyegFUf00000007_* zNYy`!_vAHduRc0mh^%Tz^nHL6@5yT{nxEVMULdJdPfa_r_4=;VYFiSHjYqS^b!7ea zclY&0qFPL|)lT(56Z3oWY5VeNX%3gqui>kvesoD9sds?Jcu!vCy$k%CtRvqG1VJES gWmt^qr`Q1^pL@hdQL33HeEBbB%)QC@BhE|Idj|i3^`1MR5Q--4!$D#q5bIZfR7uQJpak} hKAu?qi{-*^zHV317dH{nhW3K=J delta 532 zcmV+v0_**l0=@*083+ad0047(di0SYAb$yPNLh0L01m?d01m?e$8V@)0005gNklsvF!izhc_4`!bW`sfhPvVuI3Jk?fzb3Ooc1t5 zX`%o&%VCya69>`fuHI*;%!~aGR)hsGLusObxDZ#v^Vc63Zr{Gc0HS%>{(>#I^MBwG zL!iGu!`5xv!Qvo!Niji&FCX84`G-zlW_bMMMI+Q06hLwmxVbvPee>h{M}|Lt{xUE! zGBR-U2tq{}7`}h|%<%W`Zzzv}ft7`s;oy<8SnVR&0lGR`|67_X8H70@f%o?NUoc%$ z+s=Shysm@c^5v`4Ndq9j%frTCV}EPUplM>mAS$oOprN4x#-L!qD*hj5^n(G(4gi58 zhYvDbKXZiP^~3uNBBIh@F_0Iri4y_@qX0S1zkGfNrsvO}&XAX1gWGQ=fAjh&LvUy^!<8%7NRDbS09pR_%_9u#?&geDeB=7X|Mhfr;QX7{kAH))m4yM$ zcpxeYKt6$C5PaNRB!V3-321^`WU W7EuNL$%g;{002ovPDHLkU;%>urSlsA diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/inhand-left.png b/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/inhand-left.png index 345b1c6c783dcf6161dfdffd32e74b6c4ffffe5c..c87ff7cdd831022c312843bb9e37ef190f616028 100644 GIT binary patch delta 258 zcmeBSUe7c^l7pFnfno0U#y1lc73zfod_r8GJ$v^5|NjH~_g=hk?)9tZKKbm+S|Ma29w(7BevL9Ry*<9TT(P0tKgdx;TbJxWB!&k*`64$2Bnb z^#A{xwluB$B+m9+ElmYzm9O@C67YQ_D7qgUMkqfEm8a zHNE6aOWC`I9sGaEUFo|)U;Kj*P)O7j5#0000008Ib@kigr&EUx+oGU*SKbm+S|Ma29w(7BevL9Ry*<9TT(P0tKgex;TbJxWAotk*`64!`1u4 z|9VTuoPb?x;-YpxR}}oP~&2pspl^< zZ4++d5>ijgTAAIkW6p}Vp$QpjO!x1-dt?aI;=s_zz{qlFJIgOS3F+UW^RH%F&fDaa&X?QM=}flmt1B8yJVQTZdL&R000009GX%T6Nde};N-NbKHrzhj%SxQTYt|; zk~ROMD8_6%tmAa_6hzy^%9H=bZnj&E)Ia&q9f*Dl3d#Tasvf+(&cny7b&S3iFKhmZ zN?e@R!cD(F->O_W4nNZ#d-v+L*-_)kv*_;sD}R0XYxNO6_S#g^{J2yu`NyiEH|WY~ zx_V}9o4qW=z5%}H4*&oF0000008X$|&QlWK?++Lo?+5(F_xl4jr*8Rvf1nUq=kLkyQ$-b-1s=SM00000NkvXXu0mjfwdAE7 diff --git a/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/meta.json b/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/meta.json index 8bfe0c1a19..6fda26443e 100644 --- a/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/meta.json +++ b/Resources/Textures/Clothing/Shoes/Boots/winterbootsweb.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by UbaserB and edited by Kilk for SS14" , + "copyright": "Made by UbaserB and edited by Kilk for SS14 and modified by alzore_(discord)" , "size": { "x": 32, "y": 32 From b72818cb12224db726106acaf7ca7ed59e7168f6 Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 2 Aug 2024 23:06:27 +0000 Subject: [PATCH 137/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index a7c6d80c3b..f9b63511e1 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: DogZeroX - changes: - - message: 'Added a new salvage song: Deadline by Bolgarich' - type: Add - id: 6535 - time: '2024-05-06T03:51:33.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27707 - author: '0x6273' changes: - message: Shuttle docks now have a "dock status" device link port @@ -3784,3 +3777,10 @@ id: 7034 time: '2024-08-02T17:12:08.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/27454 +- author: Blackern5000 + changes: + - message: Winter boots no longer have ugly outlines + type: Tweak + id: 7035 + time: '2024-08-02T23:05:19.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30350 From 7c7dfb48bba8791a3be15ea567f78033e1b9a974 Mon Sep 17 00:00:00 2001 From: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Date: Fri, 2 Aug 2024 19:24:54 -0400 Subject: [PATCH 138/422] Greyscale Winter Coats and Hoods, some reorganizing of rsi. (#30314) * reorganize coats, greyscale coats and hoods * fix inhands * make rsi validator happy * even mo' hap' * comma schmomma * oops theres a recipe * armor credits * painflicts --- .../Entities/Clothing/Head/hoods.yml | 220 +++++ .../Clothing/OuterClothing/wintercoats.yml | 783 ++++++++++++++++-- Resources/Prototypes/Recipes/Crafting/web.yml | 4 +- .../coatybits-equipped-HELMET.png | Bin 0 -> 742 bytes .../Coat/hooddefault.rsi/coatybits-icon.png | Bin 0 -> 207 bytes .../Head/Hoods/Coat/hooddefault.rsi/meta.json | 23 +- .../winterbits-equipped-HELMET.png | Bin 0 -> 301 bytes .../Coat/hooddefault.rsi/winterbits-icon.png | Bin 0 -> 279 bytes .../winterbits-tan-equipped-HELMET.png | Bin 0 -> 324 bytes .../hooddefault.rsi/winterbits-tan-icon.png | Bin 0 -> 200 bytes .../coat.rsi/ARMOR-equipped-OUTERCLOTHING.png | Bin 0 -> 666 bytes .../WinterCoats/coat.rsi/ARMOR-icon.png | Bin 0 -> 235 bytes .../coat.rsi/ARMOR-inhand-left.png | Bin 0 -> 255 bytes .../coat.rsi/ARMOR-inhand-right.png | Bin 0 -> 247 bytes .../ATMOS-equipped-OUTERCLOTHING-vox.png} | Bin .../ATMOS-equipped-OUTERCLOTHING.png} | Bin .../icon.png => coat.rsi/ATMOS-icon.png} | Bin .../ATMOS-inhand-left.png} | Bin .../ATMOS-inhand-right.png} | Bin .../BAR-equipped-OUTERCLOTHING-vox.png} | Bin .../BAR-equipped-OUTERCLOTHING.png} | Bin .../icon.png => coat.rsi/BAR-icon.png} | Bin .../BAR-inhand-left.png} | Bin .../BAR-inhand-right.png} | Bin .../CAP-equipped-OUTERCLOTHING-vox.png} | Bin .../CAP-equipped-OUTERCLOTHING.png} | Bin .../icon.png => coat.rsi/CAP-icon.png} | Bin .../CAP-inhand-left.png} | Bin .../CAP-inhand-right.png} | Bin .../CARGO-equipped-OUTERCLOTHING-vox.png} | Bin .../CARGO-equipped-OUTERCLOTHING.png} | Bin .../icon.png => coat.rsi/CARGO-icon.png} | Bin .../CARGO-inhand-left.png} | Bin .../CARGO-inhand-right.png} | Bin .../CE-equipped-OUTERCLOTHING-vox.png} | Bin .../CE-equipped-OUTERCLOTHING.png} | Bin .../icon.png => coat.rsi/CE-icon.png} | Bin .../CE-inhand-left.png} | Bin .../CE-inhand-right.png} | Bin .../CENTCOM-equipped-OUTERCLOTHING.png} | Bin .../icon.png => coat.rsi/CENTCOM-icon.png} | Bin .../CENTCOM-inhand-left.png} | Bin .../CENTCOM-inhand-right.png} | Bin .../CHEF-equipped-OUTERCLOTHING.png} | Bin .../icon.png => coat.rsi/CHEF-icon.png} | Bin .../CHEF-inhand-left.png} | Bin .../CHEF-inhand-right.png} | Bin .../CHEM-equipped-OUTERCLOTHING.png} | Bin .../icon.png => coat.rsi/CHEM-icon.png} | Bin .../CHEM-inhand-left.png} | Bin .../CHEM-inhand-right.png} | Bin .../CMO-equipped-OUTERCLOTHING.png} | Bin .../icon.png => coat.rsi/CMO-icon.png} | Bin .../CMO-inhand-left.png} | Bin .../CMO-inhand-right.png} | Bin .../ENGI-equipped-OUTERCLOTHING-vox.png} | Bin .../ENGI-equipped-OUTERCLOTHING.png} | Bin .../icon.png => coat.rsi/ENGI-icon.png} | Bin .../ENGI-inhand-left.png} | Bin .../ENGI-inhand-right.png} | Bin .../GENE-equipped-OUTERCLOTHING.png} | Bin .../icon.png => coat.rsi/GENE-icon.png} | Bin .../GENE-inhand-left.png} | Bin .../GENE-inhand-right.png} | Bin .../HOP-equipped-OUTERCLOTHING.png} | Bin .../icon.png => coat.rsi/HOP-icon.png} | Bin .../HOP-inhand-left.png} | Bin .../HOP-inhand-right.png} | Bin .../WinterCoats/coat.rsi/HOS-ARMORED-icon.png | Bin 0 -> 724 bytes .../HOS-equipped-OUTERCLOTHING.png} | Bin .../icon.png => coat.rsi/HOS-icon.png} | Bin .../HOS-inhand-left.png} | Bin .../HOS-inhand-right.png} | Bin .../HYDRO-equipped-OUTERCLOTHING-vox.png} | Bin .../HYDRO-equipped-OUTERCLOTHING.png} | Bin .../icon.png => coat.rsi/HYDRO-icon.png} | Bin .../HYDRO-inhand-left.png} | Bin .../HYDRO-inhand-right.png} | Bin .../JANI-equipped-OUTERCLOTHING.png} | Bin .../icon.png => coat.rsi/JANI-icon.png} | Bin .../JANI-inhand-left.png} | Bin .../JANI-inhand-right.png} | Bin .../MED-equipped-OUTERCLOTHING-vox.png} | Bin .../MED-equipped-OUTERCLOTHING.png} | Bin .../icon.png => coat.rsi/MED-icon.png} | Bin .../MED-inhand-left.png} | Bin .../MED-inhand-right.png} | Bin .../MIME-equipped-OUTERCLOTHING-vox.png} | Bin .../MIME-equipped-OUTERCLOTHING.png} | Bin .../icon.png => coat.rsi/MIME-icon.png} | Bin .../MIME-inhand-left.png} | Bin .../MIME-inhand-right.png} | Bin .../MINER-equipped-OUTERCLOTHING-vox.png} | Bin .../MINER-equipped-OUTERCLOTHING.png} | Bin .../icon.png => coat.rsi/MINER-icon.png} | Bin .../MINER-inhand-left.png} | Bin .../MINER-inhand-right.png} | Bin .../PARA-equipped-OUTERCLOTHING-vox.png} | Bin .../PARA-equipped-OUTERCLOTHING.png} | Bin .../icon.png => coat.rsi/PARA-icon.png} | Bin .../PARA-inhand-left.png} | Bin .../PARA-inhand-right.png} | Bin .../QM-equipped-OUTERCLOTHING.png} | Bin .../icon.png => coat.rsi/QM-icon.png} | Bin .../QM-inhand-left.png} | Bin .../QM-inhand-right.png} | Bin .../RD-equipped-OUTERCLOTHING.png} | Bin .../icon.png => coat.rsi/RD-icon.png} | Bin .../RD-inhand-left.png} | Bin .../RD-inhand-right.png} | Bin .../ROBO-equipped-OUTERCLOTHING.png} | Bin .../icon.png => coat.rsi/ROBO-icon.png} | Bin .../ROBO-inhand-left.png} | Bin .../ROBO-inhand-right.png} | Bin .../SCI-equipped-OUTERCLOTHING-vox.png} | Bin .../SCI-equipped-OUTERCLOTHING.png} | Bin .../icon.png => coat.rsi/SCI-icon.png} | Bin .../SCI-inhand-left.png} | Bin .../SCI-inhand-right.png} | Bin .../SEC-equipped-OUTERCLOTHING-vox.png} | Bin .../SEC-equipped-OUTERCLOTHING.png} | Bin .../icon.png => coat.rsi/SEC-icon.png} | Bin .../SEC-inhand-left.png} | Bin .../SEC-inhand-right.png} | Bin .../coat.rsi/SYNDIE-ARMORED-icon.png | Bin 0 -> 754 bytes .../SYNDIE-equipped-OUTERCLOTHING.png} | Bin .../icon.png => coat.rsi/SYNDIE-icon.png} | Bin .../SYNDIE-inhand-left.png} | Bin .../SYNDIE-inhand-right.png} | Bin .../SYNDIECAP-equipped-OUTERCLOTHING.png} | Bin .../icon.png => coat.rsi/SYNDIECAP-icon.png} | Bin .../SYNDIECAP-inhand-left.png} | Bin .../SYNDIECAP-inhand-right.png} | Bin .../VIRO-equipped-OUTERCLOTHING.png} | Bin .../icon.png => coat.rsi/VIRO-icon.png} | Bin .../VIRO-inhand-left.png} | Bin .../VIRO-inhand-right.png} | Bin .../WARD-equipped-OUTERCLOTHING.png} | Bin .../icon.png => coat.rsi/WARD-icon.png} | Bin .../WARD-inhand-left.png} | Bin .../WARD-inhand-right.png} | Bin .../coat.rsi/WARDEN-ARMORED-icon.png | Bin 0 -> 761 bytes .../WEB-equipped-OUTERCLOTHING.png} | Bin .../icon.png => coat.rsi/WEB-icon.png} | Bin .../WEB-inhand-left.png} | Bin .../WEB-inhand-right.png} | Bin .../coatybits-equipped-OUTERCLOTHING-vox.png | Bin 0 -> 635 bytes .../coatybits-equipped-OUTERCLOTHING.png | Bin 0 -> 603 bytes .../WinterCoats/coat.rsi/coatybits-icon.png | Bin 0 -> 240 bytes .../coat.rsi/coatybits-inhand-left.png | Bin 0 -> 261 bytes .../coat.rsi/coatybits-inhand-right.png | Bin 0 -> 261 bytes .../WinterCoats/coat.rsi/meta.json | 558 ++++++++++++- .../winterbits-equipped-OUTERCLOTHING-vox.png | Bin 0 -> 480 bytes .../winterbits-equipped-OUTERCLOTHING.png | Bin 0 -> 663 bytes .../WinterCoats/coat.rsi/winterbits-icon.png | Bin 0 -> 259 bytes .../coat.rsi/winterbits-inhand-left.png | Bin 0 -> 228 bytes .../coat.rsi/winterbits-inhand-right.png | Bin 0 -> 228 bytes .../winterbits-tan-equipped-OUTERCLOTHING.png | Bin 0 -> 614 bytes .../coat.rsi/winterbits-tan-icon.png | Bin 0 -> 258 bytes .../WinterCoats/coatatmos.rsi/meta.json | 30 - .../WinterCoats/coatbar.rsi/meta.json | 30 - .../WinterCoats/coatcap.rsi/meta.json | 30 - .../WinterCoats/coatcargo.rsi/meta.json | 30 - .../WinterCoats/coatce.rsi/meta.json | 30 - .../WinterCoats/coatcentcom.rsi/meta.json | 26 - .../WinterCoats/coatchef.rsi/meta.json | 26 - .../WinterCoats/coatchem.rsi/meta.json | 26 - .../WinterCoats/coatcmo.rsi/meta.json | 26 - .../WinterCoats/coatengi.rsi/meta.json | 30 - .../WinterCoats/coatgen.rsi/meta.json | 26 - .../WinterCoats/coathop.rsi/meta.json | 26 - .../WinterCoats/coathos.rsi/meta.json | 26 - .../WinterCoats/coathydro.rsi/meta.json | 30 - .../WinterCoats/coatjani.rsi/meta.json | 26 - .../WinterCoats/coatmed.rsi/meta.json | 30 - .../WinterCoats/coatmime.rsi/meta.json | 30 - .../WinterCoats/coatminer.rsi/meta.json | 30 - .../WinterCoats/coatparamed.rsi/meta.json | 30 - .../WinterCoats/coatqm.rsi/meta.json | 26 - .../WinterCoats/coatrd.rsi/meta.json | 26 - .../WinterCoats/coatrobo.rsi/meta.json | 26 - .../WinterCoats/coatsci.rsi/meta.json | 30 - .../WinterCoats/coatsec.rsi/meta.json | 30 - .../WinterCoats/coatviro.rsi/meta.json | 26 - .../WinterCoats/coatwarden.rsi/meta.json | 26 - .../WinterCoats/coatweb.rsi/meta.json | 23 - .../syndicate/coatsyndiecap.rsi/meta.json | 26 - .../syndicate/wintercoatsyndie.rsi/meta.json | 26 - 188 files changed, 1526 insertions(+), 865 deletions(-) create mode 100644 Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/coatybits-equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/coatybits-icon.png create mode 100644 Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/winterbits-equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/winterbits-icon.png create mode 100644 Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/winterbits-tan-equipped-HELMET.png create mode 100644 Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/winterbits-tan-icon.png create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ARMOR-equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ARMOR-icon.png create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ARMOR-inhand-left.png create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ARMOR-inhand-right.png rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatatmos.rsi/equipped-OUTERCLOTHING-vox.png => coat.rsi/ATMOS-equipped-OUTERCLOTHING-vox.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatatmos.rsi/equipped-OUTERCLOTHING.png => coat.rsi/ATMOS-equipped-OUTERCLOTHING.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatatmos.rsi/icon.png => coat.rsi/ATMOS-icon.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatatmos.rsi/inhand-left.png => coat.rsi/ATMOS-inhand-left.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatatmos.rsi/inhand-right.png => coat.rsi/ATMOS-inhand-right.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatbar.rsi/equipped-OUTERCLOTHING-vox.png => coat.rsi/BAR-equipped-OUTERCLOTHING-vox.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatbar.rsi/equipped-OUTERCLOTHING.png => coat.rsi/BAR-equipped-OUTERCLOTHING.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatbar.rsi/icon.png => coat.rsi/BAR-icon.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatbar.rsi/inhand-left.png => coat.rsi/BAR-inhand-left.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatbar.rsi/inhand-right.png => coat.rsi/BAR-inhand-right.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatcap.rsi/equipped-OUTERCLOTHING-vox.png => coat.rsi/CAP-equipped-OUTERCLOTHING-vox.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatcap.rsi/equipped-OUTERCLOTHING.png => coat.rsi/CAP-equipped-OUTERCLOTHING.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatcap.rsi/icon.png => coat.rsi/CAP-icon.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatcap.rsi/inhand-left.png => coat.rsi/CAP-inhand-left.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatcap.rsi/inhand-right.png => coat.rsi/CAP-inhand-right.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatcargo.rsi/equipped-OUTERCLOTHING-vox.png => coat.rsi/CARGO-equipped-OUTERCLOTHING-vox.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatcargo.rsi/equipped-OUTERCLOTHING.png => coat.rsi/CARGO-equipped-OUTERCLOTHING.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatcargo.rsi/icon.png => coat.rsi/CARGO-icon.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatcargo.rsi/inhand-left.png => coat.rsi/CARGO-inhand-left.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatcargo.rsi/inhand-right.png => coat.rsi/CARGO-inhand-right.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatce.rsi/equipped-OUTERCLOTHING-vox.png => coat.rsi/CE-equipped-OUTERCLOTHING-vox.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatce.rsi/equipped-OUTERCLOTHING.png => coat.rsi/CE-equipped-OUTERCLOTHING.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatce.rsi/icon.png => coat.rsi/CE-icon.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatce.rsi/inhand-left.png => coat.rsi/CE-inhand-left.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatce.rsi/inhand-right.png => coat.rsi/CE-inhand-right.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatcentcom.rsi/equipped-OUTERCLOTHING.png => coat.rsi/CENTCOM-equipped-OUTERCLOTHING.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatcentcom.rsi/icon.png => coat.rsi/CENTCOM-icon.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatcentcom.rsi/inhand-left.png => coat.rsi/CENTCOM-inhand-left.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatcentcom.rsi/inhand-right.png => coat.rsi/CENTCOM-inhand-right.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatchef.rsi/equipped-OUTERCLOTHING.png => coat.rsi/CHEF-equipped-OUTERCLOTHING.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatchef.rsi/icon.png => coat.rsi/CHEF-icon.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatchef.rsi/inhand-left.png => coat.rsi/CHEF-inhand-left.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatchef.rsi/inhand-right.png => coat.rsi/CHEF-inhand-right.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatchem.rsi/equipped-OUTERCLOTHING.png => coat.rsi/CHEM-equipped-OUTERCLOTHING.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatchem.rsi/icon.png => coat.rsi/CHEM-icon.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatchem.rsi/inhand-left.png => coat.rsi/CHEM-inhand-left.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatchem.rsi/inhand-right.png => coat.rsi/CHEM-inhand-right.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatcmo.rsi/equipped-OUTERCLOTHING.png => coat.rsi/CMO-equipped-OUTERCLOTHING.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatcmo.rsi/icon.png => coat.rsi/CMO-icon.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatcmo.rsi/inhand-left.png => coat.rsi/CMO-inhand-left.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatcmo.rsi/inhand-right.png => coat.rsi/CMO-inhand-right.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatengi.rsi/equipped-OUTERCLOTHING-vox.png => coat.rsi/ENGI-equipped-OUTERCLOTHING-vox.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatengi.rsi/equipped-OUTERCLOTHING.png => coat.rsi/ENGI-equipped-OUTERCLOTHING.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatengi.rsi/icon.png => coat.rsi/ENGI-icon.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatengi.rsi/inhand-left.png => coat.rsi/ENGI-inhand-left.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatengi.rsi/inhand-right.png => coat.rsi/ENGI-inhand-right.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatgen.rsi/equipped-OUTERCLOTHING.png => coat.rsi/GENE-equipped-OUTERCLOTHING.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatgen.rsi/icon.png => coat.rsi/GENE-icon.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatgen.rsi/inhand-left.png => coat.rsi/GENE-inhand-left.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatgen.rsi/inhand-right.png => coat.rsi/GENE-inhand-right.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coathop.rsi/equipped-OUTERCLOTHING.png => coat.rsi/HOP-equipped-OUTERCLOTHING.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coathop.rsi/icon.png => coat.rsi/HOP-icon.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coathop.rsi/inhand-left.png => coat.rsi/HOP-inhand-left.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coathop.rsi/inhand-right.png => coat.rsi/HOP-inhand-right.png} (100%) create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOS-ARMORED-icon.png rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coathos.rsi/equipped-OUTERCLOTHING.png => coat.rsi/HOS-equipped-OUTERCLOTHING.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coathos.rsi/icon.png => coat.rsi/HOS-icon.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coathos.rsi/inhand-left.png => coat.rsi/HOS-inhand-left.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coathos.rsi/inhand-right.png => coat.rsi/HOS-inhand-right.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coathydro.rsi/equipped-OUTERCLOTHING-vox.png => coat.rsi/HYDRO-equipped-OUTERCLOTHING-vox.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coathydro.rsi/equipped-OUTERCLOTHING.png => coat.rsi/HYDRO-equipped-OUTERCLOTHING.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coathydro.rsi/icon.png => coat.rsi/HYDRO-icon.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coathydro.rsi/inhand-left.png => coat.rsi/HYDRO-inhand-left.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coathydro.rsi/inhand-right.png => coat.rsi/HYDRO-inhand-right.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatjani.rsi/equipped-OUTERCLOTHING.png => coat.rsi/JANI-equipped-OUTERCLOTHING.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatjani.rsi/icon.png => coat.rsi/JANI-icon.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatjani.rsi/inhand-left.png => coat.rsi/JANI-inhand-left.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatjani.rsi/inhand-right.png => coat.rsi/JANI-inhand-right.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatmed.rsi/equipped-OUTERCLOTHING-vox.png => coat.rsi/MED-equipped-OUTERCLOTHING-vox.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatmed.rsi/equipped-OUTERCLOTHING.png => coat.rsi/MED-equipped-OUTERCLOTHING.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatmed.rsi/icon.png => coat.rsi/MED-icon.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatmed.rsi/inhand-left.png => coat.rsi/MED-inhand-left.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatmed.rsi/inhand-right.png => coat.rsi/MED-inhand-right.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatmime.rsi/equipped-OUTERCLOTHING-vox.png => coat.rsi/MIME-equipped-OUTERCLOTHING-vox.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatmime.rsi/equipped-OUTERCLOTHING.png => coat.rsi/MIME-equipped-OUTERCLOTHING.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatmime.rsi/icon.png => coat.rsi/MIME-icon.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatmime.rsi/inhand-left.png => coat.rsi/MIME-inhand-left.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatmime.rsi/inhand-right.png => coat.rsi/MIME-inhand-right.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatminer.rsi/equipped-OUTERCLOTHING-vox.png => coat.rsi/MINER-equipped-OUTERCLOTHING-vox.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatminer.rsi/equipped-OUTERCLOTHING.png => coat.rsi/MINER-equipped-OUTERCLOTHING.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatminer.rsi/icon.png => coat.rsi/MINER-icon.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatminer.rsi/inhand-left.png => coat.rsi/MINER-inhand-left.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatminer.rsi/inhand-right.png => coat.rsi/MINER-inhand-right.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatparamed.rsi/equipped-OUTERCLOTHING-vox.png => coat.rsi/PARA-equipped-OUTERCLOTHING-vox.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatparamed.rsi/equipped-OUTERCLOTHING.png => coat.rsi/PARA-equipped-OUTERCLOTHING.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatparamed.rsi/icon.png => coat.rsi/PARA-icon.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatparamed.rsi/inhand-left.png => coat.rsi/PARA-inhand-left.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatparamed.rsi/inhand-right.png => coat.rsi/PARA-inhand-right.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatqm.rsi/equipped-OUTERCLOTHING.png => coat.rsi/QM-equipped-OUTERCLOTHING.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatqm.rsi/icon.png => coat.rsi/QM-icon.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatqm.rsi/inhand-left.png => coat.rsi/QM-inhand-left.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatqm.rsi/inhand-right.png => coat.rsi/QM-inhand-right.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatrd.rsi/equipped-OUTERCLOTHING.png => coat.rsi/RD-equipped-OUTERCLOTHING.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatrd.rsi/icon.png => coat.rsi/RD-icon.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatrd.rsi/inhand-left.png => coat.rsi/RD-inhand-left.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatrd.rsi/inhand-right.png => coat.rsi/RD-inhand-right.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatrobo.rsi/equipped-OUTERCLOTHING.png => coat.rsi/ROBO-equipped-OUTERCLOTHING.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatrobo.rsi/icon.png => coat.rsi/ROBO-icon.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatrobo.rsi/inhand-left.png => coat.rsi/ROBO-inhand-left.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatrobo.rsi/inhand-right.png => coat.rsi/ROBO-inhand-right.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatsci.rsi/equipped-OUTERCLOTHING-vox.png => coat.rsi/SCI-equipped-OUTERCLOTHING-vox.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatsci.rsi/equipped-OUTERCLOTHING.png => coat.rsi/SCI-equipped-OUTERCLOTHING.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatsci.rsi/icon.png => coat.rsi/SCI-icon.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatsci.rsi/inhand-left.png => coat.rsi/SCI-inhand-left.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatsci.rsi/inhand-right.png => coat.rsi/SCI-inhand-right.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatsec.rsi/equipped-OUTERCLOTHING-vox.png => coat.rsi/SEC-equipped-OUTERCLOTHING-vox.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatsec.rsi/equipped-OUTERCLOTHING.png => coat.rsi/SEC-equipped-OUTERCLOTHING.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatsec.rsi/icon.png => coat.rsi/SEC-icon.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatsec.rsi/inhand-left.png => coat.rsi/SEC-inhand-left.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatsec.rsi/inhand-right.png => coat.rsi/SEC-inhand-right.png} (100%) create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIE-ARMORED-icon.png rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{syndicate/wintercoatsyndie.rsi/equipped-OUTERCLOTHING.png => coat.rsi/SYNDIE-equipped-OUTERCLOTHING.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{syndicate/wintercoatsyndie.rsi/icon.png => coat.rsi/SYNDIE-icon.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{syndicate/wintercoatsyndie.rsi/inhand-left.png => coat.rsi/SYNDIE-inhand-left.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{syndicate/wintercoatsyndie.rsi/inhand-right.png => coat.rsi/SYNDIE-inhand-right.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{syndicate/coatsyndiecap.rsi/equipped-OUTERCLOTHING.png => coat.rsi/SYNDIECAP-equipped-OUTERCLOTHING.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{syndicate/coatsyndiecap.rsi/icon.png => coat.rsi/SYNDIECAP-icon.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{syndicate/coatsyndiecap.rsi/inhand-left.png => coat.rsi/SYNDIECAP-inhand-left.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{syndicate/coatsyndiecap.rsi/inhand-right.png => coat.rsi/SYNDIECAP-inhand-right.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatviro.rsi/equipped-OUTERCLOTHING.png => coat.rsi/VIRO-equipped-OUTERCLOTHING.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatviro.rsi/icon.png => coat.rsi/VIRO-icon.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatviro.rsi/inhand-left.png => coat.rsi/VIRO-inhand-left.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatviro.rsi/inhand-right.png => coat.rsi/VIRO-inhand-right.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatwarden.rsi/equipped-OUTERCLOTHING.png => coat.rsi/WARD-equipped-OUTERCLOTHING.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatwarden.rsi/icon.png => coat.rsi/WARD-icon.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatwarden.rsi/inhand-left.png => coat.rsi/WARD-inhand-left.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatwarden.rsi/inhand-right.png => coat.rsi/WARD-inhand-right.png} (100%) create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WARDEN-ARMORED-icon.png rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatweb.rsi/equipped-OUTERCLOTHING.png => coat.rsi/WEB-equipped-OUTERCLOTHING.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatweb.rsi/icon.png => coat.rsi/WEB-icon.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatweb.rsi/inhand-left.png => coat.rsi/WEB-inhand-left.png} (100%) rename Resources/Textures/Clothing/OuterClothing/WinterCoats/{coatweb.rsi/inhand-right.png => coat.rsi/WEB-inhand-right.png} (100%) create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/coatybits-equipped-OUTERCLOTHING-vox.png create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/coatybits-equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/coatybits-icon.png create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/coatybits-inhand-left.png create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/coatybits-inhand-right.png create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-equipped-OUTERCLOTHING-vox.png create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-icon.png create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-inhand-left.png create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-inhand-right.png create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-tan-equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-tan-icon.png delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/meta.json delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/meta.json delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/meta.json delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/meta.json delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/meta.json delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/meta.json delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchef.rsi/meta.json delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/meta.json delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/meta.json delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/meta.json delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/meta.json delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/meta.json delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coathos.rsi/meta.json delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coathydro.rsi/meta.json delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coatjani.rsi/meta.json delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmed.rsi/meta.json delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coatmime.rsi/meta.json delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coatminer.rsi/meta.json delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coatparamed.rsi/meta.json delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coatqm.rsi/meta.json delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrd.rsi/meta.json delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coatrobo.rsi/meta.json delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsci.rsi/meta.json delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coatsec.rsi/meta.json delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/meta.json delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/meta.json delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/meta.json delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi/meta.json delete mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml index 180b738e40..125d183caa 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml @@ -525,3 +525,223 @@ sprite: Clothing/Head/Hoods/Coat/hoodweb.rsi - type: Clothing sprite: Clothing/Head/Hoods/Coat/hoodweb.rsi + +- type: entity + parent: ClothingHeadHatHoodWinterBase + id: ClothingHeadHatHoodWinterColorBlack + noSpawn: true + name: black winter coat hood + components: + - type: Sprite + sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi + layers: + - state: coatybits-icon + color: "#3f3f3f" + - state: winterbits-icon + - type: Clothing + sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi + clothingVisuals: + head: + - state: coatybits-equipped-HELMET + color: "#3f3f3f" + - state: winterbits-equipped-HELMET + +- type: entity + parent: ClothingHeadHatHoodWinterBase + id: ClothingHeadHatHoodWinterColorPurple + noSpawn: true + name: purple winter coat hood + components: + - type: Sprite + sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi + layers: + - state: coatybits-icon + color: "#9C0DE1" + - state: winterbits-icon + - type: Clothing + sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi + clothingVisuals: + head: + - state: coatybits-equipped-HELMET + color: "#9C0DE1" + - state: winterbits-equipped-HELMET + +- type: entity + parent: ClothingHeadHatHoodWinterBase + id: ClothingHeadHatHoodWinterColorRed + noSpawn: true + name: red winter coat hood + components: + - type: Sprite + sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi + layers: + - state: coatybits-icon + color: "#940000" + - state: winterbits-icon + - type: Clothing + sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi + clothingVisuals: + head: + - state: coatybits-equipped-HELMET + color: "#940000" + - state: winterbits-equipped-HELMET + +- type: entity + parent: ClothingHeadHatHoodWinterBase + id: ClothingHeadHatHoodWinterColorBlue + noSpawn: true + name: blue winter coat hood + components: + - type: Sprite + sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi + layers: + - state: coatybits-icon + color: "#0089EF" + - state: winterbits-icon + - type: Clothing + sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi + clothingVisuals: + head: + - state: coatybits-equipped-HELMET + color: "#0089EF" + - state: winterbits-equipped-HELMET + +- type: entity + parent: ClothingHeadHatHoodWinterBase + id: ClothingHeadHatHoodWinterColorBrown + noSpawn: true + name: brown winter coat hood + components: + - type: Sprite + sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi + layers: + - state: coatybits-icon + color: "#723A02" + - state: winterbits-icon + - type: Clothing + sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi + clothingVisuals: + head: + - state: coatybits-equipped-HELMET + color: "#723A02" + - state: winterbits-equipped-HELMET + +- type: entity + parent: ClothingHeadHatHoodWinterBase + id: ClothingHeadHatHoodWinterColorGray + noSpawn: true + name: gray winter coat hood + components: + - type: Sprite + sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi + layers: + - state: coatybits-icon + color: "#999999" + - state: winterbits-icon + - type: Clothing + sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi + clothingVisuals: + head: + - state: coatybits-equipped-HELMET + color: "#999999" + - state: winterbits-equipped-HELMET + +- type: entity + parent: ClothingHeadHatHoodWinterBase + id: ClothingHeadHatHoodWinterColorGreen + noSpawn: true + name: green winter coat hood + components: + - type: Sprite + sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi + layers: + - state: coatybits-icon + color: "#5ABF2F" + - state: winterbits-icon + - type: Clothing + sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi + clothingVisuals: + head: + - state: coatybits-equipped-HELMET + color: "#5ABF2F" + - state: winterbits-equipped-HELMET + +- type: entity + parent: ClothingHeadHatHoodWinterBase + id: ClothingHeadHatHoodWinterColorLightBrown + noSpawn: true + name: light brown winter coat hood + components: + - type: Sprite + sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi + layers: + - state: coatybits-icon + color: "#C09F72" + - state: winterbits-icon + - type: Clothing + sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi + clothingVisuals: + head: + - state: coatybits-equipped-HELMET + color: "#C09F72" + - state: winterbits-equipped-HELMET + +- type: entity + parent: ClothingHeadHatHoodWinterBase + id: ClothingHeadHatHoodWinterColorOrange + noSpawn: true + name: orange winter coat hood + components: + - type: Sprite + sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi + layers: + - state: coatybits-icon + color: "#EF8100" + - state: winterbits-icon + - type: Clothing + sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi + clothingVisuals: + head: + - state: coatybits-equipped-HELMET + color: "#EF8100" + - state: winterbits-equipped-HELMET + +- type: entity + parent: ClothingHeadHatHoodWinterBase + id: ClothingHeadHatHoodWinterColorWhite + noSpawn: true + name: white winter coat hood + components: + - type: Sprite + sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi + layers: + - state: coatybits-icon + color: "#EAE8E8" + - state: winterbits-icon + - type: Clothing + sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi + clothingVisuals: + head: + - state: coatybits-equipped-HELMET + color: "#EAE8E8" + - state: winterbits-equipped-HELMET + +- type: entity + parent: ClothingHeadHatHoodWinterBase + id: ClothingHeadHatHoodWinterColorYellow + noSpawn: true + name: yellow winter coat hood + components: + - type: Sprite + sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi + layers: + - state: coatybits-icon + color: "#EBE216" + - state: winterbits-icon + - type: Clothing + sprite: Clothing/Head/Hoods/Coat/hooddefault.rsi + clothingVisuals: + head: + - state: coatybits-equipped-HELMET + color: "#EBE216" + - state: winterbits-equipped-HELMET diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index 9b943de36a..e3401f4533 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -55,9 +55,20 @@ name: atmospherics winter coat components: - type: Sprite - sprite: Clothing/OuterClothing/WinterCoats/coatatmos.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + layers: + - state: ATMOS-icon + - type: Item + inhandVisuals: + left: + - state: ATMOS-inhand-left + right: + - state: ATMOS-inhand-right - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/coatatmos.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + clothingVisuals: + outerClothing: + - state: ATMOS-equipped-OUTERCLOTHING - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodWinterEngineer @@ -67,9 +78,20 @@ name: bartender winter coat components: - type: Sprite - sprite: Clothing/OuterClothing/WinterCoats/coatbar.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + layers: + - state: BAR-icon + - type: Item + inhandVisuals: + left: + - state: BAR-inhand-left + right: + - state: BAR-inhand-right - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/coatbar.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + clothingVisuals: + outerClothing: + - state: BAR-equipped-OUTERCLOTHING - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodWinterBartender @@ -79,9 +101,20 @@ name: captain's winter coat components: - type: Sprite - sprite: Clothing/OuterClothing/WinterCoats/coatcap.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + layers: + - state: CAP-icon + - type: Item + inhandVisuals: + left: + - state: CAP-inhand-left + right: + - state: CAP-inhand-right - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/coatcap.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + clothingVisuals: + outerClothing: + - state: CAP-equipped-OUTERCLOTHING - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodWinterCaptain @@ -91,9 +124,20 @@ name: cargo winter coat components: - type: Sprite - sprite: Clothing/OuterClothing/WinterCoats/coatcargo.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + layers: + - state: CARGO-icon + - type: Item + inhandVisuals: + left: + - state: CARGO-inhand-left + right: + - state: CARGO-inhand-right - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/coatcargo.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + clothingVisuals: + outerClothing: + - state: CARGO-equipped-OUTERCLOTHING - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodWinterCargo @@ -103,9 +147,20 @@ name: chief engineer's winter coat components: - type: Sprite - sprite: Clothing/OuterClothing/WinterCoats/coatce.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + layers: + - state: CE-icon + - type: Item + inhandVisuals: + left: + - state: CE-inhand-left + right: + - state: CE-inhand-right - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/coatce.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + clothingVisuals: + outerClothing: + - state: CE-equipped-OUTERCLOTHING - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodWinterCE @@ -115,9 +170,20 @@ name: CentCom winter coat components: - type: Sprite - sprite: Clothing/OuterClothing/WinterCoats/coatcentcom.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + layers: + - state: CENTCOM-icon + - type: Item + inhandVisuals: + left: + - state: CENTCOM-inhand-left + right: + - state: CENTCOM-inhand-right - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/coatcentcom.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + clothingVisuals: + outerClothing: + - state: CENTCOM-equipped-OUTERCLOTHING - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodWinterCentcom @@ -128,9 +194,20 @@ description: A coat specifically designed for work inside cold storage, sorely needed by cold-blooded lizard chefs. components: - type: Sprite - sprite: Clothing/OuterClothing/WinterCoats/coatchef.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + layers: + - state: CHEF-icon + - type: Item + inhandVisuals: + left: + - state: CHEF-inhand-left + right: + - state: CHEF-inhand-right - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/coatchef.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + clothingVisuals: + outerClothing: + - state: CHEF-equipped-OUTERCLOTHING - type: entity parent: ClothingOuterWinterCoatToggleable @@ -138,9 +215,20 @@ name: chemistry winter coat components: - type: Sprite - sprite: Clothing/OuterClothing/WinterCoats/coatchem.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + layers: + - state: CHEM-icon + - type: Item + inhandVisuals: + left: + - state: CHEM-inhand-left + right: + - state: CHEM-inhand-right - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/coatchem.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + clothingVisuals: + outerClothing: + - state: CHEM-equipped-OUTERCLOTHING - type: Armor modifiers: coefficients: @@ -157,9 +245,20 @@ name: chief medical officer's winter coat components: - type: Sprite - sprite: Clothing/OuterClothing/WinterCoats/coatcmo.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + layers: + - state: CMO-icon + - type: Item + inhandVisuals: + left: + - state: CMO-inhand-left + right: + - state: CMO-inhand-right - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/coatcmo.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + clothingVisuals: + outerClothing: + - state: CMO-equipped-OUTERCLOTHING - type: Armor modifiers: coefficients: @@ -186,9 +285,20 @@ name: engineering winter coat components: - type: Sprite - sprite: Clothing/OuterClothing/WinterCoats/coatengi.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + layers: + - state: ENGI-icon + - type: Item + inhandVisuals: + left: + - state: ENGI-inhand-left + right: + - state: ENGI-inhand-right - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/coatengi.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + clothingVisuals: + outerClothing: + - state: ENGI-equipped-OUTERCLOTHING - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodWinterEngineer @@ -198,9 +308,20 @@ name: genetics winter coat components: - type: Sprite - sprite: Clothing/OuterClothing/WinterCoats/coatgen.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + layers: + - state: GENE-icon + - type: Item + inhandVisuals: + left: + - state: GENE-inhand-left + right: + - state: GENE-inhand-right - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/coatgen.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + clothingVisuals: + outerClothing: + - state: GENE-equipped-OUTERCLOTHING - type: Armor modifiers: coefficients: @@ -217,12 +338,25 @@ name: head of personnel's winter coat components: - type: Sprite - sprite: Clothing/OuterClothing/WinterCoats/coathop.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + layers: + - state: HOP-icon + - type: Item + inhandVisuals: + left: + - state: HOP-inhand-left + right: + - state: HOP-inhand-right - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/coathop.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + clothingVisuals: + outerClothing: + - state: HOP-equipped-OUTERCLOTHING - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodWinterHOP + +########################################################## - type: entity parent: [ClothingOuterArmorHoS, ClothingOuterWinterCoatToggleable] id: ClothingOuterWinterHoS @@ -235,6 +369,7 @@ sprite: Clothing/OuterClothing/WinterCoats/coathosarmored.rsi - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodWinterHOS +########################################################## - type: entity parent: ClothingOuterWinterCoatToggleable @@ -243,9 +378,20 @@ description: A sturdy coat, a warm coat, but not an armored coat. components: - type: Sprite - sprite: Clothing/OuterClothing/WinterCoats/coathos.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + layers: + - state: HOS-icon + - type: Item + inhandVisuals: + left: + - state: HOS-inhand-left + right: + - state: HOS-inhand-right - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/coathos.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + clothingVisuals: + outerClothing: + - state: HOS-equipped-OUTERCLOTHING - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodWinterHOS @@ -255,9 +401,20 @@ name: hydroponics winter coat components: - type: Sprite - sprite: Clothing/OuterClothing/WinterCoats/coathydro.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + layers: + - state: HYDRO-icon + - type: Item + inhandVisuals: + left: + - state: HYDRO-inhand-left + right: + - state: HYDRO-inhand-right - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/coathydro.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + clothingVisuals: + outerClothing: + - state: HYDRO-equipped-OUTERCLOTHING - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodWinterHydro @@ -267,9 +424,20 @@ name: janitorial winter coat components: - type: Sprite - sprite: Clothing/OuterClothing/WinterCoats/coatjani.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + layers: + - state: JANI-icon + - type: Item + inhandVisuals: + left: + - state: JANI-inhand-left + right: + - state: CHEF-inhand-right - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/coatjani.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + clothingVisuals: + outerClothing: + - state: JANI-equipped-OUTERCLOTHING - type: Armor modifiers: coefficients: @@ -286,9 +454,20 @@ name: medical winter coat components: - type: Sprite - sprite: Clothing/OuterClothing/WinterCoats/coatmed.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + layers: + - state: MED-icon + - type: Item + inhandVisuals: + left: + - state: MED-inhand-left + right: + - state: MED-inhand-right - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/coatmed.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + clothingVisuals: + outerClothing: + - state: MED-equipped-OUTERCLOTHING - type: Armor modifiers: coefficients: @@ -305,9 +484,20 @@ name: mime winter coat components: - type: Sprite - sprite: Clothing/OuterClothing/WinterCoats/coatmime.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + layers: + - state: MIME-icon + - type: Item + inhandVisuals: + left: + - state: MIME-inhand-left + right: + - state: MIME-inhand-right - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/coatmime.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + clothingVisuals: + outerClothing: + - state: MIME-equipped-OUTERCLOTHING - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodWinterMime @@ -317,9 +507,20 @@ name: mining winter coat components: - type: Sprite - sprite: Clothing/OuterClothing/WinterCoats/coatminer.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + layers: + - state: MINER-icon + - type: Item + inhandVisuals: + left: + - state: MINER-inhand-left + right: + - state: MINER-inhand-right - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/coatminer.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + clothingVisuals: + outerClothing: + - state: MINER-equipped-OUTERCLOTHING - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodWinterMiner @@ -329,9 +530,20 @@ name: paramedic winter coat components: - type: Sprite - sprite: Clothing/OuterClothing/WinterCoats/coatparamed.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + layers: + - state: PARA-icon + - type: Item + inhandVisuals: + left: + - state: PARA-inhand-left + right: + - state: PARA-inhand-right - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/coatparamed.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + clothingVisuals: + outerClothing: + - state: PARA-equipped-OUTERCLOTHING - type: Armor modifiers: coefficients: @@ -348,9 +560,20 @@ name: quartermaster's winter coat components: - type: Sprite - sprite: Clothing/OuterClothing/WinterCoats/coatqm.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + layers: + - state: QM-icon + - type: Item + inhandVisuals: + left: + - state: QM-inhand-left + right: + - state: QM-inhand-right - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/coatqm.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + clothingVisuals: + outerClothing: + - state: QM-equipped-OUTERCLOTHING - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodWinterQM @@ -361,9 +584,20 @@ name: research director's winter coat components: - type: Sprite - sprite: Clothing/OuterClothing/WinterCoats/coatrd.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + layers: + - state: RD-icon + - type: Item + inhandVisuals: + left: + - state: RD-inhand-left + right: + - state: RD-inhand-right - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/coatrd.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + clothingVisuals: + outerClothing: + - state: RD-equipped-OUTERCLOTHING - type: Armor modifiers: coefficients: @@ -380,9 +614,20 @@ name: robotics winter coat components: - type: Sprite - sprite: Clothing/OuterClothing/WinterCoats/coatrobo.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + layers: + - state: ROBO-icon + - type: Item + inhandVisuals: + left: + - state: ROBO-inhand-left + right: + - state: ROBO-inhand-right - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/coatrobo.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + clothingVisuals: + outerClothing: + - state: ROBO-equipped-OUTERCLOTHING - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodWinterRobo @@ -393,9 +638,20 @@ name: science winter coat components: - type: Sprite - sprite: Clothing/OuterClothing/WinterCoats/coatsci.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + layers: + - state: SCI-icon + - type: Item + inhandVisuals: + left: + - state: SCI-inhand-left + right: + - state: SCI-inhand-right - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/coatsci.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + clothingVisuals: + outerClothing: + - state: SCI-equipped-OUTERCLOTHING - type: Armor modifiers: coefficients: @@ -412,9 +668,20 @@ name: security winter coat components: - type: Sprite - sprite: Clothing/OuterClothing/WinterCoats/coatsec.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + layers: + - state: SEC-icon + - type: Item + inhandVisuals: + left: + - state: SEC-inhand-left + right: + - state: SEC-inhand-right - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/coatsec.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + clothingVisuals: + outerClothing: + - state: SEC-equipped-OUTERCLOTHING - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodWinterSec @@ -424,9 +691,20 @@ name: virology winter coat components: - type: Sprite - sprite: Clothing/OuterClothing/WinterCoats/coatviro.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + layers: + - state: VIRO-icon + - type: Item + inhandVisuals: + left: + - state: VIRO-inhand-left + right: + - state: VIRO-inhand-right - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/coatviro.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + clothingVisuals: + outerClothing: + - state: VIRO-equipped-OUTERCLOTHING - type: Armor modifiers: coefficients: @@ -437,6 +715,7 @@ - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodWinterSci +################################################################ - type: entity parent: [ClothingOuterArmorWarden, ClothingOuterWinterCoatToggleable] id: ClothingOuterWinterWarden @@ -449,6 +728,7 @@ sprite: Clothing/OuterClothing/WinterCoats/coatwardenarmored.rsi - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodWinterWarden +################################################################ - type: entity parent: ClothingOuterWinterCoatToggleable @@ -457,9 +737,20 @@ description: A sturdy coat, a warm coat, but not an armored coat. components: - type: Sprite - sprite: Clothing/OuterClothing/WinterCoats/coatwarden.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + layers: + - state: WARD-icon + - type: Item + inhandVisuals: + left: + - state: WARD-inhand-left + right: + - state: WARD-inhand-right - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/coatwarden.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + clothingVisuals: + outerClothing: + - state: WARD-equipped-OUTERCLOTHING - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodWinterWarden @@ -470,12 +761,24 @@ description: "The syndicate's winter coat is made of durable fabric, with gilded patterns, and coarse wool." components: - type: Sprite - sprite: Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + layers: + - state: SYNDIECAP-icon + - type: Item + inhandVisuals: + left: + - state: SYNDIECAP-inhand-left + right: + - state: SYNDIECAP-inhand-right - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + clothingVisuals: + outerClothing: + - state: SYNDIECAP-equipped-OUTERCLOTHING - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodWinterSyndie +############################################################## - type: entity parent: ClothingOuterWinterWarden id: ClothingOuterWinterSyndieCapArmored @@ -488,6 +791,7 @@ sprite: Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecaparmored.rsi - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodWinterSyndie +############################################################## - type: entity parent: ClothingOuterWinterCoatToggleable @@ -496,9 +800,20 @@ description: Insulated winter coat, looks like a merch from "Syndieland" components: - type: Sprite - sprite: Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + layers: + - state: SYNDIE-icon + - type: Item + inhandVisuals: + left: + - state: SYNDIE-inhand-left + right: + - state: SYNDIE-inhand-right - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + clothingVisuals: + outerClothing: + - state: SYNDIE-equipped-OUTERCLOTHING - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodWinterSyndie @@ -520,9 +835,20 @@ description: Feels like the inside of a cocoon, not that this would make you less afraid of being in one. components: - type: Sprite - sprite: Clothing/OuterClothing/WinterCoats/coatweb.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + layers: + - state: WEB-icon + - type: Item + inhandVisuals: + left: + - state: WEB-inhand-left + right: + - state: WEB-inhand-right - type: Clothing - sprite: Clothing/OuterClothing/WinterCoats/coatweb.rsi + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + clothingVisuals: + outerClothing: + - state: WEB-equipped-OUTERCLOTHING - type: Construction graph: WebObjects node: coat @@ -540,3 +866,344 @@ Quantity: 20 - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodWinterWeb + +- type: entity + parent: ClothingOuterWinterCoatToggleable + id: ClothingOuterWinterColorBlack + name: black winter coat + components: + - type: Sprite + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + layers: + - state: coatybits-icon + color: "#3f3f3f" + - state: winterbits-icon + - type: Item + inhandVisuals: + left: + - state: coatybits-inhand-left + color: "#3f3f3f" + - state: winterbits-inhand-left + right: + - state: coatybits-inhand-right + color: "#3f3f3f" + - state: winterbits-inhand-right + - type: Clothing + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + clothingVisuals: + outerClothing: + - state: coatybits-equipped-OUTERCLOTHING + color: "#1d1d1d" + - state: winterbits-equipped-OUTERCLOTHING + - type: ToggleableClothing + clothingPrototype: ClothingHeadHatHoodWinterColorBlack + +- type: entity + parent: ClothingOuterWinterCoatToggleable + id: ClothingOuterWinterColorPurple + name: purple winter coat + components: + - type: Sprite + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + layers: + - state: coatybits-icon + color: "#9C0DE1" + - state: winterbits-icon + - type: Item + inhandVisuals: + left: + - state: coatybits-inhand-left + color: "#9C0DE1" + - state: winterbits-inhand-left + right: + - state: coatybits-inhand-right + color: "#9C0DE1" + - state: winterbits-inhand-right + - type: Clothing + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + clothingVisuals: + outerClothing: + - state: coatybits-equipped-OUTERCLOTHING + color: "#9C0DE1" + - state: winterbits-equipped-OUTERCLOTHING + - type: ToggleableClothing + clothingPrototype: ClothingHeadHatHoodWinterColorPurple + +- type: entity + parent: ClothingOuterWinterCoatToggleable + id: ClothingOuterWinterColorRed + name: red winter coat + components: + - type: Sprite + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + layers: + - state: coatybits-icon + color: "#940000" + - state: winterbits-icon + - type: Item + inhandVisuals: + left: + - state: coatybits-inhand-left + color: "#940000" + - state: winterbits-inhand-left + right: + - state: coatybits-inhand-right + color: "#940000" + - state: winterbits-inhand-right + - type: Clothing + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + clothingVisuals: + outerClothing: + - state: coatybits-equipped-OUTERCLOTHING + color: "#940000" + - state: winterbits-equipped-OUTERCLOTHING + - type: ToggleableClothing + clothingPrototype: ClothingHeadHatHoodWinterColorRed + +- type: entity + parent: ClothingOuterWinterCoatToggleable + id: ClothingOuterWinterColorBlue + name: blue winter coat + components: + - type: Sprite + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + layers: + - state: coatybits-icon + color: "#0089EF" + - state: winterbits-icon + - type: Item + inhandVisuals: + left: + - state: coatybits-inhand-left + color: "#0089EF" + - state: winterbits-inhand-left + right: + - state: coatybits-inhand-right + color: "#0089EF" + - state: winterbits-inhand-right + - type: Clothing + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + clothingVisuals: + outerClothing: + - state: coatybits-equipped-OUTERCLOTHING + color: "#0089EF" + - state: winterbits-equipped-OUTERCLOTHING + - type: ToggleableClothing + clothingPrototype: ClothingHeadHatHoodWinterColorBlue + +- type: entity + parent: ClothingOuterWinterCoatToggleable + id: ClothingOuterWinterColorBrown + name: brown winter coat + components: + - type: Sprite + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + layers: + - state: coatybits-icon + color: "#723A02" + - state: winterbits-icon + - type: Item + inhandVisuals: + left: + - state: coatybits-inhand-left + color: "#723A02" + - state: winterbits-inhand-left + right: + - state: coatybits-inhand-right + color: "#723A02" + - state: winterbits-inhand-right + - type: Clothing + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + clothingVisuals: + outerClothing: + - state: coatybits-equipped-OUTERCLOTHING + color: "#723A02" + - state: winterbits-equipped-OUTERCLOTHING + - type: ToggleableClothing + clothingPrototype: ClothingHeadHatHoodWinterColorBrown + +- type: entity + parent: ClothingOuterWinterCoatToggleable + id: ClothingOuterWinterColorGray + name: gray winter coat + components: + - type: Sprite + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + layers: + - state: coatybits-icon + color: "#999999" + - state: winterbits-icon + - type: Item + inhandVisuals: + left: + - state: coatybits-inhand-left + color: "#999999" + - state: winterbits-inhand-left + right: + - state: coatybits-inhand-right + color: "#999999" + - state: winterbits-inhand-right + - type: Clothing + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + clothingVisuals: + outerClothing: + - state: coatybits-equipped-OUTERCLOTHING + color: "#999999" + - state: winterbits-equipped-OUTERCLOTHING + - type: ToggleableClothing + clothingPrototype: ClothingHeadHatHoodWinterColorGray + +- type: entity + parent: ClothingOuterWinterCoatToggleable + id: ClothingOuterWinterColorGreen + name: green winter coat + components: + - type: Sprite + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + layers: + - state: coatybits-icon + color: "#5ABF2F" + - state: winterbits-icon + - type: Item + inhandVisuals: + left: + - state: coatybits-inhand-left + color: "#5ABF2F" + - state: winterbits-inhand-left + right: + - state: coatybits-inhand-right + color: "#5ABF2F" + - state: winterbits-inhand-right + - type: Clothing + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + clothingVisuals: + outerClothing: + - state: coatybits-equipped-OUTERCLOTHING + color: "#5ABF2F" + - state: winterbits-equipped-OUTERCLOTHING + - type: ToggleableClothing + clothingPrototype: ClothingHeadHatHoodWinterColorGreen + +- type: entity + parent: ClothingOuterWinterCoatToggleable + id: ClothingOuterWinterColorLightBrown + name: light brown winter coat + components: + - type: Sprite + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + layers: + - state: coatybits-icon + color: "#C09F72" + - state: winterbits-icon + - type: Item + inhandVisuals: + left: + - state: coatybits-inhand-left + color: "#C09F72" + - state: winterbits-inhand-left + right: + - state: coatybits-inhand-right + color: "#C09F72" + - state: winterbits-inhand-right + - type: Clothing + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + clothingVisuals: + outerClothing: + - state: coatybits-equipped-OUTERCLOTHING + color: "#C09F72" + - state: winterbits-equipped-OUTERCLOTHING + - type: ToggleableClothing + clothingPrototype: ClothingHeadHatHoodWinterColorLightBrown + +- type: entity + parent: ClothingOuterWinterCoatToggleable + id: ClothingOuterWinterColorOrange + name: orange winter coat + components: + - type: Sprite + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + layers: + - state: coatybits-icon + color: "#EF8100" + - state: winterbits-icon + - type: Item + inhandVisuals: + left: + - state: coatybits-inhand-left + color: "#EF8100" + - state: winterbits-inhand-left + right: + - state: coatybits-inhand-right + color: "#EF8100" + - state: winterbits-inhand-right + - type: Clothing + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + clothingVisuals: + outerClothing: + - state: coatybits-equipped-OUTERCLOTHING + color: "#EF8100" + - state: winterbits-equipped-OUTERCLOTHING + - type: ToggleableClothing + clothingPrototype: ClothingHeadHatHoodWinterColorOrange + +- type: entity + parent: ClothingOuterWinterCoatToggleable + id: ClothingOuterWinterColorWhite + name: white winter coat + components: + - type: Sprite + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + layers: + - state: coatybits-icon + color: "#EAE8E8" + - state: winterbits-icon + - type: Item + inhandVisuals: + left: + - state: coatybits-inhand-left + color: "#EAE8E8" + - state: winterbits-inhand-left + right: + - state: coatybits-inhand-right + color: "#EAE8E8" + - state: winterbits-inhand-right + - type: Clothing + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + clothingVisuals: + outerClothing: + - state: coatybits-equipped-OUTERCLOTHING + color: "#EAE8E8" + - state: winterbits-equipped-OUTERCLOTHING + - type: ToggleableClothing + clothingPrototype: ClothingHeadHatHoodWinterColorWhite + +- type: entity + parent: ClothingOuterWinterCoatToggleable + id: ClothingOuterWinterColorYellow + name: yellow winter coat + components: + - type: Sprite + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + layers: + - state: coatybits-icon + color: "#EBE216" + - state: winterbits-icon + - type: Item + inhandVisuals: + left: + - state: coatybits-inhand-left + color: "#EBE216" + - state: winterbits-inhand-left + right: + - state: coatybits-inhand-right + color: "#EBE216" + - state: winterbits-inhand-right + - type: Clothing + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + clothingVisuals: + outerClothing: + - state: coatybits-equipped-OUTERCLOTHING + color: "#EBE216" + - state: winterbits-equipped-OUTERCLOTHING + - type: ToggleableClothing + clothingPrototype: ClothingHeadHatHoodWinterColorYellow \ No newline at end of file diff --git a/Resources/Prototypes/Recipes/Crafting/web.yml b/Resources/Prototypes/Recipes/Crafting/web.yml index 5fe9d1b85a..55f73fef50 100644 --- a/Resources/Prototypes/Recipes/Crafting/web.yml +++ b/Resources/Prototypes/Recipes/Crafting/web.yml @@ -26,8 +26,8 @@ tags: - SpiderCraft icon: - sprite: Clothing/OuterClothing/WinterCoats/coatweb.rsi - state: icon + sprite: Clothing/OuterClothing/WinterCoats/coat.rsi + state: WEB-icon objectType: Item - type: construction diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/coatybits-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/coatybits-equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..ea6575dbbb86be7f21943445714d1ecbb2799664 GIT binary patch literal 742 zcmVAxVNPD=Fg8W^9zsuC z)-35+M-5va2!c9Q^>EUqbm>B>-L;!%*Y89PDfTyP?M?{F@7{(YB zMFAoL5n((YN9PFM+xHk_z|56I2>QWtxpV-I2D)4>T^z?43(Z}wyIt*?r*zO5Q>y^})P3NsRtq;bH^}oG+wHc} zHG?vsD2l6TgsoN!x3{-P1*%PeYvTR=y?mdhY31t#3Bb&FeSLLbHAsJJstaQbj4@@p zCrN@l&&wuQr3C3zHO|b)^So98m>FrBLTg=~y7#H7_(2&kpU)#}?U$cFJUrBTCs?gk z5i?`A+hMcWV6)jE%Q7TM0wSvXFeC_qAP9mW2!bF8f*=TjAcQcTPTh1mbwANwrN5D9 zvzY@v$I?U;JeB=d?(grNx9vw_kB^VRJ_L`(Mx&7ffKI1_Znq1i)Y*dvKE~imDRjGC zbUK~ie5*}>(P-q9Qn)LegF-g(fy@^1^!Y&OgJ{51rAOb8!%v)Md-3GDZKtk-K~Sq9*9 zE8~)l(A)ODWLbvwdX4>le|iBHi$!FuMNt$;)3odXm&}GkAJQ~MQ53M&VzF36Cocit zaNgeD$~q$=Ff%5TiFy$#=>vS3w!*G#^JtMs@Ztdm=< zwdLA5_h~^=oBuyNS-B%hz-h~)y|t0I*+8H*@pg2; zMI#rs6HF$N4Z1NKSh+7$FtR0dY*}g4cA159qK46nzK9R?yu1(R`soWzGJN*r%`N#J zXZiX4yERXp(pf+K_1P?bow@l-4}Fg~G$r2rt-ITcnvk>d?RIVFj>ms*Id{D9#p8#c zf)AOtUpP~)Y3}>g&+xCTO6D``m+k8$&8DW=@h)IAd2omKfi2K+V6Y+Z6=Ry8q+ij7 zMQcK)FPQjHg+17MO2zDS58Z>F{A#s2X50Trsm^9S!~Xl*&#o!EGS_}tbX0nQ?r*k? s#f&BmY!@2#ZrW7M`_EkrVqSrP{uLFoNnc;?2?Gguy85}Sb4q9e0EUu!<^TWy literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/winterbits-icon.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/winterbits-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d0b9a774d08af108585e19d41a4abeafd4613787 GIT binary patch literal 279 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dy2?0JKu0Z<8j%BN7);T)ZIXgMH zxjNa~*(fW>Dac7HDadN5Dyb?fNQ#TfNQyf-+Nmljh=~e|2n*_Hs5;o&xHvo5+E~g; zNmyH1*xOlas41D7>f1Rx+dDhi0gZEV1RAbyC}{+w7)yfuf*Bm1-ADs+QaxQ9Lo80e zo#4pbpup3*eERfl1*II%{{LT?$>O-db-A9M{-fVNj;TofoF{Pp^R?M79oLU4RPp<0 zM!QrW<%tu@yMCF$z<5)##wISa;{g#n7?(AA$vbXa$havz-#>J%*SYwgTe~DWM4fcbiil literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/winterbits-tan-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hoods/Coat/hooddefault.rsi/winterbits-tan-equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..923d7363b61b4ba9c83154f7d5d32b877c328823 GIT binary patch literal 324 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVC436aSW-r_4d|5-X;T)V;`^k z9q1Hhp16a7c|t)^quLyw8;wU8B@Q;)R2DT?DJe>A_5G!D;(z(arkb;ll{2>}S*IuM zH`sM7KEHhBDW`e%yAzFWar@294{H6N#8Le3WliPD7q@S%e%8P4V{PTOHmOcFsB35XnW$#=1v?w=@HensV32ZP-uJ5Q zWJs!_;%|oDvmWo*H*oDVPXc-X1U@J|^FO&Y<;E0l?w>DfawSi)ZLm>U=&G!IlVO^= z>z0g^8B?y-l-IaEHuadAx;?0Vt zq>i$JoPwORl7g&;s*?B&mKYr6PZBKA&T? zS^>b*+&c!LLUy}d88ZGUlv0tD62_R9^VV8ODG}m)a0Lh<%Gqp&!{Jb7Syqkj_j@R% zzGS8g7-JAZ06^*6*IJ_}3Us~%7-P^{`%Xh^4aQg_0in1GNRkA`m`cxgmGSWa)D5*U z-n0TZ=TJ(4F$QCdtBCF^z->Z)AY2xlIHgo)&bzDwKomtV#vqEKDhWxF1lteV1Uct0 z#(Z(wjd9L9%|7S6vKPlO03eRzN>3B}K>^6J42-c#gkJ%SG58x}7r6UB?srHj!5D*- z5|8`+X+DJD9a{)duGi}-2<}=G1-d=~oPD<(q?Faw9hIF2z!yUf>BI3?dfZnbUsGrhf-1lna#(9|yTEWfD(ihVN%*#W4NYj>CFVCx^wA=7 zyWOhZgvDZk~!j1z+ES()!Vd4u8DwQ{X2p^n6PY1VIo4K@e~G3w*Lw{;cWFz5oCK07*qoM6N<$g12lY AX#fBK literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ARMOR-icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ARMOR-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..34725dcae122919bbf3add17b28de46e2b6e8606 GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJO`a}}ArXh)PCm$a*nr2i-i!Uh z)d#FRk_y}zuht}9U}B8j>R1(&@!EN!;)UjWM}H(o$8Ta$@tmaMIU)D~)y|t06*+8WA;pCt> z%zjP^n;&HVxMJtD-05KC2S%BrNAtF|@?}Y>e))gwz|=d!JH3?{fqH?!VZkPy=cd^k zUu`$o=(OT>)w|zulb*~8zHIXB#ILRE4F9*RTBYK7*kDdjeHO#DTd9w)-8%gG`YwZw zO8kc>JQR)MhnNB+6B2{&{rSB&@%FZ7`Ak2q?f72zZdYEhy=Pp1dgQW28g_oQ{+~~> x8Td~AWb^;z_DQu0hJDJyG8H@T%D0I$oSk~)y|t0+u!2bI!(`2w ztv-y3#RsmR2>z{buF=Nf*n>%anzEOYGQ=ML?`=A?^Hl6QA)rPeXjsL2c*D~*cU7A$ zqhyX3&VC*_>B*d6j)POmChnA+cc1UWJ?}}=QZ>JsK2NdGY1sO0@5!j>lpl9^_;=mw zcMFR8ygM1>5D0jnwEX$M`J1;%EMB>aq4s|MWs{lKqK~dr)bQ_bf49re_p-=erhmWW oFKk;Ii7AvS!M2E&2`{XJrKP0nYmB0z?Cy85}Sb4q9e0KU^^&j0`b literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ATMOS-equipped-OUTERCLOTHING-vox.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING-vox.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ATMOS-equipped-OUTERCLOTHING-vox.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ATMOS-equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ATMOS-equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ATMOS-icon.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/icon.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ATMOS-icon.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ATMOS-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/inhand-left.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ATMOS-inhand-left.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ATMOS-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatatmos.rsi/inhand-right.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ATMOS-inhand-right.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/BAR-equipped-OUTERCLOTHING-vox.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/equipped-OUTERCLOTHING-vox.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/BAR-equipped-OUTERCLOTHING-vox.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/BAR-equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/BAR-equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/BAR-icon.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/icon.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/BAR-icon.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/BAR-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/inhand-left.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/BAR-inhand-left.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/BAR-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatbar.rsi/inhand-right.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/BAR-inhand-right.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CAP-equipped-OUTERCLOTHING-vox.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING-vox.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CAP-equipped-OUTERCLOTHING-vox.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CAP-equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CAP-equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CAP-icon.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/icon.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CAP-icon.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CAP-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/inhand-left.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CAP-inhand-left.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CAP-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcap.rsi/inhand-right.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CAP-inhand-right.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CARGO-equipped-OUTERCLOTHING-vox.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/equipped-OUTERCLOTHING-vox.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CARGO-equipped-OUTERCLOTHING-vox.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CARGO-equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CARGO-equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CARGO-icon.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/icon.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CARGO-icon.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CARGO-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/inhand-left.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CARGO-inhand-left.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CARGO-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcargo.rsi/inhand-right.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CARGO-inhand-right.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CE-equipped-OUTERCLOTHING-vox.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/equipped-OUTERCLOTHING-vox.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CE-equipped-OUTERCLOTHING-vox.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CE-equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CE-equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CE-icon.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/icon.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CE-icon.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CE-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/inhand-left.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CE-inhand-left.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CE-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatce.rsi/inhand-right.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CE-inhand-right.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CENTCOM-equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CENTCOM-equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CENTCOM-icon.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/icon.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CENTCOM-icon.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CENTCOM-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/inhand-left.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CENTCOM-inhand-left.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CENTCOM-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcentcom.rsi/inhand-right.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CENTCOM-inhand-right.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchef.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEF-equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchef.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEF-equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchef.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEF-icon.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchef.rsi/icon.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEF-icon.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchef.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEF-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchef.rsi/inhand-left.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEF-inhand-left.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchef.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEF-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchef.rsi/inhand-right.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEF-inhand-right.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEM-equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEM-equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEM-icon.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/icon.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEM-icon.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEM-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/inhand-left.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEM-inhand-left.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEM-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatchem.rsi/inhand-right.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CHEM-inhand-right.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CMO-equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CMO-equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CMO-icon.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/icon.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CMO-icon.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CMO-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/inhand-left.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CMO-inhand-left.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CMO-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatcmo.rsi/inhand-right.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/CMO-inhand-right.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ENGI-equipped-OUTERCLOTHING-vox.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/equipped-OUTERCLOTHING-vox.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ENGI-equipped-OUTERCLOTHING-vox.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ENGI-equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ENGI-equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ENGI-icon.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/icon.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ENGI-icon.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ENGI-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/inhand-left.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ENGI-inhand-left.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ENGI-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatengi.rsi/inhand-right.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/ENGI-inhand-right.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/GENE-equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/GENE-equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/GENE-icon.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/icon.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/GENE-icon.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/GENE-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/inhand-left.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/GENE-inhand-left.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/GENE-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatgen.rsi/inhand-right.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/GENE-inhand-right.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOP-equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOP-equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOP-icon.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/icon.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOP-icon.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOP-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/inhand-left.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOP-inhand-left.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOP-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coathop.rsi/inhand-right.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOP-inhand-right.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOS-ARMORED-icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/HOS-ARMORED-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..6f7573420d026e0b0aeeccc9550a1358d9d941ee GIT binary patch literal 724 zcmV;_0xSKAP)cIVr3-@RfJhnQ$+Or$K=9xn&_gc;{{Rny&`S>mp@o9C zA|>`Bg@7PL0)`fqft5hw2BC$`!uBB9CR#OnkY4hgcHg{t-^cf6=Pe8|#1KRLXJpbO zZ@pfMO(S6Y+YjpXda_q36)(+AAV&l%>)WYnK1!2p8Ub=durxP;QYzlt+lzb2O(RHC z4oKmEQYy~p^Jq^bWWR;SGLjd2!Pfa$EjhAVXbt*(U+&Zc%|arb8;I7 za$v1=L1nxEfDi)T_t9D-r9^9u@B0WL0H}-?SSwu&QWm(!fo|U`xg3^d0T2ZJ2hI2W zzL;fMRK^SBuk!D8;Z_GeZoNtRXjvA`W)siz5JDh?NJxVqNMfGn(QGyovDfST3%5GZ zIz6WM^LqR4dj^OLg#th#qF2nx$qDs(J+m}75nt^Sv`&xj;=f&hX#{+&o&)E9le5{R z*Vi5Bt^i|*L9hl zon>=#^Wg+YDdWY(MY7o}wrwZzFbs*Jh@G9C)D8?h3zSl^<2aPdWuhoT*@iF-QMMt9 zBFg15j^m`d1yc#=LTk;8Xz^@pl8udx%(JmcW<(3Eb=p$t1-Pz@ZQGbe!06Z%)6>)O z=-3pd5n$UkuIoOmfMT(j44~q|at5Hdu$<`*red-9a00Z}gkebMY(M$wn4g~qU}b$f z(>dEG48zo|xOWZ815n;{!E_bh=9g%-}(?k41zzjvKy7Q{Oo)H0000Px%tVu*cR9J=Wma$74Q5?rV3CdmUON4p}l3Y}Rl+rpB>8e7-NpR4ylS>yZ{s$d& zl1>ht#K~C)_Y|bK+74DqIYVtO8O{*#d?pu!ybf}QqS0JI+999q-Fxr%{l4Gt-H!(y zI&}EQM8Yhd9m%O|F2iJ@$jrg7VDHYzkjm$>6bmJ`4+^1TM#G3}B8KBs$>*|^H>VUp zd2>qTb6FgxiY8*rj^xy%7}%>c$c|6bkaZlV%Hrw~YX7ZTTs^{Zsx)Ms?D#Z$l|~r- z_6#HqLjhQp#j&2GA?s)&#_M+$nuyVmb&mBUmSx>o-wqGfD`^-iozCLAXVko_)0w8p z{o|M|?7tC2DJkM(@pyzqaStU051;6v@F5W%$Nd#8@_!|iBu~m$~4WO-afu~*)DP}Wn^k7r8E&E zm3j)G)^@(MG||#Pu}}(bxKE|xQ1cqMGT@u2NjDfbWF3da`)7To$ux@m-;9m0e;|mttOV*8UwuUnt_Gw|l0UDJwr;jt^eOAR0e!;*F6iwJX4%s5#}AqO7k?dIE3hg?`u(BHBVWRQDjdOFRIXi{U?e;y@`-f*2F2_YEeG?m6ZpG z3!##Rq2fZQxDaY-W=tgwLoLmW1>gMn$I!TrC(BZ$}56O!;*twZ+w*UYD07*qoM6N<$g5X(c`~Uy| literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIE-equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIE-equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIE-icon.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi/icon.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIE-icon.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIE-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi/inhand-left.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIE-inhand-left.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIE-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi/inhand-right.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIE-inhand-right.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIECAP-equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIECAP-equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIECAP-icon.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi/icon.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIECAP-icon.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIECAP-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi/inhand-left.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIECAP-inhand-left.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIECAP-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi/inhand-right.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/SYNDIECAP-inhand-right.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/VIRO-equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/VIRO-equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/VIRO-icon.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/icon.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/VIRO-icon.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/VIRO-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/inhand-left.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/VIRO-inhand-left.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/VIRO-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatviro.rsi/inhand-right.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/VIRO-inhand-right.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WARD-equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WARD-equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WARD-icon.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/icon.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WARD-icon.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WARD-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-left.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WARD-inhand-left.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WARD-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/inhand-right.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WARD-inhand-right.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WARDEN-ARMORED-icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WARDEN-ARMORED-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..eaf984f43789b711a16c42c695c6841d7f327954 GIT binary patch literal 761 zcmVPx%vq?ljR9J=WRXu3iKp1_hWeug6!wz)>qFySnh@g5aK1!EL}1MWM~N(1V>Bam=a1Ygs(%;VbeH~3LXl6 zi=^+qpQm@TD8m$b~o6d*g?1v$C)-8kaKw~ zFIiAkmF@5EGgVdD@{$EPmj`V&;?{={)lt(l=1>ad?IJJspD%7fF7RJfB{8jY_6QIoo-mPx~*ygr+y$)U1`JeYH5UvC0 zi+l0(%KFjI0pOx1K4))3QIx+F@H`Jw-+x5v{9eR53B^(oR_hF&=i%t+sPAdD&LEbG zanb?!2L;4Z5uzwUk|fN{&0%L}2fptk2m%BjKMhZTa3se!w-5vY=4U1`Jv}YV&rBi+ z0*r5N@zEO!fe4C|V9eS=crhK@*6;|3r6PRahn5X^@v!TSSzFMu0es(&JqeKs*aZVq6Qu8C rdvI@zzstEirX~pNf)R_r2qXLf9s(+BUc6yD00000NkvXXu0mjf%M?mq literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WEB-equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WEB-equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WEB-icon.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/icon.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WEB-icon.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WEB-inhand-left.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/inhand-left.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WEB-inhand-left.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WEB-inhand-right.png similarity index 100% rename from Resources/Textures/Clothing/OuterClothing/WinterCoats/coatweb.rsi/inhand-right.png rename to Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/WEB-inhand-right.png diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/coatybits-equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/coatybits-equipped-OUTERCLOTHING-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..d453b039c530984a6207a6f35f9eb7fa17551520 GIT binary patch literal 635 zcmV->0)+jEP)r1GHkhI86Ht)8Gh9u!{sKJI3(}A`J@OL2=n7( z8!-k1K@bE%5ClOGgl&dl@XxeU*mutPwr#!Edj2`*7VWley>rgT*w6PES4zP-H$Sv# znv9JM!{D2y$@rRc&MT#oC4ub&Kwa0c)&cUI|dm_SCVqP&HDWzsr@bReq{HP?uIUu#p!PZ=} z_9f-}had=oAP9mW2!bF8f*=V0IbGLzE|9iu`*9y0*(c|m@49Zcf7#yPtE!qyP+Xe& z{{GHBA$aGUU;B2wUeWjcL;t>x2G54yodj0px?WIK6#)20N!V2v2*1CF-{y&Ev2WmA zJ^!0;dw7_DzVEYf9Dh8R74fblgtA{(i2z_6$6Z4piWYwbhB;huq4lG1LT!XfSft+hWZ_*5nNJXP@QP|O;9D%$`6 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/coatybits-equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/coatybits-equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..25c72cf26f6fed6fa012fec5b3e2677472384e8f GIT binary patch literal 603 zcmV-h0;K(kP)3BSnwU&s8thL0zSzu;jW;&nG!{?>?WsJDBc5rgad0Ce#Ewnx}llOjb zQadm6vHInbMItWIpIakF>;W@VRaJwt&bh()s;Y*dB&z}X=xZT;%=MbC>&O^G`k5`M z5FUN4-*w%vPR|)*qEg{7_htC794lRX^w=0fsSBX4IT8?Nrt9_kax!E-EXe=;{=?d% zI5$qkR4~UjAm;h#8Zc(S+;~sKab1|VY{Fsd?(0gNI{+#4%Qd?{mIAp>!Q5LYO90-T z0;y|HvJ}YaboeK5ZW{mq0000000000007_1;`X@iw@E|dbUGEE;Kbwc=tJ9_bBj7d zi~lPe3K0Fa#OLk|?1^sGuk8@6YK-WBF!SV{fxVsAHfYiNw9sO!2I6EeoU)QMcq-|zQ9OKb=?rmpMsX*uO&+qQkq05nb0Po-U~9Z@x4 zkK13ViM6pzQHn#+?BaMNyOuQcB0w`KP9z zUgjY+cg_I-LI~5Dobv$yM1&Zl=-)&_Dc~e#8X}r%mMiF^ zCnB`g;Jrs5bFZnj!di=d=3N!ftB>O_$I9D|+goeJ-7i%z(wm>1zkY$Sa0000x literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/coatybits-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/coatybits-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..34e9a603ab834602ae05536f64662703d95f410e GIT binary patch literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I0wfs{c7_7UGoCJvAsP4H-q^_7?7-9d@OcO0 zB*{JAVF}ZD8a6qrC9sw`N-9bp(e!W>$AoGUUN6}^H`LsZ31kigBovn@ zmKr{t^6P!Zw*CLK`mZgqi|LyEc6B;)O!J@Lxy?1@wVFBS_b%uUoV0rDma1<8eVgY5 zooD-@v;4~D=mU;m7s1S8P+g??`-fdj^OC2z2NmldM6PE2K11&{|LQAE-`hf6A4<*$ vGt2(H=#cS;`pCi)O^;Hiui$#164T8;UBz5a|K`U}AcH(z{an^LB{Ts5-}YxJ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/coatybits-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/coatybits-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..3627bf8c8d16fbe45ce7bcd496e3c04132b0efd2 GIT binary patch literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=XFOdTLn>~)z2(T)tRT?(aAJk< zyG8BA{(DYUh;_KnT({xM4VO!K6aL@kaPg39ysE$i)B^&x+=>zZroGiOY7x*mma(ep z&zetA7MdN7DBJUWQ||1F_x5Ev{aY899WL0~u`0^zWkkWe=L@&4t}$=kEpDyLfe(_q+*=5L1EVkHxQ6qVbnCkJ0om`{&mEI<{$IlC6>Dc>V64tC?-47zYlDyI?WHF`hIzXBxvX(f$5B-T89!()Xpr|NrVKv0rfu#zu19m%
ch`bX2*)kM(lhwBG8L7&Y)%YL(mx@Hsj7 zE(@S7`Ut>QH$!QD4Sg4ux*sql!gIcGHGn+}kiy4?#uV6c8l1bMK#c$a1ONa4*!%(O WL^LlNVk(dT0000o literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..b0bb27edca381f63c8771574a6430d008ea08d7f GIT binary patch literal 663 zcmV;I0%-k-P)~556vv-@`4EO7u!U|Jb7?!b-C<}tWeIbZjBdi1yIyB^$y7SPM2C>Bp}mgTVz!vv z#pF|{gHccv)B4HCG{^t97&uGsJ)x(krzau+0001hHAQeAH=jjp8UgoqB24=0ANkB z!K_To+zPwg73RqVZRF?P3F=$mtgW!?Epe9oWu(IZ0000000000SU*@NLh7@A2;rh) z%R${sFpt3V9*lT-jn_|rrjxnA(XcD~merpk^k)?#WxUc!>6o`7Rp{UQdGSpq@iqCI z4VuOgHA^~<>W6{!AB=uMFWW1@u!reUXAPyMi3e>&}5mZQzS?zQ5um&`ip(v{>{$=mjvKR;n=^}i2n%}e&MG5g9gY-YK; ze0BP@zsH|j)HF<-lhF_8yzHD*GyTdPaz{4lT z`&72UjS3e**(2^{I=}fZyK7X<;9xbjTqzwXzwkxk!E}%Re|&j(cxHR>g{9QCb}nZ9 zp|Kz+uxFm`M$w~BrgXVXZ#m&=ux-(dOG=eMR|gs-0R4Eh@lAG!j||XP44$rjF6*2U FngHMvX&3+i literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-inhand-left.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..09c187e3fe630c44f74f61e3dc82ae64f70dfef2 GIT binary patch literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=t36#DLn>~)y|q^Gkb?l*1>R5t zi3yraHX;oR8FzIo;JU=Xq@lpNgu|pukB`xa>BRX1ALi|vIoo#g_Vj(-K>Z91FC1cJ zgDzLC_!Zu}W!3ZO3(Kl=U;o_J_kAz_`_sQHzJ!SNUN6~uH`VzHGg$eB2g@f<+hw)n z_E({oGnM~_7F`MTdeh!v{-AyCX{Fxfl}ki6M&zm-|8to`=6k=t$mB>lLBY>U1snM9 YFitrWU?pyQZwJU6Pgg&ebxsLQ0OeO(&;S4c literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-inhand-right.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..77201839c7bc7c3f6e7ebbc8c94939e5fd26c512 GIT binary patch literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=t36#DLn>~)y|q`6(NTi!L4K&B zkhT*em%{?aRRS-Zn5Szr%u&))G2CTwQT5p|p5&gp)$?AYZT^0H{*%2NK>Z90zMnh3 z>g6vz!@~#4_RmOIw>v(l?f=X$zRNm_%=@R!6aTi`_qpKA_1iS32dJiiG%zsy*tLE3 zq-~|1nn@N?$5VE_DZf3b`t~b+!Tba4e(kF~H6PWjOGv_5=6?a%z_R!T}@+1DA2 ZzA`NO<8PH1zw{}{3{O`-mvv4FO#tSJTG#*p literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-tan-equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coat.rsi/winterbits-tan-equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..7e401cdd7b4631efe879609d52989d6f4b35a2cb GIT binary patch literal 614 zcmV-s0-61ZP)GvIH_ws5!5!*B>mB6@ z;(+l&E!c#nh z3|-1{`D4eURi&)_gv`raNDy2Jo&09JihM)$3y7Xx_59xrfgodd*?8$8Kt$B;4-B!p z?XvMo4)D(fag2SijXA&{a)LtNDtJiTWOy_xMJCQMD)M>#b@CHoLyioah9)jw{0J)Y zdHr=H*ERC+Iw7KowDMxTLSC(FicVa#CnvvW z;u1J$DXe=*93(%AbQk~t000000002{ht!S`|E+ppq67aS3@7Zyh!NI!(P-QCD03kE zcRXsvyc5%`6j^4CPGNV4Hd4BKS!TAg5FDoyxbe2@QN}W!eFplB6MHoBDdYgsIh^UNJZK%wS;lm1Wq>a(DSw zO}YOcE&1dVRMe#srkS3 Date: Sat, 3 Aug 2024 02:59:50 +0100 Subject: [PATCH 139/422] Add Ngl to chatsan (#30589) * Ngl added fr this time * Update speech-chatsan.ftl Not gonna lie sounds more realistic than not going to lie --- Resources/Locale/en-US/speech/speech-chatsan.ftl | 3 +++ Resources/Prototypes/Accents/word_replacements.yml | 1 + 2 files changed, 4 insertions(+) diff --git a/Resources/Locale/en-US/speech/speech-chatsan.ftl b/Resources/Locale/en-US/speech/speech-chatsan.ftl index 3e1c3fedb6..1f6f12195f 100644 --- a/Resources/Locale/en-US/speech/speech-chatsan.ftl +++ b/Resources/Locale/en-US/speech/speech-chatsan.ftl @@ -150,3 +150,6 @@ chatsan-replacement-53 = where are you chatsan-word-54 = fs chatsan-replacement-54 = for sure + +chatsan-word-55 = ngl +chatsan-replacement-55 = not gonna lie diff --git a/Resources/Prototypes/Accents/word_replacements.yml b/Resources/Prototypes/Accents/word_replacements.yml index 1e611a99d3..73a4a50369 100644 --- a/Resources/Prototypes/Accents/word_replacements.yml +++ b/Resources/Prototypes/Accents/word_replacements.yml @@ -435,6 +435,7 @@ chatsan-word-52: chatsan-replacement-52 chatsan-word-53: chatsan-replacement-53 chatsan-word-54: chatsan-replacement-54 + chatsan-word-55: chatsan-replacement-55 - type: accent id: liar From 64273cb914047a819cc6be35d03ab8f9e2d89723 Mon Sep 17 00:00:00 2001 From: to4no_fix <156101927+chavonadelal@users.noreply.github.com> Date: Sat, 3 Aug 2024 06:59:20 +0300 Subject: [PATCH 140/422] Display the administrator's title in ahelp and ahelp relay (#30075) * Adding the admin prefix to the ahelp * Updating the admin prefix * The second update of the admin prefix * Configuration correction --- .../Administration/Managers/AdminManager.cs | 2 +- .../Administration/Systems/BwoinkSystem.cs | 22 ++++++++++++--- Content.Shared/CCVar/CCVars.cs | 27 +++++++++++++++++++ .../ConfigPresets/WizardsDen/wizardsDen.toml | 4 +++ 4 files changed, 50 insertions(+), 5 deletions(-) diff --git a/Content.Server/Administration/Managers/AdminManager.cs b/Content.Server/Administration/Managers/AdminManager.cs index af950e9fc2..36cea4c156 100644 --- a/Content.Server/Administration/Managers/AdminManager.cs +++ b/Content.Server/Administration/Managers/AdminManager.cs @@ -458,7 +458,7 @@ namespace Content.Server.Administration.Managers Flags = flags }; - if (dbData.Title != null) + if (dbData.Title != null && _cfg.GetCVar(CCVars.AdminUseCustomNamesAdminRank)) { data.Title = dbData.Title; } diff --git a/Content.Server/Administration/Systems/BwoinkSystem.cs b/Content.Server/Administration/Systems/BwoinkSystem.cs index 6709403177..893de4aba5 100644 --- a/Content.Server/Administration/Systems/BwoinkSystem.cs +++ b/Content.Server/Administration/Systems/BwoinkSystem.cs @@ -565,16 +565,23 @@ namespace Content.Server.Administration.Systems var escapedText = FormattedMessage.EscapeText(message.Text); string bwoinkText; + string adminPrefix = ""; + + //Getting an administrator position + if (_config.GetCVar(CCVars.AhelpAdminPrefix) && senderAdmin is not null && senderAdmin.Title is not null) + { + adminPrefix = $"[bold]\\[{senderAdmin.Title}\\][/bold] "; + } if (senderAdmin is not null && senderAdmin.Flags == AdminFlags.Adminhelp) // Mentor. Not full admin. That's why it's colored differently. { - bwoinkText = $"[color=purple]{senderSession.Name}[/color]"; + bwoinkText = $"[color=purple]{adminPrefix}{senderSession.Name}[/color]"; } else if (senderAdmin is not null && senderAdmin.HasFlag(AdminFlags.Adminhelp)) { - bwoinkText = $"[color=red]{senderSession.Name}[/color]"; + bwoinkText = $"[color=red]{adminPrefix}{senderSession.Name}[/color]"; } else { @@ -597,6 +604,13 @@ namespace Content.Server.Administration.Systems RaiseNetworkEvent(msg, channel); } + string adminPrefixWebhook = ""; + + if (_config.GetCVar(CCVars.AhelpAdminPrefixWebhook) && senderAdmin is not null && senderAdmin.Title is not null) + { + adminPrefixWebhook = $"[bold]\\[{senderAdmin.Title}\\][/bold] "; + } + // Notify player if (_playerManager.TryGetSessionById(message.UserId, out var session)) { @@ -611,11 +625,11 @@ namespace Content.Server.Administration.Systems senderAdmin.Flags == AdminFlags.Adminhelp) // Mentor. Not full admin. That's why it's colored differently. { - overrideMsgText = $"[color=purple]{_overrideClientName}[/color]"; + overrideMsgText = $"[color=purple]{adminPrefixWebhook}{_overrideClientName}[/color]"; } else if (senderAdmin is not null && senderAdmin.HasFlag(AdminFlags.Adminhelp)) { - overrideMsgText = $"[color=red]{_overrideClientName}[/color]"; + overrideMsgText = $"[color=red]{adminPrefixWebhook}{_overrideClientName}[/color]"; } else { diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index 082d9c8033..9f8a02cbb7 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -902,6 +902,15 @@ namespace Content.Shared.CCVar public static readonly CVarDef AdminBypassMaxPlayers = CVarDef.Create("admin.bypass_max_players", true, CVar.SERVERONLY); + /// + /// Determine if custom rank names are used. + /// If it is false, it'd use the actual rank name regardless of the individual's title. + /// + /// + /// + public static readonly CVarDef AdminUseCustomNamesAdminRank = + CVarDef.Create("admin.use_custom_names_admin_rank", true, CVar.SERVERONLY); + /* * AHELP */ @@ -921,6 +930,24 @@ namespace Content.Shared.CCVar public static readonly CVarDef AhelpRateLimitCount = CVarDef.Create("ahelp.rate_limit_count", 10, CVar.SERVERONLY); + /// + /// Should the administrator's position be displayed in ahelp. + /// If it is is false, only the admin's ckey will be displayed in the ahelp. + /// + /// + /// + public static readonly CVarDef AhelpAdminPrefix = + CVarDef.Create("ahelp.admin_prefix", true, CVar.SERVERONLY); + + /// + /// Should the administrator's position be displayed in the webhook. + /// If it is is false, only the admin's ckey will be displayed in webhook. + /// + /// + /// + public static readonly CVarDef AhelpAdminPrefixWebhook = + CVarDef.Create("ahelp.admin_prefix_webhook", true, CVar.SERVERONLY); + /* * Explosions */ diff --git a/Resources/ConfigPresets/WizardsDen/wizardsDen.toml b/Resources/ConfigPresets/WizardsDen/wizardsDen.toml index 4f1b616fb2..96656c911b 100644 --- a/Resources/ConfigPresets/WizardsDen/wizardsDen.toml +++ b/Resources/ConfigPresets/WizardsDen/wizardsDen.toml @@ -39,5 +39,9 @@ deadmin_on_join = true new_player_threshold = 600 alert.min_players_sharing_connection = 2 +[ahelp] +admin_prefix = false +admin_prefix_webhook = false + [worldgen] enabled = true From b432dc612520e08e5409af76d31a5e7fa42ea247 Mon Sep 17 00:00:00 2001 From: RiceMar1244 <138547931+RiceMar1244@users.noreply.github.com> Date: Sat, 3 Aug 2024 09:26:32 -0400 Subject: [PATCH 141/422] Shotgun spread refactor (#27773) * Moves spread data to new component * Refactors shotgun spread code * Makes shotgun cartridges and projectiles use new component * Attempts to fix nullable build error * Fixes hitscan weapons that I broke :( * Saviour commit? --------- Co-authored-by: EmoGarbage404 --- .../Weapons/Ranged/Systems/GunSystem.cs | 63 +++++++++-------- .../Projectiles/ProjectileSpreadComponent.cs | 32 +++++++++ .../Ranged/Components/AmmoComponent.cs | 12 ---- .../Guns/Ammunition/Cartridges/shotgun.yml | 21 ++---- .../Guns/Ammunition/Projectiles/shotgun.yml | 69 +++++++++++++++++++ .../Weapons/Guns/Ammunition/explosives.yml | 8 +-- 6 files changed, 144 insertions(+), 61 deletions(-) create mode 100644 Content.Shared/Projectiles/ProjectileSpreadComponent.cs diff --git a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs index 29f9198818..3a5fa4540a 100644 --- a/Content.Server/Weapons/Ranged/Systems/GunSystem.cs +++ b/Content.Server/Weapons/Ranged/Systems/GunSystem.cs @@ -129,27 +129,8 @@ public sealed partial class GunSystem : SharedGunSystem case CartridgeAmmoComponent cartridge: if (!cartridge.Spent) { - if (cartridge.Count > 1) - { - var ev = new GunGetAmmoSpreadEvent(cartridge.Spread); - RaiseLocalEvent(gunUid, ref ev); - - var angles = LinearSpread(mapAngle - ev.Spread / 2, - mapAngle + ev.Spread / 2, cartridge.Count); - - for (var i = 0; i < cartridge.Count; i++) - { - var uid = Spawn(cartridge.Prototype, fromEnt); - ShootOrThrow(uid, angles[i].ToVec(), gunVelocity, gun, gunUid, user); - shotProjectiles.Add(uid); - } - } - else - { - var uid = Spawn(cartridge.Prototype, fromEnt); - ShootOrThrow(uid, mapDirection, gunVelocity, gun, gunUid, user); - shotProjectiles.Add(uid); - } + var uid = Spawn(cartridge.Prototype, fromEnt); + CreateAndFireProjectiles(uid, cartridge); RaiseLocalEvent(ent!.Value, new AmmoShotEvent() { @@ -157,8 +138,6 @@ public sealed partial class GunSystem : SharedGunSystem }); SetCartridgeSpent(ent.Value, cartridge, true); - MuzzleFlash(gunUid, cartridge, mapDirection.ToAngle(), user); - Audio.PlayPredicted(gun.SoundGunshotModified, gunUid, user); if (cartridge.DeleteOnSpawn) Del(ent.Value); @@ -177,10 +156,10 @@ public sealed partial class GunSystem : SharedGunSystem break; // Ammo shoots itself case AmmoComponent newAmmo: - shotProjectiles.Add(ent!.Value); - MuzzleFlash(gunUid, newAmmo, mapDirection.ToAngle(), user); - Audio.PlayPredicted(gun.SoundGunshotModified, gunUid, user); - ShootOrThrow(ent.Value, mapDirection, gunVelocity, gun, gunUid, user); + if (ent == null) + break; + CreateAndFireProjectiles(ent.Value, newAmmo); + break; case HitscanPrototype hitscan: @@ -295,6 +274,36 @@ public sealed partial class GunSystem : SharedGunSystem { FiredProjectiles = shotProjectiles, }); + + void CreateAndFireProjectiles(EntityUid ammoEnt, AmmoComponent ammoComp) + { + if (TryComp(ammoEnt, out var ammoSpreadComp)) + { + var spreadEvent = new GunGetAmmoSpreadEvent(ammoSpreadComp.Spread); + RaiseLocalEvent(gunUid, ref spreadEvent); + + var angles = LinearSpread(mapAngle - spreadEvent.Spread / 2, + mapAngle + spreadEvent.Spread / 2, ammoSpreadComp.Count); + + ShootOrThrow(ammoEnt, angles[0].ToVec(), gunVelocity, gun, gunUid, user); + shotProjectiles.Add(ammoEnt); + + for (var i = 1; i < ammoSpreadComp.Count; i++) + { + var newuid = Spawn(ammoSpreadComp.Proto, fromEnt); + ShootOrThrow(newuid, angles[i].ToVec(), gunVelocity, gun, gunUid, user); + shotProjectiles.Add(ammoEnt); + } + } + else + { + ShootOrThrow(ammoEnt, mapDirection, gunVelocity, gun, gunUid, user); + shotProjectiles.Add(ammoEnt); + } + + MuzzleFlash(gunUid, ammoComp, mapDirection.ToAngle(), user); + Audio.PlayPredicted(gun.SoundGunshotModified, gunUid, user); + } } private void ShootOrThrow(EntityUid uid, Vector2 mapDirection, Vector2 gunVelocity, GunComponent gun, EntityUid gunUid, EntityUid? user) diff --git a/Content.Shared/Projectiles/ProjectileSpreadComponent.cs b/Content.Shared/Projectiles/ProjectileSpreadComponent.cs new file mode 100644 index 0000000000..1edffe3ba5 --- /dev/null +++ b/Content.Shared/Projectiles/ProjectileSpreadComponent.cs @@ -0,0 +1,32 @@ +using Content.Shared.Weapons.Ranged.Systems; +using Robust.Shared.GameStates; +using Robust.Shared.Prototypes; + +namespace Content.Shared.Projectiles; + +/// +/// Spawns a spread of the projectiles when fired +/// +[RegisterComponent, NetworkedComponent, Access(typeof(SharedGunSystem))] +public sealed partial class ProjectileSpreadComponent : Component +{ + /// + /// The entity prototype that will be fired by the rest of the spread. + /// Will generally be the same entity prototype as the first projectile being fired. + /// Needed for ammo components that do not specify a fired prototype, unlike cartridges. + /// + [DataField(required: true)] + public EntProtoId Proto; + + /// + /// How much the ammo spreads when shot, in degrees. Does nothing if count is 0. + /// + [DataField] + public Angle Spread = Angle.FromDegrees(5); + + /// + /// How many prototypes are spawned when shot. + /// + [DataField] + public int Count = 1; +} diff --git a/Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs b/Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs index 62af124252..3e1111a97d 100644 --- a/Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs +++ b/Content.Shared/Weapons/Ranged/Components/AmmoComponent.cs @@ -30,18 +30,6 @@ public sealed partial class CartridgeAmmoComponent : AmmoComponent [AutoNetworkedField] public bool Spent = false; - /// - /// How much the ammo spreads when shot, in degrees. Does nothing if count is 0. - /// - [ViewVariables(VVAccess.ReadWrite), DataField("spread")] - public Angle Spread = Angle.FromDegrees(5); - - /// - /// How many prototypes are spawned when shot. - /// - [ViewVariables(VVAccess.ReadWrite), DataField("count")] - public int Count = 1; - /// /// Caseless ammunition. /// diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml index 57b95cb901..1d90fab7c2 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml @@ -9,8 +9,6 @@ - Cartridge - ShellShotgun - type: CartridgeAmmo - count: 6 - spread: 15 soundEject: collection: ShellEject - type: Sprite @@ -32,7 +30,6 @@ map: [ "enum.AmmoVisualLayers.Base" ] - type: CartridgeAmmo proto: PelletShotgunBeanbag - count: 1 - type: SpentAmmoVisuals state: "beanbag" @@ -47,8 +44,6 @@ map: [ "enum.AmmoVisualLayers.Base" ] - type: CartridgeAmmo proto: PelletShotgunSlug - count: 1 - spread: 0 - type: SpentAmmoVisuals state: "slug" @@ -63,7 +58,6 @@ map: [ "enum.AmmoVisualLayers.Base" ] - type: CartridgeAmmo proto: PelletShotgunFlare - count: 1 - type: SpentAmmoVisuals state: "flare" @@ -77,7 +71,7 @@ - state: base map: [ "enum.AmmoVisualLayers.Base" ] - type: CartridgeAmmo - proto: PelletShotgun + proto: PelletShotgunSpread - type: entity id: ShellShotgunIncendiary @@ -89,7 +83,7 @@ - state: incendiary map: [ "enum.AmmoVisualLayers.Base" ] - type: CartridgeAmmo - proto: PelletShotgunIncendiary + proto: PelletShotgunIncendiarySpread - type: SpentAmmoVisuals state: "incendiary" @@ -103,7 +97,7 @@ - state: practice map: [ "enum.AmmoVisualLayers.Base" ] - type: CartridgeAmmo - proto: PelletShotgunPractice + proto: PelletShotgunPracticeSpread - type: SpentAmmoVisuals state: "practice" @@ -118,7 +112,6 @@ map: [ "enum.AmmoVisualLayers.Base" ] - type: CartridgeAmmo proto: PelletShotgunTranquilizer - count: 1 - type: ChemicalAmmo - type: SolutionContainerManager solutions: @@ -145,9 +138,7 @@ graph: ImprovisedShotgunShellGraph node: shell - type: CartridgeAmmo - count: 10 - spread: 45 - proto: PelletShotgunImprovised + proto: PelletShotgunImprovisedSpread - type: SpentAmmoVisuals state: "improvised" @@ -161,8 +152,6 @@ - state: depleted-uranium map: [ "enum.AmmoVisualLayers.Base" ] - type: CartridgeAmmo - count: 5 - spread: 6 - proto: PelletShotgunUranium + proto: PelletShotgunUraniumSpread - type: SpentAmmoVisuals state: "depleted-uranium" diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml index 6e4570e1a1..ce79b6f417 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml @@ -42,6 +42,16 @@ types: Piercing: 10 +- type: entity + id: PelletShotgunSpread + noSpawn: true + parent: PelletShotgun + components: + - type: ProjectileSpread + proto: PelletShotgun + count: 6 + spread: 15 + - type: entity id: PelletShotgunIncendiary name: pellet (.50 incendiary) @@ -59,6 +69,16 @@ - type: IgnitionSource ignited: true +- type: entity + id: PelletShotgunIncendiarySpread + noSpawn: true + parent: PelletShotgunIncendiary + components: + - type: ProjectileSpread + proto: PelletShotgunIncendiary + count: 6 + spread: 15 + - type: entity id: PelletShotgunPractice name: pellet (.50 practice) @@ -73,6 +93,16 @@ types: Blunt: 1 +- type: entity + id: PelletShotgunPracticeSpread + noSpawn: true + parent: PelletShotgunPractice + components: + - type: ProjectileSpread + proto: PelletShotgunPractice + count: 6 + spread: 15 + - type: entity id: PelletShotgunImprovised name: improvised pellet @@ -88,6 +118,15 @@ Piercing: 3 Slash: 3 +- type: entity + id: PelletShotgunImprovisedSpread + noSpawn: true + parent: PelletShotgunImprovised + components: + - type: ProjectileSpread + proto: PelletShotgunImprovised + count: 10 + spread: 45 - type: entity id: PelletShotgunTranquilizer @@ -178,6 +217,16 @@ Radiation: 5 Piercing: 5 +- type: entity + id: PelletShotgunUraniumSpread + noSpawn: true + parent: PelletShotgunUranium + components: + - type: ProjectileSpread + proto: PelletShotgunUranium + count: 5 + spread: 6 + - type: entity id: PelletGrapeshot #tally fucking ho name: grapeshot pellet @@ -196,6 +245,16 @@ Piercing: 25 Structural: 5 +- type: entity + id: PelletGrapeshotSpread + noSpawn: true + parent: PelletGrapeshot + components: + - type: ProjectileSpread + proto: PelletGrapeshot + count: 5 + spread: 40 + - type: entity id: PelletGlass name: glass shard @@ -215,3 +274,13 @@ damage: types: Slash: 25 + +- type: entity + id: PelletGlassSpread + parent: PelletGlass + noSpawn: true + components: + - type: ProjectileSpread + proto: PelletGlass + count: 5 + spread: 10 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml index 152de7e92f..04d405e881 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml @@ -175,9 +175,7 @@ parent: BaseCannonBall components: - type: CartridgeAmmo - proto: PelletGrapeshot - count: 5 - spread: 40 + proto: PelletGrapeshotSpread deleteOnSpawn: true - type: Sprite sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi @@ -190,9 +188,7 @@ parent: BaseCannonBall components: - type: CartridgeAmmo - proto: PelletGlass - count: 5 - spread: 10 + proto: PelletGlassSpread deleteOnSpawn: true - type: Sprite sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi From a9693322beaa6726a5370b9ae05b5a89c0136610 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Sat, 3 Aug 2024 16:06:04 +0200 Subject: [PATCH 142/422] SpeakOnUseSystem and phrases for figurines (#30455) * commit 1 * 2 * add more text * apply review * apply review 2 Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --------- Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> --- Content.Server/Chat/SpeakOnUseComponent.cs | 18 ++ .../Chat/Systems/SpeakOnUseSystem.cs | 42 +++ Resources/Locale/en-US/datasets/figurines.ftl | 166 +++++++++++ Resources/Prototypes/Datasets/figurines.yml | 263 ++++++++++++++++++ .../Entities/Objects/Fun/figurines.yml | 95 ++++++- 5 files changed, 583 insertions(+), 1 deletion(-) create mode 100644 Content.Server/Chat/SpeakOnUseComponent.cs create mode 100644 Content.Server/Chat/Systems/SpeakOnUseSystem.cs create mode 100644 Resources/Locale/en-US/datasets/figurines.ftl create mode 100644 Resources/Prototypes/Datasets/figurines.yml diff --git a/Content.Server/Chat/SpeakOnUseComponent.cs b/Content.Server/Chat/SpeakOnUseComponent.cs new file mode 100644 index 0000000000..f8953aebef --- /dev/null +++ b/Content.Server/Chat/SpeakOnUseComponent.cs @@ -0,0 +1,18 @@ +using Content.Shared.Dataset; +using Robust.Shared.Prototypes; + +namespace Content.Server.Chat; + +/// +/// Entity will say the things when activated +/// +[RegisterComponent] +public sealed partial class SpeakOnUseComponent : Component +{ + /// + /// The identifier for the dataset prototype containing messages to be spoken by this entity. + /// + [DataField(required: true)] + public ProtoId Pack { get; private set; } + +} diff --git a/Content.Server/Chat/Systems/SpeakOnUseSystem.cs b/Content.Server/Chat/Systems/SpeakOnUseSystem.cs new file mode 100644 index 0000000000..addec79e41 --- /dev/null +++ b/Content.Server/Chat/Systems/SpeakOnUseSystem.cs @@ -0,0 +1,42 @@ +using Content.Server.Chat; +using Content.Shared.Dataset; +using Content.Shared.Interaction.Events; +using Content.Shared.Timing; +using Robust.Shared.Prototypes; +using Robust.Shared.Random; + +namespace Content.Server.Chat.Systems; + +/// +/// Handles the speech on activating an entity +/// +public sealed partial class SpeakOnUIClosedSystem : EntitySystem +{ + [Dependency] private readonly UseDelaySystem _useDelay = default!; + [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private readonly ChatSystem _chat = default!; + + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(OnUseInHand); + } + + public void OnUseInHand(EntityUid uid, SpeakOnUseComponent? component, UseInHandEvent args) + { + if (!Resolve(uid, ref component)) + return; + + // Yes it won't work without UseDelayComponent, but we don't want any kind of spam + if (!TryComp(uid, out UseDelayComponent? useDelay) || _useDelay.IsDelayed((uid, useDelay))) + return; + + if (!_prototypeManager.TryIndex(component.Pack, out var messagePack)) + return; + + var message = Loc.GetString(_random.Pick(messagePack.Values)); + _chat.TrySendInGameICMessage(uid, message, InGameICChatType.Speak, true); + _useDelay.TryResetDelay((uid, useDelay)); + } +} diff --git a/Resources/Locale/en-US/datasets/figurines.ftl b/Resources/Locale/en-US/datasets/figurines.ftl new file mode 100644 index 0000000000..0de2d9131b --- /dev/null +++ b/Resources/Locale/en-US/datasets/figurines.ftl @@ -0,0 +1,166 @@ +figurines-hop-1 = Papers, please. +figurines-hop-2 = You are fired. + +figurines-passenger-1 = How to change hands? +figurines-passenger-2 = Call evac. + +figurines-greytider-1 = Man, this party stinks. I fucking hate these people. +figurines-greytider-2 = Uh-oh, who's lost their stunbaton? +figurines-greytider-3 = Robust. +figurines-greytider-4 = I'm not me without a toolbox. +figurines-greytider-5 = Grey tide station wide! + +figurines-clown-1 = Honk! +figurines-clown-2 = Banana! +figurines-clown-3 = Soap! +figurines-clown-4 = HoP has one clown, HoS has the whole department. +figurines-clown-5 = Do I annoy you? + +figurines-holoclown-1 = I'm helping my older brother. + +figurines-mime-1 = ... +figurines-mime-2 = ... +figurines-mime-3 = .... +figurines-mime-4 = ....... +figurines-mime-5 = ................ + +figurines-musician-1 = Never gonna give you up! +figurines-musician-2 = Never gonna let you down! + +# figurines-boxer- + +figurines-captain-1 = Crew, the Nuke Disk is safely up my ass. +figurines-captain-2 = Glory to NT! + +figurines-hos-1 = Space law? What? +figurines-hos-2 = Shot the clown. + +figurines-warden-1 = Execute him for breaking in! + +figurines-detective-1 = The butler did it. + +figurines-security-1 = I am the law! +figurines-security-2 = You have violated article 1984. + +figurines-lawyer-1 = Better Call Saul! +figurines-lawyer-2 = Objection! + +figurines-cargotech-1 = DRAGON ON ATS! +figurines-cargotech-2 = I sold the station! +figurines-cargotech-3 = Brain bounty? I don't have a brain. + +figurines-salvage-1 = Megafauna? It was mega easy. + +figurines-qm-1 = Who stole the shuttle? +figurines-qm-2 = I won't approve the guns. +figurines-qm-3 = I didn't buy those guns! +figurines-qm-4 = One toys crate for ma fellow clown! +figurines-qm-5 = Time to spent all money on gambling. +figurines-qm-6 = Viva La Cargonia! +figurines-qm-7 = Fill the form. + +figurines-ce-1 = Everyone to the briefing! +figurines-ce-2 = Wire the solars! +figurines-ce-3 = How to setup the TEG? +figurines-ce-4 = SINGULOOSE! +figurines-ce-5 = TESLOOSE! + +figurines-engineer-1 = SINGULOOSE! +figurines-engineer-2 = TESLOOSE! +figurines-engineer-3 = What is AME? + +figurines-atmostech-1 = I put plasma in distro. +figurines-atmostech-2 = I will burn you in a burn chamber. +figurines-atmostech-3 = Frezon... +figurines-atmostech-4 = Tritium... +figurines-atmostech-5 = Glory to Atmosia! + +figurines-rd-1 = Blowing all of the borgs! +figurines-rd-2 = Tier 3 arsenal? No way. + +figurines-scientist-1 = Someone else must have made those bombs! +figurines-scientist-2 = He asked to be borged! +figurines-scientist-3 = Carp at sci! +figurines-scientist-4 = Explosion at sci. +figurines-scientist-5 = The anomaly has exploded. + +figurines-cmo-1 = Suit sensors! +figurines-cmo-2 = Why do we have meth? + +figurines-chemist-1 = Get your pills! + +figurines-paramedic-1 = Insuls and tools! +figurines-paramedic-2 = I need AA for saving people! + +figurines-doctor-1 = The patient is already dead! +figurines-doctor-2 = CLEAR! +figurines-doctor-3 = Saw makes BRRR. + +figurines-librarian-1 = One day while... +figurines-librarian-2 = Silence! + +figurines-chaplain-1 = Would you like to join my cul- I mean religion. +figurines-chaplain-2 = Gods make me a killing machine please! +figurines-chaplain-3 = God exists! + +figurines-chef-1 = I swear it's not human meat. + +figurines-bartender-1 = Where's my monkey? +figurines-bartender-2 = Sec won't drink. + +figurines-botanist-1 = I don't have any weed, officer! +figurines-botanist-2 = Dude, I see colors... + +figurines-janitor-1 = Clown stole my soap. Again. +figurines-janitor-2 = Look at the signs, you idiot. + +figurines-nukie-1 = I got the disk! +figurines-nukie-2 = Whiskey, Echo, Whiskey. +figurines-nukie-3 = The nuke makes boom. +figurines-nukie-4 = What's the code? + +figurines-nukie-elite-1 = Not a word in nanotrasen. +figurines-nukie-elite-2 = THAT'S A KEG! +figurines-nukie-elite-3 = Guys are you alive? + +figurines-nukie-commander-1 = GET DAT FUKKEN DISK! + +figurines-footsoldier-1 = I'm an evil boy. Less boy every day, more evil every day. +figurines-footsoldier-2 = Who will you choose? Them or us? Us or them? + +figurines-wizard-1 = Ei Nath! +figurines-wizard-2 = Wehgardium Leviosa! +figurines-wizard-3 = Skidaddle skadoodle! +figurines-wizard-4 = FIREBALL! + +figurines-space-dragon-1 = Fish will consume the station. + +# figurines-queen + +figurines-rat-king-1 = Gimme some food, capiche? +figurines-rat-king-2 = Fugeddaboutit. +figurines-rat-king-3 = Whack 'em! + +figurines-rat-servant-1 = Capiche! +figurines-rat-servant-2 = Boss says! + +figurines-mouse-1 = Piep! +figurines-mouse-2 = Squeak! +figurines-mouse-3 = Chuu! +figurines-mouse-4 = Eeee! +figurines-mouse-5 = Pip! +figurines-mouse-6 = Fwiep! +figurines-mouse-7 = Heep! + +figurines-slime-1 = Blyump. +figurines-slime-2 = Blimpuf? +figurines-slime-3 = Blump! + +figurines-hamlet-1 = Piep! +figurines-hamlet-2 = Squeak! +figurines-hamlet-3 = Chuu! +figurines-hamlet-4 = Eeee! +figurines-hamlet-5 = Pip! +figurines-hamlet-6 = Fwiep! +figurines-hamlet-7 = Heep! +figurines-hamlet-8 = NOT THE MICROWAVE! diff --git a/Resources/Prototypes/Datasets/figurines.yml b/Resources/Prototypes/Datasets/figurines.yml new file mode 100644 index 0000000000..8ad651c134 --- /dev/null +++ b/Resources/Prototypes/Datasets/figurines.yml @@ -0,0 +1,263 @@ +- type: localizedDataset + id: FigurinesHoP + values: + prefix: figurines-hop- + count: 2 + +- type: localizedDataset + id: FigurinesPassenger + values: + prefix: figurines-passenger- + count: 2 + +- type: localizedDataset + id: FigurinesGreytider + values: + prefix: figurines-greytider- + count: 5 + +- type: localizedDataset + id: FigurinesClown + values: + prefix: figurines-clown- + count: 5 + +- type: localizedDataset + id: FigurinesHoloClown + values: + prefix: figurines-holoclown- + count: 1 + +- type: localizedDataset + id: FigurinesMime + values: + prefix: figurines-mime- + count: 5 + +- type: localizedDataset + id: FigurinesMusician + values: + prefix: figurines-musician- + count: 2 + +# - type: localizedDataset # TODO add something +# id: FigurinesBoxer +# values: +# prefix: figurines-boxer- +# count: 0 + +- type: localizedDataset + id: FigurinesCaptain + values: + prefix: figurines-captain- + count: 2 + +- type: localizedDataset + id: FigurinesHoS + values: + prefix: figurines-hos- + count: 2 + +- type: localizedDataset + id: FigurinesWarden + values: + prefix: figurines-warden- + count: 1 + +- type: localizedDataset + id: FigurinesDetective + values: + prefix: figurines-detective- + count: 1 + +- type: localizedDataset + id: FigurinesSecurity + values: + prefix: figurines-security- + count: 2 + +- type: localizedDataset + id: FigurinesLawyer + values: + prefix: figurines-lawyer- + count: 2 + +- type: localizedDataset + id: FigurinesCargoTech + values: + prefix: figurines-cargotech- + count: 3 + +- type: localizedDataset + id: FigurinesSalvage + values: + prefix: figurines-salvage- + count: 1 + +- type: localizedDataset + id: FigurinesQM + values: + prefix: figurines-qm- + count: 7 + +- type: localizedDataset + id: FigurinesCE + values: + prefix: figurines-ce- + count: 5 + +- type: localizedDataset + id: FigurinesEngineer + values: + prefix: figurines-engineer- + count: 3 + +- type: localizedDataset + id: FigurinesAtmosTech + values: + prefix: figurines-atmostech- + count: 5 + +- type: localizedDataset + id: FigurinesRD + values: + prefix: figurines-rd- + count: 2 + +- type: localizedDataset + id: FigurinesScientist + values: + prefix: figurines-scientist- + count: 5 + +- type: localizedDataset + id: FigurinesCMO + values: + prefix: figurines-cmo- + count: 2 + +- type: localizedDataset + id: FigurinesChemist + values: + prefix: figurines-chemist- + count: 1 + +- type: localizedDataset + id: FigurinesParamedic + values: + prefix: figurines-paramedic- + count: 2 + +- type: localizedDataset + id: FigurinesDoctor + values: + prefix: figurines-doctor- + count: 3 + +- type: localizedDataset + id: FigurinesLibrarian + values: + prefix: figurines-librarian- + count: 2 + +- type: localizedDataset + id: FigurinesChaplain + values: + prefix: figurines-chaplain- + count: 3 + +- type: localizedDataset + id: FigurinesChef + values: + prefix: figurines-chef- + count: 1 + +- type: localizedDataset + id: FigurinesBartender + values: + prefix: figurines-bartender- + count: 2 + +- type: localizedDataset + id: FigurinesBotanist + values: + prefix: figurines-botanist- + count: 2 + +- type: localizedDataset + id: FigurinesJanitor + values: + prefix: figurines-janitor- + count: 2 + +- type: localizedDataset + id: FigurinesNukie + values: + prefix: figurines-nukie- + count: 4 + +- type: localizedDataset + id: FigurinesNukieElite + values: + prefix: figurines-nukie-elite- + count: 3 + +- type: localizedDataset + id: FigurinesNukieCommander + values: + prefix: figurines-nukie-commander- + count: 1 + +- type: localizedDataset + id: FigurinesFootsoldier + values: + prefix: figurines-footsoldier- + count: 2 + +- type: localizedDataset + id: FigurinesWizard + values: + prefix: figurines-wizard- + count: 1 + +- type: localizedDataset + id: FigurinesSpaceDragon + values: + prefix: figurines-space-dragon- + count: 1 + +# - type: localizedDataset # TODO add something +# id: FigurinesQueen +# values: +# prefix: figurines-queen- +# count: 0 + +- type: localizedDataset + id: FigurinesRatKing + values: + prefix: figurines-rat-king- + count: 3 + +- type: localizedDataset + id: FigurinesRatServant + values: + prefix: figurines-rat-servant- + count: 2 + +- type: localizedDataset + id: FigurinesMouse + values: + prefix: figurines-mouse- + count: 7 + +- type: localizedDataset + id: FigurinesSlime + values: + prefix: figurines-slime- + count: 3 + +- type: localizedDataset + id: FigurinesHamlet + values: + prefix: figurines-hamlet- + count: 8 diff --git a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml index ce83f66cb3..0ab95ce043 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/figurines.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/figurines.yml @@ -19,6 +19,10 @@ - Figurine - type: StealTarget stealGroup: Figurines + - type: UseDelay + delay: 10 + - type: Speech + speechSounds: Pai # it just sounds better - type: entity parent: BaseFigurine @@ -28,6 +32,8 @@ components: - type: Sprite state: hop + - type: SpeakOnUse + pack: FigurinesHoP - type: entity parent: BaseFigurine @@ -37,6 +43,8 @@ components: - type: Sprite state: passenger + - type: SpeakOnUse + pack: FigurinesPassenger - type: entity parent: BaseFigurine @@ -46,6 +54,8 @@ components: - type: Sprite state: passenger_greytide + - type: SpeakOnUse + pack: FigurinesGreytider - type: entity parent: BaseFigurine @@ -55,6 +65,8 @@ components: - type: Sprite state: clown + - type: SpeakOnUse + pack: FigurinesClown - type: entity parent: BaseFigurine @@ -64,7 +76,8 @@ components: - type: Sprite state: holoclown - + - type: SpeakOnUse + pack: FigurinesHoloClown - type: entity parent: BaseFigurine @@ -74,6 +87,8 @@ components: - type: Sprite state: mime + - type: SpeakOnUse + pack: FigurinesMime - type: entity parent: BaseFigurine @@ -83,6 +98,8 @@ components: - type: Sprite state: musician + - type: SpeakOnUse + pack: FigurinesMusician - type: entity parent: BaseFigurine @@ -92,6 +109,8 @@ components: - type: Sprite state: boxer + # - type: SpeakOnUse # TODO add something + # pack: FigurinesBoxer - type: entity parent: BaseFigurine @@ -101,6 +120,8 @@ components: - type: Sprite state: captain + - type: SpeakOnUse + pack: FigurinesCaptain - type: entity parent: BaseFigurine @@ -110,6 +131,8 @@ components: - type: Sprite state: hos + - type: SpeakOnUse + pack: FigurinesHoS - type: entity parent: BaseFigurine @@ -119,6 +142,8 @@ components: - type: Sprite state: warden + - type: SpeakOnUse + pack: FigurinesWarden - type: entity parent: BaseFigurine @@ -128,6 +153,8 @@ components: - type: Sprite state: detective + - type: SpeakOnUse + pack: FigurinesDetective - type: entity parent: BaseFigurine @@ -137,6 +164,8 @@ components: - type: Sprite state: security + - type: SpeakOnUse + pack: FigurinesSecurity - type: entity parent: BaseFigurine @@ -146,6 +175,8 @@ components: - type: Sprite state: lawyer + - type: SpeakOnUse + pack: FigurinesLawyer - type: entity parent: BaseFigurine @@ -155,6 +186,8 @@ components: - type: Sprite state: cargotech + - type: SpeakOnUse + pack: FigurinesCargoTech - type: entity parent: BaseFigurine @@ -164,6 +197,8 @@ components: - type: Sprite state: salvage + - type: SpeakOnUse + pack: FigurinesSalvage - type: entity parent: BaseFigurine @@ -173,6 +208,8 @@ components: - type: Sprite state: qm + - type: SpeakOnUse + pack: FigurinesQM - type: entity parent: BaseFigurine @@ -182,6 +219,8 @@ components: - type: Sprite state: ce + - type: SpeakOnUse + pack: FigurinesCE - type: entity parent: BaseFigurine @@ -191,6 +230,8 @@ components: - type: Sprite state: engineer + - type: SpeakOnUse + pack: FigurinesEngineer - type: entity parent: BaseFigurine @@ -200,6 +241,8 @@ components: - type: Sprite state: atmos + - type: SpeakOnUse + pack: FigurinesAtmosTech - type: entity parent: BaseFigurine @@ -209,6 +252,8 @@ components: - type: Sprite state: rd + - type: SpeakOnUse + pack: FigurinesRD - type: entity parent: BaseFigurine @@ -218,6 +263,8 @@ components: - type: Sprite state: scientist + - type: SpeakOnUse + pack: FigurinesScientist - type: entity parent: BaseFigurine @@ -227,6 +274,8 @@ components: - type: Sprite state: cmo + - type: SpeakOnUse + pack: FigurinesCMO - type: entity parent: BaseFigurine @@ -236,6 +285,8 @@ components: - type: Sprite state: chemist + - type: SpeakOnUse + pack: FigurinesChemist - type: entity parent: BaseFigurine @@ -245,6 +296,8 @@ components: - type: Sprite state: paramedic + - type: SpeakOnUse + pack: FigurinesParamedic - type: entity parent: BaseFigurine @@ -254,6 +307,8 @@ components: - type: Sprite state: medical + - type: SpeakOnUse + pack: FigurinesDoctor - type: entity parent: BaseFigurine @@ -263,6 +318,8 @@ components: - type: Sprite state: librarian + - type: SpeakOnUse + pack: FigurinesLibrarian - type: entity parent: BaseFigurine @@ -272,6 +329,8 @@ components: - type: Sprite state: chaplain + - type: SpeakOnUse + pack: FigurinesChaplain - type: entity parent: BaseFigurine @@ -281,6 +340,8 @@ components: - type: Sprite state: chef + - type: SpeakOnUse + pack: FigurinesChef - type: entity parent: BaseFigurine @@ -290,6 +351,8 @@ components: - type: Sprite state: bartender + - type: SpeakOnUse + pack: FigurinesBartender - type: entity parent: BaseFigurine @@ -299,6 +362,8 @@ components: - type: Sprite state: botanist + - type: SpeakOnUse + pack: FigurinesBotanist - type: entity parent: BaseFigurine @@ -308,6 +373,8 @@ components: - type: Sprite state: janitor + - type: SpeakOnUse + pack: FigurinesJanitor - type: entity parent: BaseFigurine @@ -317,6 +384,8 @@ components: - type: Sprite state: nukie + - type: SpeakOnUse + pack: FigurinesNukie - type: entity parent: BaseFigurine @@ -326,6 +395,8 @@ components: - type: Sprite state: nukie_elite + - type: SpeakOnUse + pack: FigurinesNukieElite - type: entity parent: BaseFigurine @@ -335,6 +406,8 @@ components: - type: Sprite state: nukie_commander + - type: SpeakOnUse + pack: FigurinesNukieCommander - type: entity parent: BaseFigurine @@ -344,6 +417,8 @@ components: - type: Sprite state: footsoldier + - type: SpeakOnUse + pack: FigurinesFootsoldier - type: entity parent: BaseFigurine @@ -353,6 +428,8 @@ components: - type: Sprite state: wizard + - type: SpeakOnUse + pack: FigurinesWizard - type: entity parent: BaseFigurine @@ -362,6 +439,8 @@ components: - type: Sprite state: wizard_fake + - type: SpeakOnUse + pack: FigurinesWizard #Nonhuman Figurines @@ -373,6 +452,8 @@ components: - type: Sprite state: spacedragon + - type: SpeakOnUse + pack: FigurinesSpaceDragon - type: entity parent: BaseFigurine @@ -382,6 +463,8 @@ components: - type: Sprite state: queen + # - type: SpeakOnUse # TODO add something + # pack: FigurinesQueen - type: entity parent: BaseFigurine @@ -391,6 +474,8 @@ components: - type: Sprite state: ratking + - type: SpeakOnUse + pack: FigurinesRatKing - type: entity parent: BaseFigurine @@ -400,6 +485,8 @@ components: - type: Sprite state: ratservant + - type: SpeakOnUse + pack: FigurinesRatServant - type: entity parent: BaseFigurine @@ -409,6 +496,8 @@ components: - type: Sprite state: mouse + - type: SpeakOnUse + pack: FigurinesMouse - type: entity parent: BaseFigurine @@ -418,6 +507,8 @@ components: - type: Sprite state: slime + - type: SpeakOnUse + pack: FigurinesSlime - type: entity parent: BaseFigurine @@ -427,6 +518,8 @@ components: - type: Sprite state: hamlet + - type: SpeakOnUse + pack: FigurinesHamlet #TODO: Convert these to the new figurine sprite template and rename their sprite name. #Yes, these are humanoids, but they need to be updated first. From a15fb563818e7891ea00b91d4ecddb54e5cf41e8 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 3 Aug 2024 14:07:11 +0000 Subject: [PATCH 143/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index f9b63511e1..4e134c5a4d 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: '0x6273' - changes: - - message: Shuttle docks now have a "dock status" device link port - type: Add - id: 6536 - time: '2024-05-06T03:59:01.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27646 - author: DogZeroX changes: - message: 'Added new lobby art: Just a week away by Fern' @@ -3784,3 +3777,10 @@ id: 7035 time: '2024-08-02T23:05:19.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30350 +- author: lzk228 + changes: + - message: Figurines will say phrases on activation. + type: Add + id: 7036 + time: '2024-08-03T14:06:04.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30455 From aad2441f305d62b0647b6d42f42388d2c0813886 Mon Sep 17 00:00:00 2001 From: Joel Zimmerman Date: Sat, 3 Aug 2024 16:07:20 +0200 Subject: [PATCH 144/422] Made the dank pizza actually dank (#30430) * made the dank pizza actually dank * made the dank pizza also contain some nutritional value --- .../Objects/Consumable/Food/Baked/pizza.yml | 16 ++++++---------- .../Prototypes/Recipes/Cooking/meal_recipes.yml | 2 +- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml index 55bf7f994a..20b03fcb67 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml @@ -319,11 +319,9 @@ maxVol: 50 reagents: - ReagentId: Nutriment - Quantity: 25 - - ReagentId: Vitamin - Quantity: 5 - - ReagentId: DoctorsDelight - Quantity: 6 + Quantity: 20 + - ReagentId: THC + Quantity: 30 - type: entity name: slice of dank pizza @@ -346,11 +344,9 @@ maxVol: 10 reagents: - ReagentId: Nutriment - Quantity: 4.2 - - ReagentId: Vitamin - Quantity: 0.8 - - ReagentId: DoctorsDelight - Quantity: 1 + Quantity: 3.5 + - ReagentId: THC + Quantity: 5 # Tastes like crust, tomato, cheese, meat, satisfaction. - type: entity diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index 3c750e0190..fff0e7db9f 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -576,7 +576,7 @@ time: 30 solids: FoodDoughFlat: 1 - FoodAmbrosiaVulgaris: 3 + LeavesCannabis: 2 FoodCheeseSlice: 1 FoodTomato: 1 From 77eb70ea8a29705b1c6ea7cd6d3d71ba3a7fbe2f Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 3 Aug 2024 14:08:26 +0000 Subject: [PATCH 145/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 4e134c5a4d..b6df40b06d 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: DogZeroX - changes: - - message: 'Added new lobby art: Just a week away by Fern' - type: Add - id: 6537 - time: '2024-05-06T08:17:35.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27717 - author: mirrorcult changes: - message: Event weights have been tweaked across the board, and some events removed @@ -3784,3 +3777,10 @@ id: 7036 time: '2024-08-03T14:06:04.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30455 +- author: JoelZimmerman + changes: + - message: Dank pizza is now cooked with cannabis leaves instead of ambrosia vulgaris. + type: Tweak + id: 7037 + time: '2024-08-03T14:07:21.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30430 From a937f05929f9cf1d41801e4b9335fcf5cf4e96a3 Mon Sep 17 00:00:00 2001 From: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com> Date: Sat, 3 Aug 2024 14:09:41 +0000 Subject: [PATCH 146/422] fix(GhostRoleAntagSpawner): Create a new mind before transfering (#30354) * IN MY WALLS! IN MY WALLS THEY ARE IN MY WALLS HELP HEELP HEKP PA DADOEAMD EODM AOM D *DIES* IM NOT DEAD ADADADDADIAMSDIM * RUN I SAID RUN! THEY TOOK MY UKELELE Co-authored-by: EmoGarbage404 * Many have fallen * It's all emo's fault --------- Co-authored-by: EmoGarbage404 --- Content.Server/Antag/AntagSelectionSystem.cs | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Content.Server/Antag/AntagSelectionSystem.cs b/Content.Server/Antag/AntagSelectionSystem.cs index c9ef237474..496fcbb550 100644 --- a/Content.Server/Antag/AntagSelectionSystem.cs +++ b/Content.Server/Antag/AntagSelectionSystem.cs @@ -328,16 +328,13 @@ public sealed partial class AntagSelectionSystem : GameRuleSystem Date: Sat, 3 Aug 2024 13:36:19 -0400 Subject: [PATCH 147/422] Docking ports now block air only in the direction their port is. (#30195) speedholes. --- .../Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml index 5d27cec181..34639e4335 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml @@ -63,6 +63,8 @@ path: /Audio/Machines/airlock_deny.ogg - type: Airtight noAirWhenFullyAirBlocked: false + airBlockedDirection: + - South - type: Tag tags: - ForceNoFixRotations From b55c37ec3e4264e8262af3a5bd206a496e981161 Mon Sep 17 00:00:00 2001 From: voidnull000 <18663194+voidnull000@users.noreply.github.com> Date: Sat, 3 Aug 2024 22:20:00 +0100 Subject: [PATCH 148/422] Fix a typo in the raid suit's description (#30612) fix typo (for real this time i swear) --- Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index 6de0c78220..413a41473b 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -103,7 +103,7 @@ parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing] id: ClothingOuterArmorRaid name: syndicate raid suit - description: A somewhat flexible and well-armored suit with a powerful shoulder mounted flashlight manufactured in the Gorlex Marauder's iconic blood-red color scheme, it does not protect it's wearer from space. + description: A somewhat flexible and well-armored suit with a powerful shoulder mounted flashlight manufactured in the Gorlex Marauder's iconic blood-red color scheme, it does not protect its wearer from space. components: - type: Sprite sprite: Clothing/OuterClothing/Armor/syndie-raid.rsi From 6e8f8d706a79c933e3073e8b22c0ac81e9877af3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 3 Aug 2024 21:01:41 -0400 Subject: [PATCH 149/422] Update Credits (#30620) Co-authored-by: PJBot --- Resources/Credits/GitHub.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt index 6f5e023184..c3b51ce777 100644 --- a/Resources/Credits/GitHub.txt +++ b/Resources/Credits/GitHub.txt @@ -1 +1 @@ -0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aeshus, Aexxie, Afrokada, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlexUm418, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, ArkiveDev, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, Baptr0b0t, BasedUser, beck-thompson, BellwetherLogic, BGare, bhenrich, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blueDev2, Boaz1111, BobdaBiscuit, BombasterDS, brainfood1183, Brandon-Huu, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CaasGit, CakeQ, Callmore, CaptainSqrBeard, Carbonhell, CatTheSystem, Centronias, chairbender, Charlese2, chavonadelal, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, Ciac32, clement-or, Clyybber, Cojoke-dot, ColdAutumnRain, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, Deeeeja, deepdarkdepths, deepy, Delete69, deltanedas, DerbyX, DexlerXD, dffdff2423, diraven, Doctor-Cpu, DoctorBeard, DogZeroX, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FoLoKe, fooberticus, Fortune117, freeman2651, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, geraeumig, Ghagliiarghii, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, graevy, GreyMario, gusxyz, Gyrandola, h3half, Hanzdegloker, Hardly3D, harikattar, HerCoyote23, hitomishirichan, Hmeister-real, HoofedEar, hord-brayden, hubismal, Hugal31, Huxellberger, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, Interrobang01, IProduceWidgets, ItsMeThom, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JIPDawg, JoeHammad1844, joelsgp, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTrotter, K-Dynamic, KaiShibaa, kalane15, kalanosh, Keer-Sar, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, laok233, lapatison, Leander-0, LetterN, Level10Cybermancer, lever1209, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, luckyshotpictures, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, Mangohydra, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, MjrLandWhale, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, nuke-haus, NULL882, OctoRocket, OldDanceJacket, onoira, osjarw, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, pigeonpeas, pissdemon, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, PursuitInAshes, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, RamZ, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, RumiTiger, Saakra, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, shampunj, SignalWalker, Simyon264, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, snebl, Snowni, snowsignal, SonicHDC, SoulFN, SoulSloth, SpaceManiac, SpeltIncorrectyl, SphiraI, spoogemonster, ssdaniel24, Stealthbomber16, StrawberryMoses, superjj18, SweptWasTaken, Szunti, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, Terraspark4941, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, Theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, TokenStyle, tom-leys, tomasalves8, Tomeno, Tornado-Technology, tosatur, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UBlueberry, UKNOWH, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Vermidia, Verslebas, VigersRay, Visne, volundr-, Voomra, Vordenburg, vulppine, wafehling, WarMechanic, waylon531, weaversam8, whateverusername0, Willhelm53, Winkarst-cpu, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zonespace27, Zumorica, Zymem +0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aeshus, Aexxie, Afrokada, Agoichi, Ahion, Aidenkrz, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlexUm418, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, ArkiveDev, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, Baptr0b0t, BasedUser, beck-thompson, BellwetherLogic, BGare, bhenrich, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blueDev2, Boaz1111, BobdaBiscuit, BombasterDS, brainfood1183, Brandon-Huu, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CaasGit, Callmore, CaptainSqrBeard, Carbonhell, CatTheSystem, Centronias, chairbender, Charlese2, chavonadelal, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, Ciac32, clement-or, Clyybber, Cojoke-dot, ColdAutumnRain, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, Deeeeja, deepdarkdepths, deepy, Delete69, deltanedas, DerbyX, dffdff2423, diraven, Doctor-Cpu, DoctorBeard, DogZeroX, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FoLoKe, fooberticus, Fortune117, freeman2651, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, geraeumig, Ghagliiarghii, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, graevy, GreyMario, gusxyz, Gyrandola, h3half, Hanzdegloker, Hardly3D, harikattar, HerCoyote23, hitomishirichan, Hmeister-real, HoofedEar, Hoolny, hord-brayden, hubismal, Hugal31, Huxellberger, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, Interrobang01, IProduceWidgets, ItsMeThom, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JIPDawg, JoeHammad1844, joelsgp, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTrotter, K-Dynamic, KaiShibaa, kalane15, kalanosh, Keer-Sar, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, laok233, lapatison, Leander-0, LetterN, Level10Cybermancer, lever1209, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, luckyshotpictures, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, Mangohydra, marboww, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, MjrLandWhale, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, NakataRin, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, nuke-haus, NULL882, OctoRocket, OldDanceJacket, onoira, osjarw, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, pigeonpeas, pissdemon, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, PursuitInAshes, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, RamZ, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, RumiTiger, Saakra, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, ShadowCommander, Shadowtheprotogen546, shampunj, SignalWalker, Simyon264, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, snebl, Snowni, snowsignal, SonicHDC, SoulFN, SoulSloth, SpaceManiac, SpeltIncorrectyl, SphiraI, spoogemonster, ssdaniel24, stalengd, Stealthbomber16, StrawberryMoses, superjj18, SweptWasTaken, Szunti, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, Terraspark4941, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, Theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, TokenStyle, tom-leys, tomasalves8, Tomeno, Tornado-Technology, tosatur, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UBlueberry, UKNOWH, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Vermidia, Verslebas, VigersRay, Visne, volundr-, Voomra, Vordenburg, vulppine, wafehling, WarMechanic, waylon531, weaversam8, whateverusername0, Willhelm53, Winkarst-cpu, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zonespace27, Zumorica, Zymem From 54d5bd266cdf06fcd4351dc2120b8ddee13ec2ec Mon Sep 17 00:00:00 2001 From: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com> Date: Sat, 3 Aug 2024 20:31:45 -0700 Subject: [PATCH 150/422] Add mapping editor (#23427) * Add mapping editor (#757) * Remove mapping actions, never again * Cleanup actions system * Jarvis, remove all references to CM14 * Fix InventoryUIController crashing when an InventoryGui is not found * Rename mapping1 to mapping * Clean up context calls * Add doc comments * Add delegate for hiding decals in the mapping screen * Jarvis mission failed * a * Add test * Fix not flushing save stream in mapping manager * change * Fix verbs * fixes * localise --------- Co-authored-by: DrSmugleaf Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: metalgearsloth Co-authored-by: Pieter-Jan Briers --- Content.Client/Actions/ActionsSystem.cs | 2 +- Content.Client/Commands/ActionsCommands.cs | 25 +- .../Commands/MappingClientSideSetupCommand.cs | 7 +- .../ContextMenu/UI/ContextMenuUIController.cs | 38 +- .../Decals/Overlays/DecalPlacementOverlay.cs | 6 +- Content.Client/IoC/ClientContentIoC.cs | 9 +- .../Mapping/MappingActionsButton.xaml | 8 + .../Mapping/MappingActionsButton.xaml.cs | 15 + .../Mapping/MappingDoNotMeasure.xaml | 4 + .../Mapping/MappingDoNotMeasure.xaml.cs | 21 + Content.Client/Mapping/MappingManager.cs | 69 ++ Content.Client/Mapping/MappingOverlay.cs | 84 ++ Content.Client/Mapping/MappingPrototype.cs | 39 + .../Mapping/MappingPrototypeList.xaml | 21 + .../Mapping/MappingPrototypeList.xaml.cs | 170 ++++ Content.Client/Mapping/MappingScreen.xaml | 85 ++ Content.Client/Mapping/MappingScreen.xaml.cs | 197 ++++ .../Mapping/MappingSpawnButton.xaml | 26 + .../Mapping/MappingSpawnButton.xaml.cs | 16 + Content.Client/Mapping/MappingState.cs | 936 ++++++++++++++++++ Content.Client/Mapping/MappingSystem.cs | 8 - .../Systems/Actions/ActionUIController.cs | 2 +- .../Verbs/UI/VerbMenuUIController.cs | 17 +- .../Tests/MappingEditorTest.cs | 41 + Content.Server/IoC/ServerContentIoC.cs | 2 + Content.Server/Mapping/MappingManager.cs | 76 ++ Content.Shared/Decals/DecalPrototype.cs | 11 +- Content.Shared/Input/ContentKeyFunctions.cs | 9 + .../Mapping/MappingMapDataMessage.cs | 46 + .../Mapping/MappingSaveMapErrorMessage.cs | 19 + .../Mapping/MappingSaveMapMessage.cs | 19 + Resources/Locale/en-US/mapping/editor.ftl | 7 + Resources/Textures/Interface/eraser.svg | 3 + Resources/Textures/Interface/eraser.svg.png | Bin 0 -> 1706 bytes Resources/Textures/Interface/eyedropper.svg | 3 + .../Textures/Interface/eyedropper.svg.png | Bin 0 -> 1956 bytes Resources/keybinds.yml | 30 + 37 files changed, 2024 insertions(+), 47 deletions(-) create mode 100644 Content.Client/Mapping/MappingActionsButton.xaml create mode 100644 Content.Client/Mapping/MappingActionsButton.xaml.cs create mode 100644 Content.Client/Mapping/MappingDoNotMeasure.xaml create mode 100644 Content.Client/Mapping/MappingDoNotMeasure.xaml.cs create mode 100644 Content.Client/Mapping/MappingManager.cs create mode 100644 Content.Client/Mapping/MappingOverlay.cs create mode 100644 Content.Client/Mapping/MappingPrototype.cs create mode 100644 Content.Client/Mapping/MappingPrototypeList.xaml create mode 100644 Content.Client/Mapping/MappingPrototypeList.xaml.cs create mode 100644 Content.Client/Mapping/MappingScreen.xaml create mode 100644 Content.Client/Mapping/MappingScreen.xaml.cs create mode 100644 Content.Client/Mapping/MappingSpawnButton.xaml create mode 100644 Content.Client/Mapping/MappingSpawnButton.xaml.cs create mode 100644 Content.Client/Mapping/MappingState.cs create mode 100644 Content.IntegrationTests/Tests/MappingEditorTest.cs create mode 100644 Content.Server/Mapping/MappingManager.cs create mode 100644 Content.Shared/Mapping/MappingMapDataMessage.cs create mode 100644 Content.Shared/Mapping/MappingSaveMapErrorMessage.cs create mode 100644 Content.Shared/Mapping/MappingSaveMapMessage.cs create mode 100644 Resources/Locale/en-US/mapping/editor.ftl create mode 100644 Resources/Textures/Interface/eraser.svg create mode 100644 Resources/Textures/Interface/eraser.svg.png create mode 100644 Resources/Textures/Interface/eyedropper.svg create mode 100644 Resources/Textures/Interface/eyedropper.svg.png diff --git a/Content.Client/Actions/ActionsSystem.cs b/Content.Client/Actions/ActionsSystem.cs index 7f261f5df2..30f657a2b5 100644 --- a/Content.Client/Actions/ActionsSystem.cs +++ b/Content.Client/Actions/ActionsSystem.cs @@ -293,7 +293,7 @@ namespace Content.Client.Actions continue; var action = _serialization.Read(actionNode, notNullableOverride: true); - var actionId = Spawn(null); + var actionId = Spawn(); AddComp(actionId, action); AddActionDirect(user, actionId); diff --git a/Content.Client/Commands/ActionsCommands.cs b/Content.Client/Commands/ActionsCommands.cs index 3d8e906e09..593b8e8256 100644 --- a/Content.Client/Commands/ActionsCommands.cs +++ b/Content.Client/Commands/ActionsCommands.cs @@ -1,3 +1,4 @@ +using Content.Client.Actions; using Content.Client.Actions; using Content.Client.Mapping; using Content.Shared.Administration; @@ -61,27 +62,3 @@ public sealed class LoadActionsCommand : LocalizedCommands } } } - -[AnyCommand] -public sealed class LoadMappingActionsCommand : LocalizedCommands -{ - [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!; - - public const string CommandName = "loadmapacts"; - - public override string Command => CommandName; - - public override string Help => LocalizationManager.GetString($"cmd-{Command}-help", ("command", Command)); - - public override void Execute(IConsoleShell shell, string argStr, string[] args) - { - try - { - _entitySystemManager.GetEntitySystem().LoadMappingActions(); - } - catch - { - shell.WriteError(LocalizationManager.GetString($"cmd-{Command}-error")); - } - } -} diff --git a/Content.Client/Commands/MappingClientSideSetupCommand.cs b/Content.Client/Commands/MappingClientSideSetupCommand.cs index 39268c6284..eb2d13c954 100644 --- a/Content.Client/Commands/MappingClientSideSetupCommand.cs +++ b/Content.Client/Commands/MappingClientSideSetupCommand.cs @@ -1,6 +1,8 @@ +using Content.Client.Mapping; using Content.Client.Markers; using JetBrains.Annotations; using Robust.Client.Graphics; +using Robust.Client.State; using Robust.Shared.Console; namespace Content.Client.Commands; @@ -10,6 +12,7 @@ internal sealed class MappingClientSideSetupCommand : LocalizedCommands { [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!; [Dependency] private readonly ILightManager _lightManager = default!; + [Dependency] private readonly IStateManager _stateManager = default!; public override string Command => "mappingclientsidesetup"; @@ -21,8 +24,8 @@ internal sealed class MappingClientSideSetupCommand : LocalizedCommands { _entitySystemManager.GetEntitySystem().MarkersVisible = true; _lightManager.Enabled = false; - shell.ExecuteCommand(ShowSubFloorForever.CommandName); - shell.ExecuteCommand(LoadMappingActionsCommand.CommandName); + shell.ExecuteCommand("showsubfloorforever"); + _stateManager.RequestStateChange(); } } } diff --git a/Content.Client/ContextMenu/UI/ContextMenuUIController.cs b/Content.Client/ContextMenu/UI/ContextMenuUIController.cs index 5b156644a7..2d94034bb9 100644 --- a/Content.Client/ContextMenu/UI/ContextMenuUIController.cs +++ b/Content.Client/ContextMenu/UI/ContextMenuUIController.cs @@ -2,6 +2,7 @@ using System.Numerics; using System.Threading; using Content.Client.CombatMode; using Content.Client.Gameplay; +using Content.Client.Mapping; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controllers; using Timer = Robust.Shared.Timing.Timer; @@ -16,7 +17,7 @@ namespace Content.Client.ContextMenu.UI /// /// This largely involves setting up timers to open and close sub-menus when hovering over other menu elements. /// - public sealed class ContextMenuUIController : UIController, IOnStateEntered, IOnStateExited, IOnSystemChanged + public sealed class ContextMenuUIController : UIController, IOnStateEntered, IOnStateExited, IOnSystemChanged, IOnStateEntered, IOnStateExited { public static readonly TimeSpan HoverDelay = TimeSpan.FromSeconds(0.2); @@ -42,18 +43,51 @@ namespace Content.Client.ContextMenu.UI public Action? OnSubMenuOpened; public Action? OnContextKeyEvent; + private bool _setup; + public void OnStateEntered(GameplayState state) { + Setup(); + } + + public void OnStateExited(GameplayState state) + { + Shutdown(); + } + + public void OnStateEntered(MappingState state) + { + Setup(); + } + + public void OnStateExited(MappingState state) + { + Shutdown(); + } + + public void Setup() + { + if (_setup) + return; + + _setup = true; + RootMenu = new(this, null); RootMenu.OnPopupHide += Close; Menus.Push(RootMenu); } - public void OnStateExited(GameplayState state) + public void Shutdown() { + if (!_setup) + return; + + _setup = false; + Close(); RootMenu.OnPopupHide -= Close; RootMenu.Dispose(); + RootMenu = default!; } /// diff --git a/Content.Client/Decals/Overlays/DecalPlacementOverlay.cs b/Content.Client/Decals/Overlays/DecalPlacementOverlay.cs index 845bd7c03d..07b6f57bdb 100644 --- a/Content.Client/Decals/Overlays/DecalPlacementOverlay.cs +++ b/Content.Client/Decals/Overlays/DecalPlacementOverlay.cs @@ -4,6 +4,7 @@ using Robust.Client.Graphics; using Robust.Client.Input; using Robust.Shared.Enums; using Robust.Shared.Map; +using Robust.Shared.Prototypes; namespace Content.Client.Decals.Overlays; @@ -16,7 +17,7 @@ public sealed class DecalPlacementOverlay : Overlay private readonly SharedTransformSystem _transform; private readonly SpriteSystem _sprite; - public override OverlaySpace Space => OverlaySpace.WorldSpace; + public override OverlaySpace Space => OverlaySpace.WorldSpaceEntities; public DecalPlacementOverlay(DecalPlacementSystem placement, SharedTransformSystem transform, SpriteSystem sprite) { @@ -24,6 +25,7 @@ public sealed class DecalPlacementOverlay : Overlay _placement = placement; _transform = transform; _sprite = sprite; + ZIndex = 1000; } protected override void Draw(in OverlayDrawArgs args) @@ -55,7 +57,7 @@ public sealed class DecalPlacementOverlay : Overlay if (snap) { - localPos = (Vector2) localPos.Floored() + grid.TileSizeHalfVector; + localPos = localPos.Floored() + grid.TileSizeHalfVector; } // Nothing uses snap cardinals so probably don't need preview? diff --git a/Content.Client/IoC/ClientContentIoC.cs b/Content.Client/IoC/ClientContentIoC.cs index 328cf41d0d..1fd237cf3e 100644 --- a/Content.Client/IoC/ClientContentIoC.cs +++ b/Content.Client/IoC/ClientContentIoC.cs @@ -4,23 +4,23 @@ using Content.Client.Chat.Managers; using Content.Client.Clickable; using Content.Client.DebugMon; using Content.Client.Eui; +using Content.Client.Fullscreen; using Content.Client.GhostKick; +using Content.Client.Guidebook; using Content.Client.Launcher; +using Content.Client.Mapping; using Content.Client.Parallax.Managers; using Content.Client.Players.PlayTimeTracking; +using Content.Client.Replay; using Content.Client.Screenshot; -using Content.Client.Fullscreen; using Content.Client.Stylesheets; using Content.Client.Viewport; using Content.Client.Voting; using Content.Shared.Administration.Logs; -using Content.Client.Guidebook; using Content.Client.Lobby; -using Content.Client.Replay; using Content.Shared.Administration.Managers; using Content.Shared.Players.PlayTimeTracking; - namespace Content.Client.IoC { internal static class ClientContentIoC @@ -49,6 +49,7 @@ namespace Content.Client.IoC collection.Register(); collection.Register(); collection.Register(); + collection.Register(); collection.Register(); } } diff --git a/Content.Client/Mapping/MappingActionsButton.xaml b/Content.Client/Mapping/MappingActionsButton.xaml new file mode 100644 index 0000000000..099719a70e --- /dev/null +++ b/Content.Client/Mapping/MappingActionsButton.xaml @@ -0,0 +1,8 @@ + + + diff --git a/Content.Client/Mapping/MappingActionsButton.xaml.cs b/Content.Client/Mapping/MappingActionsButton.xaml.cs new file mode 100644 index 0000000000..1a2f2c069f --- /dev/null +++ b/Content.Client/Mapping/MappingActionsButton.xaml.cs @@ -0,0 +1,15 @@ +using Robust.Client.AutoGenerated; +using Robust.Client.UserInterface.Controls; +using Robust.Client.UserInterface.XAML; + +namespace Content.Client.Mapping; + +[GenerateTypedNameReferences] +public sealed partial class MappingActionsButton : Button +{ + public MappingActionsButton() + { + RobustXamlLoader.Load(this); + } +} + diff --git a/Content.Client/Mapping/MappingDoNotMeasure.xaml b/Content.Client/Mapping/MappingDoNotMeasure.xaml new file mode 100644 index 0000000000..08909636ee --- /dev/null +++ b/Content.Client/Mapping/MappingDoNotMeasure.xaml @@ -0,0 +1,4 @@ + + diff --git a/Content.Client/Mapping/MappingDoNotMeasure.xaml.cs b/Content.Client/Mapping/MappingDoNotMeasure.xaml.cs new file mode 100644 index 0000000000..c4cb560234 --- /dev/null +++ b/Content.Client/Mapping/MappingDoNotMeasure.xaml.cs @@ -0,0 +1,21 @@ +using System.Numerics; +using Robust.Client.AutoGenerated; +using Robust.Client.UserInterface; +using Robust.Client.UserInterface.XAML; + +namespace Content.Client.Mapping; + +[GenerateTypedNameReferences] +public sealed partial class MappingDoNotMeasure : Control +{ + public MappingDoNotMeasure() + { + RobustXamlLoader.Load(this); + } + + protected override Vector2 MeasureOverride(Vector2 availableSize) + { + return Vector2.Zero; + } +} + diff --git a/Content.Client/Mapping/MappingManager.cs b/Content.Client/Mapping/MappingManager.cs new file mode 100644 index 0000000000..1aac02be71 --- /dev/null +++ b/Content.Client/Mapping/MappingManager.cs @@ -0,0 +1,69 @@ +using System.IO; +using System.Text; +using System.Threading.Tasks; +using Content.Shared.Mapping; +using Robust.Client.UserInterface; +using Robust.Shared.Network; + +namespace Content.Client.Mapping; + +public sealed class MappingManager : IPostInjectInit +{ + [Dependency] private readonly IFileDialogManager _file = default!; + [Dependency] private readonly IClientNetManager _net = default!; + + private Stream? _saveStream; + private MappingMapDataMessage? _mapData; + + public void PostInject() + { + _net.RegisterNetMessage(); + _net.RegisterNetMessage(OnSaveError); + _net.RegisterNetMessage(OnMapData); + } + + private void OnSaveError(MappingSaveMapErrorMessage message) + { + _saveStream?.DisposeAsync(); + _saveStream = null; + } + + private async void OnMapData(MappingMapDataMessage message) + { + if (_saveStream == null) + { + _mapData = message; + return; + } + + await _saveStream.WriteAsync(Encoding.ASCII.GetBytes(message.Yml)); + await _saveStream.DisposeAsync(); + + _saveStream = null; + _mapData = null; + } + + public async Task SaveMap() + { + if (_saveStream != null) + await _saveStream.DisposeAsync(); + + var request = new MappingSaveMapMessage(); + _net.ClientSendMessage(request); + + var path = await _file.SaveFile(); + if (path is not { fileStream: var stream }) + return; + + if (_mapData != null) + { + await stream.WriteAsync(Encoding.ASCII.GetBytes(_mapData.Yml)); + _mapData = null; + await stream.FlushAsync(); + await stream.DisposeAsync(); + return; + } + + _saveStream = stream; + } +} diff --git a/Content.Client/Mapping/MappingOverlay.cs b/Content.Client/Mapping/MappingOverlay.cs new file mode 100644 index 0000000000..ef9f3e795e --- /dev/null +++ b/Content.Client/Mapping/MappingOverlay.cs @@ -0,0 +1,84 @@ +using Robust.Client.GameObjects; +using Robust.Client.Graphics; +using Robust.Client.Input; +using Robust.Client.Player; +using Robust.Client.UserInterface; +using Robust.Shared.Enums; +using Robust.Shared.Prototypes; +using static Content.Client.Mapping.MappingState; + +namespace Content.Client.Mapping; + +public sealed class MappingOverlay : Overlay +{ + [Dependency] private readonly IEntityManager _entities = default!; + [Dependency] private readonly IPlayerManager _player = default!; + [Dependency] private readonly IPrototypeManager _prototypes = default!; + + // 1 off in case something else uses these colors since we use them to compare + private static readonly Color PickColor = new(1, 255, 0); + private static readonly Color DeleteColor = new(255, 1, 0); + + private readonly Dictionary _oldColors = new(); + + private readonly MappingState _state; + private readonly ShaderInstance _shader; + + public override OverlaySpace Space => OverlaySpace.WorldSpace; + + public MappingOverlay(MappingState state) + { + IoCManager.InjectDependencies(this); + + _state = state; + _shader = _prototypes.Index("unshaded").Instance(); + } + + protected override void Draw(in OverlayDrawArgs args) + { + foreach (var (id, color) in _oldColors) + { + if (!_entities.TryGetComponent(id, out SpriteComponent? sprite)) + continue; + + if (sprite.Color == DeleteColor || sprite.Color == PickColor) + sprite.Color = color; + } + + _oldColors.Clear(); + + if (_player.LocalEntity == null) + return; + + var handle = args.WorldHandle; + handle.UseShader(_shader); + + switch (_state.State) + { + case CursorState.Pick: + { + if (_state.GetHoveredEntity() is { } entity && + _entities.TryGetComponent(entity, out SpriteComponent? sprite)) + { + _oldColors[entity] = sprite.Color; + sprite.Color = PickColor; + } + + break; + } + case CursorState.Delete: + { + if (_state.GetHoveredEntity() is { } entity && + _entities.TryGetComponent(entity, out SpriteComponent? sprite)) + { + _oldColors[entity] = sprite.Color; + sprite.Color = DeleteColor; + } + + break; + } + } + + handle.UseShader(null); + } +} diff --git a/Content.Client/Mapping/MappingPrototype.cs b/Content.Client/Mapping/MappingPrototype.cs new file mode 100644 index 0000000000..eff2dfab15 --- /dev/null +++ b/Content.Client/Mapping/MappingPrototype.cs @@ -0,0 +1,39 @@ +using Content.Shared.Decals; +using Content.Shared.Maps; +using Robust.Shared.Prototypes; + +namespace Content.Client.Mapping; + +/// +/// Used to represent a button's data in the mapping editor. +/// +public sealed class MappingPrototype +{ + /// + /// The prototype instance, if any. + /// Can be one of , or + /// If null, this is a top-level button (such as Entities, Tiles or Decals) + /// + public readonly IPrototype? Prototype; + + /// + /// The text to display on the UI for this button. + /// + public readonly string Name; + + /// + /// Which other prototypes (buttons) this one is nested inside of. + /// + public List? Parents; + + /// + /// Which other prototypes (buttons) are nested inside this one. + /// + public List? Children; + + public MappingPrototype(IPrototype? prototype, string name) + { + Prototype = prototype; + Name = name; + } +} diff --git a/Content.Client/Mapping/MappingPrototypeList.xaml b/Content.Client/Mapping/MappingPrototypeList.xaml new file mode 100644 index 0000000000..de311240df --- /dev/null +++ b/Content.Client/Mapping/MappingPrototypeList.xaml @@ -0,0 +1,21 @@ + + + + public (EntityUid Parent, string Slot)? GetParentPartAndSlotOrNull(EntityUid uid) { - if (!Containers.TryGetContainingContainer(uid, out var container)) + if (!Containers.TryGetContainingContainer((uid, null, null), out var container)) return null; var slotId = GetPartSlotContainerIdFromContainer(container.ID); @@ -235,7 +235,7 @@ public partial class SharedBodySystem parentUid = null; parentComponent = null; - if (Containers.TryGetContainingContainer(partUid, out var container) && + if (Containers.TryGetContainingContainer((partUid, null, null), out var container) && TryComp(container.Owner, out parentComponent)) { parentUid = container.Owner; diff --git a/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs b/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs index 897f379156..21afd4e591 100644 --- a/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs +++ b/Content.Shared/Clothing/ClothingSpeedModifierSystem.cs @@ -48,7 +48,7 @@ public sealed class ClothingSpeedModifierSystem : EntitySystem // Avoid raising the event for the container if nothing changed. // We'll still set the values in case they're slightly different but within tolerance. - if (diff && _container.TryGetContainingContainer(uid, out var container)) + if (diff && _container.TryGetContainingContainer((uid, null, null), out var container)) { _movementSpeed.RefreshMovementSpeedModifiers(container.Owner); } @@ -112,7 +112,7 @@ public sealed class ClothingSpeedModifierSystem : EntitySystem // make sentient boots slow or fast too _movementSpeed.RefreshMovementSpeedModifiers(ent); - if (_container.TryGetContainingContainer(ent.Owner, out var container)) + if (_container.TryGetContainingContainer((ent.Owner, null, null), out var container)) { // inventory system will automatically hook into the event raised by this and update accordingly _movementSpeed.RefreshMovementSpeedModifiers(container.Owner); diff --git a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs index 14137b3836..082b040a32 100644 --- a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs +++ b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs @@ -162,7 +162,7 @@ public abstract class ClothingSystem : EntitySystem if (args.Current is ClothingComponentState state) { SetEquippedPrefix(uid, state.EquippedPrefix, component); - if (component.InSlot != null && _containerSys.TryGetContainingContainer(uid, out var container)) + if (component.InSlot != null && _containerSys.TryGetContainingContainer((uid, null, null), out var container)) { CheckEquipmentForLayerHide(uid, container.Owner); } diff --git a/Content.Shared/Clothing/MagbootsSystem.cs b/Content.Shared/Clothing/MagbootsSystem.cs index 88d987aae1..d41f27fefb 100644 --- a/Content.Shared/Clothing/MagbootsSystem.cs +++ b/Content.Shared/Clothing/MagbootsSystem.cs @@ -36,7 +36,7 @@ public sealed class SharedMagbootsSystem : EntitySystem { var (uid, comp) = ent; // only stick to the floor if being worn in the correct slot - if (_container.TryGetContainingContainer(uid, out var container) && + if (_container.TryGetContainingContainer((uid, null, null), out var container) && _inventory.TryGetSlotEntity(container.Owner, comp.Slot, out var worn) && uid == worn) { diff --git a/Content.Shared/Damage/Systems/DamageOnHoldingSystem.cs b/Content.Shared/Damage/Systems/DamageOnHoldingSystem.cs index c13ec0a1b9..78e86f5ab4 100644 --- a/Content.Shared/Damage/Systems/DamageOnHoldingSystem.cs +++ b/Content.Shared/Damage/Systems/DamageOnHoldingSystem.cs @@ -37,7 +37,7 @@ public sealed class DamageOnHoldingSystem : EntitySystem { if (!component.Enabled || component.NextDamage > _timing.CurTime) continue; - if (_container.TryGetContainingContainer(uid, out var container)) + if (_container.TryGetContainingContainer((uid, null, null), out var container)) { _damageableSystem.TryChangeDamage(container.Owner, component.Damage, origin: uid); } diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs index a57796d87c..972fa389e4 100644 --- a/Content.Shared/Interaction/SharedInteractionSystem.cs +++ b/Content.Shared/Interaction/SharedInteractionSystem.cs @@ -1171,7 +1171,7 @@ namespace Content.Shared.Interaction /// public bool CanAccessViaStorage(EntityUid user, EntityUid target) { - if (!_containerSystem.TryGetContainingContainer(target, out var container)) + if (!_containerSystem.TryGetContainingContainer((target, null, null), out var container)) return false; return CanAccessViaStorage(user, target, container); @@ -1197,7 +1197,7 @@ namespace Content.Shared.Interaction if (Deleted(target)) return false; - if (!_containerSystem.TryGetContainingContainer(target, out var container)) + if (!_containerSystem.TryGetContainingContainer((target, null, null), out var container)) return false; var wearer = container.Owner; diff --git a/Content.Shared/Item/SharedItemSystem.cs b/Content.Shared/Item/SharedItemSystem.cs index 5eaa25f484..a058cb8658 100644 --- a/Content.Shared/Item/SharedItemSystem.cs +++ b/Content.Shared/Item/SharedItemSystem.cs @@ -110,8 +110,8 @@ public abstract class SharedItemSystem : EntitySystem // if the item already in a container (that is not the same as the user's), then change the text. // this occurs when the item is in their inventory or in an open backpack - Container.TryGetContainingContainer(args.User, out var userContainer); - if (Container.TryGetContainingContainer(args.Target, out var container) && container != userContainer) + Container.TryGetContainingContainer((args.User, null, null), out var userContainer); + if (Container.TryGetContainingContainer((args.Target, null, null), out var container) && container != userContainer) verb.Text = Loc.GetString("pick-up-verb-get-data-text-inventory"); else verb.Text = Loc.GetString("pick-up-verb-get-data-text"); diff --git a/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs b/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs index 9a7da17d48..866148b113 100644 --- a/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs +++ b/Content.Shared/Materials/SharedMaterialReclaimerSystem.cs @@ -97,7 +97,7 @@ public abstract class SharedMaterialReclaimerSystem : EntitySystem _whitelistSystem.IsBlacklistPass(component.Blacklist, item)) return false; - if (Container.TryGetContainingContainer(item, out _) && !Container.TryRemoveFromContainer(item)) + if (Container.TryGetContainingContainer((item, null, null), out _) && !Container.TryRemoveFromContainer(item)) return false; if (user != null) diff --git a/Content.Shared/Movement/Systems/SharedJetpackSystem.cs b/Content.Shared/Movement/Systems/SharedJetpackSystem.cs index 724eca682f..276aa62032 100644 --- a/Content.Shared/Movement/Systems/SharedJetpackSystem.cs +++ b/Content.Shared/Movement/Systems/SharedJetpackSystem.cs @@ -13,12 +13,12 @@ namespace Content.Shared.Movement.Systems; public abstract class SharedJetpackSystem : EntitySystem { - [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!; - [Dependency] protected readonly SharedAppearanceSystem Appearance = default!; + [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!; + [Dependency] protected readonly SharedAppearanceSystem Appearance = default!; [Dependency] protected readonly SharedContainerSystem Container = default!; - [Dependency] private readonly SharedMoverController _mover = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; - [Dependency] private readonly SharedPhysicsSystem _physics = default!; + [Dependency] private readonly SharedMoverController _mover = default!; + [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private readonly SharedPhysicsSystem _physics = default!; [Dependency] private readonly ActionContainerSystem _actionContainer = default!; public override void Initialize() @@ -158,7 +158,7 @@ public abstract class SharedJetpackSystem : EntitySystem if (user == null) { - Container.TryGetContainingContainer(uid, out var container); + Container.TryGetContainingContainer((uid, null, null), out var container); user = container?.Owner; } diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs index 7a207fb47c..cac3b86ad6 100644 --- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs +++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs @@ -1431,7 +1431,7 @@ public abstract class SharedStorageSystem : EntitySystem private void OnStackCountChanged(EntityUid uid, MetaDataComponent component, StackCountChangedEvent args) { - if (_containerSystem.TryGetContainingContainer(uid, out var container, component) && + if (_containerSystem.TryGetContainingContainer((uid, null, component), out var container) && container.ID == StorageComponent.ContainerId) { UpdateAppearance(container.Owner); diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Clothing.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Clothing.cs index d4aa024f4c..7ef57df539 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Clothing.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Clothing.cs @@ -33,7 +33,7 @@ public partial class SharedGunSystem { slotEntity = null; - if (!Containers.TryGetContainingContainer(uid, out var container)) + if (!Containers.TryGetContainingContainer((uid, null, null), out var container)) return false; var user = container.Owner; From f15cb8b77dd1cbf453af3e500436f5515efdf26f Mon Sep 17 00:00:00 2001 From: Mervill Date: Sun, 4 Aug 2024 03:13:57 -0700 Subject: [PATCH 161/422] Give rotten meat `Trash` and `Recyclable` tag (#30594) --- Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml index bb0f05c181..78f21eab7c 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml @@ -447,6 +447,8 @@ tags: - Raw - Meat + - Trash + - Recyclable - type: Sprite state: rotten - type: SolutionContainerManager From 65d5539248254ada9b28a5705e62025833fa46ca Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 4 Aug 2024 10:15:04 +0000 Subject: [PATCH 162/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 14c8207f46..4c19a3ab6e 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: Blackern5000 - changes: - - message: Burn damage is now half as effective at cauterizing wounds as it was - previously - type: Tweak - id: 6540 - time: '2024-05-06T20:19:57.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27726 - author: Blackern5000 changes: - message: Active lights now deal significantly less burn damage when touched. @@ -3781,3 +3773,10 @@ id: 7039 time: '2024-08-04T03:34:56.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30622 +- author: Mervill + changes: + - message: Rotten Meat can be collected in trash bags and deleted by the recycler + type: Tweak + id: 7040 + time: '2024-08-04T10:13:57.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30594 From 21d0326e130ff0aabf507d5d3b08a3abb4445cce Mon Sep 17 00:00:00 2001 From: JustCone <141039037+JustCone14@users.noreply.github.com> Date: Sun, 4 Aug 2024 19:38:26 +0100 Subject: [PATCH 163/422] Meta Robotics Console (#30652) Adds robotics console to Meta --- Resources/Maps/meta.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Resources/Maps/meta.yml b/Resources/Maps/meta.yml index 473cbbb3a8..82ab0632da 100644 --- a/Resources/Maps/meta.yml +++ b/Resources/Maps/meta.yml @@ -10635,7 +10635,7 @@ entities: pos: -42.5,29.5 parent: 5350 - type: Door - secondsUntilStateChange: -99.68158 + secondsUntilStateChange: -206.70142 state: Opening - type: DeviceLinkSink invokeCounter: 2 @@ -62288,6 +62288,13 @@ entities: rot: 1.5707963267948966 rad pos: 19.5,-38.5 parent: 5350 +- proto: ComputerRoboticsControl + entities: + - uid: 24793 + components: + - type: Transform + pos: 21.5,-34.5 + parent: 5350 - proto: ComputerSalvageExpedition entities: - uid: 1504 From f1b8dcbfba2a14d4cb76483cd4ffb5b434c317e7 Mon Sep 17 00:00:00 2001 From: JustCone <141039037+JustCone14@users.noreply.github.com> Date: Sun, 4 Aug 2024 19:38:45 +0100 Subject: [PATCH 164/422] Cluster Christmas Removal (#30635) No Fun Allowed --- Resources/Maps/cluster.yml | 42 -------------------------------------- 1 file changed, 42 deletions(-) diff --git a/Resources/Maps/cluster.yml b/Resources/Maps/cluster.yml index 32f860cae6..53eb68994e 100644 --- a/Resources/Maps/cluster.yml +++ b/Resources/Maps/cluster.yml @@ -27931,48 +27931,6 @@ entities: - type: Transform pos: -39.356712,-24.532705 parent: 1 -- proto: ClothingOuterSanta - entities: - - uid: 8934 - components: - - type: Transform - pos: 19.401697,12.696105 - parent: 1 - - uid: 9050 - components: - - type: Transform - pos: 19.401697,12.696105 - parent: 1 - - uid: 9051 - components: - - type: Transform - pos: 19.401697,12.696105 - parent: 1 - - uid: 9201 - components: - - type: Transform - pos: 19.401697,12.696105 - parent: 1 - - uid: 9254 - components: - - type: Transform - pos: 19.604822,12.571105 - parent: 1 - - uid: 9255 - components: - - type: Transform - pos: 19.604822,12.571105 - parent: 1 - - uid: 9308 - components: - - type: Transform - pos: 19.604822,12.571105 - parent: 1 - - uid: 9309 - components: - - type: Transform - pos: 19.604822,12.571105 - parent: 1 - proto: ClothingOuterWinterCap entities: - uid: 5926 From 17cececde0180300da7c2e72c416c3788a03cfb8 Mon Sep 17 00:00:00 2001 From: Ubaser <134914314+UbaserB@users.noreply.github.com> Date: Mon, 5 Aug 2024 04:39:18 +1000 Subject: [PATCH 165/422] Update Core (#30633) add --- Resources/Maps/core.yml | 1197 ++++++++++++++++++++++----------------- 1 file changed, 669 insertions(+), 528 deletions(-) diff --git a/Resources/Maps/core.yml b/Resources/Maps/core.yml index 445965e336..8719acd69b 100644 --- a/Resources/Maps/core.yml +++ b/Resources/Maps/core.yml @@ -81,139 +81,139 @@ entities: version: 6 -1,0: ind: -1,0 - tiles: DgAAAAADDgAAAAADJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAADgAAAAACDgAAAAACJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAACDgAAAAAAJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAADgAAAAABJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACHwAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAHwAAAAACegAAAAADegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAABegAAAAADegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAACegAAAAABegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAABXQAAAAADXQAAAAACbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAABfgAAAAAA + tiles: DgAAAAACDgAAAAACJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAADgAAAAACDgAAAAACJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAAADgAAAAADJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAACDgAAAAADJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABHwAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAHwAAAAADegAAAAAAegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAABegAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHwAAAAADegAAAAADegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAALgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAADXQAAAAADXQAAAAADbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAADfgAAAAAA version: 6 0,-1: ind: 0,-1 - tiles: bAAAAAAAbAAAAAAAXQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAADJAAAAAADXQAAAAADXQAAAAADaAAAAAADbAAAAAAAbAAAAAAAXQAAAAACaAAAAAACJAAAAAADJAAAAAADJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAABaAAAAAABJAAAAAAAJAAAAAACJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAADfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAOwAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA + tiles: bAAAAAAAbAAAAAAAXQAAAAACfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAABJAAAAAAAXQAAAAAAXQAAAAAAaAAAAAAAbAAAAAAAbAAAAAAAXQAAAAACaAAAAAACJAAAAAAAJAAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAADaAAAAAADJAAAAAAAJAAAAAADJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAOwAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA version: 6 -1,-1: ind: -1,-1 - tiles: fgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADXQAAAAAAaAAAAAABXQAAAAADXQAAAAADXQAAAAABXQAAAAABXQAAAAABXQAAAAACXQAAAAACfgAAAAAAXQAAAAACbAAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAXQAAAAABfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAACaAAAAAADXQAAAAABbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAADfgAAAAAAJAAAAAABJAAAAAAAJAAAAAAAXQAAAAADJAAAAAADXQAAAAACXQAAAAACaAAAAAACXQAAAAABbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACHwAAAAAAfgAAAAAAXQAAAAADbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMwAAAAAAMwAAAAAAfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAegAAAAACegAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAegAAAAAAegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAegAAAAADegAAAAADegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAADgAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAACDgAAAAABJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: fgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAXQAAAAACaAAAAAADXQAAAAACXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACfgAAAAAAXQAAAAABbAAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABXQAAAAACfgAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAACaAAAAAAAXQAAAAADbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAABfgAAAAAAJAAAAAACJAAAAAADJAAAAAAAXQAAAAADJAAAAAADXQAAAAACXQAAAAADaAAAAAACXQAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACHwAAAAABfgAAAAAAXQAAAAACbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMwAAAAAAMwAAAAAAfgAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAegAAAAADegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAegAAAAADegAAAAACegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAegAAAAACegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAADgAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAAADDgAAAAABJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,-2: ind: -1,-2 - tiles: XQAAAAADXQAAAAACXQAAAAABXQAAAAACXQAAAAADXQAAAAACXQAAAAAAaAAAAAABXQAAAAADXQAAAAACXQAAAAACXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAADaAAAAAABaAAAAAABaAAAAAACaAAAAAACaAAAAAACaAAAAAADaAAAAAADaAAAAAABaAAAAAACaAAAAAACTgAAAAAATgAAAAABaAAAAAAATgAAAAACTgAAAAAAaAAAAAACXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAABXQAAAAADaAAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAABXQAAAAABXQAAAAACXQAAAAACXQAAAAABHwAAAAACfgAAAAAAHwAAAAABfgAAAAAAXQAAAAADfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAADfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAADfgAAAAAAaAAAAAADaAAAAAACXQAAAAACXQAAAAADfgAAAAAAHwAAAAAAHwAAAAADHwAAAAACHwAAAAACHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAACaAAAAAADaAAAAAACXQAAAAAAXQAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAfgAAAAAAaAAAAAABaAAAAAACXQAAAAACJAAAAAABfgAAAAAAHwAAAAADHwAAAAACHwAAAAABaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADXQAAAAADXQAAAAACXQAAAAADXQAAAAABXQAAAAADXQAAAAADXQAAAAACaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAABXQAAAAACTgAAAAABTgAAAAACTgAAAAACXQAAAAABXQAAAAAATgAAAAACfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAJAAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAACJAAAAAADXQAAAAABJAAAAAACJAAAAAACJAAAAAAAfgAAAAAAJAAAAAABJAAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAACfgAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAXQAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADXQAAAAAAaAAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAAD + tiles: XQAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAADXQAAAAADXQAAAAABaAAAAAADXQAAAAADXQAAAAACXQAAAAAAXQAAAAADXQAAAAACXQAAAAADXQAAAAADXQAAAAADaAAAAAACaAAAAAADaAAAAAACaAAAAAADaAAAAAAAaAAAAAADaAAAAAACaAAAAAABaAAAAAAAaAAAAAABTgAAAAACTgAAAAACaAAAAAAATgAAAAACTgAAAAABaAAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAADXQAAAAAAXQAAAAABXQAAAAADaAAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAACHwAAAAAAfgAAAAAAHwAAAAABfgAAAAAAXQAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAADfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAACfgAAAAAAaAAAAAACaAAAAAAAXQAAAAADXQAAAAADfgAAAAAAHwAAAAABHwAAAAADHwAAAAAAHwAAAAAAHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAaAAAAAABaAAAAAABXQAAAAABXQAAAAADfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAADHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACfgAAAAAAaAAAAAAAaAAAAAADXQAAAAAAJAAAAAABfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAABXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAADXQAAAAADaQAAAAAAaQAAAAAAaQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAAAXQAAAAABTgAAAAAATgAAAAADTgAAAAADXQAAAAAAXQAAAAACTgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAAAJAAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAACJAAAAAAAXQAAAAACJAAAAAACJAAAAAAAJAAAAAAAfgAAAAAAJAAAAAABJAAAAAADfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAABfgAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACXQAAAAABfgAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAAAXQAAAAACfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACXQAAAAABaAAAAAACXQAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAACXQAAAAABXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAAD version: 6 0,-2: ind: 0,-2 - tiles: aAAAAAAAaAAAAAACXQAAAAABXQAAAAADaAAAAAAAXQAAAAACXQAAAAACXQAAAAADaAAAAAACXQAAAAAAaAAAAAACXQAAAAACXQAAAAADXQAAAAACXQAAAAAAXQAAAAAATgAAAAAATgAAAAACaAAAAAACaAAAAAABaAAAAAADaAAAAAACaAAAAAABaAAAAAACaAAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAABaAAAAAADXQAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAAAfgAAAAAAHwAAAAAAJAAAAAABJAAAAAABJAAAAAAAJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAADfgAAAAAAHwAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAJAAAAAADegAAAAABfgAAAAAAHwAAAAACHwAAAAACHwAAAAADHwAAAAACJAAAAAAAfgAAAAAAHwAAAAAAJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABegAAAAAAegAAAAACfgAAAAAAHwAAAAADHwAAAAABHwAAAAADHwAAAAAAHwAAAAADfgAAAAAAHwAAAAACJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAegAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABJAAAAAACJAAAAAAAJAAAAAACJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACaAAAAAABXQAAAAAAHwAAAAACfgAAAAAAHwAAAAAAJAAAAAABJAAAAAADJAAAAAABJAAAAAABXQAAAAABXQAAAAADJAAAAAACfgAAAAAAJAAAAAABaAAAAAAAaAAAAAABaAAAAAADXQAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAATgAAAAAATgAAAAADJAAAAAAAfgAAAAAAaAAAAAADaAAAAAAAaAAAAAABaAAAAAADXQAAAAADHwAAAAABHwAAAAABHwAAAAAAHwAAAAACHwAAAAAAHwAAAAAAHwAAAAAAXQAAAAABXQAAAAACXQAAAAACaAAAAAACaAAAAAAAaAAAAAADaAAAAAAAaAAAAAABXQAAAAABHwAAAAACHwAAAAACHwAAAAABHwAAAAABXQAAAAAAXQAAAAABaAAAAAADXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAaAAAAAABaAAAAAADaAAAAAABaAAAAAABXQAAAAACHwAAAAAAHwAAAAACfgAAAAAAHwAAAAABXQAAAAAAXQAAAAADaAAAAAADHwAAAAACHwAAAAABHwAAAAAAfgAAAAAAaAAAAAABaAAAAAADaAAAAAACaAAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAACaAAAAAABaAAAAAACXQAAAAACfgAAAAAAJAAAAAADJAAAAAACJAAAAAAAXQAAAAACXQAAAAABaAAAAAABXQAAAAACXQAAAAACXQAAAAACfgAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAABfgAAAAAAJAAAAAACHwAAAAADHwAAAAAAXQAAAAABXQAAAAACaAAAAAAAXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAJAAAAAACHwAAAAAAHwAAAAACXQAAAAAAXQAAAAABaAAAAAAA + tiles: aAAAAAAAaAAAAAAAXQAAAAADXQAAAAADaAAAAAACXQAAAAABXQAAAAADXQAAAAABaAAAAAABXQAAAAADaAAAAAADXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAADTgAAAAABTgAAAAABaAAAAAACaAAAAAACaAAAAAABaAAAAAAAaAAAAAABaAAAAAACaAAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAAAaAAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAADXQAAAAABfgAAAAAAHwAAAAAAJAAAAAAAJAAAAAABJAAAAAACJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAABfgAAAAAAHwAAAAACJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAJAAAAAADegAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAACHwAAAAAAJAAAAAADfgAAAAAAHwAAAAADJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADegAAAAAAegAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAABHwAAAAABfgAAAAAAHwAAAAACJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAegAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADJAAAAAABJAAAAAAAJAAAAAADJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACaAAAAAABXQAAAAABHwAAAAABfgAAAAAAHwAAAAACJAAAAAABJAAAAAACJAAAAAAAJAAAAAABXQAAAAAAXQAAAAAAJAAAAAAAfgAAAAAAJAAAAAACaAAAAAADaAAAAAAAaAAAAAACXQAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAATgAAAAACTgAAAAADJAAAAAABfgAAAAAAaAAAAAADaAAAAAAAaAAAAAABaAAAAAACXQAAAAACHwAAAAABHwAAAAACHwAAAAADHwAAAAAAHwAAAAACHwAAAAAAHwAAAAADXQAAAAAAXQAAAAABXQAAAAABaAAAAAADaAAAAAADaAAAAAACaAAAAAADaAAAAAACXQAAAAABHwAAAAACHwAAAAAAHwAAAAABHwAAAAABXQAAAAADXQAAAAADaAAAAAAAXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAaAAAAAACaAAAAAADaAAAAAACaAAAAAADXQAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAACXQAAAAADXQAAAAABaAAAAAAAHwAAAAACHwAAAAAAHwAAAAABfgAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAABaAAAAAABaAAAAAABXQAAAAABfgAAAAAAJAAAAAACJAAAAAAAJAAAAAABXQAAAAABXQAAAAADaAAAAAAAXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAJAAAAAACHwAAAAACHwAAAAACXQAAAAAAXQAAAAADaAAAAAADXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAJAAAAAAAHwAAAAADHwAAAAABXQAAAAADXQAAAAAAaAAAAAAD version: 6 1,-2: ind: 1,-2 - tiles: XQAAAAADXQAAAAADaAAAAAADXQAAAAAAaAAAAAACXQAAAAADfgAAAAAAHwAAAAAAaAAAAAADaAAAAAACaAAAAAABaAAAAAADaAAAAAAAHwAAAAACfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAABfgAAAAAAHwAAAAACaAAAAAABaAAAAAABaAAAAAACaAAAAAACaAAAAAADHwAAAAACfgAAAAAAHwAAAAACJAAAAAABHwAAAAADfgAAAAAAXQAAAAACaAAAAAACXQAAAAABfgAAAAAAHwAAAAADaAAAAAAAaAAAAAADaAAAAAABXQAAAAACaAAAAAACHwAAAAAAHwAAAAAAHwAAAAAAJAAAAAACHwAAAAABfgAAAAAAXQAAAAACaAAAAAABXQAAAAABfgAAAAAAHwAAAAADaAAAAAACaAAAAAABaAAAAAABaAAAAAACaAAAAAAAHwAAAAABfgAAAAAAHwAAAAAAJAAAAAADHwAAAAAAfgAAAAAAaAAAAAAAaAAAAAACaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACJAAAAAABHwAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAABJAAAAAACXQAAAAADXQAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAJAAAAAAAHwAAAAAAfgAAAAAAXQAAAAACaAAAAAAAaAAAAAACaAAAAAABaAAAAAACaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAABaAAAAAACXQAAAAADfgAAAAAAHwAAAAACJAAAAAAAHwAAAAADfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACaAAAAAABXQAAAAADfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAABfgAAAAAAXQAAAAACfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAADaAAAAAAAXQAAAAABfgAAAAAAXQAAAAAAfgAAAAAAHwAAAAACHwAAAAACXQAAAAADXQAAAAACXQAAAAADfgAAAAAAXQAAAAACfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAADaAAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAAAaAAAAAABXQAAAAADfgAAAAAAXQAAAAACfgAAAAAAHwAAAAAAJAAAAAADXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAADaAAAAAAAXQAAAAABaAAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAaAAAAAADaAAAAAADaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAABHwAAAAADfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABaAAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAA + tiles: XQAAAAAAXQAAAAABaAAAAAAAXQAAAAAAaAAAAAAAXQAAAAACfgAAAAAAHwAAAAACaAAAAAADaAAAAAABaAAAAAABaAAAAAADaAAAAAABHwAAAAABfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAABXQAAAAABfgAAAAAAHwAAAAAAaAAAAAADaAAAAAAAaAAAAAADaAAAAAABaAAAAAABHwAAAAAAfgAAAAAAHwAAAAAAJAAAAAABHwAAAAACfgAAAAAAXQAAAAABaAAAAAACXQAAAAACfgAAAAAAHwAAAAAAaAAAAAAAaAAAAAABaAAAAAABXQAAAAADaAAAAAACHwAAAAADHwAAAAACHwAAAAACJAAAAAAAHwAAAAADfgAAAAAAXQAAAAADaAAAAAAAXQAAAAABfgAAAAAAHwAAAAADaAAAAAABaAAAAAABaAAAAAABaAAAAAADaAAAAAADHwAAAAABfgAAAAAAHwAAAAAAJAAAAAACHwAAAAABfgAAAAAAaAAAAAAAaAAAAAABaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABJAAAAAADHwAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAAAJAAAAAABXQAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAJAAAAAADHwAAAAABfgAAAAAAXQAAAAACaAAAAAACaAAAAAAAaAAAAAABaAAAAAACaAAAAAACaAAAAAABaAAAAAADaAAAAAABaAAAAAADXQAAAAACfgAAAAAAHwAAAAABJAAAAAAAHwAAAAADfgAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAABXQAAAAABaAAAAAAAXQAAAAACfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAABfgAAAAAAXQAAAAACfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAACaAAAAAADXQAAAAACfgAAAAAAXQAAAAABfgAAAAAAHwAAAAAAHwAAAAACXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAXQAAAAABfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAABaAAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAABaAAAAAAAXQAAAAACfgAAAAAAXQAAAAAAfgAAAAAAHwAAAAAAJAAAAAAAXQAAAAACXQAAAAACXQAAAAADfgAAAAAAHwAAAAABfgAAAAAAAwAAAAAAAwAAAAAAXQAAAAAAaAAAAAABXQAAAAAAaAAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAABaAAAAAABaAAAAAAAaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAABHwAAAAADfgAAAAAAXQAAAAABXQAAAAABXQAAAAACaAAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAA version: 6 1,-1: ind: 1,-1 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAD + tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAD version: 6 -2,-2: ind: -2,-2 - tiles: EgAAAAACXQAAAAAAegAAAAAAegAAAAAAXQAAAAACfgAAAAAAJAAAAAABXQAAAAACXQAAAAAAXQAAAAABXQAAAAACXQAAAAACaAAAAAACXQAAAAABXQAAAAAAXQAAAAADEgAAAAACXQAAAAACegAAAAAAegAAAAACXQAAAAACfgAAAAAAXQAAAAACTgAAAAAATgAAAAAAaAAAAAAATgAAAAAAaAAAAAADaAAAAAADaAAAAAACaAAAAAACaAAAAAABEgAAAAACXQAAAAABegAAAAADegAAAAACXQAAAAABfgAAAAAAXQAAAAAATgAAAAACXQAAAAADXQAAAAACXQAAAAADXQAAAAADaAAAAAADXQAAAAABXQAAAAABXQAAAAABEgAAAAAAXQAAAAABegAAAAADegAAAAACXQAAAAADaAAAAAADXQAAAAAAaAAAAAADXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACEgAAAAADXQAAAAABegAAAAADegAAAAADXQAAAAACaAAAAAAAXQAAAAACTgAAAAADXQAAAAAAXQAAAAAAaAAAAAADHwAAAAAAHwAAAAABJgAAAAABJgAAAAADJgAAAAADEgAAAAABXQAAAAACegAAAAACegAAAAAAXQAAAAAAfgAAAAAAXQAAAAACTgAAAAAAXQAAAAADXQAAAAABaAAAAAABHwAAAAABHwAAAAAATgAAAAAATgAAAAABTgAAAAACXQAAAAADXQAAAAACKAAAAAACKAAAAAADXQAAAAADfgAAAAAAXQAAAAAAaAAAAAADXQAAAAAAXQAAAAABaAAAAAABHwAAAAADHwAAAAAAJgAAAAABJgAAAAABJgAAAAABKAAAAAABKAAAAAABKAAAAAAAKAAAAAADXQAAAAADfgAAAAAAXQAAAAACaAAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAABfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAADXQAAAAACaAAAAAAAXQAAAAACfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAACaAAAAAABfgAAAAAAfgAAAAAAegAAAAABfgAAAAAAegAAAAACfgAAAAAAfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAACaAAAAAAAXQAAAAACfgAAAAAAegAAAAABegAAAAACegAAAAABegAAAAACegAAAAAAfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAABaAAAAAABXQAAAAACfgAAAAAAegAAAAAAegAAAAAAegAAAAABegAAAAAAegAAAAACfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAACegAAAAAAegAAAAACegAAAAADegAAAAADegAAAAADegAAAAADfgAAAAAAQwAAAAAAfgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAABegAAAAADegAAAAACegAAAAADegAAAAADegAAAAADegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAABfgAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADfgAAAAAAfgAAAAAA + tiles: EgAAAAADXQAAAAABegAAAAABegAAAAABXQAAAAADfgAAAAAAJAAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAaAAAAAAAXQAAAAADXQAAAAADXQAAAAADEgAAAAAAXQAAAAACegAAAAABegAAAAADXQAAAAADfgAAAAAAXQAAAAADTgAAAAADTgAAAAACaAAAAAADTgAAAAAAaAAAAAACaAAAAAABaAAAAAAAaAAAAAAAaAAAAAAAEgAAAAABXQAAAAACegAAAAADegAAAAABXQAAAAABfgAAAAAAXQAAAAABTgAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAADaAAAAAADXQAAAAADXQAAAAAAXQAAAAACEgAAAAACXQAAAAADegAAAAAAegAAAAACXQAAAAABaAAAAAAAXQAAAAADaAAAAAACXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAEgAAAAABXQAAAAAAegAAAAAAegAAAAABXQAAAAADaAAAAAADXQAAAAADTgAAAAACXQAAAAADXQAAAAACaAAAAAADHwAAAAACHwAAAAADJgAAAAACJgAAAAABJgAAAAACEgAAAAABXQAAAAABegAAAAACegAAAAABXQAAAAACfgAAAAAAXQAAAAABTgAAAAADXQAAAAAAXQAAAAADaAAAAAAAHwAAAAAAHwAAAAAATgAAAAABTgAAAAADTgAAAAADXQAAAAAAXQAAAAAAKAAAAAABKAAAAAADXQAAAAAAfgAAAAAAXQAAAAACaAAAAAAAXQAAAAAAXQAAAAAAaAAAAAADHwAAAAAAHwAAAAADJgAAAAADJgAAAAABJgAAAAACKAAAAAAAKAAAAAABKAAAAAACKAAAAAADXQAAAAACfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAAAaAAAAAAAXQAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAABaAAAAAACfgAAAAAAfgAAAAAAegAAAAADfgAAAAAAegAAAAADfgAAAAAAfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAACaAAAAAAAXQAAAAABfgAAAAAAegAAAAACegAAAAABegAAAAAAegAAAAADegAAAAACfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAACfgAAAAAAegAAAAACegAAAAADegAAAAADegAAAAABegAAAAACfgAAAAAAQwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAACegAAAAACegAAAAACegAAAAADegAAAAACegAAAAADegAAAAABfgAAAAAAQwAAAAAAfgAAAAAAFgAAAAAAFgAAAAAAFgAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAADegAAAAAAegAAAAAAegAAAAAAegAAAAABegAAAAACegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAADfgAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACfgAAAAAAfgAAAAAA version: 6 -2,-1: ind: -2,-1 - tiles: egAAAAADegAAAAADegAAAAAAegAAAAACegAAAAAAaAAAAAACXQAAAAADaAAAAAABXQAAAAACfgAAAAAAegAAAAABegAAAAAAegAAAAABewAAAAACewAAAAABfgAAAAAATgAAAAACTgAAAAAAKAAAAAAATgAAAAADTgAAAAADaAAAAAAAXQAAAAADaAAAAAAAXQAAAAAAfgAAAAAAegAAAAADegAAAAADegAAAAABewAAAAADewAAAAADbAAAAAAATgAAAAAATgAAAAABKAAAAAAATgAAAAADTgAAAAACaAAAAAACXQAAAAADaAAAAAADXQAAAAADfgAAAAAAegAAAAAAegAAAAADegAAAAABewAAAAACewAAAAACfgAAAAAAegAAAAADegAAAAACegAAAAABegAAAAADegAAAAADaAAAAAACXQAAAAACaAAAAAACXQAAAAABfgAAAAAAegAAAAADegAAAAAAegAAAAACewAAAAAAewAAAAACfgAAAAAAKAAAAAACfgAAAAAAfgAAAAAAKAAAAAACfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAADaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAaAAAAAABfgAAAAAAewAAAAACewAAAAACewAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAAAXQAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAQAAAAAAAfgAAAAAAaAAAAAACfgAAAAAAKAAAAAADKAAAAAABKAAAAAAAfgAAAAAAXQAAAAAAaAAAAAACaAAAAAABXQAAAAACfgAAAAAAHwAAAAACHwAAAAADHwAAAAACQAAAAAAAQAAAAAAAXQAAAAAAfgAAAAAAKAAAAAAAKAAAAAACKAAAAAADfgAAAAAAXQAAAAABXQAAAAADaAAAAAADXQAAAAABfgAAAAAAHwAAAAADHwAAAAABHwAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAAAaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAaAAAAAADaAAAAAABaAAAAAABaAAAAAAAaAAAAAACbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAADaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAJAAAAAABXwAAAAAAXwAAAAACXwAAAAABXQAAAAADXQAAAAAAXQAAAAAAaAAAAAABegAAAAADegAAAAADegAAAAAAegAAAAAAegAAAAADfgAAAAAAXQAAAAACfgAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAABXQAAAAACXQAAAAABXQAAAAABaAAAAAABegAAAAACegAAAAADegAAAAACegAAAAAAegAAAAABfgAAAAAAgQAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAADHwAAAAACXQAAAAACXQAAAAACXQAAAAAAaAAAAAADegAAAAABegAAAAADegAAAAAAegAAAAADegAAAAACfgAAAAAAXQAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAABXQAAAAABXQAAAAADXQAAAAAAaAAAAAACegAAAAABegAAAAAAegAAAAABegAAAAABfgAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAADXQAAAAADXQAAAAABXQAAAAAAXQAAAAADaAAAAAACegAAAAABegAAAAACegAAAAACegAAAAACegAAAAAD + tiles: egAAAAADegAAAAAAegAAAAAAegAAAAAAegAAAAACaAAAAAAAXQAAAAACaAAAAAAAXQAAAAABfgAAAAAAegAAAAABegAAAAABegAAAAADewAAAAADewAAAAABfgAAAAAATgAAAAABTgAAAAABKAAAAAADTgAAAAAATgAAAAACaAAAAAACXQAAAAACaAAAAAACXQAAAAABfgAAAAAAegAAAAABegAAAAABegAAAAADewAAAAAAewAAAAABbAAAAAAATgAAAAADTgAAAAABKAAAAAABTgAAAAACTgAAAAACaAAAAAABXQAAAAABaAAAAAACXQAAAAAAfgAAAAAAegAAAAABegAAAAADegAAAAADewAAAAACewAAAAADfgAAAAAAegAAAAACegAAAAAAegAAAAAAegAAAAAAegAAAAACaAAAAAABXQAAAAACaAAAAAADXQAAAAABfgAAAAAAegAAAAADegAAAAABegAAAAADewAAAAABewAAAAADfgAAAAAAKAAAAAABfgAAAAAAfgAAAAAAKAAAAAABfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAADaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAaAAAAAAAfgAAAAAAewAAAAABewAAAAAAewAAAAACfgAAAAAAXQAAAAAAaAAAAAABXQAAAAACXQAAAAACfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAQAAAAAAAfgAAAAAAaAAAAAACfgAAAAAAKAAAAAACKAAAAAACKAAAAAACfgAAAAAAXQAAAAABaAAAAAAAaAAAAAACXQAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAABQAAAAAAAQAAAAAAAXQAAAAABfgAAAAAAKAAAAAABKAAAAAAAKAAAAAACfgAAAAAAXQAAAAABXQAAAAAAaAAAAAABXQAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAADQAAAAAAAQAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAADaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAaAAAAAACaAAAAAAAaAAAAAABaAAAAAACaAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAABaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABfgAAAAAAJAAAAAABXwAAAAADXwAAAAABXwAAAAAAXQAAAAAAXQAAAAADXQAAAAABaAAAAAAAegAAAAACegAAAAACegAAAAABegAAAAABegAAAAADXQAAAAAAXQAAAAABfgAAAAAAHwAAAAACHwAAAAACHwAAAAAAHwAAAAACXQAAAAABXQAAAAAAXQAAAAADaAAAAAABegAAAAACegAAAAAAegAAAAAAegAAAAAAegAAAAACXQAAAAABXQAAAAACfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAABHwAAAAABXQAAAAACXQAAAAAAXQAAAAACaAAAAAABegAAAAADegAAAAACegAAAAABegAAAAADegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAADHwAAAAADXQAAAAACXQAAAAAAXQAAAAAAaAAAAAACegAAAAAAegAAAAABegAAAAABegAAAAABfgAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAAAaAAAAAAAegAAAAAAegAAAAACegAAAAABegAAAAAAegAAAAAC version: 6 1,0: ind: 1,0 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAADAwAAAAAAAwAAAAAAAwAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAACXQAAAAABaAAAAAACXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAATgAAAAADTgAAAAAAaAAAAAABaAAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAaAAAAAABaAAAAAADaAAAAAAAaAAAAAACaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACTgAAAAACXQAAAAABXQAAAAAAXQAAAAABJAAAAAADJAAAAAACJAAAAAABXQAAAAABXQAAAAAAaAAAAAABXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAADfgAAAAAAfgAAAAAAaAAAAAACaAAAAAAAaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAABaAAAAAABfgAAAAAAJAAAAAADJAAAAAABJAAAAAACXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAABfgAAAAAAJAAAAAACJAAAAAAAJAAAAAACXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAAAXQAAAAADfgAAAAAAJAAAAAADJAAAAAAAJAAAAAAAXQAAAAABXQAAAAAAXQAAAAACfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAACXQAAAAADXQAAAAADXQAAAAABXQAAAAACXQAAAAACXQAAAAABXQAAAAABfgAAAAAAXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAABaAAAAAADaAAAAAABfgAAAAAAaAAAAAAAaAAAAAABXQAAAAADXQAAAAACfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAAAaAAAAAACaAAAAAADHQAAAAACaAAAAAAAaAAAAAACXQAAAAACXQAAAAABfgAAAAAAXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAADaAAAAAADaAAAAAACXQAAAAAAaAAAAAABaAAAAAABXQAAAAAAXQAAAAACfgAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAACaAAAAAADaAAAAAACXQAAAAABaAAAAAABaAAAAAADXQAAAAABXQAAAAAAfgAAAAAAXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAADaAAAAAAAaAAAAAABfgAAAAAAaAAAAAAAaAAAAAABXQAAAAABXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAAA + tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAADaAAAAAAAaAAAAAADaAAAAAACAwAAAAAAAwAAAAAAAwAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAaAAAAAADXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADTgAAAAABTgAAAAACaAAAAAABaAAAAAACbQAAAAAAbQAAAAAAbQAAAAAAaAAAAAADaAAAAAABaAAAAAACaAAAAAADaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABTgAAAAADXQAAAAABXQAAAAADXQAAAAADJAAAAAACJAAAAAACJAAAAAAAXQAAAAAAXQAAAAADaAAAAAADXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAACXQAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAADaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAADaAAAAAAAfgAAAAAAJAAAAAACJAAAAAAAJAAAAAADXQAAAAAAXQAAAAAAXQAAAAABfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAAAfgAAAAAAJAAAAAAAJAAAAAACJAAAAAACXQAAAAADXQAAAAACXQAAAAADXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAAAfgAAAAAAJAAAAAACJAAAAAADJAAAAAACXQAAAAABXQAAAAABXQAAAAABfgAAAAAAXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADfgAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAACXQAAAAABaAAAAAABaAAAAAADfgAAAAAAaAAAAAADaAAAAAAAXQAAAAACXQAAAAACfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAABaAAAAAABaAAAAAACHQAAAAAAaAAAAAACaAAAAAACXQAAAAAAXQAAAAABfgAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAAAXQAAAAAAaAAAAAACaAAAAAAAXQAAAAADaAAAAAABaAAAAAABXQAAAAAAXQAAAAACfgAAAAAAXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAABaAAAAAAAaAAAAAABXQAAAAAAaAAAAAACaAAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAAAXQAAAAADaAAAAAAAaAAAAAADfgAAAAAAaAAAAAADaAAAAAAAXQAAAAAAXQAAAAABfgAAAAAAXQAAAAAAXQAAAAAB version: 6 2,-2: ind: 2,-2 - tiles: HwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAAAfgAAAAAAHwAAAAADHwAAAAAAewAAAAACfgAAAAAAewAAAAAAHwAAAAAAHwAAAAABMwAAAAAAHwAAAAAAHwAAAAABewAAAAADfgAAAAAAHwAAAAADHwAAAAABHwAAAAABHwAAAAACHwAAAAADHwAAAAAAewAAAAABewAAAAAAewAAAAACHwAAAAADHwAAAAAAMwAAAAAAHwAAAAABHwAAAAADewAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAACfgAAAAAAHwAAAAACHwAAAAADewAAAAAAfgAAAAAAewAAAAADHwAAAAAAHwAAAAAAHwAAAAACHwAAAAAAHwAAAAABewAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABewAAAAADewAAAAADewAAAAABewAAAAACewAAAAACewAAAAABfgAAAAAAHwAAAAACHwAAAAAAHwAAAAABfgAAAAAAegAAAAAAegAAAAADegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAACXQAAAAADegAAAAADegAAAAACegAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAXQAAAAABXQAAAAACegAAAAADJAAAAAACfgAAAAAAHwAAAAADXQAAAAAAXQAAAAAAXQAAAAACegAAAAADegAAAAABegAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAABXQAAAAACXQAAAAADXQAAAAADXQAAAAACfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAADfgAAAAAAXQAAAAADXQAAAAADXQAAAAABfgAAAAAAcAAAAAAAcAAAAAADcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAACXQAAAAAAXQAAAAACXQAAAAADfgAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAACaAAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAADXQAAAAACaAAAAAADXQAAAAADTgAAAAADTgAAAAADaAAAAAAATgAAAAABTgAAAAAAaAAAAAAAaAAAAAAATgAAAAADaAAAAAADTgAAAAABTgAAAAACTgAAAAADaAAAAAADTgAAAAACaAAAAAABaAAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAADXQAAAAACXQAAAAABaAAAAAABXQAAAAABXQAAAAACXQAAAAAAaAAAAAADXQAAAAADXQAAAAAAXQAAAAABaAAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAAAfgAAAAAAXQAAAAABaAAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA + tiles: HwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAACfgAAAAAAHwAAAAABHwAAAAADewAAAAABfgAAAAAAewAAAAABHwAAAAACHwAAAAABMwAAAAAAHwAAAAABHwAAAAABewAAAAADfgAAAAAAHwAAAAAAHwAAAAABHwAAAAABHwAAAAADHwAAAAACHwAAAAAAewAAAAABewAAAAAAewAAAAAAHwAAAAADHwAAAAACMwAAAAAAHwAAAAAAHwAAAAACewAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADfgAAAAAAHwAAAAAAHwAAAAAAewAAAAABfgAAAAAAewAAAAAAHwAAAAABHwAAAAACHwAAAAAAHwAAAAAAHwAAAAACewAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABewAAAAACewAAAAACewAAAAADewAAAAADewAAAAABewAAAAACfgAAAAAAHwAAAAABHwAAAAABHwAAAAADfgAAAAAAegAAAAABegAAAAADegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAAAXQAAAAACegAAAAACegAAAAAAegAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAACXQAAAAADXQAAAAACegAAAAAAJAAAAAACfgAAAAAAHwAAAAADXQAAAAAAXQAAAAABXQAAAAABegAAAAACegAAAAABegAAAAACHwAAAAABHwAAAAACHwAAAAABHwAAAAABXQAAAAADXQAAAAACXQAAAAADXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAADfgAAAAAAXQAAAAAAXQAAAAADXQAAAAADfgAAAAAAcAAAAAAAcAAAAAADcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAADXQAAAAABXQAAAAABXQAAAAAAaAAAAAADXQAAAAADXQAAAAABXQAAAAACXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAaAAAAAADXQAAAAADTgAAAAACTgAAAAAAaAAAAAACTgAAAAACTgAAAAAAaAAAAAAAaAAAAAABTgAAAAADaAAAAAAATgAAAAABTgAAAAAATgAAAAADaAAAAAACTgAAAAABaAAAAAACaAAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAACaAAAAAADXQAAAAACXQAAAAADXQAAAAACaAAAAAACXQAAAAADXQAAAAACXQAAAAABaAAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAABfgAAAAAAXQAAAAADaAAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA version: 6 2,-1: ind: 2,-1 - tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAAAaAAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAABfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAACaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAAAaAAAAAAAaAAAAAABaAAAAAACbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACaAAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAADXQAAAAAAfgAAAAAAdQAAAAADdQAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAABfgAAAAAAdQAAAAACdQAAAAACcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAAAfgAAAAAAXQAAAAABaAAAAAABXQAAAAAAfgAAAAAAdQAAAAACdQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAACXQAAAAAAaAAAAAAAXQAAAAADfgAAAAAAdQAAAAACdQAAAAAAcAAAAAADJAAAAAACJAAAAAABJAAAAAABfgAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAfgAAAAAAXQAAAAADTgAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAAAJAAAAAAAfgAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAfgAAAAAAXQAAAAAATgAAAAAAXQAAAAACfgAAAAAAdQAAAAADdQAAAAADfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAABfgAAAAAAaAAAAAACaAAAAAADaAAAAAABaAAAAAAAfgAAAAAAXQAAAAABaAAAAAACXQAAAAAAfgAAAAAAdQAAAAAAdQAAAAACcAAAAAAC + tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAADaAAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAQgAAAAAAQgAAAAAAQgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAADfgAAAAAAXQAAAAABaAAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAAAaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAABaAAAAAABaAAAAAACaAAAAAADbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADaAAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAABfgAAAAAAdQAAAAACdQAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAABXQAAAAABfgAAAAAAdQAAAAABdQAAAAACcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAXQAAAAACaAAAAAACXQAAAAACfgAAAAAAdQAAAAABdQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAACXQAAAAACXQAAAAADaAAAAAAAXQAAAAAAfgAAAAAAdQAAAAACdQAAAAACcAAAAAACJAAAAAADJAAAAAABJAAAAAAAfgAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAfgAAAAAAXQAAAAACTgAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAACJAAAAAAAfgAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAJQAAAAAAfgAAAAAAXQAAAAACTgAAAAACXQAAAAAAfgAAAAAAdQAAAAADdQAAAAACfgAAAAAAHwAAAAAAHwAAAAACHwAAAAAAfgAAAAAAaAAAAAAAaAAAAAABaAAAAAABaAAAAAABfgAAAAAAXQAAAAABaAAAAAACXQAAAAABfgAAAAAAdQAAAAABdQAAAAADcAAAAAAA version: 6 -2,0: ind: -2,0 - tiles: aAAAAAADaAAAAAAAaAAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAADaAAAAAACegAAAAACegAAAAABegAAAAACegAAAAABegAAAAAAaAAAAAACaAAAAAACXwAAAAACXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAACaAAAAAADegAAAAABegAAAAABegAAAAAAegAAAAABegAAAAABaAAAAAADaAAAAAACXwAAAAADXQAAAAADXQAAAAACXQAAAAADXQAAAAACXQAAAAAAXQAAAAACXQAAAAADaAAAAAACegAAAAAAegAAAAABegAAAAAAegAAAAABegAAAAADaAAAAAAAaAAAAAAAaAAAAAADXQAAAAABXQAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAAAXQAAAAAAaAAAAAACegAAAAABegAAAAADegAAAAAAegAAAAABegAAAAACewAAAAABewAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAADAwAAAAAAegAAAAAAegAAAAABegAAAAABegAAAAACXQAAAAABXQAAAAADXQAAAAAAHwAAAAACewAAAAABAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAADXQAAAAACXQAAAAABAwAAAAAAegAAAAACHwAAAAABHwAAAAAAHwAAAAABfgAAAAAAJAAAAAABHwAAAAACHwAAAAACewAAAAABAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAACXQAAAAAAXQAAAAAAAwAAAAAAegAAAAADJAAAAAAAJAAAAAACJAAAAAACfgAAAAAAJAAAAAABHwAAAAABHwAAAAACewAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAADXQAAAAAAXQAAAAACAwAAAAAAegAAAAAAJAAAAAADJAAAAAADJAAAAAADfgAAAAAAJAAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAABaAAAAAAAaAAAAAADaAAAAAAAaAAAAAABaAAAAAADaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAACXQAAAAACaAAAAAABaAAAAAACaAAAAAAAaAAAAAADaAAAAAABaAAAAAADaAAAAAADaAAAAAADbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAABaAAAAAAAfgAAAAAAfgAAAAAAeQAAAAAAeQAAAAACJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAABaAAAAAABXQAAAAACXQAAAAADXQAAAAABaAAAAAABXQAAAAADeQAAAAAAeQAAAAAAeQAAAAADeQAAAAAAeQAAAAABeQAAAAABLgAAAAAALgAAAAAAAQAAAAAAaAAAAAADaAAAAAACAQAAAAADfgAAAAAAXQAAAAABaAAAAAADXQAAAAADfgAAAAAAJAAAAAADeQAAAAAAeQAAAAADeQAAAAAAeQAAAAADfgAAAAAALgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAAQAAAAAAXQAAAAAAXQAAAAADaAAAAAAAXQAAAAABXQAAAAAAYAAAAAABYAAAAAABYAAAAAAAYAAAAAABYAAAAAAAfgAAAAAALgAAAAAAXQAAAAACXQAAAAABPAAAAAAAAQAAAAACXQAAAAADXQAAAAAAaAAAAAAAXQAAAAACXQAAAAAAYAAAAAABYAAAAAADYAAAAAAAYAAAAAADYAAAAAABfgAAAAAALgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAJAAAAAABfgAAAAAAXQAAAAABaAAAAAADXQAAAAABfgAAAAAAYAAAAAACYAAAAAADYAAAAAACYAAAAAABYAAAAAACfgAAAAAAfgAAAAAA + tiles: aAAAAAACaAAAAAACaAAAAAACXQAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAACXQAAAAAAXQAAAAADaAAAAAAAegAAAAABegAAAAAAegAAAAADegAAAAAAegAAAAADaAAAAAADaAAAAAADXwAAAAADXQAAAAACXQAAAAACXQAAAAADXQAAAAADXQAAAAACXQAAAAABXQAAAAABaAAAAAADegAAAAAAegAAAAABegAAAAACegAAAAAAegAAAAADaAAAAAADaAAAAAABXwAAAAABXQAAAAADXQAAAAACXQAAAAABXQAAAAAAXQAAAAABXQAAAAADXQAAAAADaAAAAAAAegAAAAABegAAAAAAegAAAAADegAAAAAAegAAAAADaAAAAAABaAAAAAACaAAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAADaAAAAAADegAAAAADegAAAAACegAAAAACegAAAAAAegAAAAACewAAAAABewAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAACXQAAAAACAwAAAAAAegAAAAAAegAAAAAAegAAAAACegAAAAACXQAAAAABXQAAAAACXQAAAAACHwAAAAACewAAAAADAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAAAXQAAAAABXQAAAAACAwAAAAAAegAAAAACHwAAAAACHwAAAAACHwAAAAADfgAAAAAAJAAAAAAAHwAAAAACHwAAAAAAewAAAAABAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAAAXQAAAAADXQAAAAAAAwAAAAAAegAAAAACJAAAAAABJAAAAAABJAAAAAABfgAAAAAAJAAAAAADHwAAAAAAHwAAAAABewAAAAADAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAADXQAAAAABXQAAAAABAwAAAAAAegAAAAAAJAAAAAACJAAAAAAAJAAAAAABfgAAAAAAJAAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAADaAAAAAABaAAAAAADaAAAAAABaAAAAAADaAAAAAAAaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAACaAAAAAACaAAAAAADaAAAAAABaAAAAAADaAAAAAABaAAAAAADaAAAAAAAaAAAAAADbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAADaAAAAAAAfgAAAAAAfgAAAAAAeQAAAAADeQAAAAACJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACaAAAAAADXQAAAAABXQAAAAABXQAAAAAAaAAAAAAAXQAAAAADeQAAAAACeQAAAAADeQAAAAADeQAAAAAAeQAAAAABeQAAAAACLgAAAAAALgAAAAAAAQAAAAACaAAAAAAAaAAAAAABAQAAAAACfgAAAAAAXQAAAAADaAAAAAADXQAAAAADfgAAAAAAJAAAAAABeQAAAAADeQAAAAACeQAAAAABeQAAAAAAfgAAAAAALgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAAQAAAAADXQAAAAACXQAAAAABaAAAAAAAXQAAAAAAXQAAAAACYAAAAAABYAAAAAACYAAAAAACYAAAAAAAYAAAAAAAfgAAAAAALgAAAAAAXQAAAAACXQAAAAABPAAAAAAAAQAAAAADXQAAAAABXQAAAAAAaAAAAAABXQAAAAACXQAAAAABYAAAAAADYAAAAAACYAAAAAACYAAAAAACYAAAAAABfgAAAAAALgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAJAAAAAABfgAAAAAAXQAAAAACaAAAAAACXQAAAAACfgAAAAAAYAAAAAAAYAAAAAADYAAAAAAAYAAAAAADYAAAAAAAfgAAAAAAfgAAAAAA version: 6 1,-3: ind: 1,-3 - tiles: bQAAAAAAfgAAAAAAJAAAAAAAJAAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAJAAAAAACJAAAAAADfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAADbQAAAAAAbQAAAAAAJAAAAAAAJAAAAAADfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAABHwAAAAAAHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAJAAAAAACJAAAAAACfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAAAHwAAAAACHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAJAAAAAADJAAAAAABfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAABbQAAAAAAbQAAAAAAJAAAAAACJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAABJAAAAAAAJAAAAAABJAAAAAAAJAAAAAADfgAAAAAAHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAADHwAAAAABHwAAAAACHwAAAAABHwAAAAAAfgAAAAAAHwAAAAABHwAAAAAAfgAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAABHwAAAAABHwAAAAACHwAAAAAAHwAAAAADJAAAAAABJAAAAAABJAAAAAADJAAAAAABJAAAAAABfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAAAJAAAAAABJAAAAAACJAAAAAABJAAAAAACfgAAAAAAHwAAAAACHwAAAAACfgAAAAAAJAAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABXQAAAAACXQAAAAABaAAAAAAAXQAAAAADXQAAAAADXQAAAAACfgAAAAAAHwAAAAADaAAAAAADaAAAAAABaAAAAAAAaAAAAAABaAAAAAACHwAAAAADfgAAAAAAHwAAAAABTgAAAAADaAAAAAADaAAAAAACaAAAAAABaAAAAAAAXQAAAAAAfgAAAAAAHwAAAAABaAAAAAAAaAAAAAADaAAAAAAAaAAAAAABaAAAAAABHwAAAAAAfgAAAAAAHwAAAAAA + tiles: bQAAAAAAfgAAAAAAJAAAAAABJAAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAJAAAAAAAJAAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAADbQAAAAAAbQAAAAAAJAAAAAADJAAAAAABfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADHwAAAAABHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAJAAAAAAAJAAAAAADfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAACHwAAAAADHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAJAAAAAACJAAAAAACfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAJAAAAAABJAAAAAAAbQAAAAAAbQAAAAAAJAAAAAACJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAABJAAAAAACJAAAAAABJAAAAAABJAAAAAAAfgAAAAAAHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAADHwAAAAADHwAAAAABHwAAAAADHwAAAAAAfgAAAAAAHwAAAAADHwAAAAABfgAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAHwAAAAACHwAAAAACHwAAAAADHwAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAJAAAAAADfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAACJAAAAAACJAAAAAAAJAAAAAAAJAAAAAACfgAAAAAAHwAAAAADHwAAAAABfgAAAAAAJAAAAAABfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACXQAAAAABXQAAAAAAaAAAAAACXQAAAAACXQAAAAACXQAAAAACfgAAAAAAHwAAAAACaAAAAAAAaAAAAAABaAAAAAABaAAAAAAAaAAAAAAAHwAAAAACfgAAAAAAHwAAAAADTgAAAAAAaAAAAAACaAAAAAABaAAAAAABaAAAAAABXQAAAAABfgAAAAAAHwAAAAADaAAAAAAAaAAAAAAAaAAAAAACaAAAAAAAaAAAAAADHwAAAAACfgAAAAAAHwAAAAAA version: 6 0,-3: ind: 0,-3 - tiles: fQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAACfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAJAAAAAADJAAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADaAAAAAAAaAAAAAABJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADaAAAAAACaAAAAAADJAAAAAADfgAAAAAAXQAAAAADXQAAAAAAHwAAAAACHwAAAAABHwAAAAABJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAAAJAAAAAAAJAAAAAABJAAAAAABfgAAAAAAfgAAAAAAbAAAAAAAHwAAAAABHwAAAAABHwAAAAACJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAaAAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAXQAAAAAAaAAAAAAAaAAAAAADaAAAAAACaAAAAAAATgAAAAACaAAAAAACTgAAAAAAaAAAAAAD + tiles: fQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAADfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABJAAAAAABJAAAAAADJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAaAAAAAACaAAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABaAAAAAADaAAAAAABJAAAAAACfgAAAAAAXQAAAAAAXQAAAAADHwAAAAAAHwAAAAAAHwAAAAABJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAABJAAAAAABJAAAAAACJAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAHwAAAAAAHwAAAAACHwAAAAADJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAAAaAAAAAACXQAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAXQAAAAABaAAAAAABaAAAAAADaAAAAAACaAAAAAABTgAAAAADaAAAAAAATgAAAAACaAAAAAAA version: 6 1,1: ind: 1,1 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAACaAAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAACXQAAAAAAJAAAAAACXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAADXQAAAAABfgAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAAAXQAAAAADaAAAAAADXQAAAAACXQAAAAABaAAAAAAAXQAAAAADfgAAAAAAXQAAAAAAaAAAAAACaAAAAAABaAAAAAAAXQAAAAADaAAAAAACaAAAAAABaAAAAAADXQAAAAABaAAAAAAAaAAAAAADaAAAAAACaAAAAAAAaAAAAAACXQAAAAABfgAAAAAAXQAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAXQAAAAAAaAAAAAACaAAAAAAAaAAAAAACXQAAAAABXQAAAAADaAAAAAAAXQAAAAACXQAAAAAAXQAAAAABJAAAAAAAfgAAAAAAXQAAAAADaAAAAAABaAAAAAACaAAAAAACXQAAAAAAaAAAAAAAaAAAAAADaAAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAAAXQAAAAAAdQAAAAADdAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAAAdAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: fgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAACaAAAAAADfgAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAADXQAAAAAAJAAAAAADXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAADfgAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAABaAAAAAABXQAAAAAAXQAAAAACaAAAAAACXQAAAAABfgAAAAAAXQAAAAACaAAAAAACaAAAAAAAaAAAAAAAXQAAAAADaAAAAAABaAAAAAADaAAAAAABXQAAAAADaAAAAAADaAAAAAACaAAAAAAAaAAAAAABaAAAAAAAXQAAAAACfgAAAAAAXQAAAAADaAAAAAAAaAAAAAAAaAAAAAABXQAAAAACaAAAAAADaAAAAAACaAAAAAABXQAAAAACXQAAAAAAaAAAAAADXQAAAAACXQAAAAABXQAAAAACJAAAAAADfgAAAAAAXQAAAAACaAAAAAADaAAAAAACaAAAAAADXQAAAAABaAAAAAADaAAAAAABaAAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAdQAAAAACdAAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAADXQAAAAACXQAAAAABXQAAAAACXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAABdAAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 0,1: ind: 0,1 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAADaAAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAADXQAAAAACXQAAAAADXQAAAAACXQAAAAACXQAAAAADaAAAAAABaAAAAAACaAAAAAAAaAAAAAADaAAAAAADaAAAAAABaAAAAAAAaAAAAAABaAAAAAABaAAAAAADaAAAAAABaAAAAAAAaAAAAAADaAAAAAADaAAAAAACaAAAAAABXQAAAAABXQAAAAADXQAAAAADaAAAAAACXQAAAAACXQAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAXQAAAAAAXQAAAAADXQAAAAACHwAAAAAAHwAAAAADHwAAAAACfgAAAAAAbAAAAAAAfgAAAAAAdQAAAAACcAAAAAADcAAAAAAAdQAAAAAAdAAAAAAAdAAAAAACdAAAAAADXQAAAAACXQAAAAAAXQAAAAAAHwAAAAACHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADcAAAAAABcAAAAAABdQAAAAACdAAAAAADdAAAAAACdAAAAAAAfgAAAAAAXQAAAAACXQAAAAACHwAAAAABHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdAAAAAADdAAAAAABdAAAAAABfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADdQAAAAADdQAAAAADfgAAAAAAHwAAAAAAHwAAAAADHwAAAAABHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAACHwAAAAACHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAAaAAAAAADfgAAAAAAHwAAAAAAHwAAAAADHwAAAAACHwAAAAABHwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAgQAAAAAAcAAAAAABcAAAAAABaAAAAAADfgAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAABHwAAAAABTwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAALgAAAAAA + tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAABaAAAAAADXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAABaAAAAAADaAAAAAAAaAAAAAAAaAAAAAADaAAAAAAAaAAAAAACaAAAAAACaAAAAAABaAAAAAACaAAAAAADaAAAAAABaAAAAAABaAAAAAACaAAAAAAAaAAAAAAAaAAAAAADXQAAAAAAXQAAAAACXQAAAAADaAAAAAACXQAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAABXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAACHwAAAAABHwAAAAAAHwAAAAACfgAAAAAAbAAAAAAAfgAAAAAAdQAAAAABcAAAAAABcAAAAAAAdQAAAAACdAAAAAAAdAAAAAAAdAAAAAADXQAAAAACXQAAAAABXQAAAAADHwAAAAACHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADcAAAAAAAcAAAAAADdQAAAAACdAAAAAACdAAAAAACdAAAAAAAfgAAAAAAXQAAAAADXQAAAAADHwAAAAAAHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdAAAAAAAdAAAAAABdAAAAAABfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAACdQAAAAADdQAAAAACfgAAAAAAHwAAAAADHwAAAAABHwAAAAACHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAAaAAAAAABfgAAAAAAHwAAAAABHwAAAAADHwAAAAACHwAAAAACHwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAgQAAAAAAcAAAAAABcAAAAAADaAAAAAACfgAAAAAAHwAAAAABHwAAAAACHwAAAAACHwAAAAACHwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAALgAAAAAA version: 6 -1,1: ind: -1,1 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAAAXQAAAAACaAAAAAACXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAADaAAAAAACaAAAAAAAaAAAAAADaAAAAAACaAAAAAADaAAAAAACaAAAAAABaAAAAAAAaAAAAAADaAAAAAAATgAAAAADTgAAAAABaAAAAAACTgAAAAAATgAAAAACaAAAAAABXQAAAAACXQAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAADXQAAAAABaAAAAAABXQAAAAADXQAAAAABXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACfgAAAAAAXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAABfgAAAAAAXQAAAAABXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAADHwAAAAABHwAAAAADXQAAAAAAXQAAAAAAXQAAAAADXQAAAAABfgAAAAAAXQAAAAABXQAAAAADXQAAAAADfgAAAAAAXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAXQAAAAACHwAAAAACHwAAAAADXQAAAAADfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAXQAAAAAAJAAAAAABJAAAAAACXQAAAAAAHwAAAAADHwAAAAABHwAAAAADHwAAAAADHwAAAAACHwAAAAACHwAAAAABHwAAAAADHwAAAAACHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACfgAAAAAAHwAAAAABTgAAAAABTgAAAAACHwAAAAABTgAAAAABTgAAAAACTgAAAAABHwAAAAACTgAAAAABTgAAAAABHwAAAAACXQAAAAAAXQAAAAADXQAAAAACXQAAAAAAJAAAAAACHwAAAAAAHwAAAAADHwAAAAACHwAAAAAAHwAAAAADHwAAAAADHwAAAAADHwAAAAABHwAAAAABHwAAAAAAHwAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAACXQAAAAACHwAAAAADHwAAAAAAHwAAAAAAHwAAAAACHwAAAAACXQAAAAABXQAAAAABXQAAAAABXQAAAAACXQAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAHwAAAAACHwAAAAABHwAAAAABHwAAAAABXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAABJAAAAAACJAAAAAABfgAAAAAAXQAAAAACXQAAAAAAXQAAAAAB + tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAADaAAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAAAXQAAAAACXQAAAAAAaAAAAAAAaAAAAAACaAAAAAAAaAAAAAADaAAAAAACaAAAAAABaAAAAAAAaAAAAAADaAAAAAAAaAAAAAADTgAAAAADTgAAAAABaAAAAAABTgAAAAADTgAAAAAAaAAAAAADXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAACXQAAAAACaAAAAAACXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADfgAAAAAAXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAXQAAAAACXQAAAAABXQAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAAAfgAAAAAAXQAAAAAAHwAAAAABHwAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABfgAAAAAAXQAAAAACXQAAAAADXQAAAAADfgAAAAAAXQAAAAACHwAAAAABHwAAAAABXQAAAAADfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAXQAAAAABJAAAAAACJAAAAAACXQAAAAABHwAAAAABHwAAAAACHwAAAAADHwAAAAACHwAAAAACHwAAAAABHwAAAAADHwAAAAACHwAAAAAAHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAfgAAAAAAHwAAAAACTgAAAAACTgAAAAADHwAAAAADTgAAAAABTgAAAAABTgAAAAABHwAAAAADTgAAAAAATgAAAAACHwAAAAACXQAAAAADXQAAAAACXQAAAAABXQAAAAACJAAAAAACHwAAAAABHwAAAAABHwAAAAAAHwAAAAADHwAAAAAAHwAAAAAAHwAAAAABHwAAAAAAHwAAAAACHwAAAAAAHwAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAABXQAAAAABHwAAAAABHwAAAAABHwAAAAADHwAAAAACHwAAAAADXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAADXQAAAAADXQAAAAADXQAAAAAAXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAACHwAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAADJAAAAAAAJAAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAAD version: 6 -2,1: ind: -2,1 - tiles: AQAAAAADAQAAAAADAQAAAAACJAAAAAABfgAAAAAAXQAAAAADaAAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAaAAAAAABfgAAAAAAXQAAAAACaAAAAAADXQAAAAADKAAAAAABKAAAAAACKAAAAAACKAAAAAAAKAAAAAACKAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAABXwAAAAADXwAAAAADXwAAAAABXwAAAAADXwAAAAAAXwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAACXQAAAAABaAAAAAAAaAAAAAACaAAAAAAAaAAAAAAAaAAAAAACaAAAAAACaAAAAAABaAAAAAAAaAAAAAABaAAAAAACfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAaAAAAAADXwAAAAACXwAAAAAAXwAAAAABXwAAAAADXwAAAAADXwAAAAADaAAAAAADaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACJAAAAAAAKAAAAAABKAAAAAACKAAAAAAAKAAAAAACKAAAAAABKAAAAAADXQAAAAAAaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAACfgAAAAAAegAAAAADegAAAAAAegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAADegAAAAADegAAAAAAegAAAAACegAAAAABbAAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAAAJAAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAAAfgAAAAAAegAAAAABegAAAAAAegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAADJAAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAADJAAAAAADHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAA + tiles: AQAAAAAAAQAAAAADAQAAAAACJAAAAAACfgAAAAAAXQAAAAACaAAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAaAAAAAACfgAAAAAAXQAAAAAAaAAAAAAAXQAAAAAAKAAAAAABKAAAAAADKAAAAAACKAAAAAADKAAAAAABKAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAAAXwAAAAACXwAAAAABXwAAAAABXwAAAAAAXwAAAAAAXwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAACXQAAAAACaAAAAAABaAAAAAABaAAAAAACaAAAAAADaAAAAAACaAAAAAAAaAAAAAADaAAAAAAAaAAAAAACaAAAAAABfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAAAaAAAAAACXwAAAAACXwAAAAADXwAAAAAAXwAAAAAAXwAAAAAAXwAAAAABaAAAAAAAaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABJAAAAAADKAAAAAADKAAAAAAAKAAAAAAAKAAAAAABKAAAAAADKAAAAAABXQAAAAABaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAACfgAAAAAAegAAAAABegAAAAABegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAACegAAAAACegAAAAAAegAAAAADegAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAABJAAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAAAfgAAAAAAegAAAAAAegAAAAACegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAJAAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAADJAAAAAACHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAC version: 6 -1,-3: ind: -1,-3 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXgAAAAABYQAAAAABXgAAAAAAXQAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAYQAAAAADfgAAAAAAggAAAAABfgAAAAAAXgAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAggAAAAAAfgAAAAAAfgAAAAAAggAAAAABfgAAAAAAfgAAAAAAYQAAAAACXQAAAAACfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAggAAAAACgQAAAAAAfgAAAAAAgQAAAAAAggAAAAACfgAAAAAAfgAAAAAAfgAAAAAAggAAAAACYQAAAAAEXgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAgQAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAAAaAAAAAADfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAABfgAAAAAAaAAAAAADaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAaAAAAAADaAAAAAACaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXgAAAAAAYQAAAAADXgAAAAABXQAAAAADfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAYQAAAAAAfgAAAAAAggAAAAABfgAAAAAAXgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAfgAAAAAAggAAAAABfgAAAAAAfgAAAAAAggAAAAACfgAAAAAAfgAAAAAAYQAAAAABXQAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAggAAAAAAgQAAAAAAfgAAAAAAgQAAAAAAggAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAggAAAAABYQAAAAACXgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAgQAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAABaAAAAAACfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAABfgAAAAAAaAAAAAABaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAaAAAAAABaAAAAAADaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAC version: 6 2,-3: ind: 2,-3 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAJAAAAAAAJAAAAAABJAAAAAAAJAAAAAADJAAAAAADJAAAAAAAJAAAAAACJAAAAAADJAAAAAAAJAAAAAABJAAAAAADJAAAAAABJAAAAAAAJAAAAAADJAAAAAABJAAAAAADJAAAAAABJAAAAAAAJAAAAAAAJAAAAAADJAAAAAACJAAAAAACJAAAAAABJAAAAAAAJAAAAAAAJAAAAAADJAAAAAAAJAAAAAABJAAAAAABJAAAAAABJAAAAAABJAAAAAACJAAAAAACJgAAAAACJgAAAAACJgAAAAACJgAAAAACJgAAAAAAJgAAAAADJgAAAAADJgAAAAADJgAAAAAAJgAAAAADJgAAAAACJgAAAAACJAAAAAABJAAAAAABJAAAAAADJgAAAAACJgAAAAAAHwAAAAACHwAAAAAAHwAAAAACHwAAAAABHwAAAAACHwAAAAABHwAAAAACHwAAAAACHwAAAAACJgAAAAAAJgAAAAAAJAAAAAAAJAAAAAACJAAAAAAAJgAAAAAAJgAAAAACHwAAAAACHwAAAAABHwAAAAABHwAAAAADHwAAAAADHwAAAAAAHwAAAAACHwAAAAAAHwAAAAABJgAAAAAAJgAAAAABJAAAAAABHwAAAAABHwAAAAAAJAAAAAAAJAAAAAABHwAAAAADHwAAAAACJAAAAAABJAAAAAAAJAAAAAABJAAAAAABJAAAAAAAHwAAAAAAHwAAAAABJAAAAAADJAAAAAABHwAAAAABHwAAAAABHwAAAAAAJgAAAAADJAAAAAABJAAAAAADJAAAAAABJAAAAAADJAAAAAAAJAAAAAAAJAAAAAAAJAAAAAACJAAAAAAAJAAAAAACJAAAAAACJgAAAAACHwAAAAAB + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABJAAAAAADJAAAAAABJAAAAAACJAAAAAADJAAAAAAAJAAAAAADJAAAAAABJAAAAAAAJAAAAAABJAAAAAABJAAAAAADJAAAAAADJAAAAAABJAAAAAACJAAAAAABJAAAAAABJAAAAAADJAAAAAADJAAAAAADJAAAAAABJAAAAAADJAAAAAADJAAAAAAAJAAAAAAAJAAAAAACJAAAAAABJAAAAAAAJAAAAAAAJAAAAAABJAAAAAAAJAAAAAADJAAAAAADJAAAAAABJgAAAAABJgAAAAAAJgAAAAABJgAAAAADJgAAAAAAJgAAAAAAJgAAAAABJgAAAAABJgAAAAAAJgAAAAADJgAAAAABJgAAAAADJAAAAAACJAAAAAABJAAAAAADJgAAAAABJgAAAAAAHwAAAAAAHwAAAAADHwAAAAABHwAAAAADHwAAAAABHwAAAAACHwAAAAABHwAAAAADHwAAAAADJgAAAAADJgAAAAADJAAAAAAAJAAAAAADJAAAAAACJgAAAAABJgAAAAACHwAAAAADHwAAAAAAHwAAAAACHwAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAACHwAAAAADJgAAAAADJgAAAAADJAAAAAAAHwAAAAABHwAAAAADJAAAAAACJAAAAAAAHwAAAAADHwAAAAADJAAAAAADJAAAAAACJAAAAAADJAAAAAACJAAAAAACHwAAAAADHwAAAAAAJAAAAAABJAAAAAADHwAAAAAAHwAAAAABHwAAAAAAJgAAAAABJAAAAAADJAAAAAADJAAAAAAAJAAAAAADJAAAAAABJAAAAAAAJAAAAAABJAAAAAAAJAAAAAABJAAAAAABJAAAAAABJgAAAAADHwAAAAAC version: 6 3,-2: ind: 3,-2 - tiles: HwAAAAADHwAAAAACfgAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAADHwAAAAACHwAAAAACfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAABHwAAAAADfgAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAXQAAAAABHwAAAAAAHwAAAAABfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAXQAAAAADXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAAAXQAAAAADXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAABaAAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAACXQAAAAACaAAAAAADXQAAAAADXQAAAAACXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAACXQAAAAACXQAAAAABXQAAAAADXQAAAAADaAAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAACJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAABXQAAAAACXQAAAAADXQAAAAACJAAAAAADfgAAAAAAXQAAAAACTgAAAAADTgAAAAACaAAAAAAATgAAAAADTgAAAAACaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAACaAAAAAABaAAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAABXQAAAAACXQAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAAAXQAAAAACXQAAAAABfgAAAAAAXQAAAAAC + tiles: HwAAAAABHwAAAAAAfgAAAAAAHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAAAHwAAAAABHwAAAAABfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAABHwAAAAAAHwAAAAADfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADXQAAAAADHwAAAAAAHwAAAAABfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAXQAAAAABXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAABXQAAAAACXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAABaAAAAAABXQAAAAABXQAAAAADXQAAAAABXQAAAAABXQAAAAADaAAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAAAaAAAAAADXQAAAAACXQAAAAABXQAAAAADXQAAAAADJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAABXQAAAAABXQAAAAADXQAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAACXQAAAAAAXQAAAAAAXQAAAAABJAAAAAADfgAAAAAAXQAAAAADTgAAAAACTgAAAAACaAAAAAABTgAAAAABTgAAAAABaAAAAAABaAAAAAACaAAAAAACaAAAAAACaAAAAAABaAAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAABfgAAAAAAXQAAAAAD version: 6 3,-3: ind: 3,-3 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAACwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAJAAAAAABfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAACHwAAAAADfgAAAAAAfgAAAAAABwAAAAAIBwAAAAAABwAAAAAABwAAAAAABwAAAAALBwAAAAAABwAAAAAAJAAAAAADJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAJAAAAAAAJAAAAAADfgAAAAAAHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAJAAAAAABJAAAAAAAHwAAAAACHwAAAAADHwAAAAAAfgAAAAAAHwAAAAADHwAAAAACOAAAAAAAOAAAAAAAOAAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAKfwAAAAAAJAAAAAADJAAAAAACfgAAAAAAHwAAAAADHwAAAAACfgAAAAAAHwAAAAADHwAAAAAAOAAAAAAAHwAAAAAAOAAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAACHwAAAAAAHwAAAAACfgAAAAAAHwAAAAADHwAAAAAAfgAAAAAAHwAAAAAAHwAAAAADOAAAAAAAOAAAAAAAOAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAfgAAAAAAHwAAAAABHwAAAAABfgAAAAAAHwAAAAADHwAAAAAAHwAAAAABHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAAC + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAACwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAABBwAAAAAABwAAAAALBwAAAAAAJAAAAAADfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAABBwAAAAAABwAAAAAAJAAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAJAAAAAADJAAAAAADfgAAAAAAHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAADJAAAAAACJAAAAAACHwAAAAADHwAAAAADHwAAAAAAfgAAAAAAHwAAAAADHwAAAAABOAAAAAAAOAAAAAAAOAAAAAAAfgAAAAAAfgAAAAAABwAAAAAHBwAAAAAAfwAAAAAAJAAAAAACJAAAAAACfgAAAAAAHwAAAAABHwAAAAABfgAAAAAAHwAAAAAAHwAAAAAAOAAAAAAAHwAAAAABOAAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAALHwAAAAADHwAAAAABfgAAAAAAHwAAAAADHwAAAAABfgAAAAAAHwAAAAADHwAAAAADOAAAAAAAOAAAAAAAOAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADfgAAAAAAHwAAAAABHwAAAAADfgAAAAAAHwAAAAABHwAAAAAAHwAAAAAAHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAAB version: 6 -2,-3: ind: -2,-3 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAegAAAAADegAAAAACegAAAAABegAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAegAAAAACFQAAAAAGegAAAAADegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAFQAAAAACgQAAAAAAFQAAAAAGegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACJAAAAAACfgAAAAAAegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADKAAAAAADKAAAAAABXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAACXQAAAAABXQAAAAACXQAAAAACXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAXQAAAAABKAAAAAAAfgAAAAAAegAAAAAAegAAAAADegAAAAAAegAAAAABegAAAAACegAAAAABegAAAAACegAAAAACegAAAAABegAAAAADegAAAAADfgAAAAAAfgAAAAAAewAAAAACewAAAAACfgAAAAAAegAAAAAAegAAAAACegAAAAAAKAAAAAAAKAAAAAADKAAAAAAAKAAAAAADKAAAAAACKAAAAAABKAAAAAAAKAAAAAAAfgAAAAAAfgAAAAAAewAAAAACewAAAAADfgAAAAAAegAAAAAAegAAAAAAegAAAAABKAAAAAABKAAAAAABKAAAAAADKAAAAAABKAAAAAAAKAAAAAADKAAAAAADKAAAAAACfgAAAAAAfgAAAAAAewAAAAADewAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAABKAAAAAACKAAAAAADKAAAAAADKAAAAAACKAAAAAABKAAAAAADKAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAADegAAAAACegAAAAAAegAAAAABegAAAAACegAAAAACJAAAAAABfgAAAAAAfgAAAAAAKAAAAAAAKAAAAAADKAAAAAADKAAAAAAAXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAACfgAAAAAAbAAAAAAAXQAAAAABXQAAAAAAKAAAAAABKAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAC + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAegAAAAABegAAAAACegAAAAAAegAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAegAAAAACFQAAAAACegAAAAABegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAFQAAAAAFgQAAAAAAFQAAAAAFegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAJAAAAAADfgAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACKAAAAAAAKAAAAAADXQAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAADKAAAAAADfgAAAAAAegAAAAACegAAAAABegAAAAAAegAAAAADegAAAAACegAAAAABegAAAAAAegAAAAADegAAAAADegAAAAAAegAAAAACfgAAAAAAfgAAAAAAewAAAAACewAAAAAAfgAAAAAAegAAAAACegAAAAAAegAAAAABKAAAAAACKAAAAAAAKAAAAAACKAAAAAACKAAAAAABKAAAAAADKAAAAAADKAAAAAACfgAAAAAAfgAAAAAAewAAAAABewAAAAABfgAAAAAAegAAAAABegAAAAABegAAAAACKAAAAAABKAAAAAACKAAAAAADKAAAAAABKAAAAAAAKAAAAAADKAAAAAAAKAAAAAABfgAAAAAAfgAAAAAAewAAAAADewAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAAAKAAAAAAAKAAAAAACKAAAAAAAKAAAAAAAKAAAAAABKAAAAAADKAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAADegAAAAACegAAAAADegAAAAADegAAAAADegAAAAADJAAAAAAAfgAAAAAAfgAAAAAAKAAAAAAAKAAAAAADKAAAAAADKAAAAAACXQAAAAACfgAAAAAAXQAAAAABXQAAAAADXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAABKAAAAAAAKAAAAAACXQAAAAABfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAA version: 6 -3,-1: ind: -3,-1 - tiles: HwAAAAADfgAAAAAAewAAAAADewAAAAABewAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAegAAAAAAegAAAAADegAAAAAAegAAAAAAegAAAAACegAAAAAAegAAAAAAHwAAAAACHwAAAAACHwAAAAAAHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACTgAAAAAATgAAAAAAKAAAAAADTgAAAAACTgAAAAACKAAAAAAAHwAAAAACfgAAAAAAHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACTgAAAAAATgAAAAADKAAAAAABTgAAAAAATgAAAAAAKAAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAACegAAAAAAegAAAAACegAAAAADegAAAAADegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAACfgAAAAAAfgAAAAAAKAAAAAADKAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZQAAAAABZQAAAAAAfgAAAAAAewAAAAAAewAAAAAAewAAAAADfgAAAAAAaAAAAAABKAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAZQAAAAADZQAAAAAAfgAAAAAAKAAAAAACKAAAAAACKAAAAAABfgAAAAAAaAAAAAADKAAAAAABBAAAAAAABAAAAAAABAAAAAAABAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZQAAAAACZQAAAAACfgAAAAAAKAAAAAADKAAAAAACKAAAAAABfgAAAAAAXQAAAAAAXQAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAADfgAAAAAAXQAAAAABXQAAAAABfgAAAAAAXwAAAAACXwAAAAABXwAAAAACXwAAAAAAJAAAAAADfgAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAACXQAAAAABfgAAAAAAXwAAAAADHwAAAAAAHwAAAAAAHwAAAAADHwAAAAADfgAAAAAAXQAAAAAAXQAAAAADJAAAAAACJAAAAAACJAAAAAAAJAAAAAABJAAAAAADXQAAAAACXQAAAAACfgAAAAAAXwAAAAAAHwAAAAACHwAAAAADHwAAAAABHwAAAAADfgAAAAAAXQAAAAADXQAAAAADAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAACXQAAAAABfgAAAAAAXwAAAAABHwAAAAABHwAAAAACHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAACJAAAAAADJAAAAAADJAAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAAA + tiles: HwAAAAABfgAAAAAAewAAAAACewAAAAADewAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAegAAAAAAegAAAAACegAAAAACegAAAAADegAAAAAAegAAAAABegAAAAADHwAAAAADHwAAAAABHwAAAAABHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADTgAAAAABTgAAAAADKAAAAAABTgAAAAAATgAAAAAAKAAAAAAAHwAAAAACfgAAAAAAHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAATgAAAAABTgAAAAACKAAAAAADTgAAAAABTgAAAAAAKAAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAACegAAAAAAegAAAAACegAAAAADegAAAAACegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAABfgAAAAAAfgAAAAAAKAAAAAABKAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZQAAAAADZQAAAAADfgAAAAAAewAAAAAAewAAAAABewAAAAABfgAAAAAAaAAAAAABKAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAZQAAAAAAZQAAAAADfgAAAAAAKAAAAAAAKAAAAAADKAAAAAABfgAAAAAAaAAAAAABKAAAAAADBAAAAAAABAAAAAAABAAAAAAABAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZQAAAAABZQAAAAABfgAAAAAAKAAAAAACKAAAAAADKAAAAAABfgAAAAAAXQAAAAABXQAAAAACBAAAAAAABAAAAAAABAAAAAAABAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABAAAAAAABAAAAAAABAAAAAAABAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAXQAAAAACXQAAAAADfgAAAAAAXwAAAAACXwAAAAADXwAAAAADXwAAAAAAJAAAAAADfgAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAXwAAAAACHwAAAAACHwAAAAACHwAAAAABHwAAAAACfgAAAAAAXQAAAAACXQAAAAADJAAAAAABJAAAAAACJAAAAAACJAAAAAAAJAAAAAACXQAAAAABXQAAAAABfgAAAAAAXwAAAAADHwAAAAABHwAAAAACHwAAAAACHwAAAAAAfgAAAAAAXQAAAAABXQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAABXQAAAAADfgAAAAAAXwAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAJAAAAAABJAAAAAACJAAAAAACJAAAAAAAJAAAAAACXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAC version: 6 -3,0: ind: -3,0 - tiles: ZQAAAAABZQAAAAADZQAAAAACZQAAAAACZQAAAAADXQAAAAAAaAAAAAAAaAAAAAADXQAAAAADXQAAAAADaAAAAAABaAAAAAACaAAAAAADaAAAAAACaAAAAAABXQAAAAAATgAAAAACTgAAAAADaAAAAAADTgAAAAACTgAAAAABaAAAAAAAaAAAAAADaAAAAAADXQAAAAADXQAAAAACXwAAAAAAaAAAAAACaAAAAAACaAAAAAADXwAAAAACaAAAAAAAZQAAAAABZQAAAAABZQAAAAACZQAAAAABZQAAAAABXQAAAAABaAAAAAABaAAAAAACXQAAAAABXQAAAAABXwAAAAADaAAAAAABaAAAAAACaAAAAAAAXwAAAAABaAAAAAACJAAAAAAAJAAAAAADJAAAAAADJAAAAAACJAAAAAADXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAADXQAAAAABaAAAAAACaAAAAAAAaAAAAAACaAAAAAACaAAAAAACaAAAAAABAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAACXQAAAAADfgAAAAAAXQAAAAADXQAAAAABXQAAAAABewAAAAABewAAAAABewAAAAACewAAAAACewAAAAAAJAAAAAACJAAAAAADJAAAAAACJAAAAAAAJAAAAAACXQAAAAACXQAAAAAAfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAewAAAAAAHwAAAAACHwAAAAABHwAAAAAAHwAAAAACXQAAAAACXQAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAADfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAewAAAAAAHwAAAAADHwAAAAADHwAAAAABHwAAAAABXQAAAAADXQAAAAADXQAAAAACXQAAAAABfgAAAAAAXQAAAAADXQAAAAACfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAewAAAAAAHwAAAAABHwAAAAACHwAAAAACHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAJAAAAAABJAAAAAABJAAAAAABJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAHwAAAAADHwAAAAABHwAAAAABbAAAAAAAfgAAAAAAfgAAAAAAewAAAAADewAAAAAAewAAAAACfgAAAAAAaAAAAAADaAAAAAABaAAAAAACAgAAAAAAJAAAAAABJAAAAAADHwAAAAAAHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAewAAAAABewAAAAAAewAAAAADfgAAAAAAaAAAAAACaAAAAAABaAAAAAADAgAAAAAAHwAAAAABHwAAAAADHwAAAAABHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAAQAAAAADPAAAAAAAPAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAACAQAAAAADPAAAAAAAXQAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAQAAAAAAPAAAAAAAPAAAAAAA + tiles: ZQAAAAACZQAAAAADZQAAAAABZQAAAAACZQAAAAACXQAAAAABaAAAAAADaAAAAAAAXQAAAAABXQAAAAAAaAAAAAAAaAAAAAABaAAAAAAAaAAAAAADaAAAAAAAXQAAAAADTgAAAAAATgAAAAACaAAAAAAATgAAAAACTgAAAAABaAAAAAACaAAAAAADaAAAAAACXQAAAAABXQAAAAACXwAAAAADaAAAAAAAaAAAAAABaAAAAAAAXwAAAAACaAAAAAABZQAAAAAAZQAAAAABZQAAAAACZQAAAAAAZQAAAAABXQAAAAABaAAAAAABaAAAAAABXQAAAAABXQAAAAABXwAAAAAAaAAAAAADaAAAAAABaAAAAAACXwAAAAAAaAAAAAACJAAAAAACJAAAAAADJAAAAAACJAAAAAACJAAAAAADXQAAAAAAXQAAAAACfgAAAAAAXQAAAAACXQAAAAABaAAAAAADaAAAAAACaAAAAAABaAAAAAADaAAAAAACaAAAAAABAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAXQAAAAAAXQAAAAACfgAAAAAAXQAAAAADXQAAAAADXQAAAAABewAAAAAAewAAAAAAewAAAAADewAAAAADewAAAAADJAAAAAADJAAAAAAAJAAAAAABJAAAAAADJAAAAAACXQAAAAACXQAAAAABfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAewAAAAADHwAAAAADHwAAAAADHwAAAAABHwAAAAACXQAAAAACXQAAAAADXQAAAAADXQAAAAACXQAAAAACXQAAAAABXQAAAAABfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAewAAAAADHwAAAAABHwAAAAABHwAAAAAAHwAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAADfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAewAAAAABHwAAAAABHwAAAAADHwAAAAABHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAJAAAAAADJAAAAAABJAAAAAAAJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAHwAAAAAAHwAAAAACHwAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAewAAAAAAewAAAAADewAAAAACfgAAAAAAaAAAAAABaAAAAAADaAAAAAAAAgAAAAAAJAAAAAADJAAAAAACHwAAAAADHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAewAAAAABewAAAAADewAAAAAAfgAAAAAAaAAAAAABaAAAAAACaAAAAAADAgAAAAAAHwAAAAADHwAAAAAAHwAAAAACHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAADfgAAAAAAAQAAAAACPAAAAAAAPAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAADAQAAAAAAPAAAAAAAXQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAQAAAAACPAAAAAAAPAAAAAAA version: 6 -3,1: ind: -3,1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAACaAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAADaAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAegAAAAABegAAAAABegAAAAABegAAAAADegAAAAABfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAIwAAAAADfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAegAAAAACegAAAAADegAAAAACegAAAAADegAAAAABfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAIwAAAAACRQAAAAAAIwAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAegAAAAACfgAAAAAAegAAAAADegAAAAAAegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAIwAAAAACfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAgQAAAAAAFQAAAAAGgQAAAAAAegAAAAABegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAgQAAAAAAggAAAAABFQAAAAACegAAAAADfgAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAggAAAAACgQAAAAAAgQAAAAAAgQAAAAAAggAAAAABegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAgQAAAAAAgQAAAAAAggAAAAACgQAAAAAAFQAAAAAGfgAAAAAAegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAFQAAAAAEfgAAAAAAgQAAAAAAegAAAAAAegAAAAADegAAAAACegAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAggAAAAACFQAAAAAAegAAAAABegAAAAAAfgAAAAAAegAAAAAAegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAABaAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAegAAAAAAegAAAAAAegAAAAABegAAAAABegAAAAADfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAIwAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAegAAAAACegAAAAABegAAAAABegAAAAADegAAAAABfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAIwAAAAACRQAAAAAAIwAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAegAAAAADfgAAAAAAegAAAAADegAAAAADegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAIwAAAAADfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAgQAAAAAAFQAAAAAEgQAAAAAAegAAAAADegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAgQAAAAAAggAAAAABFQAAAAAGegAAAAABfgAAAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAggAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAggAAAAACegAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAgQAAAAAAgQAAAAAAggAAAAACgQAAAAAAFQAAAAAFfgAAAAAAegAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAFQAAAAADfgAAAAAAgQAAAAAAegAAAAABegAAAAAAegAAAAAAegAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAggAAAAACFQAAAAACegAAAAAAegAAAAADfgAAAAAAegAAAAABegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA version: 6 -3,-2: ind: -3,-2 - tiles: aAAAAAABaAAAAAADaAAAAAABaAAAAAACXQAAAAADXQAAAAAAfgAAAAAAXQAAAAADegAAAAAAegAAAAADXQAAAAADEgAAAAAAEgAAAAACEgAAAAACEgAAAAADEgAAAAACfgAAAAAAfgAAAAAAJAAAAAACaAAAAAACXQAAAAACXQAAAAACfgAAAAAAXQAAAAAAegAAAAAAegAAAAACXQAAAAAAEgAAAAADEgAAAAABEgAAAAACEgAAAAABEgAAAAACAwAAAAAAAwAAAAAAJAAAAAACaAAAAAADXQAAAAACXQAAAAABfgAAAAAAXQAAAAACegAAAAAAegAAAAABXQAAAAABEgAAAAADEgAAAAAAEgAAAAABEgAAAAABEgAAAAACAwAAAAAAAwAAAAAAJAAAAAABaAAAAAACaAAAAAAAXQAAAAABaAAAAAAAXQAAAAACegAAAAABegAAAAABXQAAAAAAEgAAAAAAEgAAAAADEgAAAAACEgAAAAADEgAAAAABAwAAAAAAAwAAAAAAJAAAAAAAaAAAAAADaAAAAAACXQAAAAADaAAAAAADXQAAAAABegAAAAAAegAAAAAAXQAAAAADEgAAAAADEgAAAAAAEgAAAAADEgAAAAACEgAAAAAAAwAAAAAAAwAAAAAAJAAAAAABaAAAAAADXQAAAAADXQAAAAABfgAAAAAAXQAAAAABegAAAAADegAAAAAAXQAAAAAAEgAAAAABEgAAAAACEgAAAAAAEgAAAAACEgAAAAADfgAAAAAAfgAAAAAAJAAAAAADaAAAAAABXQAAAAACXQAAAAACfgAAAAAAXQAAAAACKAAAAAADKAAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAACXQAAAAACaAAAAAADaAAAAAADaAAAAAADaAAAAAADXQAAAAABXQAAAAAAfgAAAAAAXQAAAAACKAAAAAADKAAAAAABKAAAAAABKAAAAAADKAAAAAAAKAAAAAADKAAAAAABKAAAAAABaAAAAAAAaAAAAAADXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAAAXQAAAAABXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAACXQAAAAABXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAABXQAAAAAAXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAABegAAAAABKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAABegAAAAACKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAABegAAAAACKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAABfgAAAAAAewAAAAAAewAAAAACewAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAACfgAAAAAAewAAAAAAewAAAAABewAAAAADfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAADKAAAAAAC + tiles: aAAAAAADaAAAAAACaAAAAAAAaAAAAAAAXQAAAAAAXQAAAAACfgAAAAAAXQAAAAABegAAAAADegAAAAADXQAAAAABEgAAAAACEgAAAAACEgAAAAACEgAAAAADEgAAAAADfgAAAAAAfgAAAAAAJAAAAAACaAAAAAAAXQAAAAACXQAAAAAAfgAAAAAAXQAAAAABegAAAAADegAAAAADXQAAAAACEgAAAAADEgAAAAACEgAAAAAAEgAAAAACEgAAAAABAwAAAAAAAwAAAAAAJAAAAAACaAAAAAADXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAABegAAAAAAegAAAAABXQAAAAADEgAAAAACEgAAAAADEgAAAAABEgAAAAABEgAAAAAAAwAAAAAAAwAAAAAAJAAAAAADaAAAAAABaAAAAAACXQAAAAAAaAAAAAABXQAAAAABegAAAAADegAAAAABXQAAAAABEgAAAAADEgAAAAABEgAAAAADEgAAAAAAEgAAAAADAwAAAAAAAwAAAAAAJAAAAAACaAAAAAABaAAAAAACXQAAAAAAaAAAAAADXQAAAAAAegAAAAAAegAAAAADXQAAAAABEgAAAAABEgAAAAADEgAAAAAAEgAAAAACEgAAAAABAwAAAAAAAwAAAAAAJAAAAAAAaAAAAAABXQAAAAADXQAAAAADfgAAAAAAXQAAAAADegAAAAAAegAAAAADXQAAAAABEgAAAAAAEgAAAAADEgAAAAABEgAAAAACEgAAAAADfgAAAAAAfgAAAAAAJAAAAAABaAAAAAABXQAAAAADXQAAAAACfgAAAAAAXQAAAAAAKAAAAAADKAAAAAACXQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAACXQAAAAAAaAAAAAADaAAAAAABaAAAAAACaAAAAAADXQAAAAABXQAAAAACfgAAAAAAXQAAAAAAKAAAAAADKAAAAAABKAAAAAACKAAAAAACKAAAAAAAKAAAAAAAKAAAAAABKAAAAAADaAAAAAACaAAAAAAAXQAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAAAXQAAAAADXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAAAXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAAAXQAAAAACXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAABegAAAAABKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAABegAAAAACKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAADegAAAAACKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAADfgAAAAAAewAAAAADewAAAAACewAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAKwAAAAAAfgAAAAAAaQAAAAAAaQAAAAAAQwAAAAAAXQAAAAABfgAAAAAAewAAAAADewAAAAADewAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAAAKAAAAAAC version: 6 -3,-3: ind: -3,-3 - tiles: XQAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAABaAAAAAACXQAAAAABfgAAAAAABwAAAAAABwAAAAAIBwAAAAAAAAAAAAAAfQAAAAAAAAAAAAAATgAAAAAATgAAAAAAaAAAAAAATgAAAAAATgAAAAAAaAAAAAABaAAAAAAAaAAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACXQAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAACfgAAAAAAJAAAAAABJAAAAAABHwAAAAADHwAAAAADfgAAAAAAegAAAAAAaAAAAAACaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAABHwAAAAACHwAAAAACfgAAAAAAegAAAAAAaAAAAAAAXQAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAADHwAAAAAAHwAAAAABfgAAAAAAegAAAAABTgAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAAAXQAAAAACfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAXQAAAAAAfgAAAAAABwAAAAAGBwAAAAAABwAAAAAABwAAAAADBwAAAAAABwAAAAAJBwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAAAXQAAAAADfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAFfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAACXQAAAAACTgAAAAACXQAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAABXQAAAAACaAAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAewAAAAAATgAAAAABXQAAAAABXQAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAewAAAAABTgAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAewAAAAACaAAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABKAAAAAADKAAAAAADKAAAAAAAKAAAAAADKAAAAAADKAAAAAADKAAAAAABKAAAAAACaAAAAAACXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABKAAAAAABKAAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAB + tiles: XQAAAAACXQAAAAABXQAAAAACXQAAAAAAXQAAAAADXQAAAAACXQAAAAADaAAAAAAAXQAAAAABfgAAAAAABwAAAAALBwAAAAAABwAAAAAAAAAAAAAAfQAAAAAAAAAAAAAATgAAAAACTgAAAAACaAAAAAACTgAAAAAATgAAAAABaAAAAAAAaAAAAAACaAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACXQAAAAACXQAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAADXQAAAAABXQAAAAAAfgAAAAAAJAAAAAACJAAAAAABHwAAAAACHwAAAAAAfgAAAAAAegAAAAACaAAAAAAAaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAACHwAAAAACHwAAAAACfgAAAAAAegAAAAACaAAAAAADXQAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAACHwAAAAACHwAAAAAAfgAAAAAAegAAAAAATgAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAABXQAAAAADfgAAAAAABwAAAAAIBwAAAAAABwAAAAAABwAAAAAKBwAAAAAGBwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAaAAAAAACXQAAAAABfgAAAAAABwAAAAAABwAAAAAABwAAAAAFBwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAACXQAAAAADfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAABXQAAAAABTgAAAAAAXQAAAAAAfgAAAAAABwAAAAAIBwAAAAAABwAAAAAABwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAKAAAAAADXQAAAAAAaAAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAewAAAAAATgAAAAAAXQAAAAACXQAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAewAAAAADTgAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAewAAAAADaAAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABKAAAAAAAKAAAAAAAKAAAAAAAKAAAAAACKAAAAAAAKAAAAAABKAAAAAABKAAAAAACaAAAAAACXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADKAAAAAABKAAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAAA version: 6 -4,0: ind: -4,0 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAABaAAAAAAAXQAAAAAAXQAAAAACZQAAAAAAZQAAAAAAZQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAABaAAAAAADaAAAAAACaAAAAAAATgAAAAADTgAAAAAAaAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAACaAAAAAAAXQAAAAADXQAAAAAAZQAAAAADZQAAAAACZQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAABJAAAAAABJAAAAAAAJAAAAAADJAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAADXQAAAAAAXQAAAAABAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAADXQAAAAAAXQAAAAAAJAAAAAADJAAAAAABJAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAACXQAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAADfgAAAAAAXQAAAAACXQAAAAABXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAACfgAAAAAAHwAAAAABHwAAAAAAHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAJAAAAAABJAAAAAAAJAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAABJAAAAAACJAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAACaAAAAAACXQAAAAADXQAAAAACZQAAAAADZQAAAAADZQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAAAaAAAAAABaAAAAAABaAAAAAABTgAAAAACTgAAAAADaAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAAAaAAAAAADXQAAAAADXQAAAAACZQAAAAADZQAAAAABZQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAACXQAAAAADJAAAAAABJAAAAAADJAAAAAABJAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACaAAAAAABXQAAAAADXQAAAAABAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAADXQAAAAAAXQAAAAACJAAAAAACJAAAAAABJAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAACXQAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAACfgAAAAAAXQAAAAABXQAAAAACXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAHwAAAAABHwAAAAABHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAJAAAAAADJAAAAAAAJAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAABJAAAAAABJAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA version: 6 -4,-1: ind: -4,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAADXQAAAAABfgAAAAAAHwAAAAADHwAAAAABHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAACXQAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABaAAAAAADXQAAAAABfgAAAAAAHwAAAAABHwAAAAABHwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAACXQAAAAADfgAAAAAAHwAAAAAAHwAAAAACHwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABTgAAAAACXQAAAAAAXQAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAATgAAAAACXQAAAAACfgAAAAAABAAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACTgAAAAABXQAAAAADfgAAAAAABAAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAAAfgAAAAAABAAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAADaAAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAADXQAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAABXQAAAAADJAAAAAADJAAAAAAAJAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAABXQAAAAABXQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAAAJAAAAAABJAAAAAADJAAAAAABJAAAAAAB + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACTgAAAAABXQAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABTgAAAAAAXQAAAAADfgAAAAAAHwAAAAACHwAAAAADHwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAACfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACTgAAAAADXQAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAATgAAAAADXQAAAAAAXQAAAAACbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACTgAAAAADXQAAAAAAfgAAAAAABAAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABTgAAAAAAXQAAAAABfgAAAAAABAAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAABfgAAAAAABAAAAAAABAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAABaAAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABaAAAAAACXQAAAAABXQAAAAABXQAAAAACXQAAAAACXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAACXQAAAAADXQAAAAACJAAAAAAAJAAAAAABJAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAABXQAAAAAAXQAAAAABAwAAAAAAAwAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAAAXQAAAAABJAAAAAABJAAAAAABJAAAAAAAJAAAAAAC version: 6 -4,-2: ind: -4,-2 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAACaAAAAAACaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAABJAAAAAABfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAAAfgAAAAAAXQAAAAABaAAAAAAAJAAAAAACAwAAAAAAfgAAAAAAfgAAAAAAJAAAAAADHwAAAAADHwAAAAADHwAAAAADfgAAAAAAHwAAAAADHwAAAAAAHwAAAAADHwAAAAADfgAAAAAAXQAAAAADaAAAAAAAJAAAAAACAwAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAADegAAAAAAHwAAAAACHwAAAAADHwAAAAAAHwAAAAADHwAAAAAAHwAAAAADfgAAAAAAXQAAAAADaAAAAAAAJAAAAAAAAwAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAAAegAAAAAAHwAAAAABfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAXQAAAAABaAAAAAACJAAAAAAAAwAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAACegAAAAACHwAAAAADfgAAAAAAaAAAAAABaAAAAAACaAAAAAABaAAAAAACaAAAAAACXQAAAAAAaAAAAAADJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAADfgAAAAAAaAAAAAABaAAAAAAAaAAAAAABaAAAAAACaAAAAAAAXQAAAAACaAAAAAADaAAAAAABaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAADaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAACaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAACXQAAAAABaAAAAAACfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADaAAAAAACaAAAAAACaAAAAAADaAAAAAAAaAAAAAAAaAAAAAACfQAAAAAAfgAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAaAAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAAAXQAAAAADAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAaAAAAAABaAAAAAADaAAAAAADfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAaAAAAAADXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAaAAAAAABXQAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAAD + tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABaAAAAAACaAAAAAABaAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAABJAAAAAACfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAABHwAAAAAAfgAAAAAAXQAAAAAAaAAAAAADJAAAAAABAwAAAAAAfgAAAAAAfgAAAAAAJAAAAAACHwAAAAAAHwAAAAAAHwAAAAACfgAAAAAAHwAAAAADHwAAAAACHwAAAAACHwAAAAABfgAAAAAAXQAAAAACaAAAAAADJAAAAAAAAwAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAABegAAAAADHwAAAAACHwAAAAADHwAAAAAAHwAAAAADHwAAAAADHwAAAAACfgAAAAAAXQAAAAADaAAAAAAAJAAAAAACAwAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAABegAAAAABHwAAAAABfgAAAAAAXQAAAAAAXQAAAAACXQAAAAAAXQAAAAADfgAAAAAAXQAAAAAAaAAAAAABJAAAAAACAwAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAAAegAAAAACHwAAAAADfgAAAAAAaAAAAAADaAAAAAACaAAAAAADaAAAAAADaAAAAAACXQAAAAACaAAAAAACJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAACHwAAAAACfgAAAAAAaAAAAAAAaAAAAAADaAAAAAAAaAAAAAABaAAAAAADXQAAAAAAaAAAAAACaAAAAAACaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAABaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAABaAAAAAADfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAADaAAAAAADaAAAAAADaAAAAAACaAAAAAABaAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAABAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAaAAAAAABaAAAAAAAaAAAAAABfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADaAAAAAAAXQAAAAACfgAAAAAAXQAAAAACXQAAAAADXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABaAAAAAADXQAAAAACfgAAAAAAXQAAAAACXQAAAAACXQAAAAAB version: 6 -4,-3: ind: -4,-3 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAADXQAAAAABXQAAAAACXQAAAAACXQAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACaAAAAAABaAAAAAAAaAAAAAADTgAAAAADTgAAAAAAaAAAAAAATgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAACXgAAAAAAXQAAAAADXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAAAXgAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXgAAAAAAXgAAAAABXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACYQAAAAAAYQAAAAAEXgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACaAAAAAACXQAAAAABXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADaAAAAAABaAAAAAACaAAAAAABTgAAAAACTgAAAAADaAAAAAACTgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAACAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXgAAAAABXQAAAAADXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAXQAAAAACAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAACXgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACXgAAAAABXgAAAAABXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAYQAAAAAEYQAAAAADXgAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAD version: 6 2,0: ind: 2,0 - tiles: HwAAAAACHwAAAAADHwAAAAACfgAAAAAAaAAAAAAAaAAAAAABaAAAAAABfgAAAAAAfgAAAAAAaAAAAAACaAAAAAACaAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABXQAAAAABaAAAAAABXQAAAAABdQAAAAABdQAAAAAAdQAAAAABfgAAAAAAXQAAAAABXQAAAAABXQAAAAACJAAAAAAAXQAAAAAAXQAAAAADXQAAAAADaAAAAAACXQAAAAAAXQAAAAADTgAAAAACXQAAAAAAdQAAAAACdQAAAAACdQAAAAAAfgAAAAAAaAAAAAADaAAAAAACaAAAAAABaAAAAAACTgAAAAABTgAAAAACaAAAAAAAaAAAAAAAaAAAAAACTgAAAAADTgAAAAABXQAAAAADdQAAAAACdQAAAAACaAAAAAADfgAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAaAAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAdQAAAAACdQAAAAAAdQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAABcAAAAAABcAAAAAAAcAAAAAACcAAAAAACcAAAAAACfgAAAAAAXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAADfgAAAAAAXQAAAAACfgAAAAAAcAAAAAABcAAAAAAAcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAdQAAAAAAdQAAAAADcAAAAAAAcAAAAAAAcAAAAAABcAAAAAABcAAAAAADdQAAAAACXQAAAAABXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAdQAAAAADdQAAAAACTgAAAAACcAAAAAABdQAAAAAAcAAAAAADTgAAAAABdQAAAAADXQAAAAACXQAAAAABXQAAAAADbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAABcAAAAAADcAAAAAADcAAAAAABcAAAAAAAcAAAAAADdQAAAAADXQAAAAADXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADdAAAAAACdQAAAAABdQAAAAABdQAAAAAAdAAAAAABdQAAAAAAfgAAAAAAXQAAAAABegAAAAAAegAAAAABegAAAAABegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADdAAAAAACdQAAAAAAdQAAAAACdQAAAAABdAAAAAACJAAAAAADXQAAAAABXQAAAAADegAAAAACegAAAAABegAAAAABegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAAAcAAAAAAAcAAAAAABcAAAAAABcAAAAAACcAAAAAADcAAAAAAAfgAAAAAAXQAAAAACegAAAAABegAAAAADegAAAAACegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAADJAAAAAACHwAAAAAAJAAAAAAAfgAAAAAAXQAAAAACegAAAAADegAAAAABegAAAAABegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAAAJAAAAAADTwAAAAAATwAAAAAA + tiles: HwAAAAABHwAAAAABHwAAAAAAfgAAAAAAaAAAAAADaAAAAAACaAAAAAACfgAAAAAAfgAAAAAAaAAAAAADaAAAAAAAaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABXQAAAAACaAAAAAADXQAAAAABdQAAAAACdQAAAAABdQAAAAACfgAAAAAAXQAAAAAAXQAAAAADXQAAAAABJAAAAAADXQAAAAACXQAAAAAAXQAAAAAAaAAAAAACXQAAAAABXQAAAAADTgAAAAACXQAAAAACdQAAAAADdQAAAAADdQAAAAADfgAAAAAAaAAAAAADaAAAAAACaAAAAAACaAAAAAABTgAAAAABTgAAAAABaAAAAAACaAAAAAADaAAAAAADTgAAAAABTgAAAAACXQAAAAADdQAAAAACdQAAAAABaAAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAaAAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAABdQAAAAACdQAAAAAAdQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADcAAAAAAAcAAAAAAAcAAAAAACcAAAAAADcAAAAAACcAAAAAADfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADfgAAAAAAbAAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAXQAAAAADfgAAAAAAcAAAAAABcAAAAAACcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAdQAAAAAAdQAAAAABcAAAAAABcAAAAAABcAAAAAAAcAAAAAADcAAAAAABdQAAAAADXQAAAAADXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAdQAAAAAAdQAAAAAATgAAAAADcAAAAAAAdQAAAAAAcAAAAAAATgAAAAADdQAAAAACXQAAAAABXQAAAAADXQAAAAABbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAACcAAAAAACcAAAAAABcAAAAAADcAAAAAABcAAAAAADdQAAAAABXQAAAAABXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAACdAAAAAADdQAAAAAAdQAAAAABdQAAAAACdAAAAAABdQAAAAAAfgAAAAAAXQAAAAAAegAAAAAAegAAAAABegAAAAABegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAACdAAAAAADdQAAAAABdQAAAAADdQAAAAABdAAAAAADJAAAAAACXQAAAAAAXQAAAAACegAAAAADegAAAAACegAAAAACegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAACcAAAAAABcAAAAAADcAAAAAACcAAAAAABcAAAAAAAcAAAAAAAfgAAAAAAXQAAAAACegAAAAACegAAAAACegAAAAABegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAABJAAAAAABHwAAAAACJAAAAAABfgAAAAAAXQAAAAADegAAAAAAegAAAAACegAAAAACegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAACJAAAAAADTwAAAAAATwAAAAAA version: 6 -5,-2: ind: -5,-2 @@ -221,71 +221,71 @@ entities: version: 6 0,2: ind: 0,2 - tiles: fgAAAAAAfgAAAAAATwAAAAAAHwAAAAACHwAAAAAAHwAAAAAAHwAAAAADTwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAHwAAAAABHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAABbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAABfgAAAAAAdAAAAAACdAAAAAACdQAAAAADfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAACfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAABfgAAAAAAHwAAAAADHwAAAAACHwAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAACfgAAAAAAHwAAAAABHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABHwAAAAABHwAAAAADHwAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: fgAAAAAAfgAAAAAATwAAAAAAHwAAAAADHwAAAAABHwAAAAAAHwAAAAADTwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAATwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAHwAAAAABHwAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAABbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAACfgAAAAAAdAAAAAADdAAAAAACdQAAAAABfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAADfgAAAAAAHwAAAAAAHwAAAAACHwAAAAACfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADHwAAAAACHwAAAAAAHwAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABHwAAAAADHwAAAAABHwAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABHwAAAAACHwAAAAADHwAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,2: ind: -1,2 - tiles: HwAAAAAAHwAAAAAAewAAAAADewAAAAADewAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAACXQAAAAABJAAAAAADJAAAAAACfgAAAAAAXQAAAAADXQAAAAACXQAAAAADfgAAAAAAHwAAAAACewAAAAACewAAAAACewAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAACXQAAAAABHwAAAAAAHwAAAAADfgAAAAAAHwAAAAACHwAAAAABHwAAAAADfgAAAAAAHwAAAAABewAAAAADewAAAAABewAAAAADXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADHwAAAAABXQAAAAADfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAACHwAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAHwAAAAADHwAAAAABHwAAAAADHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAACdAAAAAADdAAAAAABfgAAAAAAHwAAAAACHwAAAAAAHwAAAAACHwAAAAACgQAAAAAAHwAAAAABHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAACfgAAAAAAJAAAAAACJAAAAAABJAAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAADfgAAAAAAXQAAAAABXQAAAAACXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAACXQAAAAADXQAAAAAAXQAAAAABXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAACXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAADXQAAAAABXQAAAAACXQAAAAAAXQAAAAAA + tiles: HwAAAAABHwAAAAAAewAAAAADewAAAAAAewAAAAACXQAAAAABXQAAAAABXQAAAAACXQAAAAADXQAAAAABJAAAAAABJAAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAADfgAAAAAAHwAAAAACewAAAAABewAAAAABewAAAAACXQAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAADHwAAAAACHwAAAAABfgAAAAAAHwAAAAAAHwAAAAADHwAAAAABfgAAAAAAHwAAAAABewAAAAAAewAAAAABewAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAADHwAAAAADHwAAAAABfgAAAAAAHwAAAAADHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABHwAAAAABXQAAAAABfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAAAHwAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADHwAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADdAAAAAADdAAAAAADfgAAAAAAHwAAAAAAHwAAAAACHwAAAAACHwAAAAAAgQAAAAAAHwAAAAADHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAACfgAAAAAAJAAAAAAAJAAAAAACJAAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAABfgAAAAAAXQAAAAACXQAAAAABXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAABXQAAAAADXQAAAAADXQAAAAAAXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAACXQAAAAADXQAAAAABXQAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAACXQAAAAABXQAAAAABXQAAAAACXQAAAAAD version: 6 -2,2: ind: -2,2 - tiles: fQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADXQAAAAACfgAAAAAAHwAAAAACHwAAAAAAHwAAAAABHwAAAAABHwAAAAAAHwAAAAAAfgAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAHwAAAAADHwAAAAAAHwAAAAADHwAAAAAAHwAAAAABHwAAAAACfgAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAACXQAAAAAAXQAAAAABXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAACAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAA + tiles: fQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABXQAAAAACfgAAAAAAHwAAAAADHwAAAAADHwAAAAAAHwAAAAADHwAAAAABHwAAAAADfgAAAAAAXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAHwAAAAADHwAAAAACHwAAAAACHwAAAAADHwAAAAACHwAAAAACfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAABXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAADAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAHwAAAAACAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,3: ind: -1,3 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAJAAAAAABXQAAAAABXQAAAAAAXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAADHwAAAAABHwAAAAACXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACJAAAAAADXQAAAAACXQAAAAACXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAACHwAAAAABHwAAAAADXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 0,3: ind: 0,3 - tiles: XQAAAAAAHwAAAAABHwAAAAACJAAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABHwAAAAABHwAAAAABXQAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: XQAAAAABHwAAAAAAHwAAAAACJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABHwAAAAACHwAAAAAAXQAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 2,1: ind: 2,1 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAACJAAAAAACTwAAAAAATwAAAAAAfgAAAAAAJAAAAAACHwAAAAAAHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAADHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACTgAAAAADTgAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAAATgAAAAADTgAAAAACHwAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAACHwAAAAAAaAAAAAAAHwAAAAACHwAAAAACHwAAAAACHwAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAMAAAAAAAMAAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAADHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAADJAAAAAADTwAAAAAATwAAAAAAfgAAAAAAJAAAAAADHwAAAAAAHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAAAHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACTgAAAAACTgAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAAATgAAAAABTgAAAAADHwAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAABHwAAAAABaAAAAAACHwAAAAABHwAAAAADHwAAAAAAHwAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAMAAAAAAAMAAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAAAHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 3,0: ind: 3,0 - tiles: fgAAAAAAdQAAAAACdQAAAAACdQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACcAAAAAADfgAAAAAAdQAAAAADdQAAAAACdQAAAAACcAAAAAABdQAAAAACcAAAAAABfgAAAAAAcAAAAAACcAAAAAAAdQAAAAADdQAAAAAAdQAAAAABfgAAAAAAcAAAAAACdQAAAAACdQAAAAABdQAAAAADdQAAAAAAdQAAAAAAcAAAAAADdQAAAAAAcAAAAAABcAAAAAACcAAAAAAAcAAAAAABdQAAAAABdQAAAAACdQAAAAAAdQAAAAAAdQAAAAADdQAAAAABcAAAAAAAcAAAAAACcAAAAAABdQAAAAAAcAAAAAACdQAAAAABcAAAAAADcAAAAAACcAAAAAACcAAAAAAAdQAAAAABdQAAAAAAdQAAAAAAfgAAAAAAcAAAAAACdQAAAAACdQAAAAABdQAAAAABdQAAAAABdQAAAAACcAAAAAAAdQAAAAACcAAAAAABfgAAAAAAcAAAAAAAcAAAAAADdQAAAAAAdQAAAAADdQAAAAACfgAAAAAAcAAAAAAAcAAAAAADfgAAAAAAdQAAAAADdQAAAAAAdQAAAAAAcAAAAAAAdQAAAAACJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAdQAAAAADcAAAAAADfgAAAAAAcAAAAAACcAAAAAAAcAAAAAABcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAABcAAAAAABdQAAAAADcAAAAAAAcAAAAAAAcAAAAAACdQAAAAADdQAAAAAAdQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAAAdQAAAAADdQAAAAAAcAAAAAADfgAAAAAAcAAAAAACdQAAAAAAdQAAAAACdQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAdQAAAAAAcAAAAAAAdQAAAAABcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAABfgAAAAAAcAAAAAAAdQAAAAABcAAAAAABfgAAAAAAJAAAAAADHwAAAAABHwAAAAABHwAAAAADHwAAAAADegAAAAADegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAcAAAAAACdQAAAAAAcAAAAAABcAAAAAABcAAAAAABHwAAAAABHwAAAAACHwAAAAADfgAAAAAAegAAAAACegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAdQAAAAACcAAAAAACfgAAAAAAcAAAAAAAHwAAAAABHwAAAAACHwAAAAABfgAAAAAAegAAAAABegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABcAAAAAAAdQAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAACdQAAAAABdQAAAAAAdQAAAAABcAAAAAABcAAAAAADcAAAAAABdQAAAAADcAAAAAADcAAAAAACcAAAAAACcAAAAAAAcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAACdQAAAAAAdQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAdQAAAAABdQAAAAABdQAAAAACcAAAAAACfgAAAAAAfgAAAAAA + tiles: fgAAAAAAdQAAAAAAdQAAAAADdQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABcAAAAAABfgAAAAAAdQAAAAADdQAAAAAAdQAAAAABcAAAAAABdQAAAAACcAAAAAACfgAAAAAAcAAAAAADcAAAAAADdQAAAAABdQAAAAADdQAAAAAAfgAAAAAAcAAAAAAAdQAAAAACdQAAAAACdQAAAAACdQAAAAACdQAAAAAAcAAAAAABdQAAAAADcAAAAAACcAAAAAABcAAAAAACcAAAAAACdQAAAAABdQAAAAACdQAAAAADdQAAAAAAdQAAAAABdQAAAAABcAAAAAABcAAAAAAAcAAAAAAAdQAAAAACcAAAAAACdQAAAAADcAAAAAABcAAAAAADcAAAAAACcAAAAAABdQAAAAAAdQAAAAABdQAAAAACfgAAAAAAcAAAAAAAdQAAAAADdQAAAAABdQAAAAACdQAAAAADdQAAAAADcAAAAAACdQAAAAADcAAAAAACfgAAAAAAcAAAAAADcAAAAAACdQAAAAACdQAAAAACdQAAAAAAfgAAAAAAcAAAAAADcAAAAAABfgAAAAAAdQAAAAADdQAAAAADdQAAAAABcAAAAAAAdQAAAAABJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADdQAAAAACcAAAAAAAfgAAAAAAcAAAAAADcAAAAAADcAAAAAACcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADcAAAAAABdQAAAAABcAAAAAABcAAAAAAAcAAAAAACdQAAAAAAdQAAAAAAdQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAADdQAAAAABdQAAAAAAcAAAAAABfgAAAAAAcAAAAAADdQAAAAAAdQAAAAACdQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABdQAAAAABcAAAAAABdQAAAAADcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAABfgAAAAAAcAAAAAABdQAAAAADcAAAAAACfgAAAAAAJAAAAAABHwAAAAAAHwAAAAABHwAAAAADHwAAAAACegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAcAAAAAADdQAAAAABcAAAAAADcAAAAAAAcAAAAAACHwAAAAACHwAAAAABHwAAAAADfgAAAAAAegAAAAADegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABdQAAAAAAcAAAAAACfgAAAAAAcAAAAAADHwAAAAAAHwAAAAACHwAAAAACfgAAAAAAegAAAAABegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABcAAAAAABdQAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAABdQAAAAAAdQAAAAADdQAAAAAAcAAAAAAAcAAAAAACcAAAAAACdQAAAAADcAAAAAADcAAAAAACcAAAAAAAcAAAAAADcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAdQAAAAACdQAAAAABdQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADdQAAAAAAdQAAAAAAdQAAAAADcAAAAAADfgAAAAAAfgAAAAAA version: 6 3,1: ind: 3,1 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABdQAAAAACdQAAAAACdQAAAAACcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAAAcAAAAAABcAAAAAACcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAwAAAAAAegAAAAAAegAAAAADegAAAAABegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAACgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAXgAAAAABZAAAAAAAXQAAAAABXQAAAAABfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMAAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAfgAAAAAAegAAAAABegAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACfgAAAAAAegAAAAADegAAAAACfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAACegAAAAAAegAAAAAAfgAAAAAAegAAAAAAegAAAAADfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAdQAAAAABdQAAAAAAdQAAAAAAcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACcAAAAAABcAAAAAACcAAAAAAAcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAwAAAAAAegAAAAAAegAAAAACegAAAAACegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAACgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAXgAAAAABZAAAAAAAXQAAAAADXQAAAAADfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMAAAAAAAfgAAAAAAXQAAAAADXQAAAAABXgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACfgAAAAAAegAAAAADegAAAAACfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAfgAAAAAAegAAAAAAegAAAAADfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAACegAAAAABegAAAAABfgAAAAAAegAAAAAAegAAAAACfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -4,-4: ind: -4,-4 - tiles: AAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAABJAAAAAADJAAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAABHwAAAAADHwAAAAADHwAAAAACHwAAAAADJAAAAAABJAAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAADHwAAAAABHwAAAAAAHwAAAAABHwAAAAADJAAAAAAAJAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAABHwAAAAADHwAAAAADJAAAAAACJAAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAADHwAAAAACHwAAAAACHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAABHwAAAAAAHwAAAAADHwAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAHwAAAAADHwAAAAABHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAADHwAAAAAAHwAAAAABHwAAAAABJAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAJAAAAAABJAAAAAAAJAAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAABJAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAaAAAAAADXQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADTgAAAAAAXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAADTgAAAAADXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAATgAAAAAAXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACaAAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAACaAAAAAADaAAAAAADfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAA + tiles: AAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAABHwAAAAADHwAAAAACHwAAAAACHwAAAAACJAAAAAABJAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAABHwAAAAACHwAAAAACHwAAAAAAHwAAAAADJAAAAAABJAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAADHwAAAAADHwAAAAADHwAAAAAAHwAAAAABJAAAAAABJAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAADHwAAAAABHwAAAAABJAAAAAACJAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAADHwAAAAACHwAAAAABHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAACHwAAAAABHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAABHwAAAAADHwAAAAADHwAAAAABJAAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAJAAAAAADJAAAAAAAJAAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAACJAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAAATgAAAAABXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAAATgAAAAAAXQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAABTgAAAAABXQAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAXQAAAAACaAAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAaAAAAAABaAAAAAADaAAAAAACfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAA version: 6 -3,-4: ind: -3,-4 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAABJAAAAAADHwAAAAABHwAAAAADHwAAAAAAHwAAAAADJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAJAAAAAAAHwAAAAAAHwAAAAACHwAAAAADHwAAAAABJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAACJAAAAAADHwAAAAACHwAAAAAAHwAAAAAAHwAAAAADJAAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAACJAAAAAADHwAAAAAAHwAAAAADHwAAAAAAHwAAAAAAJAAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAABHwAAAAAAJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADHwAAAAAAHwAAAAACJAAAAAACfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAACHwAAAAABJAAAAAACfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAADJAAAAAADHwAAAAAAHwAAAAABHwAAAAADHwAAAAADHwAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAADfgAAAAAAJAAAAAABJAAAAAACJAAAAAACfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAACJAAAAAABJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABaAAAAAACXQAAAAABfgAAAAAAXQAAAAAAXQAAAAABfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACTgAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACTgAAAAADXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAABTgAAAAAAXQAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAaAAAAAADXQAAAAABfgAAAAAABwAAAAAABwAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAfgAAAAAAaAAAAAABaAAAAAADaAAAAAAAfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAJAAAAAACHwAAAAACHwAAAAABHwAAAAABHwAAAAAAJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAACJAAAAAACHwAAAAACHwAAAAABHwAAAAACHwAAAAACJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAABJAAAAAADHwAAAAABHwAAAAABHwAAAAAAHwAAAAACJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAACJAAAAAACHwAAAAABHwAAAAABHwAAAAAAHwAAAAAAJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAABJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAADHwAAAAAAJAAAAAACfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAABHwAAAAADJAAAAAADfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAACJAAAAAABHwAAAAABHwAAAAACHwAAAAACHwAAAAABHwAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAABfgAAAAAAJAAAAAACJAAAAAAAJAAAAAABfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAJAAAAAACJAAAAAAAJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACaAAAAAABXQAAAAABfgAAAAAAXQAAAAACXQAAAAADfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTgAAAAACXQAAAAAAfgAAAAAABwAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACaAAAAAAAXQAAAAABfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAfgAAAAAAaAAAAAADaAAAAAAAaAAAAAADfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAA version: 6 -4,-5: ind: -4,-5 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAABHwAAAAABHwAAAAAAHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAAAHwAAAAADHwAAAAABHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAABHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAJAAAAAABHwAAAAABHwAAAAACHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -3,-5: ind: -3,-5 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAADHwAAAAABHwAAAAACfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAABHwAAAAABJAAAAAACfgAAAAAAAAAAAAAAfQAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAACHwAAAAABHwAAAAABfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAADHwAAAAACJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAA version: 6 3,-1: ind: 3,-1 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAABHwAAAAACHwAAAAABHwAAAAACHwAAAAABHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAABfgAAAAAAXQAAAAACHwAAAAAAHwAAAAABHwAAAAAAHwAAAAADHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAABfgAAAAAAXQAAAAACHwAAAAAAHwAAAAACHwAAAAADHwAAAAABHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAACHwAAAAABHwAAAAABHwAAAAAAHwAAAAAAHwAAAAADHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAACfgAAAAAAXQAAAAABJAAAAAABJAAAAAAAJAAAAAABJAAAAAACJAAAAAABJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAACJAAAAAAAJAAAAAADJAAAAAADJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABdQAAAAABdQAAAAAAdQAAAAABcAAAAAACfgAAAAAAdQAAAAADdQAAAAAAfgAAAAAAcAAAAAAAcAAAAAABcAAAAAABbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAcAAAAAABcAAAAAACdQAAAAACcAAAAAADcAAAAAADcAAAAAADdQAAAAAAdQAAAAABfgAAAAAAcAAAAAABdQAAAAACdQAAAAACdQAAAAADcAAAAAAAfgAAAAAAfgAAAAAAcAAAAAABcAAAAAAAdQAAAAACcAAAAAABcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACdQAAAAADdQAAAAADdQAAAAADcAAAAAACfgAAAAAAfgAAAAAAcAAAAAADdQAAAAADdQAAAAACdQAAAAACcAAAAAADcAAAAAAAdQAAAAABcAAAAAAAcAAAAAABcAAAAAABaAAAAAACaAAAAAABaAAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAcAAAAAADcAAAAAACdQAAAAADcAAAAAADcAAAAAACcAAAAAADdQAAAAAAcAAAAAABcAAAAAADcAAAAAACaAAAAAADaAAAAAAAaAAAAAACcAAAAAADfgAAAAAAfgAAAAAAcAAAAAACcAAAAAADdQAAAAAAcAAAAAADcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACdQAAAAADdQAAAAAAdQAAAAAAcAAAAAADfgAAAAAAdQAAAAAAdQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAdQAAAAADdQAAAAACdQAAAAACcAAAAAAAcAAAAAABdQAAAAADdQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA + tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAXQAAAAACHwAAAAACHwAAAAACHwAAAAAAHwAAAAABHwAAAAADHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAfgAAAAAAXQAAAAAAHwAAAAADHwAAAAACHwAAAAAAHwAAAAABHwAAAAACHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAADXQAAAAAAfgAAAAAAXQAAAAADHwAAAAABHwAAAAAAHwAAAAACHwAAAAADHwAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAACXQAAAAAAHwAAAAABHwAAAAACHwAAAAADHwAAAAADHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAADXQAAAAADfgAAAAAAXQAAAAADJAAAAAABJAAAAAACJAAAAAABJAAAAAADJAAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAACJAAAAAACJAAAAAADJAAAAAACJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAdQAAAAABdQAAAAABdQAAAAACcAAAAAABfgAAAAAAdQAAAAAAdQAAAAABfgAAAAAAcAAAAAABcAAAAAADcAAAAAABbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAcAAAAAABcAAAAAAAdQAAAAAAcAAAAAACcAAAAAADcAAAAAAAdQAAAAACdQAAAAACfgAAAAAAcAAAAAAAdQAAAAADdQAAAAABdQAAAAAAcAAAAAABfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAADdQAAAAABcAAAAAAAcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABdQAAAAADdQAAAAAAdQAAAAACcAAAAAAAfgAAAAAAfgAAAAAAcAAAAAABdQAAAAACdQAAAAADdQAAAAADcAAAAAACcAAAAAABdQAAAAABcAAAAAACcAAAAAACcAAAAAADaAAAAAAAaAAAAAABaAAAAAABcAAAAAADfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAACdQAAAAACcAAAAAAAcAAAAAACcAAAAAABdQAAAAADcAAAAAABcAAAAAAAcAAAAAABaAAAAAABaAAAAAADaAAAAAADcAAAAAABfgAAAAAAfgAAAAAAcAAAAAACcAAAAAAAdQAAAAADcAAAAAABcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACdQAAAAAAdQAAAAABdQAAAAABcAAAAAADfgAAAAAAdQAAAAADdQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABdQAAAAAAdQAAAAAAdQAAAAABcAAAAAADcAAAAAACdQAAAAACdQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA version: 6 4,0: ind: 4,0 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 4,-1: ind: 4,-1 - tiles: XQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAATgAAAAADXQAAAAACfgAAAAAAaAAAAAAAaAAAAAABaAAAAAABaAAAAAACaAAAAAABfgAAAAAAXQAAAAADbQAAAAAAXQAAAAACXQAAAAACXQAAAAABfgAAAAAAfgAAAAAATgAAAAABXQAAAAADfgAAAAAAaAAAAAADaAAAAAAAaAAAAAADaAAAAAACaAAAAAAAfgAAAAAAXQAAAAABbQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAAAaAAAAAAAaAAAAAAAaAAAAAACaAAAAAAAaAAAAAABfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAACXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAaAAAAAACaAAAAAABaAAAAAABaAAAAAACaAAAAAACfgAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAACXQAAAAAAXQAAAAACXQAAAAACaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: XQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAATgAAAAAAXQAAAAADfgAAAAAAaAAAAAACaAAAAAACaAAAAAABaAAAAAABaAAAAAADfgAAAAAAXQAAAAABbQAAAAAAXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAATgAAAAABXQAAAAACfgAAAAAAaAAAAAADaAAAAAADaAAAAAABaAAAAAAAaAAAAAABfgAAAAAAXQAAAAADbQAAAAAAXQAAAAADXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAADaAAAAAABaAAAAAABaAAAAAADaAAAAAAAaAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAXQAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADfgAAAAAAaAAAAAABaAAAAAABaAAAAAAAaAAAAAAAaAAAAAACfgAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAABXQAAAAADXQAAAAAAXQAAAAABaAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 4,1: ind: 4,1 - tiles: fgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAggAAAAAAfgAAAAAAgQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAggAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: fgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAggAAAAABfgAAAAAAgQAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAgQAAAAAAggAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 4,-2: ind: 4,-2 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAJAAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADJAAAAAAAJAAAAAAAJAAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAABJAAAAAAAHwAAAAADXQAAAAAAXQAAAAACXQAAAAADfgAAAAAAXQAAAAABXQAAAAADXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAHwAAAAADHwAAAAADHwAAAAACHwAAAAAAXQAAAAABXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABegAAAAADegAAAAACegAAAAABXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAaAAAAAACXQAAAAAAegAAAAABegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADegAAAAADegAAAAABegAAAAADXQAAAAADXQAAAAAAJAAAAAACfgAAAAAAaAAAAAACXQAAAAABegAAAAADegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACegAAAAABegAAAAACegAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAaAAAAAABXQAAAAAAJAAAAAABegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAADXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAAAbQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAACbQAAAAAAXQAAAAADXQAAAAABXQAAAAADfgAAAAAAfgAAAAAATgAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAbQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAA + tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADJAAAAAADHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADHwAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAJAAAAAACJAAAAAACJAAAAAAAXQAAAAADXQAAAAABXQAAAAADfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAJAAAAAABHwAAAAAAXQAAAAADXQAAAAACXQAAAAABfgAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAHwAAAAADHwAAAAADHwAAAAADHwAAAAADXQAAAAADXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAegAAAAABegAAAAAAegAAAAABXQAAAAAAXQAAAAACXQAAAAABfgAAAAAAaAAAAAACXQAAAAABegAAAAAAegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACegAAAAABegAAAAAAegAAAAAAXQAAAAAAXQAAAAADJAAAAAADfgAAAAAAaAAAAAAAXQAAAAACegAAAAACegAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACegAAAAAAegAAAAAAegAAAAADfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAaAAAAAADXQAAAAADJAAAAAAAegAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAADXQAAAAACegAAAAACegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATgAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAACXQAAAAABXQAAAAADXQAAAAAAXQAAAAADbQAAAAAAXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADbQAAAAAAXQAAAAACXQAAAAAAXQAAAAACfgAAAAAAfgAAAAAATgAAAAACXQAAAAABXQAAAAADXQAAAAABXQAAAAACXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAACbQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAA version: 6 5,-1: ind: 5,-1 @@ -293,19 +293,19 @@ entities: version: 6 5,-2: ind: 5,-2 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAABJAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAAAJAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAMAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAABXQAAAAADXQAAAAABfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAADaAAAAAAAXQAAAAADXQAAAAACaAAAAAACaAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAADJAAAAAABXQAAAAABXQAAAAACJAAAAAAAJAAAAAADfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAADXQAAAAACXQAAAAAAJAAAAAACJAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAA + tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAADJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJAAAAAACJAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMAAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAaAAAAAAAaAAAAAACXQAAAAABXQAAAAACaAAAAAAAaAAAAAACfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAACJAAAAAABXQAAAAABXQAAAAADJAAAAAACJAAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAADXQAAAAADXQAAAAACJAAAAAAAJAAAAAACfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAA version: 6 4,-3: ind: 4,-3 - tiles: CwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAABwAAAAAABwAAAAAABwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAABwAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA + tiles: CwAAAAAABwAAAAAABwAAAAAABwAAAAAGBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfwAAAAAABwAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA version: 6 1,-4: ind: 1,-4 - tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAIBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEQAAAAAAfgAAAAAAJAAAAAABJAAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAHBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAABJAAAAAACfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADHwAAAAADHwAAAAACHwAAAAACHwAAAAABHwAAAAADEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAfwAAAAAAfgAAAAAACwAAAAAAfQAAAAAAfQAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAJAAAAAAAJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAHBwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAIBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAHwAAAAADHwAAAAABHwAAAAADHwAAAAAAHwAAAAABEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAACBwAAAAAAfwAAAAAAAAAAAAAAEQAAAAAAEQAAAAAAHwAAAAABHwAAAAADEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAHfwAAAAAAfgAAAAAACwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAJBwAAAAAGfwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAACfgAAAAAAfgAAAAAAJAAAAAABJAAAAAACfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAKfgAAAAAAfgAAAAAAJAAAAAACJAAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA + tiles: fQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEQAAAAAAfgAAAAAAJAAAAAAAJAAAAAABfgAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAHwAAAAADHwAAAAADfgAAAAAAHwAAAAACJAAAAAACfgAAAAAAfgAAAAAABwAAAAAEBwAAAAAABwAAAAACfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABHwAAAAABHwAAAAABHwAAAAAAHwAAAAABHwAAAAABEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAAfwAAAAAAfgAAAAAACwAAAAAAfQAAAAAAfQAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAHBwAAAAAAfwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAHBwAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAEBwAAAAAABwAAAAAIBwAAAAAABwAAAAAGAAAAAAAAAAAAAAAAHwAAAAABHwAAAAAAHwAAAAACHwAAAAAAHwAAAAADHwAAAAAAEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAHBwAAAAAAfwAAAAAAAAAAAAAAEQAAAAAAEQAAAAAAHwAAAAABHwAAAAACEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAAfgAAAAAACwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAABBwAAAAALBwAAAAAHfwAAAAAABwAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAKBwAAAAADfgAAAAAAfgAAAAAAJAAAAAACJAAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAfgAAAAAAfgAAAAAAJAAAAAABJAAAAAABfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA version: 6 0,-4: ind: 0,-4 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAJAAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABfgAAAAAAfgAAAAAAJAAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAJAAAAAACfgAAAAAAfgAAAAAAJAAAAAAC + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAJAAAAAADfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJAAAAAABfgAAAAAAfgAAAAAAJAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfgAAAAAAfgAAAAAAJAAAAAABfgAAAAAAfgAAAAAAJAAAAAAD version: 6 -5,-3: ind: -5,-3 @@ -313,7 +313,7 @@ entities: version: 6 -3,2: ind: -3,2 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAABXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,-4: ind: -1,-4 @@ -325,11 +325,11 @@ entities: version: 6 5,-3: ind: 5,-3 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAAKfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAgwAAAAAAgwAAAAAAQAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAWwAAAAAGWwAAAAAAWwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAgwAAAAAAgwAAAAAAQAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgwAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 1,2: ind: 1,2 - tiles: fgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: fgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -2,-4: ind: -2,-4 @@ -337,15 +337,15 @@ entities: version: 6 2,-4: ind: 2,-4 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAHBwAAAAAABwAAAAAABwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAADBwAAAAAJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAFBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfwAAAAAABwAAAAALBwAAAAAABwAAAAAABwAAAAAKBwAAAAAIBwAAAAAABwAAAAAABwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAABBwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfwAAAAAABwAAAAAEBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAKBwAAAAAABwAAAAAABwAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAABBwAAAAAABwAAAAACBwAAAAAEBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAHBwAAAAAABwAAAAAMBwAAAAAABwAAAAAJBwAAAAAABwAAAAAIfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAADBwAAAAAABwAAAAAABwAAAAAABwAAAAALAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAABBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 3,-4: ind: 3,-4 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAHBwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAEfwAAAAAABwAAAAACBwAAAAAAfwAAAAAABwAAAAAACwAAAAAACwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAKBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAJBwAAAAAABwAAAAAABwAAAAABBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAADBwAAAAAIBwAAAAAEBwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAMBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAJBwAAAAAABwAAAAAABwAAAAACBwAAAAAABwAAAAAGfwAAAAAABwAAAAAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAKAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAGBwAAAAAKfwAAAAAAfgAAAAAACwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAIBwAAAAAABwAAAAAABwAAAAAGBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAKBwAAAAAAfwAAAAAABwAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAACwAAAAAACwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAAfgAAAAAAfwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAIBwAAAAAGBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAfwAAAAAABwAAAAAIBwAAAAAABwAAAAAFBwAAAAACBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAACBwAAAAAEBwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAfwAAAAAAfgAAAAAACwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAACwAAAAAA version: 6 4,-4: ind: 4,-4 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAFBwAAAAAABwAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAADBwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAABegAAAAAAegAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAABegAAAAADegAAAAABfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAADegAAAAACegAAAAACfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAABfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQgAAAAAAQgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAAAAABwAAAAAABwAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAABegAAAAACegAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAACegAAAAADegAAAAABfgAAAAAABwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAegAAAAABegAAAAAAegAAAAABfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAADfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAACfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAQgAAAAAAQgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAABwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 - type: Broadphase - type: Physics @@ -1390,6 +1390,9 @@ entities: 6533: 7,-48 6534: 8,-48 6535: 9,-48 + 6985: -32,-3 + 6986: -31,-3 + 6987: -33,-3 - node: color: '#FFFFFFFF' id: BrickTileDarkLineS @@ -1491,6 +1494,10 @@ entities: 6956: -29,-1 6971: -35,-1 6972: -30,-1 + 6988: -34,-5 + 6989: -32,-5 + 6990: -33,-5 + 6991: -31,-5 - node: cleanable: True color: '#FFFFFFFF' @@ -5544,11 +5551,9 @@ entities: 6905: 58,-24 6936: 78,-7 6944: 52,-23 - 6957: -34,-5 - 6958: -33,-4 - 6959: -33,-3 - 6960: -31,-4 - 6961: -31,-2 + 7010: -34,-5 + 7011: -32,-3 + 7012: -34,-2 - node: cleanable: True angle: 1.5707963267948966 rad @@ -6447,11 +6452,6 @@ entities: 6953: 3,-22 6954: 16,23 6955: 16,25 - 6962: -34,-3 - 6963: -34,-4 - 6964: -33,-5 - 6965: -32,-5 - 6970: -31,-5 6975: -36,3 6976: -33,3 6977: -35,-1 @@ -6462,6 +6462,14 @@ entities: 6982: -34,1 6983: -30,1 6984: -38,2 + 6992: -33,-4 + 6993: -34,-4 + 6994: -32,-3 + 6995: -31,-3 + 6996: -34,-3 + 6997: -34,-2 + 6998: -31,-5 + 6999: -32,-5 - node: cleanable: True angle: 1.5707963267948966 rad @@ -6520,8 +6528,12 @@ entities: 6915: 58,-23 6916: 57,-24 6946: 54,-23 - 6968: -31,-5 - 6969: -31,-5 + 7000: -33,-5 + 7001: -34,-3 + 7002: -32,-3 + 7003: -33,-4 + 7004: -32,-4 + 7005: -34,-5 - node: cleanable: True angle: 1.5707963267948966 rad @@ -6578,8 +6590,10 @@ entities: 6880: -12,-39 6917: 52,-21 6918: 57,-22 - 6966: -33,-3 - 6967: -34,-4 + 7006: -31,-5 + 7007: -33,-3 + 7008: -34,-3 + 7009: -34,-4 - node: cleanable: True angle: 1.5707963267948966 rad @@ -9702,17 +9716,13 @@ entities: -9,-3: 1: 56796 -8,-2: - 1: 33008 - 3: 12288 + 1: 45296 -9,-2: - 1: 4336 - 3: 49152 + 1: 53488 -8,-1: - 3: 34 - 1: 64136 + 1: 64443 -9,-1: - 3: 204 - 1: 61713 + 1: 62941 -8,0: 1: 65535 -7,-3: @@ -13577,6 +13587,16 @@ entities: - 21114 - 21102 - 21101 + - uid: 21958 + components: + - type: Transform + pos: -32.5,-1.5 + parent: 2 + - type: DeviceList + devices: + - 21959 + - 8815 + - 21957 - proto: AirCanister entities: - uid: 4 @@ -13701,21 +13721,6 @@ entities: - type: Transform pos: 61.5,24.5 parent: 2 - - uid: 17379 - components: - - type: MetaData - name: Nitrogen room airlock - - type: Transform - rot: 3.141592653589793 rad - pos: -30.5,-3.5 - parent: 2 - - uid: 21376 - components: - - type: MetaData - name: Nitrogen room airlock - - type: Transform - pos: -30.5,-1.5 - parent: 2 - proto: AirlockArmoryLocked entities: - uid: 4316 @@ -14699,7 +14704,7 @@ entities: rot: -1.5707963267948966 rad pos: -57.5,4.5 parent: 2 - - uid: 3613 + - uid: 6351 components: - type: MetaData name: Evacuation docking airlock @@ -14709,6 +14714,13 @@ entities: parent: 2 - proto: AirlockExternalGlassShuttleEscape entities: + - uid: 7393 + components: + - type: MetaData + name: Evacuation pod docking airlock + - type: Transform + pos: -22.5,-48.5 + parent: 2 - uid: 15228 components: - type: MetaData @@ -14733,13 +14745,6 @@ entities: rot: 1.5707963267948966 rad pos: 73.5,5.5 parent: 2 - - uid: 17525 - components: - - type: MetaData - name: Evacuation pod docking airlock - - type: Transform - pos: -22.5,-48.5 - parent: 2 - uid: 21378 components: - type: MetaData @@ -17536,6 +17541,14 @@ entities: deviceLists: - 17633 - 8405 + - uid: 21959 + components: + - type: Transform + pos: -32.5,-2.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 21958 - proto: AltarHeaven entities: - uid: 16557 @@ -19295,108 +19308,158 @@ entities: - type: Transform pos: 43.5,-55.5 parent: 2 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - - uid: 107 + - uid: 730 components: - type: Transform - pos: -17.5,11.5 + rot: -1.5707963267948966 rad + pos: -57.5,6.5 parent: 2 - - uid: 108 + - uid: 961 components: - type: Transform + rot: -1.5707963267948966 rad pos: -14.5,11.5 parent: 2 + - uid: 1651 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -17.5,11.5 + parent: 2 + - uid: 1653 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 68.5,21.5 + parent: 2 + - uid: 1654 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -52.5,-58.5 + parent: 2 - uid: 1668 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -42.5,-65.5 + parent: 2 + - uid: 1897 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -42.5,-58.5 + parent: 2 + - uid: 2296 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -52.5,-65.5 + parent: 2 + - uid: 2299 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 25.5,27.5 + parent: 2 + - uid: 2300 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 26.5,27.5 + parent: 2 + - uid: 3099 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 29.5,27.5 + parent: 2 + - uid: 3228 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 28.5,27.5 + parent: 2 + - uid: 3257 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 64.5,-53.5 + parent: 2 + - uid: 3613 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 73.5,-2.5 + parent: 2 + - uid: 3856 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 73.5,1.5 + parent: 2 + - uid: 5519 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 73.5,5.5 + parent: 2 + - uid: 5539 components: - type: Transform rot: 1.5707963267948966 rad pos: 68.5,19.5 parent: 2 - - uid: 6351 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -41.5,-58.5 - parent: 2 - uid: 6376 components: - type: Transform rot: -1.5707963267948966 rad - pos: -53.5,-65.5 + pos: -57.5,4.5 parent: 2 - uid: 6377 components: - type: Transform rot: -1.5707963267948966 rad - pos: -53.5,-58.5 + pos: -57.5,-3.5 parent: 2 - uid: 6378 components: - type: Transform rot: -1.5707963267948966 rad - pos: -41.5,-65.5 + pos: -57.5,-1.5 parent: 2 - - uid: 7393 + - uid: 8839 components: - type: Transform - pos: 26.5,27.5 + pos: -18.5,-48.5 parent: 2 - - uid: 15192 + - uid: 11057 components: - type: Transform - pos: 25.5,27.5 + pos: -22.5,-48.5 parent: 2 - - uid: 15193 - components: - - type: Transform - pos: 29.5,27.5 - parent: 2 - - uid: 15605 - components: - - type: Transform - pos: 28.5,27.5 - parent: 2 - - uid: 17258 - components: - - type: Transform - pos: 64.5,-53.5 - parent: 2 - - uid: 20292 - components: - - type: Transform - pos: 73.5,-2.5 - parent: 2 - - uid: 20293 - components: - - type: Transform - pos: 73.5,1.5 - parent: 2 - - uid: 20294 - components: - - type: Transform - pos: 73.5,5.5 - parent: 2 - - uid: 20295 - components: - - type: Transform - pos: 68.5,21.5 - parent: 2 - - uid: 21184 - components: - - type: Transform - pos: -0.5,-2.5 - parent: 21128 - - uid: 21185 - components: - - type: Transform - pos: -0.5,-3.5 - parent: 21128 - - uid: 21186 + - uid: 21961 components: - type: Transform + rot: -1.5707963267948966 rad pos: -0.5,-4.5 parent: 21128 + - uid: 21962 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-3.5 + parent: 21128 + - uid: 21963 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-2.5 + parent: 21128 +- proto: AtmosDeviceFanTiny + entities: - uid: 21187 components: - type: Transform @@ -19407,40 +19470,6 @@ entities: - type: Transform pos: 10.5,-4.5 parent: 21128 - - uid: 21406 - components: - - type: Transform - pos: -22.5,-48.5 - parent: 2 - - uid: 21407 - components: - - type: Transform - pos: -18.5,-48.5 - parent: 2 - - uid: 21892 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -57.5,4.5 - parent: 2 - - uid: 21893 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -57.5,6.5 - parent: 2 - - uid: 21894 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -57.5,-1.5 - parent: 2 - - uid: 21895 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -57.5,-3.5 - parent: 2 - proto: AtmosFixBlockerMarker entities: - uid: 109 @@ -19596,66 +19625,6 @@ entities: - type: Transform pos: 18.5,-4.5 parent: 2 - - uid: 21937 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -32.5,-2.5 - parent: 2 - - uid: 21938 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -33.5,-2.5 - parent: 2 - - uid: 21939 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -33.5,-3.5 - parent: 2 - - uid: 21940 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -32.5,-3.5 - parent: 2 - - uid: 21941 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -33.5,-4.5 - parent: 2 - - uid: 21942 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -32.5,-4.5 - parent: 2 - - uid: 21943 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -31.5,-4.5 - parent: 2 - - uid: 21944 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -30.5,-4.5 - parent: 2 - - uid: 21945 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -30.5,-2.5 - parent: 2 - - uid: 21946 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -30.5,-3.5 - parent: 2 - proto: AtmosFixOxygenMarker entities: - uid: 121 @@ -24103,25 +24072,15 @@ entities: - type: Transform pos: -28.5,-4.5 parent: 2 - - uid: 11057 + - uid: 11058 components: - type: Transform pos: -29.5,-4.5 parent: 2 - - uid: 11058 - components: - - type: Transform - pos: -30.5,-4.5 - parent: 2 - - uid: 11059 - components: - - type: Transform - pos: -31.5,-4.5 - parent: 2 - uid: 11060 components: - type: Transform - pos: -32.5,-4.5 + pos: -30.5,-4.5 parent: 2 - uid: 11061 components: @@ -24393,6 +24352,11 @@ entities: - type: Transform pos: -53.5,2.5 parent: 2 + - uid: 11115 + components: + - type: Transform + pos: -32.5,-4.5 + parent: 2 - uid: 11117 components: - type: Transform @@ -32868,6 +32832,11 @@ entities: - type: Transform pos: -11.5,-36.5 parent: 2 + - uid: 13179 + components: + - type: Transform + pos: -31.5,-4.5 + parent: 2 - uid: 13452 components: - type: Transform @@ -34158,11 +34127,6 @@ entities: - type: Transform pos: 16.5,16.5 parent: 2 - - uid: 14334 - components: - - type: Transform - pos: 17.5,16.5 - parent: 2 - uid: 14335 components: - type: Transform @@ -37853,6 +37817,16 @@ entities: - type: Transform pos: 8.5,-47.5 parent: 2 + - uid: 21376 + components: + - type: Transform + pos: -33.5,-2.5 + parent: 2 + - uid: 21406 + components: + - type: Transform + pos: -33.5,-3.5 + parent: 2 - uid: 21413 components: - type: Transform @@ -37873,25 +37847,15 @@ entities: - type: Transform pos: 45.5,15.5 parent: 2 - - uid: 21948 + - uid: 21943 components: - type: Transform - pos: -30.5,-3.5 + pos: -33.5,-1.5 parent: 2 - - uid: 21949 + - uid: 21946 components: - type: Transform - pos: -30.5,-2.5 - parent: 2 - - uid: 21950 - components: - - type: Transform - pos: -30.5,-1.5 - parent: 2 - - uid: 21951 - components: - - type: Transform - pos: -30.5,-0.5 + pos: -33.5,-0.5 parent: 2 - uid: 21952 components: @@ -51841,6 +51805,12 @@ entities: rot: -1.5707963267948966 rad pos: -38.5,16.5 parent: 2 + - uid: 11116 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 17.5,16.5 + parent: 2 - uid: 12460 components: - type: Transform @@ -52343,12 +52313,6 @@ entities: rot: -1.5707963267948966 rad pos: 17.5,12.5 parent: 2 - - uid: 13935 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 17.5,16.5 - parent: 2 - uid: 13936 components: - type: Transform @@ -54689,6 +54653,12 @@ entities: rot: 1.5707963267948966 rad pos: -13.5,-39.5 parent: 2 + - uid: 20292 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -31.5,-1.5 + parent: 2 - uid: 20437 components: - type: Transform @@ -55729,10 +55699,11 @@ entities: rot: 3.141592653589793 rad pos: 5.5,44.5 parent: 2 - - uid: 21947 + - uid: 21941 components: - type: Transform - pos: -30.5,-2.5 + rot: 3.141592653589793 rad + pos: -30.5,-1.5 parent: 2 - proto: Chair entities: @@ -57353,15 +57324,17 @@ entities: - type: Transform pos: -30.5,-12.5 parent: 2 - - uid: 13181 + - uid: 13183 components: - type: Transform - pos: -32.5,-2.5 + rot: 1.5707963267948966 rad + pos: -31.5,-4.5 parent: 2 - - uid: 13182 + - uid: 13191 components: - type: Transform - pos: -33.5,-2.5 + rot: 1.5707963267948966 rad + pos: -31.5,-3.5 parent: 2 - uid: 13862 components: @@ -61400,11 +61373,6 @@ entities: - type: Transform pos: 16.5,15.5 parent: 2 - - uid: 15413 - components: - - type: Transform - pos: -40.5,-14.5 - parent: 2 - uid: 15414 components: - type: Transform @@ -69059,6 +69027,13 @@ entities: - type: Transform pos: 63.5,-26.5 parent: 2 +- proto: ExplosivesSignMed + entities: + - uid: 21892 + components: + - type: Transform + pos: 48.5,16.5 + parent: 2 - proto: ExtendedEmergencyOxygenTankFilled entities: - uid: 996 @@ -74646,6 +74621,16 @@ entities: - type: Transform pos: 60.5,-5.5 parent: 2 +- proto: GasFilterFlipped + entities: + - uid: 21947 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -31.5,-0.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' - proto: GasMinerCarbonDioxide entities: - uid: 1093 @@ -74800,6 +74785,11 @@ entities: rot: -1.5707963267948966 rad pos: 80.5,-14.5 parent: 2 + - uid: 21956 + components: + - type: Transform + pos: -30.5,-0.5 + parent: 2 - proto: GasPipeBend entities: - uid: 1113 @@ -74879,6 +74869,14 @@ entities: - type: Transform pos: 61.5,-4.5 parent: 2 + - uid: 8365 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -32.5,-0.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 8957 components: - type: Transform @@ -74901,6 +74899,14 @@ entities: rot: 3.141592653589793 rad pos: 60.5,-6.5 parent: 2 + - uid: 13181 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -30.5,-0.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 16392 components: - type: Transform @@ -77156,6 +77162,20 @@ entities: rot: 1.5707963267948966 rad pos: 79.5,-12.5 parent: 2 + - uid: 7797 + components: + - type: Transform + pos: -30.5,0.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 7798 + components: + - type: Transform + pos: -30.5,1.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 7918 components: - type: Transform @@ -77195,6 +77215,13 @@ entities: parent: 2 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 8816 + components: + - type: Transform + pos: -32.5,0.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 8857 components: - type: Transform @@ -80534,14 +80561,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 18274 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -30.5,2.5 - parent: 2 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 18275 components: - type: Transform @@ -80558,14 +80577,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 18277 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -32.5,2.5 - parent: 2 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 18278 components: - type: Transform @@ -89993,6 +90004,13 @@ entities: parent: 2 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 21955 + components: + - type: Transform + pos: -32.5,1.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' - proto: GasPipeTJunction entities: - uid: 575 @@ -90141,6 +90159,20 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 13240 + components: + - type: Transform + pos: -30.5,2.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 13935 + components: + - type: Transform + pos: -32.5,2.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 17684 components: - type: Transform @@ -91919,12 +91951,6 @@ entities: rot: 3.141592653589793 rad pos: 24.5,-14.5 parent: 2 - - uid: 2300 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -33.5,-4.5 - parent: 2 - uid: 5522 components: - type: Transform @@ -92155,6 +92181,15 @@ entities: - 4744 - type: AtmosPipeColor color: '#0335FCFF' + - uid: 8815 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -31.5,-1.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 21958 - uid: 9034 components: - type: Transform @@ -92163,11 +92198,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0335FCFF' - - uid: 13175 - components: - - type: Transform - pos: -33.5,-3.5 - parent: 2 - uid: 17707 components: - type: Transform @@ -94302,6 +94332,15 @@ entities: - 21113 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 21957 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -30.5,-1.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 21958 - proto: GasVolumePump entities: - uid: 9163 @@ -94396,6 +94435,12 @@ entities: parent: 2 - proto: Grille entities: + - uid: 108 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -29.5,-2.5 + parent: 2 - uid: 759 components: - type: Transform @@ -95469,21 +95514,11 @@ entities: - type: Transform pos: -33.5,-37.5 parent: 2 - - uid: 1653 - components: - - type: Transform - pos: -33.5,-1.5 - parent: 2 - uid: 2012 components: - type: Transform pos: 37.5,-31.5 parent: 2 - - uid: 2299 - components: - - type: Transform - pos: -34.5,-2.5 - parent: 2 - uid: 2700 components: - type: Transform @@ -95494,11 +95529,6 @@ entities: - type: Transform pos: -3.5,22.5 parent: 2 - - uid: 3257 - components: - - type: Transform - pos: -29.5,-2.5 - parent: 2 - uid: 3329 components: - type: Transform @@ -96959,15 +96989,11 @@ entities: - type: Transform pos: -13.5,-41.5 parent: 2 - - uid: 13176 + - uid: 13182 components: - type: Transform - pos: -32.5,-1.5 - parent: 2 - - uid: 13179 - components: - - type: Transform - pos: -31.5,-2.5 + rot: 3.141592653589793 rad + pos: -34.5,-3.5 parent: 2 - uid: 14852 components: @@ -98909,6 +98935,18 @@ entities: - type: Transform pos: -42.5,28.5 parent: 2 + - uid: 21942 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -29.5,-3.5 + parent: 2 + - uid: 21945 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -34.5,-2.5 + parent: 2 - proto: GrilleBroken entities: - uid: 15037 @@ -102723,11 +102761,6 @@ entities: - type: Transform pos: 23.5,-17.5 parent: 2 - - uid: 1897 - components: - - type: Transform - pos: -33.5,-4.5 - parent: 2 - uid: 6386 components: - type: Transform @@ -103097,6 +103130,13 @@ entities: ents: - 7948 - type: InsideEntityStorage +- proto: PackPaperRollingFilters + entities: + - uid: 7157 + components: + - type: Transform + pos: -4.659782,40.34784 + parent: 2 - proto: Paper entities: - uid: 1521 @@ -103282,6 +103322,18 @@ entities: - type: Transform pos: 27.520927,-44.445698 parent: 2 + - uid: 21960 + components: + - type: Transform + pos: -30.522171,-4.355038 + parent: 2 + - type: Paper + content: >- + [bold] As the air alarm is currently not set up, please follow these basic setup instructions:[/bold] + + - Enable all gas filters under "Scrubbers", except for Nitrogen. + + - Ensure that the mode is on filtering, with widenet and scrubbing enabled. - proto: PaperBin10 entities: - uid: 1527 @@ -104025,16 +104077,41 @@ entities: parent: 2 - proto: PortableGeneratorJrPacman entities: + - uid: 732 + components: + - type: Transform + pos: 58.5,-27.5 + parent: 2 - uid: 4914 components: - type: Transform pos: 15.5,-21.5 parent: 2 + - uid: 5923 + components: + - type: Transform + pos: 70.5,6.5 + parent: 2 + - uid: 6008 + components: + - type: Transform + pos: -65.5,-26.5 + parent: 2 + - uid: 8364 + components: + - type: Transform + pos: 5.5,-40.5 + parent: 2 - uid: 11657 components: - type: Transform pos: 72.5,-4.5 parent: 2 + - uid: 13239 + components: + - type: Transform + pos: -40.5,-14.5 + parent: 2 - uid: 15095 components: - type: Transform @@ -105605,12 +105682,6 @@ entities: enabled: False - type: ApcPowerReceiver powerLoad: 0 - - uid: 3099 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 29.5,-37.5 - parent: 2 - uid: 3256 components: - type: Transform @@ -106949,6 +107020,12 @@ entities: rot: 3.141592653589793 rad pos: 58.5,-23.5 parent: 2 + - uid: 17525 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -32.5,-4.5 + parent: 2 - uid: 17538 components: - type: Transform @@ -107220,24 +107297,18 @@ entities: - type: Transform pos: -12.5,-36.5 parent: 2 - - uid: 13177 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -33.5,-3.5 - parent: 2 - - uid: 13183 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -31.5,-0.5 - parent: 2 - uid: 14224 components: - type: Transform rot: -1.5707963267948966 rad pos: 37.5,14.5 parent: 2 + - uid: 14334 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -34.5,-0.5 + parent: 2 - uid: 14851 components: - type: Transform @@ -107273,6 +107344,12 @@ entities: enabled: False - type: ApcPowerReceiver powerLoad: 0 + - uid: 15192 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -29.5,-0.5 + parent: 2 - uid: 15250 components: - type: Transform @@ -107472,6 +107549,12 @@ entities: enabled: False - type: ApcPowerReceiver powerLoad: 0 + - uid: 18274 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 29.5,-37.5 + parent: 2 - uid: 20386 components: - type: Transform @@ -110454,18 +110537,6 @@ entities: rot: 3.141592653589793 rad pos: -40.5,-0.5 parent: 2 - - uid: 8815 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -31.5,-5.5 - parent: 2 - - uid: 8816 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -32.5,-5.5 - parent: 2 - uid: 8817 components: - type: Transform @@ -110598,12 +110669,6 @@ entities: rot: 3.141592653589793 rad pos: 0.5,26.5 parent: 2 - - uid: 8839 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 15.5,22.5 - parent: 2 - uid: 8840 components: - type: Transform @@ -111047,6 +111112,12 @@ entities: - type: Transform pos: -8.5,-24.5 parent: 2 + - uid: 15605 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -33.5,-5.5 + parent: 2 - uid: 15976 components: - type: Transform @@ -111082,6 +111153,12 @@ entities: - type: Transform pos: 58.5,-8.5 parent: 2 + - uid: 20294 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -32.5,-5.5 + parent: 2 - uid: 21863 components: - type: Transform @@ -111135,6 +111212,11 @@ entities: parent: 2 - proto: RandomSpawner entities: + - uid: 107 + components: + - type: Transform + pos: -33.5,-4.5 + parent: 2 - uid: 1921 components: - type: Transform @@ -111823,16 +111905,6 @@ entities: parent: 2 - proto: ReinforcedWindow entities: - - uid: 730 - components: - - type: Transform - pos: -34.5,-2.5 - parent: 2 - - uid: 732 - components: - - type: Transform - pos: -32.5,-1.5 - parent: 2 - uid: 758 components: - type: Transform @@ -111843,11 +111915,6 @@ entities: - type: Transform pos: -19.5,-47.5 parent: 2 - - uid: 961 - components: - - type: Transform - pos: -33.5,-1.5 - parent: 2 - uid: 1963 components: - type: Transform @@ -113511,16 +113578,6 @@ entities: - type: Transform pos: 41.5,19.5 parent: 2 - - uid: 13239 - components: - - type: Transform - pos: -31.5,-2.5 - parent: 2 - - uid: 13240 - components: - - type: Transform - pos: -29.5,-2.5 - parent: 2 - uid: 13965 components: - type: Transform @@ -113673,6 +113730,11 @@ entities: rot: 1.5707963267948966 rad pos: 73.5,0.5 parent: 2 + - uid: 15413 + components: + - type: Transform + pos: -34.5,-3.5 + parent: 2 - uid: 15869 components: - type: Transform @@ -113886,6 +113948,11 @@ entities: rot: 3.141592653589793 rad pos: 64.5,-52.5 parent: 2 + - uid: 18277 + components: + - type: Transform + pos: -34.5,-2.5 + parent: 2 - uid: 19794 components: - type: Transform @@ -113913,6 +113980,11 @@ entities: - type: Transform pos: 80.5,-36.5 parent: 2 + - uid: 20815 + components: + - type: Transform + pos: -29.5,-3.5 + parent: 2 - uid: 20881 components: - type: Transform @@ -113957,6 +114029,11 @@ entities: - type: Transform pos: -21.5,-46.5 parent: 2 + - uid: 21944 + components: + - type: Transform + pos: -29.5,-2.5 + parent: 2 - proto: RemoteSignaller entities: - uid: 3270 @@ -114159,6 +114236,11 @@ entities: rot: 4.71238898038469 rad pos: 30.5,-24.5 parent: 2 + - uid: 20293 + components: + - type: Transform + pos: -31.5,-5.5 + parent: 2 - uid: 20311 components: - type: Transform @@ -114264,11 +114346,6 @@ entities: - type: Transform pos: -49.5,-5.5 parent: 2 - - uid: 20815 - components: - - type: Transform - pos: -30.5,-5.5 - parent: 2 - uid: 20816 components: - type: Transform @@ -115132,16 +115209,16 @@ entities: parent: 21128 - proto: SignAi entities: - - uid: 7797 + - uid: 21407 components: - type: Transform - rot: -1.5707963267948966 rad pos: 17.5,-41.5 parent: 2 - - uid: 7798 +- proto: SignAiUpload + entities: + - uid: 21887 components: - type: Transform - rot: -1.5707963267948966 rad pos: 20.5,-41.5 parent: 2 - proto: SignalButton @@ -115256,6 +115333,14 @@ entities: rot: 3.141592653589793 rad pos: 50.5,-2.5 parent: 2 + - type: DeviceLinkSource + linkedPorts: + 6514: + - Pressed: Open + 6515: + - Pressed: Open + 6516: + - Pressed: Open - proto: SignalButtonDirectional entities: - uid: 2100 @@ -116009,8 +116094,6 @@ entities: - type: Transform pos: 15.5,-10.5 parent: 2 -- proto: SignAtmosMinsky - entities: - uid: 8347 components: - type: Transform @@ -116030,6 +116113,13 @@ entities: - type: Transform pos: 52.5,15.5 parent: 2 +- proto: SignBiohazardMed + entities: + - uid: 21893 + components: + - type: Transform + pos: 47.5,10.5 + parent: 2 - proto: SignBridge entities: - uid: 6813 @@ -116044,6 +116134,18 @@ entities: - type: Transform pos: 22.5,9.5 parent: 2 +- proto: SignCargoDock + entities: + - uid: 21894 + components: + - type: Transform + pos: 30.5,24.5 + parent: 2 + - uid: 21895 + components: + - type: Transform + pos: 24.5,24.5 + parent: 2 - proto: SignChapel entities: - uid: 2082 @@ -116052,21 +116154,12 @@ entities: pos: -25.5,-32.5 parent: 2 - proto: SignChem - entities: - - uid: 6008 - components: - - type: Transform - pos: 47.5,10.5 - parent: 2 -- proto: SignChemistry1 entities: - uid: 5964 components: - type: Transform pos: 41.5,10.5 parent: 2 -- proto: SignChemistry2 - entities: - uid: 8369 components: - type: Transform @@ -116546,13 +116639,6 @@ entities: - type: Transform pos: -54.5,-64.5 parent: 2 -- proto: SignDrones - entities: - - uid: 4375 - components: - - type: Transform - pos: 31.5,1.5 - parent: 2 - proto: SignElectricalMed entities: - uid: 6817 @@ -116779,10 +116865,12 @@ entities: - type: Transform pos: 22.5,16.5 parent: 2 - - uid: 8364 +- proto: SignMaterials + entities: + - uid: 4375 components: - type: Transform - pos: 28.5,16.5 + pos: 31.5,1.5 parent: 2 - proto: SignMedical entities: @@ -116791,19 +116879,6 @@ entities: - type: Transform pos: 44.5,0.5 parent: 2 -- proto: SignMinerDock - entities: - - uid: 5519 - components: - - type: Transform - pos: 24.5,24.5 - parent: 2 - - uid: 5539 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 30.5,24.5 - parent: 2 - proto: SignMorgue entities: - uid: 6665 @@ -116922,12 +116997,19 @@ entities: rot: 3.141592653589793 rad pos: -27.505127,-11.735416 parent: 2 -- proto: SignRND +- proto: SignRestroom entities: - - uid: 8365 + - uid: 20295 components: - type: Transform - pos: 62.5,-14.5 + pos: 15.5,22.5 + parent: 2 +- proto: SignRND + entities: + - uid: 21928 + components: + - type: Transform + pos: 61.5,-15.5 parent: 2 - proto: SignRobo entities: @@ -116944,13 +117026,6 @@ entities: pos: 32.5,19.5 parent: 2 - proto: SignScience - entities: - - uid: 7157 - components: - - type: Transform - pos: 61.5,-15.5 - parent: 2 -- proto: SignScience2 entities: - uid: 7158 components: @@ -116959,12 +117034,6 @@ entities: parent: 2 - proto: SignSecureMed entities: - - uid: 5923 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 53.5,-34.5 - parent: 2 - uid: 6827 components: - type: Transform @@ -117020,6 +117089,11 @@ entities: - type: Transform pos: 64.5,-48.5 parent: 2 + - uid: 21950 + components: + - type: Transform + pos: 53.5,-35.5 + parent: 2 - proto: SignSecureMedRed entities: - uid: 6826 @@ -117034,6 +117108,13 @@ entities: - type: Transform pos: 0.5,22.5 parent: 2 +- proto: SignServer + entities: + - uid: 21937 + components: + - type: Transform + pos: 71.5,-24.5 + parent: 2 - proto: SignShipDock entities: - uid: 8354 @@ -117078,6 +117159,31 @@ entities: - type: Transform pos: -5.5,-12.5 parent: 2 + - uid: 21938 + components: + - type: Transform + pos: -10.5,40.5 + parent: 2 + - uid: 21948 + components: + - type: Transform + pos: 71.5,-33.5 + parent: 2 + - uid: 21951 + components: + - type: Transform + pos: -23.5,38.5 + parent: 2 + - uid: 21953 + components: + - type: Transform + pos: -57.5,-20.5 + parent: 2 + - uid: 21954 + components: + - type: Transform + pos: 68.5,20.5 + parent: 2 - proto: SignSurgery entities: - uid: 6886 @@ -117107,6 +117213,13 @@ entities: - type: Transform pos: 40.5,0.5 parent: 2 +- proto: SignVault + entities: + - uid: 21949 + components: + - type: Transform + pos: 53.5,-34.5 + parent: 2 - proto: SignVirology entities: - uid: 6829 @@ -122171,12 +122284,24 @@ entities: rot: 1.5707963267948966 rad pos: 9.5,40.5 parent: 2 + - uid: 17379 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -30.5,-3.5 + parent: 2 - uid: 20792 components: - type: Transform rot: 3.141592653589793 rad pos: 8.5,16.5 parent: 2 + - uid: 21186 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -30.5,-4.5 + parent: 2 - uid: 21330 components: - type: Transform @@ -137490,17 +137615,6 @@ entities: parent: 21128 - proto: WallSolid entities: - - uid: 1654 - components: - - type: Transform - pos: -34.5,-1.5 - parent: 2 - - uid: 2296 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -34.5,-4.5 - parent: 2 - uid: 2702 components: - type: Transform @@ -139978,15 +140092,10 @@ entities: rot: -1.5707963267948966 rad pos: -32.5,26.5 parent: 2 - - uid: 11115 + - uid: 11059 components: - type: Transform - pos: -31.5,-3.5 - parent: 2 - - uid: 11116 - components: - - type: Transform - pos: -29.5,-1.5 + pos: -34.5,-4.5 parent: 2 - uid: 11655 components: @@ -140010,6 +140119,11 @@ entities: rot: -1.5707963267948966 rad pos: -32.5,22.5 parent: 2 + - uid: 13177 + components: + - type: Transform + pos: -34.5,-1.5 + parent: 2 - uid: 13745 components: - type: Transform @@ -140226,6 +140340,11 @@ entities: - type: Transform pos: 80.5,-32.5 parent: 2 + - uid: 21940 + components: + - type: Transform + pos: -29.5,-4.5 + parent: 2 - proto: WallSolidRust entities: - uid: 757 @@ -140238,12 +140357,6 @@ entities: - type: Transform pos: -25.5,-41.5 parent: 2 - - uid: 1651 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -29.5,-3.5 - parent: 2 - uid: 2704 components: - type: Transform @@ -140856,12 +140969,6 @@ entities: rot: 1.5707963267948966 rad pos: -32.5,-5.5 parent: 2 - - uid: 3228 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -34.5,-3.5 - parent: 2 - uid: 3230 components: - type: Transform @@ -141328,12 +141435,6 @@ entities: rot: 1.5707963267948966 rad pos: -46.5,-12.5 parent: 2 - - uid: 3856 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -31.5,-1.5 - parent: 2 - uid: 4067 components: - type: Transform @@ -142147,11 +142248,15 @@ entities: rot: -1.5707963267948966 rad pos: -32.5,23.5 parent: 2 - - uid: 13191 + - uid: 13175 components: - type: Transform - rot: 3.141592653589793 rad - pos: -29.5,-4.5 + pos: -32.5,-1.5 + parent: 2 + - uid: 13176 + components: + - type: Transform + pos: -29.5,-1.5 parent: 2 - uid: 13238 components: @@ -143382,6 +143487,29 @@ entities: rot: 3.141592653589793 rad pos: 65.5,-50.5 parent: 2 + - uid: 17258 + components: + - type: Transform + pos: -33.5,-2.5 + parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 21184: + - DoorStatus: DoorBolt + - uid: 21184 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -33.5,-1.5 + parent: 2 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 17258: + - DoorStatus: DoorBolt - uid: 21321 components: - type: Transform @@ -144373,6 +144501,12 @@ entities: rot: -1.5707963267948966 rad pos: 46.5,16.5 parent: 2 + - uid: 15193 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -30.5,-1.5 + parent: 2 - uid: 15404 components: - type: Transform @@ -144439,6 +144573,12 @@ entities: rot: 1.5707963267948966 rad pos: -10.5,-39.5 parent: 2 + - uid: 21185 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -32.5,-2.5 + parent: 2 - uid: 21553 components: - type: Transform @@ -144487,6 +144627,12 @@ entities: rot: 1.5707963267948966 rad pos: 55.5,1.5 parent: 2 + - uid: 21939 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -31.5,-1.5 + parent: 2 - proto: WoodDoor entities: - uid: 3557 @@ -144654,9 +144800,4 @@ entities: - type: Transform pos: 1.7595062,-8.203196 parent: 21128 - - uid: 21928 - components: - - type: Transform - pos: -33.683754,-4.75871 - parent: 2 ... From 548f9e31fbf39026bc7105475a33f0d00e8efdfc Mon Sep 17 00:00:00 2001 From: JustCone <141039037+JustCone14@users.noreply.github.com> Date: Sun, 4 Aug 2024 19:40:25 +0100 Subject: [PATCH 166/422] Box Atmos Miners Grille Removal (#30610) Removes Grilles from around atmos miners --- Resources/Maps/box.yml | 672 ++--------------------------------------- 1 file changed, 21 insertions(+), 651 deletions(-) diff --git a/Resources/Maps/box.yml b/Resources/Maps/box.yml index 2ba6b203e5..d3b49496bf 100644 --- a/Resources/Maps/box.yml +++ b/Resources/Maps/box.yml @@ -11448,7 +11448,7 @@ entities: pos: 24.5,16.5 parent: 8364 - type: Door - secondsUntilStateChange: -3331.5208 + secondsUntilStateChange: -4258.8877 state: Opening - type: DeviceLinkSource lastSignals: @@ -17253,6 +17253,11 @@ entities: - type: Transform pos: -52.5,-6.5 parent: 8364 + - uid: 1301 + components: + - type: Transform + pos: 25.5,-45.5 + parent: 8364 - uid: 1468 components: - type: Transform @@ -17668,6 +17673,16 @@ entities: - type: Transform pos: 25.5,-60.5 parent: 8364 + - uid: 3702 + components: + - type: Transform + pos: 25.5,-49.5 + parent: 8364 + - uid: 3703 + components: + - type: Transform + pos: 25.5,-53.5 + parent: 8364 - uid: 3705 components: - type: Transform @@ -17903,11 +17918,6 @@ entities: - type: Transform pos: 25.5,-51.5 parent: 8364 - - uid: 4163 - components: - - type: Transform - pos: 22.5,-67.5 - parent: 8364 - uid: 4520 components: - type: Transform @@ -31538,71 +31548,6 @@ entities: - type: Transform pos: 24.5,-45.5 parent: 8364 - - uid: 16587 - components: - - type: Transform - pos: 25.5,-45.5 - parent: 8364 - - uid: 16588 - components: - - type: Transform - pos: 26.5,-45.5 - parent: 8364 - - uid: 16589 - components: - - type: Transform - pos: 27.5,-45.5 - parent: 8364 - - uid: 16590 - components: - - type: Transform - pos: 28.5,-45.5 - parent: 8364 - - uid: 16591 - components: - - type: Transform - pos: 29.5,-45.5 - parent: 8364 - - uid: 16592 - components: - - type: Transform - pos: 29.5,-44.5 - parent: 8364 - - uid: 16593 - components: - - type: Transform - pos: 29.5,-43.5 - parent: 8364 - - uid: 16594 - components: - - type: Transform - pos: 29.5,-42.5 - parent: 8364 - - uid: 16595 - components: - - type: Transform - pos: 29.5,-41.5 - parent: 8364 - - uid: 16596 - components: - - type: Transform - pos: 28.5,-41.5 - parent: 8364 - - uid: 16597 - components: - - type: Transform - pos: 27.5,-41.5 - parent: 8364 - - uid: 16598 - components: - - type: Transform - pos: 26.5,-41.5 - parent: 8364 - - uid: 16599 - components: - - type: Transform - pos: 25.5,-41.5 - parent: 8364 - uid: 16600 components: - type: Transform @@ -31623,11 +31568,6 @@ entities: - type: Transform pos: 25.5,-48.5 parent: 8364 - - uid: 16606 - components: - - type: Transform - pos: 25.5,-49.5 - parent: 8364 - uid: 16607 components: - type: Transform @@ -31643,11 +31583,6 @@ entities: - type: Transform pos: 25.5,-52.5 parent: 8364 - - uid: 16610 - components: - - type: Transform - pos: 25.5,-53.5 - parent: 8364 - uid: 16611 components: - type: Transform @@ -31663,116 +31598,6 @@ entities: - type: Transform pos: 25.5,-56.5 parent: 8364 - - uid: 16614 - components: - - type: Transform - pos: 25.5,-57.5 - parent: 8364 - - uid: 16615 - components: - - type: Transform - pos: 26.5,-57.5 - parent: 8364 - - uid: 16616 - components: - - type: Transform - pos: 27.5,-57.5 - parent: 8364 - - uid: 16617 - components: - - type: Transform - pos: 28.5,-57.5 - parent: 8364 - - uid: 16618 - components: - - type: Transform - pos: 29.5,-57.5 - parent: 8364 - - uid: 16619 - components: - - type: Transform - pos: 29.5,-56.5 - parent: 8364 - - uid: 16620 - components: - - type: Transform - pos: 29.5,-55.5 - parent: 8364 - - uid: 16621 - components: - - type: Transform - pos: 29.5,-54.5 - parent: 8364 - - uid: 16622 - components: - - type: Transform - pos: 29.5,-53.5 - parent: 8364 - - uid: 16623 - components: - - type: Transform - pos: 29.5,-52.5 - parent: 8364 - - uid: 16624 - components: - - type: Transform - pos: 29.5,-51.5 - parent: 8364 - - uid: 16625 - components: - - type: Transform - pos: 29.5,-50.5 - parent: 8364 - - uid: 16626 - components: - - type: Transform - pos: 29.5,-49.5 - parent: 8364 - - uid: 16627 - components: - - type: Transform - pos: 29.5,-48.5 - parent: 8364 - - uid: 16628 - components: - - type: Transform - pos: 29.5,-47.5 - parent: 8364 - - uid: 16629 - components: - - type: Transform - pos: 29.5,-46.5 - parent: 8364 - - uid: 16630 - components: - - type: Transform - pos: 28.5,-49.5 - parent: 8364 - - uid: 16631 - components: - - type: Transform - pos: 27.5,-49.5 - parent: 8364 - - uid: 16632 - components: - - type: Transform - pos: 26.5,-49.5 - parent: 8364 - - uid: 16633 - components: - - type: Transform - pos: 28.5,-53.5 - parent: 8364 - - uid: 16634 - components: - - type: Transform - pos: 27.5,-53.5 - parent: 8364 - - uid: 16635 - components: - - type: Transform - pos: 26.5,-53.5 - parent: 8364 - uid: 16636 components: - type: Transform @@ -32188,141 +32013,11 @@ entities: - type: Transform pos: 22.5,-63.5 parent: 8364 - - uid: 16777 - components: - - type: Transform - pos: 23.5,-63.5 - parent: 8364 - - uid: 16778 - components: - - type: Transform - pos: 23.5,-64.5 - parent: 8364 - - uid: 16779 - components: - - type: Transform - pos: 23.5,-65.5 - parent: 8364 - - uid: 16780 - components: - - type: Transform - pos: 23.5,-66.5 - parent: 8364 - - uid: 16781 - components: - - type: Transform - pos: 23.5,-67.5 - parent: 8364 - - uid: 16783 - components: - - type: Transform - pos: 21.5,-67.5 - parent: 8364 - - uid: 16784 - components: - - type: Transform - pos: 20.5,-67.5 - parent: 8364 - - uid: 16785 - components: - - type: Transform - pos: 19.5,-67.5 - parent: 8364 - - uid: 16786 - components: - - type: Transform - pos: 18.5,-67.5 - parent: 8364 - - uid: 16787 - components: - - type: Transform - pos: 17.5,-67.5 - parent: 8364 - - uid: 16788 - components: - - type: Transform - pos: 16.5,-67.5 - parent: 8364 - - uid: 16789 - components: - - type: Transform - pos: 15.5,-67.5 - parent: 8364 - - uid: 16790 - components: - - type: Transform - pos: 14.5,-67.5 - parent: 8364 - - uid: 16791 - components: - - type: Transform - pos: 13.5,-67.5 - parent: 8364 - - uid: 16792 - components: - - type: Transform - pos: 12.5,-67.5 - parent: 8364 - - uid: 16793 - components: - - type: Transform - pos: 11.5,-67.5 - parent: 8364 - - uid: 16794 - components: - - type: Transform - pos: 11.5,-66.5 - parent: 8364 - - uid: 16795 - components: - - type: Transform - pos: 11.5,-65.5 - parent: 8364 - - uid: 16796 - components: - - type: Transform - pos: 11.5,-64.5 - parent: 8364 - - uid: 16797 - components: - - type: Transform - pos: 11.5,-63.5 - parent: 8364 - uid: 16798 components: - type: Transform pos: 12.5,-63.5 parent: 8364 - - uid: 16799 - components: - - type: Transform - pos: 15.5,-64.5 - parent: 8364 - - uid: 16800 - components: - - type: Transform - pos: 15.5,-65.5 - parent: 8364 - - uid: 16801 - components: - - type: Transform - pos: 15.5,-66.5 - parent: 8364 - - uid: 16802 - components: - - type: Transform - pos: 19.5,-64.5 - parent: 8364 - - uid: 16803 - components: - - type: Transform - pos: 19.5,-65.5 - parent: 8364 - - uid: 16804 - components: - - type: Transform - pos: 19.5,-66.5 - parent: 8364 - uid: 16805 components: - type: Transform @@ -112272,11 +111967,6 @@ entities: - type: Transform pos: -6.5,2.5 parent: 8364 - - uid: 120 - components: - - type: Transform - pos: 28.5,-45.5 - parent: 8364 - uid: 211 components: - type: Transform @@ -113041,11 +112731,6 @@ entities: - type: Transform pos: -54.5,-19.5 parent: 8364 - - uid: 1301 - components: - - type: Transform - pos: 28.5,-53.5 - parent: 8364 - uid: 1344 components: - type: Transform @@ -114645,16 +114330,6 @@ entities: - type: Transform pos: -12.5,-77.5 parent: 8364 - - uid: 3702 - components: - - type: Transform - pos: 29.5,-49.5 - parent: 8364 - - uid: 3703 - components: - - type: Transform - pos: 29.5,-50.5 - parent: 8364 - uid: 3715 components: - type: Transform @@ -114675,36 +114350,6 @@ entities: - type: Transform pos: -1.5,-72.5 parent: 8364 - - uid: 3808 - components: - - type: Transform - pos: 25.5,-53.5 - parent: 8364 - - uid: 3809 - components: - - type: Transform - pos: 26.5,-53.5 - parent: 8364 - - uid: 3810 - components: - - type: Transform - pos: 27.5,-53.5 - parent: 8364 - - uid: 3811 - components: - - type: Transform - pos: 27.5,-49.5 - parent: 8364 - - uid: 3812 - components: - - type: Transform - pos: 29.5,-46.5 - parent: 8364 - - uid: 3813 - components: - - type: Transform - pos: 29.5,-48.5 - parent: 8364 - uid: 3832 components: - type: Transform @@ -117966,51 +117611,6 @@ entities: - type: Transform pos: -2.5,-65.5 parent: 8364 - - uid: 15105 - components: - - type: Transform - pos: 19.5,-63.5 - parent: 8364 - - uid: 15106 - components: - - type: Transform - pos: 29.5,-57.5 - parent: 8364 - - uid: 15126 - components: - - type: Transform - pos: 16.5,-67.5 - parent: 8364 - - uid: 15127 - components: - - type: Transform - pos: 17.5,-67.5 - parent: 8364 - - uid: 15128 - components: - - type: Transform - pos: 15.5,-64.5 - parent: 8364 - - uid: 15129 - components: - - type: Transform - pos: 15.5,-65.5 - parent: 8364 - - uid: 15136 - components: - - type: Transform - pos: 25.5,-57.5 - parent: 8364 - - uid: 15137 - components: - - type: Transform - pos: 15.5,-63.5 - parent: 8364 - - uid: 15139 - components: - - type: Transform - pos: 15.5,-66.5 - parent: 8364 - uid: 15343 components: - type: Transform @@ -118026,141 +117626,6 @@ entities: - type: Transform pos: -29.5,-26.5 parent: 8364 - - uid: 15903 - components: - - type: Transform - pos: 29.5,-56.5 - parent: 8364 - - uid: 15984 - components: - - type: Transform - pos: 29.5,-55.5 - parent: 8364 - - uid: 16057 - components: - - type: Transform - pos: 29.5,-54.5 - parent: 8364 - - uid: 16082 - components: - - type: Transform - pos: 29.5,-53.5 - parent: 8364 - - uid: 16128 - components: - - type: Transform - pos: 29.5,-51.5 - parent: 8364 - - uid: 16131 - components: - - type: Transform - pos: 11.5,-67.5 - parent: 8364 - - uid: 16134 - components: - - type: Transform - pos: 12.5,-67.5 - parent: 8364 - - uid: 16140 - components: - - type: Transform - pos: 13.5,-67.5 - parent: 8364 - - uid: 16142 - components: - - type: Transform - pos: 14.5,-67.5 - parent: 8364 - - uid: 16143 - components: - - type: Transform - pos: 15.5,-67.5 - parent: 8364 - - uid: 16144 - components: - - type: Transform - pos: 19.5,-66.5 - parent: 8364 - - uid: 16148 - components: - - type: Transform - pos: 23.5,-63.5 - parent: 8364 - - uid: 16149 - components: - - type: Transform - pos: 19.5,-64.5 - parent: 8364 - - uid: 16150 - components: - - type: Transform - pos: 19.5,-65.5 - parent: 8364 - - uid: 16151 - components: - - type: Transform - pos: 22.5,-67.5 - parent: 8364 - - uid: 16152 - components: - - type: Transform - pos: 23.5,-67.5 - parent: 8364 - - uid: 16155 - components: - - type: Transform - pos: 23.5,-66.5 - parent: 8364 - - uid: 16156 - components: - - type: Transform - pos: 23.5,-65.5 - parent: 8364 - - uid: 16157 - components: - - type: Transform - pos: 23.5,-64.5 - parent: 8364 - - uid: 16159 - components: - - type: Transform - pos: 20.5,-67.5 - parent: 8364 - - uid: 16160 - components: - - type: Transform - pos: 27.5,-57.5 - parent: 8364 - - uid: 16161 - components: - - type: Transform - pos: 28.5,-57.5 - parent: 8364 - - uid: 16168 - components: - - type: Transform - pos: 29.5,-52.5 - parent: 8364 - - uid: 16169 - components: - - type: Transform - pos: 18.5,-67.5 - parent: 8364 - - uid: 16170 - components: - - type: Transform - pos: 19.5,-67.5 - parent: 8364 - - uid: 16208 - components: - - type: Transform - pos: 21.5,-67.5 - parent: 8364 - - uid: 16209 - components: - - type: Transform - pos: 26.5,-57.5 - parent: 8364 - uid: 16526 components: - type: Transform @@ -118211,11 +117676,6 @@ entities: - type: Transform pos: 20.5,-63.5 parent: 8364 - - uid: 16877 - components: - - type: Transform - pos: 29.5,-45.5 - parent: 8364 - uid: 16884 components: - type: Transform @@ -118271,41 +117731,11 @@ entities: - type: Transform pos: 4.5,-78.5 parent: 8364 - - uid: 16940 - components: - - type: Transform - pos: 11.5,-64.5 - parent: 8364 - - uid: 16941 - components: - - type: Transform - pos: 11.5,-63.5 - parent: 8364 - - uid: 16958 - components: - - type: Transform - pos: 11.5,-65.5 - parent: 8364 - - uid: 16959 - components: - - type: Transform - pos: 11.5,-66.5 - parent: 8364 - uid: 16972 components: - type: Transform pos: 3.5,-78.5 parent: 8364 - - uid: 16973 - components: - - type: Transform - pos: 26.5,-49.5 - parent: 8364 - - uid: 16974 - components: - - type: Transform - pos: 25.5,-49.5 - parent: 8364 - uid: 16986 components: - type: Transform @@ -118356,11 +117786,6 @@ entities: - type: Transform pos: -4.5,-100.5 parent: 8364 - - uid: 17153 - components: - - type: Transform - pos: 29.5,-44.5 - parent: 8364 - uid: 17154 components: - type: Transform @@ -118496,26 +117921,11 @@ entities: - type: Transform pos: -18.5,-29.5 parent: 8364 - - uid: 17670 - components: - - type: Transform - pos: 26.5,-41.5 - parent: 8364 - - uid: 17688 - components: - - type: Transform - pos: 29.5,-47.5 - parent: 8364 - uid: 17709 components: - type: Transform pos: 13.5,-51.5 parent: 8364 - - uid: 17710 - components: - - type: Transform - pos: 25.5,-41.5 - parent: 8364 - uid: 17721 components: - type: Transform @@ -118526,11 +117936,6 @@ entities: - type: Transform pos: -34.5,-26.5 parent: 8364 - - uid: 17764 - components: - - type: Transform - pos: 29.5,-41.5 - parent: 8364 - uid: 17785 components: - type: Transform @@ -118897,11 +118302,6 @@ entities: - type: Transform pos: 13.5,-50.5 parent: 8364 - - uid: 20152 - components: - - type: Transform - pos: 25.5,-45.5 - parent: 8364 - uid: 20195 components: - type: Transform @@ -118927,11 +118327,6 @@ entities: - type: Transform pos: 23.5,-34.5 parent: 8364 - - uid: 21110 - components: - - type: Transform - pos: 29.5,-42.5 - parent: 8364 - uid: 21130 components: - type: Transform @@ -118942,16 +118337,6 @@ entities: - type: Transform pos: 76.5,-48.5 parent: 8364 - - uid: 21231 - components: - - type: Transform - pos: 28.5,-41.5 - parent: 8364 - - uid: 21239 - components: - - type: Transform - pos: 26.5,-45.5 - parent: 8364 - uid: 21337 components: - type: Transform @@ -119232,16 +118617,6 @@ entities: - type: Transform pos: 14.5,-53.5 parent: 8364 - - uid: 23204 - components: - - type: Transform - pos: 27.5,-45.5 - parent: 8364 - - uid: 23211 - components: - - type: Transform - pos: 28.5,-49.5 - parent: 8364 - uid: 23212 components: - type: Transform @@ -119347,11 +118722,6 @@ entities: - type: Transform pos: 12.5,-28.5 parent: 8364 - - uid: 26088 - components: - - type: Transform - pos: 29.5,-43.5 - parent: 8364 - uid: 26472 components: - type: Transform @@ -132681,6 +132051,11 @@ entities: parent: 8364 - proto: ReinforcedPlasmaWindow entities: + - uid: 120 + components: + - type: Transform + pos: 25.5,-50.5 + parent: 8364 - uid: 3494 components: - type: Transform @@ -132801,11 +132176,6 @@ entities: - type: Transform pos: 25.5,-51.5 parent: 8364 - - uid: 22889 - components: - - type: Transform - pos: 25.5,-50.5 - parent: 8364 - uid: 22890 components: - type: Transform From c237ef284374a068946cc81c875ac4c0d0c91b48 Mon Sep 17 00:00:00 2001 From: JustCone <141039037+JustCone14@users.noreply.github.com> Date: Sun, 4 Aug 2024 19:40:41 +0100 Subject: [PATCH 167/422] Fland Atmos Gas Miners Grille Removal (#30615) Removes grilles from atmos gas miners on Fland --- Resources/Maps/fland.yml | 265 --------------------------------------- 1 file changed, 265 deletions(-) diff --git a/Resources/Maps/fland.yml b/Resources/Maps/fland.yml index 80bce4b922..c9cd7c1d0a 100644 --- a/Resources/Maps/fland.yml +++ b/Resources/Maps/fland.yml @@ -156995,141 +156995,6 @@ entities: - type: Transform pos: 98.5,-18.5 parent: 13329 - - uid: 20449 - components: - - type: Transform - pos: 69.5,-43.5 - parent: 13329 - - uid: 20450 - components: - - type: Transform - pos: 69.5,-42.5 - parent: 13329 - - uid: 20451 - components: - - type: Transform - pos: 69.5,-41.5 - parent: 13329 - - uid: 20452 - components: - - type: Transform - pos: 69.5,-40.5 - parent: 13329 - - uid: 20453 - components: - - type: Transform - pos: 69.5,-39.5 - parent: 13329 - - uid: 20454 - components: - - type: Transform - pos: 70.5,-43.5 - parent: 13329 - - uid: 20455 - components: - - type: Transform - pos: 71.5,-43.5 - parent: 13329 - - uid: 20456 - components: - - type: Transform - pos: 72.5,-43.5 - parent: 13329 - - uid: 20457 - components: - - type: Transform - pos: 73.5,-43.5 - parent: 13329 - - uid: 20458 - components: - - type: Transform - pos: 74.5,-43.5 - parent: 13329 - - uid: 20459 - components: - - type: Transform - pos: 75.5,-43.5 - parent: 13329 - - uid: 20460 - components: - - type: Transform - pos: 76.5,-43.5 - parent: 13329 - - uid: 20461 - components: - - type: Transform - pos: 77.5,-43.5 - parent: 13329 - - uid: 20462 - components: - - type: Transform - pos: 78.5,-43.5 - parent: 13329 - - uid: 20463 - components: - - type: Transform - pos: 79.5,-43.5 - parent: 13329 - - uid: 20464 - components: - - type: Transform - pos: 80.5,-43.5 - parent: 13329 - - uid: 20465 - components: - - type: Transform - pos: 81.5,-43.5 - parent: 13329 - - uid: 20466 - components: - - type: Transform - pos: 81.5,-42.5 - parent: 13329 - - uid: 20467 - components: - - type: Transform - pos: 81.5,-41.5 - parent: 13329 - - uid: 20468 - components: - - type: Transform - pos: 81.5,-40.5 - parent: 13329 - - uid: 20469 - components: - - type: Transform - pos: 81.5,-39.5 - parent: 13329 - - uid: 20470 - components: - - type: Transform - pos: 77.5,-42.5 - parent: 13329 - - uid: 20472 - components: - - type: Transform - pos: 77.5,-40.5 - parent: 13329 - - uid: 20473 - components: - - type: Transform - pos: 77.5,-39.5 - parent: 13329 - - uid: 20474 - components: - - type: Transform - pos: 73.5,-42.5 - parent: 13329 - - uid: 20476 - components: - - type: Transform - pos: 73.5,-40.5 - parent: 13329 - - uid: 20477 - components: - - type: Transform - pos: 73.5,-39.5 - parent: 13329 - uid: 20506 components: - type: Transform @@ -157145,136 +157010,6 @@ entities: - type: Transform pos: 90.5,-41.5 parent: 13329 - - uid: 20531 - components: - - type: Transform - pos: 90.5,-44.5 - parent: 13329 - - uid: 20532 - components: - - type: Transform - pos: 91.5,-44.5 - parent: 13329 - - uid: 20533 - components: - - type: Transform - pos: 92.5,-44.5 - parent: 13329 - - uid: 20534 - components: - - type: Transform - pos: 93.5,-44.5 - parent: 13329 - - uid: 20535 - components: - - type: Transform - pos: 94.5,-44.5 - parent: 13329 - - uid: 20536 - components: - - type: Transform - pos: 94.5,-43.5 - parent: 13329 - - uid: 20537 - components: - - type: Transform - pos: 94.5,-42.5 - parent: 13329 - - uid: 20538 - components: - - type: Transform - pos: 94.5,-41.5 - parent: 13329 - - uid: 20539 - components: - - type: Transform - pos: 94.5,-40.5 - parent: 13329 - - uid: 20540 - components: - - type: Transform - pos: 94.5,-39.5 - parent: 13329 - - uid: 20541 - components: - - type: Transform - pos: 94.5,-38.5 - parent: 13329 - - uid: 20542 - components: - - type: Transform - pos: 94.5,-37.5 - parent: 13329 - - uid: 20543 - components: - - type: Transform - pos: 94.5,-36.5 - parent: 13329 - - uid: 20544 - components: - - type: Transform - pos: 94.5,-35.5 - parent: 13329 - - uid: 20545 - components: - - type: Transform - pos: 94.5,-34.5 - parent: 13329 - - uid: 20546 - components: - - type: Transform - pos: 94.5,-33.5 - parent: 13329 - - uid: 20547 - components: - - type: Transform - pos: 94.5,-32.5 - parent: 13329 - - uid: 20548 - components: - - type: Transform - pos: 93.5,-32.5 - parent: 13329 - - uid: 20549 - components: - - type: Transform - pos: 91.5,-32.5 - parent: 13329 - - uid: 20550 - components: - - type: Transform - pos: 90.5,-32.5 - parent: 13329 - - uid: 20551 - components: - - type: Transform - pos: 93.5,-40.5 - parent: 13329 - - uid: 20552 - components: - - type: Transform - pos: 93.5,-36.5 - parent: 13329 - - uid: 20553 - components: - - type: Transform - pos: 91.5,-36.5 - parent: 13329 - - uid: 20554 - components: - - type: Transform - pos: 90.5,-36.5 - parent: 13329 - - uid: 20555 - components: - - type: Transform - pos: 91.5,-40.5 - parent: 13329 - - uid: 20556 - components: - - type: Transform - pos: 90.5,-40.5 - parent: 13329 - uid: 20572 components: - type: Transform From 8e43bb1b07a7b858893da1402a129c4fb32ae870 Mon Sep 17 00:00:00 2001 From: OrangeMoronage9622 Date: Sun, 4 Aug 2024 20:07:34 +0100 Subject: [PATCH 168/422] fml to chatsan (#30651) --- Resources/Locale/en-US/speech/speech-chatsan.ftl | 3 +++ Resources/Prototypes/Accents/word_replacements.yml | 1 + 2 files changed, 4 insertions(+) diff --git a/Resources/Locale/en-US/speech/speech-chatsan.ftl b/Resources/Locale/en-US/speech/speech-chatsan.ftl index 1f6f12195f..08edd6c204 100644 --- a/Resources/Locale/en-US/speech/speech-chatsan.ftl +++ b/Resources/Locale/en-US/speech/speech-chatsan.ftl @@ -153,3 +153,6 @@ chatsan-replacement-54 = for sure chatsan-word-55 = ngl chatsan-replacement-55 = not gonna lie + +chatsan-word-56 = fml +chatsan-replacement-56 = fuck my life diff --git a/Resources/Prototypes/Accents/word_replacements.yml b/Resources/Prototypes/Accents/word_replacements.yml index 73a4a50369..13e0baa66a 100644 --- a/Resources/Prototypes/Accents/word_replacements.yml +++ b/Resources/Prototypes/Accents/word_replacements.yml @@ -436,6 +436,7 @@ chatsan-word-53: chatsan-replacement-53 chatsan-word-54: chatsan-replacement-54 chatsan-word-55: chatsan-replacement-55 + chatsan-word-56: chatsan-replacement-56 - type: accent id: liar From b306130fbcada47a5c76d58ccb954a2227950c62 Mon Sep 17 00:00:00 2001 From: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com> Date: Sun, 4 Aug 2024 19:08:13 +0000 Subject: [PATCH 169/422] tweak(grammar): Correct multiple instances of incorrect "it's" usage (#30641) --- Resources/Locale/en-US/administration/admin-verbs.ftl | 2 +- Resources/Locale/en-US/administration/smites.ftl | 2 +- Resources/Locale/en-US/reagents/meta/medicine.ftl | 2 +- Resources/Prototypes/Entities/Mobs/Player/guardian.yml | 2 +- Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml | 2 +- Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Locale/en-US/administration/admin-verbs.ftl b/Resources/Locale/en-US/administration/admin-verbs.ftl index 24294f0529..a89397bd65 100644 --- a/Resources/Locale/en-US/administration/admin-verbs.ftl +++ b/Resources/Locale/en-US/administration/admin-verbs.ftl @@ -13,6 +13,6 @@ admin-verbs-erase-description = Removes the player from the round and crew manif Their items are dropped on the ground. Players are shown a popup indicating them to play as if they never existed. toolshed-verb-mark = Mark -toolshed-verb-mark-description = Places this entity into the $marked variable, a list of entities, replacing it's prior value. +toolshed-verb-mark-description = Places this entity into the $marked variable, a list of entities, replacing its prior value. export-entity-verb-get-data-text = Export sprite diff --git a/Resources/Locale/en-US/administration/smites.ftl b/Resources/Locale/en-US/administration/smites.ftl index 51c86dfb44..e77725765b 100644 --- a/Resources/Locale/en-US/administration/smites.ftl +++ b/Resources/Locale/en-US/administration/smites.ftl @@ -126,7 +126,7 @@ admin-trick-rename-and-redescribe-description = Convenient bundle of both rename admin-trick-bar-job-slots-description = Closes all job slots on the station, such that nobody can join it. admin-trick-locate-cargo-shuttle-description = Teleports you directly to the station's cargo shuttle, if it exists. admin-trick-infinite-battery-description = Reconfigures the SMESes and substations on the grid/station/map to self-recharge rapidly. -admin-trick-infinite-battery-object-description = Reconfigures the item so that it's battery rapidly refills. +admin-trick-infinite-battery-object-description = Reconfigures the item so that its battery rapidly refills. admin-trick-halt-movement-description = Halts the movement of the target object, at least until something moves it again. admin-trick-unpause-map-description = Unpause the selected map. NOTE THIS CAN CAUSE BAD BEHAVIOR WITH STORAGE MAPS! admin-trick-pause-map-description = Pause the selected map. Note this doesn't entirely stop player movement! diff --git a/Resources/Locale/en-US/reagents/meta/medicine.ftl b/Resources/Locale/en-US/reagents/meta/medicine.ftl index 1e34411efb..a0c27d5291 100644 --- a/Resources/Locale/en-US/reagents/meta/medicine.ftl +++ b/Resources/Locale/en-US/reagents/meta/medicine.ftl @@ -83,7 +83,7 @@ reagent-name-lipozine = lipozine reagent-desc-lipozine = A chemical that accelerates metabolism, causing the user to hunger faster. reagent-name-omnizine = omnizine -reagent-desc-omnizine = A soothing milky liquid with an iridescent gleam. A well known conspiracy theory says that it's origins remain a mystery because revealing the secrets of its production would render most commercial pharmaceuticals obsolete. +reagent-desc-omnizine = A soothing milky liquid with an iridescent gleam. A well known conspiracy theory says that its origins remain a mystery because revealing the secrets of its production would render most commercial pharmaceuticals obsolete. reagent-name-ultravasculine = ultravasculine reagent-desc-ultravasculine = A complicated anti-toxin solution that quickly flushes out toxin while causing minor stress on the body. Reacts with histamine, duplicating itself while flushing it out. Overdose causes extreme pain. diff --git a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml index eececb70da..b21f19edd3 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/guardian.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/guardian.yml @@ -148,7 +148,7 @@ name: Ifrit parent: MobGuardianBase id: MobIfritGuardian - description: A corrupted jinn, ripped from fitra to serve the wizard's petty needs. It stands wicked, tuning into it's owner's life to sustain itself. + description: A corrupted jinn, ripped from fitra to serve the wizard's petty needs. It stands wicked, tuning into its owner's life to sustain itself. components: - type: GhostRole allowMovement: true diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml index 78f21eab7c..59b1db1782 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml @@ -361,7 +361,7 @@ name: dragon flesh parent: FoodMeatBase id: FoodMeatDragon - description: The dense meat of the space-era apex predator is oozing with it's mythical ichor. Ironically, best eaten raw. + description: The dense meat of the space-era apex predator is oozing with its mythical ichor. Ironically, best eaten raw. components: - type: Tag tags: diff --git a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml index 6d911ee29c..a8495cef01 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml @@ -158,7 +158,7 @@ parent: ExtendedEmergencyOxygenTank id: DoubleEmergencyOxygenTank name: double emergency oxygen tank - description: A high-grade dual-tank emergency life support container. It holds a decent amount of oxygen for it's small size. It can hold 2.5 L of gas. + description: A high-grade dual-tank emergency life support container. It holds a decent amount of oxygen for its small size. It can hold 2.5 L of gas. components: - type: Sprite sprite: Objects/Tanks/emergency_double.rsi From c04f71728eda8a74f1057608d28195f395ef1a02 Mon Sep 17 00:00:00 2001 From: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com> Date: Sun, 4 Aug 2024 19:09:01 +0000 Subject: [PATCH 170/422] tweak(grammar): Correct multiple instances of incorrect "its" usage (#30640) --- Resources/Locale/en-US/advertisements/vending/lawdrobe.ftl | 2 +- Resources/Prototypes/Entities/Mobs/NPCs/lavaland.yml | 2 +- .../Entities/Objects/Consumable/Drinks/drinks_bottles.yml | 2 +- .../Prototypes/Entities/Objects/Devices/encryption_keys.yml | 2 +- .../Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Locale/en-US/advertisements/vending/lawdrobe.ftl b/Resources/Locale/en-US/advertisements/vending/lawdrobe.ftl index d91ca5e3df..5473f162da 100644 --- a/Resources/Locale/en-US/advertisements/vending/lawdrobe.ftl +++ b/Resources/Locale/en-US/advertisements/vending/lawdrobe.ftl @@ -9,5 +9,5 @@ advertisement-lawdrobe-8 = You or a loved one hurt by Nanotrasen? Too bad! thankyou-lawdrobe-1 = You can win any case in that outfit! thankyou-lawdrobe-2 = Get one for your client as well! thankyou-lawdrobe-3 = Win or lose, you get paid either way! -thankyou-lawdrobe-4 = Remember: Its only illegal if you get caught! +thankyou-lawdrobe-4 = Remember: It's only illegal if you get caught! thankyou-lawdrobe-5 = OBJECTION! That outfit is too cool for court! diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/lavaland.yml b/Resources/Prototypes/Entities/Mobs/NPCs/lavaland.yml index edbfb5bf12..7571d8c8f4 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/lavaland.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/lavaland.yml @@ -3,7 +3,7 @@ id: MobWatcherBase parent: [ SimpleSpaceMobBase, FlyingMobBase ] abstract: true - description: It's like its staring right through you. + description: It's like it's staring right through you. components: - type: NpcFactionMember factions: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml index f894b170f4..8052c5d0ae 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml @@ -869,7 +869,7 @@ parent: DrinkBottlePlasticBaseFull id: DrinkGreenTeaJug name: green tea jug - description: its like tea... but green! great for settling the stomach. + description: It's like tea... but green! great for settling the stomach. components: - type: SolutionContainerManager solutions: diff --git a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml index 75cca71221..08260acb88 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml @@ -233,7 +233,7 @@ parent: EncryptionKey id: EncryptionKeyFreelance name: freelancer encryption key - description: An encryption key used by freelancers, who may or may not have an affiliation. It looks like its worn out. + description: An encryption key used by freelancers, who may or may not have an affiliation. It looks like it's worn out. components: - type: EncryptionKey channels: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml index 1308eff1be..2b5889a3dd 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml @@ -1170,7 +1170,7 @@ parent: BaseSign id: SignSomethingOld name: old sign - description: Technical information of some sort, shame its too worn-out to read. + description: Technical information of some sort, shame it's too worn-out to read. components: - type: Sprite state: something-old1 @@ -1179,7 +1179,7 @@ parent: BaseSign id: SignSomethingOld2 name: old sign - description: Looks like a planet crashing by some station above it. Its kinda scary. + description: Looks like a planet crashing by some station above it. It's kinda scary. components: - type: Sprite state: something-old2 From d87d9c467626fab1d8f33da5949b16e9e8d120eb Mon Sep 17 00:00:00 2001 From: Plykiya <58439124+Plykiya@users.noreply.github.com> Date: Sun, 4 Aug 2024 18:24:40 -0700 Subject: [PATCH 171/422] Fix GhostRoleRadio icons (#30650) Co-authored-by: plykiya --- Content.Client/Ghost/GhostRoleRadioBoundUserInterface.cs | 2 +- Content.Client/Ghost/GhostRoleRadioMenu.xaml.cs | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Content.Client/Ghost/GhostRoleRadioBoundUserInterface.cs b/Content.Client/Ghost/GhostRoleRadioBoundUserInterface.cs index 33944973b5..52ea835f4a 100644 --- a/Content.Client/Ghost/GhostRoleRadioBoundUserInterface.cs +++ b/Content.Client/Ghost/GhostRoleRadioBoundUserInterface.cs @@ -22,7 +22,7 @@ public sealed class GhostRoleRadioBoundUserInterface : BoundUserInterface _ghostRoleRadioMenu.SendGhostRoleRadioMessageAction += SendGhostRoleRadioMessage; } - public void SendGhostRoleRadioMessage(ProtoId protoId) + private void SendGhostRoleRadioMessage(ProtoId protoId) { SendMessage(new GhostRoleRadioMessage(protoId)); } diff --git a/Content.Client/Ghost/GhostRoleRadioMenu.xaml.cs b/Content.Client/Ghost/GhostRoleRadioMenu.xaml.cs index b05ac3fbdd..3897b1b949 100644 --- a/Content.Client/Ghost/GhostRoleRadioMenu.xaml.cs +++ b/Content.Client/Ghost/GhostRoleRadioMenu.xaml.cs @@ -1,7 +1,6 @@ using Content.Client.UserInterface.Controls; using Content.Shared.Ghost.Roles; using Content.Shared.Ghost.Roles.Components; -using Robust.Client.GameObjects; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.XAML; @@ -33,7 +32,7 @@ public sealed partial class GhostRoleRadioMenu : RadialMenu private void RefreshUI() { - // The main control that will contain all of the clickable options + // The main control that will contain all the clickable options var main = FindControl("Main"); // The purpose of this radial UI is for ghost role radios that allow you to select @@ -70,7 +69,7 @@ public sealed partial class GhostRoleRadioMenu : RadialMenu if (_prototypeManager.TryIndex(ghostRoleProto.IconPrototype, out var iconProto)) entProtoView.SetPrototype(iconProto); else - entProtoView.SetPrototype(comp.Prototype); + entProtoView.SetPrototype(ghostRoleProto.EntityPrototype); button.AddChild(entProtoView); main.AddChild(button); From 84a9253b10f2ffa888aad4f4bc2c3fa9bfe8b494 Mon Sep 17 00:00:00 2001 From: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com> Date: Sun, 4 Aug 2024 20:14:01 -0700 Subject: [PATCH 172/422] Fix falsely showing damage color effect to entities that aren't allowed to be attacked (#30661) --- Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs index 72cf4ec550..ae0ebfe74c 100644 --- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs +++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs @@ -625,14 +625,18 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem var appliedDamage = new DamageSpecifier(); - foreach (var entity in targets) + for (var i = targets.Count - 1; i >= 0; i--) { + var entity = targets[i]; // We raise an attack attempt here as well, // primarily because this was an untargeted wideswing: if a subscriber to that event cared about // the potential target (such as for pacifism), they need to be made aware of the target here. // In that case, just continue. if (!Blocker.CanAttack(user, entity, (weapon, component))) + { + targets.RemoveAt(i); continue; + } var attackedEvent = new AttackedEvent(meleeUid, user, GetCoordinates(ev.Coordinates)); RaiseLocalEvent(entity, attackedEvent); From 490de1de4e724f1aa86525ea59cc54abbb7f2968 Mon Sep 17 00:00:00 2001 From: beck-thompson <107373427+beck-thompson@users.noreply.github.com> Date: Sun, 4 Aug 2024 20:15:07 -0700 Subject: [PATCH 173/422] Explosion resistance is now predicted! (#30654) * First commit * Added Network and access --- Content.Client/Explosion/ExplosionSystem.cs | 8 ++++++ .../EntitySystems/ExplosionSystem.Airtight.cs | 4 +-- .../EntitySystems/ExplosionSystem.CVars.cs | 4 +-- .../EntitySystems/ExplosionSystem.GridMap.cs | 3 ++- .../ExplosionSystem.Processing.cs | 4 +-- .../EntitySystems/ExplosionSystem.TileFill.cs | 4 +-- .../EntitySystems/ExplosionSystem.Visuals.cs | 4 +-- .../EntitySystems/ExplosionSystem.cs | 17 +++---------- .../ExplosionResistanceComponent.cs | 10 ++++---- .../EntitySystems/SharedExplosionSystem.cs | 25 +++++++++++++++++++ 10 files changed, 53 insertions(+), 30 deletions(-) create mode 100644 Content.Client/Explosion/ExplosionSystem.cs rename {Content.Server => Content.Shared}/Explosion/Components/ExplosionResistanceComponent.cs (89%) create mode 100644 Content.Shared/Explosion/EntitySystems/SharedExplosionSystem.cs diff --git a/Content.Client/Explosion/ExplosionSystem.cs b/Content.Client/Explosion/ExplosionSystem.cs new file mode 100644 index 0000000000..a2ed2d50e0 --- /dev/null +++ b/Content.Client/Explosion/ExplosionSystem.cs @@ -0,0 +1,8 @@ +using Content.Shared.Explosion.EntitySystems; + +namespace Content.Client.Explosion.EntitySystems; + +public sealed class ExplosionSystem : SharedExplosionSystem +{ + +} diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Airtight.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Airtight.cs index 55e8de2632..4b59c8f1c4 100644 --- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Airtight.cs +++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Airtight.cs @@ -3,12 +3,12 @@ using Content.Server.Destructible; using Content.Shared.Atmos; using Content.Shared.Damage; using Content.Shared.Explosion; +using Content.Shared.Explosion.EntitySystems; using Content.Shared.FixedPoint; using Robust.Shared.Map.Components; - namespace Content.Server.Explosion.EntitySystems; -public sealed partial class ExplosionSystem : EntitySystem +public sealed partial class ExplosionSystem : SharedExplosionSystem { [Dependency] private readonly DestructibleSystem _destructibleSystem = default!; diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.CVars.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.CVars.cs index 3332d3a4f5..ce98f89de7 100644 --- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.CVars.cs +++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.CVars.cs @@ -1,8 +1,8 @@ using Content.Shared.CCVar; - +using Content.Shared.Explosion.EntitySystems; namespace Content.Server.Explosion.EntitySystems; -public sealed partial class ExplosionSystem : EntitySystem +public sealed partial class ExplosionSystem : SharedExplosionSystem { public int MaxIterations { get; private set; } public int MaxArea { get; private set; } diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs index 556fe7c141..d88945bc19 100644 --- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs +++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs @@ -2,6 +2,7 @@ using System.Numerics; using Content.Shared.Atmos; using Content.Shared.Explosion; using Content.Shared.Explosion.Components; +using Content.Shared.Explosion.EntitySystems; using Robust.Shared.Map; using Robust.Shared.Map.Components; @@ -11,7 +12,7 @@ namespace Content.Server.Explosion.EntitySystems; // A good portion of it is focused around keeping track of what tile-indices on a grid correspond to tiles that border // space. AFAIK no other system currently needs to track these "edge-tiles". If they do, this should probably be a // property of the grid itself? -public sealed partial class ExplosionSystem : EntitySystem +public sealed partial class ExplosionSystem : SharedExplosionSystem { /// /// Set of tiles of each grid that are directly adjacent to space, along with the directions that face space. diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs index c30a9ce300..3cab1213b6 100644 --- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs +++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Processing.cs @@ -4,6 +4,7 @@ using Content.Shared.CCVar; using Content.Shared.Damage; using Content.Shared.Explosion; using Content.Shared.Explosion.Components; +using Content.Shared.Explosion.EntitySystems; using Content.Shared.Maps; using Content.Shared.Physics; using Content.Shared.Projectiles; @@ -17,10 +18,9 @@ using Robust.Shared.Random; using Robust.Shared.Timing; using Robust.Shared.Utility; using TimedDespawnComponent = Robust.Shared.Spawners.TimedDespawnComponent; - namespace Content.Server.Explosion.EntitySystems; -public sealed partial class ExplosionSystem +public sealed partial class ExplosionSystem : SharedExplosionSystem { [Dependency] private readonly FlammableSystem _flammableSystem = default!; diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs index 8b4c0e14c5..8c3229e06e 100644 --- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs +++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.TileFill.cs @@ -7,13 +7,13 @@ using Robust.Shared.Map; using Robust.Shared.Map.Components; using Robust.Shared.Physics.Components; using Robust.Shared.Timing; - +using Content.Shared.Explosion.EntitySystems; namespace Content.Server.Explosion.EntitySystems; // This partial part of the explosion system has all of the functions used to create the actual explosion map. // I.e, to get the sets of tiles & intensity values that describe an explosion. -public sealed partial class ExplosionSystem : EntitySystem +public sealed partial class ExplosionSystem : SharedExplosionSystem { /// /// This is the main explosion generating function. diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Visuals.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Visuals.cs index 5db8b55bf9..219dba4bde 100644 --- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.Visuals.cs +++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.Visuals.cs @@ -1,14 +1,14 @@ using System.Numerics; using Content.Shared.Explosion; using Content.Shared.Explosion.Components; +using Content.Shared.Explosion.EntitySystems; using Robust.Server.GameObjects; using Robust.Shared.GameStates; using Robust.Shared.Map; - namespace Content.Server.Explosion.EntitySystems; // This part of the system handled send visual / overlay data to clients. -public sealed partial class ExplosionSystem : EntitySystem +public sealed partial class ExplosionSystem : SharedExplosionSystem { public void InitVisuals() { diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs index b9f0f6fdb7..1eeed949cc 100644 --- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs +++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs @@ -16,6 +16,8 @@ using Content.Shared.GameTicking; using Content.Shared.Inventory; using Content.Shared.Projectiles; using Content.Shared.Throwing; +using Content.Shared.Explosion.Components; +using Content.Shared.Explosion.EntitySystems; using Robust.Server.GameStates; using Robust.Server.Player; using Robust.Shared.Audio.Systems; @@ -29,7 +31,7 @@ using Robust.Shared.Utility; namespace Content.Server.Explosion.EntitySystems; -public sealed partial class ExplosionSystem : EntitySystem +public sealed partial class ExplosionSystem : SharedExplosionSystem { [Dependency] private readonly IMapManager _mapManager = default!; [Dependency] private readonly IRobustRandom _robustRandom = default!; @@ -92,8 +94,6 @@ public sealed partial class ExplosionSystem : EntitySystem SubscribeLocalEvent(OnReset); - SubscribeLocalEvent(OnArmorExamine); - // Handled by ExplosionSystem.Processing.cs SubscribeLocalEvent(OnMapChanged); @@ -418,15 +418,4 @@ public sealed partial class ExplosionSystem : EntitySystem _recoilSystem.KickCamera(uid, -delta.Normalized() * effect); } } - - private void OnArmorExamine(EntityUid uid, ExplosionResistanceComponent component, ref ArmorExamineEvent args) - { - var value = MathF.Round((1f - component.DamageCoefficient) * 100, 1); - - if (value == 0) - return; - - args.Msg.PushNewline(); - args.Msg.AddMarkupOrThrow(Loc.GetString(component.Examine, ("value", value))); - } } diff --git a/Content.Server/Explosion/Components/ExplosionResistanceComponent.cs b/Content.Shared/Explosion/Components/ExplosionResistanceComponent.cs similarity index 89% rename from Content.Server/Explosion/Components/ExplosionResistanceComponent.cs rename to Content.Shared/Explosion/Components/ExplosionResistanceComponent.cs index d4a93c2b56..3b5c64c3ec 100644 --- a/Content.Server/Explosion/Components/ExplosionResistanceComponent.cs +++ b/Content.Shared/Explosion/Components/ExplosionResistanceComponent.cs @@ -1,8 +1,8 @@ -using Content.Server.Explosion.EntitySystems; -using Content.Shared.Explosion; +using Content.Shared.Explosion.EntitySystems; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.Dictionary; +using Robust.Shared.GameStates; -namespace Content.Server.Explosion.Components; +namespace Content.Shared.Explosion.Components; /// /// Component that provides entities with explosion resistance. @@ -13,8 +13,8 @@ namespace Content.Server.Explosion.Components; /// This is desirable over just using damage modifier sets, given that equipment like bomb-suits need to /// significantly reduce the damage, but shouldn't be silly overpowered in regular combat. /// -[RegisterComponent] -[Access(typeof(ExplosionSystem))] +[NetworkedComponent, RegisterComponent] +[Access(typeof(SharedExplosionSystem))] public sealed partial class ExplosionResistanceComponent : Component { /// diff --git a/Content.Shared/Explosion/EntitySystems/SharedExplosionSystem.cs b/Content.Shared/Explosion/EntitySystems/SharedExplosionSystem.cs new file mode 100644 index 0000000000..1d926dd0b6 --- /dev/null +++ b/Content.Shared/Explosion/EntitySystems/SharedExplosionSystem.cs @@ -0,0 +1,25 @@ +using Content.Shared.Explosion.Components; +using Content.Shared.Armor; + +namespace Content.Shared.Explosion.EntitySystems; + +public abstract class SharedExplosionSystem : EntitySystem +{ + + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(OnArmorExamine); + } + + private void OnArmorExamine(EntityUid uid, ExplosionResistanceComponent component, ref ArmorExamineEvent args) + { + var value = MathF.Round((1f - component.DamageCoefficient) * 100, 1); + + if (value == 0) + return; + + args.Msg.PushNewline(); + args.Msg.AddMarkupOrThrow(Loc.GetString(component.Examine, ("value", value))); + } +} From 118ea976526e1e9fc660b628d5c9b626919d8963 Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 5 Aug 2024 03:15:09 +0000 Subject: [PATCH 174/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 4c19a3ab6e..69e3704154 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Blackern5000 - changes: - - message: Active lights now deal significantly less burn damage when touched. - type: Tweak - id: 6541 - time: '2024-05-06T20:20:19.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27728 - author: pissdemon changes: - message: Special ghost roles are now raffled, instead of being given out to the @@ -3780,3 +3773,11 @@ id: 7040 time: '2024-08-04T10:13:57.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30594 +- author: DrSmugleaf + changes: + - message: Fixed the client sometimes falsely showing the red color flash effect + when attacking something that they can't, like allied xenonids. + type: Fix + id: 7041 + time: '2024-08-05T03:14:01.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30661 From 82d7636619ef70c2aa8f8c9c16f241a9c779cc78 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Mon, 5 Aug 2024 05:15:52 +0200 Subject: [PATCH 175/422] Fix some descriptions (#30644) --- .../Entities/Clothing/Ears/headsets.yml | 2 +- .../Entities/Clothing/Head/hats.yml | 4 ++-- .../Entities/Clothing/Masks/masks.yml | 2 +- .../Entities/Clothing/Neck/pins.yml | 22 +++++++++---------- .../Entities/Clothing/OuterClothing/coats.yml | 2 +- .../Clothing/OuterClothing/wintercoats.yml | 2 +- .../Entities/Clothing/Shoes/boots.yml | 2 +- .../Entities/Clothing/Uniforms/jumpskirts.yml | 2 +- .../Entities/Clothing/Uniforms/jumpsuits.yml | 4 ++-- .../Entities/Mobs/Player/admin_ghost.yml | 2 +- .../Entities/Mobs/Player/dragon.yml | 2 +- .../Objects/Consumable/Drinks/drinks.yml | 2 +- .../Consumable/Drinks/drinks_bottles.yml | 20 ++++++++--------- .../Consumable/Drinks/drinks_flasks.yml | 4 ++-- .../Consumable/Drinks/drinks_special.yml | 2 +- .../Objects/Consumable/Food/Baked/cake.yml | 2 +- .../Consumable/Food/Baked/donkpocket.yml | 2 +- .../Objects/Consumable/Food/produce.yml | 2 +- .../Entities/Objects/Decoration/flora.yml | 2 +- .../Devices/Circuitboards/Machine/cannons.yml | 10 ++++----- .../Machine/particle_accelerator.yml | 12 +++++----- .../Circuitboards/Machine/production.yml | 6 ++--- .../Devices/Electronics/atmos_alarms.yml | 4 ++-- .../Objects/Devices/Electronics/disposal.yml | 2 +- .../Objects/Devices/Electronics/door.yml | 2 +- .../Objects/Devices/Electronics/intercom.yml | 2 +- .../Objects/Devices/Electronics/triggers.yml | 2 +- .../Syndicate_Gadgets/guardian_activators.yml | 4 ++-- .../Entities/Objects/Devices/cartridges.yml | 10 ++++----- .../Objects/Devices/forensic_scanner.yml | 2 +- .../Fun/Instruments/instruments_string.yml | 2 +- .../Prototypes/Entities/Objects/Fun/darts.yml | 2 +- .../Prototypes/Entities/Objects/Fun/toys.yml | 4 ++-- .../Entities/Objects/Misc/fluff_lights.yml | 2 +- .../Entities/Objects/Misc/paper.yml | 2 +- .../Objects/Power/portable_recharger.yml | 2 +- .../Objects/Specific/Chapel/bibles.yml | 2 +- .../Entities/Objects/Specific/Chapel/urn.yml | 2 +- .../Objects/Specific/Librarian/books_bag.yml | 2 +- .../Objects/Specific/Medical/hypospray.yml | 4 ++-- .../Objects/Specific/Service/barber.yml | 2 +- .../Service/vending_machine_restock.yml | 2 +- .../Entities/Objects/Tools/tools.yml | 2 +- .../Objects/Weapons/Guns/HMGs/hmgs.yml | 2 +- .../Weapons/Guns/Launchers/launchers.yml | 4 ++-- .../Weapons/Guns/Projectiles/magic.yml | 2 +- .../Entities/Objects/Weapons/Guns/turrets.yml | 2 +- .../Objects/Weapons/Melee/pickaxe.yml | 4 ++-- .../Objects/Weapons/Throwable/grenades.yml | 4 ++-- .../Machines/Computers/computers.yml | 2 +- .../Entities/Structures/Machines/bombs.yml | 2 +- .../Entities/Structures/Machines/lathe.yml | 2 +- .../Structures/Piping/Disposal/pipes.yml | 2 +- .../Entities/Structures/Power/substation.yml | 2 +- .../Structures/Wallmounts/Signs/flags.yml | 10 ++++----- .../Structures/Wallmounts/Signs/posters.yml | 2 +- .../Structures/Wallmounts/Signs/signs.yml | 2 +- .../Entities/Structures/Wallmounts/shelfs.yml | 6 ++--- .../Entities/Structures/Walls/grille.yml | 2 +- .../Prototypes/Entities/Tiles/basalt.yml | 2 +- 60 files changed, 110 insertions(+), 110 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml index a2e18d99aa..c5d0816b6d 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml @@ -278,7 +278,7 @@ parent: ClothingHeadset id: ClothingHeadsetFreelance name: freelancer headset - description: This is used by a roaming group of freelancers + description: This is used by a roaming group of freelancers. components: - type: ContainerFill containers: diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index f81ddfc8d0..b5d3b0ff3e 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -62,7 +62,7 @@ parent: ClothingHeadBase id: ClothingHeadHatCasa name: casa - description: Cone-shaped hat + description: Cone-shaped hat. components: - type: Sprite sprite: Clothing/Head/Hats/casa.rsi @@ -409,7 +409,7 @@ parent: ClothingHeadBase id: ClothingHeadHatSantahat name: santa hat - description: "A festive hat worn by Santa Claus" + description: A festive hat worn by Santa Claus. components: - type: Sprite sprite: Clothing/Head/Hats/santahat.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index b3a76c5855..b222ed0d5a 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -602,7 +602,7 @@ parent: ClothingMaskMime id: ClothingMaskScaredMime name: scared mime mask - description: Looks like it would scream if it wasn't a mask + description: Looks like it would scream if it wasn't a mask. components: - type: Sprite sprite: Clothing/Mask/scaredmime.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml index 0054a3645c..eb948d299c 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/pins.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/pins.yml @@ -3,7 +3,7 @@ id: ClothingNeckPinBase abstract: true name: pin - description: be nothing do crime + description: Be nothing do crime. components: - type: Item size: Tiny @@ -12,7 +12,7 @@ parent: ClothingNeckPinBase id: ClothingNeckLGBTPin name: LGBT pin - description: be gay do crime + description: Be gay do crime. components: - type: Sprite sprite: Clothing/Neck/Misc/pins.rsi @@ -28,7 +28,7 @@ parent: ClothingNeckPinBase id: ClothingNeckAromanticPin name: aromantic pin - description: be aro do crime + description: Be aro do crime. components: - type: Sprite sprite: Clothing/Neck/Misc/pins.rsi @@ -44,7 +44,7 @@ parent: ClothingNeckPinBase id: ClothingNeckAsexualPin name: asexual pin - description: be ace do crime + description: Be ace do crime. components: - type: Sprite sprite: Clothing/Neck/Misc/pins.rsi @@ -60,7 +60,7 @@ parent: ClothingNeckPinBase id: ClothingNeckBisexualPin name: bisexual pin - description: be bi do crime + description: Be bi do crime. components: - type: Sprite sprite: Clothing/Neck/Misc/pins.rsi @@ -76,7 +76,7 @@ parent: ClothingNeckPinBase id: ClothingNeckIntersexPin name: intersex pin - description: be intersex do crime + description: Be intersex do crime. components: - type: Sprite sprite: Clothing/Neck/Misc/pins.rsi @@ -92,7 +92,7 @@ parent: ClothingNeckPinBase id: ClothingNeckLesbianPin name: lesbian pin - description: be lesbian do crime + description: Be lesbian do crime. components: - type: Sprite sprite: Clothing/Neck/Misc/pins.rsi @@ -124,7 +124,7 @@ parent: ClothingNeckPinBase id: ClothingNeckPansexualPin name: pansexual pin - description: be pan do crime + description: Be pan do crime. components: - type: Sprite sprite: Clothing/Neck/Misc/pins.rsi @@ -140,7 +140,7 @@ parent: ClothingNeckPinBase id: ClothingNeckTransPin name: transgender pin - description: be trans do crime + description: Be trans do crime. components: - type: Sprite sprite: Clothing/Neck/Misc/pins.rsi @@ -156,7 +156,7 @@ parent: ClothingNeckPinBase id: ClothingNeckAutismPin name: autism pin - description: be autism do crime + description: Be autism do crime. components: - type: Sprite sprite: Clothing/Neck/Misc/autismpin.rsi @@ -172,7 +172,7 @@ parent: ClothingNeckPinBase id: ClothingNeckGoldAutismPin name: golden autism pin - description: be autism do warcrime + description: Be autism do warcrime. components: - type: Sprite sprite: Clothing/Neck/Misc/goldautismpin.rsi diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index fa937c1ccc..593ad78f72 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -223,7 +223,7 @@ parent: ClothingOuterStorageFoldableBase id: ClothingOuterCoatLabCmo name: chief medical officer's lab coat - description: Custom made blue lab coat for the Chief Medical Officer, offers improved protection against chemical spills and minor cuts + description: Custom made blue lab coat for the Chief Medical Officer, offers improved protection against chemical spills and minor cuts. components: - type: Sprite sprite: Clothing/OuterClothing/Coats/labcoat_cmo.rsi diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index e3401f4533..5007b5a194 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -797,7 +797,7 @@ parent: ClothingOuterWinterCoatToggleable id: ClothingOuterWinterSyndie name: syndicate's winter coat - description: Insulated winter coat, looks like a merch from "Syndieland" + description: Insulated winter coat, looks like a merch from "Syndieland". components: - type: Sprite sprite: Clothing/OuterClothing/WinterCoats/coat.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml index 33f5d36e36..8c5405d684 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml @@ -156,7 +156,7 @@ parent: ClothingShoesBaseWinterBoots id: ClothingShoesBootsWinterSyndicate name: syndicate's winter boots - description: Durable heavy boots, looks like merch from "Syndieland" + description: Durable heavy boots, looks like merch from "Syndieland". components: - type: Sprite sprite: Clothing/Shoes/Boots/winterbootssyndicate.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index d105d4cd77..6ad8cc0505 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -481,7 +481,7 @@ parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtCentcomFormalDress name: central command formal dress - description: A dress for special occasions + description: A dress for special occasions. components: - type: Sprite sprite: Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 196df817b0..1e7fa65f95 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -422,7 +422,7 @@ parent: ClothingUniformBase id: ClothingUniformJumpsuitKimono name: kimono - description: traditional chinese clothing + description: Traditional chinese clothing. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/kimono.rsi @@ -1076,7 +1076,7 @@ parent: ClothingUniformBase id: ClothingUniformJumpsuitCossack name: cossack suit - description: the good old pants and brigantine. + description: The good old pants and brigantine. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/cossack.rsi diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml index d213cf5f46..0b60ed447f 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml @@ -155,7 +155,7 @@ - type: entity id: ActionAGhostShowStationRecords name: Station Records Interface - description: View a station records Interface + description: View a station records Interface. components: - type: InstantAction icon: { sprite: Structures/Machines/parts.rsi, state: box_0 } diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml index 0b21f0d735..73246dcced 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml @@ -157,7 +157,7 @@ categories: [ HideSpawnMenu ] id: DragonsBreathGun name: dragon's lung - description: For dragon's breathing + description: For dragon's breathing. components: - type: RechargeBasicEntityAmmo rechargeCooldown: 5 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index a51a9a1930..c435e6c98f 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml @@ -2141,7 +2141,7 @@ parent: DrinkGlassBase id: DrinkWaterJug name: water jug - description: Stay hydrated + description: Stay hydrated. components: - type: SolutionContainerManager solutions: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml index 8052c5d0ae..a5f72b8546 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml @@ -752,7 +752,7 @@ id: DrinkSugarJug name: sugar jug suffix: For Drinks, Full - description: some people put this in their coffee... + description: Some people put this in their coffee... components: - type: SolutionContainerManager solutions: @@ -767,7 +767,7 @@ parent: DrinkBottlePlasticBaseFull id: DrinkLemonLimeJug name: lemon lime jug - description: a dual citrus sensation. + description: A dual citrus sensation. components: - type: SolutionContainerManager solutions: @@ -784,7 +784,7 @@ parent: DrinkBottlePlasticBaseFull id: DrinkMeadJug name: mead jug - description: storing mead in a plastic jug should be a crime. + description: Storing mead in a plastic jug should be a crime. components: - type: SolutionContainerManager solutions: @@ -801,7 +801,7 @@ parent: DrinkBottlePlasticBaseFull id: DrinkIceJug name: ice jug - description: stubborn water. pretty cool. + description: Stubborn water. Pretty cool. components: - type: SolutionContainerManager solutions: @@ -835,7 +835,7 @@ parent: DrinkBottlePlasticBaseFull id: DrinkCoffeeJug name: coffee jug - description: wake up juice, of the heated kind. + description: Wake up juice, of the heated kind. components: - type: SolutionContainerManager solutions: @@ -852,7 +852,7 @@ parent: DrinkBottlePlasticBaseFull id: DrinkTeaJug name: tea jug - description: the drink of choice for the Bri'ish and hipsters. + description: The drink of choice for the Bri'ish and hipsters. components: - type: SolutionContainerManager solutions: @@ -886,7 +886,7 @@ parent: DrinkBottlePlasticBaseFull id: DrinkIcedTeaJug name: iced tea jug - description: for when the regular tea is too hot for you boohoo + description: For when the regular tea is too hot for you boohoo. components: - type: SolutionContainerManager solutions: @@ -903,7 +903,7 @@ parent: DrinkBottlePlasticBaseFull id: DrinkDrGibbJug name: dr gibb. jug - description: yeah I don't know either... + description: Yeah I don't know either... components: - type: SolutionContainerManager solutions: @@ -920,7 +920,7 @@ parent: DrinkBottlePlasticBaseFull id: DrinkRootBeerJug name: root beer jug - description: this drink makes Australians giggle + description: This drink makes Australians giggle. components: - type: SolutionContainerManager solutions: @@ -937,7 +937,7 @@ parent: DrinkBottlePlasticBaseFull id: DrinkWaterMelonJuiceJug name: watermelon juice jug - description: May include leftover seeds + description: May include leftover seeds. components: - type: SolutionContainerManager solutions: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml index 0b2af4c97f..1c90e71979 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_flasks.yml @@ -23,7 +23,7 @@ parent: FlaskBase id: DrinkMREFlask name: MRE flask - description: An old military flask, filled with the finest contents for soldiers + description: An old military flask, filled with the finest contents for soldiers. components: - type: Sprite sprite: Objects/Consumable/Drinks/mreflask.rsi @@ -58,7 +58,7 @@ parent: FlaskBase id: DrinkFlask name: captain's flask - description: A metal flask belonging to the captain + description: A metal flask belonging to the captain. components: - type: Sprite sprite: Objects/Consumable/Drinks/flask.rsi diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml index 604ae28fb3..dfb6ac31c0 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml @@ -72,7 +72,7 @@ parent: DrinkGlassBase id: DrinkJar name: jar - description: The hipster's cup + description: The hipster's cup. components: - type: Drink - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml index b9a5cc42e4..bbf02fdb88 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml @@ -292,7 +292,7 @@ name: lemoon cake parent: FoodCakeBase id: FoodCakeLemoon - description: A cake that represents the moon of earth + description: A cake that represents the moon of earth. components: - type: Sprite state: lemoon diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml index e8efb19435..c7e46d9a94 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml @@ -296,7 +296,7 @@ name: stonk-pocket parent: FoodDonkpocketBase id: FoodDonkpocketStonk - description: Tasty, but a sad reminder of the great crash of '24 + description: Tasty, but a sad reminder of the great crash of '24. components: - type: FlavorProfile flavors: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 75ed63a4ce..88a30150d8 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -1277,7 +1277,7 @@ name: poppy parent: FoodProduceBase id: FoodPoppy - description: A flower with extracts often used in the production of medicine + description: A flower with extracts often used in the production of medicine. components: - type: Clothing slots: diff --git a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml index f35d222d39..6f4baf2785 100644 --- a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml +++ b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml @@ -548,7 +548,7 @@ parent: BaseTree id: LightTree01 name: glowing tree - description: a marvelous tree filled with strange energy. + description: A marvelous tree filled with strange energy. components: - type: PointLight radius: 2.0 diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/cannons.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/cannons.yml index e4bde7ab84..4b7a0ee55a 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/cannons.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/cannons.yml @@ -4,7 +4,7 @@ id: ShuttleGunSvalinnMachineGunCircuitboard parent: BaseMachineCircuitboard name: LSE-400c "Svalinn machine gun" machine board - description: A machine printed circuit board for an LSE-400c "Svalinn machine gun" + description: A machine printed circuit board for an LSE-400c "Svalinn machine gun". suffix: DO NOT MAP, Machine Board components: - type: Sprite @@ -21,7 +21,7 @@ id: ShuttleGunPerforatorCircuitboard parent: BaseMachineCircuitboard name: LSE-1200c "Perforator" machine board - description: A machine printed circuit board for an LSE-1200c "Perforator" + description: A machine printed circuit board for an LSE-1200c "Perforator". suffix: DO NOT MAP, Machine Board components: - type: Sprite @@ -38,7 +38,7 @@ id: ShuttleGunFriendshipCircuitboard parent: BaseMachineCircuitboard name: EXP-320g "Friendship" machine board - description: A machine printed circuit board for an EXP-320g "Friendship" + description: A machine printed circuit board for an EXP-320g "Friendship". suffix: DO NOT MAP, Machine Board components: - type: Sprite @@ -55,7 +55,7 @@ id: ShuttleGunDusterCircuitboard parent: BaseMachineCircuitboard name: EXP-2100g "Duster" machine board - description: A machine printed circuit board for an EXP-2100g "Duster" + description: A machine printed circuit board for an EXP-2100g "Duster". suffix: DO NOT MAP, Machine Board components: - type: Sprite @@ -73,7 +73,7 @@ id: ShuttleGunKineticCircuitboard parent: BaseMachineCircuitboard name: PTK-800 "Matter Dematerializer" machine board - description: A machine printed circuit board for an PTK-800 "Matter Dematerializer" + description: A machine printed circuit board for an PTK-800 "Matter Dematerializer". suffix: DO NOT MAP, Machine Board components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/particle_accelerator.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/particle_accelerator.yml index a1260f07c0..f1b03f97c2 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/particle_accelerator.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/particle_accelerator.yml @@ -2,7 +2,7 @@ id: MachineParticleAcceleratorEndCapCircuitboard parent: BaseMachineCircuitboard name: PA end cap board - description: A machine board for a particle accelerator end cap + description: A machine board for a particle accelerator end cap. components: - type: Sprite state: engineering @@ -16,7 +16,7 @@ id: MachineParticleAcceleratorFuelChamberCircuitboard parent: BaseMachineCircuitboard name: PA fuel chamber board - description: A machine board for a particle accelerator fuel chamber + description: A machine board for a particle accelerator fuel chamber. components: - type: Sprite state: engineering @@ -34,7 +34,7 @@ id: MachineParticleAcceleratorPowerBoxCircuitboard parent: BaseMachineCircuitboard name: PA power box board - description: A machine board for a particle accelerator power box + description: A machine board for a particle accelerator power box. components: - type: Sprite state: engineering @@ -50,7 +50,7 @@ id: MachineParticleAcceleratorEmitterStarboardCircuitboard parent: BaseMachineCircuitboard name: PA starboard emitter board - description: A machine board for a particle accelerator left emitter + description: A machine board for a particle accelerator left emitter. components: - type: Sprite state: engineering @@ -64,7 +64,7 @@ id: MachineParticleAcceleratorEmitterForeCircuitboard parent: BaseMachineCircuitboard name: PA fore emitter board - description: A machine board for a particle accelerator center emitter + description: A machine board for a particle accelerator center emitter. components: - type: Sprite state: engineering @@ -78,7 +78,7 @@ id: MachineParticleAcceleratorEmitterPortCircuitboard parent: BaseMachineCircuitboard name: PA port emitter board - description: A machine board for a particle accelerator right emitter + description: A machine board for a particle accelerator right emitter. components: - type: Sprite state: engineering diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml index f2c3ed15fb..2e3df6e754 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml @@ -2,7 +2,7 @@ id: AutolatheMachineCircuitboard parent: BaseMachineCircuitboard name: autolathe machine board - description: A machine printed circuit board for an autolathe + description: A machine printed circuit board for an autolathe. components: - type: MachineBoard prototype: Autolathe @@ -15,7 +15,7 @@ parent: BaseMachineCircuitboard id: AutolatheHyperConvectionMachineCircuitboard name: hyper convection autolathe machine board - description: A machine printed circuit board for a hyper convection autolathe + description: A machine printed circuit board for a hyper convection autolathe. components: - type: MachineBoard prototype: AutolatheHyperConvection @@ -95,7 +95,7 @@ id: AmmoTechFabCircuitboard parent: BaseMachineCircuitboard name: ammo techfab circuit board - description: A machine printed circuit board for an ammo techfab + description: A machine printed circuit board for an ammo techfab. components: - type: Sprite state: security diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/atmos_alarms.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/atmos_alarms.yml index 838ec637d3..0fea9b7227 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/atmos_alarms.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/atmos_alarms.yml @@ -2,7 +2,7 @@ id: AirAlarmElectronics parent: BaseElectronics name: air alarm electronics - description: An electronics board used in air alarms + description: An electronics board used in air alarms. components: - type: Sprite sprite: Objects/Misc/module.rsi @@ -17,7 +17,7 @@ id: FireAlarmElectronics parent: BaseElectronics name: fire alarm electronics - description: An electronics board used in fire alarms + description: An electronics board used in fire alarms. components: - type: Item storedRotation: 0 diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/disposal.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/disposal.yml index 7c2f2a6fda..4e57705417 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/disposal.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/disposal.yml @@ -2,7 +2,7 @@ id: MailingUnitElectronics parent: BaseElectronics name: mailing unit electronics - description: An electronics board used in mailing units + description: An electronics board used in mailing units. components: - type: Sprite sprite: Objects/Misc/module.rsi diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml index a832bea741..5ca355ec71 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml @@ -2,7 +2,7 @@ id: DoorElectronics parent: BaseElectronics name: door electronics - description: An electronics board used in doors and airlocks + description: An electronics board used in doors and airlocks. components: - type: Sprite sprite: Objects/Misc/module.rsi diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/intercom.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/intercom.yml index 3446a3ba4f..c1a8a9d70b 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/intercom.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/intercom.yml @@ -2,7 +2,7 @@ id: IntercomElectronics parent: BaseElectronics name: intercom electronics - description: An electronics board used in intercoms + description: An electronics board used in intercoms. components: - type: Sprite sprite: Objects/Misc/module.rsi diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml index 2cb9b5233d..acc82abebe 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml @@ -59,7 +59,7 @@ parent: BaseItem id: VoiceTrigger name: voice trigger - description: Adds a machine link that is triggered by vocal keywords + description: Adds a machine link that is triggered by vocal keywords. components: - type: Sprite sprite: Objects/Devices/voice.rsi diff --git a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/guardian_activators.yml b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/guardian_activators.yml index 0b1769a3da..823ee82862 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/guardian_activators.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/guardian_activators.yml @@ -36,7 +36,7 @@ name: holoparasite box parent: BoxCardboard id: BoxHoloparasite - description: A box containing a holoparasite injector + description: A box containing a holoparasite injector. components: - type: StorageFill contents: @@ -52,7 +52,7 @@ name: holoclown box parent: BoxCardboard id: BoxHoloclown - description: A box containing a holoclown injector + description: A box containing a holoclown injector. components: - type: StorageFill contents: diff --git a/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml b/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml index 8935b9667c..f9581149e2 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml @@ -2,7 +2,7 @@ parent: BaseItem id: NotekeeperCartridge name: notekeeper cartridge - description: A program for keeping notes + description: A program for keeping notes. components: - type: Sprite sprite: Objects/Devices/cartridge.rsi @@ -20,7 +20,7 @@ parent: BaseItem id: NewsReaderCartridge name: news cartridge - description: A program for reading news + description: A program for reading news. components: - type: Sprite sprite: Objects/Devices/cartridge.rsi @@ -38,7 +38,7 @@ parent: BaseItem id: CrewManifestCartridge name: crew manifest cartridge - description: A program for listing your fellow crewmembers + description: A program for listing your fellow crewmembers. components: - type: Sprite sprite: Objects/Devices/cartridge.rsi @@ -56,7 +56,7 @@ parent: BaseItem id: NetProbeCartridge name: NetProbe cartridge - description: A program for getting the address and frequency of network devices + description: A program for getting the address and frequency of network devices. components: - type: Sprite sprite: Objects/Devices/cartridge.rsi @@ -74,7 +74,7 @@ parent: BaseItem id: LogProbeCartridge name: LogProbe cartridge - description: A program for getting access logs from devices + description: A program for getting access logs from devices. components: - type: Sprite sprite: Objects/Devices/cartridge.rsi diff --git a/Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml b/Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml index 8f1879ef78..fbb477de64 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/forensic_scanner.yml @@ -34,7 +34,7 @@ name: forensic scanner report parent: Paper id: ForensicReportPaper - description: 'Circumstantial evidence, at best' + description: Circumstantial evidence, at best. components: - type: Sprite sprite: Objects/Misc/bureaucracy.rsi diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml index 6ceb5e23ed..3e2f02f828 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_string.yml @@ -162,7 +162,7 @@ parent: BaseHandheldInstrument id: GuitarlessFretsInstrument name: guitarless frets - description: who even needs a body? + description: Who even needs a body? suffix: Admeme #the sound is awful components: - type: Instrument diff --git a/Resources/Prototypes/Entities/Objects/Fun/darts.yml b/Resources/Prototypes/Entities/Objects/Fun/darts.yml index 31fd4fd8e2..dfcb0c68f1 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/darts.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/darts.yml @@ -1,6 +1,6 @@ - type: entity name: dart - description: light throwing dart for playing darts. Don't get in the eye! + description: Light throwing dart for playing darts. Don't get in the eye! parent: BaseItem id: Dart components: diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 20c92b0901..ad304a5bce 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -211,7 +211,7 @@ parent: BasePlushie id: PlushieRouny name: rouny plushie - description: Rouny + description: Rouny. components: - type: Sprite state: plushie_rouny @@ -1273,7 +1273,7 @@ parent: BasePlushie id: ToyAmongPequeno name: among pequeño - description: sus! + description: Sus! components: - type: Sprite sprite: Objects/Fun/pequeno.rsi diff --git a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml index a02f94215b..a9b86d4d83 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml @@ -132,7 +132,7 @@ name: interrogator lamp id: LampInterrogator parent: BaseLamp - description: Ultra-bright lamp for the bad cop + description: Ultra-bright lamp for the bad cop. components: - type: Sprite sprite: Objects/Misc/Lights/lampint.rsi diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index bc3b8be0ea..37776f5ba2 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -104,7 +104,7 @@ name: artifact analyzer printout parent: Paper id: PaperArtifactAnalyzer - description: 'The readout of a device forgotten to time' + description: The readout of a device forgotten to time. components: - type: Sprite layers: diff --git a/Resources/Prototypes/Entities/Objects/Power/portable_recharger.yml b/Resources/Prototypes/Entities/Objects/Power/portable_recharger.yml index e3213ac8c9..3c553fc812 100644 --- a/Resources/Prototypes/Entities/Objects/Power/portable_recharger.yml +++ b/Resources/Prototypes/Entities/Objects/Power/portable_recharger.yml @@ -2,7 +2,7 @@ parent: Clothing id: PortableRecharger name: portable recharger - description: High-tech recharger adapted for portability + description: High-tech recharger adapted for portability. components: - type: Item size: Huge diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml index 58f7e01550..28d90f1a3b 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml @@ -1,6 +1,6 @@ - type: entity name: bible - description: New Interstellar Version 2340 + description: New Interstellar Version 2340. parent: BaseStorageItem id: Bible components: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chapel/urn.yml b/Resources/Prototypes/Entities/Objects/Specific/Chapel/urn.yml index 55a58ef18a..72d21977c6 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Chapel/urn.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Chapel/urn.yml @@ -1,6 +1,6 @@ - type: entity name: urn - description: Store the Dead smart and Compact since 2300 + description: Store the Dead smart and Compact since 2300. parent: BaseStorageItem id: Urn components: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Librarian/books_bag.yml b/Resources/Prototypes/Entities/Objects/Specific/Librarian/books_bag.yml index 9972fad414..6eb56f3245 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Librarian/books_bag.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Librarian/books_bag.yml @@ -2,7 +2,7 @@ name: books bag id: BooksBag parent: BaseStorageItem - description: A refined bag to carry your own library + description: A refined bag to carry your own library. components: - type: Sprite sprite: Objects/Specific/Library/Equipment/books_bag.rsi diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml index 08b86e5636..6f684cafad 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml @@ -191,7 +191,7 @@ name: brute auto-injector parent: ChemicalMedipen id: BruteAutoInjector - description: A rapid dose of bicaridine and tranexamic acid, intended for combat applications + description: A rapid dose of bicaridine and tranexamic acid, intended for combat applications. components: - type: Sprite sprite: Objects/Specific/Medical/medipen.rsi @@ -223,7 +223,7 @@ name: burn auto-injector parent: ChemicalMedipen id: BurnAutoInjector - description: A rapid dose of dermaline and leporazine, intended for combat applications + description: A rapid dose of dermaline and leporazine, intended for combat applications. components: - type: Sprite sprite: Objects/Specific/Medical/medipen.rsi diff --git a/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml b/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml index 251331919e..ad0eeccc7d 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Service/barber.yml @@ -1,7 +1,7 @@ - type: entity id: BarberScissors name: barber scissors - description: is able to reshape the hairstyle of any crew cut to your liking. + description: Is able to reshape the hairstyle of any crew cut to your liking. parent: BaseItem components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml b/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml index 953c05f107..415b59a6e5 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml @@ -460,7 +460,7 @@ parent: BaseVendingMachineRestock id: VendingMachineRestockHappyHonk name: Happy Honk restock box - description: place this box full of fun into the restock slot on the Happy Honk Dispenser to begin. + description: Place this box full of fun into the restock slot on the Happy Honk Dispenser to begin. components: - type: VendingMachineRestock canRestock: diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index 2b0cb02e6f..d420aa309d 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -189,7 +189,7 @@ name: multitool parent: BaseItem id: Multitool - description: An advanced tool to copy, store, and send electrical pulses and signals through wires and machines + description: An advanced tool to copy, store, and send electrical pulses and signals through wires and machines. components: - type: EmitSoundOnLand sound: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml index 9d685e1ddc..aa1e7ec84d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml @@ -2,7 +2,7 @@ name: BaseWeaponHeavyMachineGun parent: BaseItem id: BaseWeaponHeavyMachineGun - description: Spray and pray + description: Spray and pray. abstract: true components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index 0ecad70a64..1b9d821e2b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -24,7 +24,7 @@ name: china lake parent: [BaseWeaponLauncher, BaseGunWieldable] id: WeaponLauncherChinaLake - description: PLOOP + description: PLOOP. components: - type: Sprite sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi @@ -360,7 +360,7 @@ parent: WeaponLauncherMultipleRocket id: WeaponLauncherAdmemeMeteorLarge suffix: Admeme - description: It fires large meteors + description: It fires large meteors. components: - type: BallisticAmmoProvider whitelist: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml index 2f1edfe697..d11f96d875 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/magic.yml @@ -179,7 +179,7 @@ id: ProjectilePolyboltCluwne parent: ProjectilePolyboltBase name: cluwne polybolt - description: knoH KnoH! + description: KnoH KnoH! categories: [ HideSpawnMenu ] components: - type: PolymorphOnCollide diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml index 3f75faf75e..82177478fa 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml @@ -197,7 +197,7 @@ - type: entity name: xeno turret - description: Shoots 9mm acid projectiles + description: Shoots 9mm acid projectiles. parent: BaseWeaponTurret id: WeaponTurretXeno suffix: Xeno diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml index cb9defccd9..e1c98f418b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml @@ -2,7 +2,7 @@ name: pickaxe parent: BaseItem id: Pickaxe - description: Notched to perfection, for jamming it into rocks + description: Notched to perfection, for jamming it into rocks. components: - type: Tag tags: @@ -40,7 +40,7 @@ name: mining drill parent: BaseItem id: MiningDrill - description: Powerful tool used to quickly drill through rocks + description: Powerful tool used to quickly drill through rocks. components: - type: Item storedRotation: -90 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml index 1632755a1f..e36eff8ac3 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml @@ -59,7 +59,7 @@ - type: entity name: flashbang - description: Eeeeeeeeeeeeeeeeeeeeee + description: Eeeeeeeeeeeeeeeeeeeeee. parent: GrenadeBase id: GrenadeFlashBang components: @@ -394,7 +394,7 @@ parent: SmokeGrenade id: CleanerGrenade name: cleanade - description: Special grenade for janitors, releasing large cloud of space cleaner foam + description: Special grenade for janitors, releasing large cloud of space cleaner foam. components: - type: Sprite sprite: Objects/Weapons/Grenades/janitor.rsi diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml index 4a17d67f32..e5fd87ef2a 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml @@ -972,7 +972,7 @@ id: ComputerPalletConsole parent: BaseComputer name: cargo sale computer - description: Used to sell goods loaded onto cargo pallets + description: Used to sell goods loaded onto cargo pallets. components: - type: Sprite layers: diff --git a/Resources/Prototypes/Entities/Structures/Machines/bombs.yml b/Resources/Prototypes/Entities/Structures/Machines/bombs.yml index d53f0950b6..82c79496f2 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/bombs.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/bombs.yml @@ -144,7 +144,7 @@ id: DebugHardBomb name: debug bomb suffix: DEBUG - description: Holy shit this is gonna explode + description: Holy shit this is gonna explode. components: - type: Defusable disposable: true diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index ed25fe514b..44d4224d6b 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -534,7 +534,7 @@ id: ExosuitFabricator parent: BaseLatheLube name: exosuit fabricator - description: Creates parts for robotics and other mechanical needs + description: Creates parts for robotics and other mechanical needs. components: - type: Sprite sprite: Structures/Machines/exosuit_fabricator.rsi diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml index 3c1334169d..a0192b8685 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml @@ -75,7 +75,7 @@ id: DisposalPipeBroken parent: DisposalPipeBase name: broken disposal pipe - description: A BBP (big broken pipe) + description: A BBP (big broken pipe). components: - type: Sprite drawdepth: ThickPipe diff --git a/Resources/Prototypes/Entities/Structures/Power/substation.yml b/Resources/Prototypes/Entities/Structures/Power/substation.yml index 8f8f752e38..b4e669519a 100644 --- a/Resources/Prototypes/Entities/Structures/Power/substation.yml +++ b/Resources/Prototypes/Entities/Structures/Power/substation.yml @@ -258,7 +258,7 @@ id: BaseSubstationWallFrame categories: [ HideSpawnMenu ] name: wallmount substation frame - description: A substation frame for construction + description: A substation frame for construction. placement: mode: SnapgridCenter components: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml index a4ab12df74..992f7a71e6 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/flags.yml @@ -13,7 +13,7 @@ parent: BaseFlag id: BlankFlag name: blank flag - description: "Some piece of white cloth. Definitely not the flag of France." + description: Some piece of white cloth. Definitely not the flag of France. components: - type: Sprite state: blank_flag @@ -22,7 +22,7 @@ parent: BaseFlag id: NTFlag name: Nanotrasen flag - description: "Glory to NT! Wait, they really made a flag for a corporation?" + description: Glory to NT! Wait, they really made a flag for a corporation? components: - type: Sprite state: NT_flag @@ -31,7 +31,7 @@ parent: BaseFlag id: SyndieFlag name: syndicate flag - description: "Smells bloody. Death to NT!" + description: Smells bloody. Death to NT! components: - type: Sprite state: syndie_flag @@ -40,7 +40,7 @@ parent: BaseFlag id: LGBTQFlag name: LGBTQ flag - description: "Be gay do crime flag" + description: "\"Be gay do crime\" flag." components: - type: Sprite state: lgbtq_flag @@ -49,7 +49,7 @@ parent: BaseFlag id: PirateFlag name: pirate flag - description: "Raise the jolly roger, scallywags!" + description: Raise the jolly roger, scallywags! components: - type: Sprite state: pirate_flag \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml index ae8ed5f74f..c5b9b24a74 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml @@ -441,7 +441,7 @@ parent: PosterBase id: PosterContrabandUnreadableAnnouncement name: "Unreadable Announcement" - description: "A poster announcing something by someone, oddly enough they seem to have forgotten making it readable" + description: "A poster announcing something by someone, oddly enough they seem to have forgotten making it readable." components: - type: Sprite state: poster45_contraband diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml index 2b5889a3dd..4ebeaa66ba 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml @@ -1161,7 +1161,7 @@ parent: BaseSign id: SignSmoking name: no smoking sign - description: A warning sign which reads 'NO SMOKING' + description: A warning sign which reads 'NO SMOKING'. components: - type: Sprite state: nosmoking2 diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml index af68f5898d..793e7211a5 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml @@ -4,7 +4,7 @@ id: ShelfBase parent: BaseStructure name: shelf - description: a strange place to place, well, anything really. You feel like you shouldn't be seeing this.' + description: A strange place to place, well, anything really. You feel like you shouldn't be seeing this.' components: - type: Sprite drawdepth: WallMountedItems @@ -189,7 +189,7 @@ id: ShelfRWood parent: ShelfBaseReinforced name: sturdy wood shelf - description: A safe place to put your favorite bottle of whiskey + description: A safe place to put your favorite bottle of whiskey. components: - type: Sprite sprite: Structures/Storage/Shelfs/wood.rsi @@ -226,7 +226,7 @@ id: ShelfRMetal parent: ShelfBaseReinforced name: sturdy metal shelf - description: A strong & shiny place to keep all your vials safe + description: A strong & shiny place to keep all your vials safe. components: - type: Sprite sprite: Structures/Storage/Shelfs/metal.rsi diff --git a/Resources/Prototypes/Entities/Structures/Walls/grille.yml b/Resources/Prototypes/Entities/Structures/Walls/grille.yml index 7be721b6f9..84dbb92d1f 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/grille.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/grille.yml @@ -92,7 +92,7 @@ id: ClockworkGrille parent: Grille name: clockwork grille - description: a flimsy framework of iron rods assembled in traditional Ratvarian fashion. + description: A flimsy framework of iron rods assembled in traditional Ratvarian fashion. components: - type: Sprite drawdepth: Walls diff --git a/Resources/Prototypes/Entities/Tiles/basalt.yml b/Resources/Prototypes/Entities/Tiles/basalt.yml index 900f25d100..73a7dc0dea 100644 --- a/Resources/Prototypes/Entities/Tiles/basalt.yml +++ b/Resources/Prototypes/Entities/Tiles/basalt.yml @@ -1,7 +1,7 @@ - type: entity id: BasaltOne name: basalt - description: Rock + description: Rock. placement: mode: SnapgridCenter components: From d0884a3074eb9f4ee58dfb213a2b9069f4812a38 Mon Sep 17 00:00:00 2001 From: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Date: Mon, 5 Aug 2024 05:16:19 +0200 Subject: [PATCH 176/422] Improve communications console countdown formatting (#30495) * improve communications console countdown formatting * tostring --- .../Communications/UI/CommunicationsConsoleMenu.xaml.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs b/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs index 63868e7a93..56604ba526 100644 --- a/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs +++ b/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml.cs @@ -130,7 +130,7 @@ namespace Content.Client.Communications.UI EmergencyShuttleButton.Text = Loc.GetString("comms-console-menu-recall-shuttle"); var infoText = Loc.GetString($"comms-console-menu-time-remaining", - ("time", diff.TotalSeconds.ToString(CultureInfo.CurrentCulture))); + ("time", diff.ToString(@"hh\:mm\:ss", CultureInfo.CurrentCulture))); CountdownLabel.SetMessage(infoText); } } From c5b887fb4e0490105c62c60db34f5972b33a4bfb Mon Sep 17 00:00:00 2001 From: Plykiya <58439124+Plykiya@users.noreply.github.com> Date: Sun, 4 Aug 2024 20:16:47 -0700 Subject: [PATCH 177/422] Gets rid of all leftover usages of IEyeManager.CurrentMap (#30022) * Gets rid of all leftover usages of CurrentMap * args works * reverty * skill issue --------- Co-authored-by: plykiya --- Content.Client/Administration/AdminNameOverlay.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Client/Administration/AdminNameOverlay.cs b/Content.Client/Administration/AdminNameOverlay.cs index c21ba2e32c..27b2a5dedb 100644 --- a/Content.Client/Administration/AdminNameOverlay.cs +++ b/Content.Client/Administration/AdminNameOverlay.cs @@ -44,7 +44,7 @@ namespace Content.Client.Administration } // if not on the same map, continue - if (_entityManager.GetComponent(entity.Value).MapID != _eyeManager.CurrentMap) + if (_entityManager.GetComponent(entity.Value).MapID != args.MapId) { continue; } From 6503cb7833738ebbb7d02e7d6a68ea60d8f8d4cb Mon Sep 17 00:00:00 2001 From: Killerqu00 <47712032+Killerqu00@users.noreply.github.com> Date: Mon, 5 Aug 2024 05:17:53 +0200 Subject: [PATCH 178/422] Sleeper agents event no longer occurs when evacuation is called (#30646) no more evac sleeper agents --- .../StationEvents/Components/StationEventComponent.cs | 6 ++++++ Content.Server/StationEvents/EventManagerSystem.cs | 7 +++++++ Resources/Prototypes/GameRules/events.yml | 1 + 3 files changed, 14 insertions(+) diff --git a/Content.Server/StationEvents/Components/StationEventComponent.cs b/Content.Server/StationEvents/Components/StationEventComponent.cs index fdd1d3962e..a188d5c052 100644 --- a/Content.Server/StationEvents/Components/StationEventComponent.cs +++ b/Content.Server/StationEvents/Components/StationEventComponent.cs @@ -81,4 +81,10 @@ public sealed partial class StationEventComponent : Component [DataField("endTime", customTypeSerializer: typeof(TimeOffsetSerializer))] [AutoPausedField] public TimeSpan? EndTime; + + /// + /// If false, the event won't trigger during ongoing evacuation. + /// + [DataField] + public bool OccursDuringRoundEnd = true; } diff --git a/Content.Server/StationEvents/EventManagerSystem.cs b/Content.Server/StationEvents/EventManagerSystem.cs index f2fdb8ff5a..2e44040fcc 100644 --- a/Content.Server/StationEvents/EventManagerSystem.cs +++ b/Content.Server/StationEvents/EventManagerSystem.cs @@ -1,6 +1,7 @@ using System.Linq; using Content.Server.Chat.Managers; using Content.Server.GameTicking; +using Content.Server.RoundEnd; using Content.Server.StationEvents.Components; using Content.Shared.CCVar; using Robust.Server.Player; @@ -18,6 +19,7 @@ public sealed class EventManagerSystem : EntitySystem [Dependency] private readonly IPrototypeManager _prototype = default!; [Dependency] private readonly IChatManager _chat = default!; [Dependency] public readonly GameTicker GameTicker = default!; + [Dependency] private readonly RoundEndSystem _roundEnd = default!; public bool EventsEnabled { get; private set; } private void SetEnabled(bool value) => EventsEnabled = value; @@ -191,6 +193,11 @@ public sealed class EventManagerSystem : EntitySystem return false; } + if (_roundEnd.IsRoundEndRequested() && !stationEvent.OccursDuringRoundEnd) + { + return false; + } + return true; } } diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml index 73b2920ca7..01a9f00257 100644 --- a/Resources/Prototypes/GameRules/events.yml +++ b/Resources/Prototypes/GameRules/events.yml @@ -496,6 +496,7 @@ startAudio: path: /Audio/Announcements/intercept.ogg duration: null # the rule has to last the whole round not 1 second + occursDuringRoundEnd: false - type: AlertLevelInterceptionRule - type: AntagSelection definitions: From 7e285ee55cc4b4ecdacd2417e86641ab40e167ef Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 5 Aug 2024 03:18:59 +0000 Subject: [PATCH 179/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 69e3704154..072e72fb97 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: pissdemon - changes: - - message: Special ghost roles are now raffled, instead of being given out to the - first player requesting them. - type: Add - id: 6542 - time: '2024-05-07T01:48:16.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26629 - author: mirrorcult changes: - message: Less ratkings should spawn during the mouse migration event now @@ -3781,3 +3773,10 @@ id: 7041 time: '2024-08-05T03:14:01.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30661 +- author: Killerqu00 + changes: + - message: Sleeper agents event no longer occurs when evacuation is called. + type: Tweak + id: 7042 + time: '2024-08-05T03:17:53.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30646 From a79cbf383c705c1570d0acff04df6ea36f1685ed Mon Sep 17 00:00:00 2001 From: Cojoke <83733158+Cojoke-dot@users.noreply.github.com> Date: Sun, 4 Aug 2024 22:26:28 -0500 Subject: [PATCH 180/422] Give Mice Combat Mode and a 0 Damage Attack (#30487) --- Resources/Prototypes/Entities/Mobs/NPCs/animals.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 7fab3ac124..3131e7bf9d 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -1656,7 +1656,14 @@ wilhelmProbability: 0.001 # TODO: Remove CombatMode when Prototype Composition is added - type: CombatMode - combatToggleAction: ActionCombatModeToggleOff + - type: MeleeWeapon + soundHit: + path: /Audio/Effects/bite.ogg + angle: 0 + animation: WeaponArcBite + damage: + types: + Piercing: 0 - type: Bloodstream bloodMaxVolume: 50 - type: CanEscapeInventory From 68dbf6449cdfef04e88e175b92e264ccef809482 Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 5 Aug 2024 03:27:34 +0000 Subject: [PATCH 181/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 072e72fb97..d7c23f937f 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: mirrorcult - changes: - - message: Less ratkings should spawn during the mouse migration event now - type: Tweak - id: 6543 - time: '2024-05-07T03:23:50.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27760 - author: PJB3005 changes: - message: Fixed preferences not loading sometimes if you had a loadout item with @@ -3780,3 +3773,10 @@ id: 7042 time: '2024-08-05T03:17:53.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30646 +- author: Cojoke-dot + changes: + - message: Mice can now use combat mode with a 0 damage attack + type: Tweak + id: 7043 + time: '2024-08-05T03:26:28.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30487 From 0ef5f668e27ffaa0deb4db1e1232b8f524a58639 Mon Sep 17 00:00:00 2001 From: Simon <63975668+Simyon264@users.noreply.github.com> Date: Mon, 5 Aug 2024 06:09:42 +0200 Subject: [PATCH 182/422] Fix warnings in ShuttleSystem.GridFill.cs (#30253) * Fix warnings in ShuttleSystem.GridFill.cs * remove the thingie --------- Co-authored-by: metalgearsloth --- .../Shuttles/Systems/ShuttleSystem.GridFill.cs | 16 +++++++--------- Content.Server/Shuttles/Systems/ShuttleSystem.cs | 1 + 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs index a31fda074f..c0eff11931 100644 --- a/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs +++ b/Content.Server/Shuttles/Systems/ShuttleSystem.GridFill.cs @@ -2,9 +2,7 @@ using System.Numerics; using Content.Server.Shuttles.Components; using Content.Server.Station.Components; using Content.Server.Station.Events; -using Content.Shared.Cargo.Components; using Content.Shared.CCVar; -using Content.Shared.Procedural; using Content.Shared.Salvage; using Content.Shared.Shuttles.Components; using Content.Shared.Station.Components; @@ -72,11 +70,11 @@ public sealed partial class ShuttleSystem if (targetGrid == null) return; - var mapId = _mapManager.CreateMap(); + _mapSystem.CreateMap(out var mapId); if (_loader.TryLoad(mapId, component.Path.ToString(), out var ent) && ent.Count > 0) { - if (TryComp(ent[0], out var shuttle)) + if (HasComp(ent[0])) { TryFTLProximity(ent[0], targetGrid.Value); } @@ -87,7 +85,7 @@ public sealed partial class ShuttleSystem _mapManager.DeleteMap(mapId); } - private bool TryDungeonSpawn(Entity targetGrid, EntityUid stationUid, MapId mapId, DungeonSpawnGroup group, out EntityUid spawned) + private bool TryDungeonSpawn(Entity targetGrid, MapId mapId, DungeonSpawnGroup group, out EntityUid spawned) { spawned = EntityUid.Invalid; @@ -146,7 +144,7 @@ public sealed partial class ShuttleSystem if (_loader.TryLoad(mapId, path.ToString(), out var ent) && ent.Count == 1) { - if (TryComp(ent[0], out var shuttle)) + if (HasComp(ent[0])) { TryFTLProximity(ent[0], targetGrid); } @@ -181,7 +179,7 @@ public sealed partial class ShuttleSystem return; // Spawn on a dummy map and try to FTL if possible, otherwise dump it. - var mapId = _mapManager.CreateMap(); + _mapSystem.CreateMap(out var mapId); foreach (var group in component.Groups.Values) { @@ -194,7 +192,7 @@ public sealed partial class ShuttleSystem switch (group) { case DungeonSpawnGroup dungeon: - if (!TryDungeonSpawn(targetGrid.Value, uid, mapId, dungeon, out spawned)) + if (!TryDungeonSpawn(targetGrid.Value, mapId, dungeon, out spawned)) continue; break; @@ -244,7 +242,7 @@ public sealed partial class ShuttleSystem } // Spawn on a dummy map and try to dock if possible, otherwise dump it. - var mapId = _mapManager.CreateMap(); + _mapSystem.CreateMap(out var mapId); var valid = false; if (_loader.TryLoad(mapId, component.Path.ToString(), out var ent) && diff --git a/Content.Server/Shuttles/Systems/ShuttleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleSystem.cs index aae466ba0d..6ae4aff2f4 100644 --- a/Content.Server/Shuttles/Systems/ShuttleSystem.cs +++ b/Content.Server/Shuttles/Systems/ShuttleSystem.cs @@ -34,6 +34,7 @@ public sealed partial class ShuttleSystem : SharedShuttleSystem [Dependency] private readonly IComponentFactory _factory = default!; [Dependency] private readonly IConfigurationManager _cfg = default!; [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private readonly MapSystem _mapSystem = default!; [Dependency] private readonly IMapManager _mapManager = default!; [Dependency] private readonly IPrototypeManager _protoManager = default!; [Dependency] private readonly IRobustRandom _random = default!; From 01e1624567a5113feba940e96abcf4bb077d0aac Mon Sep 17 00:00:00 2001 From: Plykiya <58439124+Plykiya@users.noreply.github.com> Date: Sun, 4 Aug 2024 21:23:23 -0700 Subject: [PATCH 183/422] Move PaperSystem to Shared (#30592) * Fix paper system late localization * IS THIS WHAT YOU WANT * well I guess this is happening now * fix the BUI * did that even do anything before? * again with the escapeformatting... * Dirtying * Move dirty to function * Rename PaperSystem to PaperVisualizerSystem * Fix namespace * how many namespace changes must I suffer through * SetContent is for Setting Content * minor shuffling * review --------- Co-authored-by: plykiya Co-authored-by: metalgearsloth --- Content.Client/Paper/PaperComponent.cs | 6 - .../Paper/UI/PaperBoundUserInterface.cs | 2 +- ...aperSystem.cs => PaperVisualizerSystem.cs} | 6 +- .../Paper/UI/PaperVisualsComponent.cs | 2 +- Content.Client/Paper/UI/PaperWindow.xaml.cs | 4 +- Content.Client/Tips/TippyUI.xaml.cs | 2 +- Content.Client/Tips/TippyUIController.cs | 6 +- .../Cargo/Systems/CargoSystem.Bounty.cs | 4 +- .../Cargo/Systems/CargoSystem.Orders.cs | 9 +- Content.Server/Cargo/Systems/CargoSystem.cs | 2 +- Content.Server/Fax/FaxSystem.cs | 5 +- .../Systems/ForensicScannerSystem.cs | 6 +- Content.Server/Labels/Label/LabelSystem.cs | 2 +- Content.Server/Nuke/NukeCodePaperSystem.cs | 4 +- Content.Server/Paper/PaperComponent.cs | 26 -- .../Paper/PaperRandomStorySystem.cs | 7 +- Content.Server/Paper/PaperSystem.cs | 231 ------------------ .../Systems/ArtifactAnalyzerSystem.cs | 5 +- .../Paper/ActivateOnPaperOpenedComponent.cs | 4 +- ...redPaperComponent.cs => PaperComponent.cs} | 23 +- Content.Shared/Paper/PaperSystem.cs | 228 +++++++++++++++++ .../Entities/Objects/Misc/paper.yml | 4 +- 22 files changed, 283 insertions(+), 305 deletions(-) delete mode 100644 Content.Client/Paper/PaperComponent.cs rename Content.Client/Paper/UI/{PaperSystem.cs => PaperVisualizerSystem.cs} (82%) delete mode 100644 Content.Server/Paper/PaperComponent.cs delete mode 100644 Content.Server/Paper/PaperSystem.cs rename {Content.Server => Content.Shared}/Paper/ActivateOnPaperOpenedComponent.cs (78%) rename Content.Shared/Paper/{SharedPaperComponent.cs => PaperComponent.cs} (68%) create mode 100644 Content.Shared/Paper/PaperSystem.cs diff --git a/Content.Client/Paper/PaperComponent.cs b/Content.Client/Paper/PaperComponent.cs deleted file mode 100644 index 1dc827bf7e..0000000000 --- a/Content.Client/Paper/PaperComponent.cs +++ /dev/null @@ -1,6 +0,0 @@ -using Content.Shared.Paper; - -namespace Content.Client.Paper; - -[RegisterComponent] -public sealed partial class PaperComponent : SharedPaperComponent; diff --git a/Content.Client/Paper/UI/PaperBoundUserInterface.cs b/Content.Client/Paper/UI/PaperBoundUserInterface.cs index f3ad1e347e..63645bc01e 100644 --- a/Content.Client/Paper/UI/PaperBoundUserInterface.cs +++ b/Content.Client/Paper/UI/PaperBoundUserInterface.cs @@ -2,7 +2,7 @@ using JetBrains.Annotations; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Shared.Utility; -using static Content.Shared.Paper.SharedPaperComponent; +using static Content.Shared.Paper.PaperComponent; namespace Content.Client.Paper.UI; diff --git a/Content.Client/Paper/UI/PaperSystem.cs b/Content.Client/Paper/UI/PaperVisualizerSystem.cs similarity index 82% rename from Content.Client/Paper/UI/PaperSystem.cs rename to Content.Client/Paper/UI/PaperVisualizerSystem.cs index f75d04a26b..a0d05736ad 100644 --- a/Content.Client/Paper/UI/PaperSystem.cs +++ b/Content.Client/Paper/UI/PaperVisualizerSystem.cs @@ -1,10 +1,10 @@ using Robust.Client.GameObjects; -using static Content.Shared.Paper.SharedPaperComponent; +using static Content.Shared.Paper.PaperComponent; -namespace Content.Client.Paper; +namespace Content.Client.Paper.UI; -public sealed class PaperSystem : VisualizerSystem +public sealed class PaperVisualizerSystem : VisualizerSystem { protected override void OnAppearanceChange(EntityUid uid, PaperVisualsComponent component, ref AppearanceChangeEvent args) { diff --git a/Content.Client/Paper/UI/PaperVisualsComponent.cs b/Content.Client/Paper/UI/PaperVisualsComponent.cs index 95040e77e6..f0dee3cf90 100644 --- a/Content.Client/Paper/UI/PaperVisualsComponent.cs +++ b/Content.Client/Paper/UI/PaperVisualsComponent.cs @@ -1,6 +1,6 @@ using System.Numerics; -namespace Content.Client.Paper; +namespace Content.Client.Paper.UI; [RegisterComponent] public sealed partial class PaperVisualsComponent : Component diff --git a/Content.Client/Paper/UI/PaperWindow.xaml.cs b/Content.Client/Paper/UI/PaperWindow.xaml.cs index f7cace642c..81b831068c 100644 --- a/Content.Client/Paper/UI/PaperWindow.xaml.cs +++ b/Content.Client/Paper/UI/PaperWindow.xaml.cs @@ -215,9 +215,9 @@ namespace Content.Client.Paper.UI /// Initialize the paper contents, i.e. the text typed by the /// user and any stamps that have peen put on the page. /// - public void Populate(SharedPaperComponent.PaperBoundUserInterfaceState state) + public void Populate(PaperComponent.PaperBoundUserInterfaceState state) { - bool isEditing = state.Mode == SharedPaperComponent.PaperAction.Write; + bool isEditing = state.Mode == PaperComponent.PaperAction.Write; bool wasEditing = InputContainer.Visible; InputContainer.Visible = isEditing; EditButtons.Visible = isEditing; diff --git a/Content.Client/Tips/TippyUI.xaml.cs b/Content.Client/Tips/TippyUI.xaml.cs index de3eaf4f51..4a2c4bfe2f 100644 --- a/Content.Client/Tips/TippyUI.xaml.cs +++ b/Content.Client/Tips/TippyUI.xaml.cs @@ -1,4 +1,4 @@ -using Content.Client.Paper; +using Content.Client.Paper.UI; using Robust.Client.AutoGenerated; using Robust.Client.Graphics; using Robust.Client.ResourceManagement; diff --git a/Content.Client/Tips/TippyUIController.cs b/Content.Client/Tips/TippyUIController.cs index 2cc694d97d..7737a3d698 100644 --- a/Content.Client/Tips/TippyUIController.cs +++ b/Content.Client/Tips/TippyUIController.cs @@ -1,21 +1,17 @@ -using Content.Client.Gameplay; using System.Numerics; using Content.Client.Message; -using Content.Client.Paper; +using Content.Client.Paper.UI; using Content.Shared.CCVar; using Content.Shared.Movement.Components; using Content.Shared.Tips; using Robust.Client.GameObjects; using Robust.Client.ResourceManagement; -using Robust.Client.State; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controllers; using Robust.Client.UserInterface.Controls; using Robust.Client.Audio; using Robust.Shared.Configuration; -using Robust.Shared.Console; using Robust.Shared.Map; -using Robust.Shared.Prototypes; using Robust.Shared.Timing; using static Content.Client.Tips.TippyUI; diff --git a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs index 89c4635b0c..e118f49363 100644 --- a/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs +++ b/Content.Server/Cargo/Systems/CargoSystem.Bounty.cs @@ -3,13 +3,13 @@ using System.Linq; using Content.Server.Cargo.Components; using Content.Server.Labels; using Content.Server.NameIdentifier; -using Content.Server.Paper; using Content.Shared.Access.Components; using Content.Shared.Cargo; using Content.Shared.Cargo.Components; using Content.Shared.Cargo.Prototypes; using Content.Shared.Database; using Content.Shared.NameIdentifier; +using Content.Shared.Paper; using Content.Shared.Stacks; using Content.Shared.Whitelist; using JetBrains.Annotations; @@ -125,7 +125,7 @@ public sealed partial class CargoSystem msg.PushNewline(); } msg.AddMarkup(Loc.GetString("bounty-console-manifest-reward", ("reward", prototype.Reward))); - _paperSystem.SetContent(uid, msg.ToMarkup(), paper); + _paperSystem.SetContent((uid, paper), msg.ToMarkup()); } /// diff --git a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs index 7a2a3d474a..f68fe0fa63 100644 --- a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs +++ b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs @@ -1,7 +1,6 @@ using System.Diagnostics.CodeAnalysis; using Content.Server.Cargo.Components; using Content.Server.Labels.Components; -using Content.Server.Paper; using Content.Server.Station.Components; using Content.Shared.Cargo; using Content.Shared.Cargo.BUI; @@ -10,10 +9,9 @@ using Content.Shared.Cargo.Events; using Content.Shared.Cargo.Prototypes; using Content.Shared.Database; using Content.Shared.Interaction; +using Content.Shared.Paper; using Robust.Shared.Map; -using Robust.Shared.Player; using Robust.Shared.Prototypes; -using Robust.Shared.Random; using Robust.Shared.Utility; namespace Content.Server.Cargo.Systems @@ -512,15 +510,14 @@ namespace Content.Server.Cargo.Systems var val = Loc.GetString("cargo-console-paper-print-name", ("orderNumber", order.OrderId)); _metaSystem.SetEntityName(printed, val); - _paperSystem.SetContent(printed, Loc.GetString( + _paperSystem.SetContent((printed, paper), Loc.GetString( "cargo-console-paper-print-text", ("orderNumber", order.OrderId), ("itemName", MetaData(item).EntityName), ("orderQuantity", order.OrderQuantity), ("requester", order.Requester), ("reason", order.Reason), - ("approver", order.Approver ?? string.Empty)), - paper); + ("approver", order.Approver ?? string.Empty))); // attempt to attach the label to the item if (TryComp(item, out var label)) diff --git a/Content.Server/Cargo/Systems/CargoSystem.cs b/Content.Server/Cargo/Systems/CargoSystem.cs index 1b33404e35..0d205d762b 100644 --- a/Content.Server/Cargo/Systems/CargoSystem.cs +++ b/Content.Server/Cargo/Systems/CargoSystem.cs @@ -1,7 +1,6 @@ using Content.Server.Access.Systems; using Content.Server.Cargo.Components; using Content.Server.DeviceLinking.Systems; -using Content.Server.Paper; using Content.Server.Popups; using Content.Server.Shuttles.Systems; using Content.Server.Stack; @@ -13,6 +12,7 @@ using Content.Shared.Cargo; using Content.Shared.Cargo.Components; using Content.Shared.Containers.ItemSlots; using Content.Shared.Mobs.Components; +using Content.Shared.Paper; using JetBrains.Annotations; using Robust.Server.GameObjects; using Robust.Shared.Audio.Systems; diff --git a/Content.Server/Fax/FaxSystem.cs b/Content.Server/Fax/FaxSystem.cs index 2b059b4b80..3f10e180fe 100644 --- a/Content.Server/Fax/FaxSystem.cs +++ b/Content.Server/Fax/FaxSystem.cs @@ -5,7 +5,6 @@ using Content.Server.DeviceNetwork; using Content.Server.DeviceNetwork.Components; using Content.Server.DeviceNetwork.Systems; using Content.Server.Labels; -using Content.Server.Paper; using Content.Server.Popups; using Content.Server.Power.Components; using Content.Server.Tools; @@ -591,14 +590,14 @@ public sealed class FaxSystem : EntitySystem if (TryComp(printed, out var paper)) { - _paperSystem.SetContent(printed, printout.Content); + _paperSystem.SetContent((printed, paper), printout.Content); // Apply stamps if (printout.StampState != null) { foreach (var stamp in printout.StampedBy) { - _paperSystem.TryStamp(printed, stamp, printout.StampState); + _paperSystem.TryStamp((printed, paper), stamp, printout.StampState); } } diff --git a/Content.Server/Forensics/Systems/ForensicScannerSystem.cs b/Content.Server/Forensics/Systems/ForensicScannerSystem.cs index 5e2a562577..80062569b8 100644 --- a/Content.Server/Forensics/Systems/ForensicScannerSystem.cs +++ b/Content.Server/Forensics/Systems/ForensicScannerSystem.cs @@ -1,12 +1,12 @@ using System.Linq; using System.Text; -using Content.Server.Paper; using Content.Server.Popups; using Content.Shared.UserInterface; using Content.Shared.DoAfter; using Content.Shared.Forensics; using Content.Shared.Hands.EntitySystems; using Content.Shared.Interaction; +using Content.Shared.Paper; using Content.Shared.Verbs; using Robust.Shared.Audio.Systems; using Robust.Server.GameObjects; @@ -183,7 +183,7 @@ namespace Content.Server.Forensics var printed = EntityManager.SpawnEntity(component.MachineOutput, Transform(uid).Coordinates); _handsSystem.PickupOrDrop(args.Actor, printed, checkActionBlocker: false); - if (!HasComp(printed)) + if (!TryComp(printed, out var paperComp)) { Log.Error("Printed paper did not have PaperComponent."); return; @@ -217,7 +217,7 @@ namespace Content.Server.Forensics text.AppendLine(residue); } - _paperSystem.SetContent(printed, text.ToString()); + _paperSystem.SetContent((printed, paperComp), text.ToString()); _audioSystem.PlayPvs(component.SoundPrint, uid, AudioParams.Default .WithVariation(0.25f) diff --git a/Content.Server/Labels/Label/LabelSystem.cs b/Content.Server/Labels/Label/LabelSystem.cs index cbf29e16a2..b70c004123 100644 --- a/Content.Server/Labels/Label/LabelSystem.cs +++ b/Content.Server/Labels/Label/LabelSystem.cs @@ -1,10 +1,10 @@ using Content.Server.Labels.Components; -using Content.Server.Paper; using Content.Shared.Containers.ItemSlots; using Content.Shared.Examine; using Content.Shared.Labels; using Content.Shared.Labels.Components; using Content.Shared.Labels.EntitySystems; +using Content.Shared.Paper; using JetBrains.Annotations; using Robust.Shared.Containers; diff --git a/Content.Server/Nuke/NukeCodePaperSystem.cs b/Content.Server/Nuke/NukeCodePaperSystem.cs index 8025e2bbd5..e890aa0845 100644 --- a/Content.Server/Nuke/NukeCodePaperSystem.cs +++ b/Content.Server/Nuke/NukeCodePaperSystem.cs @@ -2,7 +2,6 @@ using System.Diagnostics.CodeAnalysis; using Content.Server.Chat.Systems; using Content.Server.Fax; using Content.Shared.Fax.Components; -using Content.Server.Paper; using Content.Server.Station.Components; using Content.Server.Station.Systems; using Content.Shared.Paper; @@ -38,7 +37,8 @@ namespace Content.Server.Nuke if (TryGetRelativeNukeCode(uid, out var paperContent, station, onlyCurrentStation: component.AllNukesAvailable)) { - _paper.SetContent(uid, paperContent); + if (TryComp(uid, out var paperComp)) + _paper.SetContent((uid, paperComp), paperContent); } } diff --git a/Content.Server/Paper/PaperComponent.cs b/Content.Server/Paper/PaperComponent.cs deleted file mode 100644 index 7b04a77d57..0000000000 --- a/Content.Server/Paper/PaperComponent.cs +++ /dev/null @@ -1,26 +0,0 @@ -using Content.Shared.Paper; - -namespace Content.Server.Paper; - -[RegisterComponent] -public sealed partial class PaperComponent : SharedPaperComponent -{ - public PaperAction Mode; - [DataField("content")] - public string Content { get; set; } = ""; - - [DataField("contentSize")] - public int ContentSize { get; set; } = 6000; - - [DataField("stampedBy")] - public List StampedBy { get; set; } = new(); - - /// - /// Stamp to be displayed on the paper, state from beauracracy.rsi - /// - [DataField("stampState")] - public string? StampState { get; set; } - - [DataField] - public bool EditingDisabled = false; -} diff --git a/Content.Server/Paper/PaperRandomStorySystem.cs b/Content.Server/Paper/PaperRandomStorySystem.cs index 156718f545..2e43058197 100644 --- a/Content.Server/Paper/PaperRandomStorySystem.cs +++ b/Content.Server/Paper/PaperRandomStorySystem.cs @@ -1,3 +1,4 @@ +using Content.Shared.Paper; using Content.Shared.StoryGen; namespace Content.Server.Paper; @@ -11,10 +12,10 @@ public sealed class PaperRandomStorySystem : EntitySystem { base.Initialize(); - SubscribeLocalEvent(OnMapinit); + SubscribeLocalEvent(OnMapInit); } - private void OnMapinit(Entity paperStory, ref MapInitEvent ev) + private void OnMapInit(Entity paperStory, ref MapInitEvent ev) { if (!TryComp(paperStory, out var paper)) return; @@ -22,6 +23,6 @@ public sealed class PaperRandomStorySystem : EntitySystem if (!_storyGen.TryGenerateStoryFromTemplate(paperStory.Comp.Template, out var story)) return; - _paper.SetContent(paperStory.Owner, story, paper); + _paper.SetContent((paperStory.Owner, paper), story); } } diff --git a/Content.Server/Paper/PaperSystem.cs b/Content.Server/Paper/PaperSystem.cs deleted file mode 100644 index 3935df8370..0000000000 --- a/Content.Server/Paper/PaperSystem.cs +++ /dev/null @@ -1,231 +0,0 @@ -using System.Linq; -using Content.Server.Administration.Logs; -using Content.Server.Popups; -using Content.Shared.UserInterface; -using Content.Shared.Database; -using Content.Shared.Examine; -using Content.Shared.Interaction; -using Content.Shared.Paper; -using Content.Shared.Tag; -using Robust.Server.GameObjects; -using Robust.Shared.Player; -using Robust.Shared.Audio.Systems; -using static Content.Shared.Paper.SharedPaperComponent; - -namespace Content.Server.Paper -{ - public sealed class PaperSystem : EntitySystem - { - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly SharedInteractionSystem _interaction = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly TagSystem _tagSystem = default!; - [Dependency] private readonly UserInterfaceSystem _uiSystem = default!; - [Dependency] private readonly MetaDataSystem _metaSystem = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - - public override void Initialize() - { - base.Initialize(); - - SubscribeLocalEvent(OnInit); - SubscribeLocalEvent(BeforeUIOpen); - SubscribeLocalEvent(OnExamined); - SubscribeLocalEvent(OnInteractUsing); - SubscribeLocalEvent(OnInputTextMessage); - - SubscribeLocalEvent(OnPaperWrite); - - SubscribeLocalEvent(OnMapInit); - } - - private void OnMapInit(EntityUid uid, PaperComponent paperComp, MapInitEvent args) - { - if (!string.IsNullOrEmpty(paperComp.Content)) - { - paperComp.Content = Loc.GetString(paperComp.Content); - } - } - - private void OnInit(EntityUid uid, PaperComponent paperComp, ComponentInit args) - { - paperComp.Mode = PaperAction.Read; - UpdateUserInterface(uid, paperComp); - - if (TryComp(uid, out var appearance)) - { - if (paperComp.Content != "") - _appearance.SetData(uid, PaperVisuals.Status, PaperStatus.Written, appearance); - - if (paperComp.StampState != null) - _appearance.SetData(uid, PaperVisuals.Stamp, paperComp.StampState, appearance); - } - - } - - private void BeforeUIOpen(EntityUid uid, PaperComponent paperComp, BeforeActivatableUIOpenEvent args) - { - paperComp.Mode = PaperAction.Read; - UpdateUserInterface(uid, paperComp); - } - - private void OnExamined(EntityUid uid, PaperComponent paperComp, ExaminedEvent args) - { - if (!args.IsInDetailsRange) - return; - - using (args.PushGroup(nameof(PaperComponent))) - { - if (paperComp.Content != "") - args.PushMarkup( - Loc.GetString( - "paper-component-examine-detail-has-words", ("paper", uid) - ) - ); - - if (paperComp.StampedBy.Count > 0) - { - var commaSeparated = - string.Join(", ", paperComp.StampedBy.Select(s => Loc.GetString(s.StampedName))); - args.PushMarkup( - Loc.GetString( - "paper-component-examine-detail-stamped-by", ("paper", uid), ("stamps", commaSeparated)) - ); - } - } - } - - private void OnInteractUsing(EntityUid uid, PaperComponent paperComp, InteractUsingEvent args) - { - // only allow editing if there are no stamps or when using a cyberpen - var editable = paperComp.StampedBy.Count == 0 || _tagSystem.HasTag(args.Used, "WriteIgnoreStamps"); - if (_tagSystem.HasTag(args.Used, "Write") && editable) - { - if (paperComp.EditingDisabled) - { - var paperEditingDisabledMessage = Loc.GetString("paper-tamper-proof-modified-message"); - _popupSystem.PopupEntity(paperEditingDisabledMessage, uid, args.User); - - args.Handled = true; - return; - } - var writeEvent = new PaperWriteEvent(uid, args.User); - RaiseLocalEvent(args.Used, ref writeEvent); - - paperComp.Mode = PaperAction.Write; - _uiSystem.OpenUi(uid, PaperUiKey.Key, args.User); - UpdateUserInterface(uid, paperComp); - args.Handled = true; - return; - } - - // If a stamp, attempt to stamp paper - if (TryComp(args.Used, out var stampComp) && TryStamp(uid, GetStampInfo(stampComp), stampComp.StampState, paperComp)) - { - // successfully stamped, play popup - var stampPaperOtherMessage = Loc.GetString("paper-component-action-stamp-paper-other", - ("user", args.User), ("target", args.Target), ("stamp", args.Used)); - - _popupSystem.PopupEntity(stampPaperOtherMessage, args.User, Filter.PvsExcept(args.User, entityManager: EntityManager), true); - var stampPaperSelfMessage = Loc.GetString("paper-component-action-stamp-paper-self", - ("target", args.Target), ("stamp", args.Used)); - _popupSystem.PopupEntity(stampPaperSelfMessage, args.User, args.User); - - _audio.PlayPvs(stampComp.Sound, uid); - - UpdateUserInterface(uid, paperComp); - } - } - - private static StampDisplayInfo GetStampInfo(StampComponent stamp) - { - return new StampDisplayInfo - { - StampedName = stamp.StampedName, - StampedColor = stamp.StampedColor - }; - } - - private void OnInputTextMessage(EntityUid uid, PaperComponent paperComp, PaperInputTextMessage args) - { - if (args.Text.Length <= paperComp.ContentSize) - { - paperComp.Content = args.Text; - - if (TryComp(uid, out var appearance)) - _appearance.SetData(uid, PaperVisuals.Status, PaperStatus.Written, appearance); - - if (TryComp(uid, out MetaDataComponent? meta)) - _metaSystem.SetEntityDescription(uid, "", meta); - - _adminLogger.Add(LogType.Chat, LogImpact.Low, - $"{ToPrettyString(args.Actor):player} has written on {ToPrettyString(uid):entity} the following text: {args.Text}"); - - _audio.PlayPvs(paperComp.Sound, uid); - } - - paperComp.Mode = PaperAction.Read; - UpdateUserInterface(uid, paperComp); - } - - private void OnPaperWrite(EntityUid uid, ActivateOnPaperOpenedComponent comp, ref PaperWriteEvent args) - { - _interaction.UseInHandInteraction(args.User, uid); - } - - /// - /// Accepts the name and state to be stamped onto the paper, returns true if successful. - /// - public bool TryStamp(EntityUid uid, StampDisplayInfo stampInfo, string spriteStampState, PaperComponent? paperComp = null) - { - if (!Resolve(uid, ref paperComp)) - return false; - - if (!paperComp.StampedBy.Contains(stampInfo)) - { - paperComp.StampedBy.Add(stampInfo); - if (paperComp.StampState == null && TryComp(uid, out var appearance)) - { - paperComp.StampState = spriteStampState; - // Would be nice to be able to display multiple sprites on the paper - // but most of the existing images overlap - _appearance.SetData(uid, PaperVisuals.Stamp, paperComp.StampState, appearance); - } - } - return true; - } - - public void SetContent(EntityUid uid, string content, PaperComponent? paperComp = null) - { - if (!Resolve(uid, ref paperComp)) - return; - - paperComp.Content = content + '\n'; - UpdateUserInterface(uid, paperComp); - - if (!TryComp(uid, out var appearance)) - return; - - var status = string.IsNullOrWhiteSpace(content) - ? PaperStatus.Blank - : PaperStatus.Written; - - _appearance.SetData(uid, PaperVisuals.Status, status, appearance); - } - - public void UpdateUserInterface(EntityUid uid, PaperComponent? paperComp = null) - { - if (!Resolve(uid, ref paperComp)) - return; - - _uiSystem.SetUiState(uid, PaperUiKey.Key, new PaperBoundUserInterfaceState(paperComp.Content, paperComp.StampedBy, paperComp.Mode)); - } - } - - /// - /// Event fired when using a pen on paper, opening the UI. - /// - [ByRefEvent] - public record struct PaperWriteEvent(EntityUid User, EntityUid Paper); -} diff --git a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs index 59ca913a39..8fc2f26fa6 100644 --- a/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs +++ b/Content.Server/Xenoarchaeology/Equipment/Systems/ArtifactAnalyzerSystem.cs @@ -1,5 +1,4 @@ using System.Linq; -using Content.Server.Paper; using Content.Server.Power.Components; using Content.Server.Research.Systems; using Content.Shared.UserInterface; @@ -9,6 +8,7 @@ using Content.Server.Xenoarchaeology.XenoArtifacts.Events; using Content.Shared.Audio; using Content.Shared.DeviceLinking; using Content.Shared.DeviceLinking.Events; +using Content.Shared.Paper; using Content.Shared.Placeable; using Content.Shared.Popups; using Content.Shared.Research.Components; @@ -290,7 +290,8 @@ public sealed class ArtifactAnalyzerSystem : EntitySystem return; _popup.PopupEntity(Loc.GetString("analysis-console-print-popup"), uid); - _paper.SetContent(report, msg.ToMarkup()); + if (TryComp(report, out var paperComp)) + _paper.SetContent((report, paperComp), msg.ToMarkup()); UpdateUserInterface(uid, component); } diff --git a/Content.Server/Paper/ActivateOnPaperOpenedComponent.cs b/Content.Shared/Paper/ActivateOnPaperOpenedComponent.cs similarity index 78% rename from Content.Server/Paper/ActivateOnPaperOpenedComponent.cs rename to Content.Shared/Paper/ActivateOnPaperOpenedComponent.cs index 0d0f72b612..82b366decd 100644 --- a/Content.Server/Paper/ActivateOnPaperOpenedComponent.cs +++ b/Content.Shared/Paper/ActivateOnPaperOpenedComponent.cs @@ -1,4 +1,6 @@ -namespace Content.Server.Paper; +using Content.Shared.Paper; + +namespace Content.Shared.Paper; /// /// Activates the item when used to write on paper, as if Z was pressed. diff --git a/Content.Shared/Paper/SharedPaperComponent.cs b/Content.Shared/Paper/PaperComponent.cs similarity index 68% rename from Content.Shared/Paper/SharedPaperComponent.cs rename to Content.Shared/Paper/PaperComponent.cs index f65a599e53..cd0758589d 100644 --- a/Content.Shared/Paper/SharedPaperComponent.cs +++ b/Content.Shared/Paper/PaperComponent.cs @@ -4,9 +4,28 @@ using Robust.Shared.Serialization; namespace Content.Shared.Paper; -[NetworkedComponent] -public abstract partial class SharedPaperComponent : Component +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState] +public sealed partial class PaperComponent : Component { + public PaperAction Mode; + [DataField("content"), AutoNetworkedField] + public string Content { get; set; } = ""; + + [DataField("contentSize")] + public int ContentSize { get; set; } = 6000; + + [DataField("stampedBy"), AutoNetworkedField] + public List StampedBy { get; set; } = new(); + + /// + /// Stamp to be displayed on the paper, state from bureaucracy.rsi + /// + [DataField("stampState"), AutoNetworkedField] + public string? StampState { get; set; } + + [DataField, AutoNetworkedField] + public bool EditingDisabled; + /// /// Sound played after writing to the paper. /// diff --git a/Content.Shared/Paper/PaperSystem.cs b/Content.Shared/Paper/PaperSystem.cs new file mode 100644 index 0000000000..0f4bfef983 --- /dev/null +++ b/Content.Shared/Paper/PaperSystem.cs @@ -0,0 +1,228 @@ +using System.Linq; +using Content.Shared.Administration.Logs; +using Content.Shared.UserInterface; +using Content.Shared.Database; +using Content.Shared.Examine; +using Content.Shared.Interaction; +using Content.Shared.Popups; +using Content.Shared.Tag; +using Robust.Shared.Player; +using Robust.Shared.Audio.Systems; +using static Content.Shared.Paper.PaperComponent; + +namespace Content.Shared.Paper; + +public sealed class PaperSystem : EntitySystem +{ + [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; + [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private readonly SharedInteractionSystem _interaction = default!; + [Dependency] private readonly SharedPopupSystem _popupSystem = default!; + [Dependency] private readonly TagSystem _tagSystem = default!; + [Dependency] private readonly SharedUserInterfaceSystem _uiSystem = default!; + [Dependency] private readonly MetaDataSystem _metaSystem = default!; + [Dependency] private readonly SharedAudioSystem _audio = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnMapInit); + SubscribeLocalEvent(OnInit); + SubscribeLocalEvent(BeforeUIOpen); + SubscribeLocalEvent(OnExamined); + SubscribeLocalEvent(OnInteractUsing); + SubscribeLocalEvent(OnInputTextMessage); + + SubscribeLocalEvent(OnPaperWrite); + } + + private void OnMapInit(Entity entity, ref MapInitEvent args) + { + if (!string.IsNullOrEmpty(entity.Comp.Content)) + { + SetContent(entity, Loc.GetString(entity.Comp.Content)); + } + } + + private void OnInit(Entity entity, ref ComponentInit args) + { + entity.Comp.Mode = PaperAction.Read; + UpdateUserInterface(entity); + + if (TryComp(entity, out var appearance)) + { + if (entity.Comp.Content != "") + _appearance.SetData(entity, PaperVisuals.Status, PaperStatus.Written, appearance); + + if (entity.Comp.StampState != null) + _appearance.SetData(entity, PaperVisuals.Stamp, entity.Comp.StampState, appearance); + } + } + + private void BeforeUIOpen(Entity entity, ref BeforeActivatableUIOpenEvent args) + { + entity.Comp.Mode = PaperAction.Read; + UpdateUserInterface(entity); + } + + private void OnExamined(Entity entity, ref ExaminedEvent args) + { + if (!args.IsInDetailsRange) + return; + + using (args.PushGroup(nameof(PaperComponent))) + { + if (entity.Comp.Content != "") + { + args.PushMarkup( + Loc.GetString( + "paper-component-examine-detail-has-words", + ("paper", entity) + ) + ); + } + + if (entity.Comp.StampedBy.Count > 0) + { + var commaSeparated = + string.Join(", ", entity.Comp.StampedBy.Select(s => Loc.GetString(s.StampedName))); + args.PushMarkup( + Loc.GetString( + "paper-component-examine-detail-stamped-by", + ("paper", entity), + ("stamps", commaSeparated)) + ); + } + } + } + + private void OnInteractUsing(Entity entity, ref InteractUsingEvent args) + { + // only allow editing if there are no stamps or when using a cyberpen + var editable = entity.Comp.StampedBy.Count == 0 || _tagSystem.HasTag(args.Used, "WriteIgnoreStamps"); + if (_tagSystem.HasTag(args.Used, "Write") && editable) + { + if (entity.Comp.EditingDisabled) + { + var paperEditingDisabledMessage = Loc.GetString("paper-tamper-proof-modified-message"); + _popupSystem.PopupEntity(paperEditingDisabledMessage, entity, args.User); + + args.Handled = true; + return; + } + var writeEvent = new PaperWriteEvent(entity, args.User); + RaiseLocalEvent(args.Used, ref writeEvent); + + entity.Comp.Mode = PaperAction.Write; + _uiSystem.OpenUi(entity.Owner, PaperUiKey.Key, args.User); + UpdateUserInterface(entity); + args.Handled = true; + return; + } + + // If a stamp, attempt to stamp paper + if (TryComp(args.Used, out var stampComp) && TryStamp(entity, GetStampInfo(stampComp), stampComp.StampState)) + { + // successfully stamped, play popup + var stampPaperOtherMessage = Loc.GetString("paper-component-action-stamp-paper-other", + ("user", args.User), + ("target", args.Target), + ("stamp", args.Used)); + + _popupSystem.PopupEntity(stampPaperOtherMessage, args.User, Filter.PvsExcept(args.User, entityManager: EntityManager), true); + var stampPaperSelfMessage = Loc.GetString("paper-component-action-stamp-paper-self", + ("target", args.Target), + ("stamp", args.Used)); + _popupSystem.PopupClient(stampPaperSelfMessage, args.User, args.User); + + _audio.PlayPredicted(stampComp.Sound, entity, args.User); + + UpdateUserInterface(entity); + } + } + + private static StampDisplayInfo GetStampInfo(StampComponent stamp) + { + return new StampDisplayInfo + { + StampedName = stamp.StampedName, + StampedColor = stamp.StampedColor + }; + } + + private void OnInputTextMessage(Entity entity, ref PaperInputTextMessage args) + { + if (args.Text.Length <= entity.Comp.ContentSize) + { + SetContent(entity, args.Text); + + if (TryComp(entity, out var appearance)) + _appearance.SetData(entity, PaperVisuals.Status, PaperStatus.Written, appearance); + + if (TryComp(entity, out MetaDataComponent? meta)) + _metaSystem.SetEntityDescription(entity, "", meta); + + _adminLogger.Add(LogType.Chat, + LogImpact.Low, + $"{ToPrettyString(args.Actor):player} has written on {ToPrettyString(entity):entity} the following text: {args.Text}"); + + _audio.PlayPvs(entity.Comp.Sound, entity); + } + + entity.Comp.Mode = PaperAction.Read; + UpdateUserInterface(entity); + } + + private void OnPaperWrite(Entity entity, ref PaperWriteEvent args) + { + _interaction.UseInHandInteraction(args.User, entity); + } + + /// + /// Accepts the name and state to be stamped onto the paper, returns true if successful. + /// + public bool TryStamp(Entity entity, StampDisplayInfo stampInfo, string spriteStampState) + { + if (!entity.Comp.StampedBy.Contains(stampInfo)) + { + entity.Comp.StampedBy.Add(stampInfo); + Dirty(entity); + if (entity.Comp.StampState == null && TryComp(entity, out var appearance)) + { + entity.Comp.StampState = spriteStampState; + // Would be nice to be able to display multiple sprites on the paper + // but most of the existing images overlap + _appearance.SetData(entity, PaperVisuals.Stamp, entity.Comp.StampState, appearance); + } + } + return true; + } + + public void SetContent(Entity entity, string content) + { + entity.Comp.Content = content + '\n'; + Dirty(entity); + UpdateUserInterface(entity); + + if (!TryComp(entity, out var appearance)) + return; + + var status = string.IsNullOrWhiteSpace(content) + ? PaperStatus.Blank + : PaperStatus.Written; + + _appearance.SetData(entity, PaperVisuals.Status, status, appearance); + } + + private void UpdateUserInterface(Entity entity) + { + _uiSystem.SetUiState(entity.Owner, PaperUiKey.Key, new PaperBoundUserInterfaceState(entity.Comp.Content, entity.Comp.StampedBy, entity.Comp.Mode)); + } +} + +/// +/// Event fired when using a pen on paper, opening the UI. +/// +[ByRefEvent] +public record struct PaperWriteEvent(EntityUid User, EntityUid Paper); diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index 37776f5ba2..edd4aee3ba 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -229,7 +229,6 @@ components: - type: Paper contentSize: 10000 - escapeFormatting: false content: book-cnc-sheet - type: Sprite layers: @@ -587,7 +586,6 @@ map: ["enum.PaperVisualLayers.Stamp"] visible: false - type: Paper - escapeFormatting: false content: envelope-default-message - type: PaperVisuals headerImagePath: "/Textures/Interface/Paper/paper_heading_postage_stamp.svg.96dpi.png" @@ -642,4 +640,4 @@ behaviors: - !type:EmptyAllContainersBehaviour - !type:DoActsBehavior - acts: [ "Destruction" ] \ No newline at end of file + acts: [ "Destruction" ] From a95d2257c35dca930ff8eb9eebf82409a5d5645f Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Mon, 5 Aug 2024 07:25:49 +0300 Subject: [PATCH 184/422] JobRequirement refactor (#30347) * refactor JobRequirements * add profile support * fix * Update quartermaster.yml * sloth fixes * inport 30208 * Update DepartmentPrototype.cs * species restriction * left tweak stick * stringbuilder is cool! --- Content.Client/LateJoin/LateJoinGui.cs | 5 +- .../Lobby/UI/HumanoidProfileEditor.xaml.cs | 4 +- .../JobRequirementsManager.cs | 14 +- .../Ghost/Controls/Roles/GhostRolesEui.cs | 2 +- .../PlayTimeTrackingSystem.cs | 9 +- .../Effects/JobRequirementLoadoutEffect.cs | 8 +- Content.Shared/Roles/DepartmentPrototype.cs | 10 +- .../Roles/JobRequirement/AgeRequirement.cs | 50 ++++ .../DepartmentTimeRequirement.cs | 83 ++++++ .../OverallPlaytimeRequirement.cs | 50 ++++ .../JobRequirement/RoleTimeRequirement.cs | 73 +++++ .../JobRequirement/SpeciesRequirement.cs | 59 ++++ Content.Shared/Roles/JobRequirements.cs | 253 +++--------------- ...{role-timers.ftl => role-requirements.ftl} | 6 + .../Roles/Jobs/Cargo/quartermaster.yml | 2 + .../Prototypes/Roles/Jobs/Command/captain.yml | 2 + .../Roles/Jobs/Command/head_of_personnel.yml | 2 + .../Roles/Jobs/Engineering/chief_engineer.yml | 2 + .../Jobs/Medical/chief_medical_officer.yml | 2 + .../Roles/Jobs/Science/research_director.yml | 2 + .../Roles/Jobs/Security/head_of_security.yml | 2 + .../Prototypes/Roles/Jobs/departments.yml | 8 + 22 files changed, 415 insertions(+), 233 deletions(-) create mode 100644 Content.Shared/Roles/JobRequirement/AgeRequirement.cs create mode 100644 Content.Shared/Roles/JobRequirement/DepartmentTimeRequirement.cs create mode 100644 Content.Shared/Roles/JobRequirement/OverallPlaytimeRequirement.cs create mode 100644 Content.Shared/Roles/JobRequirement/RoleTimeRequirement.cs create mode 100644 Content.Shared/Roles/JobRequirement/SpeciesRequirement.cs rename Resources/Locale/en-US/job/{role-timers.ftl => role-requirements.ftl} (71%) diff --git a/Content.Client/LateJoin/LateJoinGui.cs b/Content.Client/LateJoin/LateJoinGui.cs index 62a06629f2..13cf281513 100644 --- a/Content.Client/LateJoin/LateJoinGui.cs +++ b/Content.Client/LateJoin/LateJoinGui.cs @@ -2,9 +2,11 @@ using System.Linq; using System.Numerics; using Content.Client.CrewManifest; using Content.Client.GameTicking.Managers; +using Content.Client.Lobby; using Content.Client.UserInterface.Controls; using Content.Client.Players.PlayTimeTracking; using Content.Shared.CCVar; +using Content.Shared.Preferences; using Content.Shared.Roles; using Content.Shared.StatusIcon; using Robust.Client.Console; @@ -26,6 +28,7 @@ namespace Content.Client.LateJoin [Dependency] private readonly IConfigurationManager _configManager = default!; [Dependency] private readonly IEntitySystemManager _entitySystem = default!; [Dependency] private readonly JobRequirementsManager _jobRequirements = default!; + [Dependency] private readonly IClientPreferencesManager _preferencesManager = default!; public event Action<(NetEntity, string)> SelectedId; @@ -254,7 +257,7 @@ namespace Content.Client.LateJoin jobButton.OnPressed += _ => SelectedId.Invoke((id, jobButton.JobId)); - if (!_jobRequirements.IsAllowed(prototype, out var reason)) + if (!_jobRequirements.IsAllowed(prototype, (HumanoidCharacterProfile?)_preferencesManager.Preferences?.SelectedCharacter, out var reason)) { jobButton.Disabled = true; diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs index 1509a2fed1..c5f2f311d9 100644 --- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs +++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs @@ -649,7 +649,7 @@ namespace Content.Client.Lobby.UI selector.Select(Profile?.AntagPreferences.Contains(antag.ID) == true ? 0 : 1); var requirements = _entManager.System().GetAntagRequirement(antag); - if (!_requirements.CheckRoleTime(requirements, out var reason)) + if (!_requirements.CheckRoleRequirements(requirements, (HumanoidCharacterProfile?)_preferencesManager.Preferences?.SelectedCharacter, out var reason)) { selector.LockRequirements(reason); Profile = Profile?.WithAntagPreference(antag.ID, false); @@ -903,7 +903,7 @@ namespace Content.Client.Lobby.UI icon.Texture = jobIcon.Icon.Frame0(); selector.Setup(items, job.LocalizedName, 200, job.LocalizedDescription, icon, job.Guides); - if (!_requirements.IsAllowed(job, out var reason)) + if (!_requirements.IsAllowed(job, (HumanoidCharacterProfile?)_preferencesManager.Preferences?.SelectedCharacter, out var reason)) { selector.LockRequirements(reason); } diff --git a/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs b/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs index bd4ac877db..8ce22489c7 100644 --- a/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs +++ b/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs @@ -1,8 +1,10 @@ using System.Diagnostics.CodeAnalysis; +using Content.Client.Lobby; using Content.Shared.CCVar; using Content.Shared.Players; using Content.Shared.Players.JobWhitelist; using Content.Shared.Players.PlayTimeTracking; +using Content.Shared.Preferences; using Content.Shared.Roles; using Robust.Client; using Robust.Client.Player; @@ -89,7 +91,7 @@ public sealed class JobRequirementsManager : ISharedPlaytimeManager Updated?.Invoke(); } - public bool IsAllowed(JobPrototype job, [NotNullWhen(false)] out FormattedMessage? reason) + public bool IsAllowed(JobPrototype job, HumanoidCharacterProfile? profile, [NotNullWhen(false)] out FormattedMessage? reason) { reason = null; @@ -106,16 +108,16 @@ public sealed class JobRequirementsManager : ISharedPlaytimeManager if (player == null) return true; - return CheckRoleTime(job, out reason); + return CheckRoleRequirements(job, profile, out reason); } - public bool CheckRoleTime(JobPrototype job, [NotNullWhen(false)] out FormattedMessage? reason) + public bool CheckRoleRequirements(JobPrototype job, HumanoidCharacterProfile? profile, [NotNullWhen(false)] out FormattedMessage? reason) { var reqs = _entManager.System().GetJobRequirement(job); - return CheckRoleTime(reqs, out reason); + return CheckRoleRequirements(reqs, profile, out reason); } - public bool CheckRoleTime(HashSet? requirements, [NotNullWhen(false)] out FormattedMessage? reason) + public bool CheckRoleRequirements(HashSet? requirements, HumanoidCharacterProfile? profile, [NotNullWhen(false)] out FormattedMessage? reason) { reason = null; @@ -125,7 +127,7 @@ public sealed class JobRequirementsManager : ISharedPlaytimeManager var reasons = new List(); foreach (var requirement in requirements) { - if (JobRequirements.TryRequirementMet(requirement, _roles, out var jobReason, _entManager, _prototypes)) + if (requirement.Check(_entManager, _prototypes, profile, _roles, out var jobReason)) continue; reasons.Add(jobReason.ToMarkup()); diff --git a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs index 33358a68a4..6b183362e5 100644 --- a/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs +++ b/Content.Client/UserInterface/Systems/Ghost/Controls/Roles/GhostRolesEui.cs @@ -93,7 +93,7 @@ namespace Content.Client.UserInterface.Systems.Ghost.Controls.Roles bool hasAccess = true; FormattedMessage? reason; - if (!requirementsManager.CheckRoleTime(group.Key.Requirements, out reason)) + if (!requirementsManager.CheckRoleRequirements(group.Key.Requirements, null, out reason)) { hasAccess = false; } diff --git a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs index ea6f0ad3f4..4139499e9f 100644 --- a/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs +++ b/Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs @@ -6,6 +6,7 @@ using Content.Server.Afk.Events; using Content.Server.GameTicking; using Content.Server.GameTicking.Events; using Content.Server.Mind; +using Content.Server.Preferences.Managers; using Content.Server.Station.Events; using Content.Shared.CCVar; using Content.Shared.GameTicking; @@ -13,6 +14,7 @@ using Content.Shared.Mobs; using Content.Shared.Mobs.Components; using Content.Shared.Players; using Content.Shared.Players.PlayTimeTracking; +using Content.Shared.Preferences; using Content.Shared.Roles; using Robust.Server.Player; using Robust.Shared.Configuration; @@ -35,6 +37,7 @@ public sealed class PlayTimeTrackingSystem : EntitySystem [Dependency] private readonly MindSystem _minds = default!; [Dependency] private readonly PlayTimeTrackingManager _tracking = default!; [Dependency] private readonly IAdminManager _adminManager = default!; + [Dependency] private readonly IServerPreferencesManager _preferencesManager = default!; public override void Initialize() { @@ -206,7 +209,7 @@ public sealed class PlayTimeTrackingSystem : EntitySystem playTimes = new Dictionary(); } - return JobRequirements.TryRequirementsMet(job, playTimes, out _, EntityManager, _prototypes); + return JobRequirements.TryRequirementsMet(job, playTimes, out _, EntityManager, _prototypes, (HumanoidCharacterProfile?) _preferencesManager.GetPreferences(player.UserId).SelectedCharacter); } public HashSet> GetDisallowedJobs(ICommonSession player) @@ -223,7 +226,7 @@ public sealed class PlayTimeTrackingSystem : EntitySystem foreach (var job in _prototypes.EnumeratePrototypes()) { - if (JobRequirements.TryRequirementsMet(job, playTimes, out _, EntityManager, _prototypes)) + if (JobRequirements.TryRequirementsMet(job, playTimes, out _, EntityManager, _prototypes, (HumanoidCharacterProfile?) _preferencesManager.GetPreferences(player.UserId).SelectedCharacter)) roles.Add(job.ID); } @@ -246,7 +249,7 @@ public sealed class PlayTimeTrackingSystem : EntitySystem for (var i = 0; i < jobs.Count; i++) { if (_prototypes.TryIndex(jobs[i], out var job) - && JobRequirements.TryRequirementsMet(job, playTimes, out _, EntityManager, _prototypes)) + && JobRequirements.TryRequirementsMet(job, playTimes, out _, EntityManager, _prototypes, (HumanoidCharacterProfile?) _preferencesManager.GetPreferences(userId).SelectedCharacter)) { continue; } diff --git a/Content.Shared/Preferences/Loadouts/Effects/JobRequirementLoadoutEffect.cs b/Content.Shared/Preferences/Loadouts/Effects/JobRequirementLoadoutEffect.cs index 4a40e2c65e..2f7e7b7c48 100644 --- a/Content.Shared/Preferences/Loadouts/Effects/JobRequirementLoadoutEffect.cs +++ b/Content.Shared/Preferences/Loadouts/Effects/JobRequirementLoadoutEffect.cs @@ -25,8 +25,10 @@ public sealed partial class JobRequirementLoadoutEffect : LoadoutEffect var manager = collection.Resolve(); var playtimes = manager.GetPlayTimes(session); - return JobRequirements.TryRequirementMet(Requirement, playtimes, out reason, - collection.Resolve(), - collection.Resolve()); + return Requirement.Check(collection.Resolve(), + collection.Resolve(), + profile, + playtimes, + out reason); } } diff --git a/Content.Shared/Roles/DepartmentPrototype.cs b/Content.Shared/Roles/DepartmentPrototype.cs index d6288bec90..5c94c90f8b 100644 --- a/Content.Shared/Roles/DepartmentPrototype.cs +++ b/Content.Shared/Roles/DepartmentPrototype.cs @@ -9,10 +9,16 @@ public sealed partial class DepartmentPrototype : IPrototype public string ID { get; } = string.Empty; /// - /// A description string to display in the character menu as an explanation of the department's function. + /// The name LocId of the department that will be displayed in the various menus. /// [DataField(required: true)] - public string Description = string.Empty; + public LocId Name = string.Empty; + + /// + /// A description LocId to display in the character menu as an explanation of the department's function. + /// + [DataField(required: true)] + public LocId Description = string.Empty; /// /// A color representing this department to use for text. diff --git a/Content.Shared/Roles/JobRequirement/AgeRequirement.cs b/Content.Shared/Roles/JobRequirement/AgeRequirement.cs new file mode 100644 index 0000000000..2cdc8e001c --- /dev/null +++ b/Content.Shared/Roles/JobRequirement/AgeRequirement.cs @@ -0,0 +1,50 @@ +using System.Diagnostics.CodeAnalysis; +using Content.Shared.Preferences; +using JetBrains.Annotations; +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization; +using Robust.Shared.Utility; + +namespace Content.Shared.Roles; + +/// +/// Requires the character to be older or younger than a certain age (inclusive) +/// +[UsedImplicitly] +[Serializable, NetSerializable] +public sealed partial class AgeRequirement : JobRequirement +{ + [DataField(required: true)] + public int RequiredAge; + + public override bool Check(IEntityManager entManager, + IPrototypeManager protoManager, + HumanoidCharacterProfile? profile, + IReadOnlyDictionary playTimes, + [NotNullWhen(false)] out FormattedMessage? reason) + { + reason = new FormattedMessage(); + + if (profile is null) //the profile could be null if the player is a ghost. In this case we don't need to block the role selection for ghostrole + return true; + + if (!Inverted) + { + reason = FormattedMessage.FromMarkupPermissive(Loc.GetString("role-timer-age-to-young", + ("age", RequiredAge))); + + if (profile.Age <= RequiredAge) + return false; + } + else + { + reason = FormattedMessage.FromMarkupPermissive(Loc.GetString("role-timer-age-to-old", + ("age", RequiredAge))); + + if (profile.Age >= RequiredAge) + return false; + } + + return true; + } +} diff --git a/Content.Shared/Roles/JobRequirement/DepartmentTimeRequirement.cs b/Content.Shared/Roles/JobRequirement/DepartmentTimeRequirement.cs new file mode 100644 index 0000000000..56b7d8ba81 --- /dev/null +++ b/Content.Shared/Roles/JobRequirement/DepartmentTimeRequirement.cs @@ -0,0 +1,83 @@ +using System.Diagnostics.CodeAnalysis; +using Content.Shared.Preferences; +using JetBrains.Annotations; +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization; +using Robust.Shared.Utility; + +namespace Content.Shared.Roles; + +[UsedImplicitly] +[Serializable, NetSerializable] +public sealed partial class DepartmentTimeRequirement : JobRequirement +{ + /// + /// Which department needs the required amount of time. + /// + [DataField(required: true)] + public ProtoId Department = default!; + + /// + /// How long (in seconds) this requirement is. + /// + [DataField(required: true)] + public TimeSpan Time; + + public override bool Check(IEntityManager entManager, + IPrototypeManager protoManager, + HumanoidCharacterProfile? profile, + IReadOnlyDictionary playTimes, + [NotNullWhen(false)] out FormattedMessage? reason) + { + reason = new FormattedMessage(); + var playtime = TimeSpan.Zero; + + // Check all jobs' departments + var department = protoManager.Index(Department); + var jobs = department.Roles; + string proto; + + // Check all jobs' playtime + foreach (var other in jobs) + { + // The schema is stored on the Job role but we want to explode if the timer isn't found anyway. + proto = protoManager.Index(other).PlayTimeTracker; + + playTimes.TryGetValue(proto, out var otherTime); + playtime += otherTime; + } + + var deptDiff = Time.TotalMinutes - playtime.TotalMinutes; + var nameDepartment = "role-timer-department-unknown"; + + if (protoManager.TryIndex(Department, out var departmentIndexed)) + { + nameDepartment = departmentIndexed.Name; + } + + if (!Inverted) + { + if (deptDiff <= 0) + return true; + + reason = FormattedMessage.FromMarkupPermissive(Loc.GetString( + "role-timer-department-insufficient", + ("time", Math.Ceiling(deptDiff)), + ("department", Loc.GetString(nameDepartment)), + ("departmentColor", department.Color.ToHex()))); + return false; + } + + if (deptDiff <= 0) + { + reason = FormattedMessage.FromMarkupPermissive(Loc.GetString( + "role-timer-department-too-high", + ("time", -deptDiff), + ("department", Loc.GetString(nameDepartment)), + ("departmentColor", department.Color.ToHex()))); + return false; + } + + return true; + } +} diff --git a/Content.Shared/Roles/JobRequirement/OverallPlaytimeRequirement.cs b/Content.Shared/Roles/JobRequirement/OverallPlaytimeRequirement.cs new file mode 100644 index 0000000000..acbb8f2b4d --- /dev/null +++ b/Content.Shared/Roles/JobRequirement/OverallPlaytimeRequirement.cs @@ -0,0 +1,50 @@ +using System.Diagnostics.CodeAnalysis; +using Content.Shared.Players.PlayTimeTracking; +using Content.Shared.Preferences; +using JetBrains.Annotations; +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization; +using Robust.Shared.Utility; + +namespace Content.Shared.Roles; + +[UsedImplicitly] +[Serializable, NetSerializable] +public sealed partial class OverallPlaytimeRequirement : JobRequirement +{ + /// + [DataField(required: true)] + public TimeSpan Time; + + public override bool Check(IEntityManager entManager, + IPrototypeManager protoManager, + HumanoidCharacterProfile? profile, + IReadOnlyDictionary playTimes, + [NotNullWhen(false)] out FormattedMessage? reason) + { + reason = new FormattedMessage(); + + var overallTime = playTimes.GetValueOrDefault(PlayTimeTrackingShared.TrackerOverall); + var overallDiff = Time.TotalMinutes - overallTime.TotalMinutes; + + if (!Inverted) + { + if (overallDiff <= 0 || overallTime >= Time) + return true; + + reason = FormattedMessage.FromMarkupPermissive(Loc.GetString( + "role-timer-overall-insufficient", + ("time", Math.Ceiling(overallDiff)))); + return false; + } + + if (overallDiff <= 0 || overallTime >= Time) + { + reason = FormattedMessage.FromMarkupPermissive(Loc.GetString("role-timer-overall-too-high", + ("time", -overallDiff))); + return false; + } + + return true; + } +} diff --git a/Content.Shared/Roles/JobRequirement/RoleTimeRequirement.cs b/Content.Shared/Roles/JobRequirement/RoleTimeRequirement.cs new file mode 100644 index 0000000000..658db95ab5 --- /dev/null +++ b/Content.Shared/Roles/JobRequirement/RoleTimeRequirement.cs @@ -0,0 +1,73 @@ +using System.Diagnostics.CodeAnalysis; +using Content.Shared.Players.PlayTimeTracking; +using Content.Shared.Preferences; +using Content.Shared.Roles.Jobs; +using JetBrains.Annotations; +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization; +using Robust.Shared.Utility; + +namespace Content.Shared.Roles; + +[UsedImplicitly] +[Serializable, NetSerializable] +public sealed partial class RoleTimeRequirement : JobRequirement +{ + /// + /// What particular role they need the time requirement with. + /// + [DataField(required: true)] + public ProtoId Role = default!; + + /// + [DataField(required: true)] + public TimeSpan Time; + + public override bool Check(IEntityManager entManager, + IPrototypeManager protoManager, + HumanoidCharacterProfile? profile, + IReadOnlyDictionary playTimes, + [NotNullWhen(false)] out FormattedMessage? reason) + { + reason = new FormattedMessage(); + + string proto = Role; + + playTimes.TryGetValue(proto, out var roleTime); + var roleDiff = Time.TotalMinutes - roleTime.TotalMinutes; + var departmentColor = Color.Yellow; + + if (entManager.EntitySysManager.TryGetEntitySystem(out SharedJobSystem? jobSystem)) + { + var jobProto = jobSystem.GetJobPrototype(proto); + + if (jobSystem.TryGetDepartment(jobProto, out var departmentProto)) + departmentColor = departmentProto.Color; + } + + if (!Inverted) + { + if (roleDiff <= 0) + return true; + + reason = FormattedMessage.FromMarkupPermissive(Loc.GetString( + "role-timer-role-insufficient", + ("time", Math.Ceiling(roleDiff)), + ("job", Loc.GetString(proto)), + ("departmentColor", departmentColor.ToHex()))); + return false; + } + + if (roleDiff <= 0) + { + reason = FormattedMessage.FromMarkupPermissive(Loc.GetString( + "role-timer-role-too-high", + ("time", -roleDiff), + ("job", Loc.GetString(proto)), + ("departmentColor", departmentColor.ToHex()))); + return false; + } + + return true; + } +} diff --git a/Content.Shared/Roles/JobRequirement/SpeciesRequirement.cs b/Content.Shared/Roles/JobRequirement/SpeciesRequirement.cs new file mode 100644 index 0000000000..68c069931f --- /dev/null +++ b/Content.Shared/Roles/JobRequirement/SpeciesRequirement.cs @@ -0,0 +1,59 @@ +using System.Diagnostics.CodeAnalysis; +using System.Text; +using Content.Shared.Humanoid.Prototypes; +using Content.Shared.Preferences; +using JetBrains.Annotations; +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization; +using Robust.Shared.Utility; + +namespace Content.Shared.Roles; + +/// +/// Requires the character to be or not be on the list of specified species +/// +[UsedImplicitly] +[Serializable, NetSerializable] +public sealed partial class SpeciesRequirement : JobRequirement +{ + [DataField(required: true)] + public HashSet> Species = new(); + + public override bool Check(IEntityManager entManager, + IPrototypeManager protoManager, + HumanoidCharacterProfile? profile, + IReadOnlyDictionary playTimes, + [NotNullWhen(false)] out FormattedMessage? reason) + { + reason = new FormattedMessage(); + + if (profile is null) //the profile could be null if the player is a ghost. In this case we don't need to block the role selection for ghostrole + return true; + + var sb = new StringBuilder(); + sb.Append("[color=yellow]"); + foreach (var s in Species) + { + sb.Append(Loc.GetString(protoManager.Index(s).Name) + " "); + } + + sb.Append("[/color]"); + + if (!Inverted) + { + reason = FormattedMessage.FromMarkupPermissive($"{Loc.GetString("role-timer-whitelisted-species")}\n{sb}"); + + if (!Species.Contains(profile.Species)) + return false; + } + else + { + reason = FormattedMessage.FromMarkupPermissive($"{Loc.GetString("role-timer-blacklisted-species")}\n{sb}"); + + if (Species.Contains(profile.Species)) + return false; + } + + return true; + } +} diff --git a/Content.Shared/Roles/JobRequirements.cs b/Content.Shared/Roles/JobRequirements.cs index c9d66fcf91..17f5f7bd6a 100644 --- a/Content.Shared/Roles/JobRequirements.cs +++ b/Content.Shared/Roles/JobRequirements.cs @@ -1,228 +1,51 @@ using System.Diagnostics.CodeAnalysis; -using Content.Shared.Players.PlayTimeTracking; -using Content.Shared.Roles.Jobs; -using JetBrains.Annotations; +using Content.Shared.Preferences; using Robust.Shared.Prototypes; using Robust.Shared.Serialization; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; using Robust.Shared.Utility; -namespace Content.Shared.Roles +namespace Content.Shared.Roles; + +public static class JobRequirements { - /// - /// Abstract class for playtime and other requirements for role gates. - /// - [ImplicitDataDefinitionForInheritors] - [Serializable, NetSerializable] - public abstract partial class JobRequirement{} - - [UsedImplicitly] - [Serializable, NetSerializable] - public sealed partial class DepartmentTimeRequirement : JobRequirement + public static bool TryRequirementsMet( + JobPrototype job, + IReadOnlyDictionary playTimes, + [NotNullWhen(false)] out FormattedMessage? reason, + IEntityManager entManager, + IPrototypeManager protoManager, + HumanoidCharacterProfile? profile) { - /// - /// Which department needs the required amount of time. - /// - [DataField("department", customTypeSerializer: typeof(PrototypeIdSerializer))] - public string Department = default!; - - /// - /// How long (in seconds) this requirement is. - /// - [DataField("time")] public TimeSpan Time; - - /// - /// If true, requirement will return false if playtime above the specified time. - /// - /// - /// False by default.
- /// True for invert general requirement - /// - [DataField("inverted")] public bool Inverted; - } - - [UsedImplicitly] - [Serializable, NetSerializable] - public sealed partial class RoleTimeRequirement : JobRequirement - { - /// - /// What particular role they need the time requirement with. - /// - [DataField("role", customTypeSerializer: typeof(PrototypeIdSerializer))] - public string Role = default!; - - /// - [DataField("time")] public TimeSpan Time; - - /// - [DataField("inverted")] public bool Inverted; - } - - [UsedImplicitly] - [Serializable, NetSerializable] - public sealed partial class OverallPlaytimeRequirement : JobRequirement - { - /// - [DataField("time")] public TimeSpan Time; - - /// - [DataField("inverted")] public bool Inverted; - } - - public static class JobRequirements - { - public static bool TryRequirementsMet( - JobPrototype job, - IReadOnlyDictionary playTimes, - [NotNullWhen(false)] out FormattedMessage? reason, - IEntityManager entManager, - IPrototypeManager prototypes) - { - var sys = entManager.System(); - var requirements = sys.GetJobRequirement(job); - reason = null; - if (requirements == null) - return true; - - foreach (var requirement in requirements) - { - if (!TryRequirementMet(requirement, playTimes, out reason, entManager, prototypes)) - return false; - } - + var sys = entManager.System(); + var requirements = sys.GetJobRequirement(job); + reason = null; + if (requirements == null) return true; - } - /// - /// Returns a string with the reason why a particular requirement may not be met. - /// - public static bool TryRequirementMet( - JobRequirement requirement, - IReadOnlyDictionary playTimes, - [NotNullWhen(false)] out FormattedMessage? reason, - IEntityManager entManager, - IPrototypeManager prototypes) + foreach (var requirement in requirements) { - reason = null; - - switch (requirement) - { - case DepartmentTimeRequirement deptRequirement: - var playtime = TimeSpan.Zero; - - // Check all jobs' departments - var department = prototypes.Index(deptRequirement.Department); - var jobs = department.Roles; - string proto; - - // Check all jobs' playtime - foreach (var other in jobs) - { - // The schema is stored on the Job role but we want to explode if the timer isn't found anyway. - proto = prototypes.Index(other).PlayTimeTracker; - - playTimes.TryGetValue(proto, out var otherTime); - playtime += otherTime; - } - - var deptDiff = deptRequirement.Time.TotalMinutes - playtime.TotalMinutes; - - if (!deptRequirement.Inverted) - { - if (deptDiff <= 0) - return true; - - reason = FormattedMessage.FromMarkupPermissive(Loc.GetString( - "role-timer-department-insufficient", - ("time", Math.Ceiling(deptDiff)), - ("department", Loc.GetString(deptRequirement.Department)), - ("departmentColor", department.Color.ToHex()))); - return false; - } - else - { - if (deptDiff <= 0) - { - reason = FormattedMessage.FromMarkupPermissive(Loc.GetString( - "role-timer-department-too-high", - ("time", -deptDiff), - ("department", Loc.GetString(deptRequirement.Department)), - ("departmentColor", department.Color.ToHex()))); - return false; - } - - return true; - } - - case OverallPlaytimeRequirement overallRequirement: - var overallTime = playTimes.GetValueOrDefault(PlayTimeTrackingShared.TrackerOverall); - var overallDiff = overallRequirement.Time.TotalMinutes - overallTime.TotalMinutes; - - if (!overallRequirement.Inverted) - { - if (overallDiff <= 0 || overallTime >= overallRequirement.Time) - return true; - - reason = FormattedMessage.FromMarkupPermissive(Loc.GetString( - "role-timer-overall-insufficient", - ("time", Math.Ceiling(overallDiff)))); - return false; - } - else - { - if (overallDiff <= 0 || overallTime >= overallRequirement.Time) - { - reason = FormattedMessage.FromMarkupPermissive(Loc.GetString("role-timer-overall-too-high", ("time", -overallDiff))); - return false; - } - - return true; - } - - case RoleTimeRequirement roleRequirement: - proto = roleRequirement.Role; - - playTimes.TryGetValue(proto, out var roleTime); - var roleDiff = roleRequirement.Time.TotalMinutes - roleTime.TotalMinutes; - var departmentColor = Color.Yellow; - - if (entManager.EntitySysManager.TryGetEntitySystem(out SharedJobSystem? jobSystem)) - { - var jobProto = jobSystem.GetJobPrototype(proto); - - if (jobSystem.TryGetDepartment(jobProto, out var departmentProto)) - departmentColor = departmentProto.Color; - } - - if (!roleRequirement.Inverted) - { - if (roleDiff <= 0) - return true; - - reason = FormattedMessage.FromMarkupPermissive(Loc.GetString( - "role-timer-role-insufficient", - ("time", Math.Ceiling(roleDiff)), - ("job", Loc.GetString(proto)), - ("departmentColor", departmentColor.ToHex()))); - return false; - } - else - { - if (roleDiff <= 0) - { - reason = FormattedMessage.FromMarkupPermissive(Loc.GetString( - "role-timer-role-too-high", - ("time", -roleDiff), - ("job", Loc.GetString(proto)), - ("departmentColor", departmentColor.ToHex()))); - return false; - } - - return true; - } - default: - throw new NotImplementedException(); - } + if (!requirement.Check(entManager, protoManager, profile, playTimes, out reason)) + return false; } + + return true; } } + +/// +/// Abstract class for playtime and other requirements for role gates. +/// +[ImplicitDataDefinitionForInheritors] +[Serializable, NetSerializable] +public abstract partial class JobRequirement +{ + [DataField] + public bool Inverted; + + public abstract bool Check( + IEntityManager entManager, + IPrototypeManager protoManager, + HumanoidCharacterProfile? profile, + IReadOnlyDictionary playTimes, + [NotNullWhen(false)] out FormattedMessage? reason); +} diff --git a/Resources/Locale/en-US/job/role-timers.ftl b/Resources/Locale/en-US/job/role-requirements.ftl similarity index 71% rename from Resources/Locale/en-US/job/role-timers.ftl rename to Resources/Locale/en-US/job/role-requirements.ftl index 1981f5e795..906a0470af 100644 --- a/Resources/Locale/en-US/job/role-timers.ftl +++ b/Resources/Locale/en-US/job/role-requirements.ftl @@ -4,7 +4,13 @@ role-timer-overall-insufficient = You require [color=yellow]{TOSTRING($time, "0" role-timer-overall-too-high = You require [color=yellow]{TOSTRING($time, "0")}[/color] fewer minutes of playtime to play this role. (Are you trying to play a trainee role?) role-timer-role-insufficient = You require [color=yellow]{TOSTRING($time, "0")}[/color] more minutes with [color={$departmentColor}]{$job}[/color] to play this role. role-timer-role-too-high = You require[color=yellow] {TOSTRING($time, "0")}[/color] fewer minutes with [color={$departmentColor}]{$job}[/color] to play this role. (Are you trying to play a trainee role?) +role-timer-age-to-old = Your character must be under the age of [color=yellow]{$age}[/color] to play this role. +role-timer-age-to-young = Your character must be over the age of [color=yellow]{$age}[/color] to play this role. +role-timer-whitelisted-species = Your character must be one of the following species to play this role: +role-timer-blacklisted-species = Your character must not be one of the following species to play this role: role-timer-locked = Locked (hover for details) +role-timer-department-unknown = Unknown Department + role-ban = You have been banned from this role. diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index 515e2f8425..0197cd0daf 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -15,6 +15,8 @@ time: 36000 #10 hours - !type:OverallPlaytimeRequirement time: 144000 #40 hrs + - !type:AgeRequirement + requiredAge: 20 weight: 10 startingGear: QuartermasterGear icon: "JobIconQuarterMaster" diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml index 79634aa5d9..e2687dd653 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -16,6 +16,8 @@ - !type:DepartmentTimeRequirement department: Command time: 54000 # 15 hours + - !type:AgeRequirement + requiredAge: 20 weight: 20 startingGear: CaptainGear icon: "JobIconCaptain" diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index d5521f767f..c1b285303d 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -16,6 +16,8 @@ - !type:DepartmentTimeRequirement department: Command time: 36000 # 10 hours + - !type:AgeRequirement + requiredAge: 20 weight: 20 startingGear: HoPGear icon: "JobIconHeadOfPersonnel" diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml index 0ee0b6736c..c0d9569c5d 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -15,6 +15,8 @@ time: 36000 #10 hrs - !type:OverallPlaytimeRequirement time: 144000 #40 hrs + - !type:AgeRequirement + requiredAge: 20 weight: 10 startingGear: ChiefEngineerGear icon: "JobIconChiefEngineer" diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml index 2587113415..94248450cd 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -17,6 +17,8 @@ time: 36000 #10 hrs - !type:OverallPlaytimeRequirement time: 144000 #40 hrs + - !type:AgeRequirement + requiredAge: 20 weight: 10 startingGear: CMOGear icon: "JobIconChiefMedicalOfficer" diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index b54ba54b1a..b66e89f420 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -9,6 +9,8 @@ time: 36000 #10 hrs - !type:OverallPlaytimeRequirement time: 144000 #40 hrs + - !type:AgeRequirement + requiredAge: 20 weight: 10 startingGear: ResearchDirectorGear icon: "JobIconResearchDirector" diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index 044df7f69e..c02f1cee76 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -15,6 +15,8 @@ time: 108000 # 30 hrs - !type:OverallPlaytimeRequirement time: 144000 #40 hrs + - !type:AgeRequirement + requiredAge: 20 weight: 10 startingGear: HoSGear icon: "JobIconHeadOfSecurity" diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 9be98be950..6d25d8fd88 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -1,5 +1,6 @@ - type: department id: Cargo + name: department-Cargo description: department-Cargo-description color: "#A46106" roles: @@ -9,6 +10,7 @@ - type: department id: Civilian + name: department-Civilian description: department-Civilian-description color: "#9FED58" weight: -10 @@ -34,6 +36,7 @@ - type: department id: Command + name: department-Command description: department-Command-description color: "#334E6D" roles: @@ -50,6 +53,7 @@ - type: department id: Engineering + name: department-Engineering description: department-Engineering-description color: "#EFB341" roles: @@ -60,6 +64,7 @@ - type: department id: Medical + name: department-Medical description: department-Medical-description color: "#52B4E9" roles: @@ -72,6 +77,7 @@ - type: department id: Security + name: department-Security description: department-Security-description color: "#DE3A3A" weight: 20 @@ -84,6 +90,7 @@ - type: department id: Science + name: department-Science description: department-Science-description color: "#D381C9" roles: @@ -93,6 +100,7 @@ - type: department id: Specific + name: department-Specific description: department-Specific-description color: "#9FED58" weight: 10 From 71a8fd5eabcaf2b4a7250204803edc4824db46c5 Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 5 Aug 2024 04:26:56 +0000 Subject: [PATCH 185/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index d7c23f937f..e95152fba2 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: PJB3005 - changes: - - message: Fixed preferences not loading sometimes if you had a loadout item with - playtime requirement selected in a character profile. - type: Fix - id: 6544 - time: '2024-05-07T04:21:03.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27742 - author: lzk228 changes: - message: Morgue now can be anchored and unanchored. @@ -3780,3 +3772,11 @@ id: 7043 time: '2024-08-05T03:26:28.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30487 +- author: TheShuEd + changes: + - message: Nanotrasen has introduced recruitment rules. Characters under the age + of 20 are no longer allowed to take on the role of head. + type: Tweak + id: 7044 + time: '2024-08-05T04:25:49.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30347 From 6264a557a659cddf1ddf968666d37cc2a43d9e57 Mon Sep 17 00:00:00 2001 From: Errant <35878406+Errant-4@users.noreply.github.com> Date: Mon, 5 Aug 2024 06:41:34 +0200 Subject: [PATCH 186/422] Restore the longer traitor briefing message (#30404) * Restore the long traitor briefing * highlights --- Content.Server/GameTicking/Rules/TraitorRuleSystem.cs | 4 ++-- .../en-US/game-ticking/game-presets/preset-traitor.ftl | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs index a96020d0e3..acd2a3ffde 100644 --- a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs @@ -122,9 +122,9 @@ public sealed class TraitorRuleSystem : GameRuleSystem { var sb = new StringBuilder(); sb.AppendLine(Loc.GetString("traitor-role-greeting", ("corporation", objectiveIssuer ?? Loc.GetString("objective-issuer-unknown")))); - sb.AppendLine(Loc.GetString("traitor-role-codewords-short", ("codewords", string.Join(", ", codewords)))); + sb.AppendLine(Loc.GetString("traitor-role-codewords", ("codewords", string.Join(", ", codewords)))); if (uplinkCode != null) - sb.AppendLine(Loc.GetString("traitor-role-uplink-code-short", ("code", string.Join("-", uplinkCode).Replace("sharp", "#")))); + sb.AppendLine(Loc.GetString("traitor-role-uplink-code", ("code", string.Join("-", uplinkCode).Replace("sharp", "#")))); return sb.ToString(); } diff --git a/Resources/Locale/en-US/game-ticking/game-presets/preset-traitor.ftl b/Resources/Locale/en-US/game-ticking/game-presets/preset-traitor.ftl index e92676a216..fd3e6b82aa 100644 --- a/Resources/Locale/en-US/game-ticking/game-presets/preset-traitor.ftl +++ b/Resources/Locale/en-US/game-ticking/game-presets/preset-traitor.ftl @@ -24,17 +24,17 @@ traitor-death-match-end-round-description-entry = {$originalName}'s PDA, with {$ # TraitorRole traitor-role-greeting = - You are an agent sent by {$corporation} on behalf of The Syndicate. + You are an agent sent by {$corporation} on behalf of [color = darkred]The Syndicate.[/color] Your objectives and codewords are listed in the character menu. Use the uplink loaded into your PDA to buy the tools you'll need for this mission. Death to Nanotrasen! traitor-role-codewords = - The codewords are: - {$codewords}. + The codewords are: [color = lightgray] + {$codewords}.[/color] Codewords can be used in regular conversation to identify yourself discretely to other syndicate agents. Listen for them, and keep them secret. traitor-role-uplink-code = - Set your ringtone to the notes {$code} to lock or unlock your uplink. + Set your ringtone to the notes [color = lightgray]{$code}[/color] to lock or unlock your uplink. Remember to lock it after, or the stations crew will easily open it too! # don't need all the flavour text for character menu From 9a8620d9d87a08a5e4e1619a2b7e3448f7e3536f Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Mon, 5 Aug 2024 14:42:25 +1000 Subject: [PATCH 187/422] De-duplicate loadout gear (#30341) * De-duplicate loadout gear Needs supporting code, probably with an interface with StartingGearPrototype which would also use it, but I regexed the yaml. * Code updates * Remaining yaml * Fix automatic naming * raiseEvent * Don't code when tired kids --- Content.Client/Lobby/LobbyUIController.cs | 48 +++++--- .../Tests/Preferences/LoadoutTests.cs | 4 - .../Tests/Roles/StartingGearStorageTests.cs | 2 +- .../Commands/SetOutfitCommand.cs | 3 +- Content.Shared/Clothing/LoadoutSystem.cs | 38 ++++-- .../Preferences/Loadouts/LoadoutPrototype.cs | 22 +++- Content.Shared/Roles/JobPrototype.cs | 4 +- Content.Shared/Roles/StartingGearPrototype.cs | 35 ++++-- .../Station/SharedStationSpawningSystem.cs | 29 +++-- .../Loadouts/Jobs/Cargo/cargo_technician.yml | 34 +----- .../Loadouts/Jobs/Cargo/quartermaster.yml | 42 +------ .../Jobs/Cargo/salvage_specialist.yml | 22 +--- .../Loadouts/Jobs/Civilian/bartender.yml | 34 +----- .../Loadouts/Jobs/Civilian/botanist.yml | 42 +------ .../Loadouts/Jobs/Civilian/chaplain.yml | 60 ---------- .../Loadouts/Jobs/Civilian/chef.yml | 30 +---- .../Loadouts/Jobs/Civilian/clown.yml | 42 +------ .../Loadouts/Jobs/Civilian/janitor.yml | 34 +----- .../Loadouts/Jobs/Civilian/lawyer.yml | 46 +------ .../Loadouts/Jobs/Civilian/librarian.yml | 18 +-- .../Loadouts/Jobs/Civilian/mime.yml | 50 +------- .../Loadouts/Jobs/Civilian/musician.yml | 12 -- .../Loadouts/Jobs/Civilian/passenger.yml | 48 -------- .../Loadouts/Jobs/Command/captain.yml | 60 +--------- .../Jobs/Command/head_of_personnel.yml | 30 +---- .../Engineering/atmospheric_technician.yml | 34 +----- .../Jobs/Engineering/chief_engineer.yml | 40 +------ .../Jobs/Engineering/station_engineer.yml | 84 ++----------- .../Jobs/Engineering/technical_assistant.yml | 10 +- .../Loadouts/Jobs/Medical/chemist.yml | 28 ----- .../Jobs/Medical/chief_medical_officer.yml | 40 ------- .../Loadouts/Jobs/Medical/medical_doctor.yml | 96 --------------- .../Loadouts/Jobs/Medical/medical_intern.yml | 10 +- .../Loadouts/Jobs/Medical/paramedic.yml | 24 ---- .../Jobs/Science/research_director.yml | 28 +---- .../Loadouts/Jobs/Science/scientist.yml | 105 +--------------- .../Loadouts/Jobs/Security/detective.yml | 40 +------ .../Jobs/Security/head_of_security.yml | 50 +------- .../Loadouts/Jobs/Security/security_cadet.yml | 10 +- .../Jobs/Security/security_officer.yml | 88 -------------- .../Loadouts/Jobs/Security/warden.yml | 26 +--- .../Loadouts/Jobs/Wildcards/boxer.yml | 26 +--- .../Loadouts/Jobs/Wildcards/reporter.yml | 10 +- .../Loadouts/Miscellaneous/glasses.yml | 14 +-- .../Loadouts/Miscellaneous/instruments.yml | 112 ------------------ .../Loadouts/Miscellaneous/survival.yml | 68 ----------- .../Loadouts/Miscellaneous/trinkets.yml | 82 +------------ 47 files changed, 173 insertions(+), 1641 deletions(-) diff --git a/Content.Client/Lobby/LobbyUIController.cs b/Content.Client/Lobby/LobbyUIController.cs index 1cdaaccc4e..3cf98c98ab 100644 --- a/Content.Client/Lobby/LobbyUIController.cs +++ b/Content.Client/Lobby/LobbyUIController.cs @@ -43,6 +43,7 @@ public sealed class LobbyUIController : UIController, IOnStateEntered(job.StartingGear); - foreach (var slot in slots) { - var itemType = gear.GetGear(slot.Name); + var itemType = ((IEquipmentLoadout) gear).GetGear(slot.Name); if (_inventory.TryUnequip(dummy, slot.Name, out var unequippedItem, silent: true, force: true, reparent: false)) { diff --git a/Content.IntegrationTests/Tests/Preferences/LoadoutTests.cs b/Content.IntegrationTests/Tests/Preferences/LoadoutTests.cs index a66cecc90f..6746d6d5a9 100644 --- a/Content.IntegrationTests/Tests/Preferences/LoadoutTests.cs +++ b/Content.IntegrationTests/Tests/Preferences/LoadoutTests.cs @@ -18,10 +18,6 @@ public sealed class LoadoutTests id: PlayTimeLoadoutTester - type: loadout - id: TestJumpsuit - equipment: TestJumpsuit - -- type: startingGear id: TestJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitColorGrey diff --git a/Content.IntegrationTests/Tests/Roles/StartingGearStorageTests.cs b/Content.IntegrationTests/Tests/Roles/StartingGearStorageTests.cs index 0f15a02eaa..f8060edb2b 100644 --- a/Content.IntegrationTests/Tests/Roles/StartingGearStorageTests.cs +++ b/Content.IntegrationTests/Tests/Roles/StartingGearStorageTests.cs @@ -35,7 +35,7 @@ public sealed class StartingGearPrototypeStorageTest { foreach (var gearProto in protos) { - var backpackProto = gearProto.GetGear("back"); + var backpackProto = ((IEquipmentLoadout) gearProto).GetGear("back"); if (backpackProto == string.Empty) continue; diff --git a/Content.Server/Administration/Commands/SetOutfitCommand.cs b/Content.Server/Administration/Commands/SetOutfitCommand.cs index 15d8d4afb7..ff4d34705a 100644 --- a/Content.Server/Administration/Commands/SetOutfitCommand.cs +++ b/Content.Server/Administration/Commands/SetOutfitCommand.cs @@ -97,11 +97,12 @@ namespace Content.Server.Administration.Commands foreach (var slot in slots) { invSystem.TryUnequip(target, slot.Name, true, true, false, inventoryComponent); - var gearStr = startingGear.GetGear(slot.Name); + var gearStr = ((IEquipmentLoadout) startingGear).GetGear(slot.Name); if (gearStr == string.Empty) { continue; } + var equipmentEntity = entityManager.SpawnEntity(gearStr, entityManager.GetComponent(target).Coordinates); if (slot.Name == "id" && entityManager.TryGetComponent(equipmentEntity, out PdaComponent? pdaComponent) && diff --git a/Content.Shared/Clothing/LoadoutSystem.cs b/Content.Shared/Clothing/LoadoutSystem.cs index 1bab86e90f..7605845626 100644 --- a/Content.Shared/Clothing/LoadoutSystem.cs +++ b/Content.Shared/Clothing/LoadoutSystem.cs @@ -40,12 +40,25 @@ public sealed class LoadoutSystem : EntitySystem return "Job" + loadout; } + public EntProtoId? GetFirstOrNull(LoadoutPrototype loadout) + { + EntProtoId? proto = null; + + if (_protoMan.TryIndex(loadout.StartingGear, out var gear)) + { + proto = GetFirstOrNull(gear); + } + + proto ??= GetFirstOrNull((IEquipmentLoadout)loadout); + return proto; + } + /// /// Tries to get the first entity prototype for operations such as sprite drawing. /// - public EntProtoId? GetFirstOrNull(LoadoutPrototype loadout) + public EntProtoId? GetFirstOrNull(IEquipmentLoadout? gear) { - if (!_protoMan.TryIndex(loadout.Equipment, out var gear)) + if (gear == null) return null; var count = gear.Equipment.Count + gear.Inhand.Count + gear.Storage.Values.Sum(x => x.Count); @@ -75,13 +88,23 @@ public sealed class LoadoutSystem : EntitySystem return null; } + public string GetName(LoadoutPrototype loadout) + { + if (_protoMan.TryIndex(loadout.StartingGear, out var gear)) + { + return GetName(gear); + } + + return GetName((IEquipmentLoadout) loadout); + } + /// /// Tries to get the name of a loadout. /// - public string GetName(LoadoutPrototype loadout) + public string GetName(IEquipmentLoadout? gear) { - if (!_protoMan.TryIndex(loadout.Equipment, out var gear)) - return Loc.GetString("loadout-unknown"); + if (gear == null) + return string.Empty; var count = gear.Equipment.Count + gear.Storage.Values.Sum(o => o.Count) + gear.Inhand.Count; @@ -111,7 +134,7 @@ public sealed class LoadoutSystem : EntitySystem } } - return Loc.GetString($"loadout-{loadout.ID}"); + return Loc.GetString($"unknown"); } private void OnMapInit(EntityUid uid, LoadoutComponent component, MapInitEvent args) @@ -119,8 +142,7 @@ public sealed class LoadoutSystem : EntitySystem // Use starting gear if specified if (component.StartingGear != null) { - var gear = _protoMan.Index(_random.Pick(component.StartingGear)); - _station.EquipStartingGear(uid, gear); + _station.EquipStartingGear(uid, _random.Pick(component.StartingGear)); return; } diff --git a/Content.Shared/Preferences/Loadouts/LoadoutPrototype.cs b/Content.Shared/Preferences/Loadouts/LoadoutPrototype.cs index 90b000d181..a570b61d89 100644 --- a/Content.Shared/Preferences/Loadouts/LoadoutPrototype.cs +++ b/Content.Shared/Preferences/Loadouts/LoadoutPrototype.cs @@ -8,13 +8,17 @@ namespace Content.Shared.Preferences.Loadouts; /// Individual loadout item to be applied. /// [Prototype] -public sealed partial class LoadoutPrototype : IPrototype +public sealed partial class LoadoutPrototype : IPrototype, IEquipmentLoadout { [IdDataField] public string ID { get; } = string.Empty; - [DataField(required: true)] - public ProtoId Equipment; + /* + * You can either use an existing StartingGearPrototype or specify it inline to avoid bloating yaml. + */ + + [DataField] + public ProtoId? StartingGear; /// /// Effects to be applied when the loadout is applied. @@ -22,4 +26,16 @@ public sealed partial class LoadoutPrototype : IPrototype /// [DataField] public List Effects = new(); + + /// + [DataField] + public Dictionary Equipment { get; set; } = new(); + + /// + [DataField] + public List Inhand { get; set; } = new(); + + /// + [DataField] + public Dictionary> Storage { get; set; } = new(); } diff --git a/Content.Shared/Roles/JobPrototype.cs b/Content.Shared/Roles/JobPrototype.cs index c2549e3925..71dba7449d 100644 --- a/Content.Shared/Roles/JobPrototype.cs +++ b/Content.Shared/Roles/JobPrototype.cs @@ -87,8 +87,8 @@ namespace Content.Shared.Roles [DataField("antagAdvantage")] public int AntagAdvantage = 0; - [DataField("startingGear", customTypeSerializer: typeof(PrototypeIdSerializer))] - public string? StartingGear { get; private set; } + [DataField] + public ProtoId? StartingGear { get; private set; } /// /// Use this to spawn in as a non-humanoid (borg, test subject, etc.) diff --git a/Content.Shared/Roles/StartingGearPrototype.cs b/Content.Shared/Roles/StartingGearPrototype.cs index d96d014f88..b0a4b94e55 100644 --- a/Content.Shared/Roles/StartingGearPrototype.cs +++ b/Content.Shared/Roles/StartingGearPrototype.cs @@ -4,7 +4,7 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototy namespace Content.Shared.Roles; [Prototype] -public sealed partial class StartingGearPrototype : IPrototype, IInheritingPrototype +public sealed partial class StartingGearPrototype : IPrototype, IInheritingPrototype, IEquipmentLoadout { /// [ViewVariables] @@ -19,26 +19,41 @@ public sealed partial class StartingGearPrototype : IPrototype, IInheritingProto [AbstractDataField] public bool Abstract { get; } + /// + [DataField] + [AlwaysPushInheritance] + public Dictionary Equipment { get; set; } = new(); + + /// + [DataField] + [AlwaysPushInheritance] + public List Inhand { get; set; } = new(); + + /// + [DataField] + [AlwaysPushInheritance] + public Dictionary> Storage { get; set; } = new(); +} + +/// +/// Specifies the starting entity prototypes and where to equip them for the specified class. +/// +public interface IEquipmentLoadout +{ /// /// The slot and entity prototype ID of the equipment that is to be spawned and equipped onto the entity. /// - [DataField] - [AlwaysPushInheritance] - public Dictionary Equipment = new(); + public Dictionary Equipment { get; set; } /// /// The inhand items that are equipped when this starting gear is equipped onto an entity. /// - [DataField] - [AlwaysPushInheritance] - public List Inhand = new(0); + public List Inhand { get; set; } /// /// Inserts entities into the specified slot's storage (if it does have storage). /// - [DataField] - [AlwaysPushInheritance] - public Dictionary> Storage = new(); + public Dictionary> Storage { get; set; } /// /// Gets the entity prototype ID of a slot in this starting gear. diff --git a/Content.Shared/Station/SharedStationSpawningSystem.cs b/Content.Shared/Station/SharedStationSpawningSystem.cs index ca53998115..fb8b64454c 100644 --- a/Content.Shared/Station/SharedStationSpawningSystem.cs +++ b/Content.Shared/Station/SharedStationSpawningSystem.cs @@ -49,25 +49,32 @@ public abstract class SharedStationSpawningSystem : EntitySystem continue; } - if (!PrototypeManager.TryIndex(loadoutProto.Equipment, out var startingGear)) - { - Log.Error($"Unable to find starting gear {loadoutProto.Equipment} for loadout {loadoutProto}"); - continue; - } - - // Handle any extra data here. - EquipStartingGear(entity, startingGear, raiseEvent: false); + EquipStartingGear(entity, loadoutProto, raiseEvent: false); } } } + public void EquipStartingGear(EntityUid entity, LoadoutPrototype loadout, bool raiseEvent = true) + { + EquipStartingGear(entity, loadout.StartingGear, raiseEvent); + EquipStartingGear(entity, (IEquipmentLoadout) loadout, raiseEvent); + } + /// /// /// public void EquipStartingGear(EntityUid entity, ProtoId? startingGear, bool raiseEvent = true) { PrototypeManager.TryIndex(startingGear, out var gearProto); - EquipStartingGear(entity, gearProto); + EquipStartingGear(entity, gearProto, raiseEvent); + } + + /// + /// + /// + public void EquipStartingGear(EntityUid entity, StartingGearPrototype? startingGear, bool raiseEvent = true) + { + EquipStartingGear(entity, (IEquipmentLoadout?) startingGear, raiseEvent); } /// @@ -76,7 +83,7 @@ public abstract class SharedStationSpawningSystem : EntitySystem /// Entity to load out. /// Starting gear to use. /// Should we raise the event for equipped. Set to false if you will call this manually - public void EquipStartingGear(EntityUid entity, StartingGearPrototype? startingGear, bool raiseEvent = true) + public void EquipStartingGear(EntityUid entity, IEquipmentLoadout? startingGear, bool raiseEvent = true) { if (startingGear == null) return; @@ -145,4 +152,4 @@ public abstract class SharedStationSpawningSystem : EntitySystem RaiseLocalEvent(entity, ref ev); } } -} \ No newline at end of file +} diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml index ecc3534458..fb823fdcb9 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/cargo_technician.yml @@ -1,76 +1,44 @@ # Head - type: loadout - id: CargoTechnicianHead - equipment: CargoTechnicianHead - -- type: startingGear id: CargoTechnicianHead equipment: head: ClothingHeadHatCargosoft # Jumpsuit - type: loadout - id: CargoTechnicianJumpsuit - equipment: CargoTechnicianJumpsuit - -- type: startingGear id: CargoTechnicianJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitCargo - type: loadout - id: CargoTechnicianJumpskirt - equipment: CargoTechnicianJumpskirt - -- type: startingGear id: CargoTechnicianJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtCargo # Back - type: loadout - id: CargoTechnicianBackpack - equipment: CargoTechnicianBackpack - -- type: startingGear id: CargoTechnicianBackpack equipment: back: ClothingBackpackCargo - type: loadout - id: CargoTechnicianSatchel - equipment: CargoTechnicianSatchel - -- type: startingGear id: CargoTechnicianSatchel equipment: back: ClothingBackpackSatchelCargo - type: loadout - id: CargoTechnicianDuffel - equipment: CargoTechnicianDuffel - -- type: startingGear id: CargoTechnicianDuffel equipment: back: ClothingBackpackDuffelCargo # OuterClothing - type: loadout - id: CargoTechnicianWintercoat - equipment: CargoTechnicianWintercoat - -- type: startingGear id: CargoTechnicianWintercoat equipment: outerClothing: ClothingOuterWinterCargo # Shoes - type: loadout - id: CargoWinterBoots - equipment: CargoWinterBoots - -- type: startingGear id: CargoWinterBoots equipment: - shoes: ClothingShoesBootsWinterCargo \ No newline at end of file + shoes: ClothingShoesBootsWinterCargo diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml index f02da12316..ecdf1e5ffe 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml @@ -1,93 +1,53 @@ # Jumpsuit - type: loadout - id: QuartermasterJumpsuit - equipment: QuartermasterJumpsuit - -- type: startingGear id: QuartermasterJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitQM - type: loadout - id: QuartermasterJumpskirt - equipment: QuartermasterJumpskirt - -- type: startingGear id: QuartermasterJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtQM - type: loadout - id: QuartermasterTurtleneck - equipment: QuartermasterTurtleneck - -- type: startingGear id: QuartermasterTurtleneck equipment: jumpsuit: ClothingUniformJumpsuitQMTurtleneck - type: loadout - id: QuartermasterTurtleneckSkirt - equipment: QuartermasterTurtleneckSkirt - -- type: startingGear id: QuartermasterTurtleneckSkirt equipment: jumpsuit: ClothingUniformJumpskirtQMTurtleneck - type: loadout - id: QuartermasterFormalSuit - equipment: QuartermasterFormalSuit - -- type: startingGear id: QuartermasterFormalSuit equipment: jumpsuit: ClothingUniformJumpsuitQMFormal # Head - type: loadout - id: QuartermasterHead - equipment: QuartermasterHead - -- type: startingGear id: QuartermasterHead equipment: head: ClothingHeadHatQMsoft - type: loadout - id: QuartermasterBeret - equipment: QuartermasterBeret - -- type: startingGear id: QuartermasterBeret equipment: head: ClothingHeadHatBeretQM # Neck - type: loadout - id: QuartermasterCloak - equipment: QuartermasterCloak - -- type: startingGear id: QuartermasterCloak equipment: neck: ClothingNeckCloakQm - type: loadout - id: QuartermasterMantle - equipment: QuartermasterMantle - -- type: startingGear id: QuartermasterMantle equipment: neck: ClothingNeckMantleQM # OuterClothing - type: loadout - id: QuartermasterWintercoat - equipment: QuartermasterWintercoat - -- type: startingGear id: QuartermasterWintercoat equipment: - outerClothing: ClothingOuterWinterQM \ No newline at end of file + outerClothing: ClothingOuterWinterQM diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml index abf787d510..5ca110b5fc 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml @@ -1,47 +1,27 @@ # Back - type: loadout - id: SalvageSpecialistBackpack - equipment: SalvageSpecialistBackpack - -- type: startingGear id: SalvageSpecialistBackpack equipment: back: ClothingBackpackSalvage - type: loadout - id: SalvageSpecialistSatchel - equipment: SalvageSpecialistSatchel - -- type: startingGear id: SalvageSpecialistSatchel equipment: back: ClothingBackpackSatchelSalvage - type: loadout - id: SalvageSpecialistDuffel - equipment: SalvageSpecialistDuffel - -- type: startingGear id: SalvageSpecialistDuffel equipment: back: ClothingBackpackDuffelSalvage # OuterClothing - type: loadout - id: SalvageSpecialistWintercoat - equipment: SalvageSpecialistWintercoat - -- type: startingGear id: SalvageSpecialistWintercoat equipment: outerClothing: ClothingOuterWinterMiner # Shoes - type: loadout - id: SalvageBoots - equipment: SalvageBoots - -- type: startingGear id: SalvageBoots equipment: - shoes: ClothingShoesBootsSalvage \ No newline at end of file + shoes: ClothingShoesBootsSalvage diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml index 811e7992f8..c8c80c7895 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/bartender.yml @@ -1,74 +1,42 @@ # Head - type: loadout - id: BartenderHead - equipment: BartenderHead - -- type: startingGear id: BartenderHead equipment: head: ClothingHeadHatTophat - type: loadout - id: BartenderBowler - equipment: BartenderBowler - -- type: startingGear id: BartenderBowler equipment: head: ClothingHeadHatBowlerHat # Jumpsuit - type: loadout - id: BartenderJumpsuit - equipment: BartenderJumpsuit - -- type: startingGear id: BartenderJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitBartender - type: loadout - id: BartenderJumpskirt - equipment: BartenderJumpskirt - -- type: startingGear id: BartenderJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtBartender - type: loadout - id: BartenderJumpsuitPurple - equipment: BartenderJumpsuitPurple - -- type: startingGear id: BartenderJumpsuitPurple equipment: jumpsuit: ClothingUniformJumpsuitBartenderPurple # Outer clothing - type: loadout - id: BartenderApron - equipment: BartenderApron - -- type: startingGear id: BartenderApron equipment: outerClothing: ClothingOuterApronBar - type: loadout - id: BartenderVest - equipment: BartenderVest - -- type: startingGear id: BartenderVest equipment: outerClothing: ClothingOuterVest - type: loadout - id: BartenderWintercoat - equipment: BartenderWintercoat - -- type: startingGear id: BartenderWintercoat equipment: - outerClothing: ClothingOuterWinterBar \ No newline at end of file + outerClothing: ClothingOuterWinterBar diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/botanist.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/botanist.yml index 7dba761a18..95838d7241 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/botanist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/botanist.yml @@ -1,93 +1,53 @@ # Head - type: loadout - id: BotanistHead - equipment: BotanistHead - -- type: startingGear id: BotanistHead equipment: head: ClothingHeadHatTrucker - type: loadout - id: BotanistBandana - equipment: BotanistBandana - -- type: startingGear id: BotanistBandana equipment: head: ClothingHeadBandBotany # Jumpsuit - type: loadout - id: BotanistJumpsuit - equipment: BotanistJumpsuit - -- type: startingGear id: BotanistJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitHydroponics - type: loadout - id: BotanistJumpskirt - equipment: BotanistJumpskirt - -- type: startingGear id: BotanistJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtHydroponics - type: loadout - id: BotanistOveralls - equipment: BotanistOveralls - -- type: startingGear id: BotanistOveralls equipment: jumpsuit: ClothingUniformOveralls # Back - type: loadout - id: BotanistBackpack - equipment: BotanistBackpack - -- type: startingGear id: BotanistBackpack equipment: back: ClothingBackpackHydroponics - type: loadout - id: BotanistSatchel - equipment: BotanistSatchel - -- type: startingGear id: BotanistSatchel equipment: back: ClothingBackpackSatchelHydroponics - type: loadout - id: BotanistDuffel - equipment: BotanistDuffel - -- type: startingGear id: BotanistDuffel equipment: back: ClothingBackpackDuffelHydroponics # Outer clothing - type: loadout - id: BotanistApron - equipment: BotanistApron - -- type: startingGear id: BotanistApron equipment: outerClothing: ClothingOuterApronBotanist - type: loadout - id: BotanistWintercoat - equipment: BotanistWintercoat - -- type: startingGear id: BotanistWintercoat equipment: - outerClothing: ClothingOuterWinterHydro \ No newline at end of file + outerClothing: ClothingOuterWinterHydro diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml index 160f06d5cf..27e41e6461 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/chaplain.yml @@ -1,139 +1,79 @@ # Head - type: loadout - id: ChaplainHead - equipment: ChaplainHead - -- type: startingGear id: ChaplainHead equipment: head: ClothingHeadHatFez - type: loadout - id: ChaplainNunHood - equipment: ChaplainNunHood - -- type: startingGear id: ChaplainNunHood equipment: head: ClothingHeadHatHoodNunHood - type: loadout - id: ChaplainPlagueHat - equipment: ChaplainPlagueHat - -- type: startingGear id: ChaplainPlagueHat equipment: head: ClothingHeadHatPlaguedoctor - type: loadout - id: ChaplainWitchHat - equipment: ChaplainWitchHat - -- type: startingGear id: ChaplainWitchHat equipment: head: ClothingHeadHatWitch - type: loadout - id: ChaplainWitchHatAlt - equipment: ChaplainWitchHatAlt - -- type: startingGear id: ChaplainWitchHatAlt equipment: head: ClothingHeadHatWitch1 # Mask - type: loadout - id: ChaplainMask - equipment: ChaplainMask - -- type: startingGear id: ChaplainMask equipment: mask: ClothingMaskPlague # Jumpsuit - type: loadout - id: ChaplainJumpsuit - equipment: ChaplainJumpsuit - -- type: startingGear id: ChaplainJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitChaplain - type: loadout - id: ChaplainJumpskirt - equipment: ChaplainJumpskirt - -- type: startingGear id: ChaplainJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtChaplain - type: loadout - id: ChaplainRobesDark - equipment: ChaplainRobesDark - -- type: startingGear id: ChaplainRobesDark equipment: jumpsuit: ClothingUniformJumpsuitMonasticRobeDark - type: loadout - id: ChaplainRobesLight - equipment: ChaplainRobesLight - -- type: startingGear id: ChaplainRobesLight equipment: jumpsuit: ClothingUniformJumpsuitMonasticRobeLight # Neck - type: loadout - id: ChaplainNeck - equipment: ChaplainNeck - -- type: startingGear id: ChaplainNeck equipment: neck: ClothingNeckStoleChaplain # Outer clothing - type: loadout - id: ChaplainPlagueSuit - equipment: ChaplainPlagueSuit - -- type: startingGear id: ChaplainPlagueSuit equipment: outerClothing: ClothingOuterPlagueSuit - type: loadout - id: ChaplainNunRobe - equipment: ChaplainNunRobe - -- type: startingGear id: ChaplainNunRobe equipment: outerClothing: ClothingOuterNunRobe - type: loadout - id: ChaplainBlackHoodie - equipment: ChaplainBlackHoodie - -- type: startingGear id: ChaplainBlackHoodie equipment: outerClothing: ClothingOuterHoodieBlack - type: loadout - id: ChaplainHoodie - equipment: ChaplainHoodie - -- type: startingGear id: ChaplainHoodie equipment: outerClothing: ClothingOuterHoodieChaplain diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml index 5e647acb75..5cfa76d4a7 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/chef.yml @@ -1,66 +1,38 @@ # Head - type: loadout - id: ChefHead - equipment: ChefHead - -- type: startingGear id: ChefHead equipment: head: ClothingHeadHatChef # Mask - type: loadout - id: ChefMask - equipment: ChefMask - -- type: startingGear id: ChefMask equipment: mask: ClothingMaskItalianMoustache # Jumpsuit - type: loadout - id: ChefJumpsuit - equipment: ChefJumpsuit - -- type: startingGear id: ChefJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitChef - type: loadout - id: ChefJumpskirt - equipment: ChefJumpskirt - -- type: startingGear id: ChefJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtChef # Outer clothing - type: loadout - id: ChefApron - equipment: ChefApron - -- type: startingGear id: ChefApron equipment: outerClothing: ClothingOuterApronChef - type: loadout - id: ChefJacket - equipment: ChefJacket - -- type: startingGear id: ChefJacket equipment: outerClothing: ClothingOuterJacketChef - type: loadout - id: ChefWintercoat - equipment: ChefWintercoat - -- type: startingGear id: ChefWintercoat equipment: - outerClothing: ClothingOuterWinterChef \ No newline at end of file + outerClothing: ClothingOuterWinterChef diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml index d3a3ce2e6c..161d49c1ed 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/clown.yml @@ -1,94 +1,54 @@ # Head - type: loadout - id: JesterHat - equipment: JesterHat - -- type: startingGear id: JesterHat equipment: head: ClothingHeadHatJesterAlt # Jumpsuit - type: loadout - id: ClownSuit - equipment: ClownSuit - -- type: startingGear id: ClownSuit equipment: jumpsuit: ClothingUniformJumpsuitClown - type: loadout - id: JesterSuit - equipment: JesterSuit - -- type: startingGear id: JesterSuit equipment: jumpsuit: ClothingUniformJumpsuitJesterAlt # Back - type: loadout - id: ClownBackpack - equipment: ClownBackpack - -- type: startingGear id: ClownBackpack equipment: back: ClothingBackpackClown - type: loadout - id: ClownSatchel - equipment: ClownSatchel - -- type: startingGear id: ClownSatchel equipment: back: ClothingBackpackSatchelClown - type: loadout - id: ClownDuffel - equipment: ClownDuffel - -- type: startingGear id: ClownDuffel equipment: back: ClothingBackpackDuffelClown # Shoes - type: loadout - id: ClownShoes - equipment: ClownShoes - -- type: startingGear id: ClownShoes equipment: shoes: ClothingShoesClown - type: loadout - id: JesterShoes - equipment: JesterShoes - -- type: startingGear id: JesterShoes equipment: shoes: ClothingShoesJester # Outer clothing - type: loadout - id: ClownRobes - equipment: ClownRobes - -- type: startingGear id: ClownRobes equipment: outerClothing: ClothingOuterClownPriest - type: loadout - id: ClownWintercoat - equipment: ClownWintercoat - -- type: startingGear id: ClownWintercoat equipment: - outerClothing: ClothingOuterWinterClown \ No newline at end of file + outerClothing: ClothingOuterWinterClown diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml index 4457042183..d9c4faed8c 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/janitor.yml @@ -9,67 +9,39 @@ # Head - type: loadout - id: JanitorHead - equipment: JanitorHead - -- type: startingGear id: JanitorHead equipment: head: ClothingHeadHatPurplesoft # Jumpsuit - type: loadout - id: JanitorJumpsuit - equipment: JanitorJumpsuit - -- type: startingGear id: JanitorJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitJanitor - type: loadout - id: JanitorJumpskirt - equipment: JanitorJumpskirt - -- type: startingGear id: JanitorJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtJanitor # Gloves - type: loadout - id: JanitorRubberGloves - equipment: JanitorRubberGloves - -- type: startingGear id: JanitorRubberGloves equipment: gloves: ClothingHandsGlovesJanitor - type: loadout - id: OrangeGloves - equipment: OrangeGloves - -- type: startingGear id: OrangeGloves equipment: gloves: ClothingHandsGlovesColorOrange - type: loadout - id: PurpleGloves - equipment: PurpleGloves - -- type: startingGear id: PurpleGloves equipment: gloves: ClothingHandsGlovesColorPurple # Outer clothing - type: loadout - id: JanitorWintercoat - equipment: JanitorWintercoat - -- type: startingGear id: JanitorWintercoat equipment: outerClothing: ClothingOuterWinterJani @@ -77,13 +49,9 @@ # Misc - type: loadout id: JanitorGoldenPlunger - equipment: JanitorGoldenPlunger effects: - !type:GroupLoadoutEffect proto: SeniorJanitorial - -- type: startingGear - id: JanitorGoldenPlunger storage: back: - - GoldenPlunger \ No newline at end of file + - GoldenPlunger diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/lawyer.yml index 00be124430..cdc60bb61d 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/lawyer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/lawyer.yml @@ -1,100 +1,56 @@ # Jumpsuit - type: loadout - id: LawyerJumpsuit - equipment: LawyerJumpsuit - -- type: startingGear id: LawyerJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitLawyerBlack - type: loadout - id: LawyerJumpskirt - equipment: LawyerJumpskirt - -- type: startingGear id: LawyerJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtLawyerBlack - type: loadout - id: LawyerJumpsuitBlue - equipment: LawyerJumpsuitBlue - -- type: startingGear id: LawyerJumpsuitBlue equipment: jumpsuit: ClothingUniformJumpsuitLawyerBlue - type: loadout - id: LawyerJumpskirtBlue - equipment: LawyerJumpskirtBlue - -- type: startingGear id: LawyerJumpskirtBlue equipment: jumpsuit: ClothingUniformJumpskirtLawyerBlue - type: loadout - id: LawyerJumpsuitPurple - equipment: LawyerJumpsuitPurple - -- type: startingGear id: LawyerJumpsuitPurple equipment: jumpsuit: ClothingUniformJumpsuitLawyerPurple - type: loadout - id: LawyerJumpskirtPurple - equipment: LawyerJumpskirtPurple - -- type: startingGear id: LawyerJumpskirtPurple equipment: jumpsuit: ClothingUniformJumpskirtLawyerPurple - type: loadout - id: LawyerJumpsuitRed - equipment: LawyerJumpsuitRed - -- type: startingGear id: LawyerJumpsuitRed equipment: jumpsuit: ClothingUniformJumpsuitLawyerRed - type: loadout - id: LawyerJumpskirtRed - equipment: LawyerJumpskirtRed - -- type: startingGear id: LawyerJumpskirtRed equipment: jumpsuit: ClothingUniformJumpskirtLawyerRed - type: loadout - id: LawyerJumpsuitGood - equipment: LawyerJumpsuitGood - -- type: startingGear id: LawyerJumpsuitGood equipment: jumpsuit: ClothingUniformJumpsuitLawyerGood - type: loadout - id: LawyerJumpskirtGood - equipment: LawyerJumpskirtGood - -- type: startingGear id: LawyerJumpskirtGood equipment: jumpsuit: ClothingUniformJumpskirtLawyerGood # Neck - type: loadout - id: LawyerNeck - equipment: LawyerNeck - -- type: startingGear id: LawyerNeck equipment: - neck: ClothingNeckLawyerbadge \ No newline at end of file + neck: ClothingNeckLawyerbadge diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/librarian.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/librarian.yml index f5d92b86eb..a4b58914df 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/librarian.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/librarian.yml @@ -1,36 +1,20 @@ # Jumpsuit - type: loadout - id: LibrarianJumpsuit - equipment: LibrarianJumpsuit - -- type: startingGear id: LibrarianJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitLibrarian - type: loadout - id: LibrarianJumpskirt - equipment: LibrarianJumpskirt - -- type: startingGear id: LibrarianJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtLibrarian - type: loadout - id: CuratorJumpsuit - equipment: CuratorJumpsuit - -- type: startingGear id: CuratorJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitCurator - type: loadout - id: CuratorJumpskirt - equipment: CuratorJumpskirt - -- type: startingGear id: CuratorJumpskirt equipment: - jumpsuit: ClothingUniformJumpskirtCurator \ No newline at end of file + jumpsuit: ClothingUniformJumpskirtCurator diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml index e60b2807ff..0d137b488b 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/mime.yml @@ -1,112 +1,64 @@ # Head - type: loadout - id: MimeHead - equipment: MimeHead - -- type: startingGear id: MimeHead equipment: head: ClothingHeadHatBeret - type: loadout - id: MimeFrenchBeret - equipment: MimeFrenchBeret - -- type: startingGear id: MimeFrenchBeret equipment: head: ClothingHeadHatBeretFrench - type: loadout - id: MimeCap - equipment: MimeCap - -- type: startingGear id: MimeCap equipment: head: ClothingHeadHatMimesoft # Mask - type: loadout - id: MimeMask - equipment: MimeMask - -- type: startingGear id: MimeMask equipment: mask: ClothingMaskMime - type: loadout - id: MimeMaskSad - equipment: MimeMaskSad - -- type: startingGear id: MimeMaskSad equipment: mask: ClothingMaskSadMime - type: loadout - id: MimeMaskScared - equipment: MimeMaskScared - -- type: startingGear id: MimeMaskScared equipment: mask: ClothingMaskScaredMime # Jumpsuit - type: loadout - id: MimeJumpsuit - equipment: MimeJumpsuit - -- type: startingGear id: MimeJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitMime - type: loadout - id: MimeJumpskirt - equipment: MimeJumpskirt - -- type: startingGear id: MimeJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtMime # Back - type: loadout - id: MimeBackpack - equipment: MimeBackpack - -- type: startingGear id: MimeBackpack equipment: back: ClothingBackpackMime - type: loadout - id: MimeSatchel - equipment: MimeSatchel - -- type: startingGear id: MimeSatchel equipment: back: ClothingBackpackSatchelMime - type: loadout - id: MimeDuffel - equipment: MimeDuffel - -- type: startingGear id: MimeDuffel equipment: back: ClothingBackpackDuffelMime # Outerclothing - type: loadout - id: MimeWintercoat - equipment: MimeWintercoat - -- type: startingGear id: MimeWintercoat equipment: - outerClothing: ClothingOuterWinterMime \ No newline at end of file + outerClothing: ClothingOuterWinterMime diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml index eae05d2005..2d3e6bd0fe 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/musician.yml @@ -1,28 +1,16 @@ # Jumpsuit - type: loadout - id: MusicianJumpsuit - equipment: MusicianJumpsuit - -- type: startingGear id: MusicianJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitMusician - type: loadout - id: MusicianJumpskirt - equipment: MusicianJumpskirt - -- type: startingGear id: MusicianJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtMusician # Outerclothing - type: loadout - id: MusicianWintercoat - equipment: MusicianWintercoat - -- type: startingGear id: MusicianWintercoat equipment: outerClothing: ClothingOuterWinterMusician diff --git a/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml b/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml index 84685e1702..ae86a4214f 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Civilian/passenger.yml @@ -11,32 +11,20 @@ # Face - type: loadout id: PassengerFace - equipment: GasMask effects: - !type:GroupLoadoutEffect proto: GreyTider - -- type: startingGear - id: GasMask equipment: mask: ClothingMaskGas # Jumpsuits # Grey - type: loadout - id: GreyJumpsuit - equipment: GreyJumpsuit - -- type: startingGear id: GreyJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitColorGrey - type: loadout - id: GreyJumpskirt - equipment: GreyJumpskirt - -- type: startingGear id: GreyJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtColorGrey @@ -44,53 +32,33 @@ # Rainbow - type: loadout id: RainbowJumpsuit - equipment: RainbowJumpsuit effects: - !type:GroupLoadoutEffect proto: GreyTider - -- type: startingGear - id: RainbowJumpsuit equipment: jumpsuit: ClothingUniformColorRainbow # Ancient - type: loadout id: AncientJumpsuit - equipment: AncientJumpsuit effects: - !type:GroupLoadoutEffect proto: GreyTider - -- type: startingGear - id: AncientJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitAncient # Back - type: loadout - id: CommonBackpack - equipment: CommonBackpack - -- type: startingGear id: CommonBackpack equipment: back: ClothingBackpack - type: loadout - id: CommonSatchel - equipment: CommonSatchel - -- type: startingGear id: CommonSatchel equipment: back: ClothingBackpackSatchel - type: loadout - id: CommonDuffel - equipment: CommonDuffel - -- type: startingGear id: CommonDuffel equipment: back: ClothingBackpackDuffel @@ -98,41 +66,25 @@ # Gloves - type: loadout id: PassengerGloves - equipment: FingerlessInsulatedGloves effects: - !type:GroupLoadoutEffect proto: GreyTider - -- type: startingGear - id: FingerlessInsulatedGloves equipment: gloves: ClothingHandsGlovesFingerlessInsulated # Outerclothing - type: loadout - id: PassengerWintercoat - equipment: PassengerWintercoat - -- type: startingGear id: PassengerWintercoat equipment: outerClothing: ClothingOuterWinterCoat # Shoes - type: loadout - id: BlackShoes - equipment: BlackShoes - -- type: startingGear id: BlackShoes equipment: shoes: ClothingShoesColorBlack - type: loadout - id: WinterBoots - equipment: WinterBoots - -- type: startingGear id: WinterBoots equipment: shoes: ClothingShoesBootsWinter diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml index 50786d6154..f665038ff2 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml @@ -1,130 +1,74 @@ # Jumpsuit - type: loadout - id: CaptainJumpsuit - equipment: CaptainJumpsuit - -- type: startingGear id: CaptainJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitCaptain - type: loadout - id: CaptainJumpskirt - equipment: CaptainJumpskirt - -- type: startingGear id: CaptainJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtCaptain - type: loadout - id: CaptainFormalSuit - equipment: CaptainFormalSuit - -- type: startingGear id: CaptainFormalSuit equipment: jumpsuit: ClothingUniformJumpsuitCapFormal - type: loadout - id: CaptainFormalSkirt - equipment: CaptainFormalSkirt - -- type: startingGear id: CaptainFormalSkirt equipment: jumpsuit: ClothingUniformJumpskirtCapFormalDress # Head - type: loadout - id: CaptainHead - equipment: CaptainHead - -- type: startingGear id: CaptainHead equipment: head: ClothingHeadHatCaptain - type: loadout - id: CaptainCap - equipment: CaptainCap - -- type: startingGear id: CaptainCap equipment: head: ClothingHeadHatCapcap # Neck - type: loadout - id: CaptainCloak - equipment: CaptainCloak - -- type: startingGear id: CaptainCloak equipment: neck: ClothingNeckCloakCap - -- type: loadout - id: CaptainCloakFormal - equipment: CaptainCloakFormal -- type: startingGear +- type: loadout id: CaptainCloakFormal equipment: neck: ClothingNeckCloakCapFormal - type: loadout - id: CaptainMantle - equipment: CaptainMantle - -- type: startingGear id: CaptainMantle equipment: neck: ClothingNeckMantleCap # Back - type: loadout - id: CaptainBackpack - equipment: CaptainBackpack - -- type: startingGear id: CaptainBackpack equipment: back: ClothingBackpackCaptain - type: loadout - id: CaptainSatchel - equipment: CaptainSatchel - -- type: startingGear id: CaptainSatchel equipment: back: ClothingBackpackSatchelCaptain - type: loadout - id: CaptainDuffel - equipment: CaptainDuffel - -- type: startingGear id: CaptainDuffel equipment: back: ClothingBackpackDuffelCaptain # Outer clothing - type: loadout - id: CaptainOuterClothing - equipment: CaptainOuterClothing - -- type: startingGear id: CaptainOuterClothing equipment: outerClothing: ClothingOuterArmorCaptainCarapace - type: loadout - id: CaptainWintercoat - equipment: CaptainWintercoat - -- type: startingGear id: CaptainWintercoat equipment: - outerClothing: ClothingOuterWinterCap \ No newline at end of file + outerClothing: ClothingOuterWinterCap diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml index 1e4e5d527f..76c46d7d1a 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml @@ -10,48 +10,28 @@ # Jumpsuit - type: loadout - id: HoPJumpsuit - equipment: HoPJumpsuit - -- type: startingGear id: HoPJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitHoP - type: loadout - id: HoPJumpskirt - equipment: HoPJumpskirt - -- type: startingGear id: HoPJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtHoP # Head - type: loadout - id: HoPHead - equipment: HoPHead - -- type: startingGear id: HoPHead equipment: head: ClothingHeadHatHopcap # Neck - type: loadout - id: HoPCloak - equipment: HoPCloak - -- type: startingGear id: HoPCloak equipment: neck: ClothingNeckCloakHop - type: loadout - id: HoPMantle - equipment: HoPMantle - -- type: startingGear id: HoPMantle equipment: neck: ClothingNeckMantleHOP @@ -59,22 +39,14 @@ # Back - type: loadout id: HoPBackpackIan - equipment: HoPBackpackIan effects: - !type:GroupLoadoutEffect proto: ProfessionalHoP - -- type: startingGear - id: HoPBackpackIan equipment: back: ClothingBackpackIan # Outerclothing - type: loadout - id: HoPWintercoat - equipment: HoPWintercoat - -- type: startingGear id: HoPWintercoat equipment: - outerClothing: ClothingOuterWinterHoP \ No newline at end of file + outerClothing: ClothingOuterWinterHoP diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/atmospheric_technician.yml index 5f1e753b9f..b3f1ae3cd6 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/atmospheric_technician.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/atmospheric_technician.yml @@ -1,75 +1,43 @@ # Jumpsuit - type: loadout - id: AtmosphericTechnicianJumpsuit - equipment: AtmosphericTechnicianJumpsuit - -- type: startingGear id: AtmosphericTechnicianJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitAtmos - type: loadout - id: AtmosphericTechnicianJumpskirt - equipment: AtmosphericTechnicianJumpskirt - -- type: startingGear id: AtmosphericTechnicianJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtAtmos - type: loadout - id: AtmosphericTechnicianJumpsuitCasual - equipment: AtmosphericTechnicianJumpsuitCasual - -- type: startingGear id: AtmosphericTechnicianJumpsuitCasual equipment: jumpsuit: ClothingUniformJumpsuitAtmosCasual # Back - type: loadout - id: AtmosphericTechnicianBackpack - equipment: AtmosphericTechnicianBackpack - -- type: startingGear id: AtmosphericTechnicianBackpack equipment: back: ClothingBackpackAtmospherics - type: loadout - id: AtmosphericTechnicianSatchel - equipment: AtmosphericTechnicianSatchel - -- type: startingGear id: AtmosphericTechnicianSatchel equipment: back: ClothingBackpackSatchelAtmospherics - type: loadout - id: AtmosphericTechnicianDuffel - equipment: AtmosphericTechnicianDuffel - -- type: startingGear id: AtmosphericTechnicianDuffel equipment: back: ClothingBackpackDuffelAtmospherics # OuterClothing - type: loadout - id: AtmosphericTechnicianWintercoat - equipment: AtmosphericTechnicianWintercoat - -- type: startingGear id: AtmosphericTechnicianWintercoat equipment: outerClothing: ClothingOuterWinterAtmos # Shoes - type: loadout - id: WhiteShoes - equipment: WhiteShoes - -- type: startingGear id: WhiteShoes equipment: - shoes: ClothingShoesColorWhite \ No newline at end of file + shoes: ClothingShoesColorWhite diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml index 5bfbb8c201..522f16d09e 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml @@ -1,89 +1,53 @@ # Jumpsuit - type: loadout - id: ChiefEngineerJumpsuit - equipment: ChiefEngineerJumpsuit - -- type: startingGear id: ChiefEngineerJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitChiefEngineer - type: loadout - id: ChiefEngineerJumpskirt - equipment: ChiefEngineerJumpskirt - -- type: startingGear id: ChiefEngineerJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtChiefEngineer - type: loadout - id: ChiefEngineerTurtleneck - equipment: ChiefEngineerTurtleneck - -- type: startingGear id: ChiefEngineerTurtleneck equipment: jumpsuit: ClothingUniformJumpsuitChiefEngineerTurtle - type: loadout - id: ChiefEngineerTurtleneckSkirt - equipment: ChiefEngineerTurtleneckSkirt - -- type: startingGear id: ChiefEngineerTurtleneckSkirt equipment: jumpsuit: ClothingUniformJumpskirtChiefEngineerTurtle # Head - type: loadout - id: ChiefEngineerHead - equipment: ChiefEngineerHead - -- type: startingGear id: ChiefEngineerHead equipment: head: ClothingHeadHatHardhatWhite - type: loadout id: ChiefEngineerBeret - equipment: EngineeringBeret + startingGear: EngineeringBeret # Neck - type: loadout - id: ChiefEngineerCloak - equipment: ChiefEngineerCloak - -- type: startingGear id: ChiefEngineerCloak equipment: neck: ClothingNeckCloakCe - type: loadout - id: ChiefEngineerMantle - equipment: ChiefEngineerMantle - -- type: startingGear id: ChiefEngineerMantle equipment: neck: ClothingNeckMantleCE # OuterClothing - type: loadout - id: ChiefEngineerWintercoat - equipment: ChiefEngineerWintercoat - -- type: startingGear id: ChiefEngineerWintercoat equipment: outerClothing: ClothingOuterWinterCE # Shoes - type: loadout - id: BrownShoes - equipment: BrownShoes - -- type: startingGear id: BrownShoes equipment: - shoes: ClothingShoesColorBrown \ No newline at end of file + shoes: ClothingShoesColorBrown diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml index 7f9e20e2aa..82955fccfb 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml @@ -19,181 +19,113 @@ time: 216000 # 60 hrs # Head -- type: loadout - id: StationEngineerHardhatYellow - equipment: StationEngineerHardhatYellow - - type: startingGear + id: EngineeringBeret + equipment: + head: ClothingHeadHatBeretEngineering + +- type: loadout id: StationEngineerHardhatYellow equipment: head: ClothingHeadHatHardhatYellow - type: loadout - id: StationEngineerHardhatOrange - equipment: StationEngineerHardhatOrange - -- type: startingGear id: StationEngineerHardhatOrange equipment: head: ClothingHeadHatHardhatOrange - type: loadout - id: StationEngineerHardhatRed - equipment: StationEngineerHardhatRed - -- type: startingGear id: StationEngineerHardhatRed equipment: head: ClothingHeadHatHardhatRed - type: loadout id: SeniorEngineerBeret - equipment: EngineeringBeret + startingGear: EngineeringBeret effects: - !type:GroupLoadoutEffect proto: SeniorEngineering -- type: startingGear - id: EngineeringBeret - equipment: - head: ClothingHeadHatBeretEngineering - # Jumpsuit - type: loadout - id: StationEngineerJumpsuit - equipment: StationEngineerJumpsuit - -- type: startingGear id: StationEngineerJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitEngineering - type: loadout - id: StationEngineerJumpskirt - equipment: StationEngineerJumpskirt - -- type: startingGear id: StationEngineerJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtEngineering - type: loadout - id: StationEngineerHazardsuit - equipment: StationEngineerHazardsuit - -- type: startingGear id: StationEngineerHazardsuit equipment: jumpsuit: ClothingUniformJumpsuitEngineeringHazard - type: loadout id: SeniorEngineerJumpsuit - equipment: SeniorEngineerJumpsuit effects: - !type:GroupLoadoutEffect proto: SeniorEngineering - -- type: startingGear - id: SeniorEngineerJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitSeniorEngineer - type: loadout id: SeniorEngineerJumpskirt - equipment: SeniorEngineerJumpskirt effects: - !type:GroupLoadoutEffect proto: SeniorEngineering - -- type: startingGear - id: SeniorEngineerJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtSeniorEngineer # Back - type: loadout - id: StationEngineerBackpack - equipment: StationEngineerBackpack - -- type: startingGear id: StationEngineerBackpack equipment: back: ClothingBackpackEngineering - type: loadout - id: StationEngineerSatchel - equipment: StationEngineerSatchel - -- type: startingGear id: StationEngineerSatchel equipment: back: ClothingBackpackSatchelEngineering - type: loadout - id: StationEngineerDuffel - equipment: StationEngineerDuffel - -- type: startingGear id: StationEngineerDuffel equipment: back: ClothingBackpackDuffelEngineering # OuterClothing - type: loadout - id: StationEngineerOuterVest - equipment: StationEngineerOuterVest - -- type: startingGear id: StationEngineerOuterVest equipment: outerClothing: ClothingOuterVestHazard - -- type: loadout - id: StationEngineerWintercoat - equipment: StationEngineerWintercoat -- type: startingGear +- type: loadout id: StationEngineerWintercoat equipment: outerClothing: ClothingOuterWinterEngi - + # Shoes - type: loadout - id: WorkBoots - equipment: WorkBoots - -- type: startingGear id: WorkBoots equipment: shoes: ClothingShoesBootsWork - type: loadout - id: EngineeringWinterBoots - equipment: EngineeringWinterBoots - -- type: startingGear id: EngineeringWinterBoots equipment: shoes: ClothingShoesBootsWinterEngi # ID - type: loadout - id: StationEngineerPDA - equipment: StationEngineerPDA - -- type: startingGear id: StationEngineerPDA equipment: id: EngineerPDA - type: loadout id: SeniorEngineerPDA - equipment: SeniorEngineerPDA effects: - !type:GroupLoadoutEffect proto: SeniorEngineering - -- type: startingGear - id: SeniorEngineerPDA equipment: id: SeniorEngineerPDA diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/technical_assistant.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/technical_assistant.yml index b7689daffc..2a2c16a6dd 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/technical_assistant.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/technical_assistant.yml @@ -1,18 +1,10 @@ # Jumpsuit - type: loadout - id: YellowJumpsuit - equipment: YellowJumpsuit - -- type: startingGear id: YellowJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitColorYellow - type: loadout - id: YellowJumpskirt - equipment: YellowJumpskirt - -- type: startingGear id: YellowJumpskirt equipment: - jumpsuit: ClothingUniformJumpskirtColorYellow \ No newline at end of file + jumpsuit: ClothingUniformJumpskirtColorYellow diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml index 289910c8c8..100e5eb53a 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/chemist.yml @@ -1,65 +1,37 @@ # Jumpsuit - type: loadout - id: ChemistJumpsuit - equipment: ChemistJumpsuit - -- type: startingGear id: ChemistJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitChemistry - type: loadout - id: ChemistJumpskirt - equipment: ChemistJumpskirt - -- type: startingGear id: ChemistJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtChemistry # Back - type: loadout - id: ChemistBackpack - equipment: ChemistBackpack - -- type: startingGear id: ChemistBackpack equipment: back: ClothingBackpackChemistry - type: loadout - id: ChemistSatchel - equipment: ChemistSatchel - -- type: startingGear id: ChemistSatchel equipment: back: ClothingBackpackSatchelChemistry - type: loadout - id: ChemistDuffel - equipment: ChemistDuffel - -- type: startingGear id: ChemistDuffel equipment: back: ClothingBackpackDuffelChemistry # Outer clothing - type: loadout - id: ChemistLabCoat - equipment: ChemistLabCoat - -- type: startingGear id: ChemistLabCoat equipment: outerClothing: ClothingOuterCoatLabChem - type: loadout - id: ChemistWintercoat - equipment: ChemistWintercoat - -- type: startingGear id: ChemistWintercoat equipment: outerClothing: ClothingOuterWinterChem diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml index f7436a4281..12bde1be96 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml @@ -1,93 +1,53 @@ # Jumpsuit - type: loadout - id: ChiefMedicalOfficerJumpsuit - equipment: ChiefMedicalOfficerJumpsuit - -- type: startingGear id: ChiefMedicalOfficerJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitCMO - type: loadout - id: ChiefMedicalOfficerJumpskirt - equipment: ChiefMedicalOfficerJumpskirt - -- type: startingGear id: ChiefMedicalOfficerJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtCMO - type: loadout - id: ChiefMedicalOfficerTurtleneckJumpsuit - equipment: ChiefMedicalOfficerTurtleneckJumpsuit - -- type: startingGear id: ChiefMedicalOfficerTurtleneckJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitCMOTurtle - type: loadout - id: ChiefMedicalOfficerTurtleneckJumpskirt - equipment: ChiefMedicalOfficerTurtleneckJumpskirt - -- type: startingGear id: ChiefMedicalOfficerTurtleneckJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtCMOTurtle # Head - type: loadout - id: ChiefMedicalOfficerBeret - equipment: ChiefMedicalOfficerBeret - -- type: startingGear id: ChiefMedicalOfficerBeret equipment: head: ClothingHeadHatBeretCmo - type: loadout - id: CMOMedicalHeadMirror - equipment: CMOMedicalHeadMirror - -- type: startingGear id: CMOMedicalHeadMirror equipment: head: ClothingHeadMirror # Neck - type: loadout - id: ChiefMedicalOfficerCloak - equipment: ChiefMedicalOfficerCloak - -- type: startingGear id: ChiefMedicalOfficerCloak equipment: neck: ClothingCloakCmo - type: loadout - id: ChiefMedicalOfficerMantle - equipment: ChiefMedicalOfficerMantle - -- type: startingGear id: ChiefMedicalOfficerMantle equipment: neck: ClothingNeckMantleCMO # Outer clothing - type: loadout - id: ChiefMedicalOfficerLabCoat - equipment: ChiefMedicalOfficerLabCoat - -- type: startingGear id: ChiefMedicalOfficerLabCoat equipment: outerClothing: ClothingOuterCoatLabCmo - type: loadout - id: ChiefMedicalOfficerWintercoat - equipment: ChiefMedicalOfficerWintercoat - -- type: startingGear id: ChiefMedicalOfficerWintercoat equipment: outerClothing: ClothingOuterWinterCMO diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml index a64d60ba1f..db5f2edae8 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml @@ -33,241 +33,145 @@ - type: loadout id: SeniorPhysicianBeret - equipment: SeniorPhysicianBeret effects: - !type:GroupLoadoutEffect proto: SeniorPhysician - -- type: startingGear - id: SeniorPhysicianBeret equipment: head: ClothingHeadHatBeretSeniorPhysician - type: loadout id: MedicalHeadMirror - equipment: MedicalHeadMirror effects: - !type:GroupLoadoutEffect proto: MedicalHeadMirrorTimer - -- type: startingGear - id: MedicalHeadMirror equipment: head: ClothingHeadMirror - type: loadout - id: MedicalBeret - equipment: MedicalBeret - -- type: startingGear id: MedicalBeret equipment: head: ClothingHeadHatBeretMedic - type: loadout - id: BlueSurgeryCap - equipment: BlueSurgeryCap - -- type: startingGear id: BlueSurgeryCap equipment: head: ClothingHeadHatSurgcapBlue - type: loadout - id: GreenSurgeryCap - equipment: GreenSurgeryCap - -- type: startingGear id: GreenSurgeryCap equipment: head: ClothingHeadHatSurgcapGreen - type: loadout - id: PurpleSurgeryCap - equipment: PurpleSurgeryCap - -- type: startingGear id: PurpleSurgeryCap equipment: head: ClothingHeadHatSurgcapPurple - type: loadout - id: NurseHat - equipment: NurseHat - -- type: startingGear id: NurseHat equipment: head: ClothingHeadNurseHat # Jumpsuit - type: loadout - id: MedicalDoctorJumpsuit - equipment: MedicalDoctorJumpsuit - -- type: startingGear id: MedicalDoctorJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitMedicalDoctor - type: loadout - id: MedicalDoctorJumpskirt - equipment: MedicalDoctorJumpskirt - -- type: startingGear id: MedicalDoctorJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtMedicalDoctor - type: loadout id: SeniorPhysicianJumpsuit - equipment: SeniorPhysicianJumpsuit effects: - !type:GroupLoadoutEffect proto: SeniorPhysician - -- type: startingGear - id: SeniorPhysicianJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitSeniorPhysician - type: loadout id: SeniorPhysicianJumpskirt - equipment: SeniorPhysicianJumpskirt effects: - !type:GroupLoadoutEffect proto: SeniorPhysician - -- type: startingGear - id: SeniorPhysicianJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtSeniorPhysician - type: loadout - id: MedicalBlueScrubs - equipment: MedicalBlueScrubs - -- type: startingGear id: MedicalBlueScrubs equipment: jumpsuit: UniformScrubsColorBlue - type: loadout - id: MedicalGreenScrubs - equipment: MedicalGreenScrubs - -- type: startingGear id: MedicalGreenScrubs equipment: jumpsuit: UniformScrubsColorGreen - type: loadout - id: MedicalPurpleScrubs - equipment: MedicalPurpleScrubs - -- type: startingGear id: MedicalPurpleScrubs equipment: jumpsuit: UniformScrubsColorPurple # Back - type: loadout - id: MedicalDoctorBackpack - equipment: MedicalDoctorBackpack - -- type: startingGear id: MedicalDoctorBackpack equipment: back: ClothingBackpackMedical - type: loadout - id: MedicalDoctorSatchel - equipment: MedicalDoctorSatchel - -- type: startingGear id: MedicalDoctorSatchel equipment: back: ClothingBackpackSatchelMedical - type: loadout - id: MedicalDoctorDuffel - equipment: MedicalDoctorDuffel - -- type: startingGear id: MedicalDoctorDuffel equipment: back: ClothingBackpackDuffelMedical # OuterClothing - type: loadout - id: MedicalDoctorWintercoat - equipment: MedicalDoctorWintercoat - -- type: startingGear id: MedicalDoctorWintercoat equipment: outerClothing: ClothingOuterWinterMed - type: loadout id: SeniorPhysicianLabCoat - equipment: SeniorPhysicianLabCoat effects: - !type:GroupLoadoutEffect proto: SeniorPhysician - -- type: startingGear - id: SeniorPhysicianLabCoat equipment: outerClothing: ClothingOuterCoatLabSeniorPhysician # Shoes - type: loadout - id: MedicalWinterBoots - equipment: MedicalWinterBoots - -- type: startingGear id: MedicalWinterBoots equipment: shoes: ClothingShoesBootsWinterMed # ID - type: loadout - id: MedicalDoctorPDA - equipment: MedicalDoctorPDA - -- type: startingGear id: MedicalDoctorPDA equipment: id: MedicalPDA - type: loadout id: SeniorPhysicianPDA - equipment: SeniorPhysicianPDA effects: - !type:GroupLoadoutEffect proto: SeniorPhysician - -- type: startingGear - id: SeniorPhysicianPDA equipment: id: SeniorPhysicianPDA # Gloves - type: loadout - id: NitrileGloves - equipment: NitrileGloves - -- type: startingGear id: NitrileGloves equipment: gloves: ClothingHandsGlovesNitrile #Masks - type: loadout - id: SterileMask - equipment: SterileMask - -- type: startingGear id: SterileMask equipment: mask: ClothingMaskSterile diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_intern.yml index f2795ad8ac..40a316afa3 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_intern.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_intern.yml @@ -1,18 +1,10 @@ # Jumpsuit - type: loadout - id: WhiteJumpsuit - equipment: WhiteJumpsuit - -- type: startingGear id: WhiteJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitColorWhite - type: loadout - id: WhiteJumpskirt - equipment: WhiteJumpskirt - -- type: startingGear id: WhiteJumpskirt equipment: - jumpsuit: ClothingUniformJumpskirtColorWhite \ No newline at end of file + jumpsuit: ClothingUniformJumpskirtColorWhite diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml index 7fd8d4a32f..95d18d4ea2 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/paramedic.yml @@ -1,57 +1,33 @@ # Head - type: loadout - id: ParamedicHead - equipment: ParamedicHead - -- type: startingGear id: ParamedicHead equipment: head: ClothingHeadHatParamedicsoft # Jumpsuit - type: loadout - id: ParamedicJumpsuit - equipment: ParamedicJumpsuit - -- type: startingGear id: ParamedicJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitParamedic - type: loadout - id: ParamedicJumpskirt - equipment: ParamedicJumpskirt - -- type: startingGear id: ParamedicJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtParamedic # Outer clothing - type: loadout - id: ParamedicWindbreaker - equipment: ParamedicWindbreaker - -- type: startingGear id: ParamedicWindbreaker equipment: outerClothing: ClothingOuterCoatParamedicWB - type: loadout - id: ParamedicWintercoat - equipment: ParamedicWintercoat - -- type: startingGear id: ParamedicWintercoat equipment: outerClothing: ClothingOuterWinterPara # Shoes - type: loadout - id: BlueShoes - equipment: BlueShoes - -- type: startingGear id: BlueShoes equipment: shoes: ClothingShoesColorBlue diff --git a/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml b/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml index 748e5d217c..c1c644de2a 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml @@ -2,62 +2,38 @@ - type: loadout id: ResearchDirectorBeret - equipment: ScientificBeret + startingGear: ScientificBeret # Neck - type: loadout - id: ResearchDirectorMantle - equipment: ResearchDirectorMantle - -- type: startingGear id: ResearchDirectorMantle equipment: neck: ClothingNeckMantleRD - type: loadout - id: ResearchDirectorCloak - equipment: ResearchDirectorCloak - -- type: startingGear id: ResearchDirectorCloak equipment: neck: ClothingNeckCloakRd # Jumpsuit - type: loadout - id: ResearchDirectorJumpsuit - equipment: ResearchDirectorJumpsuit - -- type: startingGear id: ResearchDirectorJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitResearchDirector - type: loadout - id: ResearchDirectorJumpskirt - equipment: ResearchDirectorJumpskirt - -- type: startingGear id: ResearchDirectorJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtResearchDirector # OuterClothing - type: loadout - id: ResearchDirectorLabCoat - equipment: ResearchDirectorLabCoat - -- type: startingGear id: ResearchDirectorLabCoat equipment: outerClothing: ClothingOuterCoatRD - type: loadout - id: ResearchDirectorWintercoat - equipment: ResearchDirectorWintercoat - -- type: startingGear id: ResearchDirectorWintercoat equipment: - outerClothing: ClothingOuterWinterRD \ No newline at end of file + outerClothing: ClothingOuterWinterRD diff --git a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml index ee30a9cf41..e89802e9c1 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Science/scientist.yml @@ -9,33 +9,24 @@ time: 216000 #60 hrs # Head - -- type: loadout - id: ScientificBeret - equipment: ScientificBeret - effects: - - !type:GroupLoadoutEffect - proto: SeniorResearcher - - type: startingGear id: ScientificBeret equipment: head: ClothingHeadHatBeretRND - type: loadout - id: RoboticistCap - equipment: RoboticistCap + id: ScientificBeret + startingGear: ScientificBeret + effects: + - !type:GroupLoadoutEffect + proto: SeniorResearcher -- type: startingGear +- type: loadout id: RoboticistCap equipment: head: ClothingHeadHatCorpsoft - type: loadout - id: SkullBandana - equipment: SkullBandana - -- type: startingGear id: SkullBandana equipment: head: ClothingHeadBandSkull @@ -43,208 +34,124 @@ # Neck - type: loadout - id: ScientistTie - equipment: ScientistTie - -- type: startingGear id: ScientistTie equipment: neck: ClothingNeckTieSci # Jumpsuit - type: loadout - id: ScientistJumpsuit - equipment: ScientistJumpsuit - -- type: startingGear id: ScientistJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitScientist - type: loadout - id: ScientistJumpskirt - equipment: ScientistJumpskirt - -- type: startingGear id: ScientistJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtScientist - type: loadout - id: RoboticistJumpsuit - equipment: RoboticistJumpsuit - -- type: startingGear id: RoboticistJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitRoboticist - type: loadout - id: RoboticistJumpskirt - equipment: RoboticistJumpskirt - -- type: startingGear id: RoboticistJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtRoboticist - type: loadout id: SeniorResearcherJumpsuit - equipment: SeniorResearcherJumpsuit effects: - !type:GroupLoadoutEffect proto: SeniorResearcher - -- type: startingGear - id: SeniorResearcherJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitSeniorResearcher - type: loadout id: SeniorResearcherJumpskirt - equipment: SeniorResearcherJumpskirt effects: - !type:GroupLoadoutEffect proto: SeniorResearcher - -- type: startingGear - id: SeniorResearcherJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtSeniorResearcher # Back - type: loadout - id: ScientistBackpack - equipment: ScientistBackpack - -- type: startingGear id: ScientistBackpack equipment: back: ClothingBackpackScience - type: loadout - id: ScientistSatchel - equipment: ScientistSatchel - -- type: startingGear id: ScientistSatchel equipment: back: ClothingBackpackSatchelScience - type: loadout - id: ScientistDuffel - equipment: ScientistDuffel - -- type: startingGear id: ScientistDuffel equipment: back: ClothingBackpackDuffelScience # OuterClothing - type: loadout - id: RegularLabCoat - equipment: RegularLabCoat - -- type: startingGear id: RegularLabCoat equipment: outerClothing: ClothingOuterCoatLab - type: loadout - id: ScienceLabCoat - equipment: ScienceLabCoat - -- type: startingGear id: ScienceLabCoat equipment: outerClothing: ClothingOuterCoatRnd - type: loadout - id: ScienceWintercoat - equipment: ScienceWintercoat - -- type: startingGear id: ScienceWintercoat equipment: outerClothing: ClothingOuterWinterSci - type: loadout - id: RoboticistLabCoat - equipment: RoboticistLabCoat - -- type: startingGear id: RoboticistLabCoat equipment: outerClothing: ClothingOuterCoatRobo - type: loadout - id: RoboticistWintercoat - equipment: RoboticistWintercoat - -- type: startingGear id: RoboticistWintercoat equipment: outerClothing: ClothingOuterWinterRobo - type: loadout id: SeniorResearcherLabCoat - equipment: SeniorResearcherLabCoat effects: - !type:GroupLoadoutEffect proto: SeniorResearcher - -- type: startingGear - id: SeniorResearcherLabCoat equipment: outerClothing: ClothingOuterCoatLabSeniorResearcher # Gloves - type: loadout - id: LatexGloves - equipment: LatexGloves - -- type: startingGear id: LatexGloves equipment: gloves: ClothingHandsGlovesLatex - type: loadout - id: RobohandsGloves - equipment: RobohandsGloves - -- type: startingGear id: RobohandsGloves equipment: gloves: ClothingHandsGlovesRobohands # Shoes - type: loadout - id: ScienceWinterBoots - equipment: ScienceWinterBoots - -- type: startingGear id: ScienceWinterBoots equipment: shoes: ClothingShoesBootsWinterSci # ID - type: loadout - id: ScientistPDA - equipment: ScientistPDA - -- type: startingGear id: ScientistPDA equipment: id: SciencePDA - type: loadout id: SeniorResearcherPDA - equipment: SeniorResearcherPDA effects: - !type:GroupLoadoutEffect proto: SeniorResearcher - -- type: startingGear - id: SeniorResearcherPDA equipment: id: SeniorResearcherPDA diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml b/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml index 888ed971e1..e8afa5a203 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/detective.yml @@ -1,84 +1,48 @@ # Head - type: loadout - id: DetectiveFedora - equipment: DetectiveFedora - -- type: startingGear id: DetectiveFedora equipment: head: ClothingHeadHatFedoraBrown - type: loadout - id: DetectiveFedoraGrey - equipment: DetectiveFedoraGrey - -- type: startingGear id: DetectiveFedoraGrey equipment: head: ClothingHeadHatFedoraGrey - + # Neck - type: loadout - id: DetectiveTie - equipment: DetectiveTie - -- type: startingGear id: DetectiveTie equipment: neck: ClothingNeckTieDet # Jumpsuit - type: loadout - id: DetectiveJumpsuit - equipment: DetectiveJumpsuit - -- type: startingGear id: DetectiveJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitDetective - type: loadout - id: DetectiveJumpskirt - equipment: DetectiveJumpskirt - -- type: startingGear id: DetectiveJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtDetective - type: loadout - id: NoirJumpsuit - equipment: NoirJumpsuit - -- type: startingGear id: NoirJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitDetectiveGrey - type: loadout - id: NoirJumpskirt - equipment: NoirJumpskirt - -- type: startingGear id: NoirJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtDetectiveGrey # OuterClothing - type: loadout - id: DetectiveArmorVest - equipment: DetectiveArmorVest - -- type: startingGear id: DetectiveArmorVest equipment: outerClothing: ClothingOuterVestDetective - type: loadout - id: DetectiveCoat - equipment: DetectiveCoat - -- type: startingGear id: DetectiveCoat equipment: - outerClothing: ClothingOuterCoatDetectiveLoadout \ No newline at end of file + outerClothing: ClothingOuterCoatDetectiveLoadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml index a8a52fe2cf..ceecef6cc6 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml @@ -1,111 +1,63 @@ # Jumpsuit - type: loadout - id: HeadofSecurityJumpsuit - equipment: HeadofSecurityJumpsuit - -- type: startingGear id: HeadofSecurityJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitHoS - type: loadout - id: HeadofSecurityJumpskirt - equipment: HeadofSecurityJumpskirt - -- type: startingGear id: HeadofSecurityJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtHoS - type: loadout - id: HeadofSecurityTurtleneck - equipment: HeadofSecurityTurtleneck - -- type: startingGear id: HeadofSecurityTurtleneck equipment: jumpsuit: ClothingUniformJumpsuitHoSAlt - type: loadout - id: HeadofSecurityTurtleneckSkirt - equipment: HeadofSecurityTurtleneckSkirt - -- type: startingGear id: HeadofSecurityTurtleneckSkirt equipment: jumpsuit: ClothingUniformJumpskirtHoSAlt - type: loadout - id: HeadofSecurityFormalSuit - equipment: HeadofSecurityFormalSuit - -- type: startingGear id: HeadofSecurityFormalSuit equipment: jumpsuit: ClothingUniformJumpsuitHosFormal - type: loadout - id: HeadofSecurityFormalSkirt - equipment: HeadofSecurityFormalSkirt - -- type: startingGear id: HeadofSecurityFormalSkirt equipment: jumpsuit: ClothingUniformJumpskirtHosFormal # Head - type: loadout - id: HeadofSecurityHead - equipment: HeadofSecurityHead - -- type: startingGear id: HeadofSecurityHead equipment: head: ClothingHeadHatHoshat - type: loadout - id: HeadofSecurityBeret - equipment: HeadofSecurityBeret - -- type: startingGear id: HeadofSecurityBeret equipment: head: ClothingHeadHatBeretHoS # Neck - type: loadout - id: HeadofSecurityCloak - equipment: HeadofSecurityCloak - -- type: startingGear id: HeadofSecurityCloak equipment: neck: ClothingNeckCloakHos - type: loadout - id: HeadofSecurityMantle - equipment: HeadofSecurityMantle - -- type: startingGear id: HeadofSecurityMantle equipment: neck: ClothingNeckMantleHOS # OuterClothing - type: loadout - id: HeadofSecurityCoat - equipment: HeadofSecurityCoat - -- type: startingGear id: HeadofSecurityCoat equipment: outerClothing: ClothingOuterCoatHoSTrench - type: loadout - id: HeadofSecurityWinterCoat - equipment: HeadofSecurityWinterCoat - -- type: startingGear id: HeadofSecurityWinterCoat equipment: - outerClothing: ClothingOuterWinterHoS \ No newline at end of file + outerClothing: ClothingOuterWinterHoS diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Loadouts/Jobs/Security/security_cadet.yml index 0157d0506d..94f889fc79 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/security_cadet.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/security_cadet.yml @@ -1,18 +1,10 @@ # Jumpsuit - type: loadout - id: RedJumpsuit - equipment: RedJumpsuit - -- type: startingGear id: RedJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitColorRed - type: loadout - id: RedJumpskirt - equipment: RedJumpskirt - -- type: startingGear id: RedJumpskirt equipment: - jumpsuit: ClothingUniformJumpskirtColorRed \ No newline at end of file + jumpsuit: ClothingUniformJumpskirtColorRed diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml index dfce25809f..d408c24b60 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml @@ -15,214 +15,126 @@ # Head - type: loadout - id: SecurityHelmet - equipment: SecurityHelmet - -- type: startingGear id: SecurityHelmet equipment: head: ClothingHeadHelmetBasic - type: loadout - id: SecurityHat - equipment: SecurityHat - -- type: startingGear id: SecurityHat equipment: head: ClothingHeadHatSecsoft - type: loadout - id: SecurityBeret - equipment: SecurityBeret - -- type: startingGear id: SecurityBeret equipment: head: ClothingHeadHatBeretSecurity # Jumpsuit - type: loadout - id: SecurityJumpsuit - equipment: SecurityJumpsuit - -- type: startingGear id: SecurityJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitSec - type: loadout - id: SecurityJumpskirt - equipment: SecurityJumpskirt - -- type: startingGear id: SecurityJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtSec - type: loadout - id: SecurityJumpsuitGrey - equipment: SecurityJumpsuitGrey - -- type: startingGear id: SecurityJumpsuitGrey equipment: jumpsuit: ClothingUniformJumpsuitSecGrey - type: loadout - id: SecurityJumpskirtGrey - equipment: SecurityJumpskirtGrey - -- type: startingGear id: SecurityJumpskirtGrey equipment: jumpsuit: ClothingUniformJumpskirtSecGrey - type: loadout id: SeniorOfficerJumpsuit - equipment: SeniorOfficerJumpsuit effects: - !type:GroupLoadoutEffect proto: SeniorOfficer - -- type: startingGear - id: SeniorOfficerJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitSeniorOfficer - type: loadout id: SeniorOfficerJumpskirt - equipment: SeniorOfficerJumpskirt effects: - !type:GroupLoadoutEffect proto: SeniorOfficer - -- type: startingGear - id: SeniorOfficerJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtSeniorOfficer # Back - type: loadout - id: SecurityBackpack - equipment: SecurityBackpack - -- type: startingGear id: SecurityBackpack equipment: back: ClothingBackpackSecurity - type: loadout - id: SecuritySatchel - equipment: SecuritySatchel - -- type: startingGear id: SecuritySatchel equipment: back: ClothingBackpackSatchelSecurity - type: loadout - id: SecurityDuffel - equipment: SecurityDuffel - -- type: startingGear id: SecurityDuffel equipment: back: ClothingBackpackDuffelSecurity # Belt - type: loadout - id: SecurityBelt - equipment: SecurityBelt - -- type: startingGear id: SecurityBelt equipment: belt: ClothingBeltSecurityFilled - type: loadout - id: SecurityWebbing - equipment: SecurityWebbing - -- type: startingGear id: SecurityWebbing equipment: belt: ClothingBeltSecurityWebbingFilled # Outerclothing - type: loadout - id: ArmorVest - equipment: ArmorVest - -- type: startingGear id: ArmorVest equipment: outerClothing: ClothingOuterArmorBasic - type: loadout - id: ArmorVestSlim - equipment: ArmorVestSlim - -- type: startingGear id: ArmorVestSlim equipment: outerClothing: ClothingOuterArmorBasicSlim - type: loadout - id: SecurityOfficerWintercoat - equipment: SecurityOfficerWintercoat - -- type: startingGear id: SecurityOfficerWintercoat equipment: outerClothing: ClothingOuterWinterSec # Shoes - type: loadout - id: CombatBoots - equipment: CombatBoots - -- type: startingGear id: CombatBoots equipment: shoes: ClothingShoesBootsCombatFilled - type: loadout - id: JackBoots - equipment: JackBoots - -- type: startingGear id: JackBoots equipment: shoes: ClothingShoesBootsJackFilled - type: loadout - id: SecurityWinterBoots - equipment: SecurityWinterBoots - -- type: startingGear id: SecurityWinterBoots equipment: shoes: ClothingShoesBootsWinterSecFilled # PDA - type: loadout - id: SecurityPDA - equipment: SecurityPDA - -- type: startingGear id: SecurityPDA equipment: id: SecurityPDA - type: loadout id: SeniorOfficerPDA - equipment: SeniorOfficerPDA effects: - !type:GroupLoadoutEffect proto: SeniorOfficer - -- type: startingGear - id: SeniorOfficerPDA equipment: id: SeniorOfficerPDA diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml b/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml index a2a0ac6faa..9c270e6d6f 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/warden.yml @@ -1,56 +1,32 @@ # Head - type: loadout - id: WardenHead - equipment: WardenHead - -- type: startingGear id: WardenHead equipment: head: ClothingHeadHatWarden - type: loadout - id: WardenBeret - equipment: WardenBeret - -- type: startingGear id: WardenBeret equipment: head: ClothingHeadHatBeretWarden # Jumpsuit - type: loadout - id: WardenJumpsuit - equipment: WardenJumpsuit - -- type: startingGear id: WardenJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitWarden - type: loadout - id: WardenJumpskirt - equipment: WardenJumpskirt - -- type: startingGear id: WardenJumpskirt equipment: jumpsuit: ClothingUniformJumpskirtWarden # OuterClothing - type: loadout - id: WardenCoat - equipment: WardenCoat - -- type: startingGear id: WardenCoat equipment: outerClothing: ClothingOuterCoatWarden - type: loadout - id: WardenArmoredWinterCoat - equipment: WardenArmoredWinterCoat - -- type: startingGear id: WardenArmoredWinterCoat equipment: - outerClothing: ClothingOuterWinterWarden \ No newline at end of file + outerClothing: ClothingOuterWinterWarden diff --git a/Resources/Prototypes/Loadouts/Jobs/Wildcards/boxer.yml b/Resources/Prototypes/Loadouts/Jobs/Wildcards/boxer.yml index d672feaba7..a9833798c7 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Wildcards/boxer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Wildcards/boxer.yml @@ -1,55 +1,31 @@ # Jumpsuit - type: loadout - id: BoxerShorts - equipment: BoxerShorts - -- type: startingGear id: BoxerShorts equipment: jumpsuit: UniformShortsRed - type: loadout - id: BoxerShortsWithTop - equipment: BoxerShortsWithTop - -- type: startingGear id: BoxerShortsWithTop equipment: jumpsuit: UniformShortsRedWithTop # Gloves - type: loadout - id: RedBoxingGloves - equipment: RedBoxingGloves - -- type: startingGear id: RedBoxingGloves equipment: gloves: ClothingHandsGlovesBoxingRed - type: loadout - id: BlueBoxingGloves - equipment: BlueBoxingGloves - -- type: startingGear id: BlueBoxingGloves equipment: gloves: ClothingHandsGlovesBoxingBlue - type: loadout - id: GreenBoxingGloves - equipment: GreenBoxingGloves - -- type: startingGear id: GreenBoxingGloves equipment: gloves: ClothingHandsGlovesBoxingGreen - type: loadout - id: YellowBoxingGloves - equipment: YellowBoxingGloves - -- type: startingGear id: YellowBoxingGloves equipment: - gloves: ClothingHandsGlovesBoxingYellow \ No newline at end of file + gloves: ClothingHandsGlovesBoxingYellow diff --git a/Resources/Prototypes/Loadouts/Jobs/Wildcards/reporter.yml b/Resources/Prototypes/Loadouts/Jobs/Wildcards/reporter.yml index 6cd2441b6b..5dfb131988 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Wildcards/reporter.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Wildcards/reporter.yml @@ -1,18 +1,10 @@ # Jumpsuit - type: loadout - id: ReporterJumpsuit - equipment: ReporterJumpsuit - -- type: startingGear id: ReporterJumpsuit equipment: jumpsuit: ClothingUniformJumpsuitReporter - type: loadout - id: JournalistJumpsuit - equipment: JournalistJumpsuit - -- type: startingGear id: JournalistJumpsuit equipment: - jumpsuit: ClothingUniformJumpsuitJournalist \ No newline at end of file + jumpsuit: ClothingUniformJumpsuitJournalist diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml b/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml index 605e0e66d2..b7dae89fda 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/glasses.yml @@ -20,37 +20,25 @@ # Basic options # Glasses - type: loadout - id: Glasses - equipment: Glasses - -- type: startingGear id: Glasses equipment: eyes: ClothingEyesGlasses # Special options -# Jamjar +# Jamjar - type: loadout id: GlassesJamjar - equipment: GlassesJamjar effects: - !type:GroupLoadoutEffect proto: JamjarTimer - -- type: startingGear - id: GlassesJamjar equipment: eyes: ClothingEyesGlassesJamjar # Jensen - type: loadout id: GlassesJensen - equipment: GlassesJensen effects: - !type:GroupLoadoutEffect proto: JensenTimer - -- type: startingGear - id: GlassesJensen equipment: eyes: ClothingEyesGlassesJensen diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/instruments.yml b/Resources/Prototypes/Loadouts/Miscellaneous/instruments.yml index 5b7e46151f..21b9070b0d 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/instruments.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/instruments.yml @@ -1,279 +1,167 @@ # Instruments - type: loadout - id: Glockenspiel - equipment: Glockenspiel - -- type: startingGear id: Glockenspiel storage: back: - GlockenspielInstrument - type: loadout - id: MusicBox - equipment: MusicBox - -- type: startingGear id: MusicBox storage: back: - MusicBoxInstrument - type: loadout - id: Xylophone - equipment: Xylophone - -- type: startingGear id: Xylophone storage: back: - XylophoneInstrument - type: loadout - id: Microphone - equipment: Microphone - -- type: startingGear id: Microphone storage: back: - MicrophoneInstrument - type: loadout - id: Synthesizer - equipment: Synthesizer - -- type: startingGear id: Synthesizer storage: back: - SynthesizerInstrument - type: loadout - id: Kalimba - equipment: Kalimba - -- type: startingGear id: Kalimba storage: back: - KalimbaInstrument - type: loadout - id: Woodblock - equipment: Woodblock - -- type: startingGear id: Woodblock storage: back: - WoodblockInstrument - type: loadout - id: ElectricGuitar - equipment: ElectricGuitar - -- type: startingGear id: ElectricGuitar storage: back: - ElectricGuitarInstrument - type: loadout - id: BassGuitar - equipment: BassGuitar - -- type: startingGear id: BassGuitar storage: back: - BassGuitarInstrument - type: loadout - id: RockGuitar - equipment: RockGuitar - -- type: startingGear id: RockGuitar storage: back: - RockGuitarInstrument - type: loadout - id: AcousticGuitar - equipment: AcousticGuitar - -- type: startingGear id: AcousticGuitar storage: back: - AcousticGuitarInstrument - type: loadout - id: Banjo - equipment: Banjo - -- type: startingGear id: Banjo storage: back: - BanjoInstrument - type: loadout - id: Violin - equipment: Violin - -- type: startingGear id: Violin storage: back: - ViolinInstrument - type: loadout - id: Viola - equipment: Viola - -- type: startingGear id: Viola storage: back: - ViolaInstrument - type: loadout - id: Cello - equipment: Cello - -- type: startingGear id: Cello storage: back: - CelloInstrument - type: loadout - id: Trumpet - equipment: Trumpet - -- type: startingGear id: Trumpet storage: back: - TrumpetInstrument - type: loadout - id: Trombone - equipment: Trombone - -- type: startingGear id: Trombone storage: back: - TromboneInstrument - type: loadout - id: FrenchHorn - equipment: FrenchHorn - -- type: startingGear id: FrenchHorn storage: back: - FrenchHornInstrument - type: loadout - id: Euphonium - equipment: Euphonium - -- type: startingGear id: Euphonium storage: back: - EuphoniumInstrument - type: loadout - id: Saxophone - equipment: Saxophone - -- type: startingGear id: Saxophone storage: back: - SaxophoneInstrument - type: loadout - id: Accordion - equipment: Accordion - -- type: startingGear id: Accordion storage: back: - AccordionInstrument - type: loadout - id: Harmonica - equipment: Harmonica - -- type: startingGear id: Harmonica storage: back: - HarmonicaInstrument - type: loadout - id: Clarinet - equipment: Clarinet - -- type: startingGear id: Clarinet storage: back: - ClarinetInstrument - type: loadout - id: Flute - equipment: Flute - -- type: startingGear id: Flute storage: back: - FluteInstrument - type: loadout - id: Recorder - equipment: Recorder - -- type: startingGear id: Recorder storage: back: - RecorderInstrument - type: loadout - id: PanFlute - equipment: PanFlute - -- type: startingGear id: PanFlute storage: back: - PanFluteInstrument - type: loadout - id: Ocarina - equipment: Ocarina - -- type: startingGear id: Ocarina storage: back: - OcarinaInstrument - type: loadout - id: Bagpipe - equipment: Bagpipe - -- type: startingGear id: Bagpipe storage: back: diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml b/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml index 7b2cb5d6ff..d308c62506 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml @@ -29,26 +29,18 @@ # Basic - type: loadout id: EmergencyOxygen - equipment: EmergencyOxygen effects: - !type:GroupLoadoutEffect proto: OxygenBreather - -- type: startingGear - id: EmergencyOxygen storage: back: - BoxSurvival - type: loadout id: EmergencyNitrogen - equipment: EmergencyNitrogen effects: - !type:GroupLoadoutEffect proto: NitrogenBreather - -- type: startingGear - id: EmergencyNitrogen storage: back: - BoxSurvivalNitrogen @@ -56,26 +48,18 @@ # Clown - type: loadout id: EmergencyOxygenClown - equipment: EmergencyOxygenClown effects: - !type:GroupLoadoutEffect proto: OxygenBreather - -- type: startingGear - id: EmergencyOxygenClown storage: back: - BoxHug - type: loadout id: EmergencyNitrogenClown - equipment: EmergencyNitrogenClown effects: - !type:GroupLoadoutEffect proto: NitrogenBreather - -- type: startingGear - id: EmergencyNitrogenClown storage: back: - BoxHugNitrogen @@ -83,26 +67,18 @@ # Engineering / Extended - type: loadout id: EmergencyOxygenExtended - equipment: EmergencyOxygenExtended effects: - !type:GroupLoadoutEffect proto: OxygenBreather - -- type: startingGear - id: EmergencyOxygenExtended storage: back: - BoxSurvivalEngineering - type: loadout id: EmergencyNitrogenExtended - equipment: EmergencyNitrogenExtended effects: - !type:GroupLoadoutEffect proto: NitrogenBreather - -- type: startingGear - id: EmergencyNitrogenExtended storage: back: - BoxSurvivalEngineeringNitrogen @@ -110,26 +86,18 @@ # Medical - type: loadout id: EmergencyOxygenMedical - equipment: EmergencyOxygenMedical effects: - !type:GroupLoadoutEffect proto: OxygenBreather - -- type: startingGear - id: EmergencyOxygenMedical storage: back: - BoxSurvivalMedical - type: loadout id: EmergencyNitrogenMedical - equipment: EmergencyNitrogenMedical effects: - !type:GroupLoadoutEffect proto: NitrogenBreather - -- type: startingGear - id: EmergencyNitrogenMedical storage: back: - BoxSurvivalMedicalNitrogen @@ -137,26 +105,18 @@ # Security - type: loadout id: EmergencyOxygenSecurity - equipment: EmergencyOxygenSecurity effects: - !type:GroupLoadoutEffect proto: OxygenBreather - -- type: startingGear - id: EmergencyOxygenSecurity storage: back: - BoxSurvivalSecurity - type: loadout id: EmergencyNitrogenSecurity - equipment: EmergencyNitrogenSecurity effects: - !type:GroupLoadoutEffect proto: NitrogenBreather - -- type: startingGear - id: EmergencyNitrogenSecurity storage: back: - BoxSurvivalSecurityNitrogen @@ -164,26 +124,18 @@ # Syndicate - type: loadout id: EmergencyOxygenSyndicate - equipment: EmergencyOxygenSyndicate effects: - !type:GroupLoadoutEffect proto: OxygenBreather - -- type: startingGear - id: EmergencyOxygenSyndicate storage: back: - BoxSurvivalSyndicate - type: loadout id: EmergencyNitrogenSyndicate - equipment: EmergencyNitrogenSyndicate effects: - !type:GroupLoadoutEffect proto: NitrogenBreather - -- type: startingGear - id: EmergencyNitrogenSyndicate storage: back: - BoxSurvivalSyndicateNitrogen @@ -193,62 +145,42 @@ # Full Tank Equipped - type: loadout id: LoadoutSpeciesEVANitrogen - equipment: GearEVANitrogen effects: - !type:GroupLoadoutEffect proto: EffectSpeciesVox - -- type: startingGear - id: GearEVANitrogen equipment: suitstorage: NitrogenTankFilled # Tank Harness - type: loadout id: LoadoutTankHarness - equipment: GearTankHarness effects: - !type:GroupLoadoutEffect proto: EffectSpeciesVox - -- type: startingGear - id: GearTankHarness equipment: outerClothing: ClothingOuterVestTank # Breaths Tool On Face - type: loadout id: LoadoutSpeciesBreathTool - equipment: GearSpeciesBreathTool effects: - !type:GroupLoadoutEffect proto: EffectSpeciesVox - -- type: startingGear - id: GearSpeciesBreathTool equipment: mask: ClothingMaskBreath - type: loadout id: LoadoutSpeciesBreathToolMedical - equipment: GearSpeciesBreathToolMedical effects: - !type:GroupLoadoutEffect proto: EffectSpeciesVox - -- type: startingGear - id: GearSpeciesBreathToolMedical equipment: mask: ClothingMaskBreathMedical - type: loadout id: LoadoutSpeciesBreathToolSecurity - equipment: GearSpeciesBreathToolSecurity effects: - !type:GroupLoadoutEffect proto: EffectSpeciesVox - -- type: startingGear - id: GearSpeciesBreathToolSecurity equipment: mask: ClothingMaskGasSecurity diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml index fe826a8334..c91108124f 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml @@ -10,20 +10,12 @@ # Plushies - type: loadout - id: PlushieLizard - equipment: PlushieLizard - -- type: startingGear id: PlushieLizard storage: back: - PlushieLizard - -- type: loadout - id: PlushieSpaceLizard - equipment: PlushieSpaceLizard -- type: startingGear +- type: loadout id: PlushieSpaceLizard storage: back: @@ -31,50 +23,30 @@ # Smokeables - type: loadout - id: Lighter - equipment: Lighter - -- type: startingGear id: Lighter storage: back: - Lighter - type: loadout - id: CigPackGreen - equipment: CigPackGreen - -- type: startingGear id: CigPackGreen storage: back: - CigPackGreen - type: loadout - id: CigPackRed - equipment: CigPackRed - -- type: startingGear id: CigPackRed storage: back: - CigPackRed - type: loadout - id: CigPackBlue - equipment: CigPackBlue - -- type: startingGear id: CigPackBlue storage: back: - CigPackBlue - type: loadout - id: CigPackBlack - equipment: CigPackBlack - -- type: startingGear id: CigPackBlack storage: back: @@ -82,136 +54,84 @@ - type: loadout id: CigarCase - equipment: CigarCase effects: - !type:GroupLoadoutEffect proto: Command - -- type: startingGear - id: CigarCase storage: back: - CigarCase - type: loadout id: CigarGold - equipment: CigarGold effects: - !type:GroupLoadoutEffect proto: Command - -- type: startingGear - id: CigarGold storage: back: - CigarGold # Pins - type: loadout - id: ClothingNeckLGBTPin - equipment: ClothingNeckLGBTPin - -- type: startingGear id: ClothingNeckLGBTPin storage: back: - ClothingNeckLGBTPin - type: loadout - id: ClothingNeckAromanticPin - equipment: ClothingNeckAromanticPin - -- type: startingGear id: ClothingNeckAromanticPin storage: back: - ClothingNeckAromanticPin - type: loadout - id: ClothingNeckAsexualPin - equipment: ClothingNeckAsexualPin - -- type: startingGear id: ClothingNeckAsexualPin storage: back: - ClothingNeckAsexualPin - type: loadout - id: ClothingNeckBisexualPin - equipment: ClothingNeckBisexualPin - -- type: startingGear id: ClothingNeckBisexualPin storage: back: - ClothingNeckBisexualPin - type: loadout - id: ClothingNeckIntersexPin - equipment: ClothingNeckIntersexPin - -- type: startingGear id: ClothingNeckIntersexPin storage: back: - ClothingNeckIntersexPin - type: loadout - id: ClothingNeckLesbianPin - equipment: ClothingNeckLesbianPin - -- type: startingGear id: ClothingNeckLesbianPin storage: back: - ClothingNeckLesbianPin - type: loadout - id: ClothingNeckNonBinaryPin - equipment: ClothingNeckNonBinaryPin - -- type: startingGear id: ClothingNeckNonBinaryPin storage: back: - ClothingNeckNonBinaryPin - type: loadout - id: ClothingNeckPansexualPin - equipment: ClothingNeckPansexualPin - -- type: startingGear id: ClothingNeckPansexualPin storage: back: - ClothingNeckPansexualPin - type: loadout - id: ClothingNeckTransPin - equipment: ClothingNeckTransPin - -- type: startingGear id: ClothingNeckTransPin storage: back: - ClothingNeckTransPin - type: loadout - id: ClothingNeckAutismPin - equipment: ClothingNeckAutismPin - -- type: startingGear id: ClothingNeckAutismPin storage: back: - ClothingNeckAutismPin - type: loadout - id: ClothingNeckGoldAutismPin - equipment: ClothingNeckGoldAutismPin - -- type: startingGear id: ClothingNeckGoldAutismPin storage: back: From a3cbbe745e83d43103ed8c5a7ab10dcf3ffa7112 Mon Sep 17 00:00:00 2001 From: voidnull000 <18663194+voidnull000@users.noreply.github.com> Date: Mon, 5 Aug 2024 06:49:51 +0100 Subject: [PATCH 188/422] Change the mimebot and killer tomato's descriptions (#30639) fix those two descriptions --- Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml | 2 +- Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml b/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml index e09d3917c7..7c4850fafc 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml @@ -76,7 +76,7 @@ - MobFlammable - MobCombat name: tomato killer - description: it seems today it's not you eating tomatoes, it's the tomatoes eating you. + description: Looks like it's not you eating tomatoes today, it's the tomatoes eating you. components: - type: Item - type: NpcFactionMember diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml index d34b1b536b..9c9499808d 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml @@ -303,7 +303,7 @@ - StripableInventoryBase id: MobMimeBot name: mimebot - description: Why not give mimebot a friendly wave. + description: Why not give the mimebot a friendly wave? components: - type: Sprite layers: From c9b69ef4914b73074ee622f17e648d277cbb3022 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Mon, 5 Aug 2024 15:51:10 +1000 Subject: [PATCH 189/422] Update submodule to 229.1.0 (#30664) --- RobustToolbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RobustToolbox b/RobustToolbox index 2e4275a7f3..5c0ce43e6c 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 2e4275a7f3b2800e7fbe1da1e1909e8e349033bf +Subproject commit 5c0ce43e6c3c22a939fad8a9f9848e489b135651 From e2ca1a195722abae0480fec64e150a4a826b34f1 Mon Sep 17 00:00:00 2001 From: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com> Date: Mon, 5 Aug 2024 06:08:05 +0000 Subject: [PATCH 190/422] add(Spawners): Add a honk bot spawner (#30616) --- .../Entities/Markers/Spawners/mobs.yml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml index 0107ce4702..cb06b39998 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml @@ -851,4 +851,18 @@ sprite: Mobs/Animals/clownspider.rsi - type: ConditionalSpawner prototypes: - - MobClownSpider \ No newline at end of file + - MobClownSpider + +- type: entity + name: honk bot spawner + id: SpawnHonkBot + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - state: honkbot + sprite: Mobs/Silicon/Bots/honkbot.rsi + - type: ConditionalSpawner + prototypes: + - MobHonkBot From 1629e200cb73509d19fc84a6d6c8478b01989f2d Mon Sep 17 00:00:00 2001 From: foboscheshir <156405958+foboscheshir@users.noreply.github.com> Date: Mon, 5 Aug 2024 13:09:35 +0700 Subject: [PATCH 191/422] Missing mime mask sprites for Vox (#30607) mime-mask-vox --- .../Mask/sadmime.rsi/equipped-MASK-vox.png | Bin 0 -> 475 bytes .../Textures/Clothing/Mask/sadmime.rsi/meta.json | 6 +++++- .../Mask/scaredmime.rsi/equipped-MASK-vox.png | Bin 0 -> 496 bytes .../Clothing/Mask/scaredmime.rsi/meta.json | 6 +++++- 4 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Clothing/Mask/sadmime.rsi/equipped-MASK-vox.png create mode 100644 Resources/Textures/Clothing/Mask/scaredmime.rsi/equipped-MASK-vox.png diff --git a/Resources/Textures/Clothing/Mask/sadmime.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/sadmime.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..c8b2504d85bd0040b86a5fcefad6ebabb14a3df8 GIT binary patch literal 475 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zr+T_LhE&XX zd&|)8uz?8MgZmt9-&kTJikiI6MXU@zaqNuZF2$qF(=)`c_1QJ4UgNWEmfYbeIiZ5* zprWH-P!BWj&;3hRsqX)=*W%;{9s%E3T{Ba9CiZPy5wSSANAUR^6U*mIR%`tC3;&d? zf5`Pd=j*Rh3=5`Y{cZcW@ntN-QjxOCds4TbR>pRKxX)!y-DFd`nkOzeWi#)b;+5CG zX;+CeFwB$BXQ;{h|Dj&!Q1^!gTNx%aUt3(u=*I2JV6gW|bN`a%Gi?On;G%`<`wX++ zEGzkZc?63Ej?K6>vr)u%vSJe7qMZQ@Ul(@HKgP>$yDne73q1YX6t92UcWqh zN-F1qR}%SK*%(qH*|OJ)xC(B~UAuKssw6|gYSSq}q1O9$O^Z1@pMgPtx%r*h?fa`u z_T>eeyqoqtZq3%c?`Lcc+w*;{;rUO22FE-!jwEdre_y-0S59zK-rnl>sT*%y?_BOv zcVYd3qMa-ZK%psD)%#+qPb-;kyds(4y|81(5-me747K5j& KpUXO@geCy%oXpDr literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json b/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json index 165fd2d46b..c43909e6a9 100644 --- a/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/harmonyn/-tg-station/blob/11043a07f6136d3d196b0378c31deb3dc1a9532f/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github)", + "copyright": "Taken from tgstation at commit https://github.com/harmonyn/-tg-station/blob/11043a07f6136d3d196b0378c31deb3dc1a9532f/icons/obj/clothing/masks.dmi. Reptilian edit by Nairod(Github).Vox edit by foboscheshir (github)", "size": { "x": 32, "y": 32 @@ -17,6 +17,10 @@ { "name": "equipped-MASK-reptilian", "directions": 4 + }, + { + "name":"equipped-MASK-vox", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/scaredmime.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/scaredmime.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..3591f30f92bf8c4c9e45515489d4ec2082ae3f50 GIT binary patch literal 496 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zS9!WPhE&XX zduwCXp#TxK2lp=}ywI*6wXoi%xCg)Oq`taktqsgS@Vz$OQ#SY+Th6g$6Zg|sqKda1NwX=NcEvC?@4%YN z2TM|evM*0PxaM*pScrikmjCHdM zW_~}UUU_Bqt#1WClWV&l7H}k3+ZUMM{CE7b4U6M~y>a^2xA8VP*q&!*xZ}HRynFZM=B;L-J5E31{>!!HcJ3X0u^n41S1U-mKBGz5CB=h=M#7=;X;u6{1-oD!M Date: Mon, 5 Aug 2024 06:10:42 +0000 Subject: [PATCH 192/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index e95152fba2..1c8e3384e1 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,13 +1,4 @@ Entries: -- author: lzk228 - changes: - - message: Morgue now can be anchored and unanchored. - type: Tweak - - message: Changed morgue's collision layer, so items now can go through it. - type: Tweak - id: 6545 - time: '2024-05-07T07:26:33.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27750 - author: mirrorcult changes: - message: Events that run now get logged to admin alert chat @@ -3780,3 +3771,10 @@ id: 7044 time: '2024-08-05T04:25:49.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30347 +- author: foboscheshir + changes: + - message: added missing mime mask sprites for Vox - scared and sad. + type: Add + id: 7045 + time: '2024-08-05T06:09:35.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30607 From 8771cc03db72ab4c001fed6fb8609dccb0374f3c Mon Sep 17 00:00:00 2001 From: Mervill Date: Mon, 5 Aug 2024 00:36:26 -0700 Subject: [PATCH 193/422] Debug command to set either your hunger or thirst to one of their respective threshold levels (#30563) * Debug command to set either your hunger or thirst to one of their respective threshold levels * code updates * code + loc changes --- Content.Server/Nutrition/SetNutrit.cs | 115 ++++++++++++++++++ .../en-US/nutrition/nutrition-commands.ftl | 4 + 2 files changed, 119 insertions(+) create mode 100644 Content.Server/Nutrition/SetNutrit.cs diff --git a/Content.Server/Nutrition/SetNutrit.cs b/Content.Server/Nutrition/SetNutrit.cs new file mode 100644 index 0000000000..c7c716b78c --- /dev/null +++ b/Content.Server/Nutrition/SetNutrit.cs @@ -0,0 +1,115 @@ +using Content.Server.Administration; +using Content.Server.Database.Migrations.Postgres; +using Content.Shared.Administration; +using Content.Shared.Nutrition.Components; +using Content.Shared.Nutrition.EntitySystems; +using Robust.Shared.Console; +using System.Linq; + +namespace Content.Server.Nutrition; + +[AdminCommand(AdminFlags.Debug)] +public sealed class SetNutrit : LocalizedEntityCommands +{ + public override string Command => "setnutrit"; + + public override void Execute(IConsoleShell shell, string argStr, string[] args) + { + var player = shell.Player; + if (player == null) + { + shell.WriteError(Loc.GetString("cmd-nutrition-error-player")); + return; + } + + if (player.AttachedEntity is not { Valid: true } playerEntity) + { + shell.WriteError(Loc.GetString("cmd-nutrition-error-entity")); + return; + } + + if (args.Length != 2) + { + shell.WriteError(Loc.GetString("shell-wrong-arguments-number-need-specific", + ("properAmount", 2), + ("currentAmount", args.Length) + )); + return; + } + + var systemString = args[0]; + switch (systemString) + { + case "hunger": + { + if (!EntityManager.TryGetComponent(playerEntity, out HungerComponent? hunger)) + { + shell.WriteError(Loc.GetString("cmd-nutrition-error-component", ("comp", nameof(HungerComponent)))); + return; + } + + if (!Enum.TryParse(args[1], out HungerThreshold hungerThreshold)) + { + shell.WriteError(Loc.GetString("cmd-setnutrit-error-invalid-threshold", + ("thresholdType", nameof(HungerThreshold)), + ("thresholdString", args[1]) + )); + return; + } + + var hungerValue = hunger.Thresholds[hungerThreshold]; + EntityManager.System().SetHunger(playerEntity, hungerValue, hunger); + return; + } + case "thirst": + { + if (!EntityManager.TryGetComponent(playerEntity, out ThirstComponent? thirst)) + { + shell.WriteError(Loc.GetString("cmd-nutrition-error-component", ("comp", nameof(ThirstComponent)))); + return; + } + + if (!Enum.TryParse(args[1], out ThirstThreshold thirstThreshold)) + { + shell.WriteError(Loc.GetString("cmd-setnutrit-error-invalid-threshold", + ("thresholdType", nameof(ThirstThreshold)), + ("thresholdString", args[1]) + )); + return; + } + + var thirstValue = thirst.ThirstThresholds[thirstThreshold]; + EntityManager.System().SetThirst(playerEntity, thirst, thirstValue); + return; + } + default: + { + shell.WriteError($"invalid nutrition system ${systemString}"); + return; + } + } + } + + public override CompletionResult GetCompletion(IConsoleShell shell, string[] args) + { + switch (args.Length) + { + case 1: + { + string[] kinds = { "hunger", "thirst" }; + return CompletionResult.FromHintOptions(kinds, "nutrition system"); + } + case 2: + { + return args[0] switch + { + "hunger" => CompletionResult.FromHintOptions(Enum.GetNames(), nameof(HungerThreshold)), + "thirst" => CompletionResult.FromHintOptions(Enum.GetNames(), nameof(ThirstThreshold)), + _ => CompletionResult.Empty, + }; + } + default: + return CompletionResult.Empty; + } + } +} diff --git a/Resources/Locale/en-US/nutrition/nutrition-commands.ftl b/Resources/Locale/en-US/nutrition/nutrition-commands.ftl index 8e6712c52f..d441026456 100644 --- a/Resources/Locale/en-US/nutrition/nutrition-commands.ftl +++ b/Resources/Locale/en-US/nutrition/nutrition-commands.ftl @@ -2,5 +2,9 @@ cmd-nutrition-error-player = You cannot use this command unless you are a player cmd-nutrition-error-entity = You cannot use this command without an entity. cmd-nutrition-error-component = Your entity does not have a {$comp} component. +cmd-setnutrit-desc = modify hunger and thirst +cmd-setnutrit-help = set your hunger or thirst to one of the built-in thresholds +cmd-setnutrit-error-invalid-threshold = invalid {$thresholdType} `{$thresholdString}` + cmd-thirsty-desc = makes you thirsty cmd-thirsty-help = sets your thirst level to partched From 52e03d2de5a5ee7678c6fa84c4a719aec20b6911 Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 5 Aug 2024 07:37:32 +0000 Subject: [PATCH 194/422] Automatic changelog update --- Resources/Changelog/Admin.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml index eaaeaee475..9885d53079 100644 --- a/Resources/Changelog/Admin.yml +++ b/Resources/Changelog/Admin.yml @@ -399,5 +399,13 @@ Entries: id: 49 time: '2024-08-02T18:58:00.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30580 +- author: Mervill + changes: + - message: added a debug command to set either your hunger or thirst value to a + given threshold + type: Add + id: 50 + time: '2024-08-05T07:36:26.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30563 Name: Admin Order: 1 From 8197382444270fee99c01eac82795c36a9bf68ad Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Mon, 5 Aug 2024 17:59:37 +1000 Subject: [PATCH 195/422] Fix random unused field warnings (#29948) * Fix random unused field warnings Not many but it counts. * caught * Field --- Content.Server/Antag/Components/AntagImmuneComponent.cs | 2 +- Content.Server/Station/Systems/StationJobsSystem.cs | 4 ++-- Content.Server/Station/Systems/StationSystem.cs | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Content.Server/Antag/Components/AntagImmuneComponent.cs b/Content.Server/Antag/Components/AntagImmuneComponent.cs index 3ae8e049f6..beec7960f0 100644 --- a/Content.Server/Antag/Components/AntagImmuneComponent.cs +++ b/Content.Server/Antag/Components/AntagImmuneComponent.cs @@ -1,7 +1,7 @@ namespace Content.Server.Antag.Components; [RegisterComponent] -public partial class AntagImmuneComponent : Component +public sealed partial class AntagImmuneComponent : Component { } diff --git a/Content.Server/Station/Systems/StationJobsSystem.cs b/Content.Server/Station/Systems/StationJobsSystem.cs index 307610d136..91a8b7ade4 100644 --- a/Content.Server/Station/Systems/StationJobsSystem.cs +++ b/Content.Server/Station/Systems/StationJobsSystem.cs @@ -24,9 +24,9 @@ namespace Content.Server.Station.Systems; public sealed partial class StationJobsSystem : EntitySystem { [Dependency] private readonly IConfigurationManager _configurationManager = default!; + [Dependency] private readonly IPlayerManager _player = default!; [Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly GameTicker _gameTicker = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; /// public override void Initialize() @@ -56,7 +56,7 @@ public sealed partial class StationJobsSystem : EntitySystem if (_availableJobsDirty) { _cachedAvailableJobs = GenerateJobsAvailableEvent(); - RaiseNetworkEvent(_cachedAvailableJobs, Filter.Empty().AddPlayers(_playerManager.Sessions)); + RaiseNetworkEvent(_cachedAvailableJobs, Filter.Empty().AddPlayers(_player.Sessions)); _availableJobsDirty = false; } } diff --git a/Content.Server/Station/Systems/StationSystem.cs b/Content.Server/Station/Systems/StationSystem.cs index 5ddb0e7746..22c0cba3f7 100644 --- a/Content.Server/Station/Systems/StationSystem.cs +++ b/Content.Server/Station/Systems/StationSystem.cs @@ -31,7 +31,6 @@ public sealed class StationSystem : EntitySystem [Dependency] private readonly ILogManager _logManager = default!; [Dependency] private readonly IPlayerManager _player = default!; [Dependency] private readonly ChatSystem _chatSystem = default!; - [Dependency] private readonly GameTicker _ticker = default!; [Dependency] private readonly SharedTransformSystem _transform = default!; [Dependency] private readonly MetaDataSystem _metaData = default!; [Dependency] private readonly MapSystem _map = default!; From bf06d0e869e78ae7f8ac51922a1e3f23bf59a39f Mon Sep 17 00:00:00 2001 From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Date: Mon, 5 Aug 2024 10:03:24 +0200 Subject: [PATCH 196/422] Change Thief Syndie & Chameleon kit contents, add Syndie codeword paper (#30446) * Initial commit * more like bYE * Fix exception during test --- .../GameTicking/Rules/TraitorRuleSystem.cs | 14 ++- .../Components/TraitorCodePaperComponent.cs | 27 ++++++ .../Traitor/Systems/TraitorCodePaperSystem.cs | 93 +++++++++++++++++++ Resources/Locale/en-US/thief/backpack.ftl | 7 +- .../en-US/traitor/traitor-codes-component.ftl | 3 + .../Prototypes/Catalog/thief_toolbox_sets.yml | 6 +- .../Entities/Objects/Misc/paper.yml | 20 ++++ 7 files changed, 161 insertions(+), 9 deletions(-) create mode 100644 Content.Server/Traitor/Components/TraitorCodePaperComponent.cs create mode 100644 Content.Server/Traitor/Systems/TraitorCodePaperSystem.cs create mode 100644 Resources/Locale/en-US/traitor/traitor-codes-component.ftl diff --git a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs index acd2a3ffde..9e8a878a2d 100644 --- a/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/TraitorRuleSystem.cs @@ -42,7 +42,7 @@ public sealed class TraitorRuleSystem : GameRuleSystem protected override void Added(EntityUid uid, TraitorRuleComponent component, GameRuleComponent gameRule, GameRuleAddedEvent args) { base.Added(uid, component, gameRule, args); - MakeCodewords(component); + SetCodewords(component); } private void AfterEntitySelected(Entity ent, ref AfterAntagEntitySelectedEvent args) @@ -50,17 +50,23 @@ public sealed class TraitorRuleSystem : GameRuleSystem MakeTraitor(args.EntityUid, ent); } - private void MakeCodewords(TraitorRuleComponent component) + private void SetCodewords(TraitorRuleComponent component) + { + component.Codewords = GenerateTraitorCodewords(component); + } + + public string[] GenerateTraitorCodewords(TraitorRuleComponent component) { var adjectives = _prototypeManager.Index(component.CodewordAdjectives).Values; var verbs = _prototypeManager.Index(component.CodewordVerbs).Values; var codewordPool = adjectives.Concat(verbs).ToList(); var finalCodewordCount = Math.Min(component.CodewordCount, codewordPool.Count); - component.Codewords = new string[finalCodewordCount]; + string[] codewords = new string[finalCodewordCount]; for (var i = 0; i < finalCodewordCount; i++) { - component.Codewords[i] = _random.PickAndTake(codewordPool); + codewords[i] = _random.PickAndTake(codewordPool); } + return codewords; } public bool MakeTraitor(EntityUid traitor, TraitorRuleComponent component, bool giveUplink = true) diff --git a/Content.Server/Traitor/Components/TraitorCodePaperComponent.cs b/Content.Server/Traitor/Components/TraitorCodePaperComponent.cs new file mode 100644 index 0000000000..7887248f21 --- /dev/null +++ b/Content.Server/Traitor/Components/TraitorCodePaperComponent.cs @@ -0,0 +1,27 @@ +namespace Content.Server.Traitor.Components; + +/// +/// Paper with written traitor codewords on it. +/// +[RegisterComponent] +public sealed partial class TraitorCodePaperComponent : Component +{ + /// + /// The number of codewords that should be generated on this paper. + /// Will not extend past the max number of available codewords. + /// + [DataField] + public int CodewordAmount = 1; + + /// + /// Whether the codewords should be faked if there is no traitor gamerule set. + /// + [DataField] + public bool FakeCodewords = true; + + /// + /// Whether all codewords added to the round should be used. Overrides CodewordAmount if true. + /// + [DataField] + public bool CodewordShowAll = false; +} diff --git a/Content.Server/Traitor/Systems/TraitorCodePaperSystem.cs b/Content.Server/Traitor/Systems/TraitorCodePaperSystem.cs new file mode 100644 index 0000000000..72baa2c91d --- /dev/null +++ b/Content.Server/Traitor/Systems/TraitorCodePaperSystem.cs @@ -0,0 +1,93 @@ +using System.Diagnostics.CodeAnalysis; +using Content.Server.GameTicking; +using Content.Server.GameTicking.Rules; +using Content.Server.GameTicking.Rules.Components; +using Content.Server.Paper; +using Content.Server.Traitor.Components; +using Robust.Shared.Random; +using Robust.Shared.Utility; +using System.Linq; + +namespace Content.Server.Traitor.Systems; + +public sealed class TraitorCodePaperSystem : EntitySystem +{ + [Dependency] private readonly GameTicker _gameTicker = default!; + [Dependency] private readonly TraitorRuleSystem _traitorRuleSystem = default!; + [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private readonly PaperSystem _paper = default!; + + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(OnMapInit); + } + + private void OnMapInit(EntityUid uid, TraitorCodePaperComponent component, MapInitEvent args) + { + SetupPaper(uid, component); + } + + private void SetupPaper(EntityUid uid, TraitorCodePaperComponent? component = null) + { + if (!Resolve(uid, ref component)) + return; + + if (HasComp(uid)) + { + if (TryGetTraitorCode(out var paperContent, component)) + { + _paper.SetContent(uid, paperContent); + } + } + } + + private bool TryGetTraitorCode([NotNullWhen(true)] out string? traitorCode, TraitorCodePaperComponent component) + { + traitorCode = null; + + var codesMessage = new FormattedMessage(); + List codeList = new(); + // Find the first nuke that matches the passed location. + if (_gameTicker.IsGameRuleAdded()) + { + var ruleEnts = _gameTicker.GetAddedGameRules(); + foreach (var ruleEnt in ruleEnts) + { + if (TryComp(ruleEnt, out TraitorRuleComponent? traitorComp)) + { + codeList.AddRange(traitorComp.Codewords.ToList()); + } + } + } + if (codeList.Count == 0) + { + if (component.FakeCodewords) + codeList = _traitorRuleSystem.GenerateTraitorCodewords(new TraitorRuleComponent()).ToList(); + else + codeList = [Loc.GetString("traitor-codes-none")]; + } + + _random.Shuffle(codeList); + + int i = 0; + foreach (var code in codeList) + { + i++; + if (i > component.CodewordAmount && !component.CodewordShowAll) + break; + + codesMessage.PushNewline(); + codesMessage.AddMarkup(code); + } + + if (!codesMessage.IsEmpty) + { + if (i == 1) + traitorCode = Loc.GetString("traitor-codes-message-singular") + codesMessage; + else + traitorCode = Loc.GetString("traitor-codes-message-plural") + codesMessage; + } + return !codesMessage.IsEmpty; + } +} diff --git a/Resources/Locale/en-US/thief/backpack.ftl b/Resources/Locale/en-US/thief/backpack.ftl index 0911bc042b..6a69ab8bc6 100644 --- a/Resources/Locale/en-US/thief/backpack.ftl +++ b/Resources/Locale/en-US/thief/backpack.ftl @@ -18,7 +18,8 @@ thief-backpack-button-deselect = Select [X] thief-backpack-category-chameleon-name = chameleon kit thief-backpack-category-chameleon-description = You are everyone and no one; you are a master of disguise. - Includes: Set of chameleon clothing, a chameleon projector. + Includes: A full set of chameleon clothing, + a chameleon projector, and an Agent ID. Disguise as anyone and anything. thief-backpack-category-tools-name = breacher kit @@ -38,8 +39,8 @@ thief-backpack-category-syndie-name = syndie kit thief-backpack-category-syndie-description = Trinkets from a disavowed past, or stolen from a careless agent? You've made some connections. Whiskey, echo... - Includes: Agent ID card, Emag, syndicate pAI, Interdyne cigs, - and some strange red crystals. + Includes: An Emag, Interdyne cigs, a Syndicate codeword, + a Radio Jammer, a lighter and some strange red crystals. thief-backpack-category-sleeper-name = sleeper kit thief-backpack-category-sleeper-description = diff --git a/Resources/Locale/en-US/traitor/traitor-codes-component.ftl b/Resources/Locale/en-US/traitor/traitor-codes-component.ftl new file mode 100644 index 0000000000..35246037f6 --- /dev/null +++ b/Resources/Locale/en-US/traitor/traitor-codes-component.ftl @@ -0,0 +1,3 @@ +traitor-codes-message-singular = syndicate codeword: +traitor-codes-message-plural = syndicate codewords: +traitor-codes-none = no known codewords diff --git a/Resources/Prototypes/Catalog/thief_toolbox_sets.yml b/Resources/Prototypes/Catalog/thief_toolbox_sets.yml index 322fd9261b..fe1a4fe75c 100644 --- a/Resources/Prototypes/Catalog/thief_toolbox_sets.yml +++ b/Resources/Prototypes/Catalog/thief_toolbox_sets.yml @@ -16,6 +16,7 @@ - ClothingShoesChameleon - BarberScissors - ChameleonProjector + - AgentIDCard - type: thiefBackpackSet id: ToolsSet @@ -57,9 +58,10 @@ sprite: Objects/Specific/Syndicate/telecrystal.rsi state: telecrystal content: - - AgentIDCard + - RadioJammer + - TraitorCodePaper - Emag - - SyndicatePersonalAI + - Lighter - CigPackSyndicate - Telecrystal10 #The thief cannot use them, but it may induce communication with traitors diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index edd4aee3ba..617db53c4e 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -565,6 +565,26 @@ - type: StealTarget stealGroup: BoxFolderQmClipboard +- type: entity + parent: Paper + id: TraitorCodePaper + name: syndicate codeword + description: A leaked codeword to possibly get in touch with the Syndicate. + suffix: DO NOT MAP + components: + - type: TraitorCodePaper + +- type: entity + parent: Paper + id: AllTraitorCodesPaper + name: syndicate codewords registry + description: A registry of all active Syndicate codewords. + suffix: Admeme + components: + - type: TraitorCodePaper + fakeCodewords: false + codewordShowAll: true + - type: entity name: envelope parent: BaseItem From 50408da21a4c3213d64f6b06b668fb1b90e69d0e Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 5 Aug 2024 08:04:30 +0000 Subject: [PATCH 197/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 1c8e3384e1..0e85e697a4 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: mirrorcult - changes: - - message: Events that run now get logged to admin alert chat - type: Tweak - id: 6546 - time: '2024-05-07T15:13:29.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27761 - author: cooldolphin changes: - message: Cigarettes in the loadout menu. @@ -3778,3 +3771,16 @@ id: 7045 time: '2024-08-05T06:09:35.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30607 +- author: SlamBamActionman, PolarTundra + changes: + - message: Thief's Syndie Kit now comes with a Radio Jammer, a lighter and a Syndicate + codeword. + type: Add + - message: Thief's Agent ID has been moved from the Syndie Kit to the Chameleon + Kit. + type: Tweak + - message: The Syndicate pAI has been removed from the Thief's Syndie Kit. + type: Remove + id: 7046 + time: '2024-08-05T08:03:24.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30446 From b3a64d4bcd2ccad17766eac0a1e17a01fa61b177 Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Mon, 5 Aug 2024 04:07:02 -0400 Subject: [PATCH 198/422] Add slowdown to low temperatures (#29692) * TemperatureSpeed component * temperature slowdown prediction (done right) * remove unnecessary changes * that too * get in line * make it readonly * auto pause --- .../ConstructionSystem.Interactions.cs | 2 +- .../Components/TemperatureComponent.cs | 14 +--- .../Temperature/Systems/TemperatureSystem.cs | 14 ---- .../Components/TemperatureSpeedComponent.cs | 30 +++++++ .../Systems/SharedTemperatureSystem.cs | 80 +++++++++++++++++++ .../Temperature/TemperatureEvents.cs | 15 ++++ .../Prototypes/Entities/Mobs/Species/base.yml | 5 ++ .../Prototypes/Entities/Mobs/Species/moth.yml | 5 ++ .../Entities/Mobs/Species/reptilian.yml | 5 ++ 9 files changed, 143 insertions(+), 27 deletions(-) create mode 100644 Content.Shared/Temperature/Components/TemperatureSpeedComponent.cs create mode 100644 Content.Shared/Temperature/Systems/SharedTemperatureSystem.cs diff --git a/Content.Server/Construction/ConstructionSystem.Interactions.cs b/Content.Server/Construction/ConstructionSystem.Interactions.cs index ad7b2a11b0..c844dd2c9a 100644 --- a/Content.Server/Construction/ConstructionSystem.Interactions.cs +++ b/Content.Server/Construction/ConstructionSystem.Interactions.cs @@ -2,7 +2,6 @@ using System.Linq; using Content.Server.Administration.Logs; using Content.Server.Construction.Components; using Content.Server.Temperature.Components; -using Content.Server.Temperature.Systems; using Content.Shared.Construction; using Content.Shared.Construction.Components; using Content.Shared.Construction.EntitySystems; @@ -11,6 +10,7 @@ using Content.Shared.DoAfter; using Content.Shared.Interaction; using Content.Shared.Prying.Systems; using Content.Shared.Radio.EntitySystems; +using Content.Shared.Temperature; using Content.Shared.Tools.Systems; using Robust.Shared.Containers; using Robust.Shared.Utility; diff --git a/Content.Server/Temperature/Components/TemperatureComponent.cs b/Content.Server/Temperature/Components/TemperatureComponent.cs index 3bfa12f269..ae2c373b14 100644 --- a/Content.Server/Temperature/Components/TemperatureComponent.cs +++ b/Content.Server/Temperature/Components/TemperatureComponent.cs @@ -1,4 +1,3 @@ -using Content.Server.Temperature.Systems; using Content.Shared.Alert; using Content.Shared.Atmos; using Content.Shared.Damage; @@ -51,15 +50,6 @@ public sealed partial class TemperatureComponent : Component [DataField, ViewVariables(VVAccess.ReadWrite)] public float AtmosTemperatureTransferEfficiency = 0.1f; - [Obsolete("Use system method")] - public float HeatCapacity - { - get - { - return IoCManager.Resolve().System().GetHeatCapacity(Owner, this); - } - } - [DataField, ViewVariables(VVAccess.ReadWrite)] public DamageSpecifier ColdDamage = new(); @@ -71,7 +61,7 @@ public sealed partial class TemperatureComponent : Component /// /// /// Okay it genuinely reaches this basically immediately for a plasma fire. - /// + /// [DataField, ViewVariables(VVAccess.ReadWrite)] public FixedPoint2 DamageCap = FixedPoint2.New(8); @@ -79,7 +69,7 @@ public sealed partial class TemperatureComponent : Component /// Used to keep track of when damage starts/stops. Useful for logs. /// [DataField] - public bool TakingDamage = false; + public bool TakingDamage; [DataField] public ProtoId HotAlert = "Hot"; diff --git a/Content.Server/Temperature/Systems/TemperatureSystem.cs b/Content.Server/Temperature/Systems/TemperatureSystem.cs index d33bf6e025..8b6fa107cc 100644 --- a/Content.Server/Temperature/Systems/TemperatureSystem.cs +++ b/Content.Server/Temperature/Systems/TemperatureSystem.cs @@ -412,17 +412,3 @@ public sealed class TemperatureSystem : EntitySystem return (newHeatThreshold, newColdThreshold); } } - -public sealed class OnTemperatureChangeEvent : EntityEventArgs -{ - public float CurrentTemperature { get; } - public float LastTemperature { get; } - public float TemperatureDelta { get; } - - public OnTemperatureChangeEvent(float current, float last, float delta) - { - CurrentTemperature = current; - LastTemperature = last; - TemperatureDelta = delta; - } -} diff --git a/Content.Shared/Temperature/Components/TemperatureSpeedComponent.cs b/Content.Shared/Temperature/Components/TemperatureSpeedComponent.cs new file mode 100644 index 0000000000..74ba2a0274 --- /dev/null +++ b/Content.Shared/Temperature/Components/TemperatureSpeedComponent.cs @@ -0,0 +1,30 @@ +using Content.Shared.Temperature.Systems; +using Robust.Shared.GameStates; + +namespace Content.Shared.Temperature.Components; + +/// +/// This is used for an entity that varies in speed based on current temperature. +/// +[RegisterComponent, NetworkedComponent, Access(typeof(SharedTemperatureSystem)), AutoGenerateComponentState, AutoGenerateComponentPause] +public sealed partial class TemperatureSpeedComponent : Component +{ + /// + /// Pairs of temperature thresholds to applied slowdown values. + /// + [DataField] + public Dictionary Thresholds = new(); + + /// + /// The current speed modifier from we reached. + /// Stored and networked so that the client doesn't mispredict temperature + /// + [DataField, AutoNetworkedField] + public float? CurrentSpeedModifier; + + /// + /// The time at which the temperature slowdown is updated. + /// + [DataField, AutoNetworkedField, AutoPausedField] + public TimeSpan? NextSlowdownUpdate; +} diff --git a/Content.Shared/Temperature/Systems/SharedTemperatureSystem.cs b/Content.Shared/Temperature/Systems/SharedTemperatureSystem.cs new file mode 100644 index 0000000000..efea2df5af --- /dev/null +++ b/Content.Shared/Temperature/Systems/SharedTemperatureSystem.cs @@ -0,0 +1,80 @@ +using System.Linq; +using Content.Shared.Movement.Components; +using Content.Shared.Movement.Systems; +using Content.Shared.Temperature.Components; +using Robust.Shared.Timing; + +namespace Content.Shared.Temperature.Systems; + +/// +/// This handles predicting temperature based speedup. +/// +public sealed class SharedTemperatureSystem : EntitySystem +{ + [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!; + + /// + /// Band-aid for unpredicted atmos. Delays the application for a short period so that laggy clients can get the replicated temperature. + /// + private static readonly TimeSpan SlowdownApplicationDelay = TimeSpan.FromSeconds(1f); + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnTemperatureChanged); + SubscribeLocalEvent(OnRefreshMovementSpeedModifiers); + } + + private void OnTemperatureChanged(Entity ent, ref OnTemperatureChangeEvent args) + { + foreach (var (threshold, modifier) in ent.Comp.Thresholds) + { + if (args.CurrentTemperature < threshold && args.LastTemperature > threshold || + args.CurrentTemperature > threshold && args.LastTemperature < threshold) + { + ent.Comp.NextSlowdownUpdate = _timing.CurTime + SlowdownApplicationDelay; + ent.Comp.CurrentSpeedModifier = modifier; + Dirty(ent); + break; + } + } + + var maxThreshold = ent.Comp.Thresholds.Max(p => p.Key); + if (args.CurrentTemperature > maxThreshold && args.LastTemperature < maxThreshold) + { + ent.Comp.NextSlowdownUpdate = _timing.CurTime + SlowdownApplicationDelay; + ent.Comp.CurrentSpeedModifier = null; + Dirty(ent); + } + } + + private void OnRefreshMovementSpeedModifiers(Entity ent, ref RefreshMovementSpeedModifiersEvent args) + { + // Don't update speed and mispredict while we're compensating for lag. + if (ent.Comp.NextSlowdownUpdate != null || ent.Comp.CurrentSpeedModifier == null) + return; + + args.ModifySpeed(ent.Comp.CurrentSpeedModifier.Value, ent.Comp.CurrentSpeedModifier.Value); + } + + public override void Update(float frameTime) + { + base.Update(frameTime); + + var query = EntityQueryEnumerator(); + while (query.MoveNext(out var uid, out var temp, out var movement)) + { + if (temp.NextSlowdownUpdate == null) + continue; + + if (_timing.CurTime < temp.NextSlowdownUpdate) + continue; + + temp.NextSlowdownUpdate = null; + _movementSpeedModifier.RefreshMovementSpeedModifiers(uid, movement); + Dirty(uid, temp); + } + } +} diff --git a/Content.Shared/Temperature/TemperatureEvents.cs b/Content.Shared/Temperature/TemperatureEvents.cs index ac12224868..7a26d07e30 100644 --- a/Content.Shared/Temperature/TemperatureEvents.cs +++ b/Content.Shared/Temperature/TemperatureEvents.cs @@ -13,3 +13,18 @@ public sealed class ModifyChangedTemperatureEvent : EntityEventArgs, IInventoryR TemperatureDelta = temperature; } } + +public sealed class OnTemperatureChangeEvent : EntityEventArgs +{ + public readonly float CurrentTemperature; + public readonly float LastTemperature; + public readonly float TemperatureDelta; + + public OnTemperatureChangeEvent(float current, float last, float delta) + { + CurrentTemperature = current; + LastTemperature = last; + TemperatureDelta = delta; + } +} + diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml index 99aa2d4bc8..af309e93ad 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/base.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml @@ -249,6 +249,11 @@ heatDamage: types: Heat: 1.5 #per second, scales with temperature & other constants + - type: TemperatureSpeed + thresholds: + 293: 0.8 + 280: 0.6 + 260: 0.4 - type: ThermalRegulator metabolismHeat: 800 radiatedHeat: 100 diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml index 153d5cccd3..da0dca740c 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml @@ -64,6 +64,11 @@ heatDamage: types: Heat : 3 #per second, scales with temperature & other constants + - type: TemperatureSpeed + thresholds: + 289: 0.8 + 275: 0.6 + 250: 0.4 - type: Sprite # sprite again because we want different layer ordering noRot: true drawdepth: Mobs diff --git a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml index 1c9eaa2ec6..c023dc1c25 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml @@ -59,6 +59,11 @@ heatDamage: types: Heat : 1.5 #per second, scales with temperature & other constants + - type: TemperatureSpeed + thresholds: + 301: 0.8 + 295: 0.6 + 285: 0.4 - type: Wagging - type: Inventory speciesId: reptilian From d45810bbdb153f09b4f3c418f5714529a5666560 Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 5 Aug 2024 08:08:08 +0000 Subject: [PATCH 199/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 0e85e697a4..c6d82d45a9 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: cooldolphin - changes: - - message: Cigarettes in the loadout menu. - type: Add - id: 6547 - time: '2024-05-07T15:55:03.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27292 - author: FairlySadPanda changes: - message: Weapons that deflect shots, like the e-sword, now are most effective @@ -3784,3 +3777,10 @@ id: 7046 time: '2024-08-05T08:03:24.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30446 +- author: EmoGarbage404 + changes: + - message: Being cold now slows down your character. + type: Add + id: 7047 + time: '2024-08-05T08:07:02.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29692 From c1eb319bdac73b4c332a3f8130ffa32f7e7ed438 Mon Sep 17 00:00:00 2001 From: Mervill Date: Mon, 5 Aug 2024 01:12:07 -0700 Subject: [PATCH 200/422] Refactor the `hungry` debug command to be in line with `thirsty` (#30591) refactor the hungry debug command to be in line with thirsty Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> --- Content.Server/Nutrition/Hungry.cs | 57 +++++++++---------- .../en-US/nutrition/nutrition-commands.ftl | 2 + 2 files changed, 28 insertions(+), 31 deletions(-) diff --git a/Content.Server/Nutrition/Hungry.cs b/Content.Server/Nutrition/Hungry.cs index ae68dcd2fd..ce5e14ce09 100644 --- a/Content.Server/Nutrition/Hungry.cs +++ b/Content.Server/Nutrition/Hungry.cs @@ -4,40 +4,35 @@ using Content.Shared.Nutrition.Components; using Content.Shared.Nutrition.EntitySystems; using Robust.Shared.Console; -namespace Content.Server.Nutrition +namespace Content.Server.Nutrition; + +[AdminCommand(AdminFlags.Debug)] +public sealed class Hungry : LocalizedEntityCommands { - [AdminCommand(AdminFlags.Debug)] - public sealed class Hungry : IConsoleCommand + public override string Command => "hungry"; + + public override void Execute(IConsoleShell shell, string argStr, string[] args) { - [Dependency] private readonly IEntityManager _entities = default!; - - public string Command => "hungry"; - public string Description => "Makes you hungry."; - public string Help => $"{Command}"; - - public void Execute(IConsoleShell shell, string argStr, string[] args) + var player = shell.Player; + if (player == null) { - var player = shell.Player; - if (player == null) - { - shell.WriteLine("You cannot use this command unless you are a player."); - return; - } - - if (player.AttachedEntity is not {Valid: true} playerEntity) - { - shell.WriteLine("You cannot use this command without an entity."); - return; - } - - if (!_entities.TryGetComponent(playerEntity, out HungerComponent? hunger)) - { - shell.WriteLine($"Your entity does not have a {nameof(HungerComponent)} component."); - return; - } - - var hungryThreshold = hunger.Thresholds[HungerThreshold.Starving]; - _entities.System().SetHunger(playerEntity, hungryThreshold, hunger); + shell.WriteError(Loc.GetString("cmd-nutrition-error-player")); + return; } + + if (player.AttachedEntity is not {Valid: true} playerEntity) + { + shell.WriteError(Loc.GetString("cmd-nutrition-error-entity")); + return; + } + + if (!EntityManager.TryGetComponent(playerEntity, out HungerComponent? hunger)) + { + shell.WriteError(Loc.GetString("cmd-nutrition-error-component", ("comp", nameof(HungerComponent)))); + return; + } + + var hungryThreshold = hunger.Thresholds[HungerThreshold.Starving]; + EntityManager.System().SetHunger(playerEntity, hungryThreshold, hunger); } } diff --git a/Resources/Locale/en-US/nutrition/nutrition-commands.ftl b/Resources/Locale/en-US/nutrition/nutrition-commands.ftl index d441026456..2b1259e9b2 100644 --- a/Resources/Locale/en-US/nutrition/nutrition-commands.ftl +++ b/Resources/Locale/en-US/nutrition/nutrition-commands.ftl @@ -2,6 +2,8 @@ cmd-nutrition-error-player = You cannot use this command unless you are a player cmd-nutrition-error-entity = You cannot use this command without an entity. cmd-nutrition-error-component = Your entity does not have a {$comp} component. +cmd-hungry-desc = makes you hungry +cmd-hungry-help = sets your hungry level to starving cmd-setnutrit-desc = modify hunger and thirst cmd-setnutrit-help = set your hunger or thirst to one of the built-in thresholds cmd-setnutrit-error-invalid-threshold = invalid {$thresholdType} `{$thresholdString}` From f7d8b4e7d469c03f4adab33307af4a44e44b0319 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Mon, 5 Aug 2024 19:24:56 +1000 Subject: [PATCH 201/422] Fix verb sub (#30667) * Fix verb sub Mapping casualty, verbs are weird. * also this --- Content.Client/Verbs/UI/VerbMenuUIController.cs | 1 + Content.Server/Traitor/Systems/TraitorCodePaperSystem.cs | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Content.Client/Verbs/UI/VerbMenuUIController.cs b/Content.Client/Verbs/UI/VerbMenuUIController.cs index ad120da80b..efacf877ad 100644 --- a/Content.Client/Verbs/UI/VerbMenuUIController.cs +++ b/Content.Client/Verbs/UI/VerbMenuUIController.cs @@ -47,6 +47,7 @@ namespace Content.Client.Verbs.UI { _context.OnContextKeyEvent += OnKeyBindDown; _context.OnContextClosed += Close; + _verbSystem.OnVerbsResponse += HandleVerbsResponse; } public void OnStateExited(GameplayState state) diff --git a/Content.Server/Traitor/Systems/TraitorCodePaperSystem.cs b/Content.Server/Traitor/Systems/TraitorCodePaperSystem.cs index 72baa2c91d..5a252fc105 100644 --- a/Content.Server/Traitor/Systems/TraitorCodePaperSystem.cs +++ b/Content.Server/Traitor/Systems/TraitorCodePaperSystem.cs @@ -7,6 +7,7 @@ using Content.Server.Traitor.Components; using Robust.Shared.Random; using Robust.Shared.Utility; using System.Linq; +using Content.Shared.Paper; namespace Content.Server.Traitor.Systems; @@ -33,11 +34,11 @@ public sealed class TraitorCodePaperSystem : EntitySystem if (!Resolve(uid, ref component)) return; - if (HasComp(uid)) + if (TryComp(uid, out PaperComponent? paperComp)) { if (TryGetTraitorCode(out var paperContent, component)) { - _paper.SetContent(uid, paperContent); + _paper.SetContent((uid, paperComp), paperContent); } } } @@ -83,7 +84,7 @@ public sealed class TraitorCodePaperSystem : EntitySystem if (!codesMessage.IsEmpty) { - if (i == 1) + if (i == 1) traitorCode = Loc.GetString("traitor-codes-message-singular") + codesMessage; else traitorCode = Loc.GetString("traitor-codes-message-plural") + codesMessage; From f2eccdc3ddaed3372ad1c81962977ac809be714b Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Mon, 5 Aug 2024 15:37:54 +0300 Subject: [PATCH 202/422] loadout update --- .../Prototypes/_CP14/Loadouts/Jobs/basic.yml | 148 +----------------- .../_CP14/Loadouts/Jobs/captain.yml | 8 - .../_CP14/Loadouts/Jobs/guard_commander.yml | 4 - 3 files changed, 2 insertions(+), 158 deletions(-) diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/basic.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/basic.yml index c9b366b599..d70cbb570b 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/basic.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/basic.yml @@ -2,59 +2,31 @@ - type: loadout id: CP14ClothingCloakBlacksmithArpon equipment: CP14ClothingCloakBlacksmithArpon - -- type: startingGear - id: CP14ClothingCloakBlacksmithArpon - equipment: cloak: CP14ClothingCloakBlacksmithArpon - + - type: loadout id: CP14ClothingCloakMaidArpon equipment: CP14ClothingCloakMaidArpon - -- type: startingGear - id: CP14ClothingCloakMaidArpon - equipment: cloak: CP14ClothingCloakMaidArpon - - type: loadout id: CP14ClothingCloakFurcapeBlack equipment: CP14ClothingCloakFurcapeBlack - -- type: startingGear - id: CP14ClothingCloakFurcapeBlack - equipment: cloak: CP14ClothingCloakFurcapeBlack - - type: loadout id: CP14ClothingCloakFurcapeBlue equipment: CP14ClothingCloakFurcapeBlue - -- type: startingGear - id: CP14ClothingCloakFurcapeBlue - equipment: cloak: CP14ClothingCloakFurcapeBlue - - type: loadout id: CP14ClothingCloakSimpleWhite equipment: CP14ClothingCloakSimpleWhite - -- type: startingGear - id: CP14ClothingCloakSimpleWhite - equipment: cloak: CP14ClothingCloakSimpleWhite - - type: loadout id: CP14ClothingCloakSimpleDarkBlue equipment: CP14ClothingCloakSimpleDarkBlue - -- type: startingGear - id: CP14ClothingCloakSimpleDarkBlue - equipment: cloak: CP14ClothingCloakSimpleDarkBlue # Eyes @@ -62,19 +34,11 @@ - type: loadout id: CP14ClothingEyesMonocle equipment: CP14ClothingEyesMonocle - -- type: startingGear - id: CP14ClothingEyesMonocle - equipment: eyes: CP14ClothingEyesMonocle - type: loadout id: CP14ClothingEyesGlasses equipment: CP14ClothingEyesGlasses - -- type: startingGear - id: CP14ClothingEyesGlasses - equipment: eyes: CP14ClothingEyesGlasses # Gloves @@ -82,10 +46,6 @@ - type: loadout id: CP14Girdles equipment: CP14Girdles - -- type: startingGear - id: CP14Girdles - equipment: gloves: CP14ClothingGlovesGirdles # Head @@ -93,78 +53,41 @@ - type: loadout id: CP14ClothingHeadMetalHeadband equipment: CP14ClothingHeadMetalHeadband - -- type: startingGear - id: CP14ClothingHeadMetalHeadband - equipment: head: CP14ClothingHeadMetalHeadband - - type: loadout id: CP14ClothingHeadTriangularHat equipment: CP14ClothingHeadTriangularHat - -- type: startingGear - id: CP14ClothingHeadTriangularHat - equipment: head: CP14ClothingHeadTriangularHat - - type: loadout id: CP14ClothingHeadTriangularHatGolden equipment: CP14ClothingHeadTriangularHatGolden - -- type: startingGear - id: CP14ClothingHeadTriangularHatGolden - equipment: head: CP14ClothingHeadTriangularHatGolden - - type: loadout id: CP14ClothingHeadRedBeret equipment: CP14ClothingHeadRedBeret - -- type: startingGear - id: CP14ClothingHeadRedBeret - equipment: head: CP14ClothingHeadRedBeret - - type: loadout id: CP14ClothingHeadPurpleBeret equipment: CP14ClothingHeadPurpleBeret - -- type: startingGear - id: CP14ClothingHeadPurpleBeret - equipment: head: CP14ClothingHeadPurpleBeret - - type: loadout id: CP14ClothingHeadYellowBeret equipment: CP14ClothingHeadYellowBeret - -- type: startingGear - id: CP14ClothingHeadYellowBeret - equipment: head: CP14ClothingHeadYellowBeret - type: loadout id: CP14ClothingHeadBlueBeret equipment: CP14ClothingHeadBlueBeret - -- type: startingGear - id: CP14ClothingHeadBlueBeret - equipment: head: CP14ClothingHeadBlueBeret - type: loadout id: CP14ClothingHeadBlackBeret equipment: CP14ClothingHeadBlackBeret - -- type: startingGear - id: CP14ClothingHeadBlackBeret - equipment: head: CP14ClothingHeadBlackBeret # Mask @@ -172,10 +95,6 @@ - type: loadout id: CP14Sinner equipment: CP14Sinner - -- type: startingGear - id: CP14Sinner - equipment: mask: CP14ClothingMaskSinner # Pants @@ -183,109 +102,58 @@ - type: loadout id: CP14ClothingPantsTrouserWhite equipment: CP14ClothingPantsTrouserWhite - -- type: startingGear - id: CP14ClothingPantsTrouserWhite - equipment: pants: CP14ClothingPantsTrouserWhite - - type: loadout id: CP14ClothingPantsTrouserDarkBlue equipment: CP14ClothingPantsTrouserDarkBlue - -- type: startingGear - id: CP14ClothingPantsTrouserDarkBlue - equipment: pants: CP14ClothingPantsTrouserDarkBlue - - type: loadout id: CP14ClothingPantsAristocratic equipment: CP14ClothingPantsAristocratic - -- type: startingGear - id: CP14ClothingPantsAristocratic - equipment: pants: CP14ClothingPantsAristocratic - - type: loadout id: CP14ClothingPantsLoincloth equipment: CP14ClothingPantsLoincloth - -- type: startingGear - id: CP14ClothingPantsLoincloth - equipment: pants: CP14ClothingPantsLoincloth - - type: loadout id: CP14ClothingDressBlack equipment: CP14ClothingDressBlack - -- type: startingGear - id: CP14ClothingDressBlack - equipment: pants: CP14ClothingDressBlack - + # Shirt - type: loadout id: CP14ClothingShirtCottonBlue equipment: CP14ClothingShirtCottonBlue - -- type: startingGear - id: CP14ClothingShirtCottonBlue - equipment: shirt: CP14ClothingShirtCottonBlue - type: loadout id: CP14ClothingShirtCottonBlack equipment: CP14ClothingShirtCottonBlack - -- type: startingGear - id: CP14ClothingShirtCottonBlack - equipment: shirt: CP14ClothingShirtCottonBlack - type: loadout id: CP14ClothingShirtCottonPurple equipment: CP14ClothingShirtCottonPurple - -- type: startingGear - id: CP14ClothingShirtCottonPurple - equipment: shirt: CP14ClothingShirtCottonPurple - - type: loadout id: CP14ClothingShirtCottonRed equipment: CP14ClothingShirtCottonRed - -- type: startingGear - id: CP14ClothingShirtCottonRed - equipment: shirt: CP14ClothingShirtCottonRed - - type: loadout id: CP14ClothingShirtCottonWhite equipment: CP14ClothingShirtCottonWhite - -- type: startingGear - id: CP14ClothingShirtCottonWhite - equipment: shirt: CP14ClothingShirtCottonWhite - - type: loadout id: CP14ClothingShirtCottonYellow equipment: CP14ClothingShirtCottonYellow - -- type: startingGear - id: CP14ClothingShirtCottonYellow - equipment: shirt: CP14ClothingShirtCottonYellow # Shoes @@ -293,26 +161,14 @@ - type: loadout id: CP14ShoesBlack equipment: CP14ShoesBlack - -- type: startingGear - id: CP14ShoesBlack - equipment: shoes: CP14ClothingShoesBlack - type: loadout id: CP14ShoesAristocraticBlack equipment: CP14ShoesAristocraticBlack - -- type: startingGear - id: CP14ShoesAristocraticBlack - equipment: shoes: CP14ClothingShoesAristocraticBlack - type: loadout id: CP14ShoesSandals equipment: CP14ShoesSandals - -- type: startingGear - id: CP14ShoesSandals - equipment: shoes: CP14ClothingShoesSandals \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/captain.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/captain.yml index 73fd36551c..4532e26c25 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/captain.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/captain.yml @@ -2,18 +2,10 @@ - type: loadout id: CP14ClothingHeadCaptainCap equipment: CP14ClothingHeadCaptainCap - -- type: startingGear - id: CP14ClothingHeadCaptainCap - equipment: head: CP14ClothingHeadCaptainCap # Cloak - type: loadout id: CP14ClothingCloakCaptainJacket equipment: CP14ClothingCloakCaptainJacket - -- type: startingGear - id: CP14ClothingCloakCaptainJacket - equipment: cloak: CP14ClothingCloakCaptainJacket \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/guard_commander.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/guard_commander.yml index 6bb4bc339a..c31f0da3cf 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/guard_commander.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/guard_commander.yml @@ -3,8 +3,4 @@ - type: loadout id: CP14ClothingCloakArmoredRed equipment: CP14ClothingCloakArmoredRed - -- type: startingGear - id: CP14ClothingCloakArmoredRed - equipment: cloak: CP14ClothingCloakArmoredRed \ No newline at end of file From f2b2da41a6340471253fccb54dd9f7fac873528a Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Mon, 5 Aug 2024 15:50:12 +0300 Subject: [PATCH 203/422] fix again --- .../Prototypes/_CP14/Loadouts/Jobs/basic.yml | 64 +++++++++---------- .../_CP14/Loadouts/Jobs/captain.yml | 4 +- .../_CP14/Loadouts/Jobs/guard_commander.yml | 2 +- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/basic.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/basic.yml index d70cbb570b..df23a4df81 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/basic.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/basic.yml @@ -1,174 +1,174 @@ # Cloak - type: loadout id: CP14ClothingCloakBlacksmithArpon - equipment: CP14ClothingCloakBlacksmithArpon + equipment: cloak: CP14ClothingCloakBlacksmithArpon - type: loadout id: CP14ClothingCloakMaidArpon - equipment: CP14ClothingCloakMaidArpon + equipment: cloak: CP14ClothingCloakMaidArpon - type: loadout id: CP14ClothingCloakFurcapeBlack - equipment: CP14ClothingCloakFurcapeBlack + equipment: cloak: CP14ClothingCloakFurcapeBlack - type: loadout id: CP14ClothingCloakFurcapeBlue - equipment: CP14ClothingCloakFurcapeBlue + equipment: cloak: CP14ClothingCloakFurcapeBlue - type: loadout id: CP14ClothingCloakSimpleWhite - equipment: CP14ClothingCloakSimpleWhite + equipment: cloak: CP14ClothingCloakSimpleWhite - type: loadout id: CP14ClothingCloakSimpleDarkBlue - equipment: CP14ClothingCloakSimpleDarkBlue + equipment: cloak: CP14ClothingCloakSimpleDarkBlue # Eyes - type: loadout id: CP14ClothingEyesMonocle - equipment: CP14ClothingEyesMonocle + equipment: eyes: CP14ClothingEyesMonocle - type: loadout id: CP14ClothingEyesGlasses - equipment: CP14ClothingEyesGlasses + equipment: eyes: CP14ClothingEyesGlasses # Gloves - type: loadout id: CP14Girdles - equipment: CP14Girdles + equipment: gloves: CP14ClothingGlovesGirdles # Head - type: loadout id: CP14ClothingHeadMetalHeadband - equipment: CP14ClothingHeadMetalHeadband + equipment: head: CP14ClothingHeadMetalHeadband - type: loadout id: CP14ClothingHeadTriangularHat - equipment: CP14ClothingHeadTriangularHat + equipment: head: CP14ClothingHeadTriangularHat - type: loadout id: CP14ClothingHeadTriangularHatGolden - equipment: CP14ClothingHeadTriangularHatGolden + equipment: head: CP14ClothingHeadTriangularHatGolden - type: loadout id: CP14ClothingHeadRedBeret - equipment: CP14ClothingHeadRedBeret + equipment: head: CP14ClothingHeadRedBeret - type: loadout id: CP14ClothingHeadPurpleBeret - equipment: CP14ClothingHeadPurpleBeret + equipment: head: CP14ClothingHeadPurpleBeret - type: loadout id: CP14ClothingHeadYellowBeret - equipment: CP14ClothingHeadYellowBeret + equipment: head: CP14ClothingHeadYellowBeret - type: loadout id: CP14ClothingHeadBlueBeret - equipment: CP14ClothingHeadBlueBeret + equipment: head: CP14ClothingHeadBlueBeret - type: loadout id: CP14ClothingHeadBlackBeret - equipment: CP14ClothingHeadBlackBeret + equipment: head: CP14ClothingHeadBlackBeret # Mask - type: loadout id: CP14Sinner - equipment: CP14Sinner + equipment: mask: CP14ClothingMaskSinner # Pants - type: loadout id: CP14ClothingPantsTrouserWhite - equipment: CP14ClothingPantsTrouserWhite + equipment: pants: CP14ClothingPantsTrouserWhite - type: loadout id: CP14ClothingPantsTrouserDarkBlue - equipment: CP14ClothingPantsTrouserDarkBlue + equipment: pants: CP14ClothingPantsTrouserDarkBlue - type: loadout id: CP14ClothingPantsAristocratic - equipment: CP14ClothingPantsAristocratic + equipment: pants: CP14ClothingPantsAristocratic - type: loadout id: CP14ClothingPantsLoincloth - equipment: CP14ClothingPantsLoincloth + equipment: pants: CP14ClothingPantsLoincloth - type: loadout id: CP14ClothingDressBlack - equipment: CP14ClothingDressBlack + equipment: pants: CP14ClothingDressBlack # Shirt - type: loadout id: CP14ClothingShirtCottonBlue - equipment: CP14ClothingShirtCottonBlue + equipment: shirt: CP14ClothingShirtCottonBlue - type: loadout id: CP14ClothingShirtCottonBlack - equipment: CP14ClothingShirtCottonBlack + equipment: shirt: CP14ClothingShirtCottonBlack - type: loadout id: CP14ClothingShirtCottonPurple - equipment: CP14ClothingShirtCottonPurple + equipment: shirt: CP14ClothingShirtCottonPurple - type: loadout id: CP14ClothingShirtCottonRed - equipment: CP14ClothingShirtCottonRed + equipment: shirt: CP14ClothingShirtCottonRed - type: loadout id: CP14ClothingShirtCottonWhite - equipment: CP14ClothingShirtCottonWhite + equipment: shirt: CP14ClothingShirtCottonWhite - type: loadout id: CP14ClothingShirtCottonYellow - equipment: CP14ClothingShirtCottonYellow + equipment: shirt: CP14ClothingShirtCottonYellow # Shoes - type: loadout id: CP14ShoesBlack - equipment: CP14ShoesBlack + equipment: shoes: CP14ClothingShoesBlack - type: loadout id: CP14ShoesAristocraticBlack - equipment: CP14ShoesAristocraticBlack + equipment: shoes: CP14ClothingShoesAristocraticBlack - type: loadout id: CP14ShoesSandals - equipment: CP14ShoesSandals + equipment: shoes: CP14ClothingShoesSandals \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/captain.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/captain.yml index 4532e26c25..062d446f7a 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/captain.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/captain.yml @@ -1,11 +1,11 @@ # Head - type: loadout id: CP14ClothingHeadCaptainCap - equipment: CP14ClothingHeadCaptainCap + equipment: head: CP14ClothingHeadCaptainCap # Cloak - type: loadout id: CP14ClothingCloakCaptainJacket - equipment: CP14ClothingCloakCaptainJacket + equipment: cloak: CP14ClothingCloakCaptainJacket \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/guard_commander.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/guard_commander.yml index c31f0da3cf..737986202b 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/guard_commander.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/guard_commander.yml @@ -2,5 +2,5 @@ # Cloak - type: loadout id: CP14ClothingCloakArmoredRed - equipment: CP14ClothingCloakArmoredRed + equipment: cloak: CP14ClothingCloakArmoredRed \ No newline at end of file From f5c0efd3cd45e2852b1015cd99d1860a12a79170 Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Mon, 5 Aug 2024 16:06:10 +0300 Subject: [PATCH 204/422] Update departments.yml --- Resources/Prototypes/_CP14/Roles/Jobs/departments.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/departments.yml b/Resources/Prototypes/_CP14/Roles/Jobs/departments.yml index 84b9ff9f04..a3d0894983 100644 --- a/Resources/Prototypes/_CP14/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/_CP14/Roles/Jobs/departments.yml @@ -1,6 +1,7 @@ - type: department id: CP14Mercenary - description: department-CP14Free-desc + name: department-CP14Mercenary + description: department-CP14Mercenary-desc color: "#429976" roles: - CP14Adventurer @@ -9,6 +10,7 @@ - type: department id: CP14Command + name: department-CP14Command description: department-CP14Command-desc color: "#fadb3e" roles: From 9bb9e80ede98c78559891e603dae8e5dd24387cd Mon Sep 17 00:00:00 2001 From: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com> Date: Mon, 5 Aug 2024 22:59:51 +0000 Subject: [PATCH 205/422] tweak(SolutionTransfer): Raise default max transfer amount. (#29969) * fix(jugs): Make max and minimum transfer amounts make sense * fix name * Better * Implement bounds checks * large beaker too * More logical solution * Bleh * remove * Doesn't make sense yet WAS MISTAKEN AAAAAAAAAAAAAAD@ @! --- .../Chemistry/Components/SolutionTransferComponent.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Shared/Chemistry/Components/SolutionTransferComponent.cs b/Content.Shared/Chemistry/Components/SolutionTransferComponent.cs index 86d8da9d3d..2b862a83ac 100644 --- a/Content.Shared/Chemistry/Components/SolutionTransferComponent.cs +++ b/Content.Shared/Chemistry/Components/SolutionTransferComponent.cs @@ -29,7 +29,7 @@ public sealed partial class SolutionTransferComponent : Component /// [DataField("maxTransferAmount")] [ViewVariables(VVAccess.ReadWrite)] - public FixedPoint2 MaximumTransferAmount { get; set; } = FixedPoint2.New(50); + public FixedPoint2 MaximumTransferAmount { get; set; } = FixedPoint2.New(100); /// /// Can this entity take reagent from reagent tanks? From edd17072ae7becc7a39043d9f31652757c4cc768 Mon Sep 17 00:00:00 2001 From: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com> Date: Mon, 5 Aug 2024 16:13:27 -0700 Subject: [PATCH 206/422] Fix admin logs cache caching rounds forever if multiple game servers are ran on the same db (#30687) --- .../Logs/AdminLogManager.Cache.cs | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/Content.Server/Administration/Logs/AdminLogManager.Cache.cs b/Content.Server/Administration/Logs/AdminLogManager.Cache.cs index c194527d82..250d0f7aa3 100644 --- a/Content.Server/Administration/Logs/AdminLogManager.Cache.cs +++ b/Content.Server/Administration/Logs/AdminLogManager.Cache.cs @@ -16,6 +16,7 @@ public sealed partial class AdminLogManager // TODO ADMIN LOGS make this thread safe or remove thread safety from the main partial class private readonly Dictionary> _roundsLogCache = new(MaxRoundsCached); + private readonly Queue _roundsLogCacheQueue = new(); private static readonly Gauge CacheRoundCount = Metrics.CreateGauge( "admin_logs_cache_round_count", @@ -28,19 +29,21 @@ public sealed partial class AdminLogManager // TODO ADMIN LOGS cache previous {MaxRoundsCached} rounds on startup public void CacheNewRound() { - List list; - var oldestRound = _currentRoundId - MaxRoundsCached; + List? list = null; - if (_roundsLogCache.Remove(oldestRound, out var oldestList)) + _roundsLogCacheQueue.Enqueue(_currentRoundId); + if (_roundsLogCacheQueue.Count > MaxRoundsCached) { - list = oldestList; - list.Clear(); - } - else - { - list = new List(LogListInitialSize); + var oldestRound = _roundsLogCacheQueue.Dequeue(); + if (_roundsLogCache.Remove(oldestRound, out var oldestList)) + { + list = oldestList; + list.Clear(); + } } + list ??= new List(LogListInitialSize); + _roundsLogCache.Add(_currentRoundId, list); CacheRoundCount.Set(_roundsLogCache.Count); } From f8c5a514bc9f6f8bab6eafbd73989b5d02d63874 Mon Sep 17 00:00:00 2001 From: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com> Date: Tue, 6 Aug 2024 03:48:41 +0000 Subject: [PATCH 207/422] add(fland): Add a space cleaner dispenser to flands janitoral department (#30695) --- Resources/Maps/fland.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Resources/Maps/fland.yml b/Resources/Maps/fland.yml index c9cd7c1d0a..f717460fed 100644 --- a/Resources/Maps/fland.yml +++ b/Resources/Maps/fland.yml @@ -89806,6 +89806,13 @@ entities: - type: Transform pos: -19.46565,10.906514 parent: 13329 +- proto: CleanerDispenser + entities: + - uid: 20449 + components: + - type: Transform + pos: 6.5,14.5 + parent: 13329 - proto: ClosetBombFilled entities: - uid: 9440 From c948bd08c6cd34642cd2ee66ea5640ee1d541bc9 Mon Sep 17 00:00:00 2001 From: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com> Date: Tue, 6 Aug 2024 03:49:05 +0000 Subject: [PATCH 208/422] add(reach): Add a space cleaner dispenser to flands janitoral department (#30697) --- Resources/Maps/reach.yml | 54 ++++++---------------------------------- 1 file changed, 8 insertions(+), 46 deletions(-) diff --git a/Resources/Maps/reach.yml b/Resources/Maps/reach.yml index b2632d97e3..74b85ec1d1 100644 --- a/Resources/Maps/reach.yml +++ b/Resources/Maps/reach.yml @@ -1364,9 +1364,6 @@ entities: - type: Transform pos: 9.5,-11.5 parent: 407 - - type: DeviceLinkSink - links: - - 1243 - type: DeviceLinkSource linkedPorts: 1243: @@ -1376,9 +1373,6 @@ entities: - type: Transform pos: 12.5,-11.5 parent: 407 - - type: DeviceLinkSink - links: - - 1242 - type: DeviceLinkSource linkedPorts: 1242: @@ -1397,9 +1391,6 @@ entities: - type: Transform pos: -17.5,5.5 parent: 407 - - type: DeviceLinkSink - links: - - 1245 - type: DeviceLinkSource linkedPorts: 1245: @@ -1409,9 +1400,6 @@ entities: - type: Transform pos: -17.5,7.5 parent: 407 - - type: DeviceLinkSink - links: - - 1244 - type: DeviceLinkSource linkedPorts: 1244: @@ -1787,9 +1775,6 @@ entities: rot: 1.5707963267948966 rad pos: -5.5,10.5 parent: 407 - - type: DeviceLinkSink - links: - - 1251 - proto: BluespaceBeaker entities: - uid: 1740 @@ -5803,6 +5788,13 @@ entities: - type: Transform pos: -0.5,8.5 parent: 407 +- proto: CleanerDispenser + entities: + - uid: 2279 + components: + - type: Transform + pos: -3.5,-5.5 + parent: 407 - proto: ClosetChefFilled entities: - uid: 1655 @@ -9737,9 +9729,6 @@ entities: - type: Transform pos: -3.5,10.5 parent: 407 - - type: DeviceLinkSink - links: - - 1986 - proto: MachineCentrifuge entities: - uid: 2220 @@ -10984,43 +10973,28 @@ entities: - type: Transform pos: -8.5,2.5 parent: 407 - - type: DeviceLinkSink - links: - - 1759 - uid: 1652 components: - type: Transform pos: -10.5,2.5 parent: 407 - - type: DeviceLinkSink - links: - - 1759 - uid: 1803 components: - type: Transform rot: -1.5707963267948966 rad pos: -4.5,2.5 parent: 407 - - type: DeviceLinkSink - links: - - 2224 - uid: 2162 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,2.5 parent: 407 - - type: DeviceLinkSink - links: - - 2224 - uid: 2222 components: - type: Transform pos: -14.5,2.5 parent: 407 - - type: DeviceLinkSink - links: - - 2223 - proto: ShuttersRadiation entities: - uid: 1252 @@ -11029,27 +11003,18 @@ entities: rot: 1.5707963267948966 rad pos: -19.5,-0.5 parent: 407 - - type: DeviceLinkSink - links: - - 1255 - uid: 1253 components: - type: Transform rot: 1.5707963267948966 rad pos: -19.5,0.5 parent: 407 - - type: DeviceLinkSink - links: - - 1255 - uid: 1254 components: - type: Transform rot: 1.5707963267948966 rad pos: -19.5,1.5 parent: 407 - - type: DeviceLinkSink - links: - - 1255 - proto: ShuttersWindowOpen entities: - uid: 1650 @@ -11057,9 +11022,6 @@ entities: - type: Transform pos: -9.5,2.5 parent: 407 - - type: DeviceLinkSink - links: - - 1759 - proto: ShuttleWindow entities: - uid: 18 @@ -11555,7 +11517,7 @@ entities: - Pressed: Toggle 2162: - Pressed: Toggle -- proto: SignAtmosMinsky +- proto: SignAtmos entities: - uid: 1560 components: From a8c74ca4e1a49c1593b509aa3520a1635774fc87 Mon Sep 17 00:00:00 2001 From: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com> Date: Tue, 6 Aug 2024 03:49:23 +0000 Subject: [PATCH 209/422] add(emergency_omega): Add defib to medical treatment area (#30693) --- Resources/Maps/Shuttles/emergency_omega.yml | 104 ++------------------ 1 file changed, 8 insertions(+), 96 deletions(-) diff --git a/Resources/Maps/Shuttles/emergency_omega.yml b/Resources/Maps/Shuttles/emergency_omega.yml index 1af66e5389..ad9c8379da 100644 --- a/Resources/Maps/Shuttles/emergency_omega.yml +++ b/Resources/Maps/Shuttles/emergency_omega.yml @@ -675,15 +675,11 @@ entities: - type: Transform pos: 0.5,-0.5 parent: 603 - - type: AtmosDevice - joinedGrid: 603 - uid: 487 components: - type: Transform pos: -1.5,-0.5 parent: 603 - - type: AtmosDevice - joinedGrid: 603 - proto: AirlockCommandLocked entities: - uid: 473 @@ -892,155 +888,98 @@ entities: - type: Transform pos: -3.5,15.5 parent: 603 - - type: DeviceLinkSink - links: - - 602 - uid: 471 components: - type: Transform pos: -5.5,15.5 parent: 603 - - type: DeviceLinkSink - links: - - 602 - uid: 472 components: - type: Transform pos: -7.5,15.5 parent: 603 - - type: DeviceLinkSink - links: - - 602 - uid: 541 components: - type: Transform pos: -10.5,5.5 parent: 603 - - type: DeviceLinkSink - links: - - 555 - uid: 542 components: - type: Transform pos: -10.5,6.5 parent: 603 - - type: DeviceLinkSink - links: - - 555 - uid: 543 components: - type: Transform pos: -10.5,7.5 parent: 603 - - type: DeviceLinkSink - links: - - 555 - uid: 544 components: - type: Transform pos: -10.5,2.5 parent: 603 - - type: DeviceLinkSink - links: - - 555 - uid: 545 components: - type: Transform pos: 5.5,2.5 parent: 603 - - type: DeviceLinkSink - links: - - 555 - uid: 546 components: - type: Transform pos: 5.5,5.5 parent: 603 - - type: DeviceLinkSink - links: - - 555 - uid: 547 components: - type: Transform pos: 5.5,6.5 parent: 603 - - type: DeviceLinkSink - links: - - 555 - uid: 548 components: - type: Transform pos: 5.5,7.5 parent: 603 - - type: DeviceLinkSink - links: - - 555 - uid: 549 components: - type: Transform pos: 5.5,10.5 parent: 603 - - type: DeviceLinkSink - links: - - 555 - uid: 550 components: - type: Transform rot: -1.5707963267948966 rad pos: 3.5,15.5 parent: 603 - - type: DeviceLinkSink - links: - - 555 - uid: 551 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,15.5 parent: 603 - - type: DeviceLinkSink - links: - - 555 - uid: 552 components: - type: Transform pos: 0.5,14.5 parent: 603 - - type: DeviceLinkSink - links: - - 555 - uid: 553 components: - type: Transform pos: -0.5,14.5 parent: 603 - - type: DeviceLinkSink - links: - - 555 - uid: 554 components: - type: Transform pos: -1.5,14.5 parent: 603 - - type: DeviceLinkSink - links: - - 555 - uid: 556 components: - type: Transform pos: -1.5,8.5 parent: 603 - - type: DeviceLinkSink - links: - - 555 - uid: 557 components: - type: Transform pos: 0.5,8.5 parent: 603 - - type: DeviceLinkSink - links: - - 555 - proto: BoxSurvivalEngineering entities: - uid: 600 @@ -2262,6 +2201,14 @@ entities: - type: Transform pos: -3.4608088,12.544868 parent: 603 +- proto: DefibrillatorCabinetFilled + entities: + - uid: 605 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,0.5 + parent: 603 - proto: EmergencyLight entities: - uid: 434 @@ -2692,16 +2639,12 @@ entities: rot: -1.5707963267948966 rad pos: 0.5,-0.5 parent: 603 - - type: AtmosDevice - joinedGrid: 603 - uid: 486 components: - type: Transform rot: 1.5707963267948966 rad pos: -1.5,-0.5 parent: 603 - - type: AtmosDevice - joinedGrid: 603 - proto: GasPressurePump entities: - uid: 156 @@ -2710,8 +2653,6 @@ entities: rot: 3.141592653589793 rad pos: -0.5,0.5 parent: 603 - - type: AtmosDevice - joinedGrid: 603 - proto: GasVentPump entities: - uid: 89 @@ -2719,78 +2660,58 @@ entities: - type: Transform pos: -0.5,10.5 parent: 603 - - type: AtmosDevice - joinedGrid: 603 - uid: 135 components: - type: Transform rot: -1.5707963267948966 rad pos: 4.5,10.5 parent: 603 - - type: AtmosDevice - joinedGrid: 603 - uid: 147 components: - type: Transform rot: -1.5707963267948966 rad pos: 4.5,2.5 parent: 603 - - type: AtmosDevice - joinedGrid: 603 - uid: 171 components: - type: Transform pos: -0.5,2.5 parent: 603 - - type: AtmosDevice - joinedGrid: 603 - uid: 172 components: - type: Transform rot: 3.141592653589793 rad pos: -2.5,5.5 parent: 603 - - type: AtmosDevice - joinedGrid: 603 - uid: 342 components: - type: Transform rot: -1.5707963267948966 rad pos: -7.5,2.5 parent: 603 - - type: AtmosDevice - joinedGrid: 603 - uid: 373 components: - type: Transform rot: 1.5707963267948966 rad pos: -8.5,-1.5 parent: 603 - - type: AtmosDevice - joinedGrid: 603 - uid: 374 components: - type: Transform rot: 1.5707963267948966 rad pos: -9.5,6.5 parent: 603 - - type: AtmosDevice - joinedGrid: 603 - uid: 376 components: - type: Transform pos: -4.5,12.5 parent: 603 - - type: AtmosDevice - joinedGrid: 603 - uid: 396 components: - type: Transform rot: -1.5707963267948966 rad pos: -4.5,1.5 parent: 603 - - type: AtmosDevice - joinedGrid: 603 - proto: GeneratorBasic15kW entities: - uid: 214 @@ -3232,25 +3153,16 @@ entities: - type: Transform pos: -5.5,8.5 parent: 603 - - type: DeviceLinkSink - links: - - 602 - uid: 468 components: - type: Transform pos: -4.5,8.5 parent: 603 - - type: DeviceLinkSink - links: - - 602 - uid: 469 components: - type: Transform pos: -3.5,8.5 parent: 603 - - type: DeviceLinkSink - links: - - 602 - proto: ShuttleWindow entities: - uid: 76 From e477a49cc6392f1991520d50f067eaa5aacf2ac6 Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Tue, 6 Aug 2024 06:51:33 -0400 Subject: [PATCH 210/422] Make biofab distinct from biogen (#30696) * Make biofab distinct from biogen * biocube fabricator --- .../Objects/Devices/Circuitboards/Machine/production.yml | 4 ++-- Resources/Prototypes/Entities/Structures/Machines/lathe.yml | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml index 2e3df6e754..e48fb0a263 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/production.yml @@ -64,8 +64,8 @@ - type: entity id: BiofabricatorMachineCircuitboard parent: BaseMachineCircuitboard - name: biofabricator machine board - description: A machine printed circuit board for a biofabricator. + name: biocube fabricator machine board + description: A machine printed circuit board for a biocube fabricator. components: - type: MachineBoard prototype: Biofabricator diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 44d4224d6b..8f1ff07547 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -648,7 +648,7 @@ - type: entity id: Biofabricator parent: BaseLathe - name: biofabricator + name: biocube fabricator description: Produces animal cubes using biomass. components: - type: Sprite @@ -657,16 +657,20 @@ layers: - state: icon map: ["enum.LatheVisualLayers.IsRunning"] + color: "#ffaa99" - state: unlit shader: unshaded map: ["enum.PowerDeviceVisualLayers.Powered"] + color: "#ffaaaa" - state: inserting map: ["enum.MaterialStorageVisualLayers.Inserting"] + color: "#ffaaaa" - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: Machine board: BiofabricatorMachineCircuitboard - type: MaterialStorage + ignoreColor: true whitelist: tags: - Sheet From fb994e8d2119d78747fe58867ee6d8e08df94db3 Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Tue, 6 Aug 2024 13:51:59 +0300 Subject: [PATCH 211/422] Add comment into jetpack system, to prevent future grid jetpack PRs (#30682) Update SharedJetpackSystem.cs --- Content.Shared/Movement/Systems/SharedJetpackSystem.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Content.Shared/Movement/Systems/SharedJetpackSystem.cs b/Content.Shared/Movement/Systems/SharedJetpackSystem.cs index 276aa62032..548594c01f 100644 --- a/Content.Shared/Movement/Systems/SharedJetpackSystem.cs +++ b/Content.Shared/Movement/Systems/SharedJetpackSystem.cs @@ -125,6 +125,8 @@ public abstract class SharedJetpackSystem : EntitySystem private bool CanEnableOnGrid(EntityUid? gridUid) { + // No and no again! Do not attempt to activate the jetpack on a grid with gravity disabled. You will not be the first or the last to try this. + // https://discord.com/channels/310555209753690112/310555209753690112/1270067921682694234 return gridUid == null || (!HasComp(gridUid)); } From 26ad8981055bb07fc1bbfb9b17a5f417ea22d9d4 Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 6 Aug 2024 10:52:42 +0000 Subject: [PATCH 212/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index c6d82d45a9..25f67a78a1 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,13 +1,4 @@ Entries: -- author: FairlySadPanda - changes: - - message: Weapons that deflect shots, like the e-sword, now are most effective - at doing so when standing still, with moving or sprinting making the deflection - chance worse. - type: Tweak - id: 6548 - time: '2024-05-07T18:14:59.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27219 - author: deltanedas changes: - message: Lathes can now be sped up by using Space Lube. @@ -3784,3 +3775,10 @@ id: 7047 time: '2024-08-05T08:07:02.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29692 +- author: EmoGarbage404 + changes: + - message: The biogenerator has been recolored and renamed to the "biocube fabricator." + type: Tweak + id: 7048 + time: '2024-08-06T10:51:33.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30696 From 9522dbc655c19b5154b98a4adce6546897d95042 Mon Sep 17 00:00:00 2001 From: Errant <35878406+Errant-4@users.noreply.github.com> Date: Tue, 6 Aug 2024 12:58:28 +0200 Subject: [PATCH 213/422] Vox nukies and ninjafix (#29783) * Nukie species gear * antagselectionsystem autointernals * nukie vox * skrek * Remove duplicate code * skrek * EVA tank loadouts, vox ninja update * fix prototype duplication * skrek * fix summary * fixed empty startinggear error * enable vox ninjas * Comments * removed comment because startinggearprototype should not be used on antagselection aaaanyway * squish that if * Update Content.Shared/Clothing/LoadoutSystem.cs --------- Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> --- Content.Server/Antag/AntagSelectionSystem.cs | 15 ++++++++- .../Components/AntagSelectionComponent.cs | 7 +++++ Content.Shared/Clothing/LoadoutSystem.cs | 31 ++++++++++++++----- .../en-US/preferences/loadout-groups.ftl | 1 + Resources/Prototypes/GameRules/events.yml | 6 ++-- Resources/Prototypes/GameRules/roundstart.yml | 8 ++++- .../Loadouts/Miscellaneous/survival.yml | 21 +++++++++++-- .../Prototypes/Loadouts/loadout_groups.yml | 18 ++++++++--- .../Prototypes/Loadouts/role_loadouts.yml | 6 ++++ Resources/Prototypes/Roles/Antags/ninja.yml | 2 -- Resources/Prototypes/Roles/Antags/nukeops.yml | 2 -- 11 files changed, 92 insertions(+), 25 deletions(-) diff --git a/Content.Server/Antag/AntagSelectionSystem.cs b/Content.Server/Antag/AntagSelectionSystem.cs index 496fcbb550..64b26509c4 100644 --- a/Content.Server/Antag/AntagSelectionSystem.cs +++ b/Content.Server/Antag/AntagSelectionSystem.cs @@ -13,11 +13,14 @@ using Content.Server.Roles.Jobs; using Content.Server.Shuttles.Components; using Content.Server.Station.Systems; using Content.Shared.Antag; +using Content.Shared.Clothing; using Content.Shared.GameTicking; using Content.Shared.GameTicking.Components; using Content.Shared.Ghost; using Content.Shared.Humanoid; using Content.Shared.Players; +using Content.Shared.Preferences.Loadouts; +using Content.Shared.Roles; using Content.Shared.Whitelist; using Robust.Server.Audio; using Robust.Server.GameObjects; @@ -25,6 +28,7 @@ using Robust.Server.Player; using Robust.Shared.Enums; using Robust.Shared.Map; using Robust.Shared.Player; +using Robust.Shared.Prototypes; using Robust.Shared.Random; using Robust.Shared.Utility; @@ -35,10 +39,13 @@ public sealed partial class AntagSelectionSystem : GameRuleSystem>? gear = new(); + if (def.StartingGear is not null) + gear.Add(def.StartingGear.Value); + + _loadout.Equip(player, gear, def.RoleLoadout); if (session != null) { diff --git a/Content.Server/Antag/Components/AntagSelectionComponent.cs b/Content.Server/Antag/Components/AntagSelectionComponent.cs index 1ab16e8aec..0e5a0afc9b 100644 --- a/Content.Server/Antag/Components/AntagSelectionComponent.cs +++ b/Content.Server/Antag/Components/AntagSelectionComponent.cs @@ -1,6 +1,7 @@ using Content.Server.Administration.Systems; using Content.Shared.Antag; using Content.Shared.Destructible.Thresholds; +using Content.Shared.Preferences.Loadouts; using Content.Shared.Roles; using Content.Shared.Storage; using Content.Shared.Whitelist; @@ -154,6 +155,12 @@ public partial struct AntagSelectionDefinition() [DataField] public ProtoId? StartingGear; + /// + /// A list of role loadouts, from which a randomly selected one will be equipped. + /// + [DataField] + public List>? RoleLoadout; + /// /// A briefing shown to the player. /// diff --git a/Content.Shared/Clothing/LoadoutSystem.cs b/Content.Shared/Clothing/LoadoutSystem.cs index 7605845626..2a686efd4f 100644 --- a/Content.Shared/Clothing/LoadoutSystem.cs +++ b/Content.Shared/Clothing/LoadoutSystem.cs @@ -139,22 +139,37 @@ public sealed class LoadoutSystem : EntitySystem private void OnMapInit(EntityUid uid, LoadoutComponent component, MapInitEvent args) { - // Use starting gear if specified - if (component.StartingGear != null) + Equip(uid, component.StartingGear, component.RoleLoadout); + } + + public void Equip(EntityUid uid, List>? startingGear, + List>? loadoutGroups) + { + // First, randomly pick a startingGear profile from those specified, and equip it. + if (startingGear != null && startingGear.Count > 0) + _station.EquipStartingGear(uid, _random.Pick(startingGear)); + + if (loadoutGroups == null) { - _station.EquipStartingGear(uid, _random.Pick(component.StartingGear)); + GearEquipped(uid); return; } - if (component.RoleLoadout == null) - return; - - // ...otherwise equip from role loadout - var id = _random.Pick(component.RoleLoadout); + // Then, randomly pick a RoleLoadout profile from those specified, and process/equip all LoadoutGroups from it. + // For non-roundstart mobs there is no SelectedLoadout data, so minValue must be set in each LoadoutGroup to force selection. + var id = _random.Pick(loadoutGroups); var proto = _protoMan.Index(id); var loadout = new RoleLoadout(id); loadout.SetDefault(GetProfile(uid), _actors.GetSession(uid), _protoMan, true); _station.EquipRoleLoadout(uid, loadout, proto); + + GearEquipped(uid); + } + + public void GearEquipped(EntityUid uid) + { + var ev = new StartingGearEquippedEvent(uid); + RaiseLocalEvent(uid, ref ev); } public HumanoidCharacterProfile GetProfile(EntityUid? uid) diff --git a/Resources/Locale/en-US/preferences/loadout-groups.ftl b/Resources/Locale/en-US/preferences/loadout-groups.ftl index 28785e305c..b1fba215d9 100644 --- a/Resources/Locale/en-US/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/preferences/loadout-groups.ftl @@ -14,6 +14,7 @@ loadout-group-survival-security = Security Survival Box loadout-group-survival-syndicate = Github is forcing me to write text that is literally twice-impossible for the player to ever see, send help loadout-group-breath-tool = Species-dependent breath tools loadout-group-tank-harness = Species-specific survival equipment +loadout-group-EVA-tank = Species-specific gas tank # Command loadout-group-captain-head = Captain head diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml index 01a9f00257..fe9d6410d0 100644 --- a/Resources/Prototypes/GameRules/events.yml +++ b/Resources/Prototypes/GameRules/events.yml @@ -151,10 +151,6 @@ minimumPlayers: 30 - type: SpaceSpawnRule - type: AntagLoadProfileRule - # Vox disabled until loadouts work on AntagSelection-based spawns - speciesOverride: Human - speciesOverrideBlacklist: - - Vox - type: AntagObjectives objectives: - StealResearchObjective @@ -171,6 +167,8 @@ max: 1 pickPlayer: false startingGear: SpaceNinjaGear + roleLoadout: + - RoleSurvivalEVA briefing: text: ninja-role-greeting color: Green diff --git a/Resources/Prototypes/GameRules/roundstart.yml b/Resources/Prototypes/GameRules/roundstart.yml index 3e4ea6d7b3..a10a6c8d2a 100644 --- a/Resources/Prototypes/GameRules/roundstart.yml +++ b/Resources/Prototypes/GameRules/roundstart.yml @@ -86,7 +86,7 @@ #Species that do not work with nukies should be included in this list. #Once the issues are fixed the species should be removed from this list to be enabled. #Balance concerns are not a valid reason to disable a species, except for high-impact Nukie-specific exploits. - - Vox + #- Vox - type: entity parent: BaseNukeopsRule @@ -103,6 +103,8 @@ fallbackRoles: [ Nukeops, NukeopsMedic ] spawnerPrototype: SpawnPointNukeopsCommander startingGear: SyndicateCommanderGearFull + roleLoadout: + - RoleSurvivalSyndicate components: - type: NukeOperative - type: RandomMetadata @@ -119,6 +121,8 @@ fallbackRoles: [ Nukeops, NukeopsCommander ] spawnerPrototype: SpawnPointNukeopsMedic startingGear: SyndicateOperativeMedicFull + roleLoadout: + - RoleSurvivalSyndicate components: - type: NukeOperative - type: RandomMetadata @@ -137,6 +141,8 @@ max: 3 playerRatio: 10 startingGear: SyndicateOperativeGearFull + roleLoadout: + - RoleSurvivalSyndicate components: - type: NukeOperative - type: RandomMetadata diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml b/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml index d308c62506..001e8a188e 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml @@ -142,15 +142,32 @@ # Pre-equipped species gear -# Full Tank Equipped +# Full tank for vox as part of any Survival loadout - type: loadout - id: LoadoutSpeciesEVANitrogen + id: LoadoutSpeciesVoxNitrogen effects: - !type:GroupLoadoutEffect proto: EffectSpeciesVox equipment: suitstorage: NitrogenTankFilled +# Full EVA Tank, Any Species +- type: loadout + id: LoadoutSpeciesEVANitrogen + effects: + - !type:GroupLoadoutEffect + proto: NitrogenBreather + equipment: + suitstorage: NitrogenTankFilled + +- type: loadout + id: LoadoutSpeciesEVAOxygen + effects: + - !type:GroupLoadoutEffect + proto: OxygenBreather + equipment: + suitstorage: OxygenTankFilled + # Tank Harness - type: loadout id: LoadoutTankHarness diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index b1d267cc00..1df741b3c7 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -51,7 +51,15 @@ loadouts: - EmergencyNitrogen - EmergencyOxygen + - LoadoutSpeciesVoxNitrogen + +- type: loadoutGroup + id: GroupEVATank + name: loadout-group-EVA-tank + hidden: true + loadouts: - LoadoutSpeciesEVANitrogen + - LoadoutSpeciesEVAOxygen # Command - type: loadoutGroup @@ -423,7 +431,7 @@ loadouts: - EmergencyNitrogenClown - EmergencyOxygenClown - - LoadoutSpeciesEVANitrogen + - LoadoutSpeciesVoxNitrogen - type: loadoutGroup id: MimeHead @@ -746,7 +754,7 @@ loadouts: - EmergencyNitrogenExtended - EmergencyOxygenExtended - - LoadoutSpeciesEVANitrogen + - LoadoutSpeciesVoxNitrogen # Science - type: loadoutGroup @@ -1026,7 +1034,7 @@ loadouts: - EmergencyNitrogenSecurity - EmergencyOxygenSecurity - - LoadoutSpeciesEVANitrogen + - LoadoutSpeciesVoxNitrogen # Medical - type: loadoutGroup @@ -1208,7 +1216,7 @@ loadouts: - EmergencyNitrogenMedical - EmergencyOxygenMedical - - LoadoutSpeciesEVANitrogen + - LoadoutSpeciesVoxNitrogen # Wildcards - type: loadoutGroup @@ -1243,7 +1251,7 @@ loadouts: - EmergencyNitrogenSyndicate - EmergencyOxygenSyndicate - - LoadoutSpeciesEVANitrogen + - LoadoutSpeciesVoxNitrogen - type: loadoutGroup id: GroupSpeciesBreathTool diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index bb30cc182a..c204f87c93 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -550,3 +550,9 @@ - SurvivalSyndicate - GroupSpeciesBreathTool - GroupTankHarness + +- type: roleLoadout + id: RoleSurvivalEVA + groups: + - GroupEVATank + - SurvivalExtended diff --git a/Resources/Prototypes/Roles/Antags/ninja.yml b/Resources/Prototypes/Roles/Antags/ninja.yml index 6df8a2317e..6a9a65bb13 100644 --- a/Resources/Prototypes/Roles/Antags/ninja.yml +++ b/Resources/Prototypes/Roles/Antags/ninja.yml @@ -23,12 +23,10 @@ pocket1: SpiderCharge pocket2: PinpointerStation belt: EnergyKatana - suitstorage: OxygenTankFilled inhand: - JetpackBlackFilled storage: back: # belt holds katana so satchel has the tools for sabotaging things - - BoxSurvival - Crowbar - Wrench - Screwdriver diff --git a/Resources/Prototypes/Roles/Antags/nukeops.yml b/Resources/Prototypes/Roles/Antags/nukeops.yml index 8dec692ee5..52d422876f 100644 --- a/Resources/Prototypes/Roles/Antags/nukeops.yml +++ b/Resources/Prototypes/Roles/Antags/nukeops.yml @@ -55,7 +55,6 @@ belt: ClothingBeltMilitaryWebbing storage: back: - - BoxSurvivalSyndicate - WeaponPistolViper - PinpointerSyndicateNuclear - DeathAcidifierImplanter @@ -90,7 +89,6 @@ storage: back: - SyndiHypo - - BoxSurvivalSyndicate - SawAdvanced - Cautery - CombatKnife From 53719bded3badfe50c48e0bf7a5ba5c424bc5a80 Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Tue, 6 Aug 2024 06:59:37 -0400 Subject: [PATCH 214/422] better examine text for radiation collectors (#30606) * better examine text for radiation collectors * this? * penis --- .../EntitySystems/RadiationCollectorSystem.cs | 19 ++++++++++++++----- .../power/components/radiation-collector.ftl | 13 +++++++++++-- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/Content.Server/Singularity/EntitySystems/RadiationCollectorSystem.cs b/Content.Server/Singularity/EntitySystems/RadiationCollectorSystem.cs index 9107ff2e32..c262988c86 100644 --- a/Content.Server/Singularity/EntitySystems/RadiationCollectorSystem.cs +++ b/Content.Server/Singularity/EntitySystems/RadiationCollectorSystem.cs @@ -137,13 +137,22 @@ public sealed class RadiationCollectorSystem : EntitySystem private void OnExamined(EntityUid uid, RadiationCollectorComponent component, ExaminedEvent args) { - if (!TryGetLoadedGasTank(uid, out var gasTank)) + using (args.PushGroup(nameof(RadiationCollectorComponent))) { - args.PushMarkup(Loc.GetString("power-radiation-collector-gas-tank-missing")); - return; - } + args.PushMarkup(Loc.GetString("power-radiation-collector-enabled", ("state", component.Enabled))); - args.PushMarkup(Loc.GetString("power-radiation-collector-gas-tank-present")); + if (!TryGetLoadedGasTank(uid, out var gasTank)) + { + args.PushMarkup(Loc.GetString("power-radiation-collector-gas-tank-missing")); + } + else + { + _appearance.TryGetData(uid, RadiationCollectorVisuals.PressureState, out var state); + + args.PushMarkup(Loc.GetString("power-radiation-collector-gas-tank-present", + ("fullness", state))); + } + } } private void OnAnalyzed(EntityUid uid, RadiationCollectorComponent component, GasAnalyzerScanEvent args) diff --git a/Resources/Locale/en-US/power/components/radiation-collector.ftl b/Resources/Locale/en-US/power/components/radiation-collector.ftl index c38050f1e0..199b3789ae 100644 --- a/Resources/Locale/en-US/power/components/radiation-collector.ftl +++ b/Resources/Locale/en-US/power/components/radiation-collector.ftl @@ -1,2 +1,11 @@ -power-radiation-collector-gas-tank-missing = [color=darkred]No plasma tank attached.[/color] -power-radiation-collector-gas-tank-present = A plasma tank is [color=darkgreen]connected[/color]. \ No newline at end of file +power-radiation-collector-gas-tank-missing = The plasma tank slot is [color=darkred]empty[/color]. +power-radiation-collector-gas-tank-present = The plasma tank slot is [color=darkgreen]filled[/color] and the tank indicator reads [color={$fullness -> + *[0]red]empty + [1]red]low + [2]yellow]half-full + [3]lime]full +}[/color]. +power-radiation-collector-enabled = It's switched [color={$state -> + [true] darkgreen]on + *[false] darkred]off +}[/color]. From 4426ce123ad53c449db21d36f8bc1b4726b276c5 Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 6 Aug 2024 10:59:35 +0000 Subject: [PATCH 215/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 25f67a78a1..422496fe2f 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: deltanedas - changes: - - message: Lathes can now be sped up by using Space Lube. - type: Tweak - id: 6549 - time: '2024-05-07T18:20:44.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/25515 - author: OnsenCapy changes: - message: Combat gloves now have their own unique sprite. @@ -3782,3 +3775,10 @@ id: 7048 time: '2024-08-06T10:51:33.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30696 +- author: Errant + changes: + - message: Vox can be nukies and ninjas again. + type: Tweak + id: 7049 + time: '2024-08-06T10:58:29.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29783 From 7117b925a5591fa6f929e2a77400f5bbac41d7fe Mon Sep 17 00:00:00 2001 From: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Date: Tue, 6 Aug 2024 13:00:15 +0200 Subject: [PATCH 216/422] Add whitelist to cryostorage (#30574) --- .../Bed/Cryostorage/CanEnterCryostorageComponent.cs | 10 ++++++++++ .../Bed/Cryostorage/SharedCryostorageSystem.cs | 2 +- Resources/Prototypes/Entities/Mobs/Species/base.yml | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 Content.Shared/Bed/Cryostorage/CanEnterCryostorageComponent.cs diff --git a/Content.Shared/Bed/Cryostorage/CanEnterCryostorageComponent.cs b/Content.Shared/Bed/Cryostorage/CanEnterCryostorageComponent.cs new file mode 100644 index 0000000000..2e5b200055 --- /dev/null +++ b/Content.Shared/Bed/Cryostorage/CanEnterCryostorageComponent.cs @@ -0,0 +1,10 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.Bed.Cryostorage; + +/// +/// Serves as a whitelist that allows an entity with this component to enter cryostorage. +/// It will also require MindContainerComponent. +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class CanEnterCryostorageComponent : Component { } diff --git a/Content.Shared/Bed/Cryostorage/SharedCryostorageSystem.cs b/Content.Shared/Bed/Cryostorage/SharedCryostorageSystem.cs index c3fa21e293..f6b7a34785 100644 --- a/Content.Shared/Bed/Cryostorage/SharedCryostorageSystem.cs +++ b/Content.Shared/Bed/Cryostorage/SharedCryostorageSystem.cs @@ -89,7 +89,7 @@ public abstract class SharedCryostorageSystem : EntitySystem return; } - if (!TryComp(args.EntityUid, out var mindContainer)) + if (!HasComp(args.EntityUid) || !TryComp(args.EntityUid, out var mindContainer)) { args.Cancel(); return; diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml index af309e93ad..4a14b5332e 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/base.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml @@ -167,6 +167,7 @@ - type: Dna - type: MindContainer showExamineInfo: true + - type: CanEnterCryostorage - type: InteractionPopup successChance: 1 interactSuccessString: hugging-success-generic From 7b3ff001297cc2722391dddb54674a7fc5d9cdcb Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 6 Aug 2024 11:01:21 +0000 Subject: [PATCH 217/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 422496fe2f..57acec494a 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,13 +1,4 @@ Entries: -- author: OnsenCapy - changes: - - message: Combat gloves now have their own unique sprite. - type: Tweak - - message: Combat gloves now have heat resistance to match their fireproof description. - type: Tweak - id: 6550 - time: '2024-05-08T00:19:55.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27373 - author: deltanedas changes: - message: Dragons can now breathe fire. @@ -3782,3 +3773,10 @@ id: 7049 time: '2024-08-06T10:58:29.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29783 +- author: slarticodefast + changes: + - message: Fixed borgs, animals and aghosts being able to enter cryosleep. + type: Fix + id: 7050 + time: '2024-08-06T11:00:15.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30574 From a87efd7d0157a0c4074e639b1da923f5c335f663 Mon Sep 17 00:00:00 2001 From: Plykiya <58439124+Plykiya@users.noreply.github.com> Date: Tue, 6 Aug 2024 04:02:01 -0700 Subject: [PATCH 218/422] Replace xform.WorldPosition with xformSystem method for Setting/Getting (#30029) * GET WORLD POSITON, ROTATION * Missing parentheses * ui system depndency * the issue * Unused * Let the function do the transform --------- Co-authored-by: plykiya --- Content.Client/Chat/UI/SpeechBubble.cs | 4 +++- Content.Client/Explosion/ExplosionOverlay.cs | 4 +++- Content.Client/Fluids/PuddleOverlay.cs | 6 ++++-- Content.Client/Interaction/DragDropSystem.cs | 3 ++- Content.Client/Maps/GridDraggingSystem.cs | 5 +++-- Content.Client/NPC/HTN/HTNOverlay.cs | 4 +++- Content.Client/NPC/NPCSteeringSystem.cs | 4 +++- .../NetworkConfiguratorLinkOverlay.cs | 4 +++- .../NodeContainer/NodeVisualizationOverlay.cs | 4 +++- Content.Client/Outline/TargetOutlineSystem.cs | 5 +++-- Content.Client/Stealth/StealthSystem.cs | 3 ++- Content.Client/Tabletop/TabletopSystem.cs | 3 ++- .../Systems/Viewport/ViewportUIController.cs | 1 - .../Weapons/Melee/MeleeWeaponSystem.Effects.cs | 4 ++-- .../AtmosphereSystem.HighPressureDelta.cs | 2 +- .../Chemistry/EntitySystems/VaporSystem.cs | 3 ++- Content.Server/Commands/CommandUtils.cs | 13 ++++++++----- .../DeviceNetwork/Systems/WirelessNetworkSystem.cs | 4 +++- Content.Server/Dragon/DragonSystem.cs | 2 +- .../EntitySystems/ExplosionSystem.GridMap.cs | 2 +- .../Explosion/EntitySystems/ExplosionSystem.cs | 2 +- Content.Server/Hands/Systems/HandsSystem.cs | 2 +- Content.Server/Maps/GridDraggingSystem.cs | 5 ++--- .../Equipment/EntitySystems/MechGrabberSystem.cs | 4 ++-- Content.Server/Movement/StressTestMovementSystem.cs | 2 +- .../Pointing/EntitySystems/RoguePointingSystem.cs | 12 +++++++----- Content.Server/Respawn/SpecialRespawnSystem.cs | 4 ++-- .../EntitySystems/RevenantSystem.Abilities.cs | 3 ++- .../ContainmentFieldGeneratorSystem.cs | 3 ++- .../EntitySystems/ContainmentFieldSystem.cs | 7 ++++--- .../Solar/EntitySystems/PowerSolarSystem.cs | 7 ++++--- Content.Server/Worldgen/Systems/BaseWorldSystem.cs | 7 ++++--- .../Effects/Systems/ThrowArtifactSystem.cs | 4 ++-- .../Construction/Conditions/WallmountCondition.cs | 4 ++-- Content.Shared/Tiles/FloorTileSystem.cs | 2 +- 35 files changed, 89 insertions(+), 59 deletions(-) diff --git a/Content.Client/Chat/UI/SpeechBubble.cs b/Content.Client/Chat/UI/SpeechBubble.cs index 68c937a788..adb61d10e6 100644 --- a/Content.Client/Chat/UI/SpeechBubble.cs +++ b/Content.Client/Chat/UI/SpeechBubble.cs @@ -16,6 +16,7 @@ namespace Content.Client.Chat.UI [Dependency] private readonly IEyeManager _eyeManager = default!; [Dependency] private readonly IEntityManager _entityManager = default!; [Dependency] protected readonly IConfigurationManager ConfigManager = default!; + private readonly SharedTransformSystem _transformSystem; public enum SpeechType : byte { @@ -83,6 +84,7 @@ namespace Content.Client.Chat.UI { IoCManager.InjectDependencies(this); _senderEntity = senderEntity; + _transformSystem = _entityManager.System(); // Use text clipping so new messages don't overlap old ones being pushed up. RectClipContent = true; @@ -140,7 +142,7 @@ namespace Content.Client.Chat.UI } var offset = (-_eyeManager.CurrentEye.Rotation).ToWorldVec() * -EntityVerticalOffset; - var worldPos = xform.WorldPosition + offset; + var worldPos = _transformSystem.GetWorldPosition(xform) + offset; var lowerCenter = _eyeManager.WorldToScreen(worldPos) / UIScale; var screenPos = lowerCenter - new Vector2(ContentSize.X / 2, ContentSize.Y + _verticalOffsetAchieved); diff --git a/Content.Client/Explosion/ExplosionOverlay.cs b/Content.Client/Explosion/ExplosionOverlay.cs index 653f63e0f9..a005d0317b 100644 --- a/Content.Client/Explosion/ExplosionOverlay.cs +++ b/Content.Client/Explosion/ExplosionOverlay.cs @@ -16,6 +16,7 @@ public sealed class ExplosionOverlay : Overlay [Dependency] private readonly IRobustRandom _robustRandom = default!; [Dependency] private readonly IEntityManager _entMan = default!; [Dependency] private readonly IPrototypeManager _proto = default!; + private readonly SharedTransformSystem _transformSystem; private SharedAppearanceSystem _appearance; public override OverlaySpace Space => OverlaySpace.WorldSpaceBelowFOV; @@ -26,6 +27,7 @@ public sealed class ExplosionOverlay : Overlay { IoCManager.InjectDependencies(this); _shader = _proto.Index("unshaded").Instance(); + _transformSystem = _entMan.System(); _appearance = appearanceSystem; } @@ -68,7 +70,7 @@ public sealed class ExplosionOverlay : Overlay continue; var xform = xforms.GetComponent(gridId); - var (_, _, worldMatrix, invWorldMatrix) = xform.GetWorldPositionRotationMatrixWithInv(xforms); + var (_, _, worldMatrix, invWorldMatrix) = _transformSystem.GetWorldPositionRotationMatrixWithInv(xform, xforms); gridBounds = invWorldMatrix.TransformBox(worldBounds).Enlarged(grid.TileSize * 2); drawHandle.SetTransform(worldMatrix); diff --git a/Content.Client/Fluids/PuddleOverlay.cs b/Content.Client/Fluids/PuddleOverlay.cs index a8c1d35510..caa5a92580 100644 --- a/Content.Client/Fluids/PuddleOverlay.cs +++ b/Content.Client/Fluids/PuddleOverlay.cs @@ -14,6 +14,7 @@ public sealed class PuddleOverlay : Overlay [Dependency] private readonly IEntityManager _entityManager = default!; [Dependency] private readonly IEntitySystemManager _entitySystemManager = default!; private readonly PuddleDebugOverlaySystem _debugOverlaySystem; + private readonly SharedTransformSystem _transformSystem; private readonly Color _heavyPuddle = new(0, 255, 255, 50); private readonly Color _mediumPuddle = new(0, 150, 255, 50); @@ -29,6 +30,7 @@ public sealed class PuddleOverlay : Overlay _debugOverlaySystem = _entitySystemManager.GetEntitySystem(); var cache = IoCManager.Resolve(); _font = new VectorFont(cache.GetResource("/Fonts/NotoSans/NotoSans-Regular.ttf"), 8); + _transformSystem = _entityManager.System(); } protected override void Draw(in OverlayDrawArgs args) @@ -56,7 +58,7 @@ public sealed class PuddleOverlay : Overlay continue; var gridXform = xformQuery.GetComponent(gridId); - var (_, _, worldMatrix, invWorldMatrix) = gridXform.GetWorldPositionRotationMatrixWithInv(xformQuery); + var (_, _, worldMatrix, invWorldMatrix) = _transformSystem.GetWorldPositionRotationMatrixWithInv(gridXform, xformQuery); gridBounds = invWorldMatrix.TransformBox(args.WorldBounds).Enlarged(mapGrid.TileSize * 2); drawHandle.SetTransform(worldMatrix); @@ -89,7 +91,7 @@ public sealed class PuddleOverlay : Overlay continue; var gridXform = xformQuery.GetComponent(gridId); - var (_, _, matrix, invMatrix) = gridXform.GetWorldPositionRotationMatrixWithInv(xformQuery); + var (_, _, matrix, invMatrix) = _transformSystem.GetWorldPositionRotationMatrixWithInv(gridXform, xformQuery); var gridBounds = invMatrix.TransformBox(args.WorldBounds).Enlarged(mapGrid.TileSize * 2); foreach (var debugOverlayData in _debugOverlaySystem.GetData(gridId)) diff --git a/Content.Client/Interaction/DragDropSystem.cs b/Content.Client/Interaction/DragDropSystem.cs index d249766bbc..aab6a62776 100644 --- a/Content.Client/Interaction/DragDropSystem.cs +++ b/Content.Client/Interaction/DragDropSystem.cs @@ -42,6 +42,7 @@ public sealed class DragDropSystem : SharedDragDropSystem [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!; [Dependency] private readonly EntityLookupSystem _lookup = default!; [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private readonly SharedTransformSystem _transformSystem = default!; // how often to recheck possible targets (prevents calling expensive // check logic each update) @@ -551,7 +552,7 @@ public sealed class DragDropSystem : SharedDragDropSystem if (Exists(_dragShadow)) { var mousePos = _eyeManager.PixelToMap(_inputManager.MouseScreenPosition); - Transform(_dragShadow.Value).WorldPosition = mousePos.Position; + _transformSystem.SetWorldPosition(_dragShadow.Value, mousePos.Position); } } } diff --git a/Content.Client/Maps/GridDraggingSystem.cs b/Content.Client/Maps/GridDraggingSystem.cs index 5e9250f0ce..5bbf5ff500 100644 --- a/Content.Client/Maps/GridDraggingSystem.cs +++ b/Content.Client/Maps/GridDraggingSystem.cs @@ -18,6 +18,7 @@ public sealed class GridDraggingSystem : SharedGridDraggingSystem [Dependency] private readonly IInputManager _inputManager = default!; [Dependency] private readonly IMapManager _mapManager = default!; [Dependency] private readonly InputSystem _inputSystem = default!; + [Dependency] private readonly SharedTransformSystem _transformSystem = default!; public bool Enabled { get; set; } @@ -62,11 +63,11 @@ public sealed class GridDraggingSystem : SharedGridDraggingSystem if (_dragging == null) return; if (_lastMousePosition != null && TryComp(_dragging.Value, out TransformComponent? xform) && - TryComp(_dragging.Value, out var body) && + TryComp(_dragging.Value, out _) && xform.MapID == _lastMousePosition.Value.MapId) { var tickTime = _gameTiming.TickPeriod; - var distance = _lastMousePosition.Value.Position - xform.WorldPosition; + var distance = _lastMousePosition.Value.Position - _transformSystem.GetWorldPosition(xform); RaiseNetworkEvent(new GridDragVelocityRequest() { Grid = GetNetEntity(_dragging.Value), diff --git a/Content.Client/NPC/HTN/HTNOverlay.cs b/Content.Client/NPC/HTN/HTNOverlay.cs index ad173f3b29..2cb02f1086 100644 --- a/Content.Client/NPC/HTN/HTNOverlay.cs +++ b/Content.Client/NPC/HTN/HTNOverlay.cs @@ -9,6 +9,7 @@ public sealed class HTNOverlay : Overlay { private readonly IEntityManager _entManager = default!; private readonly Font _font = default!; + private readonly SharedTransformSystem _transformSystem; public override OverlaySpace Space => OverlaySpace.ScreenSpace; @@ -16,6 +17,7 @@ public sealed class HTNOverlay : Overlay { _entManager = entManager; _font = new VectorFont(resourceCache.GetResource("/Fonts/NotoSans/NotoSans-Regular.ttf"), 10); + _transformSystem = _entManager.System(); } protected override void Draw(in OverlayDrawArgs args) @@ -30,7 +32,7 @@ public sealed class HTNOverlay : Overlay if (string.IsNullOrEmpty(comp.DebugText) || xform.MapID != args.MapId) continue; - var worldPos = xform.WorldPosition; + var worldPos = _transformSystem.GetWorldPosition(xform); if (!args.WorldAABB.Contains(worldPos)) continue; diff --git a/Content.Client/NPC/NPCSteeringSystem.cs b/Content.Client/NPC/NPCSteeringSystem.cs index bb2145bce0..eda3d74cf7 100644 --- a/Content.Client/NPC/NPCSteeringSystem.cs +++ b/Content.Client/NPC/NPCSteeringSystem.cs @@ -81,10 +81,12 @@ public sealed class NPCSteeringOverlay : Overlay public override OverlaySpace Space => OverlaySpace.WorldSpace; private readonly IEntityManager _entManager; + private readonly SharedTransformSystem _transformSystem; public NPCSteeringOverlay(IEntityManager entManager) { _entManager = entManager; + _transformSystem = _entManager.System(); } protected override void Draw(in OverlayDrawArgs args) @@ -96,7 +98,7 @@ public sealed class NPCSteeringOverlay : Overlay continue; } - var (worldPos, worldRot) = xform.GetWorldPositionRotation(); + var (worldPos, worldRot) = _transformSystem.GetWorldPositionRotation(xform); if (!args.WorldAABB.Contains(worldPos)) continue; diff --git a/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkOverlay.cs b/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkOverlay.cs index 4fcdada868..19da5aa959 100644 --- a/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkOverlay.cs +++ b/Content.Client/NetworkConfigurator/NetworkConfiguratorLinkOverlay.cs @@ -12,6 +12,7 @@ public sealed class NetworkConfiguratorLinkOverlay : Overlay [Dependency] private readonly IEntityManager _entityManager = default!; [Dependency] private readonly IRobustRandom _random = default!; private readonly DeviceListSystem _deviceListSystem; + private readonly SharedTransformSystem _transformSystem; public Dictionary Colors = new(); public EntityUid? Action; @@ -23,6 +24,7 @@ public sealed class NetworkConfiguratorLinkOverlay : Overlay IoCManager.InjectDependencies(this); _deviceListSystem = _entityManager.System(); + _transformSystem = _entityManager.System(); } protected override void Draw(in OverlayDrawArgs args) @@ -66,7 +68,7 @@ public sealed class NetworkConfiguratorLinkOverlay : Overlay continue; } - args.WorldHandle.DrawLine(sourceTransform.WorldPosition, linkTransform.WorldPosition, Colors[uid]); + args.WorldHandle.DrawLine(_transformSystem.GetWorldPosition(sourceTransform), _transformSystem.GetWorldPosition(linkTransform), Colors[uid]); } } } diff --git a/Content.Client/NodeContainer/NodeVisualizationOverlay.cs b/Content.Client/NodeContainer/NodeVisualizationOverlay.cs index 4e8a4a10ca..b0bdf8ed87 100644 --- a/Content.Client/NodeContainer/NodeVisualizationOverlay.cs +++ b/Content.Client/NodeContainer/NodeVisualizationOverlay.cs @@ -20,6 +20,7 @@ namespace Content.Client.NodeContainer private readonly IMapManager _mapManager; private readonly IInputManager _inputManager; private readonly IEntityManager _entityManager; + private readonly SharedTransformSystem _transformSystem; private readonly Dictionary<(int, int), NodeRenderData> _nodeIndex = new(); private readonly Dictionary>> _gridIndex = new (); @@ -46,6 +47,7 @@ namespace Content.Client.NodeContainer _mapManager = mapManager; _inputManager = inputManager; _entityManager = entityManager; + _transformSystem = _entityManager.System(); _font = cache.GetFont("/Fonts/NotoSans/NotoSans-Regular.ttf", 12); } @@ -146,7 +148,7 @@ namespace Content.Client.NodeContainer foreach (var (gridId, gridDict) in _gridIndex) { var grid = _entityManager.GetComponent(gridId); - var (_, _, worldMatrix, invMatrix) = _entityManager.GetComponent(gridId).GetWorldPositionRotationMatrixWithInv(); + var (_, _, worldMatrix, invMatrix) = _transformSystem.GetWorldPositionRotationMatrixWithInv(gridId); var lCursorBox = invMatrix.TransformBox(cursorBox); foreach (var (pos, list) in gridDict) diff --git a/Content.Client/Outline/TargetOutlineSystem.cs b/Content.Client/Outline/TargetOutlineSystem.cs index df57578b1f..c69987fe77 100644 --- a/Content.Client/Outline/TargetOutlineSystem.cs +++ b/Content.Client/Outline/TargetOutlineSystem.cs @@ -23,6 +23,7 @@ public sealed class TargetOutlineSystem : EntitySystem [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!; [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private readonly SharedTransformSystem _transformSystem = default!; private bool _enabled = false; @@ -165,8 +166,8 @@ public sealed class TargetOutlineSystem : EntitySystem valid = _interactionSystem.InRangeUnobstructed(player, entity, Range); else if (Range >= 0) { - var origin = Transform(player).WorldPosition; - var target = Transform(entity).WorldPosition; + var origin = _transformSystem.GetWorldPosition(player); + var target = _transformSystem.GetWorldPosition(entity); valid = (origin - target).LengthSquared() <= Range; } diff --git a/Content.Client/Stealth/StealthSystem.cs b/Content.Client/Stealth/StealthSystem.cs index 0b94e41f6b..adb25e1ef6 100644 --- a/Content.Client/Stealth/StealthSystem.cs +++ b/Content.Client/Stealth/StealthSystem.cs @@ -11,6 +11,7 @@ namespace Content.Client.Stealth; public sealed class StealthSystem : SharedStealthSystem { [Dependency] private readonly IPrototypeManager _protoMan = default!; + [Dependency] private readonly SharedTransformSystem _transformSystem = default!; private ShaderInstance _shader = default!; @@ -81,7 +82,7 @@ public sealed class StealthSystem : SharedStealthSystem if (!parent.IsValid()) return; // should never happen, but lets not kill the client. var parentXform = Transform(parent); - var reference = args.Viewport.WorldToLocal(parentXform.WorldPosition); + var reference = args.Viewport.WorldToLocal(_transformSystem.GetWorldPosition(parentXform)); reference.X = -reference.X; var visibility = GetVisibility(uid, component); diff --git a/Content.Client/Tabletop/TabletopSystem.cs b/Content.Client/Tabletop/TabletopSystem.cs index 0b55a1839c..034d3e4f02 100644 --- a/Content.Client/Tabletop/TabletopSystem.cs +++ b/Content.Client/Tabletop/TabletopSystem.cs @@ -27,6 +27,7 @@ namespace Content.Client.Tabletop [Dependency] private readonly IPlayerManager _playerManager = default!; [Dependency] private readonly IGameTiming _gameTiming = default!; [Dependency] private readonly AppearanceSystem _appearance = default!; + [Dependency] private readonly SharedTransformSystem _transformSystem = default!; // Time in seconds to wait until sending the location of a dragged entity to the server again private const float Delay = 1f / 10; // 10 Hz @@ -100,7 +101,7 @@ namespace Content.Client.Tabletop if (clampedCoords.Equals(MapCoordinates.Nullspace)) return; // Move the entity locally every update - EntityManager.GetComponent(_draggedEntity.Value).WorldPosition = clampedCoords.Position; + _transformSystem.SetWorldPosition(_draggedEntity.Value, clampedCoords.Position); // Increment total time passed _timePassed += frameTime; diff --git a/Content.Client/UserInterface/Systems/Viewport/ViewportUIController.cs b/Content.Client/UserInterface/Systems/Viewport/ViewportUIController.cs index 59747b1b0f..613f71e79b 100644 --- a/Content.Client/UserInterface/Systems/Viewport/ViewportUIController.cs +++ b/Content.Client/UserInterface/Systems/Viewport/ViewportUIController.cs @@ -15,7 +15,6 @@ public sealed class ViewportUIController : UIController [Dependency] private readonly IPlayerManager _playerMan = default!; [Dependency] private readonly IEntityManager _entMan = default!; [Dependency] private readonly IConfigurationManager _configurationManager = default!; - public static readonly Vector2i ViewportSize = (EyeManager.PixelsPerMeter * 21, EyeManager.PixelsPerMeter * 15); public const int ViewportHeight = 15; private MainViewport? Viewport => UIManager.ActiveScreen?.GetWidget(); diff --git a/Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs b/Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs index 3e1a4b1906..540d76c129 100644 --- a/Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs +++ b/Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs @@ -213,7 +213,7 @@ public sealed partial class MeleeWeaponSystem private void UpdateEffects() { var query = EntityQueryEnumerator(); - while (query.MoveNext(out var arcComponent, out var xform)) + while (query.MoveNext(out var uid, out var arcComponent, out var xform)) { if (arcComponent.User == null) continue; @@ -226,7 +226,7 @@ public sealed partial class MeleeWeaponSystem targetPos += entRotation.RotateVec(arcComponent.Offset); } - TransformSystem.SetWorldPosition(xform, targetPos); + TransformSystem.SetWorldPosition(uid, targetPos); } } } diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs index 2e41e45d3f..b96dd0ac48 100644 --- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs +++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs @@ -237,7 +237,7 @@ namespace Content.Server.Atmos.EntitySystems // TODO: Technically these directions won't be correct but uhh I'm just here for optimisations buddy not to fix my old bugs. if (throwTarget != EntityCoordinates.Invalid) { - var pos = ((throwTarget.ToMap(EntityManager, _transformSystem).Position - xform.WorldPosition).Normalized() + dirVec).Normalized(); + var pos = ((_transformSystem.ToMapCoordinates(throwTarget).Position - _transformSystem.GetWorldPosition(xform)).Normalized() + dirVec).Normalized(); _physics.ApplyLinearImpulse(uid, pos * moveForce, body: physics); } else diff --git a/Content.Server/Chemistry/EntitySystems/VaporSystem.cs b/Content.Server/Chemistry/EntitySystems/VaporSystem.cs index 8e12670ca6..dbb8572299 100644 --- a/Content.Server/Chemistry/EntitySystems/VaporSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/VaporSystem.cs @@ -28,6 +28,7 @@ namespace Content.Server.Chemistry.EntitySystems [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!; [Dependency] private readonly ThrowingSystem _throwing = default!; [Dependency] private readonly ReactiveSystem _reactive = default!; + [Dependency] private readonly SharedTransformSystem _transformSystem = default!; private const float ReactTime = 0.125f; @@ -69,7 +70,7 @@ namespace Content.Server.Chemistry.EntitySystems _throwing.TryThrow(vapor, dir, speed, user: user); - var distance = (target.Position - vaporXform.WorldPosition).Length(); + var distance = (target.Position - _transformSystem.GetWorldPosition(vaporXform)).Length(); var time = (distance / physics.LinearVelocity.Length()); despawn.Lifetime = MathF.Min(aliveTime, time); } diff --git a/Content.Server/Commands/CommandUtils.cs b/Content.Server/Commands/CommandUtils.cs index 172f3324e3..30ea41b7c9 100644 --- a/Content.Server/Commands/CommandUtils.cs +++ b/Content.Server/Commands/CommandUtils.cs @@ -1,4 +1,4 @@ -using System.Diagnostics.CodeAnalysis; +using System.Diagnostics.CodeAnalysis; using System.Globalization; using Robust.Server.Player; using Robust.Shared.Console; @@ -55,13 +55,15 @@ namespace Content.Server.Commands { var entMan = IoCManager.Resolve(); var transform = entMan.GetComponent(ent); + var transformSystem = entMan.System(); + var worldPosition = transformSystem.GetWorldPosition(transform); // gross, is there a better way to do this? ruleString = ruleString.Replace("$ID", ent.ToString()); ruleString = ruleString.Replace("$WX", - transform.WorldPosition.X.ToString(CultureInfo.InvariantCulture)); + worldPosition.X.ToString(CultureInfo.InvariantCulture)); ruleString = ruleString.Replace("$WY", - transform.WorldPosition.Y.ToString(CultureInfo.InvariantCulture)); + worldPosition.Y.ToString(CultureInfo.InvariantCulture)); ruleString = ruleString.Replace("$LX", transform.LocalPosition.X.ToString(CultureInfo.InvariantCulture)); ruleString = ruleString.Replace("$LY", @@ -73,12 +75,13 @@ namespace Content.Server.Commands if (player.AttachedEntity is {Valid: true} p) { var pTransform = entMan.GetComponent(p); + var pWorldPosition = transformSystem.GetWorldPosition(pTransform); ruleString = ruleString.Replace("$PID", ent.ToString()); ruleString = ruleString.Replace("$PWX", - pTransform.WorldPosition.X.ToString(CultureInfo.InvariantCulture)); + pWorldPosition.X.ToString(CultureInfo.InvariantCulture)); ruleString = ruleString.Replace("$PWY", - pTransform.WorldPosition.Y.ToString(CultureInfo.InvariantCulture)); + pWorldPosition.Y.ToString(CultureInfo.InvariantCulture)); ruleString = ruleString.Replace("$PLX", pTransform.LocalPosition.X.ToString(CultureInfo.InvariantCulture)); ruleString = ruleString.Replace("$PLY", diff --git a/Content.Server/DeviceNetwork/Systems/WirelessNetworkSystem.cs b/Content.Server/DeviceNetwork/Systems/WirelessNetworkSystem.cs index b27ef52eca..1741afd4ce 100644 --- a/Content.Server/DeviceNetwork/Systems/WirelessNetworkSystem.cs +++ b/Content.Server/DeviceNetwork/Systems/WirelessNetworkSystem.cs @@ -6,6 +6,8 @@ namespace Content.Server.DeviceNetwork.Systems [UsedImplicitly] public sealed class WirelessNetworkSystem : EntitySystem { + [Dependency] private readonly SharedTransformSystem _transformSystem = default!; + public override void Initialize() { base.Initialize(); @@ -25,7 +27,7 @@ namespace Content.Server.DeviceNetwork.Systems return; if (xform.MapID != args.SenderTransform.MapID - || (ownPosition - xform.WorldPosition).Length() > sendingComponent.Range) + || (ownPosition - _transformSystem.GetWorldPosition(xform)).Length() > sendingComponent.Range) { args.Cancel(); } diff --git a/Content.Server/Dragon/DragonSystem.cs b/Content.Server/Dragon/DragonSystem.cs index 29875c60ca..42610a0323 100644 --- a/Content.Server/Dragon/DragonSystem.cs +++ b/Content.Server/Dragon/DragonSystem.cs @@ -156,7 +156,7 @@ public sealed partial class DragonSystem : EntitySystem } // cant put a rift on solars - foreach (var tile in grid.GetTilesIntersecting(new Circle(xform.WorldPosition, RiftTileRadius), false)) + foreach (var tile in grid.GetTilesIntersecting(new Circle(_transform.GetWorldPosition(xform), RiftTileRadius), false)) { if (!tile.IsSpace(_tileDef)) continue; diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs index d88945bc19..75bb606441 100644 --- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs +++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.GridMap.cs @@ -105,7 +105,7 @@ public sealed partial class ExplosionSystem : SharedExplosionSystem var xforms = EntityManager.GetEntityQuery(); var xform = xforms.GetComponent(gridToTransform); - var (_, gridWorldRotation, gridWorldMatrix, invGridWorldMatrid) = xform.GetWorldPositionRotationMatrixWithInv(xforms); + var (_, gridWorldRotation, gridWorldMatrix, invGridWorldMatrid) = _transformSystem.GetWorldPositionRotationMatrixWithInv(xform, xforms); var localEpicentre = (Vector2i) Vector2.Transform(epicentre.Position, invGridWorldMatrid); var matrix = offsetMatrix * gridWorldMatrix * targetMatrix; diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs index 1eeed949cc..6de516ec0f 100644 --- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs +++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs @@ -406,7 +406,7 @@ public sealed partial class ExplosionSystem : SharedExplosionSystem if (player.AttachedEntity is not EntityUid uid) continue; - var playerPos = Transform(player.AttachedEntity!.Value).WorldPosition; + var playerPos = _transformSystem.GetWorldPosition(player.AttachedEntity!.Value); var delta = epicenter.Position - playerPos; if (delta.EqualsApprox(Vector2.Zero)) diff --git a/Content.Server/Hands/Systems/HandsSystem.cs b/Content.Server/Hands/Systems/HandsSystem.cs index 12c2a396de..903fd1ff3f 100644 --- a/Content.Server/Hands/Systems/HandsSystem.cs +++ b/Content.Server/Hands/Systems/HandsSystem.cs @@ -201,7 +201,7 @@ namespace Content.Server.Hands.Systems throwEnt = splitStack.Value; } - var direction = coordinates.ToMapPos(EntityManager, _transformSystem) - Transform(player).WorldPosition; + var direction = _transformSystem.ToMapCoordinates(coordinates).Position - _transformSystem.GetWorldPosition(player); if (direction == Vector2.Zero) return true; diff --git a/Content.Server/Maps/GridDraggingSystem.cs b/Content.Server/Maps/GridDraggingSystem.cs index 76b2e29dea..cf71e012f4 100644 --- a/Content.Server/Maps/GridDraggingSystem.cs +++ b/Content.Server/Maps/GridDraggingSystem.cs @@ -12,6 +12,7 @@ public sealed class GridDraggingSystem : SharedGridDraggingSystem { [Dependency] private readonly IConGroupController _admin = default!; [Dependency] private readonly SharedPhysicsSystem _physics = default!; + [Dependency] private readonly SharedTransformSystem _transformSystem = default!; private readonly HashSet _draggers = new(); @@ -76,8 +77,6 @@ public sealed class GridDraggingSystem : SharedGridDraggingSystem return; } - var gridXform = Transform(grid); - - gridXform.WorldPosition = msg.WorldPosition; + _transformSystem.SetWorldPosition(grid, msg.WorldPosition); } } diff --git a/Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs b/Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs index c5c44056b9..aa28a8063c 100644 --- a/Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs +++ b/Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs @@ -1,4 +1,4 @@ -using System.Linq; +using System.Linq; using Content.Server.Interaction; using Content.Server.Mech.Equipment.Components; using Content.Server.Mech.Systems; @@ -85,7 +85,7 @@ public sealed class MechGrabberSystem : EntitySystem var (mechPos, mechRot) = _transform.GetWorldPositionRotation(mechxform); var offset = mechPos + mechRot.RotateVec(component.DepositOffset); - _transform.SetWorldPositionRotation(xform, offset, Angle.Zero); + _transform.SetWorldPositionRotation(toRemove, offset, Angle.Zero); _mech.UpdateUserInterface(mech); } diff --git a/Content.Server/Movement/StressTestMovementSystem.cs b/Content.Server/Movement/StressTestMovementSystem.cs index 81ea6840e3..51916204da 100644 --- a/Content.Server/Movement/StressTestMovementSystem.cs +++ b/Content.Server/Movement/StressTestMovementSystem.cs @@ -39,7 +39,7 @@ public sealed class StressTestMovementSystem : EntitySystem var x = MathF.Sin(stressTest.Progress * MathHelper.TwoPi); var y = MathF.Cos(stressTest.Progress * MathHelper.TwoPi); - _transform.SetWorldPosition(transform, stressTest.Origin + new Vector2(x, y) * 5); + _transform.SetWorldPosition((uid, transform), stressTest.Origin + new Vector2(x, y) * 5); } } } diff --git a/Content.Server/Pointing/EntitySystems/RoguePointingSystem.cs b/Content.Server/Pointing/EntitySystems/RoguePointingSystem.cs index be3ceb3b08..bdd652f38f 100644 --- a/Content.Server/Pointing/EntitySystems/RoguePointingSystem.cs +++ b/Content.Server/Pointing/EntitySystems/RoguePointingSystem.cs @@ -12,6 +12,7 @@ namespace Content.Server.Pointing.EntitySystems [Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly ExplosionSystem _explosion = default!; [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private readonly SharedTransformSystem _transformSystem = default!; private EntityUid? RandomNearbyPlayer(EntityUid uid, RoguePointingArrowComponent? component = null, TransformComponent? transform = null) { @@ -66,27 +67,28 @@ namespace Content.Server.Pointing.EntitySystems } component.TurningDelay -= frameTime; + var (transformPos, transformRot) = _transformSystem.GetWorldPositionRotation(transform); if (component.TurningDelay > 0) { - var difference = Comp(chasing).WorldPosition - transform.WorldPosition; + var difference = _transformSystem.GetWorldPosition(chasing) - transformPos; var angle = difference.ToAngle(); var adjusted = angle.Degrees + 90; var newAngle = Angle.FromDegrees(adjusted); - transform.WorldRotation = newAngle; + _transformSystem.SetWorldRotation(transform, newAngle); UpdateAppearance(uid, component, transform); continue; } - transform.WorldRotation += Angle.FromDegrees(20); + _transformSystem.SetWorldRotation(transform, transformRot + Angle.FromDegrees(20)); UpdateAppearance(uid, component, transform); - var toChased = Comp(chasing).WorldPosition - transform.WorldPosition; + var toChased = _transformSystem.GetWorldPosition(chasing) - transformPos; - transform.WorldPosition += toChased * frameTime * component.ChasingSpeed; + _transformSystem.SetWorldPosition((uid, transform), transformPos + (toChased * frameTime * component.ChasingSpeed)); component.ChasingTime -= frameTime; diff --git a/Content.Server/Respawn/SpecialRespawnSystem.cs b/Content.Server/Respawn/SpecialRespawnSystem.cs index bdaa4a40bc..cbda98f263 100644 --- a/Content.Server/Respawn/SpecialRespawnSystem.cs +++ b/Content.Server/Respawn/SpecialRespawnSystem.cs @@ -1,4 +1,4 @@ -using Content.Server.Administration.Logs; +using Content.Server.Administration.Logs; using Content.Server.Atmos.EntitySystems; using Content.Server.Chat.Managers; using Content.Server.GameTicking; @@ -157,7 +157,7 @@ public sealed class SpecialRespawnSystem : SharedSpecialRespawnSystem var tile = tileRef.GridIndices; var found = false; - var (gridPos, _, gridMatrix) = xform.GetWorldPositionRotationMatrix(); + var (gridPos, _, gridMatrix) = _transform.GetWorldPositionRotationMatrix(xform); var gridBounds = gridMatrix.TransformBox(grid.LocalAABB); //Obviously don't put anything ridiculous in here diff --git a/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs b/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs index c889d59f15..f972865509 100644 --- a/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs +++ b/Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs @@ -42,6 +42,7 @@ public sealed partial class RevenantSystem [Dependency] private readonly GhostSystem _ghost = default!; [Dependency] private readonly TileSystem _tile = default!; [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private readonly SharedTransformSystem _transformSystem = default!; private void InitializeAbilities() { @@ -227,7 +228,7 @@ public sealed partial class RevenantSystem var xform = Transform(uid); if (!TryComp(xform.GridUid, out var map)) return; - var tiles = map.GetTilesIntersecting(Box2.CenteredAround(xform.WorldPosition, + var tiles = map.GetTilesIntersecting(Box2.CenteredAround(_transformSystem.GetWorldPosition(xform), new Vector2(component.DefileRadius * 2, component.DefileRadius))).ToArray(); _random.Shuffle(tiles); diff --git a/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs b/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs index e575b0403b..f02c2bfd0d 100644 --- a/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs +++ b/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs @@ -22,6 +22,7 @@ public sealed class ContainmentFieldGeneratorSystem : EntitySystem [Dependency] private readonly PhysicsSystem _physics = default!; [Dependency] private readonly PopupSystem _popupSystem = default!; [Dependency] private readonly SharedPointLightSystem _light = default!; + [Dependency] private readonly SharedTransformSystem _transformSystem = default!; [Dependency] private readonly TagSystem _tags = default!; public override void Initialize() @@ -234,7 +235,7 @@ public sealed class ContainmentFieldGeneratorSystem : EntitySystem if (!gen1XForm.Anchored) return false; - var genWorldPosRot = gen1XForm.GetWorldPositionRotation(); + var genWorldPosRot = _transformSystem.GetWorldPositionRotation(gen1XForm); var dirRad = dir.ToAngle() + genWorldPosRot.WorldRotation; //needs to be like this for the raycast to work properly var ray = new CollisionRay(genWorldPosRot.WorldPosition, dirRad.ToVec(), component.CollisionMask); diff --git a/Content.Server/Singularity/EntitySystems/ContainmentFieldSystem.cs b/Content.Server/Singularity/EntitySystems/ContainmentFieldSystem.cs index 0af4954519..d3a32f5006 100644 --- a/Content.Server/Singularity/EntitySystems/ContainmentFieldSystem.cs +++ b/Content.Server/Singularity/EntitySystems/ContainmentFieldSystem.cs @@ -1,4 +1,4 @@ -using Content.Server.Popups; +using Content.Server.Popups; using Content.Server.Shuttles.Components; using Content.Server.Singularity.Events; using Content.Shared.Popups; @@ -13,6 +13,7 @@ public sealed class ContainmentFieldSystem : EntitySystem { [Dependency] private readonly ThrowingSystem _throwing = default!; [Dependency] private readonly PopupSystem _popupSystem = default!; + [Dependency] private readonly SharedTransformSystem _transformSystem = default!; public override void Initialize() { @@ -34,8 +35,8 @@ public sealed class ContainmentFieldSystem : EntitySystem if (TryComp(otherBody, out var physics) && physics.Mass <= component.MaxMass && physics.Hard) { - var fieldDir = Transform(uid).WorldPosition; - var playerDir = Transform(otherBody).WorldPosition; + var fieldDir = _transformSystem.GetWorldPosition(uid); + var playerDir = _transformSystem.GetWorldPosition(otherBody); _throwing.TryThrow(otherBody, playerDir-fieldDir, baseThrowSpeed: component.ThrowForce); } diff --git a/Content.Server/Solar/EntitySystems/PowerSolarSystem.cs b/Content.Server/Solar/EntitySystems/PowerSolarSystem.cs index 6a8fc68d97..4f1cdb0eb0 100644 --- a/Content.Server/Solar/EntitySystems/PowerSolarSystem.cs +++ b/Content.Server/Solar/EntitySystems/PowerSolarSystem.cs @@ -18,6 +18,7 @@ namespace Content.Server.Solar.EntitySystems { [Dependency] private readonly IRobustRandom _robustRandom = default!; [Dependency] private readonly SharedPhysicsSystem _physicsSystem = default!; + [Dependency] private readonly SharedTransformSystem _transformSystem = default!; /// /// Maximum panel angular velocity range - used to stop people rotating panels fast enough that the lag prevention becomes noticable @@ -112,7 +113,7 @@ namespace Content.Server.Solar.EntitySystems while (query.MoveNext(out var uid, out var panel, out var xform)) { TotalPanelPower += panel.MaxSupply * panel.Coverage; - xform.WorldRotation = TargetPanelRotation; + _transformSystem.SetWorldRotation(xform, TargetPanelRotation); _updateQueue.Enqueue((uid, panel)); } } @@ -135,7 +136,7 @@ namespace Content.Server.Solar.EntitySystems // directly downwards (abs(theta) = pi) = coverage -1 // as TowardsSun + = CCW, // panelRelativeToSun should - = CW - var panelRelativeToSun = xform.WorldRotation - TowardsSun; + var panelRelativeToSun = _transformSystem.GetWorldRotation(xform) - TowardsSun; // essentially, given cos = X & sin = Y & Y is 'downwards', // then for the first 90 degrees of rotation in either direction, // this plots the lower-right quadrant of a circle. @@ -153,7 +154,7 @@ namespace Content.Server.Solar.EntitySystems if (coverage > 0) { // Determine if the solar panel is occluded, and zero out coverage if so. - var ray = new CollisionRay(xform.WorldPosition, TowardsSun.ToWorldVec(), (int) CollisionGroup.Opaque); + var ray = new CollisionRay(_transformSystem.GetWorldPosition(xform), TowardsSun.ToWorldVec(), (int) CollisionGroup.Opaque); var rayCastResults = _physicsSystem.IntersectRayWithPredicate( xform.MapID, ray, diff --git a/Content.Server/Worldgen/Systems/BaseWorldSystem.cs b/Content.Server/Worldgen/Systems/BaseWorldSystem.cs index 78326651c9..7a9e74375c 100644 --- a/Content.Server/Worldgen/Systems/BaseWorldSystem.cs +++ b/Content.Server/Worldgen/Systems/BaseWorldSystem.cs @@ -1,4 +1,4 @@ -using System.Numerics; +using System.Numerics; using Content.Server.Worldgen.Components; using JetBrains.Annotations; @@ -12,6 +12,7 @@ namespace Content.Server.Worldgen.Systems; public abstract class BaseWorldSystem : EntitySystem { [Dependency] private readonly WorldControllerSystem _worldController = default!; + [Dependency] private readonly SharedTransformSystem _transformSystem = default!; /// /// Gets a chunk's coordinates in chunk space as an integer value. @@ -25,7 +26,7 @@ public abstract class BaseWorldSystem : EntitySystem if (!Resolve(ent, ref xform)) throw new Exception("Failed to resolve transform, somehow."); - return WorldGen.WorldToChunkCoords(xform.WorldPosition).Floored(); + return WorldGen.WorldToChunkCoords(_transformSystem.GetWorldPosition(xform)).Floored(); } /// @@ -40,7 +41,7 @@ public abstract class BaseWorldSystem : EntitySystem if (!Resolve(ent, ref xform)) throw new Exception("Failed to resolve transform, somehow."); - return WorldGen.WorldToChunkCoords(xform.WorldPosition); + return WorldGen.WorldToChunkCoords(_transformSystem.GetWorldPosition(xform)); } /// diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/ThrowArtifactSystem.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/ThrowArtifactSystem.cs index 8708e0ff4e..0591222996 100644 --- a/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/ThrowArtifactSystem.cs +++ b/Content.Server/Xenoarchaeology/XenoArtifacts/Effects/Systems/ThrowArtifactSystem.cs @@ -1,4 +1,4 @@ -using System.Numerics; +using System.Numerics; using Content.Server.Xenoarchaeology.XenoArtifacts.Effects.Components; using Content.Server.Xenoarchaeology.XenoArtifacts.Events; using Content.Shared.Maps; @@ -31,7 +31,7 @@ public sealed class ThrowArtifactSystem : EntitySystem if (TryComp(xform.GridUid, out var grid)) { var tiles = grid.GetTilesIntersecting( - Box2.CenteredAround(xform.WorldPosition, new Vector2(component.Range * 2, component.Range))); + Box2.CenteredAround(_transform.GetWorldPosition(xform), new Vector2(component.Range * 2, component.Range))); foreach (var tile in tiles) { diff --git a/Content.Shared/Construction/Conditions/WallmountCondition.cs b/Content.Shared/Construction/Conditions/WallmountCondition.cs index fe4336e6fc..f1d056165e 100644 --- a/Content.Shared/Construction/Conditions/WallmountCondition.cs +++ b/Content.Shared/Construction/Conditions/WallmountCondition.cs @@ -20,13 +20,13 @@ namespace Content.Shared.Construction.Conditions // get blueprint and user position var transformSystem = entManager.System(); - var userWorldPosition = entManager.GetComponent(user).WorldPosition; + var userWorldPosition = transformSystem.GetWorldPosition(user); var objWorldPosition = location.ToMap(entManager, transformSystem).Position; // find direction from user to blueprint var userToObject = (objWorldPosition - userWorldPosition); // get direction of the grid being placed on as an offset. - var gridRotation = entManager.GetComponent(location.EntityId).WorldRotation; + var gridRotation = transformSystem.GetWorldRotation(location.EntityId); var directionWithOffset = gridRotation.RotateVec(direction.ToVec()); // dot product will be positive if user direction and blueprint are co-directed diff --git a/Content.Shared/Tiles/FloorTileSystem.cs b/Content.Shared/Tiles/FloorTileSystem.cs index 97ed908ed3..f031292f23 100644 --- a/Content.Shared/Tiles/FloorTileSystem.cs +++ b/Content.Shared/Tiles/FloorTileSystem.cs @@ -156,7 +156,7 @@ public sealed class FloorTileSystem : EntitySystem var grid = _mapManager.CreateGridEntity(locationMap.MapId); var gridXform = Transform(grid); - _transform.SetWorldPosition(gridXform, locationMap.Position); + _transform.SetWorldPosition((grid, gridXform), locationMap.Position); location = new EntityCoordinates(grid, Vector2.Zero); PlaceAt(args.User, grid, grid.Comp, location, _tileDefinitionManager[component.OutputTiles[0]].TileId, component.PlaceTileSound, grid.Comp.TileSize / 2f); return; From 37e36bfa7c5cc13a39ceb3fdd223b82962cb380f Mon Sep 17 00:00:00 2001 From: Flareguy <78941145+Flareguy@users.noreply.github.com> Date: Tue, 6 Aug 2024 08:12:14 -0500 Subject: [PATCH 219/422] Vox head displacement map (#30699) * head displacement for vox * fixe --- .../Prototypes/Entities/Mobs/Species/vox.yml | 10 ++++++++++ .../Mobs/Species/Vox/displacement.rsi/head.png | Bin 0 -> 253 bytes .../Mobs/Species/Vox/displacement.rsi/meta.json | 6 +++++- 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Mobs/Species/Vox/displacement.rsi/head.png diff --git a/Resources/Prototypes/Entities/Mobs/Species/vox.yml b/Resources/Prototypes/Entities/Mobs/Species/vox.yml index 4bcd068d9d..3c09baa25f 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/vox.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/vox.yml @@ -108,6 +108,11 @@ 32: sprite: Mobs/Species/Vox/displacement.rsi state: hand + head: + sizeMaps: + 32: + sprite: Mobs/Species/Vox/displacement.rsi + state: head back: sizeMaps: 32: @@ -151,6 +156,11 @@ 32: sprite: Mobs/Species/Vox/displacement.rsi state: hand + head: + sizeMaps: + 32: + sprite: Mobs/Species/Vox/displacement.rsi + state: head back: sizeMaps: 32: diff --git a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/head.png b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/head.png new file mode 100644 index 0000000000000000000000000000000000000000..676262eca651115726f3f092cfa20bd534311844 GIT binary patch literal 253 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|wtKobhE&XX zdut=_VF#WA4mVxdPSvs1Ijw(E(y0DHRBiYABkCbp(b?-N4R?!O5OLtn;99_H!g_&e z7E=bJFXNVmWeiac!3??!G#l_r-+b4fTr0m{^oNaYL0VtwzyE)K@oM1Lg2%+q%ra}) V>Rjf}nh*2>gQu&X%Q~loCIFS~Qtki% literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/meta.json b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/meta.json index 2152470bd1..002f826b3e 100644 --- a/Resources/Textures/Mobs/Species/Vox/displacement.rsi/meta.json +++ b/Resources/Textures/Mobs/Species/Vox/displacement.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "jumpsuit state made by PJB3005. back, hand, and eyes states made by Flareguy, ears and shoes made by TheShuEd", + "copyright": "jumpsuit state made by PJB3005. back, hand, head, and eyes states made by Flareguy, ears and shoes made by TheShuEd", "size": { "x": 32, "y": 32 @@ -22,6 +22,10 @@ "name": "hand", "directions": 4 }, + { + "name": "head", + "directions": 4 + }, { "name": "ears", "directions": 4 From de98531a5dbfd42cca77d7fb6991c6c8680c2617 Mon Sep 17 00:00:00 2001 From: PJBot Date: Tue, 6 Aug 2024 13:13:20 +0000 Subject: [PATCH 220/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 57acec494a..9e66cf9a9e 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: deltanedas - changes: - - message: Dragons can now breathe fire. - type: Add - id: 6551 - time: '2024-05-08T00:25:41.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26746 - author: Cojoke-dot changes: - message: You can now shoot over racks @@ -3780,3 +3773,10 @@ id: 7050 time: '2024-08-06T11:00:15.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30574 +- author: Flareguy + changes: + - message: Most hats are now automatically displaced on vox to look more fitting. + type: Tweak + id: 7051 + time: '2024-08-06T13:12:14.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30699 From 048da47f328cb54d1300d623dee04edb8a9a5d56 Mon Sep 17 00:00:00 2001 From: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com> Date: Tue, 6 Aug 2024 21:09:24 +0000 Subject: [PATCH 221/422] fix(emergency_meta): Lock the doors on evac shuttle (#29255) * fix(emergency_meta): Lock the doors on evac shuttle --- Resources/Maps/Shuttles/emergency_meta.yml | 175 +++------------------ 1 file changed, 22 insertions(+), 153 deletions(-) diff --git a/Resources/Maps/Shuttles/emergency_meta.yml b/Resources/Maps/Shuttles/emergency_meta.yml index 84b6ff02e6..091fe6a1f8 100644 --- a/Resources/Maps/Shuttles/emergency_meta.yml +++ b/Resources/Maps/Shuttles/emergency_meta.yml @@ -472,71 +472,26 @@ entities: - type: Transform pos: 20.5,-1.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - proto: AirlockCommandGlassLocked entities: - - uid: 56 + - uid: 5 components: - type: Transform pos: 0.5,-2.5 parent: 1 - - type: WiresPanelSecurity - wiresAccessible: False - examine: wires-panel-component-on-examine-security-level2 - - type: Construction - node: medSecurity - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: - - 57 - - type: DeviceNetwork - address: 2A91-A774 - receiveFrequency: 1280 -- proto: AirlockCommandLocked - entities: - - uid: 58 + - uid: 12 components: - type: Transform - rot: 1.5707963267948966 rad pos: -0.5,-6.5 parent: 1 - - type: WiresPanelSecurity - wiresAccessible: False - examine: wires-panel-component-on-examine-security-level2 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: - - 59 - - type: DeviceNetwork - address: 09A1-F0F3 - receiveFrequency: 1280 - - type: Construction - node: medSecurity -- proto: AirlockEngineering +- proto: AirlockEngineeringGlassLocked entities: - - uid: 60 + - uid: 13 components: - type: Transform rot: 1.5707963267948966 rad pos: 17.5,-4.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: - - 61 - - type: DeviceNetwork - address: 4FEE-86F1 - receiveFrequency: 1280 - proto: AirlockExternalGlassShuttleEmergencyLocked entities: - uid: 62 @@ -647,57 +602,27 @@ entities: - type: DeviceNetwork address: 2CB4-0D0E receiveFrequency: 1280 -- proto: AirlockMedicalGlass +- proto: AirlockMedicalGlassLocked entities: - - uid: 76 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 8.5,-6.5 - parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: - - 77 - - type: DeviceNetwork - address: 0B07-5B7E - receiveFrequency: 1280 - - uid: 78 + - uid: 22 components: - type: Transform rot: 1.5707963267948966 rad pos: 10.5,-9.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: - - 79 - - type: DeviceNetwork - address: 7B62-0AF6 - receiveFrequency: 1280 -- proto: AirlockSecurityGlassLocked + - uid: 23 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 8.5,-6.5 + parent: 1 +- proto: AirlockSecurityLawyerGlassLocked entities: - - uid: 80 + - uid: 32 components: - type: Transform pos: 2.5,-6.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: - - 81 - - type: DeviceNetwork - address: 40EA-C9E8 - receiveFrequency: 1280 - proto: AirTankFilled entities: - uid: 82 @@ -794,7 +719,7 @@ entities: parent: 1 - type: Physics canCollide: False -- proto: BookEscalationSecurity +- proto: BookRandomStory entities: - uid: 116 components: @@ -2901,24 +2826,6 @@ entities: ent: 568 - proto: DoorElectronics entities: - - uid: 57 - components: - - type: Transform - parent: 56 - - type: Physics - canCollide: False - - uid: 59 - components: - - type: Transform - parent: 58 - - type: Physics - canCollide: False - - uid: 61 - components: - - type: Transform - parent: 60 - - type: Physics - canCollide: False - uid: 67 components: - type: Transform @@ -2949,24 +2856,6 @@ entities: parent: 74 - type: Physics canCollide: False - - uid: 77 - components: - - type: Transform - parent: 76 - - type: Physics - canCollide: False - - uid: 79 - components: - - type: Transform - parent: 78 - - type: Physics - canCollide: False - - uid: 81 - components: - - type: Transform - parent: 80 - - type: Physics - canCollide: False - uid: 570 components: - type: Transform @@ -3311,8 +3200,6 @@ entities: rot: 3.141592653589793 rad pos: 20.5,-6.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - proto: GasPassiveVent entities: - uid: 591 @@ -3321,8 +3208,6 @@ entities: rot: 3.141592653589793 rad pos: 18.5,-6.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - proto: GasPipeBend entities: - uid: 592 @@ -3594,8 +3479,6 @@ entities: rot: -1.5707963267948966 rad pos: 20.5,-1.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - proto: GasVentPump entities: - uid: 638 @@ -3604,40 +3487,30 @@ entities: rot: 3.141592653589793 rad pos: 15.5,-9.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - uid: 639 components: - type: Transform rot: 1.5707963267948966 rad pos: -1.5,-2.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - uid: 640 components: - type: Transform rot: 3.141592653589793 rad pos: 2.5,-8.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - uid: 641 components: - type: Transform rot: 1.5707963267948966 rad pos: 7.5,-9.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - uid: 642 components: - type: Transform rot: -1.5707963267948966 rad pos: 5.5,-0.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - proto: Gauze entities: - uid: 139 @@ -4334,10 +4207,15 @@ entities: - type: Transform pos: 15.5,-10.5 parent: 1 - - type: AtmosDevice - joinedGrid: 1 - proto: OxygenTankFilled entities: + - uid: 9 + components: + - type: Transform + parent: 2 + - type: Physics + canCollide: False + - type: InsideEntityStorage - uid: 491 components: - type: Transform @@ -8039,13 +7917,4 @@ entities: parent: 1 - type: Physics canCollide: False -- proto: YellowOxygenTankFilled - entities: - - uid: 9 - components: - - type: Transform - parent: 2 - - type: Physics - canCollide: False - - type: InsideEntityStorage ... From bb80d443312fb2e92f8455be34f05fd738a63e9a Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Tue, 6 Aug 2024 17:29:29 -0600 Subject: [PATCH 222/422] marathon update (#30714) * marathon update * marathon update --- Resources/Maps/marathon.yml | 727 +++++++++++++++++++++--------------- 1 file changed, 435 insertions(+), 292 deletions(-) diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml index 35a1740237..5ea1694177 100644 --- a/Resources/Maps/marathon.yml +++ b/Resources/Maps/marathon.yml @@ -77,7 +77,7 @@ entities: version: 6 0,0: ind: 0,0 - tiles: XQAAAAABXQAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADfgAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAADXQAAAAADXQAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAACXQAAAAADXQAAAAADXQAAAAABXQAAAAACXQAAAAABXQAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAABXQAAAAADXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAACXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAADfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABHwAAAAACXQAAAAAAHwAAAAABXQAAAAAAHwAAAAADXQAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADXQAAAAACHwAAAAADXQAAAAACHwAAAAABXQAAAAACHwAAAAADXQAAAAABXQAAAAADXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAABXQAAAAADHwAAAAABXQAAAAADHwAAAAACXQAAAAACXQAAAAAAXQAAAAABXQAAAAABXQAAAAABfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAHwAAAAAAXQAAAAAAHwAAAAAAfgAAAAAAHwAAAAAAXQAAAAACHwAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAADXQAAAAACfgAAAAAAXQAAAAABHwAAAAACXQAAAAACfgAAAAAAXQAAAAADXQAAAAAAXQAAAAACfgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHwAAAAAAHwAAAAADXQAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAADHwAAAAACHwAAAAAAfgAAAAAAHwAAAAADfgAAAAAAHwAAAAADHwAAAAADHwAAAAADfgAAAAAAXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAeQAAAAAAeQAAAAAAHwAAAAADHwAAAAAAegAAAAACfgAAAAAAGwAAAAAAGwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAQwAAAAAAQwAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADfgAAAAAAHwAAAAADHwAAAAABHwAAAAAAHwAAAAACHwAAAAADfgAAAAAAHwAAAAAAHwAAAAABHwAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAHwAAAAAD + tiles: XQAAAAABXQAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADfgAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAADXQAAAAADXQAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAACXQAAAAADXQAAAAADXQAAAAABXQAAAAACXQAAAAABXQAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAABXQAAAAADXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAACXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAXQAAAAABXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAADXQAAAAACXQAAAAACXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAADfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABHwAAAAACXQAAAAAAHwAAAAABXQAAAAAAHwAAAAADXQAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADXQAAAAACHwAAAAADXQAAAAACHwAAAAABXQAAAAACHwAAAAADXQAAAAABXQAAAAADXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAABXQAAAAADHwAAAAABXQAAAAADHwAAAAACXQAAAAACXQAAAAAAXQAAAAABXQAAAAABXQAAAAABfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAHwAAAAAAXQAAAAAAHwAAAAAAfgAAAAAAHwAAAAAAXQAAAAACHwAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAHwAAAAADXQAAAAACfgAAAAAAXQAAAAABHwAAAAACXQAAAAACfgAAAAAAXQAAAAADXQAAAAAAXQAAAAACfgAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAHwAAAAAAHwAAAAADXQAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAADHwAAAAACHwAAAAAAfgAAAAAAHwAAAAADfgAAAAAAHwAAAAADHwAAAAADHwAAAAADfgAAAAAAXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAeQAAAAAAHwAAAAAAcAAAAAAAHwAAAAAAegAAAAACfgAAAAAAGwAAAAAAGwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAegAAAAABfgAAAAAAGwAAAAAAGwAAAAAAGwAAAAAAQwAAAAAAQwAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAADfgAAAAAAHwAAAAADHwAAAAABHwAAAAAAHwAAAAACHwAAAAADfgAAAAAAHwAAAAAAHwAAAAABHwAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAHwAAAAAD version: 6 -1,-1: ind: -1,-1 @@ -85,11 +85,11 @@ entities: version: 6 0,-1: ind: 0,-1 - tiles: fgAAAAAAfgAAAAAAbAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAegAAAAAAegAAAAABegAAAAABfgAAAAAAXQAAAAACXQAAAAABXQAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAegAAAAACegAAAAADegAAAAABfgAAAAAAXQAAAAABXQAAAAADXQAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAegAAAAACegAAAAAAegAAAAADfgAAAAAAXQAAAAADXQAAAAACXQAAAAACHwAAAAADfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAegAAAAAAegAAAAACegAAAAADMwAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAABHwAAAAADfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADegAAAAABegAAAAACegAAAAABJgAAAAADXQAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAACXQAAAAADXQAAAAAAHwAAAAACXQAAAAADHwAAAAACHwAAAAAAHwAAAAACegAAAAABegAAAAADegAAAAABJgAAAAACXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAABHwAAAAADfgAAAAAAHwAAAAACHwAAAAABHwAAAAABegAAAAADegAAAAABegAAAAAAJgAAAAABXQAAAAABXQAAAAADXQAAAAADfgAAAAAAXQAAAAACXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACfgAAAAAAegAAAAACegAAAAAAegAAAAABMwAAAAAAXQAAAAADXQAAAAACXQAAAAACfgAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAADXQAAAAADHwAAAAABHwAAAAADfgAAAAAAegAAAAAAegAAAAADegAAAAABMwAAAAAAXQAAAAACXQAAAAABXQAAAAADfgAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAACHwAAAAACfgAAAAAAfgAAAAAAegAAAAACegAAAAACegAAAAADfgAAAAAAXQAAAAADXQAAAAACXQAAAAABfgAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAABXQAAAAADDgAAAAADDgAAAAACDgAAAAACMwAAAAAAJgAAAAABMwAAAAAAMwAAAAAAXQAAAAAAXQAAAAADXQAAAAABfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAADfgAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAADXQAAAAACXQAAAAACXQAAAAABXQAAAAADXQAAAAABXQAAAAABfgAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAAAHwAAAAAAHwAAAAABHwAAAAADfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAA + tiles: fgAAAAAAfgAAAAAAbAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAegAAAAAAegAAAAABegAAAAABfgAAAAAAXQAAAAACXQAAAAABXQAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAegAAAAACegAAAAADegAAAAABfgAAAAAAXQAAAAABXQAAAAADXQAAAAACHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAegAAAAACegAAAAAAegAAAAADfgAAAAAAXQAAAAADXQAAAAACXQAAAAACHwAAAAADfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAegAAAAAAegAAAAACegAAAAADMwAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAABHwAAAAADfgAAAAAAfgAAAAAAHwAAAAACHwAAAAADegAAAAABegAAAAACegAAAAABJgAAAAADXQAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAACXQAAAAADXQAAAAAAHwAAAAACXQAAAAADHwAAAAACHwAAAAAAHwAAAAACegAAAAABegAAAAADegAAAAABJgAAAAACXQAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAABHwAAAAADfgAAAAAAHwAAAAACHwAAAAABHwAAAAABegAAAAADegAAAAABegAAAAAAJgAAAAABXQAAAAABXQAAAAADXQAAAAADfgAAAAAAXQAAAAACXQAAAAADXQAAAAABfgAAAAAAfgAAAAAAHwAAAAADHwAAAAACfgAAAAAAegAAAAACegAAAAAAegAAAAABMwAAAAAAXQAAAAADXQAAAAACXQAAAAACfgAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAADXQAAAAADHwAAAAABHwAAAAADfgAAAAAAegAAAAAAegAAAAADegAAAAABMwAAAAAAXQAAAAACXQAAAAABXQAAAAADfgAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAegAAAAACegAAAAACegAAAAADfgAAAAAAXQAAAAADXQAAAAACXQAAAAABfgAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAABXQAAAAADDgAAAAADDgAAAAACDgAAAAACMwAAAAAAJgAAAAABMwAAAAAAMwAAAAAAXQAAAAAAXQAAAAADXQAAAAABfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAADXQAAAAADXQAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAADXQAAAAADfgAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAAAXQAAAAADXQAAAAABXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAXQAAAAADXQAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAADXQAAAAACXQAAAAACXQAAAAABXQAAAAADXQAAAAABXQAAAAABfgAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAAAXQAAAAAAHwAAAAAAHwAAAAABHwAAAAADfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAA version: 6 -2,0: ind: -2,0 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAABXQAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAACXQAAAAADXQAAAAADXQAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAXQAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAABfgAAAAAAYAAAAAAAYAAAAAABHwAAAAABHwAAAAADfgAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAADXQAAAAABYAAAAAAAYAAAAAADJAAAAAABHwAAAAADfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAAQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABfgAAAAAAYAAAAAADYAAAAAADJAAAAAACHwAAAAABfgAAAAAAXQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAYAAAAAACYAAAAAADJAAAAAABHwAAAAABfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAAQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAYAAAAAADYAAAAAABHwAAAAACHwAAAAABfgAAAAAAXQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACYAAAAAACYAAAAAABHwAAAAACfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAAQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAYAAAAAACYAAAAAACHwAAAAABHwAAAAAAfgAAAAAAXQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAABfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJgAAAAABfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAKAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAA + tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAABXQAAAAACXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAABXQAAAAAAXQAAAAABXQAAAAADXQAAAAACXQAAAAACXQAAAAADXQAAAAADXQAAAAABXQAAAAADXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAACfgAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAXQAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAABfgAAAAAAYAAAAAAAYAAAAAABHwAAAAABHwAAAAADfgAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAADXQAAAAABYAAAAAAAYAAAAAADJAAAAAABHwAAAAADfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAABfgAAAAAAYAAAAAADYAAAAAADJAAAAAACHwAAAAABfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAYAAAAAACYAAAAAADJAAAAAABHwAAAAABfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAYAAAAAADYAAAAAABHwAAAAACHwAAAAABfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACYAAAAAACYAAAAAABHwAAAAACfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAYAAAAAACYAAAAAACHwAAAAABHwAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAABHwAAAAABfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAJgAAAAABfgAAAAAAfgAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAKAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAALgAAAAAA version: 6 0,1: ind: 0,1 @@ -201,11 +201,11 @@ entities: version: 6 -1,-2: ind: -1,-2 - tiles: HwAAAAAAfgAAAAAAXQAAAAAAEQAAAAAAHwAAAAAAEQAAAAAAHwAAAAAAEQAAAAAAHwAAAAAAEQAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAEQAAAAAAHwAAAAAAEQAAAAAAHwAAAAAAEQAAAAAAHwAAAAAAEQAAAAAAHwAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAADHwAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAHwAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACHwAAAAAAfgAAAAAAHwAAAAAAEQAAAAAAHwAAAAAAEQAAAAAAHwAAAAAAEQAAAAAAHwAAAAAAEQAAAAAAHwAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAHwAAAAAAEQAAAAAAHwAAAAAAEQAAAAAAHwAAAAAAEQAAAAAAHwAAAAAAEQAAAAAAHwAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAACbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAAAfgAAAAAAcAAAAAACcAAAAAABcAAAAAADcAAAAAAAfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAABfgAAAAAAcAAAAAADcAAAAAAAcAAAAAABcAAAAAACfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAABfgAAAAAAcAAAAAACcAAAAAADcAAAAAABcAAAAAABfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAABcAAAAAADcAAAAAACcAAAAAADcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAcAAAAAADcAAAAAAAcAAAAAACcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAACcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAA + tiles: HwAAAAAAfgAAAAAAXQAAAAAAEQAAAAAATQAAAAAAEQAAAAAATQAAAAAAEQAAAAAATQAAAAAAEQAAAAAATQAAAAAAfgAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAHwAAAAAAXQAAAAAAXQAAAAAAEQAAAAAATQAAAAAAEQAAAAAATQAAAAAAEQAAAAAATQAAAAAAEQAAAAAATQAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAADHwAAAAAAfgAAAAAATQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAATQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACHwAAAAAAfgAAAAAATQAAAAAAEQAAAAAATQAAAAAAEQAAAAAATQAAAAAAEQAAAAAATQAAAAAAEQAAAAAATQAAAAAAfgAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAABfgAAAAAAfgAAAAAATQAAAAAAEQAAAAAATQAAAAAAEQAAAAAATQAAAAAAEQAAAAAATQAAAAAAEQAAAAAATQAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAACbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAXQAAAAAAXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAAAfgAAAAAAcAAAAAACcAAAAAABcAAAAAADcAAAAAAAfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAABfgAAAAAAcAAAAAADcAAAAAAAcAAAAAABcAAAAAACfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAABfgAAAAAAcAAAAAACcAAAAAADcAAAAAABcAAAAAABfgAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAABcAAAAAADcAAAAAACcAAAAAADcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAcAAAAAADcAAAAAAAcAAAAAACcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAAAcAAAAAACcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAA version: 6 -2,-2: ind: -2,-2 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABfgAAAAAAegAAAAADegAAAAACegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACcAAAAAACcAAAAAABfgAAAAAAHwAAAAADHwAAAAACHwAAAAACfgAAAAAAcAAAAAADcAAAAAAAcAAAAAADfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAcAAAAAACeQAAAAACcAAAAAADHwAAAAACHwAAAAABHwAAAAABHwAAAAADHwAAAAADcAAAAAACeQAAAAACcAAAAAADDAAAAAADcAAAAAACcAAAAAACcAAAAAAAfgAAAAAAcAAAAAAAeQAAAAABcAAAAAACfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAcAAAAAACeQAAAAABcAAAAAAADAAAAAACcAAAAAACcAAAAAAAcAAAAAADfgAAAAAAcAAAAAACeQAAAAABcAAAAAACfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAcAAAAAADeQAAAAAAcAAAAAADcAAAAAAAcAAAAAADcAAAAAADcAAAAAABfgAAAAAAcAAAAAAAeQAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADeQAAAAABcAAAAAACDAAAAAABcAAAAAADcAAAAAABcAAAAAAAfgAAAAAAcAAAAAABeQAAAAADcAAAAAABfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAcAAAAAAAeQAAAAACcAAAAAACDAAAAAAAcAAAAAAAcAAAAAAAcAAAAAADcAAAAAACcAAAAAABeQAAAAAAcAAAAAADfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAcAAAAAACeQAAAAAAcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADeQAAAAACcAAAAAAAHwAAAAACHwAAAAABHwAAAAADHwAAAAACHwAAAAABcAAAAAAAeQAAAAADcAAAAAACfgAAAAAAeQAAAAABeQAAAAADeQAAAAAA + tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABfgAAAAAAegAAAAADegAAAAACegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAACcAAAAAACcAAAAAABfgAAAAAAHwAAAAADHwAAAAACHwAAAAACfgAAAAAAcAAAAAADcAAAAAAAcAAAAAADfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAcAAAAAACeQAAAAACcAAAAAADHwAAAAACHwAAAAABHwAAAAABHwAAAAADHwAAAAADcAAAAAACeQAAAAACcAAAAAADDAAAAAADcAAAAAACcAAAAAACcAAAAAAAfgAAAAAAcAAAAAAAeQAAAAABcAAAAAACfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAcAAAAAACeQAAAAABcAAAAAAADAAAAAACcAAAAAACcAAAAAAAcAAAAAADfgAAAAAAcAAAAAACeQAAAAABcAAAAAACfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAcAAAAAADeQAAAAAAcAAAAAADcAAAAAAAcAAAAAADcAAAAAADcAAAAAABfgAAAAAAcAAAAAAAeQAAAAAAcAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADeQAAAAABcAAAAAACDAAAAAABcAAAAAADcAAAAAABcAAAAAAAfgAAAAAAcAAAAAABeQAAAAADcAAAAAABfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAcAAAAAAAeQAAAAACcAAAAAACDAAAAAAAcAAAAAAAcAAAAAAAcAAAAAADcAAAAAACcAAAAAABeQAAAAAAcAAAAAADfgAAAAAALgAAAAAALgAAAAAALgAAAAAAfgAAAAAAcAAAAAACeQAAAAAAcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADeQAAAAACcAAAAAAAHwAAAAACHwAAAAABHwAAAAADHwAAAAACHwAAAAABcAAAAAAAeQAAAAADcAAAAAACfgAAAAAAeQAAAAABeQAAAAADeQAAAAAA version: 6 -3,-2: ind: -3,-2 @@ -582,7 +582,6 @@ entities: 2392: 7,35 2425: -4,-29 2426: -33,10 - 2427: -26,13 2428: -14,5 2429: 6,6 2430: -6,-9 @@ -595,7 +594,6 @@ entities: 2741: -20,-5 2840: 18,16 2841: 20,16 - 2853: 12,14 2856: 14,-18 2898: -6,-48 2899: -6,-49 @@ -611,6 +609,8 @@ entities: 3033: 4,-51 3037: -4,-48 3038: -3,-48 + 3071: 12,14 + 3076: 2,-51 - node: color: '#FFFFFFFF' id: BotGreyscale @@ -1776,21 +1776,6 @@ entities: 2622: -33,-16 2623: -34,-16 2624: -35,-16 - - node: - color: '#9FED5896' - id: CheckerNESW - decals: - 2787: -28,13 - 2788: -27,13 - 2789: -29,12 - 2790: -28,11 - 2791: -27,11 - 2792: -29,10 - 2793: -28,9 - 2794: -27,9 - 2795: -29,8 - 2796: -28,7 - 2797: -27,7 - node: color: '#D4D4D496' id: CheckerNESW @@ -1816,12 +1801,6 @@ entities: 2714: -30,-8 2715: -31,-8 2716: -31,-7 - - node: - color: '#724276FF' - id: CheckerNWSE - decals: - 2842: 19,13 - 2843: 18,13 - node: color: '#79150096' id: CheckerNWSE @@ -1840,6 +1819,18 @@ entities: 31: -13,14 32: -14,13 33: -14,14 + - node: + color: '#9FED5896' + id: CheckerNWSE + decals: + 3077: -26,9 + 3078: -27,9 + 3079: -28,9 + 3080: -29,9 + 3081: -29,11 + 3082: -28,11 + 3083: -27,11 + 3084: -26,11 - node: color: '#A4610696' id: CheckerNWSE @@ -1853,6 +1844,13 @@ entities: 1010: 31,0 1011: 31,1 1012: 31,2 + - node: + color: '#D381C93E' + id: CheckerNWSE + decals: + 3051: 17,13 + 3052: 18,13 + 3053: 19,13 - node: color: '#EFB34196' id: CheckerNWSE @@ -2351,11 +2349,6 @@ entities: color: '#9FED5896' id: FullTileOverlayGreyscale decals: - 2798: -29,7 - 2799: -29,9 - 2800: -29,11 - 2801: -29,13 - 2802: -26,13 2803: -23,13 2804: -23,12 2805: -24,5 @@ -2596,13 +2589,6 @@ entities: 2734: -22,-8 2735: -21,-8 2736: -20,-8 - - node: - color: '#724276FF' - id: HalfTileOverlayGreyscale - decals: - 2817: 17,16 - 2829: 19,15 - 2839: 16,12 - node: color: '#79150096' id: HalfTileOverlayGreyscale @@ -2648,6 +2634,13 @@ entities: 1251: 18,23 1252: 17,23 1253: 16,23 + - node: + color: '#D381C93E' + id: HalfTileOverlayGreyscale + decals: + 3072: 21,16 + 3073: 22,16 + 3074: 23,16 - node: color: '#D381C996' id: HalfTileOverlayGreyscale @@ -2778,20 +2771,6 @@ entities: 2726: -23,-13 2727: -24,-13 2728: -25,-13 - - node: - color: '#724276FF' - id: HalfTileOverlayGreyscale180 - decals: - 2813: 20,10 - 2814: 19,10 - 2815: 18,10 - 2816: 17,10 - 2818: 22,7 - 2819: 23,7 - 2838: 16,10 - 2846: 12,14 - 2847: 13,14 - 2848: 14,14 - node: color: '#79150096' id: HalfTileOverlayGreyscale180 @@ -2862,6 +2841,18 @@ entities: 1106: 28,-8 1107: 29,-8 1108: 30,-8 + - node: + color: '#D381C93E' + id: HalfTileOverlayGreyscale180 + decals: + 3045: 14,14 + 3046: 12,14 + 3057: 22,7 + 3058: 23,7 + 3062: 17,10 + 3063: 18,10 + 3064: 19,10 + 3065: 20,10 - node: color: '#D381C996' id: HalfTileOverlayGreyscale180 @@ -2968,13 +2959,6 @@ entities: 2730: -26,-9 2952: -6,-28 2953: -6,-29 - - node: - color: '#724276FF' - id: HalfTileOverlayGreyscale270 - decals: - 2820: 21,8 - 2821: 21,9 - 2828: 21,17 - node: color: '#9FED5896' id: HalfTileOverlayGreyscale270 @@ -2998,6 +2982,12 @@ entities: 935: 27,2 2950: -10,-28 2951: -10,-29 + - node: + color: '#D381C93E' + id: HalfTileOverlayGreyscale270 + decals: + 3059: 21,8 + 3060: 21,9 - node: color: '#D381C996' id: HalfTileOverlayGreyscale270 @@ -3103,20 +3093,6 @@ entities: 2738: -18,-12 2954: -8,-28 2955: -8,-29 - - node: - color: '#724276FF' - id: HalfTileOverlayGreyscale90 - decals: - 2822: 23,12 - 2823: 23,13 - 2824: 23,14 - 2825: 23,15 - 2826: 23,16 - 2827: 23,17 - 2849: 15,15 - 2850: 15,16 - 2851: 15,17 - 2852: 15,18 - node: color: '#9FED5896' id: HalfTileOverlayGreyscale90 @@ -3124,6 +3100,7 @@ entities: 2807: -24,8 2960: -14,-28 2961: -14,-29 + 3085: -24,7 - node: color: '#A4610696' id: HalfTileOverlayGreyscale90 @@ -3139,6 +3116,14 @@ entities: decals: 1047: 21,-6 1048: 21,-5 + - node: + color: '#D381C93E' + id: HalfTileOverlayGreyscale90 + decals: + 3047: 15,15 + 3048: 15,16 + 3049: 15,17 + 3050: 15,18 - node: color: '#D381C996' id: HalfTileOverlayGreyscale90 @@ -3308,13 +3293,6 @@ entities: 551: -15,-5 2752: -22,-12 2753: -22,-10 - - node: - color: '#724276FF' - id: QuarterTileOverlayGreyscale - decals: - 2830: 20,15 - 2831: 21,16 - 2836: 17,12 - node: color: '#79150096' id: QuarterTileOverlayGreyscale @@ -3356,6 +3334,14 @@ entities: decals: 562: 3,-2 585: 11,-9 + - node: + color: '#D381C93E' + id: QuarterTileOverlayGreyscale + decals: + 3067: 17,12 + 3068: 17,14 + 3069: 17,15 + 3070: 17,16 - node: color: '#D381C996' id: QuarterTileOverlayGreyscale @@ -3784,12 +3770,6 @@ entities: 2751: -20,-9 2762: -24,-11 2763: -24,-9 - - node: - color: '#724276FF' - id: QuarterTileOverlayGreyscale270 - decals: - 2832: 21,10 - 2837: 17,14 - node: color: '#79150096' id: QuarterTileOverlayGreyscale270 @@ -3811,6 +3791,11 @@ entities: 2333: 9,1 2334: 10,1 2335: 11,1 + - node: + color: '#D381C93E' + id: QuarterTileOverlayGreyscale270 + decals: + 3066: 21,10 - node: color: '#D381C996' id: QuarterTileOverlayGreyscale270 @@ -3993,12 +3978,6 @@ entities: 2750: -21,-10 2760: -25,-10 2761: -25,-12 - - node: - color: '#724276FF' - id: QuarterTileOverlayGreyscale90 - decals: - 2833: 18,15 - 2834: 23,11 - node: color: '#A4610696' id: QuarterTileOverlayGreyscale90 @@ -4218,6 +4197,11 @@ entities: 2749: -20,-10 2758: -24,-12 2759: -24,-10 + - node: + color: '#D381C93E' + id: ThreeQuarterTileOverlayGreyscale + decals: + 3055: 16,12 - node: color: '#EFB34196' id: ThreeQuarterTileOverlayGreyscale @@ -4229,10 +4213,10 @@ entities: decals: 2722: -18,-13 - node: - color: '#724276FF' + color: '#D381C93E' id: ThreeQuarterTileOverlayGreyscale180 decals: - 2845: 15,14 + 3044: 15,14 - node: color: '#D381C996' id: ThreeQuarterTileOverlayGreyscale180 @@ -4246,11 +4230,11 @@ entities: 2754: -22,-9 2755: -22,-11 - node: - color: '#724276FF' + color: '#D381C93E' id: ThreeQuarterTileOverlayGreyscale270 decals: - 2835: 21,7 - 2844: 17,13 + 3054: 16,10 + 3056: 21,7 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale90 @@ -4335,10 +4319,10 @@ entities: decals: 1733: 5,21 2070: 2,-35 - 2810: 13,12 2877: -8,-53 2902: -5,-52 2999: -17,-56 + 3041: 12,12 - node: color: '#FFFFFFFF' id: WarnCornerSW @@ -4347,6 +4331,7 @@ entities: 2069: 0,-35 2879: -14,-53 2998: -19,-56 + 3042: 14,12 - node: color: '#FFFFFFFF' id: WarnCornerSmallNE @@ -4588,7 +4573,6 @@ entities: 2074: 1,-35 2348: -26,-58 2349: -27,-58 - 2811: 12,12 2857: 15,-19 2858: 16,-19 2859: 17,-19 @@ -4669,7 +4653,6 @@ entities: 2362: -11,-58 2812: 12,10 2854: 13,10 - 2855: 14,10 2860: 15,-19 2861: 16,-19 2862: 17,-19 @@ -4691,6 +4674,7 @@ entities: 3000: -18,-53 3039: -4,-48 3040: -3,-48 + 3075: 14,10 - node: angle: -3.141592653589793 rad color: '#FFFFFFFF' @@ -5538,7 +5522,8 @@ entities: -11,13: 0: 65535 -11,14: - 0: 65535 + 0: 65527 + 2: 8 -11,15: 0: 16383 -10,12: @@ -5546,7 +5531,8 @@ entities: -10,13: 0: 65535 -10,14: - 0: 65535 + 0: 65533 + 2: 2 -10,15: 0: 49151 -9,12: @@ -6062,16 +6048,16 @@ entities: 5,-5: 0: 65535 6,-8: - 0: 7967 - 2: 224 - 3: 57344 - 6,-7: 0: 7967 3: 224 4: 57344 + 6,-7: + 0: 7967 + 4: 224 + 5: 57344 6,-6: 0: 65311 - 5: 224 + 6: 224 6,-5: 0: 65535 7,-8: @@ -6120,7 +6106,7 @@ entities: 0: 65535 6,-9: 0: 7967 - 3: 57568 + 4: 57568 7,-9: 0: 13107 -4,-12: @@ -6711,7 +6697,7 @@ entities: 0: 65280 -16,14: 0: 52862 - 2: 128 + 3: 128 -16,15: 0: 3976 -16,13: @@ -7443,6 +7429,21 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.14975 + moles: + - 20.078888 + - 75.53487 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - volume: 2500 temperature: 293.15 moles: @@ -7736,7 +7737,6 @@ entities: - 13085 - 18074 - 18214 - - 17912 - 18601 - 18212 - 13073 @@ -8906,13 +8906,6 @@ entities: - type: Transform pos: 26.5,32.5 parent: 30 - - uid: 7438 - components: - - type: MetaData - name: Space Bucks - - type: Transform - pos: 0.5,-5.5 - parent: 30 - uid: 12455 components: - type: Transform @@ -9497,6 +9490,11 @@ entities: - type: Transform pos: -62.5,43.5 parent: 30 + - uid: 18213 + components: + - type: Transform + pos: -4.5,-29.5 + parent: 30 - uid: 18927 components: - type: Transform @@ -10987,7 +10985,7 @@ entities: pos: -20.5,-5.5 parent: 30 - type: Door - secondsUntilStateChange: -19887.758 + secondsUntilStateChange: -21094.865 state: Opening - type: DeviceLinkSource lastSignals: @@ -11151,11 +11149,10 @@ entities: - type: Transform pos: 34.5,8.5 parent: 30 - - uid: 14335 + - uid: 16172 components: - type: Transform - rot: 3.141592653589793 rad - pos: 14.5,13.5 + pos: 13.5,13.5 parent: 30 - proto: AirlockSecurityGlassLocked entities: @@ -13430,10 +13427,10 @@ entities: current: TheBirdCage - proto: BarSignSpacebucks entities: - - uid: 998 + - uid: 342 components: - type: Transform - pos: -0.5,-10.5 + pos: 1.5,-5.5 parent: 30 - proto: BaseComputer entities: @@ -14708,11 +14705,6 @@ entities: parent: 30 - proto: Bucket entities: - - uid: 323 - components: - - type: Transform - pos: -27.774437,12.342436 - parent: 30 - uid: 547 components: - type: Transform @@ -14728,6 +14720,11 @@ entities: - type: Transform pos: -24.119356,6.357745 parent: 30 + - uid: 18174 + components: + - type: Transform + pos: -30.79277,6.840554 + parent: 30 - uid: 19541 components: - type: Transform @@ -49742,10 +49739,10 @@ entities: - 0 - 0 - 0 - - uid: 17726 + - uid: 18856 components: - type: Transform - pos: 13.5,12.5 + pos: 14.5,12.5 parent: 30 - uid: 22224 components: @@ -51218,6 +51215,18 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage +- proto: ClothingOuterHardsuitSecurity + entities: + - uid: 20709 + components: + - type: Transform + pos: -37.400864,55.464325 + parent: 30 + - uid: 20710 + components: + - type: Transform + pos: -37.400864,55.464325 + parent: 30 - proto: ClothingOuterNunRobe entities: - uid: 17657 @@ -52645,8 +52654,6 @@ entities: - type: Transform pos: -13.5,-48.5 parent: 30 - - type: Lock - locked: False - proto: CrateEngineeringAMEShielding entities: - uid: 19186 @@ -59785,6 +59792,43 @@ entities: - type: Transform pos: -32.550377,-19.499231 parent: 30 +- proto: Emitter + entities: + - uid: 18857 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -24.5,-63.5 + parent: 30 + - uid: 20703 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,-71.5 + parent: 30 + - uid: 20704 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -24.5,-71.5 + parent: 30 + - uid: 20705 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,-63.5 + parent: 30 + - uid: 20706 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -13.5,-74.5 + parent: 30 + - uid: 20707 + components: + - type: Transform + pos: -21.5,-60.5 + parent: 30 - proto: EmitterFlatpack entities: - uid: 16130 @@ -62404,6 +62448,11 @@ entities: - type: Transform pos: -46.5,28.5 parent: 30 + - uid: 16242 + components: + - type: Transform + pos: 13.5,13.5 + parent: 30 - uid: 16740 components: - type: Transform @@ -62438,15 +62487,6 @@ entities: - type: DeviceNetwork deviceLists: - 14365 - - uid: 17912 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 14.5,13.5 - parent: 30 - - type: DeviceNetwork - deviceLists: - - 14365 - uid: 18069 components: - type: Transform @@ -63473,6 +63513,14 @@ entities: rot: -1.5707963267948966 rad pos: 36.5,9.5 parent: 30 +- proto: GasMixerFlipped + entities: + - uid: 9464 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-48.5 + parent: 30 - proto: GasOutletInjector entities: - uid: 8693 @@ -63610,6 +63658,14 @@ entities: - type: Transform pos: 38.5,12.5 parent: 30 + - uid: 20708 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,-57.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 21275 components: - type: Transform @@ -64250,6 +64306,14 @@ entities: parent: 30 - type: AtmosPipeColor color: '#FF0000FF' + - uid: 8933 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,-57.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 8944 components: - type: Transform @@ -64295,14 +64359,6 @@ entities: parent: 30 - type: AtmosPipeColor color: '#EB9834FF' - - uid: 9213 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -5.5,-55.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF0000FF' - uid: 9262 components: - type: Transform @@ -64310,14 +64366,6 @@ entities: parent: 30 - type: AtmosPipeColor color: '#FF0000FF' - - uid: 9295 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -4.5,-57.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF0000FF' - uid: 9428 components: - type: Transform @@ -64390,11 +64438,11 @@ entities: - uid: 9790 components: - type: Transform - rot: 3.141592653589793 rad - pos: -5.5,-57.5 + rot: 1.5707963267948966 rad + pos: -5.5,-55.5 parent: 30 - type: AtmosPipeColor - color: '#FF0000FF' + color: '#FF1212FF' - uid: 9813 components: - type: Transform @@ -65003,14 +65051,6 @@ entities: parent: 30 - type: AtmosPipeColor color: '#FF0000FF' - - uid: 20654 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 3.5,-50.5 - parent: 30 - - type: AtmosPipeColor - color: '#03FCD3FF' - uid: 20663 components: - type: Transform @@ -75166,6 +75206,14 @@ entities: parent: 30 - type: AtmosPipeColor color: '#FF0000FF' + - uid: 9818 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -5.5,-56.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 9834 components: - type: Transform @@ -75327,7 +75375,7 @@ entities: pos: -4.5,-54.5 parent: 30 - type: AtmosPipeColor - color: '#FF0000FF' + color: '#FF1212FF' - uid: 9979 components: - type: Transform @@ -83632,6 +83680,28 @@ entities: parent: 30 - type: AtmosPipeColor color: '#FF0000FF' + - uid: 9213 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,-55.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 9216 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-50.5 + parent: 30 + - uid: 9295 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-57.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 9353 components: - type: Transform @@ -83723,14 +83793,6 @@ entities: parent: 30 - type: AtmosPipeColor color: '#0000FFFF' - - uid: 9818 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -4.5,-55.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF0000FF' - uid: 9847 components: - type: Transform @@ -84742,12 +84804,6 @@ entities: parent: 30 - type: AtmosPipeColor color: '#FF0000FF' - - uid: 20673 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -3.5,-48.5 - parent: 30 - uid: 22014 components: - type: Transform @@ -85067,7 +85123,7 @@ entities: - type: GasValve open: False - type: AtmosPipeColor - color: '#FF0000FF' + color: '#FF1212FF' - uid: 20649 components: - type: Transform @@ -87967,13 +88023,6 @@ entities: color: '#FF0000FF' - proto: GasVolumePump entities: - - uid: 9216 - components: - - type: Transform - pos: -5.5,-56.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF0000FF' - uid: 9373 components: - type: Transform @@ -94744,20 +94793,19 @@ entities: parent: 30 - proto: HeatExchanger entities: + - uid: 9159 + components: + - type: Transform + pos: -4.5,-56.5 + parent: 30 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 9651 components: - type: Transform rot: 3.141592653589793 rad pos: 3.5,-56.5 parent: 30 - - uid: 11122 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -4.5,-56.5 - parent: 30 - - type: AtmosPipeColor - color: '#FF0000FF' - uid: 20644 components: - type: Transform @@ -94933,10 +94981,10 @@ entities: - type: Transform pos: -45.453583,69.54325 parent: 30 - - uid: 18857 + - uid: 14335 components: - type: Transform - pos: -28.537731,11.513851 + pos: -28.442305,8.528054 parent: 30 - uid: 19544 components: @@ -94957,10 +95005,10 @@ entities: - type: Transform pos: -45.386658,69.59978 parent: 30 - - uid: 18858 + - uid: 16135 components: - type: Transform - pos: -28.478325,11.558405 + pos: -28.45793,8.621804 parent: 30 - uid: 19542 components: @@ -94984,16 +95032,6 @@ entities: - type: Transform pos: -21.5,12.5 parent: 30 - - uid: 341 - components: - - type: Transform - pos: -27.5,13.5 - parent: 30 - - uid: 342 - components: - - type: Transform - pos: -26.5,13.5 - parent: 30 - uid: 2339 components: - type: Transform @@ -95034,15 +95072,30 @@ entities: - type: Transform pos: -47.5,69.5 parent: 30 + - uid: 14334 + components: + - type: Transform + pos: -26.5,9.5 + parent: 30 + - uid: 16136 + components: + - type: Transform + pos: -27.5,9.5 + parent: 30 + - uid: 16137 + components: + - type: Transform + pos: -28.5,11.5 + parent: 30 - uid: 16138 components: - type: Transform - pos: -28.5,12.5 + pos: -27.5,11.5 parent: 30 - uid: 16139 components: - type: Transform - pos: -27.5,11.5 + pos: -25.5,11.5 parent: 30 - uid: 16163 components: @@ -95052,32 +95105,12 @@ entities: - uid: 16165 components: - type: Transform - pos: -28.5,10.5 - parent: 30 - - uid: 16172 - components: - - type: Transform - pos: -27.5,9.5 - parent: 30 - - uid: 16242 - components: - - type: Transform - pos: -26.5,9.5 - parent: 30 - - uid: 18174 - components: - - type: Transform - pos: -26.5,7.5 + pos: -28.5,9.5 parent: 30 - uid: 18184 components: - type: Transform - pos: -27.5,7.5 - parent: 30 - - uid: 18856 - components: - - type: Transform - pos: -28.5,8.5 + pos: -25.5,9.5 parent: 30 - proto: InflatableDoorStack entities: @@ -96731,6 +96764,12 @@ entities: parent: 30 - proto: JanitorServiceLight entities: + - uid: 341 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 14.5,14.5 + parent: 30 - uid: 844 components: - type: Transform @@ -96754,12 +96793,6 @@ entities: rot: -1.5707963267948966 rad pos: -8.5,-0.5 parent: 30 - - uid: 16403 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 13.5,14.5 - parent: 30 - proto: JetpackBlueFilled entities: - uid: 5722 @@ -97023,6 +97056,12 @@ entities: - type: Transform pos: -77.46411,-65.291664 parent: 30 + - uid: 20702 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -7.7135324,-33.95857 + parent: 30 - uid: 21649 components: - type: Transform @@ -100800,12 +100839,6 @@ entities: - type: Transform pos: 3.5,-35.5 parent: 30 - - uid: 19795 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 13.5,13.5 - parent: 30 - proto: PosterLegitSafetyMothEpi entities: - uid: 9812 @@ -106575,11 +106608,6 @@ entities: - type: Transform pos: -29.5,36.5 parent: 30 - - uid: 3708 - components: - - type: Transform - pos: -3.5,-29.5 - parent: 30 - uid: 3709 components: - type: Transform @@ -110634,6 +110662,16 @@ entities: - type: Transform pos: -15.490766,-37.49464 parent: 30 + - uid: 20715 + components: + - type: Transform + pos: -25.514673,-43.671646 + parent: 30 + - uid: 20716 + components: + - type: Transform + pos: -25.514673,-43.671646 + parent: 30 - proto: SheetPlasma entities: - uid: 11365 @@ -110684,6 +110722,31 @@ entities: - type: Transform pos: -21.505291,-47.848297 parent: 30 + - uid: 20654 + components: + - type: Transform + pos: -9.197907,-34.442944 + parent: 30 + - uid: 20673 + components: + - type: Transform + pos: -9.197907,-34.442944 + parent: 30 + - uid: 20717 + components: + - type: Transform + pos: -25.514673,-44.53102 + parent: 30 + - uid: 20718 + components: + - type: Transform + pos: -25.514673,-44.53102 + parent: 30 + - uid: 20719 + components: + - type: Transform + pos: -21.514673,-47.84352 + parent: 30 - proto: SheetPlasteel10 entities: - uid: 15989 @@ -110725,6 +110788,16 @@ entities: - type: Transform pos: -39.029526,27.478249 parent: 30 + - uid: 17726 + components: + - type: Transform + pos: -8.791859,-34.493073 + parent: 30 + - uid: 20712 + components: + - type: Transform + pos: -8.791859,-34.493073 + parent: 30 - proto: SheetSteel entities: - uid: 1349 @@ -110807,6 +110880,31 @@ entities: - type: Transform pos: -52.674896,-62.391804 parent: 30 + - uid: 18858 + components: + - type: Transform + pos: -9.526032,-34.45857 + parent: 30 + - uid: 19795 + components: + - type: Transform + pos: -9.526032,-34.45857 + parent: 30 + - uid: 20713 + components: + - type: Transform + pos: -25.545923,-43.296646 + parent: 30 + - uid: 20714 + components: + - type: Transform + pos: -25.545923,-43.296646 + parent: 30 + - uid: 20720 + components: + - type: Transform + pos: -21.483423,-47.53102 + parent: 30 - proto: SheetUranium entities: - uid: 19800 @@ -111632,6 +111730,15 @@ entities: - Pressed: Toggle 7992: - Pressed: Toggle + - uid: 3708 + components: + - type: Transform + pos: 18.5,17.5 + parent: 30 + - type: DeviceLinkSource + linkedPorts: + 341: + - Pressed: Toggle - uid: 4731 components: - type: Transform @@ -111820,17 +111927,6 @@ entities: linkedPorts: 6415: - Pressed: DoorBolt - - uid: 18213 - components: - - type: MetaData - name: janitor light button - - type: Transform - pos: 18.5,17.5 - parent: 30 - - type: DeviceLinkSource - linkedPorts: - 16403: - - Pressed: Toggle - uid: 20432 components: - type: Transform @@ -112551,11 +112647,6 @@ entities: - type: Transform pos: -36.5,-1.5 parent: 30 - - uid: 9464 - components: - - type: Transform - pos: -4.5,-28.5 - parent: 30 - uid: 15973 components: - type: Transform @@ -113059,6 +113150,11 @@ entities: parent: 30 - proto: SignTelecomms entities: + - uid: 17912 + components: + - type: Transform + pos: -4.5,-28.5 + parent: 30 - uid: 20635 components: - type: Transform @@ -116202,11 +116298,47 @@ entities: - type: Transform pos: -38.5,56.5 parent: 30 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14673 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - uid: 782 components: - type: Transform pos: -40.5,56.5 parent: 30 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14673 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - proto: SuitStorageWarden entities: - uid: 5052 @@ -116405,6 +116537,17 @@ entities: - SurveillanceCameraEngineering nameSet: True id: Atmos Storage + - uid: 16403 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,-27.5 + parent: 30 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEngineering + nameSet: True + id: Telecomms - uid: 21211 components: - type: Transform @@ -118731,6 +118874,12 @@ entities: - type: Transform pos: -25.5,-15.5 parent: 30 + - uid: 9980 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -28.5,8.5 + parent: 30 - uid: 12653 components: - type: Transform @@ -118746,11 +118895,6 @@ entities: - type: Transform pos: -4.5,-10.5 parent: 30 - - uid: 16137 - components: - - type: Transform - pos: -28.5,11.5 - parent: 30 - uid: 20282 components: - type: Transform @@ -121021,10 +121165,10 @@ entities: parent: 30 - proto: VendingMachineNutri entities: - - uid: 16135 + - uid: 998 components: - type: Transform - pos: -28.5,9.5 + pos: -28.5,13.5 parent: 30 - proto: VendingMachineRoboDrobe entities: @@ -121072,10 +121216,10 @@ entities: parent: 30 - proto: VendingMachineSeeds entities: - - uid: 16136 + - uid: 11122 components: - type: Transform - pos: -28.5,13.5 + pos: -28.5,12.5 parent: 30 - proto: VendingMachineSeedsUnlocked entities: @@ -124448,6 +124592,11 @@ entities: - type: Transform pos: -31.5,-22.5 parent: 30 + - uid: 7438 + components: + - type: Transform + pos: 14.5,13.5 + parent: 30 - uid: 7444 components: - type: Transform @@ -125533,11 +125682,6 @@ entities: rot: 3.141592653589793 rad pos: 29.5,-19.5 parent: 30 - - uid: 9159 - components: - - type: Transform - pos: -4.5,-29.5 - parent: 30 - uid: 9183 components: - type: Transform @@ -127845,12 +127989,6 @@ entities: rot: -1.5707963267948966 rad pos: -21.5,-53.5 parent: 30 - - uid: 14334 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 13.5,13.5 - parent: 30 - uid: 14506 components: - type: Transform @@ -131013,6 +131151,11 @@ entities: - type: Transform pos: -25.5,24.5 parent: 30 + - uid: 323 + components: + - type: Transform + pos: 0.5,-5.5 + parent: 30 - uid: 351 components: - type: Transform From 1caddfa1106d8be58fc281ed1e1998ab345bf736 Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Tue, 6 Aug 2024 17:29:36 -0600 Subject: [PATCH 223/422] packed update (#30716) --- Resources/Maps/packed.yml | 135 ++++++++++++++++++++++++++------------ 1 file changed, 94 insertions(+), 41 deletions(-) diff --git a/Resources/Maps/packed.yml b/Resources/Maps/packed.yml index ac6404412c..65b741097c 100644 --- a/Resources/Maps/packed.yml +++ b/Resources/Maps/packed.yml @@ -7162,7 +7162,7 @@ entities: pos: 24.5,-39.5 parent: 2 - type: Door - secondsUntilStateChange: -191.21292 + secondsUntilStateChange: -432.36554 state: Opening - type: DeviceLinkSource lastSignals: @@ -8885,13 +8885,6 @@ entities: rot: -1.5707963267948966 rad pos: 28.5,7.5 parent: 2 - - uid: 4309 - components: - - type: MetaData - name: Singulo APC - - type: Transform - pos: 17.5,-37.5 - parent: 2 - uid: 4325 components: - type: MetaData @@ -9063,6 +9056,14 @@ entities: rot: 1.5707963267948966 rad pos: 2.5,-4.5 parent: 2 + - uid: 5577 + components: + - type: MetaData + name: Singulo APC + - type: Transform + rot: 1.5707963267948966 rad + pos: 15.5,-39.5 + parent: 2 - uid: 5648 components: - type: MetaData @@ -10681,6 +10682,11 @@ entities: - type: Transform pos: 56.5,-3.5 parent: 2 + - uid: 4318 + components: + - type: Transform + pos: 16.5,-39.5 + parent: 2 - uid: 4677 components: - type: Transform @@ -11546,16 +11552,6 @@ entities: - type: Transform pos: 40.5,-44.5 parent: 2 - - uid: 5577 - components: - - type: Transform - pos: 17.5,-37.5 - parent: 2 - - uid: 5578 - components: - - type: Transform - pos: 17.5,-38.5 - parent: 2 - uid: 5579 components: - type: Transform @@ -12076,6 +12072,11 @@ entities: - type: Transform pos: 42.5,-10.5 parent: 2 + - uid: 6769 + components: + - type: Transform + pos: 15.5,-39.5 + parent: 2 - uid: 6829 components: - type: Transform @@ -18967,6 +18968,11 @@ entities: - type: Transform pos: 17.5,-40.5 parent: 2 + - uid: 4308 + components: + - type: Transform + pos: 16.5,-37.5 + parent: 2 - uid: 4335 components: - type: Transform @@ -22402,6 +22408,16 @@ entities: - type: Transform pos: 43.5,27.5 parent: 2 + - uid: 8446 + components: + - type: Transform + pos: 16.5,-36.5 + parent: 2 + - uid: 8447 + components: + - type: Transform + pos: 16.5,-35.5 + parent: 2 - uid: 8818 components: - type: Transform @@ -23872,15 +23888,10 @@ entities: - type: Transform pos: 22.5,7.5 parent: 2 - - uid: 4308 + - uid: 4309 components: - type: Transform - pos: 17.5,-37.5 - parent: 2 - - uid: 4312 - components: - - type: Transform - pos: 17.5,-36.5 + pos: 15.5,-39.5 parent: 2 - uid: 4605 components: @@ -24237,10 +24248,10 @@ entities: - type: Transform pos: 62.5,-6.5 parent: 2 - - uid: 5576 + - uid: 5578 components: - type: Transform - pos: 17.5,-35.5 + pos: 13.5,-41.5 parent: 2 - uid: 5608 components: @@ -24277,15 +24288,15 @@ entities: - type: Transform pos: 19.5,-13.5 parent: 2 + - uid: 6766 + components: + - type: Transform + pos: 14.5,-41.5 + parent: 2 - uid: 6768 components: - type: Transform - pos: 15.5,-42.5 - parent: 2 - - uid: 6769 - components: - - type: Transform - pos: 14.5,-42.5 + pos: 15.5,-41.5 parent: 2 - uid: 6770 components: @@ -24322,6 +24333,21 @@ entities: - type: Transform pos: 21.5,-39.5 parent: 2 + - uid: 6942 + components: + - type: Transform + pos: 16.5,-41.5 + parent: 2 + - uid: 6943 + components: + - type: Transform + pos: 16.5,-40.5 + parent: 2 + - uid: 6944 + components: + - type: Transform + pos: 16.5,-39.5 + parent: 2 - uid: 6955 components: - type: Transform @@ -25262,6 +25288,16 @@ entities: - type: Transform pos: -15.5,-15.5 parent: 2 + - uid: 7781 + components: + - type: Transform + pos: 16.5,-38.5 + parent: 2 + - uid: 7782 + components: + - type: Transform + pos: 16.5,-37.5 + parent: 2 - uid: 8287 components: - type: Transform @@ -32781,6 +32817,23 @@ entities: - type: Transform pos: 52.52299,8.566419 parent: 2 +- proto: ClothingOuterHardsuitSecurity + entities: + - uid: 9478 + components: + - type: Transform + pos: 38.48357,28.698536 + parent: 2 + - uid: 9883 + components: + - type: Transform + pos: 38.48357,28.698536 + parent: 2 + - uid: 9884 + components: + - type: Transform + pos: 38.48357,28.698536 + parent: 2 - proto: ClothingOuterHospitalGown entities: - uid: 12499 @@ -68308,12 +68361,12 @@ entities: currentSupply: 60.000237 - proto: SubstationWallBasic entities: - - uid: 6766 + - uid: 5576 components: - type: MetaData - name: Singulo Emitter Substation + name: Singulo Substation - type: Transform - pos: 15.5,-42.5 + pos: 16.5,-37.5 parent: 2 - proto: SuitStorageAtmos entities: @@ -81160,16 +81213,16 @@ entities: - type: Transform pos: 28.5,-20.5 parent: 2 + - uid: 4312 + components: + - type: Transform + pos: 17.5,-37.5 + parent: 2 - uid: 4313 components: - type: Transform pos: 16.5,-37.5 parent: 2 - - uid: 4318 - components: - - type: Transform - pos: 17.5,-37.5 - parent: 2 - uid: 4319 components: - type: Transform From bd36ff93d2342312d80dac66e46295c2acfff396 Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Tue, 6 Aug 2024 17:50:39 -0600 Subject: [PATCH 224/422] train update (#30721) * train update * train --- Resources/Maps/train.yml | 17303 +++++++++++++++----------- Resources/Prototypes/Maps/train.yml | 5 +- 2 files changed, 9881 insertions(+), 7427 deletions(-) diff --git a/Resources/Maps/train.yml b/Resources/Maps/train.yml index f15e08aa88..caeb4d22cc 100644 --- a/Resources/Maps/train.yml +++ b/Resources/Maps/train.yml @@ -41,6 +41,7 @@ tilemap: 80: FloorShowroom 91: FloorSteel 93: FloorSteelCheckerDark + 1: FloorSteelCheckerLight 96: FloorSteelDiagonal 98: FloorSteelDirty 100: FloorSteelLime @@ -93,11 +94,11 @@ entities: version: 6 0,-1: ind: 0,-1 - tiles: ZwAAAAAAZwAAAAAAZwAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAZwAAAAAAZwAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAQAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAJQAAAAACIwAAAAAAMAAAAAACIwAAAAAAIwAAAAAAJQAAAAADfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAJQAAAAADIwAAAAAAMAAAAAADIwAAAAAAIwAAAAAAJQAAAAABfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAAAJQAAAAAAIwAAAAAAMAAAAAADIwAAAAAAIwAAAAAAJQAAAAABfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAJQAAAAADIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAJQAAAAABfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAJQAAAAADIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAJQAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAJQAAAAACIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAJQAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAJQAAAAADIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAJQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAJQAAAAACIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAJQAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAJQAAAAADIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAJQAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAJQAAAAABIwAAAAAAfAAAAAAAfAAAAAAAQAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAQAAAAAAAJQAAAAAAIwAAAAAAfAAAAAAAagAAAAAAfAAAAAAAagAAAAAAagAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAJQAAAAADIwAAAAAAfAAAAAAAagAAAAAAfAAAAAAAagAAAAAAagAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAQAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAA + tiles: WwAAAAAAWwAAAAAAWwAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAWwAAAAAAWwAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAQAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAJQAAAAABIwAAAAAAMAAAAAABIwAAAAAAIwAAAAAAJQAAAAABfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAJQAAAAABIwAAAAAAMAAAAAABIwAAAAAAIwAAAAAAJQAAAAADfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAAAJQAAAAABIwAAAAAAMAAAAAADIwAAAAAAIwAAAAAAJQAAAAADfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAJQAAAAABIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAJQAAAAACfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAJQAAAAABIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAJQAAAAACfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAJQAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAJQAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAJQAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAJQAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAJQAAAAACIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAJQAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAJQAAAAACIwAAAAAAIwAAAAAAIwAAAAAAIwAAAAAAJQAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAJQAAAAACIwAAAAAAfAAAAAAAfAAAAAAAQAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAQAAAAAAAJQAAAAABIwAAAAAAfAAAAAAAagAAAAAAfAAAAAAAagAAAAAAagAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAJQAAAAAAIwAAAAAAfAAAAAAAagAAAAAAfAAAAAAAagAAAAAAagAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAQAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAA version: 6 -1,0: ind: -1,0 - tiles: AAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAagAAAAAAagAAAAAAagAAAAAAfAAAAAAAQgAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAawAAAAAAQAAAAAAAQAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAeAAAAAACfAAAAAAAQgAAAAAAIwAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAIwAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAagAAAAAAagAAAAAAagAAAAAAfAAAAAAAQgAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAawAAAAAAQAAAAAAAQAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAeAAAAAABfAAAAAAAQgAAAAAAIwAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAIwAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,-1: ind: -1,-1 @@ -105,99 +106,99 @@ entities: version: 6 0,-2: ind: 0,-2 - tiles: ZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAACYAAAAAACYAAAAAADZwAAAAAAfAAAAAAAagAAAAAAagAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAAACYAAAAAAAYAAAAAACZwAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAWwAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAagAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA + tiles: WwAAAAABWwAAAAACWwAAAAABWwAAAAADfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAADWwAAAAACWwAAAAADWwAAAAABfAAAAAAAagAAAAAAagAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAACWwAAAAADWwAAAAACWwAAAAACfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAWwAAAAABWwAAAAADWwAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAWwAAAAADWwAAAAACWwAAAAADWwAAAAACfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAWwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAagAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA version: 6 -1,-2: ind: -1,-2 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAZwAAAAAAZwAAAAAAYAAAAAACYAAAAAADYAAAAAACYAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAYAAAAAADYAAAAAAAYAAAAAAAYAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAYAAAAAABYAAAAAABYAAAAAABYAAAAAADOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAagAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAagAAAAAAfAAAAAAAagAAAAAAagAAAAAAfAAAAAAAQAAAAAAAZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAagAAAAAAagAAAAAAfAAAAAAAZwAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAZwAAAAAAWwAAAAACWwAAAAADWwAAAAAAWwAAAAAAWwAAAAADWwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAWwAAAAABWwAAAAACWwAAAAADWwAAAAADWwAAAAABWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAZwAAAAAAWwAAAAADWwAAAAADWwAAAAACWwAAAAACWwAAAAABWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAWwAAAAACWwAAAAACWwAAAAAAWwAAAAADWwAAAAACWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAWwAAAAABWwAAAAAAWwAAAAACWwAAAAABWwAAAAAAWwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAWwAAAAAAWwAAAAADWwAAAAACWwAAAAADOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAagAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAagAAAAAAfAAAAAAAagAAAAAAagAAAAAAfAAAAAAAQAAAAAAAWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAagAAAAAAagAAAAAAfAAAAAAAWwAAAAAA version: 6 0,-3: ind: 0,-3 - tiles: OQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAZwAAAAAAfAAAAAAAZwAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAaQAAAAADfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAaQAAAAADZwAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAaQAAAAACfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZwAAAAAADAAAAAACDAAAAAAADAAAAAABDAAAAAACZwAAAAAAaQAAAAADfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZwAAAAAADAAAAAADDAAAAAAADAAAAAAADAAAAAABZwAAAAAAaQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZwAAAAAADAAAAAADDAAAAAACDAAAAAABDAAAAAAAZwAAAAAAaQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAaQAAAAACfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAaQAAAAACfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAZwAAAAAAaQAAAAACZwAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZwAAAAAAawAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZwAAAAAAfAAAAAAAagAAAAAAfAAAAAAAagAAAAAAagAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZwAAAAAAfAAAAAAAfAAAAAAAagAAAAAAagAAAAAAagAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAagAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: OQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAZwAAAAAAfAAAAAAAWwAAAAACfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAABWwAAAAABWwAAAAAAWwAAAAAAWwAAAAABWwAAAAAAWwAAAAABfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAACWwAAAAADWwAAAAABWwAAAAACWwAAAAADWwAAAAABWwAAAAAAZwAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAWwAAAAABWwAAAAABWwAAAAACWwAAAAADWwAAAAAAWwAAAAABfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAACDAAAAAABDAAAAAADDAAAAAABDAAAAAACWwAAAAADWwAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAACDAAAAAACDAAAAAADDAAAAAADDAAAAAACWwAAAAADWwAAAAACfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAACDAAAAAADDAAAAAACDAAAAAAADAAAAAADWwAAAAAAWwAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAABWwAAAAACWwAAAAAAWwAAAAADWwAAAAADWwAAAAADWwAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAADWwAAAAACWwAAAAADWwAAAAABWwAAAAABWwAAAAACWwAAAAADfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAADWwAAAAABZwAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAawAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAfAAAAAAAagAAAAAAfAAAAAAAagAAAAAAagAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAABfAAAAAAAfAAAAAAAagAAAAAAagAAAAAAagAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAACWwAAAAABWwAAAAABWwAAAAACagAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,-3: ind: -1,-3 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAawAAAAAAaQAAAAACZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAaQAAAAACZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAagAAAAAAfAAAAAAAaQAAAAACZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAagAAAAAAfAAAAAAAaQAAAAAAZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAagAAAAAAfAAAAAAAaQAAAAABZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAagAAAAAAagAAAAAAfAAAAAAAZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAawAAAAAAWwAAAAADWwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAWwAAAAACWwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAagAAAAAAfAAAAAAAWwAAAAACWwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAagAAAAAAfAAAAAAAWwAAAAAAWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAagAAAAAAfAAAAAAAWwAAAAADWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAWwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAagAAAAAAagAAAAAAfAAAAAAAWwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAWwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAWwAAAAABWwAAAAADWwAAAAABWwAAAAABWwAAAAADWwAAAAAC version: 6 -1,-4: ind: -1,-4 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAegAAAAADeAAAAAABeAAAAAAAeAAAAAACegAAAAACDgAAAAABegAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAegAAAAACeAAAAAADeAAAAAABeAAAAAACegAAAAACDgAAAAACegAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAegAAAAACeAAAAAACeAAAAAACeAAAAAADegAAAAAADgAAAAADDgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAegAAAAACeAAAAAABeAAAAAADeAAAAAAAegAAAAACegAAAAABegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAegAAAAACeAAAAAADeAAAAAADeAAAAAAAeAAAAAACeAAAAAACeAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAegAAAAAAeAAAAAABeAAAAAADeAAAAAAAeAAAAAADeAAAAAACeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAegAAAAABegAAAAACegAAAAACegAAAAAAegAAAAACegAAAAABegAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAJgAAAAAAJgAAAAADfAAAAAAAeAAAAAABeAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAJgAAAAACJgAAAAAAJgAAAAADJgAAAAAAfAAAAAAAeAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAJgAAAAACJgAAAAADJgAAAAABJgAAAAACJgAAAAACeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAJgAAAAABJgAAAAABJgAAAAAAJgAAAAADOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAegAAAAAAeAAAAAACeAAAAAAAeAAAAAABegAAAAABDgAAAAABegAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAegAAAAADeAAAAAACeAAAAAABeAAAAAADegAAAAAADgAAAAABegAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAegAAAAAAeAAAAAABeAAAAAADeAAAAAAAegAAAAADDgAAAAADDgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAegAAAAABeAAAAAADeAAAAAABeAAAAAACegAAAAADegAAAAAAegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAegAAAAAAeAAAAAADeAAAAAABeAAAAAAAeAAAAAAAeAAAAAACeAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAegAAAAAAeAAAAAACeAAAAAAAeAAAAAACeAAAAAAAeAAAAAAAeAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAegAAAAABegAAAAABegAAAAAAegAAAAABegAAAAAAegAAAAAAegAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAJgAAAAABJgAAAAACfAAAAAAAeAAAAAAAeAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAJgAAAAABJgAAAAAAJgAAAAACJgAAAAADfAAAAAAAeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAJgAAAAADJgAAAAADJgAAAAAAJgAAAAADJgAAAAADeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAJgAAAAADJgAAAAAAJgAAAAABJgAAAAACOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAA version: 6 0,-4: ind: 0,-4 - tiles: egAAAAACDgAAAAABfAAAAAAAPgAAAAAAPgAAAAAAawAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAMwAAAAACMwAAAAABMwAAAAABegAAAAACDgAAAAACPgAAAAAAPgAAAAAAPgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAMwAAAAAANAAAAAAANAAAAAACDgAAAAAADgAAAAADfAAAAAAAPgAAAAAAPgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAMwAAAAABNAAAAAADNAAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAMwAAAAACNAAAAAAANAAAAAADegAAAAADeAAAAAADeAAAAAACfAAAAAAAagAAAAAAagAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAMwAAAAABMwAAAAAAegAAAAADeAAAAAABeAAAAAADfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAegAAAAADeAAAAAABeAAAAAACawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAeAAAAAACeAAAAAACeAAAAAACfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAeAAAAAADeAAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAagAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAeAAAAAAAeAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: egAAAAADDgAAAAACfAAAAAAAPgAAAAAAPgAAAAAAawAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAMwAAAAABMwAAAAACMwAAAAADegAAAAACDgAAAAADPgAAAAAAPgAAAAAAPgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAMwAAAAABNAAAAAAANAAAAAADDgAAAAACDgAAAAACfAAAAAAAPgAAAAAAPgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAMwAAAAADNAAAAAAANAAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAMwAAAAAANAAAAAACNAAAAAAAegAAAAAAeAAAAAADeAAAAAAAfAAAAAAAagAAAAAAagAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAMwAAAAABMwAAAAABegAAAAACeAAAAAACeAAAAAACfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAegAAAAACeAAAAAADeAAAAAADawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAeAAAAAACeAAAAAACeAAAAAABfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAeAAAAAADeAAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAagAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAeAAAAAADeAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 0,-5: ind: 0,-5 - tiles: OQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAJgAAAAAAJgAAAAADJQAAAAADOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAJgAAAAADJgAAAAACJQAAAAABOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAJgAAAAADJgAAAAAAJQAAAAACOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAJgAAAAABJQAAAAADOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAJgAAAAADJgAAAAACJQAAAAABOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAfAAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAJgAAAAADJgAAAAADJQAAAAABOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAJgAAAAACJgAAAAABJQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAJgAAAAABJgAAAAACJQAAAAABeAAAAAADeAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAJgAAAAAAJgAAAAACJQAAAAAAeAAAAAAAeAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAagAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAJgAAAAACJgAAAAAAJQAAAAADeAAAAAADeAAAAAABeAAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAJgAAAAACJgAAAAACJQAAAAACegAAAAAAeAAAAAACeAAAAAADawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAJgAAAAABJgAAAAADJQAAAAACegAAAAADeAAAAAAAeAAAAAADfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAJgAAAAACJgAAAAAAJQAAAAADegAAAAADeAAAAAABeAAAAAADfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAADgAAAAABDgAAAAADfAAAAAAAPgAAAAAAPgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAA + tiles: OQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAJgAAAAABJgAAAAACJQAAAAACOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAJgAAAAACJgAAAAAAJQAAAAADOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAJgAAAAABJgAAAAADJQAAAAABOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAJgAAAAABJQAAAAACOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAJgAAAAADJgAAAAAAJQAAAAABOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAfAAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAJgAAAAADJgAAAAABJQAAAAABOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAJgAAAAACJgAAAAAAJQAAAAABOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAJgAAAAABJgAAAAAAJQAAAAAAeAAAAAAAeAAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAJgAAAAACJgAAAAABJQAAAAAAeAAAAAABeAAAAAABfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAagAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAJgAAAAACJgAAAAABJQAAAAABeAAAAAACeAAAAAABeAAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAJgAAAAACJgAAAAACJQAAAAAAegAAAAAAeAAAAAADeAAAAAACawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAJgAAAAABJgAAAAACJQAAAAADegAAAAADeAAAAAACeAAAAAADfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAJgAAAAACJgAAAAABJQAAAAACegAAAAAAeAAAAAAAeAAAAAABfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAADgAAAAABDgAAAAAAfAAAAAAAPgAAAAAAPgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAA version: 6 -1,-5: ind: -1,-5 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAegAAAAADegAAAAAAegAAAAADegAAAAADOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAeAAAAAADeAAAAAAAeAAAAAABeAAAAAACOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAeAAAAAACeAAAAAACeAAAAAAAeAAAAAAAfAAAAAAAeAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAegAAAAABegAAAAAAegAAAAABfAAAAAAAfAAAAAAAeAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAeAAAAAABfAAAAAAAfAAAAAAAegAAAAAAeAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAegAAAAADegAAAAACegAAAAADegAAAAACegAAAAAAegAAAAABegAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAegAAAAABeAAAAAADeAAAAAACeAAAAAAAeAAAAAAAeAAAAAABeAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAegAAAAADeAAAAAAAeAAAAAACeAAAAAACeAAAAAAAeAAAAAAAeAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAegAAAAAAeAAAAAACeAAAAAACeAAAAAADegAAAAABegAAAAACegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAegAAAAADeAAAAAACeAAAAAACeAAAAAABegAAAAABDgAAAAABDgAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAegAAAAADegAAAAACegAAAAACegAAAAACOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAeAAAAAAAeAAAAAABeAAAAAABeAAAAAADOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAeAAAAAAAeAAAAAACeAAAAAABeAAAAAAAfAAAAAAAeAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAegAAAAAAegAAAAACegAAAAADfAAAAAAAfAAAAAAAeAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAeAAAAAAAfAAAAAAAfAAAAAAAegAAAAAAeAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAegAAAAABegAAAAABegAAAAABegAAAAADegAAAAABegAAAAABegAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAegAAAAADeAAAAAACeAAAAAABeAAAAAAAeAAAAAAAeAAAAAACeAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAegAAAAAAeAAAAAACeAAAAAACeAAAAAACeAAAAAABeAAAAAADeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAegAAAAACeAAAAAAAeAAAAAAAeAAAAAAAegAAAAADegAAAAABegAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAegAAAAACeAAAAAACeAAAAAAAeAAAAAABegAAAAAADgAAAAADDgAAAAAC version: 6 0,-6: ind: 0,-6 - tiles: aAAAAAACaAAAAAAALQAAAAAALQAAAAACaAAAAAABaAAAAAAAaAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAaAAAAAACaAAAAAAAaAAAAAACaAAAAAABaAAAAAADaAAAAAACaAAAAAACfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAADWwAAAAACWwAAAAADaAAAAAACfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAXQAAAAABXQAAAAACfAAAAAAAfAAAAAAAaQAAAAABWwAAAAAAWwAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAXQAAAAACXQAAAAAAXQAAAAACIgAAAAABaQAAAAACaQAAAAAAWwAAAAADfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAXQAAAAABXQAAAAADXQAAAAABIgAAAAADLQAAAAABaQAAAAACWwAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAXQAAAAABXQAAAAABXQAAAAAAIgAAAAABLQAAAAAAaQAAAAADWwAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAXQAAAAABLQAAAAACXQAAAAABIgAAAAADLQAAAAAAaQAAAAADWwAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAALQAAAAABLQAAAAABXQAAAAADIgAAAAACLQAAAAADaQAAAAABWwAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAALQAAAAADLQAAAAACXQAAAAAAIgAAAAACLQAAAAABaQAAAAADWwAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXQAAAAABXQAAAAADXQAAAAACIgAAAAABaQAAAAACaQAAAAADWwAAAAABfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAJgAAAAADJQAAAAADXQAAAAACXQAAAAACfAAAAAAAfAAAAAAAaQAAAAACWwAAAAABWwAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAJgAAAAAAJgAAAAAAJQAAAAABfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAADWwAAAAADWwAAAAADaAAAAAABfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAJgAAAAAAJgAAAAADJQAAAAAAaAAAAAABaAAAAAAAaAAAAAACaAAAAAADaAAAAAADaAAAAAACaAAAAAACfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAJgAAAAADJgAAAAADJQAAAAACaAAAAAACaAAAAAADaAAAAAABaAAAAAACaAAAAAADaAAAAAADaAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAJgAAAAADJgAAAAACJQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAaAAAAAACfAAAAAAAaAAAAAADfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAJgAAAAADJgAAAAACJQAAAAAA + tiles: WwAAAAADWwAAAAABLQAAAAACLQAAAAACWwAAAAADWwAAAAAAWwAAAAABfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAABWwAAAAAAWwAAAAABWwAAAAACfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAADWwAAAAADWwAAAAAAWwAAAAACfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAQAAAAABAQAAAAABfAAAAAAAfAAAAAAAaQAAAAABWwAAAAACWwAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAQAAAAABAQAAAAACAQAAAAABIgAAAAAAaQAAAAADaQAAAAADWwAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAQAAAAACAQAAAAABAQAAAAACIgAAAAADLQAAAAABaQAAAAADWwAAAAADfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAQAAAAADAQAAAAADAQAAAAAAIgAAAAADLQAAAAABaQAAAAACWwAAAAADfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAQAAAAAAAQAAAAADAQAAAAABIgAAAAABLQAAAAAAaQAAAAADWwAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAQAAAAADAQAAAAADAQAAAAACIgAAAAAALQAAAAACaQAAAAAAWwAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAQAAAAAAAQAAAAAAAQAAAAADIgAAAAAALQAAAAADaQAAAAABWwAAAAADfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAQAAAAACAQAAAAAAAQAAAAACIgAAAAADaQAAAAABaQAAAAACWwAAAAADfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAJgAAAAABJQAAAAACAQAAAAACAQAAAAADfAAAAAAAfAAAAAAAaQAAAAABWwAAAAADWwAAAAADfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAJgAAAAAAJgAAAAADJQAAAAABfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAADWwAAAAAAWwAAAAACWwAAAAABfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAJgAAAAABJgAAAAACJQAAAAACWwAAAAADWwAAAAAAWwAAAAADWwAAAAAAWwAAAAABWwAAAAAAWwAAAAADfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAJgAAAAABJgAAAAACJQAAAAABWwAAAAADWwAAAAADWwAAAAADWwAAAAABWwAAAAAAWwAAAAADWwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAJgAAAAAAJgAAAAABJQAAAAACOQAAAAAAOQAAAAAAOQAAAAAAWwAAAAAAfAAAAAAAWwAAAAADfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAJgAAAAACJgAAAAAAJQAAAAAC version: 6 -1,-6: ind: -1,-6 - tiles: gQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAaAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAaAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAALAAAAAAALAAAAAAALAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAALAAAAAAALAAAAAAALAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAXQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAfAAAAAAAawAAAAAAfAAAAAAAXQAAAAABXQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAagAAAAAAagAAAAAAagAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAawAAAAAAXQAAAAABXQAAAAADXQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAagAAAAAAagAAAAAAagAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAawAAAAAAXQAAAAAAXQAAAAACLQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAagAAAAAAagAAAAAAagAAAAAAOgAAAAAAOgAAAAAAfAAAAAAAawAAAAAAfAAAAAAAXQAAAAADXQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAfAAAAAAAagAAAAAAfAAAAAAAXQAAAAADXQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAXQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAaAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAawAAAAAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAOQAAAAAAOQAAAAAA + tiles: gQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAWwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAALAAAAAAALAAAAAAALAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAALAAAAAAALAAAAAAALAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAOgAAAAAAWwAAAAADWwAAAAABWwAAAAACWwAAAAABfAAAAAAAawAAAAAAfAAAAAAAAQAAAAACAQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAOgAAAAAAWwAAAAADOgAAAAAAWwAAAAACWwAAAAADOgAAAAAAawAAAAAAXQAAAAACAQAAAAADAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAOgAAAAAAWwAAAAAAOgAAAAAAWwAAAAADWwAAAAABOgAAAAAAawAAAAAAXQAAAAADAQAAAAACAQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAOgAAAAAAWwAAAAABOgAAAAAAWwAAAAAAWwAAAAABfAAAAAAAawAAAAAAfAAAAAAAAQAAAAAAAQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAOgAAAAAAWwAAAAACWwAAAAAAWwAAAAABWwAAAAAAfAAAAAAAagAAAAAAfAAAAAAAAQAAAAADAQAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAOgAAAAAAOgAAAAAAOgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAQAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAawAAAAAAWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAOQAAAAAAOQAAAAAA version: 6 -1,-7: ind: -1,-7 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAYgAAAAAAYgAAAAAAaAAAAAABfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAYgAAAAAAYgAAAAAAYgAAAAAAYgAAAAAAYgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfAAAAAAAYgAAAAAAYgAAAAAAYgAAAAAAYgAAAAAAYgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAYgAAAAAAYgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAaAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAagAAAAAAfAAAAAAAagAAAAAAagAAAAAAawAAAAAAaAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAagAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAaAAAAAAB + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAABWwAAAAACWwAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAWwAAAAACWwAAAAACYgAAAAAAYgAAAAAAWwAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfAAAAAAAYgAAAAAAWwAAAAABYgAAAAAAWwAAAAABYgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAYgAAAAAAWwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAagAAAAAAfAAAAAAAagAAAAAAagAAAAAAawAAAAAAWwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAagAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAAA version: 6 0,-7: ind: 0,-7 - tiles: fAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYgAAAAAAYgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYgAAAAAAYgAAAAAAawAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYgAAAAAAYgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAaAAAAAACaAAAAAACaAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAaAAAAAAAaAAAAAADaAAAAAADaAAAAAACaAAAAAABaAAAAAABaAAAAAABfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAaAAAAAAAaAAAAAAALQAAAAABLQAAAAABaAAAAAABaAAAAAABaAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAaAAAAAABaAAAAAACLQAAAAAALQAAAAADaAAAAAABaAAAAAAAaAAAAAADfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA + tiles: fAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYgAAAAAAYgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAWwAAAAAAWwAAAAABawAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAWwAAAAADYgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAWwAAAAADWwAAAAACWwAAAAABfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAWwAAAAACWwAAAAACWwAAAAAAWwAAAAADWwAAAAAAWwAAAAAAWwAAAAACfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAWwAAAAACWwAAAAADLQAAAAAALQAAAAACWwAAAAAAWwAAAAABWwAAAAACfAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAWwAAAAAAWwAAAAADLQAAAAACLQAAAAADWwAAAAACWwAAAAACWwAAAAADfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA version: 6 -1,-8: ind: -1,-8 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAGQAAAAAAGQAAAAAAGQAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAGQAAAAAAfAAAAAAAawAAAAAAfAAAAAAAYgAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAGQAAAAAAGQAAAAAAGQAAAAAAGQAAAAAAYgAAAAAAYgAAAAAAYgAAAAAAYgAAAAAAYgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAGQAAAAAAGQAAAAAAGQAAAAAAfAAAAAAAYgAAAAAAYgAAAAAAYgAAAAAAYgAAAAAAYgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAYgAAAAAAYgAAAAAAYgAAAAAAHQAAAAADHQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAYgAAAAAAYgAAAAAAYgAAAAAAaAAAAAADeAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAfAAAAAAAYgAAAAAAYgAAAAAAaAAAAAABegAAAAACegAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAYgAAAAAAYgAAAAAAaAAAAAACeAAAAAADeAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAYgAAAAAAYgAAAAAAfAAAAAAAeAAAAAACeAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfAAAAAAAYgAAAAAAYgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAYgAAAAAAYgAAAAAAfAAAAAAAeAAAAAAAeAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAYgAAAAAAYgAAAAAAfAAAAAAAeAAAAAACeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfAAAAAAAYgAAAAAAYgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAYgAAAAAAYgAAAAAAJQAAAAADQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAYgAAAAAAYgAAAAAAJQAAAAAAQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfAAAAAAAYgAAAAAAYgAAAAAAJQAAAAABQAAAAAAAQAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAGQAAAAAAGQAAAAAAGQAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAGQAAAAAAfAAAAAAAawAAAAAAfAAAAAAAYgAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAGQAAAAAAGQAAAAAAGQAAAAAAGQAAAAAAYgAAAAAAWwAAAAACWwAAAAABWwAAAAAAYgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAGQAAAAAAGQAAAAAAGQAAAAAAfAAAAAAAWwAAAAABWwAAAAABWwAAAAABYgAAAAAAYgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAADWwAAAAAAYgAAAAAAHQAAAAABHQAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAWwAAAAACWwAAAAABfAAAAAAAfAAAAAAAeAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAQQAAAAAAQQAAAAAAQQAAAAAAfAAAAAAAWwAAAAACWwAAAAABfAAAAAAAegAAAAACegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAACWwAAAAACfAAAAAAAeAAAAAADeAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAWwAAAAAAWwAAAAADfAAAAAAAeAAAAAADeAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfAAAAAAAWwAAAAADWwAAAAABfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAACWwAAAAACfAAAAAAAeAAAAAACeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAWwAAAAADWwAAAAADfAAAAAAAeAAAAAACeAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfAAAAAAAWwAAAAADWwAAAAACfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAAAWwAAAAAAJQAAAAABQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAWwAAAAABWwAAAAADJQAAAAABQAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfAAAAAAAWwAAAAACWwAAAAAAJQAAAAAAQAAAAAAAQAAAAAAA version: 6 0,-8: ind: 0,-8 - tiles: OQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAYgAAAAAAYgAAAAAAYgAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYgAAAAAAYgAAAAAAYgAAAAAAYgAAAAAAYgAAAAAAYgAAAAAAYgAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYgAAAAAAYgAAAAAAYgAAAAAAYgAAAAAAYgAAAAAAYgAAAAAAYgAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAHQAAAAAAHQAAAAABYgAAAAAAYgAAAAAAYgAAAAAAYgAAAAAAYgAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAaAAAAAAAaAAAAAACfAAAAAAAYgAAAAAAYgAAAAAAYgAAAAAAYgAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAegAAAAABegAAAAACegAAAAACfAAAAAAAYgAAAAAAYgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAeAAAAAAAeAAAAAACeAAAAAABeAAAAAAAYgAAAAAAYgAAAAAAHQAAAAADJAAAAAACJAAAAAADJAAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAeAAAAAABeAAAAAACeAAAAAADfAAAAAAAYgAAAAAAYgAAAAAAfAAAAAAAJAAAAAABJAAAAAABJAAAAAACfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAeAAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAJAAAAAABJAAAAAABJAAAAAADfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAeAAAAAACeAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAagAAAAAAHQAAAAADJAAAAAABJAAAAAACJAAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAeAAAAAABeAAAAAADawAAAAAAfAAAAAAAagAAAAAAfAAAAAAAHQAAAAACJAAAAAABJAAAAAABJAAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAJAAAAAABJAAAAAACJAAAAAADJAAAAAACJAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAQAAAAAAAfAAAAAAAagAAAAAAagAAAAAAfAAAAAAAJAAAAAADJAAAAAAAJAAAAAAAJAAAAAABJAAAAAACfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAQAAAAAAAawAAAAAAagAAAAAAagAAAAAAfAAAAAAAJAAAAAADJAAAAAADJAAAAAAAJAAAAAACJAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAQAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAA + tiles: OQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAYgAAAAAAYgAAAAAAYgAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYgAAAAAAWwAAAAAAYgAAAAAAWwAAAAADWwAAAAABYgAAAAAAYgAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAYgAAAAAAWwAAAAAAWwAAAAACWwAAAAADYgAAAAAAYgAAAAAAYgAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAHQAAAAAAHQAAAAABYgAAAAAAYgAAAAAAYgAAAAAAYgAAAAAAYgAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAABYgAAAAAAYgAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAegAAAAAAegAAAAAAegAAAAACfAAAAAAAYgAAAAAAYgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAeAAAAAABeAAAAAADeAAAAAABeAAAAAACYgAAAAAAWwAAAAACHQAAAAADHQAAAAACHQAAAAAAHQAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAeAAAAAADeAAAAAAAeAAAAAAAfAAAAAAAYgAAAAAAYgAAAAAAfAAAAAAAHQAAAAAAHQAAAAADHQAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAeAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAHQAAAAADHQAAAAACHQAAAAADfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAeAAAAAACeAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAagAAAAAAHQAAAAAAHQAAAAACHQAAAAAAHQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAeAAAAAACeAAAAAADawAAAAAAfAAAAAAAagAAAAAAfAAAAAAAHQAAAAAAHQAAAAAAHQAAAAADHQAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHQAAAAABHQAAAAACHQAAAAADHQAAAAABHQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAQAAAAAAAfAAAAAAAagAAAAAAagAAAAAAfAAAAAAAHQAAAAAAHQAAAAACHQAAAAACHQAAAAABHQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAQAAAAAAAawAAAAAAagAAAAAAagAAAAAAfAAAAAAAHQAAAAAAHQAAAAABHQAAAAABHQAAAAAAHQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAQAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAA version: 6 -1,-9: ind: -1,-9 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAQAAAAAAAfAAAAAAAfAAAAAAAeAAAAAACeAAAAAACeAAAAAADegAAAAAAfAAAAAAAZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAQAAAAAAAfAAAAAAAegAAAAADeAAAAAABeAAAAAAAeAAAAAACegAAAAAAfAAAAAAAZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAQAAAAAAAfAAAAAAAegAAAAAAeAAAAAAAeAAAAAADeAAAAAADegAAAAADQwAAAAAAZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAQAAAAAAAfAAAAAAAegAAAAACeAAAAAACeAAAAAACeAAAAAADegAAAAABQwAAAAAAZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAQAAAAAAAfAAAAAAAegAAAAACeAAAAAABeAAAAAACeAAAAAAAegAAAAABQwAAAAAAZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAQAAAAAAAfAAAAAAAegAAAAADeAAAAAACeAAAAAABeAAAAAADegAAAAABfAAAAAAAZwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAQAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAQwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAZwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAQAAAAAAANQAAAAADfAAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfAAAAAAAZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAANQAAAAAANQAAAAACQAAAAAAANQAAAAABfAAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfAAAAAAAZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAANQAAAAACNQAAAAADQAAAAAAANQAAAAADgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAQwAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAANQAAAAADNQAAAAABQAAAAAAANQAAAAAAgQAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAANQAAAAACNQAAAAADQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAagAAAAAAfAAAAAAAfAAAAAAAeAAAAAACeAAAAAABeAAAAAAAegAAAAAAfAAAAAAAWwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAagAAAAAAfAAAAAAAegAAAAABeAAAAAAAeAAAAAACeAAAAAADegAAAAADfAAAAAAAWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAagAAAAAAfAAAAAAAegAAAAAAeAAAAAADeAAAAAABeAAAAAACeAAAAAADQwAAAAAAWwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAagAAAAAAfAAAAAAAegAAAAABeAAAAAAAeAAAAAABeAAAAAABeAAAAAACQwAAAAAAWwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAagAAAAAAfAAAAAAAegAAAAAAeAAAAAADeAAAAAABeAAAAAABeAAAAAAAQwAAAAAAWwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAagAAAAAAfAAAAAAAegAAAAACeAAAAAACeAAAAAAAeAAAAAABegAAAAACfAAAAAAAWwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAQwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAagAAAAAANQAAAAADfAAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfAAAAAAAWwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAANQAAAAAANQAAAAAAagAAAAAANQAAAAADfAAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfAAAAAAAWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAANQAAAAADNQAAAAADagAAAAAANQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAQwAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAANQAAAAABNQAAAAABagAAAAAANQAAAAACgQAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAANQAAAAAANQAAAAACagAAAAAAagAAAAAAagAAAAAAagAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAA version: 6 0,-9: ind: 0,-9 - tiles: ZwAAAAAASwAAAAAAaAAAAAAATAAAAAADTAAAAAABTAAAAAACaAAAAAACfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAagAAAAAAagAAAAAAagAAAAAAZwAAAAAAfAAAAAAAaQAAAAADSwAAAAACTAAAAAACSwAAAAACaQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAagAAAAAAagAAAAAAagAAAAAAZwAAAAAAfAAAAAAAQwAAAAAASwAAAAADaQAAAAACSwAAAAADQwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAagAAAAAAZwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAQwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAagAAAAAAagAAAAAAagAAAAAAZwAAAAAAfAAAAAAAJQAAAAACJQAAAAADJgAAAAABJgAAAAABJgAAAAABfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAZwAAAAAAfAAAAAAAJQAAAAADJQAAAAAAJgAAAAABJgAAAAABJgAAAAABQwAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAagAAAAAAagAAAAAAagAAAAAAZwAAAAAAfAAAAAAAfAAAAAAAHwAAAAACHwAAAAADHwAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAagAAAAAAZwAAAAAAZwAAAAAAfAAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfAAAAAAAagAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAZwAAAAAAZwAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAA + tiles: WwAAAAACSwAAAAABHQAAAAACTAAAAAABTAAAAAAATAAAAAACHQAAAAADfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAagAAAAAAagAAAAAAagAAAAAAWwAAAAABfAAAAAAAHQAAAAABHQAAAAAATAAAAAAAHQAAAAADHQAAAAADfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAagAAAAAAagAAAAAAagAAAAAAWwAAAAAAfAAAAAAAQwAAAAAAHQAAAAACHQAAAAABHQAAAAACQwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAagAAAAAAWwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHQAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAagAAAAAAagAAAAAAagAAAAAAWwAAAAAAfAAAAAAAJQAAAAADJQAAAAADHQAAAAABHQAAAAAAHQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAWwAAAAAAfAAAAAAAJQAAAAABJQAAAAABHQAAAAAAHQAAAAAAHQAAAAADQwAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAagAAAAAAagAAAAAAagAAAAAAWwAAAAAAfAAAAAAAfAAAAAAAHQAAAAAAHQAAAAACHQAAAAACfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAagAAAAAAWwAAAAAAWwAAAAACfAAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfAAAAAAAagAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAAAWwAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAA version: 6 -1,-10: ind: -1,-10 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAQAAAAAAAQAAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAQAAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAQAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAJgAAAAAAfAAAAAAAJQAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAQAAAAAAAfAAAAAAALQAAAAADJgAAAAACJgAAAAACJgAAAAAAJQAAAAABfAAAAAAAZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAQAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAJgAAAAACJgAAAAABJQAAAAABQwAAAAAAZwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAQAAAAAAAfAAAAAAAJgAAAAACJgAAAAACJgAAAAABJgAAAAAAJQAAAAADfAAAAAAAZwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAQAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAQAAAAAAAfAAAAAAAegAAAAADeAAAAAACeAAAAAACeAAAAAABegAAAAAAfAAAAAAAZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAQAAAAAAAfAAAAAAAegAAAAACeAAAAAADeAAAAAACeAAAAAABegAAAAAAfAAAAAAAZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAQAAAAAAAfAAAAAAAegAAAAADeAAAAAAAeAAAAAAAeAAAAAACegAAAAACfAAAAAAAZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAQAAAAAAAfAAAAAAAegAAAAABeAAAAAACeAAAAAABeAAAAAAAegAAAAACfAAAAAAAZwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAQAAAAAAAfAAAAAAAegAAAAADeAAAAAACeAAAAAAAeAAAAAACegAAAAADfAAAAAAAZwAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAagAAAAAAagAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAagAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAagAAAAAAagAAAAAAagAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAagAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAJgAAAAAAfAAAAAAAJQAAAAABOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAagAAAAAAfAAAAAAALQAAAAADJgAAAAABJgAAAAADJgAAAAABJQAAAAACfAAAAAAAWwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAJgAAAAAAJgAAAAABJQAAAAADQwAAAAAAWwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAagAAAAAAfAAAAAAAJgAAAAADJgAAAAABJgAAAAACJgAAAAADJQAAAAAAfAAAAAAAWwAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAagAAAAAAfAAAAAAAegAAAAAAeAAAAAACeAAAAAABeAAAAAABegAAAAACfAAAAAAAWwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAagAAAAAAfAAAAAAAegAAAAABeAAAAAADeAAAAAAAeAAAAAABegAAAAABfAAAAAAAWwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAagAAAAAAfAAAAAAAegAAAAADeAAAAAADeAAAAAADeAAAAAABegAAAAABfAAAAAAAWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAagAAAAAAfAAAAAAAegAAAAAAeAAAAAADeAAAAAACeAAAAAADegAAAAACfAAAAAAAWwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAagAAAAAAfAAAAAAAegAAAAACeAAAAAABeAAAAAAAeAAAAAAAegAAAAACfAAAAAAAWwAAAAAB version: 6 0,-10: ind: 0,-10 - tiles: OQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAagAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAagAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAagAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAagAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAagAAAAAAZwAAAAAAZwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAagAAAAAAagAAAAAAfAAAAAAAZwAAAAAAZwAAAAAAfAAAAAAAfAAAAAAAagAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAagAAAAAAagAAAAAAfAAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAagAAAAAAagAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAfAAAAAAAagAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAagAAAAAAagAAAAAAagAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAZwAAAAAAfAAAAAAAagAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAagAAAAAAagAAAAAAagAAAAAAZwAAAAAAZwAAAAAAfAAAAAAAYgAAAAAAYgAAAAAAYgAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAagAAAAAAagAAAAAAfAAAAAAAZwAAAAAAfAAAAAAAaQAAAAACSwAAAAABaQAAAAABSwAAAAABaQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAagAAAAAAagAAAAAAagAAAAAAZwAAAAAASwAAAAACaQAAAAAASwAAAAAATAAAAAADSwAAAAAAaQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAZwAAAAAASwAAAAACaQAAAAAASwAAAAABTAAAAAADSwAAAAACaQAAAAADfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAagAAAAAA + tiles: OQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAagAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAagAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAagAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAagAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAagAAAAAAWwAAAAACWwAAAAACfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAagAAAAAAagAAAAAAfAAAAAAAWwAAAAADWwAAAAADfAAAAAAAfAAAAAAAagAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAagAAAAAAagAAAAAAfAAAAAAAWwAAAAACWwAAAAABWwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAagAAAAAAagAAAAAAWwAAAAACWwAAAAAAWwAAAAACWwAAAAABWwAAAAAAWwAAAAADWwAAAAABfAAAAAAAagAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAagAAAAAAagAAAAAAagAAAAAAWwAAAAAAWwAAAAABWwAAAAADWwAAAAADWwAAAAACWwAAAAADWwAAAAAAfAAAAAAAagAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAagAAAAAAagAAAAAAagAAAAAAWwAAAAACWwAAAAACfAAAAAAAYgAAAAAAYgAAAAAAYgAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAagAAAAAAagAAAAAAfAAAAAAAWwAAAAACfAAAAAAAHQAAAAACHQAAAAACHQAAAAACHQAAAAAAHQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAagAAAAAAagAAAAAAagAAAAAAWwAAAAAASwAAAAADHQAAAAACHQAAAAACTAAAAAAAHQAAAAABHQAAAAADfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAWwAAAAACSwAAAAADHQAAAAADHQAAAAADTAAAAAAAHQAAAAABHQAAAAACfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAagAAAAAA version: 6 -1,-11: ind: -1,-11 - tiles: AAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAagAAAAAAagAAAAAAfAAAAAAAUAAAAAAAUAAAAAAALAAAAAAALAAAAAAALAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAUAAAAAAAUAAAAAAALAAAAAAALAAAAAAALAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAagAAAAAAagAAAAAAawAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAALAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAcgAAAAACcgAAAAABcgAAAAADbgAAAAADfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAcgAAAAAAcgAAAAADcgAAAAABbgAAAAADZwAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAagAAAAAAagAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAagAAAAAAfAAAAAAAcgAAAAABcgAAAAACcgAAAAABbgAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAagAAAAAAfAAAAAAAbgAAAAAAbgAAAAADbgAAAAAAbgAAAAACfAAAAAAAgQAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAbgAAAAADbgAAAAACbgAAAAABbgAAAAADWwAAAAAAgQAAAAAAagAAAAAAfAAAAAAAagAAAAAAagAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAWwAAAAADgQAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAWwAAAAACgQAAAAAAfAAAAAAAagAAAAAAagAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAA + tiles: AAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAagAAAAAAagAAAAAAfAAAAAAAUAAAAAAAUAAAAAAALAAAAAAALAAAAAAALAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAUAAAAAAAUAAAAAAALAAAAAAALAAAAAAALAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAagAAAAAAagAAAAAAawAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAALAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAcgAAAAAAcgAAAAADcgAAAAABbgAAAAADfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAcgAAAAACcgAAAAABcgAAAAADbgAAAAABZwAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAagAAAAAAagAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAagAAAAAAfAAAAAAAcgAAAAAAcgAAAAADcgAAAAACbgAAAAABfAAAAAAAgQAAAAAAfAAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAagAAAAAAfAAAAAAAbgAAAAABbgAAAAAAbgAAAAADbgAAAAAAfAAAAAAAgQAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAbgAAAAACbgAAAAABbgAAAAABbgAAAAABWwAAAAACgQAAAAAAagAAAAAAfAAAAAAAagAAAAAAagAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAWwAAAAACgQAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAWwAAAAAAgQAAAAAAfAAAAAAAagAAAAAAagAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAA version: 6 0,-11: ind: 0,-11 - tiles: WwAAAAACWwAAAAACfAAAAAAAcgAAAAABbgAAAAADbgAAAAADbgAAAAAAbgAAAAADcgAAAAADfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAWwAAAAADWwAAAAADfAAAAAAAcgAAAAADbgAAAAAATAAAAAAATAAAAAABbgAAAAABcgAAAAADfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAADWwAAAAABfAAAAAAAcgAAAAAAbgAAAAABTAAAAAABTAAAAAAAbgAAAAADcgAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAACWwAAAAACaQAAAAABcgAAAAACbgAAAAAAbgAAAAAAbgAAAAADbgAAAAABcgAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAACWwAAAAAAaQAAAAAAcgAAAAACcgAAAAACcgAAAAAAcgAAAAADcgAAAAADcgAAAAACfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAABWwAAAAACfAAAAAAAfAAAAAAAfAAAAAAAZwAAAAAAZwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAABWwAAAAABfAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAADWwAAAAABZwAAAAAALAAAAAAATAAAAAAATAAAAAABTAAAAAACLAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAADWwAAAAAAZwAAAAAALAAAAAAATAAAAAACLAAAAAAATAAAAAACLAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAACWwAAAAAAZwAAAAAALAAAAAAATAAAAAABTAAAAAAATAAAAAADLAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAADWwAAAAAAfAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAWwAAAAADWwAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAWwAAAAABWwAAAAADfAAAAAAAagAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAACWwAAAAADawAAAAAAagAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAagAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAagAAAAAAagAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAagAAAAAAagAAAAAAfAAAAAAA + tiles: WwAAAAABWwAAAAABfAAAAAAAcgAAAAAAbgAAAAADbgAAAAADbgAAAAACbgAAAAABcgAAAAACfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAWwAAAAABWwAAAAABfAAAAAAAcgAAAAADbgAAAAABTAAAAAACTAAAAAABbgAAAAACcgAAAAACfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAADWwAAAAABfAAAAAAAcgAAAAABbgAAAAABTAAAAAACTAAAAAACbgAAAAACcgAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAWwAAAAADaQAAAAAAcgAAAAACbgAAAAACbgAAAAADbgAAAAADbgAAAAACcgAAAAADfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAWwAAAAADaQAAAAACcgAAAAAAcgAAAAABcgAAAAADcgAAAAACcgAAAAABcgAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAADWwAAAAADfAAAAAAAfAAAAAAAfAAAAAAAZwAAAAAAZwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAWwAAAAABfAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAADWwAAAAAAZwAAAAAALAAAAAAATAAAAAADTAAAAAAATAAAAAABLAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAABWwAAAAAAZwAAAAAALAAAAAAATAAAAAABLAAAAAAATAAAAAACLAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAWwAAAAABZwAAAAAALAAAAAAATAAAAAACTAAAAAAATAAAAAABLAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAABWwAAAAADfAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAWwAAAAADWwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAWwAAAAACWwAAAAAAfAAAAAAAagAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAACWwAAAAADawAAAAAAagAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAagAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAagAAAAAAagAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAagAAAAAAagAAAAAAfAAAAAAA version: 6 0,-12: ind: 0,-12 - tiles: dAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAADWwAAAAADfAAAAAAAgQAAAAAAQAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAWwAAAAABWwAAAAACWwAAAAACWwAAAAAAWwAAAAADWwAAAAABWwAAAAAAZwAAAAAADAAAAAADDAAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAWwAAAAABWwAAAAACWwAAAAABWwAAAAACWwAAAAABWwAAAAACWwAAAAADfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAWwAAAAACfAAAAAAAZwAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAbgAAAAAAbgAAAAADbgAAAAADfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAABWwAAAAABbgAAAAABbgAAAAABbgAAAAACbgAAAAACfAAAAAAAQAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAACWwAAAAADbgAAAAADbgAAAAACbgAAAAACbgAAAAADfAAAAAAAcgAAAAADcgAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAACWwAAAAAAfAAAAAAAfAAAAAAAbgAAAAACbgAAAAAAfAAAAAAAcgAAAAAAcgAAAAACfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAACWwAAAAADfAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAABcgAAAAABcgAAAAACfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA + tiles: dAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAACWwAAAAABfAAAAAAAgQAAAAAAQAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAWwAAAAABWwAAAAAAWwAAAAADWwAAAAADWwAAAAABWwAAAAAAWwAAAAAAZwAAAAAADAAAAAACDAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAWwAAAAACWwAAAAAAWwAAAAADWwAAAAAAWwAAAAAAWwAAAAABWwAAAAADfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAWwAAAAADfAAAAAAAZwAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAbgAAAAACbgAAAAACbgAAAAABfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAACWwAAAAABbgAAAAACbgAAAAABbgAAAAAAbgAAAAAAfAAAAAAAQAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAWwAAAAABbgAAAAADbgAAAAAAbgAAAAABbgAAAAABfAAAAAAAcgAAAAACcgAAAAACfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAABWwAAAAAAfAAAAAAAfAAAAAAAbgAAAAADbgAAAAADfAAAAAAAcgAAAAACcgAAAAADfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAWwAAAAAAfAAAAAAAcgAAAAADcgAAAAAAcgAAAAABcgAAAAADcgAAAAAAcgAAAAADfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA version: 6 -1,-12: ind: -1,-12 - tiles: gQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAWwAAAAADWwAAAAACWwAAAAAAWwAAAAACWwAAAAABWwAAAAAAWwAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAQgAAAAAAWwAAAAADWwAAAAACWwAAAAABWwAAAAADWwAAAAABWwAAAAACWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAWwAAAAACWwAAAAAAWwAAAAACWwAAAAADWwAAAAADWwAAAAADWwAAAAADWwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAABfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAagAAAAAAagAAAAAAawAAAAAAWwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAABgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAALAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAAfAAAAAAA + tiles: gQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAWwAAAAADWwAAAAACWwAAAAACWwAAAAACWwAAAAACWwAAAAADWwAAAAABfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAQgAAAAAAWwAAAAAAWwAAAAABWwAAAAAAWwAAAAABWwAAAAACWwAAAAABWwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAWwAAAAAAWwAAAAADWwAAAAADWwAAAAADWwAAAAACWwAAAAAAWwAAAAADWwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAagAAAAAAagAAAAAAawAAAAAAWwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAALAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAALAAAAAAALAAAAAAALAAAAAAALAAAAAAAfAAAAAAA version: 6 -1,-13: ind: -1,-13 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAdwAAAAACOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAbwAAAAABbwAAAAACfAAAAAAAdwAAAAAAfAAAAAAAWwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAbwAAAAADbwAAAAADdwAAAAADdwAAAAACZwAAAAAAWwAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAbwAAAAACbwAAAAADfAAAAAAAdwAAAAADfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAdwAAAAABfAAAAAAAbgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAbwAAAAACfAAAAAAAfAAAAAAAdwAAAAACfAAAAAAAbgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAbwAAAAADbwAAAAACdwAAAAABdwAAAAADfAAAAAAAbgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAbwAAAAACbwAAAAACfAAAAAAAdwAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAdwAAAAAAfAAAAAAAbgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAdwAAAAABdwAAAAAAdwAAAAACdwAAAAACdwAAAAABZwAAAAAAbgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAdwAAAAABdwAAAAADdwAAAAACdwAAAAAAdwAAAAACfAAAAAAAbgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAdwAAAAAAdwAAAAABTAAAAAADdwAAAAADdwAAAAACfAAAAAAAbgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAdwAAAAADdwAAAAABTAAAAAADdwAAAAADdwAAAAABfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAdwAAAAABdwAAAAABdwAAAAADdwAAAAACdwAAAAAAfAAAAAAAcgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAdwAAAAACdwAAAAACdwAAAAAAdwAAAAABdwAAAAAAfAAAAAAAcgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAdAAAAAAAfAAAAAAAfAAAAAAAdAAAAAAAfAAAAAAAcgAAAAAC + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAdwAAAAADOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAbwAAAAADbwAAAAACfAAAAAAAdwAAAAABfAAAAAAAWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAbwAAAAACbwAAAAABdwAAAAADdwAAAAADZwAAAAAAWwAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAbwAAAAABbwAAAAAAfAAAAAAAdwAAAAACfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAdwAAAAACfAAAAAAAbgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAbwAAAAADfAAAAAAAfAAAAAAAdwAAAAACfAAAAAAAbgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAbwAAAAAAbwAAAAACdwAAAAAAdwAAAAADfAAAAAAAbgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAbwAAAAADbwAAAAAAfAAAAAAAdwAAAAACfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAdwAAAAABfAAAAAAAbgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAdwAAAAADdwAAAAABdwAAAAADdwAAAAADdwAAAAADZwAAAAAAbgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAdwAAAAAAdwAAAAACdwAAAAADdwAAAAABdwAAAAADfAAAAAAAbgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAdwAAAAAAdwAAAAABTAAAAAABdwAAAAABdwAAAAADfAAAAAAAbgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAdwAAAAAAdwAAAAABTAAAAAAAdwAAAAACdwAAAAACfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAdwAAAAACdwAAAAADdwAAAAAAdwAAAAAAdwAAAAAAfAAAAAAAcgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAdwAAAAACdwAAAAAAdwAAAAAAdwAAAAACdwAAAAAAfAAAAAAAcgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAdAAAAAAAfAAAAAAAfAAAAAAAdAAAAAAAfAAAAAAAcgAAAAAB version: 6 0,-13: ind: 0,-13 - tiles: OQAAAAAAOQAAAAAAOQAAAAAAWwAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAACWwAAAAADWwAAAAAAWwAAAAAAWwAAAAADWwAAAAABWwAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAACWwAAAAABWwAAAAABWwAAAAADWwAAAAAAWwAAAAAAWwAAAAABZwAAAAAADAAAAAADDAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAADWwAAAAAAfAAAAAAAgQAAAAAAQAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbgAAAAACbgAAAAADbgAAAAACbgAAAAABfAAAAAAAWwAAAAABWwAAAAADfAAAAAAAgQAAAAAADAAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbgAAAAACbgAAAAABbgAAAAABbgAAAAAAfAAAAAAAWwAAAAABWwAAAAADfAAAAAAAgQAAAAAADAAAAAABgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbgAAAAAAbgAAAAAAbgAAAAABbgAAAAABfAAAAAAAWwAAAAAAWwAAAAACWwAAAAADfAAAAAAAQAAAAAAADAAAAAACgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAbgAAAAACfAAAAAAAfAAAAAAAWwAAAAADWwAAAAADWwAAAAACfAAAAAAAQAAAAAAADAAAAAACDAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbgAAAAABbgAAAAAAbgAAAAACbgAAAAABfAAAAAAAWwAAAAABWwAAAAABWwAAAAAAfAAAAAAAQAAAAAAAQAAAAAAADAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAADdwAAAAACdwAAAAACbgAAAAABZwAAAAAAWwAAAAAAWwAAAAACWwAAAAADfAAAAAAADAAAAAABQAAAAAAAQAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAADdwAAAAACdwAAAAAAbgAAAAABZwAAAAAAWwAAAAACWwAAAAAAWwAAAAABfAAAAAAADAAAAAADDAAAAAADDAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbgAAAAACbgAAAAABbgAAAAAAbgAAAAACfAAAAAAAWwAAAAACWwAAAAABWwAAAAACfAAAAAAAQAAAAAAADAAAAAADDAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAdAAAAAAAfAAAAAAAfAAAAAAAWwAAAAADWwAAAAACWwAAAAABfAAAAAAAQAAAAAAAQAAAAAAADAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAACcgAAAAADcgAAAAAAfAAAAAAAWwAAAAAAWwAAAAADWwAAAAABfAAAAAAAQAAAAAAADAAAAAADgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbgAAAAABbgAAAAAAbgAAAAABcgAAAAAAfAAAAAAAWwAAAAADWwAAAAAAfAAAAAAAgQAAAAAADAAAAAACgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAABcgAAAAADcgAAAAACcgAAAAABfAAAAAAAWwAAAAADWwAAAAAAfAAAAAAAgQAAAAAAQAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: OQAAAAAAOQAAAAAAOQAAAAAAWwAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAADWwAAAAABWwAAAAACWwAAAAACWwAAAAABWwAAAAADWwAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAWwAAAAAAWwAAAAABWwAAAAAAWwAAAAABWwAAAAAAWwAAAAAAZwAAAAAADAAAAAABDAAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAADWwAAAAADfAAAAAAAgQAAAAAAQAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbgAAAAABbgAAAAABbgAAAAACbgAAAAADfAAAAAAAWwAAAAADWwAAAAACfAAAAAAAgQAAAAAADAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAbgAAAAACbgAAAAACbgAAAAAAbgAAAAABfAAAAAAAWwAAAAABWwAAAAABfAAAAAAAgQAAAAAADAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbgAAAAAAbgAAAAADbgAAAAADbgAAAAABfAAAAAAAWwAAAAACWwAAAAACWwAAAAACfAAAAAAAQAAAAAAADAAAAAABgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAbgAAAAACfAAAAAAAfAAAAAAAWwAAAAAAWwAAAAAAWwAAAAADfAAAAAAAQAAAAAAADAAAAAADDAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbgAAAAADbgAAAAADbgAAAAABbgAAAAABfAAAAAAAWwAAAAABWwAAAAABWwAAAAADfAAAAAAAQAAAAAAAQAAAAAAADAAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAABdwAAAAAAdwAAAAACbgAAAAADZwAAAAAAWwAAAAACWwAAAAAAWwAAAAACfAAAAAAADAAAAAACQAAAAAAAQAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAdwAAAAAAdwAAAAADdwAAAAAAbgAAAAACZwAAAAAAWwAAAAAAWwAAAAACWwAAAAABfAAAAAAADAAAAAADDAAAAAABDAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbgAAAAAAbgAAAAACbgAAAAAAbgAAAAABfAAAAAAAWwAAAAACWwAAAAACWwAAAAAAfAAAAAAAQAAAAAAADAAAAAADDAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAdAAAAAAAfAAAAAAAfAAAAAAAWwAAAAADWwAAAAADWwAAAAAAfAAAAAAAQAAAAAAAQAAAAAAADAAAAAADgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAACcgAAAAABcgAAAAABcgAAAAABfAAAAAAAWwAAAAABWwAAAAACWwAAAAABfAAAAAAAQAAAAAAADAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbgAAAAADbgAAAAABbgAAAAADcgAAAAABfAAAAAAAWwAAAAACWwAAAAAAfAAAAAAAgQAAAAAADAAAAAADgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAABcgAAAAAAcgAAAAAAcgAAAAABfAAAAAAAWwAAAAACWwAAAAACfAAAAAAAgQAAAAAAQAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,-14: ind: -1,-14 @@ -209,7 +210,7 @@ entities: version: 6 -1,-15: ind: -1,-15 - tiles: fAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAfAAAAAAAagAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAfAAAAAAAagAAAAAA + tiles: fAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAfAAAAAAAagAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAfAAAAAAAagAAAAAA version: 6 0,-15: ind: 0,-15 @@ -217,27 +218,27 @@ entities: version: 6 -1,-16: ind: -1,-16 - tiles: fAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAJQAAAAAAWwAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAawAAAAAAfAAAAAAAWwAAAAACQAAAAAAAQAAAAAAAQAAAAAAAJQAAAAABWwAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAJQAAAAACWwAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAADWwAAAAAAWwAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAACWwAAAAABWwAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAWwAAAAADTAAAAAABWwAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAWwAAAAADTAAAAAAAWwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfAAAAAAAWwAAAAAAWwAAAAACWwAAAAACWwAAAAABWwAAAAACWwAAAAACTAAAAAACWwAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAAATAAAAAADWwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAWwAAAAAAWwAAAAABWwAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAA + tiles: fAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAJQAAAAACWwAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAawAAAAAAfAAAAAAAWwAAAAADQAAAAAAAQAAAAAAAQAAAAAAAJQAAAAACWwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAJQAAAAABWwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAABWwAAAAAAWwAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAACWwAAAAABWwAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAWwAAAAACTAAAAAADWwAAAAADWwAAAAABfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAWwAAAAABTAAAAAACWwAAAAADWwAAAAADWwAAAAADWwAAAAABWwAAAAADWwAAAAABWwAAAAADWwAAAAACWwAAAAADWwAAAAACWwAAAAADWwAAAAABWwAAAAADWwAAAAAAWwAAAAAATAAAAAABWwAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAAATAAAAAABWwAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAWwAAAAACWwAAAAACWwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAABfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAA version: 6 0,-16: ind: 0,-16 - tiles: aQAAAAACWwAAAAAAfAAAAAAAZAAAAAACZAAAAAADZAAAAAAAZAAAAAADMwAAAAADMwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAMwAAAAAAaQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAMwAAAAACMwAAAAADMwAAAAACMwAAAAACMwAAAAACfAAAAAAAZAAAAAAAZAAAAAACfAAAAAAAfAAAAAAAMwAAAAAAMwAAAAAAaQAAAAADfAAAAAAAMwAAAAABMwAAAAADMwAAAAAAMwAAAAABMwAAAAADMwAAAAADMwAAAAABfAAAAAAAZAAAAAACZAAAAAAAfAAAAAAAfAAAAAAAMwAAAAACMwAAAAAAaQAAAAACfAAAAAAAMwAAAAADNAAAAAADNAAAAAACNAAAAAADNAAAAAACNAAAAAADMwAAAAADZAAAAAABZAAAAAADZAAAAAAAfAAAAAAAfAAAAAAAMwAAAAACMwAAAAAAaQAAAAADWwAAAAACMwAAAAAANAAAAAACNAAAAAAANAAAAAADNAAAAAADNAAAAAADMwAAAAAAfAAAAAAAHQAAAAADHQAAAAADfAAAAAAAfAAAAAAAMwAAAAAAMwAAAAACaQAAAAAAWwAAAAABMwAAAAADNAAAAAABNAAAAAACNAAAAAAANAAAAAAANAAAAAADMwAAAAACfAAAAAAAHQAAAAADHQAAAAACfAAAAAAAfAAAAAAAMwAAAAAAMwAAAAAAaQAAAAABfAAAAAAAMwAAAAAAMwAAAAADMwAAAAAAMwAAAAABMwAAAAADMwAAAAABMwAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAMwAAAAADaQAAAAABfAAAAAAAfAAAAAAAMwAAAAABMwAAAAADMwAAAAAAMwAAAAABMwAAAAADMwAAAAADMwAAAAACMwAAAAADMwAAAAAAMwAAAAADMwAAAAAAMwAAAAADMwAAAAADaQAAAAAAWwAAAAAAfAAAAAAAMwAAAAADMwAAAAACMwAAAAACMwAAAAADMwAAAAAAMwAAAAADfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAMwAAAAACaQAAAAADWwAAAAACfAAAAAAAMwAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAMwAAAAABaQAAAAABWwAAAAADWwAAAAACWwAAAAACWwAAAAACWwAAAAABWwAAAAABWwAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAMwAAAAADaQAAAAADWwAAAAAAWwAAAAAAWwAAAAAAWwAAAAACWwAAAAACWwAAAAACWwAAAAABfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAaQAAAAADWwAAAAABWwAAAAADWwAAAAACWwAAAAACWwAAAAADWwAAAAADWwAAAAADfAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAWwAAAAAATQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAWwAAAAABWwAAAAABWwAAAAACWwAAAAACWwAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAKgAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAKgAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAKgAAAAAA + tiles: aQAAAAABWwAAAAAAfAAAAAAAZAAAAAACZAAAAAAAZAAAAAABZAAAAAABMwAAAAACMwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAMwAAAAABaQAAAAACfAAAAAAAfAAAAAAAfAAAAAAAMwAAAAADMwAAAAAAMwAAAAAAMwAAAAABMwAAAAABfAAAAAAAZAAAAAABZAAAAAABfAAAAAAAfAAAAAAAMwAAAAACMwAAAAADaQAAAAABfAAAAAAAMwAAAAADMwAAAAAAMwAAAAADMwAAAAAAMwAAAAABMwAAAAACMwAAAAACfAAAAAAAZAAAAAABZAAAAAADfAAAAAAAfAAAAAAAMwAAAAABMwAAAAABaQAAAAAAfAAAAAAAMwAAAAABNAAAAAAANAAAAAACNAAAAAACNAAAAAABNAAAAAABMwAAAAABZAAAAAABZAAAAAABZAAAAAADfAAAAAAAfAAAAAAAMwAAAAACMwAAAAABaQAAAAADWwAAAAABMwAAAAAANAAAAAAANAAAAAAANAAAAAABNAAAAAAANAAAAAAAMwAAAAAAfAAAAAAAHQAAAAABHQAAAAABfAAAAAAAfAAAAAAAMwAAAAABMwAAAAAAaQAAAAADWwAAAAABMwAAAAABNAAAAAACNAAAAAABNAAAAAAANAAAAAABNAAAAAADMwAAAAABfAAAAAAAHQAAAAACHQAAAAABfAAAAAAAfAAAAAAAMwAAAAABMwAAAAADaQAAAAABfAAAAAAAMwAAAAABMwAAAAADMwAAAAACMwAAAAAAMwAAAAAAMwAAAAABMwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAMwAAAAABaQAAAAACfAAAAAAAfAAAAAAAMwAAAAABMwAAAAACMwAAAAABMwAAAAABMwAAAAADMwAAAAACMwAAAAACMwAAAAADMwAAAAABMwAAAAADMwAAAAACMwAAAAAAMwAAAAACaQAAAAABWwAAAAAAfAAAAAAAMwAAAAADMwAAAAAAMwAAAAABMwAAAAACMwAAAAAAMwAAAAACfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAMwAAAAAAaQAAAAADWwAAAAADfAAAAAAAMwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAMwAAAAACaQAAAAACWwAAAAAAWwAAAAACWwAAAAABWwAAAAACWwAAAAADWwAAAAAAWwAAAAACfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAMwAAAAAAaQAAAAADWwAAAAAAWwAAAAABWwAAAAABWwAAAAADWwAAAAABWwAAAAAAWwAAAAABfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAaQAAAAAAWwAAAAAAWwAAAAAAWwAAAAABWwAAAAAAWwAAAAACWwAAAAADWwAAAAADawAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAawAAAAAATQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAWwAAAAADWwAAAAACWwAAAAABWwAAAAABWwAAAAADfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAKgAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAKgAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAKgAAAAAA version: 6 -1,-17: ind: -1,-17 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAMwAAAAADNAAAAAAANAAAAAAANAAAAAAANAAAAAAANAAAAAAANAAAAAABWwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAANAAAAAABMwAAAAADMwAAAAABMwAAAAADMwAAAAADMwAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAMwAAAAADMwAAAAACMwAAAAABOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfAAAAAAAfgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfgAAAAAAfAAAAAAAWwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfgAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAAAWwAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAWwAAAAAAWwAAAAABWwAAAAAD + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAMwAAAAACNAAAAAAANAAAAAADNAAAAAADNAAAAAADNAAAAAADNAAAAAABWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAANAAAAAABMwAAAAACMwAAAAADMwAAAAABMwAAAAADMwAAAAACfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAMwAAAAAAMwAAAAACMwAAAAADOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAfAAAAAAAWwAAAAADWwAAAAACWwAAAAADWwAAAAADfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAfAAAAAAAWwAAAAADWwAAAAADWwAAAAAAWwAAAAACfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAfAAAAAAAWwAAAAADWwAAAAABWwAAAAABWwAAAAABfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAWwAAAAADWwAAAAAAWwAAAAABWwAAAAACWwAAAAADawAAAAAAfgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAWwAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfgAAAAAAfAAAAAAAWwAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfgAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAADWwAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAWwAAAAADWwAAAAACWwAAAAAC version: 6 0,-17: ind: 0,-17 - tiles: WwAAAAADWwAAAAACWwAAAAABWwAAAAADWwAAAAAAWwAAAAACWwAAAAACfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAACWwAAAAACfAAAAAAAWwAAAAAAWwAAAAACWwAAAAAAWwAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAWwAAAAAAfAAAAAAAWwAAAAABfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAQAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAQAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAQAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAMwAAAAADaQAAAAACWwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfAAAAAAAMwAAAAADaQAAAAACWwAAAAABfAAAAAAAagAAAAAAfAAAAAAAagAAAAAAfgAAAAAAfAAAAAAAagAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAMwAAAAACaQAAAAABWwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAaQAAAAACWwAAAAAAfAAAAAAAZAAAAAABZAAAAAABZAAAAAABZAAAAAAAMwAAAAADMwAAAAADfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAMwAAAAADaQAAAAACWwAAAAAAZAAAAAAAZAAAAAACZAAAAAABZAAAAAABZAAAAAABMwAAAAACMwAAAAABMwAAAAABMwAAAAADMwAAAAADMwAAAAAAMwAAAAAAMwAAAAADMwAAAAAD + tiles: WwAAAAACWwAAAAADWwAAAAAAWwAAAAACWwAAAAADWwAAAAABWwAAAAACfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAABWwAAAAACfAAAAAAAWwAAAAABWwAAAAACWwAAAAAAWwAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAWwAAAAACfAAAAAAAWwAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAfAAAAAAAWwAAAAADOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAewAAAAAAewAAAAAAfAAAAAAAWwAAAAABOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAfAAAAAAAWwAAAAADOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAewAAAAAAewAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAMwAAAAADaQAAAAAAWwAAAAABawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfAAAAAAAMwAAAAADaQAAAAABWwAAAAADfAAAAAAAagAAAAAAfAAAAAAAagAAAAAAfgAAAAAAfAAAAAAAagAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAMwAAAAADaQAAAAADWwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAaQAAAAAAWwAAAAADfAAAAAAAZAAAAAADZAAAAAADZAAAAAAAZAAAAAAAMwAAAAABMwAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAMwAAAAABaQAAAAABWwAAAAABZAAAAAADZAAAAAADZAAAAAACZAAAAAADZAAAAAADMwAAAAADMwAAAAADMwAAAAAAMwAAAAABMwAAAAAAMwAAAAABMwAAAAACMwAAAAADMwAAAAAD version: 6 1,-16: ind: 1,-16 - tiles: MwAAAAACMwAAAAACMwAAAAABMwAAAAADfAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAQAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAQAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAAAABMwAAAAABMwAAAAABMwAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAAAACNAAAAAAANAAAAAAAMwAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAAAABNAAAAAADNAAAAAAAMwAAAAADfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAAAADNAAAAAADNAAAAAAAMwAAAAADfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAAAACMwAAAAACMwAAAAABMwAAAAADfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKgAAAAAATQAAAAAAKgAAAAAAKgAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKgAAAAAATQAAAAAAKgAAAAAAKgAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKgAAAAAATQAAAAAAKgAAAAAAKgAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: MwAAAAABMwAAAAAAMwAAAAADMwAAAAABfAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAQAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAQAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAAAADMwAAAAAAMwAAAAACMwAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAAAABNAAAAAAANAAAAAABMwAAAAACfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAAAABNAAAAAADNAAAAAAAMwAAAAADfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAAAABNAAAAAACNAAAAAACMwAAAAADfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAAAADMwAAAAACMwAAAAACMwAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKgAAAAAATQAAAAAAKgAAAAAAKgAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKgAAAAAATQAAAAAAKgAAAAAAKgAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKgAAAAAATQAAAAAAKgAAAAAAKgAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 1,-17: ind: 1,-17 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAMwAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAMwAAAAACfAAAAAAAfAAAAAAAMwAAAAABfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAMwAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAANAAAAAADNAAAAAACfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAfAAAAAAANAAAAAABNAAAAAADNAAAAAAAMwAAAAABfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAfAAAAAAANAAAAAAANAAAAAABNAAAAAACMwAAAAABfAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAACWwAAAAABWwAAAAABfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAWwAAAAACWwAAAAACWwAAAAACfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAWwAAAAACWwAAAAAAWwAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAWwAAAAADfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAMwAAAAAAfAAAAAAAfAAAAAAAMwAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAMwAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAANAAAAAACNAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAfAAAAAAANAAAAAACNAAAAAAANAAAAAAAMwAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAfAAAAAAANAAAAAACNAAAAAABNAAAAAACMwAAAAACfAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAA version: 6 1,-9: ind: 1,-9 @@ -261,43 +262,43 @@ entities: version: 6 -1,-20: ind: -1,-20 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHQAAAAADHQAAAAABHQAAAAADHQAAAAAAHQAAAAADHQAAAAABHQAAAAAAfAAAAAAAaQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHQAAAAAAHQAAAAACHQAAAAADHQAAAAABTAAAAAADTAAAAAABHQAAAAACfAAAAAAAaQAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAHQAAAAAAHQAAAAACHQAAAAADHQAAAAAATAAAAAADTAAAAAADHQAAAAABHQAAAAADaQAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHQAAAAABTAAAAAAATAAAAAAAHQAAAAACfAAAAAAAaQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAagAAAAAAagAAAAAAagAAAAAAfAAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAHQAAAAAAfAAAAAAAaQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAagAAAAAAagAAAAAAagAAAAAAfAAAAAAAHQAAAAABHQAAAAADHQAAAAACHQAAAAACfAAAAAAAaQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAagAAAAAAagAAAAAAagAAAAAAfAAAAAAAHQAAAAAAHQAAAAACHQAAAAABHQAAAAACfAAAAAAAaQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAQAAAAAAAQAAAAAAAHQAAAAAAHQAAAAADfAAAAAAAaQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAQAAAAAAAQAAAAAAAHQAAAAADHQAAAAAAfAAAAAAAaQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHQAAAAABfAAAAAAAHQAAAAACaQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAaAAAAAAAaAAAAAABaAAAAAACaAAAAAABaAAAAAADaAAAAAADaAAAAAADaAAAAAABaQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAQgAAAAAAWwAAAAADWwAAAAABWwAAAAAAWwAAAAABWwAAAAABWwAAAAACWwAAAAADaQAAAAABAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAaAAAAAABaAAAAAACaAAAAAACaAAAAAABaAAAAAABaAAAAAACaAAAAAABaAAAAAABaQAAAAADAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAADfAAAAAAAHQAAAAABaQAAAAACAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHQAAAAACHQAAAAAAfAAAAAAAHQAAAAABHQAAAAABHQAAAAADHQAAAAACHQAAAAACfAAAAAAAaQAAAAABAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAHQAAAAABHQAAAAACfAAAAAAAHQAAAAACHQAAAAACTAAAAAACTAAAAAAAHQAAAAACfAAAAAAAaQAAAAAC + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHQAAAAAAHQAAAAAAHQAAAAACHQAAAAACHQAAAAACHQAAAAADHQAAAAACfAAAAAAAaQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHQAAAAADHQAAAAABHQAAAAACHQAAAAAATAAAAAABTAAAAAAAHQAAAAABfAAAAAAAaQAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAHQAAAAADHQAAAAAAHQAAAAAAHQAAAAACTAAAAAADTAAAAAADHQAAAAAAHQAAAAACaQAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHQAAAAABTAAAAAADTAAAAAAAHQAAAAADfAAAAAAAaQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAagAAAAAAagAAAAAAagAAAAAAfAAAAAAAHQAAAAAAHQAAAAADHQAAAAADHQAAAAABfAAAAAAAaQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAagAAAAAAagAAAAAAagAAAAAAfAAAAAAAHQAAAAABHQAAAAADHQAAAAAAHQAAAAADfAAAAAAAaQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAagAAAAAAagAAAAAAagAAAAAAfAAAAAAAHQAAAAACHQAAAAABHQAAAAACHQAAAAACfAAAAAAAaQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAQAAAAAAAQAAAAAAAHQAAAAADHQAAAAACfAAAAAAAaQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAQAAAAAAAQAAAAAAAHQAAAAABHQAAAAABfAAAAAAAaQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHQAAAAACfAAAAAAAHQAAAAAAaQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAaAAAAAACaAAAAAAAaAAAAAADaAAAAAAAaAAAAAACaAAAAAACaAAAAAACaAAAAAABaQAAAAACAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAQgAAAAAAWwAAAAADWwAAAAACWwAAAAABWwAAAAADWwAAAAADWwAAAAAAWwAAAAADaQAAAAACAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAaAAAAAAAaAAAAAACaAAAAAAAaAAAAAABaAAAAAADaAAAAAABaAAAAAAAaAAAAAABaQAAAAABAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAACfAAAAAAAHQAAAAACaQAAAAACAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHQAAAAABHQAAAAADfAAAAAAAHQAAAAADHQAAAAABHQAAAAAAHQAAAAACHQAAAAACfAAAAAAAaQAAAAADAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAHQAAAAADHQAAAAADfAAAAAAAHQAAAAACHQAAAAACTAAAAAACTAAAAAAAHQAAAAACfAAAAAAAaQAAAAAD version: 6 0,-20: ind: 0,-20 - tiles: WwAAAAACaQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAWwAAAAAAaQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAWwAAAAADaQAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAWwAAAAABaQAAAAACfAAAAAAAHQAAAAAAHQAAAAADHQAAAAADHQAAAAAAHQAAAAAAHQAAAAADfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAaQAAAAAAfAAAAAAAHQAAAAABXQAAAAADXQAAAAACXQAAAAABHQAAAAABHQAAAAACfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAWwAAAAABaQAAAAAAfAAAAAAAQAAAAAAAQAAAAAAATAAAAAAAXQAAAAABHQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAWwAAAAADaQAAAAAAfAAAAAAAQAAAAAAAQAAAAAAATAAAAAADXQAAAAAAHQAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAWwAAAAADaQAAAAAAfAAAAAAAQAAAAAAAQAAAAAAATAAAAAADXQAAAAADHQAAAAABfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAACaQAAAAADfAAAAAAAHQAAAAADXQAAAAAAXQAAAAACXQAAAAACHQAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAACaQAAAAACfAAAAAAAHQAAAAADHQAAAAADHQAAAAABHQAAAAABHQAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAABaQAAAAABHQAAAAACfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAWwAAAAACaAAAAAACaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAACaAAAAAAAaAAAAAAAaAAAAAABaAAAAAAAaAAAAAACOQAAAAAAgQAAAAAAgQAAAAAAWwAAAAACWwAAAAAAWwAAAAADWwAAAAACWwAAAAADWwAAAAAAWwAAAAAAWwAAAAACWwAAAAABWwAAAAAAWwAAAAABWwAAAAACWwAAAAABOQAAAAAAOQAAAAAAOQAAAAAAWwAAAAADWwAAAAABaAAAAAABaAAAAAADaAAAAAACaAAAAAAAaAAAAAADaAAAAAAAaAAAAAADaAAAAAAAaAAAAAADaAAAAAADaAAAAAABOQAAAAAAgQAAAAAAgQAAAAAAWwAAAAAAaQAAAAAAHQAAAAACfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAaQAAAAAAfAAAAAAAHQAAAAABHQAAAAADHQAAAAAAHQAAAAABHQAAAAACfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: WwAAAAABaQAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAWwAAAAACaQAAAAACfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAWwAAAAADaQAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAWwAAAAAAaQAAAAACfAAAAAAAHQAAAAAAHQAAAAACHQAAAAAAHQAAAAAAHQAAAAACHQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAADaQAAAAABfAAAAAAAHQAAAAABXQAAAAABXQAAAAACXQAAAAADHQAAAAABHQAAAAACfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAWwAAAAACaQAAAAAAfAAAAAAAQAAAAAAAQAAAAAAATAAAAAABXQAAAAAAHQAAAAABfAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAWwAAAAADaQAAAAADfAAAAAAAQAAAAAAAQAAAAAAATAAAAAABXQAAAAACHQAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAWwAAAAACaQAAAAACfAAAAAAAQAAAAAAAQAAAAAAATAAAAAACXQAAAAADHQAAAAAAfAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAaQAAAAACfAAAAAAAHQAAAAACXQAAAAAAXQAAAAACXQAAAAABHQAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAACaQAAAAABfAAAAAAAHQAAAAADHQAAAAAAHQAAAAAAHQAAAAABHQAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAADaQAAAAADHQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAWwAAAAADWwAAAAACaAAAAAAAaAAAAAADaAAAAAADaAAAAAAAaAAAAAAAaAAAAAAAaAAAAAADaAAAAAACaAAAAAADaAAAAAABaAAAAAACOQAAAAAAgQAAAAAAgQAAAAAAWwAAAAACWwAAAAADWwAAAAACWwAAAAACWwAAAAAAWwAAAAADWwAAAAABWwAAAAADWwAAAAAAWwAAAAABWwAAAAABWwAAAAADWwAAAAACOQAAAAAAOQAAAAAAOQAAAAAAWwAAAAABWwAAAAAAaAAAAAADaAAAAAACaAAAAAABaAAAAAABaAAAAAADaAAAAAACaAAAAAABaAAAAAADaAAAAAACaAAAAAABaAAAAAADOQAAAAAAgQAAAAAAgQAAAAAAWwAAAAADaQAAAAABHQAAAAACfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAWwAAAAABaQAAAAAAfAAAAAAAHQAAAAADHQAAAAACHQAAAAADHQAAAAADHQAAAAACfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 0,-18: ind: 0,-18 - tiles: WwAAAAADfAAAAAAAagAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAABfAAAAAAAfAAAAAAAfAAAAAAANQAAAAABNQAAAAABNQAAAAABfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAADfAAAAAAAfAAAAAAAfAAAAAAANQAAAAAANQAAAAAANQAAAAADfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAABfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGgAAAAADGgAAAAAAGgAAAAAAGgAAAAADGgAAAAAAGgAAAAADGgAAAAADGgAAAAABGgAAAAABfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAACGwAAAAAAGwAAAAACGwAAAAACGwAAAAACGwAAAAAAGwAAAAAAGwAAAAADGgAAAAABWwAAAAAAWwAAAAACWwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAANQAAAAACNQAAAAADNQAAAAADNQAAAAADNQAAAAAANQAAAAADGwAAAAADGgAAAAAAGgAAAAADGgAAAAABGgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAADNQAAAAABNQAAAAAANQAAAAAANQAAAAABNQAAAAABNQAAAAABGwAAAAADGgAAAAAAWwAAAAAAWwAAAAACfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAADNQAAAAACNQAAAAABNQAAAAAANQAAAAAANQAAAAADNQAAAAAAGwAAAAADGgAAAAACGgAAAAAAGgAAAAABGgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAAGwAAAAAAGwAAAAADGwAAAAADGwAAAAACGwAAAAADGwAAAAAAGwAAAAADGgAAAAADWwAAAAACWwAAAAADWwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGgAAAAADGgAAAAACGgAAAAADGgAAAAADGgAAAAACGgAAAAAAGgAAAAACGgAAAAABGgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAADWwAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAWwAAAAADWwAAAAACWwAAAAAAWwAAAAADWwAAAAACWwAAAAACfAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAADWwAAAAAAfAAAAAAAWwAAAAADWwAAAAAAWwAAAAADWwAAAAACfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAABWwAAAAABWwAAAAAAWwAAAAADWwAAAAABWwAAAAACWwAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: WwAAAAADfAAAAAAAagAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAANQAAAAADNQAAAAADNQAAAAACfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAACfAAAAAAAfAAAAAAAfAAAAAAANQAAAAAANQAAAAADNQAAAAACfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAABfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGgAAAAAAGgAAAAABGgAAAAACGgAAAAACGgAAAAADGgAAAAABGgAAAAABGgAAAAACGgAAAAABfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAACGwAAAAABGwAAAAADGwAAAAADGwAAAAADGwAAAAAAGwAAAAACGwAAAAABGgAAAAACWwAAAAAAWwAAAAABWwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAABNQAAAAABNQAAAAADNQAAAAACNQAAAAADNQAAAAABNQAAAAADGwAAAAAAGgAAAAADGgAAAAABGgAAAAACGgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAAANQAAAAACNQAAAAACNQAAAAABNQAAAAABNQAAAAABNQAAAAAAGwAAAAABGgAAAAADWwAAAAACWwAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAACNQAAAAADNQAAAAABNQAAAAADNQAAAAACNQAAAAAANQAAAAAAGwAAAAABGgAAAAADGgAAAAACGgAAAAACGgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGwAAAAACGwAAAAABGwAAAAADGwAAAAAAGwAAAAACGwAAAAACGwAAAAADGwAAAAABGgAAAAADWwAAAAADWwAAAAADWwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGgAAAAACGgAAAAADGgAAAAABGgAAAAABGgAAAAADGgAAAAABGgAAAAADGgAAAAAAGgAAAAACfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAABWwAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAABWwAAAAAAWwAAAAADWwAAAAACWwAAAAADWwAAAAABWwAAAAADfAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAABWwAAAAACfAAAAAAAWwAAAAACWwAAAAACWwAAAAAAWwAAAAADfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAADWwAAAAABWwAAAAABWwAAAAAAWwAAAAACWwAAAAABWwAAAAADfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,-18: ind: -1,-18 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAMwAAAAADNAAAAAAANAAAAAABNAAAAAACMwAAAAACfAAAAAAAWwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAMwAAAAABNAAAAAABMwAAAAABMwAAAAABWwAAAAACfAAAAAAAWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAMwAAAAAANAAAAAACMwAAAAAAWwAAAAABWwAAAAAAWwAAAAACWwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAMwAAAAAANAAAAAACWwAAAAACWwAAAAADWwAAAAACWwAAAAABWwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAMwAAAAACNAAAAAAAfAAAAAAAWwAAAAACWwAAAAAAWwAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAfAAAAAAANAAAAAABfAAAAAAAWwAAAAADWwAAAAADfAAAAAAAGgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAWwAAAAABWwAAAAABWwAAAAACWwAAAAADfAAAAAAAGgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAWwAAAAACTAAAAAAATAAAAAADWwAAAAABWwAAAAABGgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAWwAAAAAATAAAAAACTAAAAAACWwAAAAAAWwAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAWwAAAAADTAAAAAAATAAAAAABWwAAAAAAWwAAAAADGgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAWwAAAAAAWwAAAAABWwAAAAADWwAAAAABfAAAAAAAGgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAAAfAAAAAAAWwAAAAACWwAAAAAAfAAAAAAAGgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAMwAAAAAAMwAAAAABNAAAAAADfAAAAAAAWwAAAAADWwAAAAAAWwAAAAACfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAMwAAAAABMwAAAAACNAAAAAADWwAAAAADWwAAAAACWwAAAAADWwAAAAABWwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAWwAAAAABNAAAAAADNAAAAAABNAAAAAACMwAAAAADWwAAAAABWwAAAAADWwAAAAADWwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAWwAAAAABNAAAAAACNAAAAAACNAAAAAADMwAAAAADMwAAAAABWwAAAAADfAAAAAAAfAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAMwAAAAABNAAAAAABNAAAAAAANAAAAAABMwAAAAABfAAAAAAAWwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAMwAAAAADNAAAAAAAMwAAAAABfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAMwAAAAABNAAAAAACfAAAAAAAfAAAAAAAWwAAAAACWwAAAAADWwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAMwAAAAAANAAAAAACfAAAAAAAWwAAAAADWwAAAAADWwAAAAACWwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAMwAAAAACNAAAAAACfAAAAAAAWwAAAAAAWwAAAAACfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAfAAAAAAANAAAAAACfAAAAAAAWwAAAAAAWwAAAAAAfAAAAAAAGgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAWwAAAAAAWwAAAAADWwAAAAACWwAAAAAAfAAAAAAAGgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAWwAAAAADTAAAAAABTAAAAAABWwAAAAABWwAAAAAAGgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAWwAAAAADTAAAAAAATAAAAAADWwAAAAADWwAAAAADQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAWwAAAAAATAAAAAACTAAAAAADWwAAAAADWwAAAAADGgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAWwAAAAADWwAAAAACWwAAAAAAWwAAAAADfAAAAAAAGgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAADfAAAAAAAWwAAAAACWwAAAAADfAAAAAAAGgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAMwAAAAAAMwAAAAACNAAAAAADfAAAAAAAWwAAAAADWwAAAAADfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAMwAAAAAAMwAAAAACNAAAAAACfAAAAAAAWwAAAAACWwAAAAACWwAAAAADWwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAWwAAAAAANAAAAAADNAAAAAABNAAAAAAAfAAAAAAAfAAAAAAAWwAAAAADWwAAAAACWwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAWwAAAAACNAAAAAADNAAAAAAANAAAAAABMwAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAA version: 6 0,-19: ind: 0,-19 - tiles: WwAAAAACaQAAAAABfAAAAAAAHQAAAAADTAAAAAAATAAAAAADTAAAAAACHQAAAAABfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAACaQAAAAADfAAAAAAAHQAAAAADTAAAAAABTAAAAAACTAAAAAAAHQAAAAABfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAABaQAAAAACfAAAAAAAHQAAAAAAHQAAAAADHQAAAAABHQAAAAABHQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAWwAAAAAAaQAAAAACfAAAAAAAHQAAAAABHQAAAAADQAAAAAAAQAAAAAAAQAAAAAAAfAAAAAAAagAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAWwAAAAACaQAAAAABfAAAAAAAHQAAAAAAHQAAAAADQAAAAAAAQAAAAAAAQAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAWwAAAAAAaQAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAAAaQAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: WwAAAAABaQAAAAADfAAAAAAAHQAAAAABTAAAAAADTAAAAAACTAAAAAACHQAAAAACfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAABaQAAAAACfAAAAAAAHQAAAAAATAAAAAADTAAAAAABTAAAAAABHQAAAAABfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAACaQAAAAACfAAAAAAAHQAAAAABHQAAAAABHQAAAAAAHQAAAAACHQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAWwAAAAADaQAAAAACfAAAAAAAHQAAAAABHQAAAAABQAAAAAAAQAAAAAAAQAAAAAAAfAAAAAAAagAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAWwAAAAAAaQAAAAACfAAAAAAAHQAAAAADHQAAAAADQAAAAAAAQAAAAAAAQAAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAWwAAAAAAaQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWwAAAAACaQAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAagAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,-19: ind: -1,-19 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAHQAAAAADHQAAAAACHQAAAAAAHQAAAAACHQAAAAAATAAAAAACTAAAAAACHQAAAAADfAAAAAAAaQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAHQAAAAABHQAAAAABfAAAAAAAHQAAAAAAHQAAAAAATAAAAAADTAAAAAADHQAAAAADfAAAAAAAaQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAHQAAAAAAfAAAAAAAHQAAAAAAHQAAAAADHQAAAAABHQAAAAABHQAAAAAAfAAAAAAAaQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAQAAAAAAAQAAAAAAAHQAAAAABHQAAAAABHQAAAAABHQAAAAAAHQAAAAACHQAAAAAAfAAAAAAAaQAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAANgAAAAAAQAAAAAAAHQAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAHQAAAAAAHQAAAAADfAAAAAAAaQAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAaQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAaQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAMwAAAAADMwAAAAABMwAAAAABMwAAAAACOQAAAAAAOQAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAHQAAAAADHQAAAAACHQAAAAACHQAAAAACHQAAAAABTAAAAAACTAAAAAACHQAAAAABfAAAAAAAaQAAAAACAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAHQAAAAABHQAAAAADfAAAAAAAHQAAAAACHQAAAAAATAAAAAACTAAAAAABHQAAAAABfAAAAAAAaQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAHQAAAAACfAAAAAAAHQAAAAAAHQAAAAABHQAAAAACHQAAAAAAHQAAAAAAfAAAAAAAaQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAQAAAAAAAQAAAAAAAHQAAAAAAHQAAAAACHQAAAAAAHQAAAAAAHQAAAAACHQAAAAABfAAAAAAAaQAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAANgAAAAAAQAAAAAAAHQAAAAACQAAAAAAAQAAAAAAAQAAAAAAAHQAAAAACHQAAAAABfAAAAAAAaQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAaQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAaQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAMwAAAAADMwAAAAACMwAAAAACMwAAAAABOQAAAAAAOQAAAAAA version: 6 -1,-21: ind: -1,-21 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAMwAAAAABMwAAAAACMwAAAAAAMwAAAAACfAAAAAAAMwAAAAAAMwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAMwAAAAACMwAAAAADMwAAAAAAfAAAAAAAfAAAAAAAMwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAMwAAAAADMwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAMwAAAAACMwAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAJQAAAAADMwAAAAABMwAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAJQAAAAADMwAAAAACMwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAJQAAAAABMwAAAAADMwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAANAAAAAACMwAAAAAAMwAAAAACOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAAAfAAAAAAAagAAAAAAOQAAAAAAOQAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAMwAAAAADMwAAAAAAMwAAAAAAMwAAAAABfAAAAAAAMwAAAAACMwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAMwAAAAAAMwAAAAACMwAAAAACfAAAAAAAfAAAAAAAMwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAMwAAAAADMwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAMwAAAAACMwAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAJQAAAAADMwAAAAAAMwAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAJQAAAAAAMwAAAAADMwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAJQAAAAABMwAAAAAAMwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAANAAAAAABMwAAAAAAMwAAAAACOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAOAAAAAAAgQAAAAAAgQAAAAAAKgAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAWwAAAAACfAAAAAAAagAAAAAAOQAAAAAAOQAAAAAA version: 6 0,-21: ind: 0,-21 - tiles: NAAAAAADMwAAAAABMwAAAAAAfAAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAAAADMwAAAAACMwAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAAAADMwAAAAADMwAAAAABfAAAAAAAegAAAAAAeAAAAAAAeAAAAAACfAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAAAABMwAAAAABMwAAAAABfAAAAAAAegAAAAACeAAAAAABeAAAAAABfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAANAAAAAACMwAAAAAAMwAAAAAAegAAAAACegAAAAAAeAAAAAAAeAAAAAADfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAANAAAAAAAMwAAAAAAMwAAAAAAfAAAAAAAegAAAAAAeAAAAAAAeAAAAAACfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAegAAAAADeAAAAAADfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAagAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: NAAAAAAAMwAAAAADMwAAAAABfAAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAAAABMwAAAAAAMwAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAAAABMwAAAAABMwAAAAABfAAAAAAAegAAAAAAeAAAAAACeAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAAAABMwAAAAAAMwAAAAACfAAAAAAAegAAAAAAeAAAAAABeAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAANAAAAAACMwAAAAADMwAAAAADegAAAAAAegAAAAAAeAAAAAADeAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAANAAAAAADMwAAAAACMwAAAAAAfAAAAAAAegAAAAABeAAAAAACeAAAAAABfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAegAAAAADeAAAAAABfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAagAAAAAAfAAAAAAAagAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 1,-20: ind: 1,-20 - tiles: gQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAHQAAAAADHQAAAAAAHQAAAAADHQAAAAAAHQAAAAABHQAAAAACHQAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAHQAAAAABHQAAAAADHQAAAAACHQAAAAABHQAAAAAAHQAAAAAAHQAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAHQAAAAADfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAHQAAAAABfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAHQAAAAACfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAQAAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAQAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAOQAAAAAAQAAAAAAAawAAAAAAawAAAAAANgAAAAAAfAAAAAAANgAAAAAAawAAAAAAawAAAAAAQAAAAAAAfAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAQAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAQAAAAAAAQAAAAAAAQAAAAAAANgAAAAAAQAAAAAAAfAAAAAAAgQAAAAAAOQAAAAAAQAAAAAAAawAAAAAAawAAAAAANgAAAAAAfAAAAAAANgAAAAAAawAAAAAAawAAAAAAQAAAAAAAfAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAQAAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAQAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAA + tiles: gQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAHQAAAAABHQAAAAABHQAAAAABHQAAAAABHQAAAAACHQAAAAAAHQAAAAACfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAANgAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAHQAAAAAAHQAAAAACHQAAAAACHQAAAAAAHQAAAAADHQAAAAACHQAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAHQAAAAABfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAHQAAAAACfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAHQAAAAABfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAQAAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAQAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAOQAAAAAAQAAAAAAAawAAAAAAawAAAAAANgAAAAAAfAAAAAAANgAAAAAAawAAAAAAawAAAAAAQAAAAAAAfAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAQAAAAAAAawAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAawAAAAAAQAAAAAAAQAAAAAAAQAAAAAAANgAAAAAAQAAAAAAAfAAAAAAAgQAAAAAAOQAAAAAAQAAAAAAAawAAAAAAawAAAAAANgAAAAAAfAAAAAAANgAAAAAAawAAAAAAawAAAAAAQAAAAAAAfAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAQAAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAQAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAawAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAA version: 6 1,-19: ind: 1,-19 - tiles: AAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAHQAAAAABfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAHQAAAAADfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAHQAAAAADfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAHQAAAAADHQAAAAABHQAAAAADHQAAAAACHQAAAAACHQAAAAADHQAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAHQAAAAAAHQAAAAACHQAAAAACHQAAAAADHQAAAAADHQAAAAACHQAAAAACfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAHQAAAAABfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAHQAAAAABfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAHQAAAAABfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAHQAAAAABHQAAAAAAHQAAAAADHQAAAAABHQAAAAACHQAAAAAAHQAAAAABfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAEQAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAHQAAAAACHQAAAAADHQAAAAABHQAAAAABHQAAAAACHQAAAAABHQAAAAADfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 1,-21: ind: 1,-21 @@ -305,35 +306,35 @@ entities: version: 6 0,-22: ind: 0,-22 - tiles: OQAAAAAAOQAAAAAAgQAAAAAAAAAAAAAAewAAAAAAOAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAgQAAAAAAAAAAAAAAewAAAAAAOAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAAAAAQgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAAAACQgAAAAAAQgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAAAAAQgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAANAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAANAAAAAACMwAAAAABMwAAAAABfAAAAAAATQAAAAAAagAAAAAAagAAAAAAagAAAAAATQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAAAADMwAAAAABMwAAAAABMwAAAAADfAAAAAAAagAAAAAAagAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAAAADMwAAAAADMwAAAAAAMwAAAAADagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAATQAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAAAACMwAAAAADMwAAAAACMwAAAAACfAAAAAAAagAAAAAAagAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAAAADMwAAAAACMwAAAAABfAAAAAAATQAAAAAAagAAAAAATQAAAAAAagAAAAAATQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAAAABMwAAAAAAMwAAAAAAfAAAAAAATQAAAAAAagAAAAAATQAAAAAAagAAAAAATQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAAAAAMwAAAAADMwAAAAADfAAAAAAATQAAAAAAagAAAAAAagAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: OQAAAAAAOQAAAAAAgQAAAAAAAAAAAAAAewAAAAAAOAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAgQAAAAAAAAAAAAAAewAAAAAAOAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAAAADQgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAAAAAQgAAAAAAQgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAAAAAQgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAANAAAAAACfAAAAAAAfAAAAAAAfAAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAATQAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAANAAAAAAAMwAAAAACMwAAAAACfAAAAAAATQAAAAAAagAAAAAAagAAAAAAagAAAAAATQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAAAADMwAAAAABMwAAAAACMwAAAAADfAAAAAAAagAAAAAAagAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAAAADMwAAAAADMwAAAAAAMwAAAAABagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAATQAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAAAABMwAAAAABMwAAAAABMwAAAAABfAAAAAAAagAAAAAAagAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAAAAAMwAAAAAAMwAAAAABfAAAAAAATQAAAAAAagAAAAAATQAAAAAAagAAAAAATQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAAAAAMwAAAAAAMwAAAAACfAAAAAAATQAAAAAAagAAAAAATQAAAAAAagAAAAAATQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAAAACMwAAAAACMwAAAAADfAAAAAAATQAAAAAAagAAAAAAagAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,-22: ind: -1,-22 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAOAAAAAAAewAAAAAAAAAAAAAAgQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAOAAAAAAAewAAAAAAAAAAAAAAgQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAMwAAAAACMwAAAAAAMwAAAAABfAAAAAAAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAMwAAAAAAMwAAAAABMwAAAAAAMwAAAAABfAAAAAAAQgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAMwAAAAABMwAAAAAAMwAAAAACMwAAAAADfAAAAAAAQgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAMwAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAMwAAAAACMwAAAAADMwAAAAACMwAAAAABMwAAAAABfAAAAAAAMwAAAAACMwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAMwAAAAABMwAAAAAAMwAAAAABMwAAAAAAMwAAAAACMwAAAAABfAAAAAAAMwAAAAAAMwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAMwAAAAADMwAAAAACMwAAAAABMwAAAAADMwAAAAACMwAAAAACfAAAAAAAMwAAAAABMwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAMwAAAAABMwAAAAADMwAAAAAAMwAAAAABMwAAAAABMwAAAAABMwAAAAADMwAAAAAAMwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAMwAAAAACMwAAAAAAMwAAAAABMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAAAMwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAMwAAAAABMwAAAAABMwAAAAAAMwAAAAAAMwAAAAABMwAAAAAAfAAAAAAAMwAAAAADMwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAMwAAAAACMwAAAAADMwAAAAAAMwAAAAABMwAAAAABfAAAAAAAMwAAAAAAMwAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAOAAAAAAAewAAAAAAAAAAAAAAgQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAOAAAAAAAewAAAAAAAAAAAAAAgQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAMwAAAAACMwAAAAABMwAAAAABfAAAAAAAQgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAMwAAAAABMwAAAAADMwAAAAADMwAAAAADfAAAAAAAQgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAMwAAAAADMwAAAAADMwAAAAACMwAAAAAAfAAAAAAAQgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAMwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAMwAAAAADMwAAAAADMwAAAAABMwAAAAACMwAAAAACfAAAAAAAMwAAAAABMwAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAMwAAAAAAMwAAAAAAMwAAAAADMwAAAAACMwAAAAADMwAAAAABfAAAAAAAMwAAAAAAMwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAMwAAAAAAMwAAAAACMwAAAAADMwAAAAABMwAAAAADMwAAAAADfAAAAAAAMwAAAAADMwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAMwAAAAABMwAAAAACMwAAAAACMwAAAAAAMwAAAAABMwAAAAADMwAAAAABMwAAAAABMwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAMwAAAAABMwAAAAADMwAAAAADMwAAAAABMwAAAAAAMwAAAAADMwAAAAADMwAAAAABMwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAMwAAAAADMwAAAAADMwAAAAAAMwAAAAABMwAAAAADMwAAAAABfAAAAAAAMwAAAAACMwAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAMwAAAAACMwAAAAADMwAAAAADMwAAAAADMwAAAAACfAAAAAAAMwAAAAAAMwAAAAAA version: 6 0,-23: ind: 0,-23 - tiles: QAAAAAAAQAAAAAAAfAAAAAAAfAAAAAAAMwAAAAACfAAAAAAAHgAAAAADHgAAAAADfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAIgAAAAABJQAAAAACfAAAAAAAJgAAAAADJQAAAAAAJgAAAAACHgAAAAABHgAAAAADfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAIgAAAAABJQAAAAABfAAAAAAAJgAAAAADJQAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAIgAAAAACJQAAAAACfAAAAAAAJgAAAAAAJQAAAAADfAAAAAAAHgAAAAABHgAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAIgAAAAACJQAAAAAAfAAAAAAAJgAAAAAAJQAAAAADJgAAAAABHgAAAAADHgAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAIgAAAAACJQAAAAABfAAAAAAAJgAAAAADJQAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAQAAAAAAAfAAAAAAAJgAAAAABHQAAAAADJQAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAJgAAAAADJgAAAAADHQAAAAABJgAAAAADJQAAAAACIgAAAAACfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAHQAAAAABHQAAAAADJgAAAAACJQAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAHQAAAAADHQAAAAACJQAAAAADfAAAAAAAHgAAAAACHgAAAAACfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAHQAAAAAAHQAAAAABJQAAAAABNAAAAAACHgAAAAACHgAAAAACfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAAAJgAAAAABJQAAAAAAfAAAAAAAHgAAAAACHgAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAHgAAAAAAHgAAAAABfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAgQAAAAAAAAAAAAAAewAAAAAAOAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: QAAAAAAAQAAAAAAAfAAAAAAAfAAAAAAAMwAAAAABfAAAAAAAHgAAAAADHgAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAIgAAAAACJQAAAAAAfAAAAAAAJgAAAAACJQAAAAABJgAAAAAAHgAAAAACHgAAAAADfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAIgAAAAACJQAAAAACfAAAAAAAJgAAAAABJQAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAIgAAAAACJQAAAAADfAAAAAAAJgAAAAABJQAAAAACfAAAAAAAHgAAAAADHgAAAAACfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAIgAAAAACJQAAAAADfAAAAAAAJgAAAAAAJQAAAAADJgAAAAACHgAAAAADHgAAAAADfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAIgAAAAABJQAAAAADfAAAAAAAJgAAAAABJQAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAQAAAAAAAfAAAAAAAJgAAAAACHQAAAAACJQAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAJgAAAAADJgAAAAADHQAAAAABJgAAAAAAJQAAAAADIgAAAAACfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAHQAAAAABHQAAAAABJgAAAAADJQAAAAACfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAHQAAAAADHQAAAAACJQAAAAACfAAAAAAAHgAAAAADHgAAAAABfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAHQAAAAAAHQAAAAADJQAAAAACNAAAAAAAHgAAAAAAHgAAAAACfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAABJgAAAAACJQAAAAADfAAAAAAAHgAAAAADHgAAAAACfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAHgAAAAACHgAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAgQAAAAAAAAAAAAAAewAAAAAAOAAAAAAAewAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,-23: ind: -1,-23 - tiles: AAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHgAAAAABHgAAAAADfAAAAAAAMwAAAAACfAAAAAAAfAAAAAAAQAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHgAAAAABHgAAAAAAJgAAAAABJQAAAAADJgAAAAACfAAAAAAAJQAAAAABgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAJQAAAAAAJgAAAAAAfAAAAAAAJQAAAAADgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHgAAAAAAHgAAAAAAJgAAAAAAJQAAAAAAJgAAAAAAfAAAAAAAJQAAAAADgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHgAAAAABHgAAAAABJgAAAAACJQAAAAACJgAAAAAAfAAAAAAAJQAAAAADgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAJQAAAAADJgAAAAAAfAAAAAAAJQAAAAADgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAIQAAAAAAIQAAAAAAIQAAAAACJQAAAAADHQAAAAAAJgAAAAABfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAIQAAAAADIQAAAAABIQAAAAACJQAAAAABJgAAAAABHQAAAAACJgAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAJQAAAAABJgAAAAAAHQAAAAABgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHwAAAAABHwAAAAADHwAAAAADHwAAAAAAfAAAAAAAJQAAAAAAHQAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHwAAAAADHwAAAAADHwAAAAAAHwAAAAABNAAAAAADJQAAAAACHQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAHwAAAAADHwAAAAAAHwAAAAABfAAAAAAAJQAAAAABJgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAHwAAAAAAHwAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAOAAAAAAAewAAAAAAAAAAAAAAgQAAAAAAOQAAAAAA + tiles: AAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHgAAAAABHgAAAAADfAAAAAAAMwAAAAAAfAAAAAAAfAAAAAAAQAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHgAAAAABHgAAAAABJgAAAAADJQAAAAABJgAAAAABfAAAAAAAJQAAAAABgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAJQAAAAACJgAAAAABfAAAAAAAJQAAAAACgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHgAAAAAAHgAAAAADJgAAAAADJQAAAAABJgAAAAADfAAAAAAAJQAAAAADgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHgAAAAAAHgAAAAACJgAAAAACJQAAAAADJgAAAAAAfAAAAAAAJQAAAAADgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAJQAAAAACJgAAAAAAfAAAAAAAJQAAAAADgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAIQAAAAABIQAAAAAAIQAAAAADJQAAAAACHQAAAAACJgAAAAABfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAIQAAAAADIQAAAAACIQAAAAADJQAAAAACJgAAAAADHQAAAAABJgAAAAACgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAJQAAAAACJgAAAAACHQAAAAABgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHwAAAAAAHwAAAAABHwAAAAADHwAAAAABfAAAAAAAJQAAAAAAHQAAAAACgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAHwAAAAACHwAAAAABHwAAAAABHwAAAAABNAAAAAACJQAAAAACHQAAAAABgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAHwAAAAACHwAAAAACHwAAAAADfAAAAAAAJQAAAAAAJgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAHwAAAAABHwAAAAADfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAOAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAewAAAAAAOAAAAAAAewAAAAAAAAAAAAAAgQAAAAAAOQAAAAAA version: 6 -1,-24: ind: -1,-24 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAADAAAAAABDAAAAAADDAAAAAADDAAAAAACfAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAADAAAAAABDAAAAAAADAAAAAADDAAAAAACOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAKgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAKgAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKgAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAQAAAAAAAfAAAAAAADAAAAAACOQAAAAAAOQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAagAAAAAAagAAAAAANQAAAAABNQAAAAACDAAAAAACDAAAAAADAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAagAAAAAAagAAAAAAagAAAAAANQAAAAABagAAAAAANQAAAAACAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAagAAAAAAagAAAAAANQAAAAADagAAAAAAagAAAAAAagAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAQAAAAAAAfAAAAAAAMwAAAAABfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAQAAAAAAAQAAAAAAAfAAAAAAAQAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAADAAAAAAADAAAAAAADAAAAAABDAAAAAADfAAAAAAADAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAADAAAAAABDAAAAAAADAAAAAABDAAAAAADOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAKgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAKgAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKgAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAOQAAAAAAOQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAQAAAAAAAfAAAAAAADAAAAAADOQAAAAAAOQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAagAAAAAAagAAAAAANQAAAAADNQAAAAABDAAAAAABDAAAAAABAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAagAAAAAAagAAAAAAagAAAAAANQAAAAAAagAAAAAANQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAagAAAAAAagAAAAAANQAAAAABagAAAAAAagAAAAAAagAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAQAAAAAAAfAAAAAAAMwAAAAABfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAQAAAAAAAQAAAAAAAfAAAAAAAQAAAAAAA version: 6 0,-24: ind: 0,-24 - tiles: DAAAAAAADAAAAAADeAAAAAADfAAAAAAADAAAAAACDAAAAAACDAAAAAACDAAAAAADfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAADAAAAAAADAAAAAACDAAAAAADfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAADAAAAAAAfAAAAAAAQAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAADAAAAAAADAAAAAABDAAAAAAANQAAAAAAagAAAAAANQAAAAABagAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADAAAAAACDAAAAAAAagAAAAAAagAAAAAANQAAAAADagAAAAAAagAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAANQAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAMwAAAAAAfAAAAAAAQAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAQAAAAAAAQAAAAAAAfAAAAAAAQAAAAAAAQAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAA + tiles: DAAAAAABDAAAAAAAeAAAAAACfAAAAAAADAAAAAADDAAAAAABDAAAAAAADAAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAADAAAAAABDAAAAAAADAAAAAABfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAOQAAAAAAKgAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAOQAAAAAAOQAAAAAAOQAAAAAADAAAAAAAfAAAAAAAQAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAADAAAAAADDAAAAAADDAAAAAABNQAAAAADagAAAAAANQAAAAABagAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAADAAAAAADDAAAAAACagAAAAAAagAAAAAANQAAAAACagAAAAAAagAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAANQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAagAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAMwAAAAADfAAAAAAAQAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAQAAAAAAAQAAAAAAAfAAAAAAAQAAAAAAAQAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAA version: 6 0,-25: ind: 0,-25 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAACfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEwAAAAADfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAADAAAAAACfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAACDAAAAAABDAAAAAABfAAAAAAADAAAAAADDAAAAAACDAAAAAABfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAAADAAAAAACDAAAAAAAfAAAAAAADAAAAAADDAAAAAAADAAAAAAADAAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAAADAAAAAACeAAAAAABDAAAAAAADAAAAAAADAAAAAACDAAAAAABDAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeAAAAAACfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEwAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAADAAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAACDAAAAAACDAAAAAAAfAAAAAAADAAAAAABDAAAAAACDAAAAAADfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAABDAAAAAADDAAAAAACfAAAAAAADAAAAAABDAAAAAADDAAAAAAADAAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAACDAAAAAAAeAAAAAAADAAAAAABDAAAAAABDAAAAAACDAAAAAABDAAAAAACfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,-25: ind: -1,-25 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAeAAAAAABEwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAEwAAAAACeAAAAAACEwAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAeAAAAAAAEwAAAAAAEwAAAAAFeAAAAAAADAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAADAAAAAADDAAAAAAADAAAAAAADAAAAAAADAAAAAACDAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAADAAAAAADDAAAAAAADAAAAAAAfAAAAAAAfAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAADAAAAAADDAAAAAACDAAAAAACDAAAAAACfAAAAAAADAAAAAAD + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAeAAAAAACEwAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAEwAAAAAEeAAAAAAAEwAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAeAAAAAACEwAAAAAFEwAAAAAAeAAAAAABDAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAADAAAAAACDAAAAAABDAAAAAACDAAAAAACDAAAAAACDAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAADAAAAAADDAAAAAACDAAAAAADfAAAAAAAfAAAAAAADAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAADAAAAAAADAAAAAABDAAAAAAADAAAAAAAfAAAAAAADAAAAAAA version: 6 -2,-22: ind: -2,-22 @@ -377,11 +378,11 @@ entities: version: 6 1,-4: ind: 1,-4 - tiles: MwAAAAABMwAAAAABfAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAAAABMwAAAAACfAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAAAAAMwAAAAAAfAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAAAADMwAAAAADfAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAAAADfAAAAAAAfAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: MwAAAAABMwAAAAADfAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAAAADMwAAAAACfAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAAAABMwAAAAADfAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANAAAAAADMwAAAAADfAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAAAACfAAAAAAAfAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 1,-5: ind: 1,-5 - tiles: JgAAAAAAJgAAAAABfAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAAAJgAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAACJgAAAAADfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAABfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAAAJgAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAACJgAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAABJgAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAACJgAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAABJgAAAAADfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAAAJgAAAAABfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAACJgAAAAABfAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAADJgAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAABJgAAAAADfAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: JgAAAAACJgAAAAABfAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAABJgAAAAACfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAACJgAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAADJgAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAADJgAAAAACfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAADJgAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAAAJgAAAAABfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAAAJgAAAAABfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAADJgAAAAABfAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAABJgAAAAADfAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAACJgAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAABJgAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -2,-4: ind: -2,-4 @@ -393,7 +394,7 @@ entities: version: 6 1,-6: ind: 1,-6 - tiles: gQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAABfAAAAAAAfAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAABJgAAAAADfAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAABJgAAAAACfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAAAJgAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAADJgAAAAACfAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAABJgAAAAADfAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: gQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAACfAAAAAAAfAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAABJgAAAAAAfAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAACJgAAAAACfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAADJgAAAAACfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAAAJgAAAAAAfAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJgAAAAAAJgAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 1,-7: ind: 1,-7 @@ -461,15 +462,15 @@ entities: version: 6 -2,-16: ind: -2,-16 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAATQAAAAAATQAAAAAATQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAATQAAAAAATQAAAAAATQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAATQAAAAAATQAAAAAATQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAA + tiles: fAAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAATQAAAAAATQAAAAAATQAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAATQAAAAAATQAAAAAATQAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAATQAAAAAATQAAAAAATQAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAA version: 6 -2,-15: ind: -2,-15 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -2,-17: ind: -2,-17 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAagAAAAAAagAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAagAAAAAAagAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAagAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAATQAAAAAATQAAAAAATQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAATQAAAAAATQAAAAAATQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAATQAAAAAATQAAAAAATQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAATQAAAAAATQAAAAAATQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAATQAAAAAATQAAAAAATQAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAATQAAAAAATQAAAAAATQAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAATQAAAAAATQAAAAAATQAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfAAAAAAAfAAAAAAATQAAAAAATQAAAAAATQAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAgQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAA version: 6 -2,-23: ind: -2,-23 @@ -495,6 +496,14 @@ entities: ind: -2,-19 tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 + -3,-16: + ind: -3,-16 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + -3,-17: + ind: -3,-17 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAA + version: 6 - type: Broadphase - type: Physics bodyStatus: InAir @@ -521,14 +530,18 @@ entities: id: Arrows decals: 470: -2,-124 - 471: 0,-124 - 472: 1,-124 - node: color: '#FFFFFFFF' id: Bot decals: 469: -1,-124 838: 6,-280 + 1470: 5,-281 + 1471: 5,-280 + 1472: 5,-279 + 1473: 4,-279 + 1474: 4,-280 + 1475: 4,-281 - node: color: '#FFFFFFFF' id: BotGreyscale @@ -547,6 +560,9 @@ entities: 1359: -2,-340 1360: -2,-339 1361: -2,-338 + 1476: 3,-281 + 1477: 2,-281 + 1478: 1,-281 - node: color: '#FFFFFFFF' id: BotLeft @@ -585,7 +601,6 @@ entities: color: '#FFFFFFFF' id: BrickTileDarkInnerNw decals: - 111: -6,-33 112: -6,-31 281: -3,-7 - node: @@ -621,12 +636,6 @@ entities: 278: -1,-7 478: 2,-139 479: 3,-139 - 480: 4,-139 - 481: 5,-139 - 482: 6,-139 - 483: 3,-138 - 484: 4,-138 - 485: 5,-138 - node: color: '#FFFFFFFF' id: BrickTileDarkLineS @@ -639,106 +648,22 @@ entities: 275: -1,-7 473: 3,-140 474: 2,-140 - 475: 4,-140 - 476: 5,-140 - 477: 6,-140 - node: color: '#FFFFFFFF' id: BrickTileDarkLineW decals: 113: -6,-30 114: -6,-32 - - node: - color: '#639137FF' - id: BrickTileSteelCornerNe - decals: - 342: 1,-87 - - node: - color: '#639137FF' - id: BrickTileSteelCornerSw - decals: - 345: 0,-88 - 346: 0,-88 - - node: - color: '#FFFFFFFF' - id: BrickTileSteelEndE - decals: - 486: 5,-144 - node: color: '#639137FF' id: BrickTileSteelEndN decals: 357: 3,-86 - - node: - color: '#FFFFFFFF' - id: BrickTileSteelEndN - decals: - 491: 4,-143 - node: color: '#639137FF' id: BrickTileSteelEndS decals: - 343: 1,-89 358: 3,-92 - - node: - color: '#FFFFFFFF' - id: BrickTileSteelEndS - decals: - 488: 4,-146 - - node: - color: '#639137FF' - id: BrickTileSteelEndW - decals: - 344: -1,-87 - - node: - color: '#FFFFFFFF' - id: BrickTileSteelEndW - decals: - 487: 3,-144 - - node: - color: '#639137FF' - id: BrickTileSteelInnerNe - decals: - 351: -1,-88 - 352: 0,-89 - 353: 0,-88 - - node: - color: '#FFFFFFFF' - id: BrickTileSteelInnerNe - decals: - 495: 4,-144 - - node: - color: '#639137FF' - id: BrickTileSteelInnerNw - decals: - 354: 1,-88 - - node: - color: '#FFFFFFFF' - id: BrickTileSteelInnerNw - decals: - 494: 4,-144 - - node: - color: '#639137FF' - id: BrickTileSteelInnerSe - decals: - 356: 0,-87 - - node: - color: '#FFFFFFFF' - id: BrickTileSteelInnerSe - decals: - 492: 4,-144 - - node: - color: '#639137FF' - id: BrickTileSteelInnerSw - decals: - 349: 1,-88 - 350: 0,-87 - 355: 1,-87 - - node: - color: '#FFFFFFFF' - id: BrickTileSteelInnerSw - decals: - 493: 4,-144 - node: cleanable: True color: '#FFFFFFFF' @@ -749,27 +674,11 @@ entities: color: '#639137FF' id: BrickTileSteelLineE decals: - 348: 1,-88 364: 3,-87 365: 3,-88 366: 3,-89 367: 3,-90 368: 3,-91 - - node: - color: '#FFFFFFFF' - id: BrickTileSteelLineE - decals: - 490: 4,-145 - - node: - color: '#639137FF' - id: BrickTileSteelLineN - decals: - 347: 0,-87 - - node: - color: '#96DAFFFF' - id: BrickTileSteelLineN - decals: - 83: 1,-31 - node: cleanable: True color: '#FFFFFFFF' @@ -787,11 +696,6 @@ entities: 361: 3,-89 362: 3,-88 363: 3,-87 - - node: - color: '#FFFFFFFF' - id: BrickTileSteelLineW - decals: - 489: 4,-145 - node: cleanable: True color: '#FFFFFFFF' @@ -850,13 +754,6 @@ entities: id: BrickTileWhiteCornerNe decals: 1417: 3,-197 - - node: - color: '#639137FF' - id: BrickTileWhiteCornerNe - decals: - 304: -6,-85 - 319: 1,-85 - 320: 2,-86 - node: color: '#A0A0A0FF' id: BrickTileWhiteCornerNe @@ -873,12 +770,6 @@ entities: id: BrickTileWhiteCornerNw decals: 1416: -1,-197 - - node: - color: '#639137FF' - id: BrickTileWhiteCornerNw - decals: - 289: -9,-90 - 315: -2,-85 - node: color: '#A0A0A0FF' id: BrickTileWhiteCornerNw @@ -890,12 +781,6 @@ entities: id: BrickTileWhiteCornerSe decals: 1423: 3,-200 - - node: - color: '#639137FF' - id: BrickTileWhiteCornerSe - decals: - 305: -6,-89 - 326: 2,-92 - node: color: '#A0A0A0FF' id: BrickTileWhiteCornerSe @@ -912,13 +797,6 @@ entities: id: BrickTileWhiteCornerSw decals: 1422: -1,-200 - - node: - color: '#639137FF' - id: BrickTileWhiteCornerSw - decals: - 292: -9,-84 - 331: -1,-90 - 332: -2,-89 - node: color: '#A0A0A0FF' id: BrickTileWhiteCornerSw @@ -943,11 +821,6 @@ entities: id: BrickTileWhiteInnerNe decals: 262: -1,2 - - node: - color: '#639137FF' - id: BrickTileWhiteInnerNe - decals: - 312: -7,-85 - node: color: '#A0A0A0FF' id: BrickTileWhiteInnerNe @@ -965,12 +838,6 @@ entities: id: BrickTileWhiteInnerNw decals: 263: 1,2 - - node: - color: '#639137FF' - id: BrickTileWhiteInnerNw - decals: - 311: -9,-85 - 341: 0,-92 - node: color: '#646464FF' id: BrickTileWhiteInnerNw @@ -984,13 +851,6 @@ entities: 404: 5,-94 443: 2,-97 452: 3,-98 - - node: - color: '#639137FF' - id: BrickTileWhiteInnerSe - decals: - 314: -7,-89 - 329: 1,-92 - 330: 1,-92 - node: color: '#A0A0A0FF' id: BrickTileWhiteInnerSe @@ -1002,14 +862,6 @@ entities: id: BrickTileWhiteInnerSe decals: 374: 4,-92 - - node: - color: '#639137FF' - id: BrickTileWhiteInnerSw - decals: - 310: -9,-89 - 336: -1,-89 - 337: 0,-90 - 340: 0,-92 - node: color: '#646464FF' id: BrickTileWhiteInnerSw @@ -1029,18 +881,6 @@ entities: id: BrickTileWhiteLineE decals: 261: -1,3 - - node: - color: '#639137FF' - id: BrickTileWhiteLineE - decals: - 303: -6,-86 - 306: -6,-88 - 307: -6,-87 - 321: 2,-87 - 322: 2,-88 - 323: 2,-89 - 324: 2,-90 - 325: 2,-91 - node: color: '#A0A0A0FF' id: BrickTileWhiteLineE @@ -1062,21 +902,6 @@ entities: decals: 1418: 1,-197 1419: 0,-197 - - node: - color: '#639137FF' - id: BrickTileWhiteLineN - decals: - 283: -10,-89 - 284: -9,-89 - 285: -8,-89 - 290: -8,-90 - 291: -7,-90 - 308: -10,-85 - 316: -1,-85 - 317: -1,-85 - 318: 0,-85 - 327: 1,-93 - 328: 0,-93 - node: color: '#A0A0A0FF' id: BrickTileWhiteLineN @@ -1093,16 +918,6 @@ entities: decals: 1420: 0,-200 1421: 1,-200 - - node: - color: '#639137FF' - id: BrickTileWhiteLineS - decals: - 286: -8,-85 - 287: -9,-85 - 288: -10,-85 - 293: -8,-84 - 294: -7,-84 - 309: -10,-89 - node: color: '#A0A0A0FF' id: BrickTileWhiteLineS @@ -1119,18 +934,6 @@ entities: id: BrickTileWhiteLineW decals: 1415: -1,-198 - - node: - color: '#639137FF' - id: BrickTileWhiteLineW - decals: - 295: -7,-87 - 296: -7,-88 - 313: -7,-86 - 333: -2,-88 - 334: -2,-87 - 335: -2,-86 - 338: 0,-91 - 339: 0,-91 - node: color: '#646464FF' id: BrickTileWhiteLineW @@ -1223,6 +1026,15 @@ entities: 1163: 3,-374 1304: 9,-200 1312: 7,-202 + - node: + color: '#3EB38896' + id: CheckerNESW + decals: + 1464: -11,-261 + 1465: -10,-261 + 1466: -12,-261 + 1467: -9,-261 + 1468: -8,-261 - node: color: '#52B4E996' id: CheckerNWSE @@ -1266,57 +1078,6 @@ entities: 1412: 3,-204 1413: 3,-203 1414: 3,-202 - - node: - color: '#FFFFFFFF' - id: ConcreteTrimCornerNe - decals: - 787: -2,-284 - - node: - color: '#FFFFFFFF' - id: ConcreteTrimCornerSe - decals: - 790: -2,-276 - - node: - color: '#FFFFFFFF' - id: ConcreteTrimInnerNe - decals: - 783: -3,-284 - 788: -2,-285 - - node: - color: '#FFFFFFFF' - id: ConcreteTrimInnerSe - decals: - 784: -3,-276 - 789: -2,-275 - - node: - color: '#FFFFFFFF' - id: ConcreteTrimLineE - decals: - 776: -3,-278 - 777: -3,-279 - 778: -3,-280 - 779: -3,-281 - 780: -3,-282 - 781: -3,-283 - 782: -3,-277 - - node: - color: '#FFFFFFFF' - id: ConcreteTrimLineN - decals: - 785: -1,-285 - 786: 0,-285 - - node: - color: '#FFFFFFFF' - id: ConcreteTrimLineS - decals: - 791: -1,-275 - 792: 0,-275 - 793: 1,-275 - 794: 3,-275 - 795: 4,-275 - 796: 5,-275 - 797: 6,-275 - 798: 2,-275 - node: cleanable: True color: '#FFFFFFFF' @@ -1466,18 +1227,6 @@ entities: 1167: -1,-373 1172: -4,-374 1300: 11,-199 - - node: - color: '#FFFFFFFF' - id: GrayConcreteTrimInnerNw - decals: - 754: -4,-278 - 761: 0,-274 - - node: - color: '#FFFFFFFF' - id: GrayConcreteTrimInnerSw - decals: - 770: -1,-286 - 771: -4,-282 - node: color: '#FFFFFFFF' id: GrayConcreteTrimLineE @@ -1490,11 +1239,6 @@ entities: color: '#FFFFFFFF' id: GrayConcreteTrimLineN decals: - 752: -6,-278 - 753: -5,-278 - 758: -2,-274 - 759: -3,-274 - 760: -1,-274 1270: 14,-60 1271: 15,-60 1272: 16,-60 @@ -1512,10 +1256,6 @@ entities: color: '#FFFFFFFF' id: GrayConcreteTrimLineS decals: - 772: -2,-286 - 773: -3,-286 - 774: -5,-282 - 775: -6,-282 1278: 13,-76 1279: 14,-76 1280: 15,-76 @@ -1530,17 +1270,6 @@ entities: color: '#FFFFFFFF' id: GrayConcreteTrimLineW decals: - 755: -4,-277 - 756: -4,-276 - 757: -4,-275 - 762: 0,-273 - 763: 0,-272 - 764: 0,-271 - 765: -4,-285 - 766: -4,-284 - 767: -4,-283 - 768: -1,-288 - 769: -1,-287 1262: 13,-64 1263: 13,-63 1264: 13,-62 @@ -1751,12 +1480,6 @@ entities: decals: 1080: 2,-360 1081: 3,-361 - - node: - color: '#FFFFFFFF' - id: MiniTileSteelInnerNe - decals: - 101: -5,-32 - 161: 5,-46 - node: color: '#D381C996' id: MiniTileSteelInnerNw @@ -1774,11 +1497,6 @@ entities: id: MiniTileSteelInnerNw decals: 1231: 15,-251 - - node: - color: '#FFFFFFFF' - id: MiniTileSteelInnerNw - decals: - 102: 3,-32 - node: color: '#D381C996' id: MiniTileSteelInnerSe @@ -1786,12 +1504,6 @@ entities: 896: 1,-309 915: 1,-298 1215: -8,-310 - - node: - color: '#FFFFFFFF' - id: MiniTileSteelInnerSe - decals: - 103: -5,-29 - 149: 0,-33 - node: color: '#D381C996' id: MiniTileSteelInnerSw @@ -1809,12 +1521,6 @@ entities: id: MiniTileSteelInnerSw decals: 1230: 15,-255 - - node: - color: '#FFFFFFFF' - id: MiniTileSteelInnerSw - decals: - 104: 3,-29 - 150: -1,-33 - node: color: '#5A64BC93' id: MiniTileSteelLineE @@ -1913,31 +1619,8 @@ entities: color: '#FFFFFFFF' id: MiniTileSteelLineE decals: - 99: -5,-31 - 100: -5,-30 - 132: 5,-45 - 133: 5,-44 - 134: 5,-43 135: 5,-38 136: 5,-37 - 137: 0,-37 - 138: 0,-36 - 139: 0,-35 - 140: 0,-34 - 162: 5,-40 - 163: 5,-41 - 534: 0,-138 - 535: 0,-139 - 536: 0,-140 - 537: 0,-141 - 538: 0,-142 - 539: 0,-143 - 540: 0,-144 - 541: 0,-145 - 542: 0,-146 - 543: 0,-147 - 544: 1,-152 - 545: 1,-153 - node: color: '#999453FF' id: MiniTileSteelLineN @@ -1985,26 +1668,6 @@ entities: 1237: 16,-246 1238: 17,-246 1239: 18,-246 - - node: - color: '#FFFFFFFF' - id: MiniTileSteelLineN - decals: - 91: -4,-32 - 92: -2,-32 - 93: -1,-32 - 94: 0,-32 - 95: 1,-32 - 96: 2,-32 - 151: 2,-28 - 152: 1,-28 - 153: 0,-28 - 154: -1,-28 - 155: -2,-28 - 156: -3,-28 - 157: -4,-28 - 158: -5,-28 - 159: -6,-28 - 160: 3,-28 - node: color: '#999453FF' id: MiniTileSteelLineS @@ -2049,25 +1712,6 @@ entities: id: MiniTileSteelLineS decals: 1251: 16,-262 - - node: - color: '#FFFFFFFF' - id: MiniTileSteelLineS - decals: - 84: -4,-29 - 85: -3,-29 - 86: -2,-29 - 87: -1,-29 - 88: 0,-29 - 89: 1,-29 - 90: 2,-29 - 141: -2,-33 - 142: -3,-33 - 143: -4,-33 - 144: -5,-33 - 145: -6,-33 - 146: 1,-33 - 147: 2,-33 - 148: 3,-33 - node: color: '#5A64BC93' id: MiniTileSteelLineW @@ -2179,41 +1823,6 @@ entities: 1235: 15,-247 1248: 15,-260 1249: 15,-261 - - node: - color: '#FFFFFFFF' - id: MiniTileSteelLineW - decals: - 97: 3,-30 - 98: 3,-31 - 120: -1,-45 - 121: -1,-44 - 122: -1,-43 - 123: -1,-42 - 124: -1,-41 - 125: -1,-40 - 126: -1,-39 - 127: -1,-38 - 128: -1,-37 - 129: -1,-36 - 130: -1,-35 - 131: -1,-34 - 517: -1,-152 - 518: -1,-151 - 519: -1,-149 - 520: -1,-150 - 521: -1,-148 - 522: -1,-147 - 523: -1,-146 - 524: -1,-145 - 525: -1,-144 - 526: -1,-143 - 527: -1,-142 - 528: -1,-141 - 529: -1,-140 - 530: -1,-139 - 531: -1,-138 - 532: -1,-137 - 533: -1,-136 - node: color: '#334E6DC8' id: MiniTileWhiteCornerNe @@ -2874,19 +2483,29 @@ entities: 1131: -1,-365 1132: -1,-364 - node: - color: '#639137FF' + color: '#3EB38896' id: QuarterTileOverlayGreyscale180 decals: - 300: -9,-90 - 301: -8,-90 - 302: -7,-90 + 1456: -15,-266 + 1457: -14,-266 + 1458: -13,-266 + 1459: -12,-266 - node: - color: '#639137FF' + color: '#A4610696' + id: QuarterTileOverlayGreyscale180 + decals: + 1480: 1,-275 + 1481: 1,-274 + 1482: 1,-273 + 1483: 1,-272 + - node: + color: '#3EB38896' id: QuarterTileOverlayGreyscale90 decals: - 297: -9,-84 - 298: -8,-84 - 299: -7,-84 + 1460: -15,-264 + 1461: -14,-264 + 1462: -13,-264 + 1463: -12,-264 - node: color: '#FFFFFFFF' id: Rock02 @@ -2904,14 +2523,12 @@ entities: color: '#FFFFFFFF' id: StandClear decals: - 546: 0,-153 547: 0,-136 548: 0,-126 549: 0,-109 550: 0,-99 551: 0,-82 552: 0,-45 - 553: 0,-28 554: 0,-18 1187: 0,-163 1188: 0,-180 @@ -2919,8 +2536,9 @@ entities: 1190: 0,-207 1191: 0,-244 1192: 0,-261 - 1193: 0,-271 1194: 0,-288 + 1469: 0,-28 + 1479: 0,-271 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' @@ -3280,9 +2898,6 @@ entities: 499: -4,-149 500: -4,-148 501: -4,-143 - 502: -4,-142 - 503: -4,-141 - 504: -4,-140 505: -4,-139 - node: color: '#FFFFFFFF' @@ -3306,9 +2921,6 @@ entities: 426: -9,-122 427: -8,-122 428: -7,-122 - 429: -9,-119 - 430: -8,-119 - 431: -7,-119 432: -9,-116 433: -8,-116 434: -7,-116 @@ -3337,10 +2949,6 @@ entities: 410: -9,-117 411: -8,-117 412: -7,-117 - 413: -7,-120 - 414: -7,-120 - 415: -8,-120 - 416: -9,-120 417: -9,-123 418: -8,-123 419: -7,-123 @@ -3412,1993 +3020,2223 @@ entities: data: tiles: 0,0: - 0: 65535 - 0,-1: - 0: 65535 + 0: 14199 -1,0: - 0: 65535 + 0: 36349 + 0,-1: + 0: 9830 0,1: - 0: 143 + 1: 140 1,0: - 0: 65535 + 0: 887 + 1: 51200 1,1: - 0: 45879 - 0,-4: - 0: 65535 - 0,-3: - 0: 65535 - 0,-2: - 0: 65535 - 1,-4: - 0: 65535 - 1,-3: - 0: 65535 - 1,-2: - 0: 65535 + 1: 45879 + 1,3: + 1: 30702 + 1,4: + 1: 4983 1,-1: - 0: 65535 - 2,-4: - 0: 4991 + 0: 12274 + 1,2: + 1: 59118 + 2,0: + 1: 61239 + 2,1: + 1: 16236 + 2,2: + 1: 17 2,-1: - 0: 55799 - -2,0: - 0: 61439 - -2,1: - 0: 47500 - -1,1: - 0: 4415 - -2,-4: - 0: 65535 - -2,-1: - 0: 65535 - -2,-3: - 0: 65535 - -2,-2: - 0: 65262 - -1,-4: - 0: 65535 - -1,-3: - 0: 65535 - -1,-2: - 0: 65535 - -1,-1: - 0: 65535 - 0,-6: - 0: 63351 + 1: 55526 + 3,0: + 1: 8044 + 3,1: + 1: 12544 + 3,2: + 1: 33074 + 3,-1: + 1: 33272 + 4,0: + 1: 65484 + 4,2: + 1: 14190 + 0,-4: + 0: 25839 0,-5: - 0: 65535 - 1,-6: - 0: 63351 + 0: 63379 + -1,-4: + 0: 12272 + 0,-3: + 0: 61046 + -1,-3: + 0: 4095 + 0,-2: + 0: 61182 + -1,-2: + 0: 4095 + -1,-1: + 0: 4095 + 1,-4: + 0: 28735 + 1,-3: + 0: 30583 + 1,-2: + 0: 30583 1,-5: - 0: 65535 - 2,-5: - 0: 63281 - -2,-5: - 0: 65535 - -2,-6: - 0: 60620 - -1,-6: - 0: 64989 - -1,-5: - 0: 65535 + 0: 48370 + 2,-4: + 1: 4990 + 2,-3: + 1: 4369 2,-2: - 0: 4096 + 1: 4096 + 2,-5: + 1: 58912 + 3,-4: + 1: 15 + 3,-5: + 1: 61440 + 4,-4: + 1: 35023 + 4,-1: + 1: 57341 + -4,0: + 1: 8134 + -5,0: + 1: 61030 + -4,2: + 1: 12680 + -5,2: + 1: 36046 + -4,-1: + 1: 12787 + -3,0: + 1: 65420 + -4,1: + 1: 32768 + -3,1: + 1: 40902 + -3,2: + 1: 272 + -3,-1: + 1: 25596 + -2,0: + 1: 25361 + 0: 2252 + -2,1: + 1: 47500 + -2,-1: + 1: 4096 + 0: 18020 + -2,2: + 1: 60671 + -2,3: + 1: 52462 + -2,4: + 1: 2252 + -1,1: + 1: 4407 + -1,3: + 1: 4352 + -1,4: + 1: 65329 + -4,-2: + 1: 4096 + -5,-2: + 1: 61030 + -5,-1: + 1: 28390 -3,-4: - 0: 2184 + 1: 2184 + -3,-5: + 1: 34944 + -2,-4: + 1: 4368 + 0: 17478 + -2,-5: + 0: 65224 + 1: 3 + -2,-3: + 1: 4369 + 0: 17476 + -2,-2: + 1: 4096 + 0: 17476 + -1,-5: + 0: 48952 0,-8: 0: 65535 - 0,-7: - 0: 65535 - 1,-8: - 0: 65535 - 1,-7: - 0: 32767 - 2,-8: - 0: 63281 - -3,-5: - 0: 34944 - -2,-8: - 0: 65535 - -2,-7: - 0: 52974 + 0,-9: + 0: 61919 -1,-8: 0: 65535 + 0,-7: + 0: 21407 + 1: 32768 -1,-7: - 0: 65535 + 0: 18495 + 1: 8192 + 0,-6: + 0: 22391 + 1: 34952 + -1,-6: + 0: 19660 + 1: 9011 + 1,-6: + 1: 34133 + 0: 8738 + 1,-8: + 0: 28270 + 1,-7: + 0: 8742 + 1: 2048 + 1,-9: + 0: 26224 + 2,-8: + 0: 257 + 1: 58912 + 2,-7: + 1: 15 + 3,-8: + 1: 61440 + 3,-7: + 1: 207 + 4,-8: + 1: 64640 + 4,-7: + 1: 36095 + 4,-5: + 1: 64640 + -2,-8: + 0: 53199 + -2,-7: + 0: 35020 + 1: 512 + -2,-6: + 1: 9284 + 0: 34952 + -2,-9: + 0: 49356 + -1,-9: + 0: 63739 0,-12: - 0: 65535 + 0: 63797 + 1: 8 + 0,-13: + 0: 30581 + 1: 34952 + -1,-12: + 0: 45700 + 1: 2 0,-11: 0: 65535 - 0,-10: - 0: 65535 - 0,-9: - 0: 65535 - 1,-12: - 0: 65399 - 1,-11: - 0: 65535 - 1,-10: - 0: 65535 - 1,-9: - 0: 65535 - 2,-12: - 0: 4096 - 2,-11: - 0: 17 - 2,-10: - 0: 4352 - 2,-9: - 0: 4097 - -2,-12: - 0: 65228 - -2,-11: - 0: 61183 - -2,-10: - 0: 65518 - -2,-9: - 0: 65263 - -1,-12: - 0: 65535 -1,-11: - 0: 65535 + 0: 53130 + 0,-10: + 0: 8191 -1,-10: - 0: 65535 - -1,-9: - 0: 65535 - -2,-16: - 0: 65535 - -2,-15: - 0: 65535 + 0: 40413 + 1,-12: + 0: 29218 + 1,-11: + 0: 30591 + 1,-10: + 0: 59255 + 1,-13: + 1: 21840 + 0: 8738 + 2,-11: + 0: 1 + 2,-10: + 0: 4096 + -2,-11: + 0: 36047 + -2,-10: + 0: 64716 + -2,-12: + 0: 51328 + -1,-13: + 1: 8738 + 0: 52420 + -4,-15: + 1: 61440 + -4,-14: + 1: 15 + -5,-15: + 1: 61713 + -5,-14: + 1: 31 + -3,-15: + 1: 65152 + -3,-14: + 1: 143 -2,-14: - 0: 61167 - -2,-13: - 0: 34952 + 1: 8193 + 0: 3276 + -2,-16: + 0: 61166 + -2,-15: + 0: 3822 + -2,-17: + 0: 61166 -1,-16: 0: 65535 -1,-15: - 0: 65535 + 0: 36863 -1,-14: - 0: 65535 - -1,-13: - 0: 52430 - 0,-16: - 0: 65535 - 0,-15: - 0: 65535 - 0,-14: - 0: 65535 - 0,-13: - 0: 30591 - 1,-16: - 0: 65535 - 1,-15: - 0: 65535 - 1,-14: - 0: 32767 - 1,-13: - 0: 30583 - 2,-15: - 0: 65329 - 2,-14: - 0: 63 - 0,-20: - 0: 30719 - 0,-19: - 0: 65527 - 0,-18: - 0: 65535 - 0,-17: - 0: 65535 - 1,-20: - 0: 30583 - 1,-19: - 0: 65399 - 1,-18: - 0: 65535 - 1,-17: - 0: 65535 - 2,-18: - 0: 65535 - 2,-17: - 0: 319 - -2,-18: - 0: 65535 - -2,-17: - 0: 65535 - -2,-19: - 0: 61164 - -2,-20: - 0: 52428 - -1,-20: - 0: 56831 - -1,-19: - 0: 65533 - -1,-18: - 0: 65535 + 0: 33787 + -2,-13: + 1: 8 -1,-17: 0: 65535 + 0,-16: + 0: 3067 + 0,-15: + 0: 32631 + 0,-14: + 0: 14771 + 0,-17: + 0: 45175 + 1,-16: + 0: 17751 + 1,-15: + 0: 65399 + 1,-14: + 0: 8830 + 1,-17: + 0: 21623 + 2,-15: + 1: 60977 + 2,-14: + 1: 46 + 3,-15: + 1: 64528 + 0: 12 + 3,-14: + 1: 15 + 3,-17: + 1: 5136 + 0: 34958 + 3,-16: + 0: 61166 + 4,-16: + 0: 13107 + 1: 8 + 4,-15: + 0: 1 + 1: 61760 + 4,-14: + 1: 15 + 0,-20: + 0: 30547 + 1: 34944 + 0,-21: + 0: 40952 + -1,-20: + 0: 52296 + 1: 13088 + 0,-19: + 0: 37719 + 1: 136 + -1,-19: + 0: 15116 + 1: 3 + 0,-18: + 0: 63291 + -1,-18: + 0: 64667 + 1,-20: + 1: 21760 + 0: 8738 + 1,-19: + 1: 2053 + 0: 8738 + 1,-18: + 0: 65511 + 1,-21: + 0: 12151 + 2,-19: + 1: 36864 + 2,-18: + 0: 240 + 1: 60942 + 2,-17: + 1: 319 + 3,-18: + 0: 61182 + 3,-20: + 0: 36590 + 3,-19: + 0: 61166 + 3,-21: + 0: 61422 + 4,-20: + 0: 819 + 4,-19: + 0: 13107 + 1: 34816 + 4,-18: + 0: 13107 + 1: 34952 + 4,-17: + 0: 3 + 1: 51656 + -4,-18: + 1: 65280 + -5,-18: + 1: 65382 + -3,-18: + 1: 65408 + -3,-17: + 1: 142 + -2,-18: + 1: 17 + 0: 59596 + -2,-19: + 1: 516 + 0: 52360 + -2,-20: + 0: 34952 + 1: 17408 + -2,-21: + 0: 35971 + 1: 256 + -1,-21: + 0: 12217 0,-24: - 0: 65535 + 0: 14591 + 0,-25: + 0: 65529 + -1,-24: + 0: 155 + 2: 29440 0,-23: 0: 65535 - 0,-22: - 0: 65535 - 0,-21: - 0: 65535 - 1,-24: - 0: 65535 - 1,-23: - 0: 65535 - 1,-22: - 0: 65535 - 1,-21: - 0: 65535 - -3,-23: - 0: 60544 - -3,-22: - 0: 65262 - -3,-24: - 0: 2255 - -3,-21: - 0: 2303 - -2,-24: - 0: 14335 - 1: 51200 - -2,-23: - 0: 65395 - 1: 140 - -2,-22: - 0: 65535 - -2,-21: - 0: 61439 - -1,-24: - 0: 36095 - 1: 29440 -1,-23: - 1: 55 - 0: 65480 - -1,-22: - 0: 65535 - -1,-21: - 0: 65535 - -3,-28: - 0: 53247 - -3,-27: - 0: 204 - -3,-25: - 0: 64712 - -2,-28: - 0: 65535 - -2,-27: - 0: 53247 - -2,-25: - 0: 65535 - -2,-26: - 0: 52428 - -1,-28: - 0: 65535 - -1,-27: - 0: 57343 - -1,-26: - 0: 65501 - -1,-25: - 0: 65535 - 0,-28: - 0: 65535 - 0,-27: - 0: 32767 - 0,-26: - 0: 65399 - 0,-25: - 0: 65535 - 1,-28: - 0: 65535 - 1,-27: - 0: 30719 - 1,-26: - 0: 63351 - 1,-25: - 0: 65535 - -3,-32: - 0: 64704 - -3,-31: - 0: 52479 - -3,-30: - 0: 52428 - -3,-29: - 0: 52428 - -2,-32: - 0: 65535 - -2,-31: - 0: 65535 - -2,-30: - 0: 65535 - -2,-29: - 0: 65535 - -1,-32: - 0: 65535 - -1,-31: - 0: 65535 - -1,-30: - 0: 65535 - -1,-29: - 0: 65535 - 0,-32: - 0: 65535 - 0,-31: - 0: 65535 - 0,-30: - 0: 65535 - 0,-29: - 0: 65535 - 1,-32: - 0: 65527 - 1,-31: - 0: 65535 - 1,-30: - 0: 65535 - 1,-29: - 0: 65535 - 2,-30: - 0: 30583 - 2,-29: - 0: 30583 - -2,-36: - 0: 65535 - -2,-35: - 0: 65535 - -2,-34: - 0: 65535 - -2,-33: - 0: 64719 - -1,-36: - 0: 65535 - -1,-35: - 0: 65535 - -1,-34: - 0: 65535 - -1,-33: - 0: 64989 - 0,-36: - 0: 65535 - 0,-35: - 0: 65535 - 0,-34: - 0: 65535 - 0,-33: - 0: 63351 - 1,-36: - 0: 65535 - 1,-35: - 0: 65535 - 1,-34: - 0: 32767 - 1,-33: - 0: 30583 - 2,-36: - 0: 65523 - 2,-35: - 0: 13107 - 2,-34: - 0: 19 - -2,-39: - 0: 65535 - -2,-38: - 0: 65535 - -2,-37: - 0: 65535 - -2,-40: - 0: 65484 - -1,-39: - 0: 65535 - -1,-38: - 0: 65535 - -1,-37: - 0: 65535 - -1,-40: - 0: 56799 - 0,-40: - 0: 30591 - 0,-39: - 0: 65535 - 0,-38: - 0: 65535 - 0,-37: - 0: 65535 - 1,-39: - 0: 65527 - 1,-38: - 0: 65535 - 1,-37: - 0: 65535 - 1,-40: - 0: 30583 - 2,-39: - 0: 12560 - 2,-38: + 0: 55560 + 2: 55 + 0,-22: 0: 16383 - 2,-37: + -1,-22: + 0: 56831 + 1,-24: + 0: 30583 + 1,-23: + 0: 30583 + 1,-22: + 0: 30583 + 1,-25: + 0: 30579 + 2,-24: + 1: 383 + 2,-22: + 1: 28928 + 2,-21: + 1: 61695 + 0: 3840 + 2,-25: + 1: 62224 + 3,-24: + 1: 34959 + 3,-25: + 1: 63624 + 3,-22: + 1: 30 + 0: 60416 + 4,-24: + 1: 34959 + 3,-23: + 1: 34952 + 4,-22: + 1: 67 + 0: 12544 + 4,-21: 0: 13107 - -3,-44: - 0: 36079 - -3,-43: - 0: 62344 - -2,-44: - 0: 65535 - -2,-43: - 0: 65535 - -2,-42: - 0: 65535 + 1: 136 + -4,-24: + 1: 15 + -4,-25: + 1: 61440 + -5,-24: + 1: 13119 + -4,-21: + 1: 255 + -5,-21: + 1: 511 + -3,-24: + 1: 2191 + -3,-21: + 1: 2097 + 0: 8 + -3,-25: + 1: 63624 + -3,-22: + 1: 4096 + 0: 52428 + -3,-23: + 0: 51200 + -2,-24: + 1: 4369 + 0: 12 + 2: 51200 + -2,-23: + 0: 29440 + 1: 1 + 2: 140 + -2,-22: + 0: 30719 + -2,-25: + 1: 4369 + 0: 27848 + -1,-25: + 0: 49058 + -4,-28: + 1: 4080 + -5,-28: + 1: 8177 + -5,-25: + 1: 63078 + -3,-28: + 1: 819 + 0: 34944 + -3,-27: + 1: 64 + 0: 8 + -3,-29: + 0: 34824 + -2,-28: + 0: 15352 + -2,-27: + 0: 34959 + 1: 17152 + -2,-29: + 0: 49035 + -2,-26: + 1: 68 + 0: 34952 + -1,-28: + 0: 53235 + -1,-27: + 0: 50307 + 1: 12800 + -1,-26: + 1: 563 + 0: 33996 + -1,-29: + 0: 65521 + 0,-28: + 0: 49080 + 0,-27: + 0: 30009 + 1: 34816 + 0,-26: + 0: 13687 + 1: 2184 + 0,-29: + 0: 57304 + 1,-28: + 0: 28790 + 1,-27: + 1: 20608 + 0: 8738 + 1,-26: + 1: 32853 + 0: 8738 + 2,-28: + 1: 65393 + 2,-27: + 1: 1 + 3,-28: + 1: 65416 + 3,-29: + 1: 34952 + 4,-28: + 1: 65280 + 3,-27: + 1: 34952 + 3,-26: + 1: 34952 + 4,-25: + 1: 64716 + -4,-31: + 1: 255 + -5,-31: + 1: 13311 + -3,-31: + 1: 51 + 0: 2176 + -3,-32: + 1: 12352 + 0: 34816 + -3,-30: + 0: 32904 + -2,-32: + 0: 49070 + -2,-31: + 0: 35832 + -2,-30: + 0: 63679 + -2,-33: + 1: 5191 + 0: 34952 + -1,-32: + 0: 65320 + -1,-31: + 0: 56735 + -1,-30: + 0: 56605 + -1,-33: + 1: 9011 + 0: 19660 + 0,-32: + 0: 65427 + 0,-31: + 0: 63247 + 0,-30: + 0: 64279 + 0,-33: + 0: 22391 + 1: 34952 + 1,-32: + 0: 30514 + 1: 128 + 1,-31: + 0: 62327 + 1,-30: + 0: 39851 + 1,-29: + 0: 3822 + 1,-33: + 0: 8738 + 1: 1365 + 2,-32: + 1: 4096 + 2,-31: + 1: 3315 + 0: 12288 + 2,-30: + 0: 13107 + 2,-29: + 0: 819 + 1: 24576 + 3,-31: + 1: 36856 + 3,-32: + 1: 34952 + 3,-33: + 1: 34952 + 4,-31: + 1: 36860 + 3,-30: + 1: 34952 + -4,-35: + 1: 65280 + -5,-35: + 1: 65297 + -3,-35: + 1: 30580 + 0: 34952 + -3,-34: + 1: 4369 + 0: 61166 + -3,-33: + 1: 15 + -3,-36: + 1: 17476 + 0: 34952 + -3,-37: + 1: 17476 + 0: 34952 + -2,-35: + 0: 55534 + -2,-34: + 0: 63773 + 1: 544 + -2,-36: + 0: 61164 + -2,-37: + 0: 61166 + -1,-36: + 0: 65467 + -1,-35: + 0: 47295 + -1,-34: + 0: 18475 + 1: 12288 + -1,-37: + 0: 48059 + 0,-36: + 0: 7645 + 0,-35: + 0: 14813 + 0,-34: + 0: 21407 + 1: 32768 + 0,-37: + 0: 56795 + 1,-36: + 0: 6007 + 1,-35: + 0: 33783 + 1,-34: + 0: 8767 + 1: 22528 + 1,-37: + 0: 30579 + 2,-36: + 0: 7953 + 1: 49344 + 2,-35: + 0: 4369 + 2,-34: + 1: 18 + 2,-37: + 0: 4369 + 3,-36: + 0: 61254 + 3,-35: + 0: 3310 + 1: 4096 + 3,-37: + 0: 28398 + 3,-34: + 1: 34958 + 4,-36: + 0: 12594 + 4,-35: + 0: 307 + 1: 16384 + 4,-34: + 1: 3 + -4,-38: + 1: 4080 + -5,-38: + 1: 16374 + -3,-38: + 1: 18292 + 0: 34952 + -3,-39: + 1: 17484 + 0: 34944 + -2,-39: + 1: 257 + 0: 59578 + -2,-40: + 1: 5956 + 0: 59528 + -2,-38: + 0: 57576 -2,-41: - 0: 53247 - -1,-44: - 0: 65535 - -1,-43: - 0: 65535 - -1,-42: - 0: 65535 + 0: 35070 + -1,-40: + 1: 13107 + 0: 52420 + -1,-39: + 0: 45700 + 1: 2 + -1,-38: + 0: 47295 -1,-41: - 0: 65535 - 0,-44: - 0: 65535 - 0,-43: - 0: 65535 - 0,-42: - 0: 65535 + 0: 33455 + 0,-40: + 0: 30581 + 1: 34952 + 0,-39: + 0: 63797 + 1: 8 + 0,-38: + 0: 65403 0,-41: - 0: 65535 + 0: 14843 + 1,-40: + 1: 21845 + 0: 8738 + 1,-39: + 0: 47650 + 1,-38: + 0: 63247 + 1,-41: + 0: 8959 + 1: 32768 + 2,-38: + 0: 4593 + 1: 3084 + 3,-40: + 0: 35022 + 1: 24832 + 3,-39: + 1: 1 + 0: 61128 + 3,-38: + 0: 28398 + 3,-41: + 0: 61176 + 4,-40: + 0: 19 + 1: 13312 + 4,-39: + 0: 13072 + 1: 4 + 4,-38: + 0: 13075 + 4,-37: + 0: 14195 + -4,-43: + 1: 4352 + 0: 57344 + -4,-42: + 1: 4369 + 0: 61166 + -5,-42: + 1: 4383 + -4,-41: + 1: 4369 + 0: 3822 + -5,-41: + 1: 241 + -4,-44: + 1: 12 + -4,-45: + 1: 63232 + -3,-44: + 1: 1127 + -3,-43: + 0: 4096 + 1: 49664 + -3,-42: + 0: 4383 + 1: 8896 + -3,-41: + 0: 497 + 1: 11276 + -3,-45: + 1: 28672 + 0: 128 + -2,-44: + 0: 49083 + -2,-43: + 0: 43747 + -2,-42: + 0: 10915 + -2,-45: + 0: 47934 + -1,-44: + 0: 30719 + -1,-43: + 0: 32624 + -1,-42: + 0: 8048 + -1,-45: + 0: 30607 + 0,-44: + 0: 48059 + 0,-43: + 0: 64315 + 0,-42: + 0: 15359 + 0,-45: + 0: 46079 1,-44: 0: 65535 1,-43: - 0: 65535 + 0: 65407 1,-42: - 0: 65535 - 1,-41: - 0: 65535 - 2,-44: - 0: 13183 - 2,-43: - 0: 4403 - 2,-42: - 0: 4369 - 0,-46: - 0: 65527 - 0,-45: - 0: 65535 - 1,-46: - 0: 65394 + 0: 20479 1,-45: - 0: 65535 - 2,-46: - 0: 4096 + 0: 64443 + 2,-44: + 0: 4369 + 1: 76 + 2,-43: + 0: 1 + 2,-41: + 0: 240 + 1: 3598 2,-45: - 0: 62259 - -3,-45: - 0: 63624 - -2,-46: - 0: 65228 - -2,-45: - 0: 65535 - -1,-46: - 0: 65533 - -1,-45: - 0: 65535 + 0: 4368 + 1: 49152 + 3,-44: + 1: 15 + 3,-45: + 1: 61440 + 3,-42: + 1: 20736 + 0: 10240 + 4,-44: + 1: 34959 + 4,-42: + 1: 4384 + 0: 8704 + 4,-41: + 0: 13074 + 1: 136 0,-48: - 0: 65535 - 0,-47: - 0: 30719 - 1,-48: - 0: 65535 - 1,-47: - 0: 8823 - -2,-48: - 0: 65535 - -2,-47: - 0: 52428 + 0: 40945 + 0,-49: + 0: 65524 -1,-48: - 0: 65535 + 0: 4087 + 0,-47: + 0: 30547 + 1: 34944 -1,-47: - 0: 56831 - -2,-51: - 0: 65263 - -2,-50: - 0: 65535 - -2,-49: - 0: 65535 - -2,-52: - 0: 65262 - -1,-52: - 0: 65535 - -1,-51: - 0: 65535 - -1,-50: - 0: 65535 + 0: 52296 + 1: 13088 + 0,-46: + 0: 37719 + 1: 136 + -1,-46: + 0: 14412 + 1: 35 + 1,-48: + 0: 10230 + 1,-46: + 0: 12288 + 1: 2082 + 1,-47: + 0: 2 + 1: 8704 + 1,-49: + 0: 26350 + 2,-48: + 1: 1997 + 0: 50 + 2,-46: + 1: 4096 + 2,-49: + 1: 56704 + 0: 8814 + 3,-48: + 1: 255 + 4,-48: + 1: 255 + 4,-45: + 1: 64716 + -4,-48: + 1: 255 + -5,-48: + 1: 511 + -5,-45: + 1: 65382 + -4,-49: + 1: 34944 + -3,-48: + 1: 26231 + -3,-49: + 1: 24820 + -2,-48: + 0: 36863 + -2,-46: + 1: 4612 + 0: 34952 + -2,-47: + 0: 34952 + 1: 17408 -1,-49: - 0: 65535 + 0: 39859 + -4,-52: + 1: 61440 + -4,-51: + 1: 15 + -5,-52: + 1: 63078 + -5,-51: + 1: 13119 + -3,-52: + 1: 62532 + -3,-51: + 1: 17487 + -3,-53: + 1: 17476 + -3,-50: + 1: 17476 + -2,-52: + 1: 4096 + 0: 52416 + -2,-51: + 1: 4097 + 0: 52416 + -2,-50: + 0: 61152 + -2,-49: + 0: 3822 + -2,-53: + 1: 34952 + -1,-52: + 0: 12194 + -1,-51: + 0: 11194 + -1,-50: + 0: 48122 + -1,-53: + 0: 33996 + 1: 546 0,-52: - 0: 65535 + 0: 4089 0,-51: - 0: 65535 + 0: 20479 0,-50: 0: 65535 - 0,-49: - 0: 65535 - 1,-52: - 0: 65535 - 1,-51: - 0: 65535 - 1,-50: - 0: 65535 - 1,-49: - 0: 65535 - 2,-51: - 0: 65535 - 2,-50: - 0: 65535 - 2,-49: - 0: 65535 - -3,-56: - 0: 61030 - -3,-55: - 0: 17476 - -2,-56: - 0: 64319 - -2,-55: - 0: 11195 - -2,-53: - 0: 51336 - -2,-54: - 0: 34952 - -1,-56: - 0: 65503 - -1,-55: - 0: 57343 - -1,-54: - 0: 53245 - -1,-53: - 0: 65228 - 0,-56: - 0: 65535 - 0,-55: - 0: 32767 - 0,-54: - 0: 32759 0,-53: - 0: 65399 - 1,-56: - 0: 65535 - 1,-55: - 0: 40959 - 1,-54: - 0: 9011 + 0: 13687 + 1: 2184 + 1,-52: + 0: 28528 + 1,-50: + 0: 61438 + 1,-51: + 0: 61030 1,-53: - 0: 61986 - 2,-56: - 0: 65501 - 2,-55: - 0: 341 - -3,-58: - 0: 60996 + 1: 41506 + 2,-52: + 1: 54384 + 0: 8960 + 2,-51: + 1: 2269 + 0: 58914 + 2,-50: + 0: 61166 + 3,-52: + 1: 61440 + 3,-51: + 1: 4367 + 3,-50: + 1: 4369 + 3,-49: + 1: 17 + 4,-52: + 1: 63624 + 4,-51: + 1: 15 + -3,-56: + 1: 61030 -3,-57: - 0: 26214 - -2,-59: - 0: 45704 - -2,-58: - 0: 49083 + 1: 26214 + -3,-55: + 1: 17476 + -3,-54: + 1: 17476 + -2,-56: + 1: 29503 -2,-57: - 0: 13299 - -2,-60: - 0: 34952 - -1,-60: - 0: 64716 - -1,-59: - 0: 64989 - -1,-58: - 0: 65535 + 1: 13299 + -2,-55: + 1: 9011 + -1,-56: + 1: 17 + 0: 47530 + -1,-55: + 0: 35007 + 1: 12288 + -2,-54: + 1: 34952 + -1,-54: + 1: 9011 + 0: 50304 -1,-57: - 0: 56829 - 0,-60: - 0: 63351 - 0,-59: - 0: 63351 - 0,-58: - 0: 65535 + 1: 4369 + 0: 43690 + 0,-56: + 0: 48051 + 0,-55: + 0: 13247 + 1: 32768 + 0,-54: + 0: 30001 + 1: 34952 0,-57: - 0: 30711 - 1,-60: - 0: 12834 - 1,-59: - 0: 47411 - 1,-58: - 0: 49083 + 0: 48059 + 1,-56: + 0: 13105 + 1: 34956 + 1,-55: + 0: 51 + 1: 48264 + 1,-54: + 1: 9011 1,-57: - 0: 39417 - 2,-59: - 0: 4096 - 2,-58: - 0: 65365 + 1: 39417 + 2,-56: + 1: 65501 + 2,-55: + 1: 341 2,-57: - 0: 56797 - -3,-64: - 0: 65535 - -3,-63: - 0: 65535 - -3,-62: - 0: 65535 + 1: 56797 + -4,-61: + 0: 30591 + -4,-60: + 0: 26466 + -5,-60: + 0: 65520 + -4,-59: + 1: 240 + 0: 2 + -5,-59: + 1: 240 + -3,-59: + 1: 17524 + -3,-58: + 1: 60996 + -3,-60: + 1: 17476 -3,-61: - 0: 17663 - -2,-64: - 0: 65535 - -2,-63: - 0: 65535 - -2,-62: - 0: 65535 + 1: 17648 + 0: 15 + -2,-58: + 1: 14131 + -2,-59: + 1: 12936 + -2,-60: + 1: 34952 -2,-61: - 0: 36095 - -1,-64: - 0: 65535 - -1,-63: - 0: 65535 - -1,-62: - 0: 65535 + 1: 34832 + 0: 143 + -1,-60: + 1: 12834 + 0: 19660 + -1,-59: + 1: 819 + 0: 34824 + -1,-58: + 0: 39931 -1,-61: - 0: 61439 - 0,-64: - 0: 65535 - 0,-63: - 0: 65535 - 0,-62: - 0: 65535 + 1: 8192 + 0: 18479 + 0,-60: + 0: 22391 + 1: 34952 + 0,-59: + 0: 13075 + 1: 2184 + 0,-58: + 0: 15355 0,-61: + 0: 21407 + 1: 32768 + 1,-60: + 1: 12834 + 1,-59: + 1: 35123 + 1,-58: + 0: 4369 + 1: 35976 + 1,-61: + 1: 8704 + 0: 255 + 2,-59: + 1: 4096 + 2,-58: + 1: 65365 + 3,-60: + 1: 3170 + 0: 8 + 3,-61: + 1: 8752 + 0: 34959 + 4,-60: + 0: 15 + 1: 3840 + -4,-64: 0: 65535 + -4,-65: + 0: 65399 + -5,-64: + 0: 65535 + -4,-63: + 0: 61823 + -5,-63: + 0: 2047 + -4,-62: + 0: 30583 + -5,-62: + 0: 65535 + -5,-61: + 0: 65535 + -3,-64: + 0: 4369 + 1: 17476 + -3,-63: + 0: 61441 + 1: 1860 + -3,-62: + 1: 62663 + -3,-65: + 0: 4352 + 1: 17487 + -2,-64: + 0: 11259 + -2,-63: + 0: 64767 + -2,-62: + 1: 4112 + 0: 52424 + -2,-65: + 0: 16364 + -1,-64: + 0: 36863 + -1,-63: + 0: 65262 + -1,-62: + 0: 47342 + -1,-65: + 0: 36251 + 0,-64: + 0: 56603 + 0,-63: + 0: 40447 + 0,-62: + 0: 65467 + 0,-65: + 0: 64315 1,-64: 0: 65535 1,-63: 0: 65535 1,-62: - 0: 65535 - 1,-61: - 0: 12287 - 2,-64: - 0: 65535 - 2,-63: - 0: 65535 - 2,-62: - 0: 65535 - 2,-61: - 0: 511 - 3,-64: - 0: 65535 - 3,-63: - 0: 65535 - 3,-62: - 0: 65535 - 3,-61: - 0: 65535 - -3,-66: - 0: 65476 - -3,-65: - 0: 65535 - -2,-66: - 0: 65532 - -2,-65: - 0: 65535 - -2,-67: - 0: 34952 - -1,-66: - 0: 65535 - -1,-65: - 0: 65535 - -1,-67: - 0: 60622 - 0,-67: - 0: 63359 - 0,-66: - 0: 65535 - 0,-65: - 0: 65535 - 1,-66: - 0: 65527 + 0: 65295 1,-65: - 0: 65535 - 1,-67: - 0: 30583 - 2,-66: - 0: 65328 + 0: 65423 + 2,-64: + 0: 64977 + 2,-63: + 0: 61917 + 2,-62: + 0: 1 + 1: 57356 + 2,-61: + 0: 15 + 1: 224 2,-65: - 0: 65535 - 3,-66: - 0: 65501 + 0: 61697 + 1: 3084 + 3,-63: + 0: 63726 + 3,-62: + 1: 12291 + 0: 2184 3,-65: - 0: 65535 + 0: 63624 + 1: 771 + 3,-64: + 0: 61160 4,-64: 0: 65535 4,-63: 0: 65535 4,-62: - 0: 65535 + 0: 20479 4,-61: 0: 65535 - 5,-64: + -4,-67: + 0: 65280 + -5,-67: + 0: 65399 + -4,-66: + 0: 63359 + -5,-66: 0: 65535 - 5,-63: - 0: 65535 - 5,-62: - 0: 65535 - 5,-61: + -5,-65: 0: 65535 + -3,-67: + 0: 4352 + 1: 17476 + -3,-66: + 0: 61441 + 1: 3908 + -3,-68: + 1: 17472 + -3,-69: + 0: 52224 + 1: 4 + -2,-68: + 0: 2799 + 1: 8192 + -2,-66: + 1: 264 + 0: 63616 + -2,-69: + 0: 63351 + -1,-68: + 0: 33663 + -2,-67: + 1: 34952 + -1,-66: + 0: 62084 + 1: 2 + -1,-67: + 1: 8738 + 0: 52420 + 0,-68: + 0: 14783 + 0,-67: + 0: 30581 + 1: 34952 + 0,-66: + 0: 63797 + 1: 8 + 0,-69: + 0: 64496 + 1,-68: + 0: 8823 + 1,-67: + 1: 21845 + 0: 8738 + 1,-66: + 0: 61986 + 1: 136 + 1,-69: + 0: 30579 + 2,-66: + 1: 3120 + 0: 61440 + 2,-67: + 1: 32768 + 3,-67: + 1: 12808 + 0: 34816 + 3,-66: + 1: 770 + 0: 63496 + 3,-68: + 1: 57568 + 4,-68: + 1: 62192 + 4,-67: + 0: 65280 + 1: 10 4,-66: - 0: 65535 + 0: 65359 4,-65: 0: 65535 - 5,-66: - 0: 65535 + 5,-64: + 0: 4360 + 1: 2182 + 5,-63: + 0: 1 5,-65: - 0: 65535 - 3,-68: - 0: 20736 - 3,-67: - 0: 64991 - 4,-67: - 0: 65535 - 4,-68: - 0: 43008 - 3,-36: - 0: 65535 - 3,-35: - 0: 65535 - 3,-34: - 0: 34958 - 3,-40: - 0: 61439 - 3,-39: - 0: 65535 - 3,-38: - 0: 65535 - 3,-37: - 0: 65535 - 2,-41: - 0: 4095 - 3,-42: - 0: 63744 - 3,-41: - 0: 65535 - -4,-64: - 0: 65535 - -4,-63: - 0: 65535 - -4,-62: - 0: 65535 - -4,-61: - 0: 65535 - -4,-66: - 0: 65535 - -4,-65: - 0: 65535 - -3,-68: - 0: 17612 - -2,-68: - 0: 61439 - -1,-68: - 0: 65535 - 0,-68: - 0: 65535 - 1,-68: - 0: 32767 - 4,-36: - 0: 30583 - 4,-35: - 0: 30583 - 4,-34: - 0: 3 - 4,-40: - 0: 14199 - 4,-39: - 0: 30583 - 4,-38: - 0: 30583 - 4,-37: - 0: 30583 - 4,-42: - 0: 30564 - 4,-41: - 0: 30719 + 0: 39048 + 1: 24576 + 6,-64: + 0: 15 + 1: 544 + 6,-65: + 1: 62933 + 7,-64: + 0: 15 + 1: 2720 + 7,-65: + 1: 30037 + 0: 34952 + 8,-64: + 1: 3 + 5,-68: + 1: 12336 + 5,-66: + 1: 102 + 0: 34952 + 5,-67: + 1: 34816 + 6,-66: + 0: 15 + 1: 54768 + 6,-67: + 1: 8704 + 7,-66: + 1: 20784 + 0: 32768 + 7,-67: + 1: 8704 + 8,-66: + 1: 272 + 8,-65: + 1: 4096 + 4,-33: + 1: 16384 + 4,-32: + 1: 52420 + 5,-40: + 1: 1094 + 5,-41: + 1: 26483 4,-43: - 0: 16520 - -6,-65: - 0: 58082 - 2: 3084 - -6,-66: - 0: 8942 - 2: 52224 - -5,-66: - 0: 61183 - 2: 4352 - -5,-65: - 2: 257 - 0: 65278 - -6,-64: - 0: 58082 - 2: 3084 - -6,-63: - 3: 12 - 0: 60642 - -6,-62: - 0: 61166 - -6,-61: - 0: 61166 - -5,-64: - 2: 257 - 0: 65278 - -5,-63: - 3: 1 - 0: 65534 - -5,-62: - 0: 65535 - -5,-61: - 0: 65535 + 1: 16520 + 5,-44: + 1: 4369 + 5,-43: + 1: 13073 + 5,-45: + 1: 4096 + 5,-42: + 1: 13107 + -4,-80: + 1: 65280 + -5,-80: + 1: 65382 -4,-78: - 0: 51200 + 1: 49152 -4,-77: - 0: 52428 - -3,-78: - 0: 65524 - -3,-77: - 0: 65535 + 1: 50244 -3,-80: - 0: 65484 + 1: 4864 + 0: 2184 + -3,-78: + 1: 4884 + 0: 34816 + -4,-76: + 1: 34952 + -3,-77: + 1: 4115 + 0: 52232 -3,-79: - 0: 65535 + 1: 4369 + 0: 3276 + -3,-81: + 1: 16384 + -3,-76: + 0: 51404 -2,-80: - 0: 65535 + 0: 53247 -2,-79: - 0: 65535 + 0: 52733 -2,-78: - 0: 65535 + 0: 65292 + 1: 1 -2,-77: - 0: 65535 + 0: 60943 + -2,-76: + 0: 61167 + -2,-81: + 0: 34952 + 1: 68 -1,-80: - 0: 65535 + 0: 49083 -1,-79: - 0: 65535 + 0: 48059 -1,-78: - 0: 65535 + 0: 65499 -1,-77: + 0: 64479 + -1,-76: 0: 65535 + -1,-81: + 0: 10316 + 1: 51 0,-80: - 0: 65535 + 0: 46015 0,-79: - 0: 65535 + 0: 48059 0,-78: - 0: 65535 + 0: 63419 0,-77: - 0: 65535 + 0: 47103 + 0,-81: + 0: 37719 + 1: 136 + 0,-76: + 0: 48059 1,-80: - 0: 65535 + 0: 61687 1,-79: 0: 65535 1,-78: - 0: 65535 + 0: 62719 1,-77: - 0: 65535 - 2,-80: - 0: 65535 - 2,-79: - 0: 65535 - 2,-78: - 0: 65535 - 2,-77: - 0: 32767 - 3,-80: - 0: 4095 - 3,-79: - 0: 4095 - 3,-78: - 0: 62208 - 3,-77: - 0: 1023 - 0,-72: - 0: 65535 - 0,-71: - 0: 65535 - 0,-70: - 0: 65535 - 0,-69: - 0: 65535 - 1,-72: - 0: 65535 - 1,-71: - 0: 65535 - 1,-70: - 0: 65535 - 1,-69: - 0: 65535 - 2,-72: - 0: 13107 - 2,-71: - 0: 65527 - 2,-70: - 0: 65535 - 2,-69: - 0: 311 - -3,-69: - 0: 52428 - -3,-70: - 0: 50244 - -2,-72: - 0: 65535 - -2,-71: - 0: 61439 - -2,-70: - 0: 65518 - -2,-69: - 0: 65535 - -1,-72: - 0: 65535 - -1,-71: - 0: 65535 - -1,-70: - 0: 65535 - -1,-69: - 0: 65535 - 0,-76: - 0: 65535 - 0,-75: - 0: 65535 - 0,-74: - 0: 30719 - 0,-73: - 0: 65527 + 0: 62719 1,-76: 0: 65535 - 1,-75: - 0: 65535 - 1,-74: - 0: 30591 - 1,-73: - 0: 65527 - 2,-76: - 0: 65399 - 2,-75: - 0: 65535 - 2,-73: - 0: 12544 - 3,-76: - 0: 65280 - 3,-75: - 0: 65295 - -4,-76: - 0: 34952 - -4,-75: - 0: 35071 - -3,-76: - 0: 65535 - -3,-75: - 0: 52479 - -2,-76: - 0: 65535 - -2,-75: - 0: 65535 - -2,-73: - 0: 65224 - -2,-74: - 0: 35022 - -1,-76: - 0: 65535 - -1,-75: - 0: 65535 - -1,-74: - 0: 52479 - -1,-73: - 0: 65532 - -3,-81: - 0: 49152 - -2,-81: - 0: 64716 - -1,-81: - 0: 65533 - 0,-81: - 0: 65527 1,-81: - 0: 63346 - 4,-80: - 0: 53247 - 4,-79: - 0: 36863 - 4,-78: - 0: 65516 - 4,-77: - 0: 61439 - 5,-80: - 0: 65521 - 5,-79: - 0: 65535 - 5,-78: - 0: 65535 - 5,-77: - 0: 65535 - 6,-80: - 0: 65393 - 6,-79: - 0: 12671 - 6,-78: - 0: 65527 - 6,-77: - 0: 65535 - 7,-78: - 0: 65314 - 7,-77: - 0: 12287 - 4,-76: - 0: 65420 - 4,-75: - 0: 65487 - 5,-76: - 0: 65535 - 5,-75: - 0: 65535 - 5,-74: - 0: 1531 - 6,-76: - 0: 28983 - 6,-75: - 0: 32767 - 6,-74: - 0: 371 - 7,-76: - 0: 26146 - 5,-81: + 0: 8704 + 1: 34 + 2,-80: + 0: 21616 + 2,-79: + 0: 26181 + 2,-78: + 0: 62054 + 2,-77: + 0: 8959 + 2,-76: + 0: 8738 + 1: 2048 + 3,-80: + 1: 3855 + 0: 240 + 3,-79: + 1: 3855 + 0: 240 + 3,-78: 0: 4096 + 1: 49664 + 3,-77: + 0: 31 + 1: 704 + 4,-80: + 1: 783 + 0: 34928 + 4,-79: + 1: 36611 + 0: 120 + 4,-78: + 1: 4388 + 0: 52352 + 4,-77: + 0: 36045 + 1: 8464 + 0,-72: + 0: 22365 + 0,-73: + 0: 37719 + 1: 136 + -1,-72: + 0: 65163 + 0,-71: + 0: 65524 + -1,-71: + 0: 48051 + 0,-70: + 0: 65535 + -1,-70: + 0: 48059 + -1,-69: + 0: 3827 + 1,-72: + 0: 30479 + 1,-71: + 0: 65524 + 1,-70: + 0: 65535 + 1,-73: + 0: 12834 + 1: 2181 + 2,-72: + 0: 4369 + 2,-71: + 0: 62736 + 1: 4 + 2,-70: + 0: 5617 + 2,-69: + 1: 308 + -4,-72: + 1: 8 + -4,-73: + 1: 34952 + -3,-72: + 1: 17487 + -3,-71: + 1: 17484 + -3,-70: + 1: 17476 + -2,-72: + 0: 26350 + -2,-71: + 0: 52294 + 1: 256 + -2,-70: + 1: 256 + 0: 19660 + -2,-73: + 0: 49152 + 1: 192 + -1,-73: + 0: 14412 + 1: 50 + 0,-75: + 0: 40763 + -1,-75: + 0: 12171 + 0,-74: + 0: 30547 + 1: 34944 + -1,-74: + 0: 52296 + 1: 8736 + 1,-75: + 0: 28431 + 1,-74: + 1: 21760 + 0: 8738 + 2,-75: + 0: 1894 + 2,-74: + 1: 15 + 2,-73: + 1: 256 + 3,-76: + 1: 3840 + 0: 61440 + 3,-75: + 1: 3855 + 0: 61440 + 3,-74: + 1: 15 + 4,-76: + 1: 3972 + 0: 28672 + 4,-75: + 1: 771 + 0: 30856 + 4,-74: + 1: 207 + -4,-75: + 1: 35071 + -5,-75: + 1: 511 + -3,-75: + 1: 17 + 0: 2060 + -4,-74: + 1: 34952 + -2,-75: + 0: 53006 + -2,-74: + 0: 8 + -4,-83: + 1: 255 + -5,-83: + 1: 511 + -3,-83: + 1: 255 + -3,-84: + 1: 2180 -2,-84: - 0: 65535 + 1: 4352 + 0: 206 -2,-83: - 0: 61439 - -2,-82: - 0: 52430 - -1,-84: - 0: 65535 - -1,-83: - 0: 65535 - -1,-82: - 0: 56831 - 0,-84: - 0: 65535 - 0,-83: - 0: 65535 - 0,-82: - 0: 30719 - 1,-84: - 0: 65535 - 1,-83: - 0: 65535 - 1,-82: - 0: 8831 - 2,-84: - 0: 13111 - 0,-88: - 0: 65399 - 0,-87: - 0: 65535 - 0,-86: - 0: 65535 - 0,-85: - 0: 65535 - 1,-88: - 0: 63266 - 1,-87: - 0: 65535 - 1,-86: - 0: 65535 - 1,-85: - 0: 65535 - 2,-87: - 0: 62224 - 2,-86: - 0: 65535 - 2,-85: - 0: 65535 - -2,-87: - 0: 65534 - -2,-86: - 0: 65535 + 1: 273 + 0: 36044 -2,-85: 0: 65535 - -2,-88: - 0: 60552 - -1,-88: - 0: 65484 - -1,-87: - 0: 65535 - -1,-86: - 0: 65535 + -2,-82: + 1: 17410 + 0: 34952 + -1,-84: + 0: 52381 + -1,-83: + 0: 4095 + -1,-82: + 1: 13088 + 0: 52296 -1,-85: - 0: 65535 - 0,-92: - 0: 65535 - 0,-91: - 0: 65535 - 0,-90: - 0: 65535 - 0,-89: - 0: 32767 - 1,-92: - 0: 65535 - 1,-91: - 0: 65535 - 1,-90: - 0: 65535 - 1,-89: - 0: 10111 - 2,-92: - 0: 4369 - 2,-91: - 0: 61713 - 2,-90: - 0: 4383 - -2,-92: - 0: 65535 - -2,-91: - 0: 65535 - -2,-90: - 0: 65535 - -2,-89: - 0: 36046 - -1,-92: - 0: 65535 - -1,-91: - 0: 65535 - -1,-90: - 0: 65535 - -1,-89: - 0: 53247 - -2,-93: - 0: 65518 - -2,-96: - 0: 52974 - -2,-94: - 0: 65516 - -2,-95: - 0: 49160 - -1,-96: - 0: 65535 - -1,-95: - 0: 63692 - -1,-94: - 0: 65535 - -1,-93: - 0: 65535 - 0,-96: - 0: 65535 - 0,-95: - 0: 63351 - 0,-94: - 0: 65535 - 0,-93: - 0: 65535 - 1,-96: - 0: 32767 - 1,-95: - 0: 29218 - 1,-94: - 0: 65527 - 1,-93: - 0: 65535 - 2,-93: - 0: 4352 - 0,-98: - 0: 65535 - 0,-97: - 0: 65535 - 1,-99: - 0: 65535 - 1,-98: - 0: 65535 - 1,-97: - 0: 65535 - -2,-97: - 0: 61166 - -1,-98: - 0: 65254 - -1,-97: - 0: 65535 - 2,-96: - 0: 17 - 0,-100: - 0: 65535 - 0,-99: - 0: 61183 - 1,-100: - 0: 65535 - 2,-100: - 0: 4368 - 2,-99: - 0: 4369 - 2,-97: - 0: 4368 - -2,-100: - 0: 36078 - -2,-99: - 0: 8 - -1,-100: - 0: 61439 - -1,-99: - 0: 16384 - 0,-101: - 0: 65399 - 1,-101: - 0: 30496 - -2,-101: - 0: 51336 - -2,-102: - 0: 32768 - -1,-101: - 0: 65484 - 1,3: - 0: 30702 - 1,2: - 0: 59118 - 2,0: - 0: 61239 - 2,1: - 0: 16236 - 2,2: - 0: 17 - 3,0: - 0: 8044 - 3,1: - 0: 12544 - 3,2: - 0: 33074 - 2,-3: - 0: 4369 - 3,-4: - 0: 15 - 3,-1: - 0: 33272 - -4,0: - 0: 8134 - -4,2: - 0: 12680 - -4,1: - 0: 32768 - -3,0: - 0: 65420 - -3,1: - 0: 40902 - -3,2: - 0: 272 - -2,2: - 0: 60671 - -2,3: - 0: 52462 - -1,3: - 0: 4352 - -4,-2: - 0: 4096 - -4,-1: - 0: 12787 - -3,-1: - 0: 25596 - 2,-7: - 0: 15 - 3,-8: - 0: 61440 - 3,-7: - 0: 207 - 3,-5: - 0: 61440 - -4,-15: - 0: 61440 - -4,-14: - 0: 15 - -3,-15: - 0: 65152 - -3,-14: - 0: 143 - 3,-15: - 0: 64767 - 3,-14: - 0: 15 - 2,-19: - 0: 36864 - 3,-18: - 0: 65535 - -4,-18: - 0: 65280 - -3,-18: - 0: 65408 - -3,-17: - 0: 142 - 2,-24: - 0: 383 - 2,-22: - 0: 28928 - 2,-21: - 0: 65535 - 3,-24: - 0: 34959 - 3,-21: - 0: 65535 - -4,-24: - 0: 15 - -4,-21: - 0: 255 - -4,-28: - 0: 4080 - -4,-25: - 0: 61440 - 2,-28: - 0: 65393 - 2,-27: - 0: 1 - 2,-25: - 0: 62224 - 3,-28: - 0: 65416 - 3,-25: - 0: 63624 - -4,-31: - 0: 255 - 2,-32: - 0: 4096 - 2,-31: - 0: 32755 - 3,-31: - 0: 36856 - -4,-35: - 0: 65280 - -3,-35: - 0: 65532 - -3,-34: - 0: 65535 - -4,-38: - 0: 4080 - -3,-38: - 0: 53244 - -3,-39: - 0: 52428 - 4,-33: - 0: 16384 - -2,4: - 0: 2252 - -1,4: - 0: 65329 - -1,5: - 0: 2190 - 0,4: - 0: 65152 - 0,5: - 0: 4927 - 0,6: - 0: 17 - 1,4: - 0: 4983 - -5,0: - 0: 61030 - -5,1: - 0: 26214 - -5,2: - 0: 36046 - -5,-3: - 0: 8738 - -5,-2: - 0: 61030 - -5,-1: - 0: 28390 - 4,-4: - 0: 35023 - 4,-2: - 0: 65228 - 4,-1: - 0: 57341 - 4,-3: - 0: 34952 - 4,0: - 0: 65484 - 4,2: - 0: 14190 - 4,1: - 0: 52428 - 4,-8: - 0: 64640 - 4,-7: - 0: 36095 - 4,-5: - 0: 64640 - 4,-6: - 0: 8 - 5,-8: - 0: 4919 - 5,-7: - 0: 17 - 5,-12: - 0: 13073 - 5,-11: - 0: 26211 - 5,-10: - 0: 26214 - 5,-9: - 0: 26214 - 4,-15: - 0: 61815 - 4,-14: - 0: 15 - 4,-16: + 0: 56831 + 0,-84: + 0: 30487 + 0,-83: + 0: 6135 + 0,-82: + 0: 30547 + 1: 34944 + 0,-85: 0: 30591 - 5,-16: - 0: 13105 - 5,-15: - 0: 13107 - 5,-14: - 0: 26231 - 5,-13: - 0: 5444 - 4,-18: - 0: 65535 - 4,-19: - 0: 65399 - 4,-17: - 0: 63999 - 5,-18: - 0: 4352 - 5,-17: - 0: 4369 - 5,-20: - 0: 17478 - -6,-14: - 0: 52428 - -6,-13: - 0: 1092 - -6,-16: - 0: 34944 - -6,-15: - 0: 34952 - -5,-16: - 0: 4371 - -5,-15: - 0: 61713 - -5,-14: - 0: 31 - -6,-20: - 0: 17484 - -5,-18: - 0: 65382 - -5,-17: - 0: 13107 - -5,-19: - 0: 26180 - 4,-24: - 0: 34959 - 4,-21: - 0: 30719 - 4,-23: - 0: 136 - 5,-24: - 0: 4369 - 5,-23: - 0: 13073 - 5,-22: - 0: 13107 - 5,-21: - 0: 26483 - 4,-28: - 0: 65280 - 4,-25: - 0: 64716 - 4,-26: - 0: 50240 - 5,-28: - 0: 29491 - 5,-27: - 0: 18023 - 5,-25: - 0: 4096 - 5,-26: - 0: 68 - -6,-21: - 0: 52424 - -6,-23: - 0: 34816 - -6,-22: - 0: 34952 - -5,-24: - 0: 13119 - -5,-23: - 0: 4403 - -5,-22: - 0: 4369 - -5,-21: - 0: 511 - -6,-28: - 0: 52360 - -6,-27: - 0: 17612 - -6,-26: - 0: 4 - -5,-28: - 0: 8177 - -5,-25: - 0: 63078 - -5,-26: - 0: 25664 - 4,-31: - 0: 36860 - 4,-32: - 0: 52420 - 4,-30: - 0: 34952 - 5,-31: - 0: 4368 - 5,-30: - 0: 4369 - 5,-29: - 0: 13107 - -6,-30: - 0: 32768 - -6,-29: - 0: 34952 - -5,-31: - 0: 13311 - -5,-30: - 0: 4915 - -5,-29: - 0: 4369 - -5,-32: - 0: 26214 - -6,-35: - 0: 51336 - -6,-34: - 0: 19660 - -6,-33: - 0: 68 - -6,-36: - 0: 34952 - -5,-36: - 0: 4369 - -5,-35: - 0: 65297 - -5,-34: - 0: 1 - -5,-33: - 0: 17408 - -5,-38: - 0: 16374 - -5,-37: - 0: 13107 - -5,-39: - 0: 26212 - -5,-40: - 0: 16384 - 3,-16: - 0: 65535 - 3,-20: - 0: 65535 - 3,-19: - 0: 65535 - 3,-17: - 0: 64767 - 3,-22: - 0: 65534 - 3,-23: - 0: 34952 - 3,-27: - 0: 34952 - 3,-26: - 0: 34952 - 3,-32: - 0: 34952 - 3,-30: - 0: 34952 - 3,-29: - 0: 34952 - 3,-33: - 0: 34952 - -4,-48: - 0: 255 - -3,-48: - 0: 61183 - -4,-49: - 0: 34944 - -3,-49: - 0: 57588 - -3,-52: - 0: 62532 - -3,-51: - 0: 17487 - -3,-50: - 0: 17476 - -3,-54: - 0: 17476 - -3,-53: - 0: 17476 - -3,-60: - 0: 17476 - -3,-59: - 0: 17476 - 3,-60: - 0: 3310 - -3,-67: - 0: 17476 - 6,-64: - 0: 8751 - 6,-63: - 0: 65535 - 6,-62: - 0: 65535 - 6,-61: - 0: 65535 - 7,-64: - 0: 43695 - 7,-63: - 0: 65535 - 7,-62: - 0: 65535 - 7,-61: - 0: 65535 - 5,-67: - 0: 39184 - 6,-67: - 0: 65535 - 6,-66: - 0: 54783 - 6,-65: - 0: 62941 - 7,-67: - 0: 30583 - 7,-66: - 0: 55603 - 7,-65: - 0: 64989 - 8,-64: - 0: 3 - 8,-63: - 0: 30583 - 8,-62: - 0: 30583 - 8,-61: - 0: 30583 - 8,-66: - 0: 272 - 8,-65: - 0: 4096 - -4,-72: - 0: 8 - -3,-72: - 0: 17487 - -3,-71: - 0: 17484 - 2,-74: - 0: 15 - 3,-74: - 0: 15 - -4,-74: - 0: 34952 - -4,-73: - 0: 34952 - 4,-74: - 0: 207 - 4,-20: - 0: 30583 - 4,-22: - 0: 30579 - 4,-60: - 0: 4095 - 5,-60: - 0: 2553 - 6,-60: - 0: 4095 - 7,-60: - 0: 4095 - 8,-60: - 0: 887 - -3,-36: - 0: 52428 - -3,-33: - 0: 15 - -3,-37: - 0: 52428 - 2,-48: - 0: 2047 - 2,-52: - 0: 63344 - 3,-51: - 0: 4367 - 3,-50: - 0: 4369 - 3,-49: - 0: 17 - -4,-42: - 0: 65535 - -4,-41: - 0: 65535 - -4,-44: - 0: 12 - -3,-42: - 0: 65535 - -3,-41: - 0: 16383 - 3,-44: - 0: 15 - 3,-48: - 0: 255 - 3,-45: - 0: 61440 - -4,-45: - 0: 63232 - -4,-52: - 0: 61440 - -4,-51: - 0: 15 - 3,-52: - 0: 61440 - 5,-40: - 0: 1094 - 4,-44: - 0: 34959 - 5,-44: - 0: 4369 - 5,-43: - 0: 13073 - 5,-42: - 0: 13107 - 5,-41: - 0: 26483 - -3,-84: - 0: 2188 - -3,-86: - 0: 61167 - -3,-85: - 0: 61166 - -3,-87: - 0: 63488 - -6,-40: - 0: 68 - -6,-48: - 0: 52424 - -6,-47: - 0: 1100 - -5,-48: - 0: 511 - -5,-45: - 0: 65382 - -5,-46: - 0: 26180 - -5,-47: - 0: 17408 - -6,-41: - 0: 52428 - -6,-43: - 0: 34944 - -6,-42: - 0: 34952 - -5,-44: - 0: 13107 - -5,-43: - 0: 4403 - -5,-42: - 0: 61727 - -5,-41: - 0: 255 - 4,-48: - 0: 255 - 4,-45: - 0: 64716 - 4,-47: - 0: 16384 - 4,-46: - 0: 50244 - 5,-48: - 0: 52983 - 5,-45: - 0: 4096 - 5,-47: - 0: 2188 - 4,-52: - 0: 63624 - 4,-51: - 0: 15 - 5,-52: - 0: 12561 - 5,-51: - 0: 13107 - 5,-50: - 0: 26163 - 5,-49: - 0: 26214 - 4,-53: - 0: 34944 - 5,-53: - 0: 4096 - -6,-50: - 0: 34816 - -6,-49: - 0: 34952 - -5,-52: - 0: 63078 - -5,-51: - 0: 13119 - -5,-50: - 0: 4403 - -5,-49: - 0: 4369 - -5,-53: - 0: 25664 - -4,-43: - 0: 65280 - -4,-60: - 0: 65535 - -4,-67: - 0: 65392 - -4,-80: - 0: 65280 - -4,-83: - 0: 255 - -3,-83: - 0: 255 + 1,-84: + 0: 28687 + 1,-83: + 0: 14199 + 1,-85: + 0: 65522 + 1,-82: + 1: 8744 + 2,-84: + 1: 13092 2,-83: - 0: 4607 + 1: 4607 3,-83: - 0: 255 - 7,-80: - 0: 30562 - 7,-79: - 0: 17511 - 7,-75: - 0: 61303 - 7,-74: - 0: 36044 + 1: 255 4,-83: - 0: 255 - 5,-84: - 0: 13107 - 5,-83: - 0: 26483 - 5,-82: - 0: 1094 + 1: 255 + 5,-80: + 1: 1 + 0: 65280 + 5,-79: + 0: 17423 + 1: 256 + 5,-78: + 0: 49151 + 5,-77: + 0: 65456 + 5,-81: + 1: 4096 + 5,-76: + 0: 1103 + 1: 256 + 6,-80: + 0: 13056 + 1: 34881 + 6,-79: + 0: 3 + 1: 8520 + 6,-78: + 0: 30513 + 1: 132 + 6,-77: + 0: 14206 + 1: 32768 + 6,-76: + 0: 1 + 1: 16676 + 7,-80: + 1: 30562 + 7,-79: + 1: 17511 + 7,-78: + 0: 28672 + 1: 2082 + 7,-77: + 0: 119 + 1: 10240 7,-81: - 0: 13073 - 3,-87: - 0: 61440 - 3,-86: - 0: 287 - -4,-87: - 0: 61440 - -4,-86: - 0: 15 - 3,-91: - 0: 63624 - 3,-90: - 0: 143 - 3,-92: - 0: 34956 - -4,-92: - 0: 13110 - -4,-91: - 0: 62259 - -4,-90: - 0: 4415 - -3,-91: - 0: 61440 - -3,-90: - 0: 15 - -4,-94: - 0: 61132 - -4,-93: - 0: 26214 - -4,-95: - 0: 52360 - -3,-94: - 0: 65280 - 2,-94: - 0: 65280 - 3,-94: - 0: 65382 - 3,-95: - 0: 26146 - 3,-93: - 0: 52428 - -2,-98: - 0: 40960 - -6,-85: - 0: 34816 - -5,-87: - 0: 63078 - -5,-86: - 0: 13119 - -5,-85: - 0: 4403 - -5,-88: - 0: 25664 - -6,-83: - 0: 52424 - -6,-82: - 0: 1100 - -6,-84: - 0: 34952 - -5,-84: - 0: 4369 - -5,-83: - 0: 511 - -5,-81: - 0: 26180 - 4,-87: - 0: 64716 - 4,-86: - 0: 34959 - 4,-88: - 0: 50240 - 4,-85: - 0: 136 - 5,-87: - 0: 4096 - 5,-86: - 0: 4369 - 5,-85: - 0: 13073 - -5,-60: - 0: 65535 - -6,-67: - 0: 61152 - -5,-67: - 0: 65520 - -5,-90: - 0: 34952 - -5,-89: - 0: 136 - 4,-92: - 0: 4368 - 4,-91: - 0: 4369 - 4,-90: - 0: 13107 - 4,-89: - 0: 34 + 1: 13073 + 7,-76: + 1: 26146 8,-78: - 0: 61440 + 1: 61440 8,-77: - 0: 255 - 8,-80: + 1: 255 + 5,-75: + 0: 4095 + 5,-74: + 1: 1530 + 6,-75: + 0: 819 + 1: 18568 + 6,-74: + 1: 370 + 7,-75: + 1: 61303 + 7,-74: + 1: 36044 + 5,-83: + 1: 26483 + 5,-84: + 1: 13107 + 5,-85: + 1: 13073 + 5,-82: + 1: 1094 + 0,-88: + 0: 12561 + 1: 3140 + 0,-89: + 0: 4401 + 1: 19456 + 0,-87: + 0: 16305 + -1,-88: 0: 32768 - 8,-79: - 0: 34952 - 9,-79: - 0: 4368 - 9,-78: - 0: 13107 - 9,-77: - 0: 29491 - 9,-76: - 0: 18023 - 9,-75: - 0: 4 - -6,-77: - 0: 34952 - -5,-80: - 0: 65382 - -5,-79: - 0: 13107 - -5,-78: - 0: 13107 - -5,-77: - 0: 4369 - -6,-75: - 0: 52424 - -6,-74: - 0: 1100 - -6,-76: - 0: 34952 - -5,-76: - 0: 4369 - -5,-75: - 0: 511 - -4,-59: - 0: 15 + 1: 1621 + -1,-87: + 0: 48048 + 0,-86: + 0: 65393 + -1,-86: + 0: 56784 + 1,-87: + 0: 816 + 1,-86: + 0: 65279 + 1,-88: + 1: 85 + 0: 546 + 1,-89: + 1: 20480 + 0: 8707 + 2,-86: + 0: 12305 + 1: 8 + 2,-85: + 0: 272 + 1: 32768 + 2,-87: + 1: 49664 + 3,-87: + 1: 61440 + 3,-86: + 1: 287 + 4,-87: + 1: 64716 + 4,-86: + 1: 34959 + -4,-87: + 1: 61440 + -4,-86: + 1: 15 + -5,-87: + 1: 63078 + -5,-86: + 1: 13119 + -3,-87: + 1: 30720 + -3,-86: + 1: 3 + 0: 34816 + -3,-85: + 1: 8192 + 0: 2184 + -2,-86: + 0: 65528 + -2,-87: + 0: 52352 + -2,-88: + 1: 68 + 0: 2184 + -2,-89: + 1: 16384 + 0: 34824 + -1,-89: + 1: 22016 + 0: 129 + 0,-92: + 0: 48051 + 0,-93: + 0: 45311 + -1,-92: + 0: 48057 + 0,-91: + 0: 64955 + -1,-91: + 0: 63419 + 0,-90: + 0: 32639 + -1,-90: + 0: 57310 + 1,-92: + 0: 53757 + 1,-91: + 0: 64799 + 1,-90: + 0: 16368 + 1,-93: + 0: 5495 + 2,-91: + 1: 57344 + 2,-90: + 1: 14 + 3,-91: + 1: 63624 + 3,-90: + 1: 143 + 3,-92: + 1: 34956 + 3,-93: + 1: 52428 + 4,-92: + 1: 4368 + 4,-91: + 1: 4369 + 4,-90: + 1: 13107 + -4,-92: + 1: 13110 + -4,-91: + 1: 62259 + -4,-90: + 1: 4415 + -5,-90: + 1: 34952 + -4,-93: + 1: 26214 + -3,-91: + 1: 61440 + -3,-90: + 1: 15 + -2,-92: + 0: 24806 + -2,-91: + 0: 60942 + -2,-90: + 0: 52960 + -1,-93: + 0: 45567 + -4,-94: + 1: 61132 + -4,-95: + 1: 52360 + -3,-94: + 1: 65280 + -2,-94: + 1: 4352 + 0: 52352 + -2,-93: + 1: 256 + 0: 1228 + -2,-96: + 0: 204 + 1: 32768 + -2,-97: + 0: 50380 + 1: 34 + -2,-95: + 1: 32776 + -1,-96: + 0: 2107 + 1: 24576 + -1,-94: + 0: 65320 + -1,-97: + 0: 47359 + -1,-95: + 1: 24644 + 0: 2184 + 0,-96: + 0: 4887 + 1: 49152 + 0,-95: + 0: 4915 + 1: 50244 + 0,-94: + 0: 65411 + 0,-97: + 0: 63344 + 1,-96: + 0: 639 + 1: 8192 + 1,-94: + 0: 30496 + 1,-97: + 0: 65404 + 1,-95: + 1: 8738 + 2,-94: + 1: 65280 + 2,-93: + 1: 256 + 3,-94: + 1: 65382 + 3,-95: + 1: 26146 + 0,-98: + 0: 48912 + 1: 34 + -1,-98: + 0: 65216 + 1: 34 + 1,-98: + 0: 12288 + 1: 544 + -2,-98: + 1: 8192 + 0: 32768 + -6,-85: + 1: 34816 + -5,-85: + 1: 4403 + -6,-84: + 1: 34952 + -5,-84: + 1: 4369 + -5,-88: + 1: 25664 + -6,-83: + 1: 52424 + -6,-82: + 1: 1100 + -5,-81: + 1: 26180 + -1,5: + 1: 2190 + 0,4: + 1: 65152 + 0,5: + 1: 4927 + 0,6: + 1: 17 + -5,1: + 1: 26214 + -5,-3: + 1: 8738 + 4,-2: + 1: 65228 + 4,-3: + 1: 34952 + 4,1: + 1: 52428 + 5,-8: + 1: 4919 + 5,-7: + 1: 17 + 4,-6: + 1: 8 + 5,-9: + 1: 26214 + 5,-12: + 1: 13073 + 5,-13: + 1: 5444 + 5,-11: + 1: 26211 + 5,-10: + 1: 26214 + 5,-16: + 1: 13105 + 5,-15: + 1: 13107 + 5,-14: + 1: 26231 + 5,-17: + 1: 4369 + 5,-18: + 1: 4352 + 5,-20: + 1: 17478 + 5,-21: + 1: 26483 + -6,-14: + 1: 52428 + -6,-13: + 1: 1092 + -6,-16: + 1: 34944 + -5,-16: + 1: 4371 + -6,-15: + 1: 34952 + -5,-17: + 1: 13107 + -6,-20: + 1: 17484 + -6,-21: + 1: 52424 + -5,-19: + 1: 26180 + 5,-24: + 1: 4369 + 4,-23: + 1: 136 + 5,-23: + 1: 13073 + 5,-25: + 1: 4096 + 5,-22: + 1: 13107 + 4,-26: + 1: 50240 + 5,-28: + 1: 29491 + 5,-29: + 1: 13107 + 5,-27: + 1: 18023 + 5,-26: + 1: 68 + -6,-23: + 1: 34816 + -5,-23: + 1: 4403 + -6,-22: + 1: 34952 + -5,-22: + 1: 4369 + -6,-28: + 1: 52360 + -6,-27: + 1: 17612 + -6,-26: + 1: 4 + -6,-29: + 1: 34952 + -5,-29: + 1: 4369 + -5,-26: + 1: 25664 + 5,-31: + 1: 4368 + 4,-30: + 1: 34952 + 5,-30: + 1: 4369 + -6,-30: + 1: 32768 + -5,-30: + 1: 4915 + -5,-32: + 1: 26214 + -5,-33: + 1: 17408 + -6,-35: + 1: 51336 + -6,-34: + 1: 19660 + -6,-33: + 1: 68 + -6,-36: + 1: 34952 + -5,-36: + 1: 4369 + -5,-34: + 1: 1 + -5,-37: + 1: 13107 + -6,-40: + 1: 68 + -6,-41: + 1: 52428 + -5,-39: + 1: 26212 + -5,-40: + 1: 16384 + 5,-60: + 1: 272 + 4,-88: + 1: 50240 + 5,-87: + 1: 4096 + 5,-86: + 1: 4369 + 4,-85: + 1: 136 + -6,-48: + 1: 52424 + -6,-47: + 1: 1100 + -6,-49: + 1: 34952 + -5,-49: + 1: 4369 + -5,-44: + 1: 13107 + -5,-46: + 1: 26180 + -5,-47: + 1: 17408 + -6,-43: + 1: 34944 + -5,-43: + 1: 4403 + -6,-42: + 1: 34952 + 4,-47: + 1: 16384 + 4,-46: + 1: 50244 + 5,-48: + 1: 52983 + 5,-49: + 1: 26214 + 5,-47: + 1: 2188 + 4,-53: + 1: 34944 + 5,-52: + 1: 12561 + 5,-51: + 1: 13107 + 5,-53: + 1: 4096 + 5,-50: + 1: 26163 + -6,-50: + 1: 34816 + -5,-50: + 1: 4403 + -5,-53: + 1: 25664 + -8,-64: + 1: 43690 + -9,-64: + 1: 34952 + -8,-63: + 1: 15278 + -9,-63: + 1: 8 + -8,-62: + 1: 255 + -8,-65: + 1: 44680 + -7,-63: + 1: 61184 + 5: 12 + -7,-62: + 1: 64443 + -7,-61: + 1: 6587 + -7,-60: + 1: 4369 + -7,-64: + 3: 12 + 4: 3072 + -6,-64: + 3: 1 + 4: 256 + 1: 17476 + -6,-63: + 5: 1 + 1: 5956 + -6,-62: + 1: 4096 + 0: 52428 + -6,-61: + 1: 1 + 0: 52428 + -6,-65: + 1: 17476 + 3: 257 -6,-60: - 0: 34958 + 1: 1 -6,-59: - 0: 8 - -5,-59: - 0: 15 + 1: 240 + -8,-68: + 1: 60032 + -8,-67: + 1: 43690 + -8,-66: + 1: 43694 + -9,-65: + 1: 34952 + -7,-67: + 1: 3840 + 0: 14 + -7,-68: + 0: 60928 + -7,-66: + 3: 3084 + -7,-65: + 3: 3084 + -6,-68: + 0: 65024 + -6,-67: + 1: 18176 + 0: 14 + -6,-66: + 3: 257 + 1: 17476 + -5,-68: + 0: 30464 + -5,-89: + 1: 136 + 4,-89: + 1: 34 + 8,-80: + 1: 32768 + 8,-79: + 1: 34952 + 9,-79: + 1: 4368 + 9,-78: + 1: 13107 + 9,-77: + 1: 29491 + 9,-76: + 1: 18023 + 9,-75: + 1: 4 + -6,-77: + 1: 34952 + -5,-77: + 1: 4369 + -6,-76: + 1: 34952 + -5,-79: + 1: 13107 + -5,-78: + 1: 13107 + -5,-76: + 1: 4369 + -6,-75: + 1: 52424 + -6,-74: + 1: 1100 + -9,-66: + 1: 32768 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -5415,6 +5253,21 @@ entities: - 0 - 0 - 0 + - volume: 2500 + immutable: True + moles: + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - volume: 2500 temperature: 235 moles: @@ -5448,9 +5301,22 @@ entities: - volume: 2500 temperature: 293.15 moles: + - 6666.982 - 0 - 0 - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - volume: 2500 + temperature: 293.15 + moles: + - 0 - 6666.982 - 0 - 0 @@ -5460,6 +5326,8 @@ entities: - 0 - 0 - 0 + - 0 + - 0 chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance @@ -5467,6 +5335,1278 @@ entities: - type: FTLDestination - type: BecomesStation id: Train + - uid: 17345 + components: + - type: MetaData + name: grid + - type: Transform + pos: -0.5056241,-0.46626663 + parent: 1 + - type: MapGrid + chunks: + -2,-16: + ind: -2,-16 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: [] + - type: GridAtmosphere + version: 2 + data: + chunkSize: 4 + - type: GasTileOverlay + - type: IFF + flags: HideLabel + - type: NavMap + - uid: 17346 + components: + - type: MetaData + name: grid + - type: Transform + pos: -0.5056241,-0.46626663 + parent: 1 + - type: MapGrid + chunks: + -2,-15: + ind: -2,-15 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: [] + - type: GridAtmosphere + version: 2 + data: + chunkSize: 4 + - type: GasTileOverlay + - type: IFF + flags: HideLabel + - type: NavMap + - uid: 17347 + components: + - type: MetaData + name: grid + - type: Transform + pos: -0.5056241,-0.46626663 + parent: 1 + - type: MapGrid + chunks: + -2,-15: + ind: -2,-15 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: [] + - type: GridAtmosphere + version: 2 + data: + chunkSize: 4 + - type: GasTileOverlay + - type: IFF + flags: HideLabel + - type: NavMap + - uid: 17348 + components: + - type: MetaData + name: grid + - type: Transform + pos: -0.5056241,-0.46626663 + parent: 1 + - type: MapGrid + chunks: + -2,-15: + ind: -2,-15 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: [] + - type: GridAtmosphere + version: 2 + data: + chunkSize: 4 + - type: GasTileOverlay + - type: IFF + flags: HideLabel + - type: NavMap + - uid: 17349 + components: + - type: MetaData + name: grid + - type: Transform + pos: -0.5056241,-0.46626663 + parent: 1 + - type: MapGrid + chunks: + -2,-15: + ind: -2,-15 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: [] + - type: GridAtmosphere + version: 2 + data: + chunkSize: 4 + - type: GasTileOverlay + - type: IFF + flags: HideLabel + - type: NavMap + - uid: 17350 + components: + - type: MetaData + name: grid + - type: Transform + pos: -0.5056241,-0.46626663 + parent: 1 + - type: MapGrid + chunks: + -2,-15: + ind: -2,-15 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: [] + - type: GridAtmosphere + version: 2 + data: + chunkSize: 4 + - type: GasTileOverlay + - type: IFF + flags: HideLabel + - type: NavMap + - uid: 17351 + components: + - type: MetaData + name: grid + - type: Transform + pos: -0.5056241,-0.46626663 + parent: 1 + - type: MapGrid + chunks: + -2,-17: + ind: -2,-17 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: [] + - type: GridAtmosphere + version: 2 + data: + chunkSize: 4 + - type: GasTileOverlay + - type: IFF + flags: HideLabel + - type: NavMap + - uid: 17352 + components: + - type: MetaData + name: grid + - type: Transform + pos: -0.5056241,-0.46626663 + parent: 1 + - type: MapGrid + chunks: + -2,-15: + ind: -2,-15 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: [] + - type: GridAtmosphere + version: 2 + data: + chunkSize: 4 + - type: GasTileOverlay + - type: IFF + flags: HideLabel + - type: NavMap + - uid: 17353 + components: + - type: MetaData + name: grid + - type: Transform + pos: -0.5056241,-0.46626663 + parent: 1 + - type: MapGrid + chunks: + -2,-17: + ind: -2,-17 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: [] + - type: GridAtmosphere + version: 2 + data: + chunkSize: 4 + - type: GasTileOverlay + - type: IFF + flags: HideLabel + - type: NavMap + - uid: 17354 + components: + - type: MetaData + name: grid + - type: Transform + pos: -0.5056241,-0.46626663 + parent: 1 + - type: MapGrid + chunks: + -2,-17: + ind: -2,-17 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: [] + - type: GridAtmosphere + version: 2 + data: + chunkSize: 4 + - type: GasTileOverlay + - type: IFF + flags: HideLabel + - type: NavMap + - uid: 17355 + components: + - type: MetaData + name: grid + - type: Transform + pos: -0.5056241,-0.46626663 + parent: 1 + - type: MapGrid + chunks: + -2,-17: + ind: -2,-17 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: [] + - type: GridAtmosphere + version: 2 + data: + chunkSize: 4 + - type: GasTileOverlay + - type: IFF + flags: HideLabel + - type: NavMap + - uid: 17356 + components: + - type: MetaData + name: grid + - type: Transform + pos: -0.5056241,-0.46626663 + parent: 1 + - type: MapGrid + chunks: + -3,-17: + ind: -3,-17 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: [] + - type: GridAtmosphere + version: 2 + data: + chunkSize: 4 + - type: GasTileOverlay + - type: IFF + flags: HideLabel + - type: NavMap + - uid: 17358 + components: + - type: MetaData + name: grid + - type: Transform + pos: -0.5056241,-0.46626663 + parent: 1 + - type: MapGrid + chunks: + -3,-17: + ind: -3,-17 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: [] + - type: GridAtmosphere + version: 2 + data: + chunkSize: 4 + - type: GasTileOverlay + - type: IFF + flags: HideLabel + - type: NavMap + - uid: 17360 + components: + - type: MetaData + name: grid + - type: Transform + pos: -0.5056241,-0.46626663 + parent: 1 + - type: MapGrid + chunks: + -3,-17: + ind: -3,-17 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: [] + - type: GridAtmosphere + version: 2 + data: + chunkSize: 4 + - type: GasTileOverlay + - type: IFF + flags: HideLabel + - type: NavMap + - uid: 17362 + components: + - type: MetaData + name: grid + - type: Transform + pos: -0.5056241,-0.46626663 + parent: 1 + - type: MapGrid + chunks: + -3,-17: + ind: -3,-17 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: [] + - type: GridAtmosphere + version: 2 + data: + chunkSize: 4 + - type: GasTileOverlay + - type: IFF + flags: HideLabel + - type: NavMap + - uid: 17364 + components: + - type: MetaData + name: grid + - type: Transform + pos: -0.5056241,-0.46626663 + parent: 1 + - type: MapGrid + chunks: + -3,-17: + ind: -3,-17 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: [] + - type: GridAtmosphere + version: 2 + data: + chunkSize: 4 + - type: GasTileOverlay + - type: IFF + flags: HideLabel + - type: NavMap + - uid: 17366 + components: + - type: MetaData + name: grid + - type: Transform + pos: -0.5056241,-0.46626663 + parent: 1 + - type: MapGrid + chunks: + -3,-17: + ind: -3,-17 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: [] + - type: GridAtmosphere + version: 2 + data: + chunkSize: 4 + - type: GasTileOverlay + - type: IFF + flags: HideLabel + - type: NavMap + - uid: 17368 + components: + - type: MetaData + name: grid + - type: Transform + pos: -0.5056241,-0.46626663 + parent: 1 + - type: MapGrid + chunks: + -3,-17: + ind: -3,-17 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: [] + - type: GridAtmosphere + version: 2 + data: + chunkSize: 4 + - type: GasTileOverlay + - type: IFF + flags: HideLabel + - type: NavMap + - uid: 17370 + components: + - type: MetaData + name: grid + - type: Transform + pos: -0.5056241,-0.46626663 + parent: 1 + - type: MapGrid + chunks: + -3,-17: + ind: -3,-17 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: [] + - type: GridAtmosphere + version: 2 + data: + chunkSize: 4 + - type: GasTileOverlay + - type: IFF + flags: HideLabel + - type: NavMap + - uid: 17372 + components: + - type: MetaData + name: grid + - type: Transform + pos: -0.5056241,-0.46626663 + parent: 1 + - type: MapGrid + chunks: + -3,-17: + ind: -3,-17 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: [] + - type: GridAtmosphere + version: 2 + data: + chunkSize: 4 + - type: GasTileOverlay + - type: IFF + flags: HideLabel + - type: NavMap + - uid: 17374 + components: + - type: MetaData + name: grid + - type: Transform + pos: -0.5056241,-0.46626663 + parent: 1 + - type: MapGrid + chunks: + -3,-17: + ind: -3,-17 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: [] + - type: GridAtmosphere + version: 2 + data: + chunkSize: 4 + - type: GasTileOverlay + - type: IFF + flags: HideLabel + - type: NavMap + - uid: 17376 + components: + - type: MetaData + name: grid + - type: Transform + pos: -0.5056241,-0.46626663 + parent: 1 + - type: MapGrid + chunks: + -2,-16: + ind: -2,-16 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: [] + - type: GridAtmosphere + version: 2 + data: + chunkSize: 4 + - type: GasTileOverlay + - type: IFF + flags: HideLabel + - type: NavMap + - uid: 17377 + components: + - type: MetaData + name: grid + - type: Transform + pos: -0.5056241,-0.46626663 + parent: 1 + - type: MapGrid + chunks: + -2,-16: + ind: -2,-16 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: [] + - type: GridAtmosphere + version: 2 + data: + chunkSize: 4 + - type: GasTileOverlay + - type: IFF + flags: HideLabel + - type: NavMap + - uid: 17378 + components: + - type: MetaData + name: grid + - type: Transform + pos: -0.5056241,-0.46626663 + parent: 1 + - type: MapGrid + chunks: + -2,-15: + ind: -2,-15 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: [] + - type: GridAtmosphere + version: 2 + data: + chunkSize: 4 + - type: GasTileOverlay + - type: IFF + flags: HideLabel + - type: NavMap + - uid: 17379 + components: + - type: MetaData + name: grid + - type: Transform + pos: -0.5056241,-0.46626663 + parent: 1 + - type: MapGrid + chunks: + -2,-15: + ind: -2,-15 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: [] + - type: GridAtmosphere + version: 2 + data: + chunkSize: 4 + - type: GasTileOverlay + - type: IFF + flags: HideLabel + - type: NavMap + - uid: 17380 + components: + - type: MetaData + name: grid + - type: Transform + pos: -0.5056241,-0.46626663 + parent: 1 + - type: MapGrid + chunks: + -2,-15: + ind: -2,-15 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: [] + - type: GridAtmosphere + version: 2 + data: + chunkSize: 4 + - type: GasTileOverlay + - type: IFF + flags: HideLabel + - type: NavMap + - uid: 17381 + components: + - type: MetaData + name: grid + - type: Transform + pos: -0.5056241,-0.46626663 + parent: 1 + - type: MapGrid + chunks: + -2,-15: + ind: -2,-15 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: [] + - type: GridAtmosphere + version: 2 + data: + chunkSize: 4 + - type: GasTileOverlay + - type: IFF + flags: HideLabel + - type: NavMap + - type: RadiationGridResistance + - uid: 17386 + components: + - type: MetaData + name: grid + - type: Transform + pos: -0.5056241,-0.46626663 + parent: 1 + - type: MapGrid + chunks: + -2,-15: + ind: -2,-15 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: [] + - type: GridAtmosphere + version: 2 + data: + chunkSize: 4 + - type: GasTileOverlay + - type: IFF + flags: HideLabel + - type: NavMap + - uid: 17387 + components: + - type: MetaData + name: grid + - type: Transform + pos: -0.5056241,-0.46626663 + parent: 1 + - type: MapGrid + chunks: + -2,-15: + ind: -2,-15 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: [] + - type: GridAtmosphere + version: 2 + data: + chunkSize: 4 + - type: GasTileOverlay + - type: IFF + flags: HideLabel + - type: NavMap + - uid: 17388 + components: + - type: MetaData + name: grid + - type: Transform + pos: -0.5056241,-0.46626663 + parent: 1 + - type: MapGrid + chunks: + -2,-15: + ind: -2,-15 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: [] + - type: GridAtmosphere + version: 2 + data: + chunkSize: 4 + - type: GasTileOverlay + - type: IFF + flags: HideLabel + - type: NavMap + - uid: 17390 + components: + - type: MetaData + name: grid + - type: Transform + pos: -0.5056241,-0.46626663 + parent: 1 + - type: MapGrid + chunks: + -2,-15: + ind: -2,-15 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: [] + - type: GridAtmosphere + version: 2 + data: + chunkSize: 4 + - type: GasTileOverlay + - type: IFF + flags: HideLabel + - type: NavMap - proto: AccordionInstrument entities: - uid: 3 @@ -6537,11 +7677,6 @@ entities: - 9670 - proto: AirCanister entities: - - uid: 73 - components: - - type: Transform - pos: -21.5,-260.5 - parent: 2 - uid: 74 components: - type: Transform @@ -6574,11 +7709,6 @@ entities: - type: Transform pos: -5.5,-116.5 parent: 2 - - uid: 79 - components: - - type: Transform - pos: -5.5,-119.5 - parent: 2 - uid: 80 components: - type: Transform @@ -6608,16 +7738,21 @@ entities: - type: Transform pos: -12.5,-260.5 parent: 2 - - uid: 85 - components: - - type: Transform - pos: -15.5,-249.5 - parent: 2 - uid: 86 components: - type: Transform pos: -6.5,-260.5 parent: 2 + - uid: 16981 + components: + - type: Transform + pos: -15.5,-249.5 + parent: 2 + - uid: 17066 + components: + - type: Transform + pos: -23.5,-268.5 + parent: 2 - proto: AirlockBarLocked entities: - uid: 87 @@ -6772,20 +7907,18 @@ entities: parent: 2 - proto: AirlockDetectiveLocked entities: - - uid: 111 + - uid: 17246 components: - type: Transform - pos: -4.5,-69.5 + pos: 3.5,-330.5 parent: 2 -- proto: AirlockEngineeringGlass +- proto: AirlockEngineeringGlassLocked entities: - uid: 112 components: - type: Transform pos: -3.5,-248.5 parent: 2 -- proto: AirlockEngineeringGlassLocked - entities: - uid: 113 components: - type: Transform @@ -6964,32 +8097,6 @@ entities: - type: Transform pos: -7.5,-36.5 parent: 2 -- proto: AirlockExternalGlassAtmosphericsLocked - entities: - - uid: 143 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -19.5,-265.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 1 - - type: DeviceLinkSource - linkedPorts: - 144: - - DoorStatus: DoorBolt - - uid: 144 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -21.5,-265.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 1 - - type: DeviceLinkSource - linkedPorts: - 143: - - DoorStatus: DoorBolt - proto: AirlockExternalGlassCargoLocked entities: - uid: 145 @@ -7269,401 +8376,128 @@ entities: rot: 1.5707963267948966 rad pos: 22.5,-312.5 parent: 2 -- proto: AirlockHatchMaintenance - entities: - - uid: 187 + - uid: 17259 components: - type: Transform - pos: 0.5,-53.5 + pos: 0.5,-320.5 parent: 2 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 16522: - - DoorStatus: Close - 16533: - - DoorStatus: Close - - uid: 188 + - uid: 17260 components: - type: Transform - pos: 0.5,-26.5 + pos: 0.5,-328.5 parent: 2 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 16510: - - DoorStatus: Close - 16534: - - DoorStatus: Close - - uid: 189 + - uid: 17261 components: - type: Transform - pos: 0.5,-18.5 + pos: 0.5,-296.5 parent: 2 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 16510: - - DoorStatus: Close - 16534: - - DoorStatus: Close - - uid: 190 + - uid: 17262 components: - type: Transform - pos: 0.5,-45.5 + pos: 0.5,-288.5 parent: 2 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 16533: - - DoorStatus: Close - 16522: - - DoorStatus: Close - - uid: 191 + - uid: 17263 components: - type: Transform - pos: 0.5,-72.5 + pos: 0.5,-269.5 parent: 2 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 16525: - - DoorStatus: Close - 16535: - - DoorStatus: Close - - uid: 192 + - uid: 17264 components: - type: Transform - pos: 0.5,-80.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 16525: - - DoorStatus: Close - 16535: - - DoorStatus: Close - - uid: 193 - components: - - type: Transform - pos: 0.5,-99.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 16530: - - DoorStatus: Close - 16536: - - DoorStatus: Close - - uid: 194 - components: - - type: Transform - pos: 0.5,-107.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 16536: - - DoorStatus: Close - 16530: - - DoorStatus: Close - - uid: 195 - components: - - type: Transform - pos: 0.5,-126.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 3 - - type: DeviceLinkSource - linkedPorts: - 16537: - - DoorStatus: Close - 16523: - - DoorStatus: Close - - uid: 196 - components: - - type: Transform - pos: 0.5,-134.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 16537: - - DoorStatus: Close - 16523: - - DoorStatus: Close - 195: - - DoorStatus: Close - - uid: 197 - components: - - type: Transform - rot: 3.141592653589793 rad pos: 0.5,-261.5 parent: 2 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 16540: - - DoorStatus: Close - 16541: - - DoorStatus: Close - - uid: 198 - components: - - type: Transform - pos: 0.5,-153.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 16531: - - DoorStatus: Close - 16538: - - DoorStatus: Close - - uid: 199 - components: - - type: Transform - pos: 0.5,-20.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 16510: - - DoorStatus: DoorBolt - 16534: - - DoorStatus: DoorBolt - - uid: 200 - components: - - type: Transform - pos: 0.5,-24.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 16510: - - DoorStatus: DoorBolt - 16534: - - DoorStatus: DoorBolt - - uid: 201 - components: - - type: Transform - pos: 0.5,-105.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 16530: - - DoorStatus: DoorBolt - 16536: - - DoorStatus: DoorBolt - - uid: 202 - components: - - type: Transform - pos: 0.5,-186.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 4 - - type: DeviceLinkSource - linkedPorts: - 16524: - - DoorStatus: DoorBolt - 16511: - - DoorStatus: DoorBolt - - uid: 203 - components: - - type: Transform - pos: 0.5,-161.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 16538: - - DoorStatus: Close - 16531: - - DoorStatus: Close - - uid: 204 - components: - - type: Transform - pos: 0.5,-188.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 16524: - - DoorStatus: Close - 16511: - - DoorStatus: Close - - uid: 205 - components: - - type: Transform - pos: 0.5,-180.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 16524: - - DoorStatus: Close - 16511: - - DoorStatus: Close - - uid: 206 - components: - - type: Transform - pos: 0.5,-215.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 16513: - - DoorStatus: Close - 16512: - - DoorStatus: Close - - uid: 207 - components: - - type: Transform - pos: 0.5,-207.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 16513: - - DoorStatus: Close - 16512: - - DoorStatus: Close - - uid: 208 + - uid: 17265 components: - type: Transform pos: 0.5,-242.5 parent: 2 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 16539: - - DoorStatus: Close - 16532: - - DoorStatus: Close - - uid: 209 + - uid: 17266 components: - type: Transform pos: 0.5,-234.5 parent: 2 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 16539: - - DoorStatus: Close - 16532: - - DoorStatus: Close - - uid: 210 + - uid: 17267 components: - type: Transform - pos: 0.5,-74.5 + pos: 0.5,-215.5 parent: 2 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 16535: - - DoorStatus: DoorBolt - 16525: - - DoorStatus: DoorBolt - - uid: 211 + - uid: 17268 components: - type: Transform - pos: 0.5,-78.5 + pos: 0.5,-207.5 parent: 2 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 16535: - - DoorStatus: DoorBolt - 16525: - - DoorStatus: DoorBolt - - uid: 212 + - uid: 17269 components: - type: Transform - pos: 0.5,-182.5 + pos: 0.5,-188.5 parent: 2 - - type: DeviceLinkSink - invokeCounter: 3 - - type: DeviceLinkSource - linkedPorts: - 16511: - - DoorStatus: DoorBolt - 16524: - - DoorStatus: DoorBolt - - uid: 213 + - uid: 17270 components: - type: Transform - pos: 0.5,-159.5 + pos: 0.5,-180.5 parent: 2 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 16531: - - DoorStatus: DoorBolt - 16538: - - DoorStatus: DoorBolt - - uid: 214 + - uid: 17271 components: - type: Transform - pos: 0.5,-263.5 + pos: 0.5,-161.5 parent: 2 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 16540: - - DoorStatus: DoorBolt - 16541: - - DoorStatus: DoorBolt - - uid: 215 + - uid: 17272 components: - type: Transform - pos: 0.5,-240.5 + pos: 0.5,-153.5 parent: 2 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 16539: - - DoorStatus: DoorBolt - 16532: - - DoorStatus: DoorBolt - - uid: 216 + - uid: 17273 components: - type: Transform - pos: 0.5,-326.5 + pos: 0.5,-134.5 parent: 2 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 16528: - - DoorStatus: DoorBolt - 16516: - - DoorStatus: DoorBolt + - uid: 17274 + components: + - type: Transform + pos: 0.5,-126.5 + parent: 2 + - uid: 17275 + components: + - type: Transform + pos: 0.5,-107.5 + parent: 2 + - uid: 17276 + components: + - type: Transform + pos: 0.5,-99.5 + parent: 2 + - uid: 17277 + components: + - type: Transform + pos: 0.5,-80.5 + parent: 2 + - uid: 17278 + components: + - type: Transform + pos: 0.5,-72.5 + parent: 2 + - uid: 17279 + components: + - type: Transform + pos: 0.5,-53.5 + parent: 2 + - uid: 17280 + components: + - type: Transform + pos: 0.5,-45.5 + parent: 2 + - uid: 17281 + components: + - type: Transform + pos: 0.5,-26.5 + parent: 2 + - uid: 17282 + components: + - type: Transform + pos: 0.5,-18.5 + parent: 2 +- proto: AirlockHatchMaintenance + entities: - uid: 217 components: - type: Transform @@ -7679,244 +8513,6 @@ entities: - type: Transform pos: 15.5,-155.5 parent: 2 - - uid: 220 - components: - - type: Transform - pos: 0.5,-132.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 16523: - - DoorStatus: DoorBolt - 16537: - - DoorStatus: DoorBolt - - uid: 221 - components: - - type: Transform - pos: 0.5,-47.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 16533: - - DoorStatus: DoorBolt - 16522: - - DoorStatus: DoorBolt - - uid: 222 - components: - - type: Transform - pos: 0.5,-213.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 16513: - - DoorStatus: DoorBolt - 16512: - - DoorStatus: DoorBolt - - uid: 223 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 0.5,-269.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 3 - - type: DeviceLinkSource - linkedPorts: - 16540: - - DoorStatus: Close - 16541: - - DoorStatus: Close - - uid: 224 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 0.5,-288.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 16526: - - DoorStatus: Close - 16527: - - DoorStatus: Close - - uid: 225 - components: - - type: Transform - pos: 0.5,-290.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 16526: - - DoorStatus: DoorBolt - 16527: - - DoorStatus: DoorBolt - - uid: 226 - components: - - type: Transform - pos: 0.5,-296.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 16527: - - DoorStatus: Close - 16526: - - DoorStatus: Close - - uid: 227 - components: - - type: Transform - pos: 0.5,-155.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 16531: - - DoorStatus: DoorBolt - 16538: - - DoorStatus: DoorBolt - - uid: 228 - components: - - type: Transform - pos: 0.5,-128.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 3 - - type: DeviceLinkSource - linkedPorts: - 16523: - - DoorStatus: DoorBolt - 16537: - - DoorStatus: DoorBolt - - uid: 229 - components: - - type: Transform - pos: 0.5,-101.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 16530: - - DoorStatus: DoorBolt - 16536: - - DoorStatus: DoorBolt - - uid: 230 - components: - - type: Transform - pos: 0.5,-51.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 16522: - - DoorStatus: DoorBolt - 16533: - - DoorStatus: DoorBolt - - uid: 231 - components: - - type: Transform - pos: 0.5,-209.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 16513: - - DoorStatus: DoorBolt - 16512: - - DoorStatus: DoorBolt - - uid: 232 - components: - - type: Transform - pos: 0.5,-236.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 16539: - - DoorStatus: DoorBolt - 16532: - - DoorStatus: DoorBolt - - uid: 233 - components: - - type: Transform - pos: 0.5,-267.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 16541: - - DoorStatus: DoorBolt - 16540: - - DoorStatus: DoorBolt - - uid: 234 - components: - - type: Transform - pos: 0.5,-294.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 16527: - - DoorStatus: DoorBolt - 16526: - - DoorStatus: DoorBolt - - uid: 235 - components: - - type: Transform - pos: 0.5,-322.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 16528: - - DoorStatus: DoorBolt - 16516: - - DoorStatus: DoorBolt - - uid: 236 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 0.5,-320.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 16528: - - DoorStatus: Close - 16516: - - DoorStatus: Close - - uid: 237 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 0.5,-328.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 2 - - type: DeviceLinkSource - linkedPorts: - 16516: - - DoorStatus: Close - 16528: - - DoorStatus: Close - uid: 238 components: - type: Transform @@ -7977,10 +8573,11 @@ entities: parent: 2 - proto: AirlockLawyerLocked entities: - - uid: 246 + - uid: 253 components: - type: Transform - pos: 3.5,-330.5 + rot: -1.5707963267948966 rad + pos: -4.5,-69.5 parent: 2 - proto: AirlockMaintBarLocked entities: @@ -8022,20 +8619,6 @@ entities: - type: Transform pos: -2.5,1.5 parent: 2 -- proto: AirlockMaintDetectiveLocked - entities: - - uid: 253 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -4.5,-74.5 - parent: 2 - - type: DeviceLinkSource - linkedPorts: - 16547: - - DoorStatus: DoorBolt - 16509: - - DoorStatus: DoorBolt - proto: AirlockMaintEngiLocked entities: - uid: 254 @@ -8088,6 +8671,14 @@ entities: - type: Transform pos: 2.5,-116.5 parent: 2 +- proto: AirlockMaintLawyerLocked + entities: + - uid: 111 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,-74.5 + parent: 2 - proto: AirlockMaintLocked entities: - uid: 262 @@ -8908,6 +9499,13 @@ entities: - type: Transform pos: -5.5,-385.5 parent: 2 + - uid: 11691 + components: + - type: MetaData + name: Reporter's Room + - type: Transform + pos: -5.5,-119.5 + parent: 2 - proto: AirlockTheatreLocked entities: - uid: 377 @@ -9644,7 +10242,7 @@ entities: - 71 - proto: AltarSpawner entities: - - uid: 467 + - uid: 11643 components: - type: Transform pos: 4.5,-143.5 @@ -9950,11 +10548,11 @@ entities: rot: -1.5707963267948966 rad pos: 18.5,-84.5 parent: 2 - - uid: 519 + - uid: 10582 components: - type: Transform rot: 3.141592653589793 rad - pos: -18.5,-266.5 + pos: -12.5,-258.5 parent: 2 - proto: APCHighCapacity entities: @@ -10097,6 +10695,152 @@ entities: - type: Transform pos: 15.5,-142.5 parent: 2 +- proto: AtmosDeviceFanDirectional + entities: + - uid: 197 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-103.5 + parent: 2 + - uid: 208 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-76.5 + parent: 2 + - uid: 209 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-22.5 + parent: 2 + - uid: 214 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-103.5 + parent: 2 + - uid: 215 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-49.5 + parent: 2 + - uid: 216 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-324.5 + parent: 2 + - uid: 223 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-157.5 + parent: 2 + - uid: 224 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-184.5 + parent: 2 + - uid: 225 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-184.5 + parent: 2 + - uid: 226 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-238.5 + parent: 2 + - uid: 232 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-22.5 + parent: 2 + - uid: 233 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-157.5 + parent: 2 + - uid: 234 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-238.5 + parent: 2 + - uid: 235 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-265.5 + parent: 2 + - uid: 236 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-265.5 + parent: 2 + - uid: 237 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-324.5 + parent: 2 + - uid: 15630 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-292.5 + parent: 2 + - uid: 15639 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-211.5 + parent: 2 + - uid: 15640 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-211.5 + parent: 2 + - uid: 15657 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-292.5 + parent: 2 + - uid: 15660 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-49.5 + parent: 2 + - uid: 15708 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-76.5 + parent: 2 + - uid: 15709 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-130.5 + parent: 2 + - uid: 15710 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-130.5 + parent: 2 - proto: AtmosDeviceFanTiny entities: - uid: 544 @@ -10180,12 +10924,6 @@ entities: rot: 3.141592653589793 rad pos: -4.5,-87.5 parent: 2 - - uid: 559 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -4.5,-86.5 - parent: 2 - uid: 560 components: - type: Transform @@ -10287,110 +11025,80 @@ entities: parent: 2 - proto: AtmosFixBlockerMarker entities: - - uid: 577 + - uid: 17029 components: - type: Transform - pos: -21.5,-255.5 + pos: -23.5,-255.5 parent: 2 - - uid: 578 + - uid: 17030 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -21.5,-261.5 + pos: -24.5,-255.5 parent: 2 - - uid: 579 + - uid: 17031 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -20.5,-260.5 + pos: -25.5,-255.5 parent: 2 - - uid: 580 + - uid: 17032 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -20.5,-259.5 + pos: -25.5,-257.5 parent: 2 - - uid: 581 + - uid: 17033 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -21.5,-259.5 + pos: -24.5,-257.5 parent: 2 - - uid: 582 + - uid: 17034 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -21.5,-260.5 + pos: -23.5,-257.5 parent: 2 - - uid: 583 + - uid: 17035 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -20.5,-261.5 + pos: -23.5,-259.5 parent: 2 - - uid: 584 + - uid: 17036 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -19.5,-261.5 + pos: -24.5,-259.5 parent: 2 - - uid: 585 + - uid: 17037 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -19.5,-260.5 + pos: -25.5,-259.5 parent: 2 - - uid: 586 + - uid: 17038 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -19.5,-259.5 + pos: -25.5,-261.5 parent: 2 - - uid: 587 + - uid: 17039 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -19.5,-257.5 + pos: -24.5,-261.5 parent: 2 - - uid: 588 + - uid: 17040 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -20.5,-257.5 + pos: -23.5,-261.5 parent: 2 - - uid: 589 + - uid: 17041 components: - type: Transform - pos: -21.5,-257.5 + pos: -23.5,-263.5 parent: 2 - - uid: 590 + - uid: 17042 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -20.5,-255.5 + pos: -24.5,-263.5 parent: 2 - - uid: 591 + - uid: 17043 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -19.5,-255.5 - parent: 2 - - uid: 592 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -19.5,-253.5 - parent: 2 - - uid: 593 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -20.5,-253.5 - parent: 2 - - uid: 594 - components: - - type: Transform - pos: -21.5,-253.5 + pos: -25.5,-263.5 parent: 2 - proto: AtmosFixFreezerMarker entities: @@ -10474,25 +11182,39 @@ entities: - type: Transform pos: -2.5,-90.5 parent: 2 -- proto: AtmosFixPlasmaMarker +- proto: AtmosFixNitrogenMarker entities: - - uid: 611 + - uid: 17026 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -19.5,-251.5 + pos: -23.5,-251.5 parent: 2 - - uid: 612 + - uid: 17027 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -20.5,-251.5 + pos: -24.5,-251.5 parent: 2 - - uid: 613 + - uid: 17028 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -21.5,-251.5 + pos: -25.5,-251.5 + parent: 2 +- proto: AtmosFixOxygenMarker + entities: + - uid: 17023 + components: + - type: Transform + pos: -25.5,-253.5 + parent: 2 + - uid: 17024 + components: + - type: Transform + pos: -24.5,-253.5 + parent: 2 + - uid: 17025 + components: + - type: Transform + pos: -23.5,-253.5 parent: 2 - proto: Autolathe entities: @@ -10527,11 +11249,6 @@ entities: parent: 2 - proto: BannerCargo entities: - - uid: 619 - components: - - type: Transform - pos: -0.5,-282.5 - parent: 2 - uid: 620 components: - type: Transform @@ -10794,11 +11511,6 @@ entities: - type: Transform pos: 4.5,-64.5 parent: 2 - - uid: 668 - components: - - type: Transform - pos: -5.5,-73.5 - parent: 2 - uid: 669 components: - type: Transform @@ -10829,16 +11541,6 @@ entities: - type: Transform pos: -6.5,-115.5 parent: 2 - - uid: 675 - components: - - type: Transform - pos: -6.5,-118.5 - parent: 2 - - uid: 676 - components: - - type: Transform - pos: -8.5,-118.5 - parent: 2 - uid: 677 components: - type: Transform @@ -10936,13 +11638,6 @@ entities: - type: Transform pos: 6.5,-139.5 parent: 2 -- proto: BedsheetBrown - entities: - - uid: 697 - components: - - type: Transform - pos: -5.5,-73.5 - parent: 2 - proto: BedsheetCaptain entities: - uid: 698 @@ -11086,16 +11781,6 @@ entities: parent: 2 - proto: BedsheetSpawner entities: - - uid: 720 - components: - - type: Transform - pos: -8.5,-118.5 - parent: 2 - - uid: 721 - components: - - type: Transform - pos: -6.5,-118.5 - parent: 2 - uid: 722 components: - type: Transform @@ -11716,6 +12401,42 @@ entities: rot: 3.141592653589793 rad pos: -6.5,-60.5 parent: 2 + - uid: 4776 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-144.5 + parent: 2 + - uid: 11611 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-146.5 + parent: 2 + - uid: 11615 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,-146.5 + parent: 2 + - uid: 11621 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-145.5 + parent: 2 + - uid: 12876 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,-145.5 + parent: 2 + - uid: 12878 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,-144.5 + parent: 2 - proto: BlastDoor entities: - uid: 828 @@ -11792,6 +12513,21 @@ entities: - type: Transform pos: -4.5,-385.5 parent: 2 + - uid: 9057 + components: + - type: Transform + pos: -27.5,-268.5 + parent: 2 + - uid: 15823 + components: + - type: Transform + pos: -27.5,-267.5 + parent: 2 + - uid: 16513 + components: + - type: Transform + pos: -27.5,-269.5 + parent: 2 - proto: BlastDoorOpen entities: - uid: 842 @@ -11903,42 +12639,6 @@ entities: - type: Transform pos: -2.34363,-175.13622 parent: 2 -- proto: BookAtmosAirAlarms - entities: - - uid: 863 - components: - - type: Transform - parent: 862 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: BookAtmosDistro - entities: - - uid: 864 - components: - - type: Transform - parent: 862 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: BookAtmosVentsMore - entities: - - uid: 865 - components: - - type: Transform - parent: 862 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: BookAtmosWaste - entities: - - uid: 866 - components: - - type: Transform - parent: 862 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: BookshelfFilled entities: - uid: 869 @@ -12006,6 +12706,13 @@ entities: - type: Transform pos: -5.5,-148.5 parent: 2 +- proto: BookSpaceLaw + entities: + - uid: 4748 + components: + - type: Transform + pos: -3.270634,-72.414474 + parent: 2 - proto: BoozeDispenser entities: - uid: 882 @@ -12014,6 +12721,11 @@ entities: rot: 3.141592653589793 rad pos: 1.5,-64.5 parent: 2 + - uid: 12168 + components: + - type: Transform + pos: -12.5,-251.5 + parent: 2 - proto: BorgCharger entities: - uid: 883 @@ -12077,11 +12789,6 @@ entities: - type: Transform pos: 6.7308598,-6.9109907 parent: 2 - - uid: 892 - components: - - type: Transform - pos: 4.492667,-332.38788 - parent: 2 - proto: BoxFolderBlue entities: - uid: 893 @@ -12101,13 +12808,6 @@ entities: - type: Transform pos: 2.4827733,-42.50757 parent: 2 -- proto: BoxFolderGrey - entities: - - uid: 896 - components: - - type: Transform - pos: 5.4435487,-332.5595 - parent: 2 - proto: BoxFolderRed entities: - uid: 897 @@ -12130,11 +12830,6 @@ entities: - type: Transform pos: 1.4750745,-67.40666 parent: 2 - - uid: 901 - components: - - type: Transform - pos: 4.703974,-332.5463 - parent: 2 - uid: 902 components: - type: Transform @@ -12146,13 +12841,6 @@ entities: - type: Transform pos: -6.6729684,-339.83936 parent: 2 -- proto: BoxFolderWhite - entities: - - uid: 904 - components: - - type: Transform - pos: 5.205828,-332.4011 - parent: 2 - proto: BoxFolderYellow entities: - uid: 905 @@ -12249,10 +12937,10 @@ entities: parent: 2 - proto: BriefcaseBrownFilled entities: - - uid: 920 + - uid: 12694 components: - type: Transform - pos: 4.4794602,-328.2291 + pos: -5.5219617,-71.09076 parent: 2 - proto: BrigTimer entities: @@ -12344,18 +13032,23 @@ entities: - type: Transform pos: -5.7254634,-38.660492 parent: 2 - - uid: 933 - components: - - type: Transform - parent: 932 - - type: Physics - canCollide: False - - type: InsideEntityStorage - uid: 936 components: - type: Transform pos: -4.342669,-374.57834 parent: 2 + - uid: 16541 + components: + - type: Transform + pos: -8.672086,-88.5724 + parent: 2 +- proto: ButtonFrameCaution + entities: + - uid: 10103 + components: + - type: Transform + pos: -22.5,-266.5 + parent: 2 - proto: ButtonFrameCautionSecurity entities: - uid: 937 @@ -12365,6 +13058,111 @@ entities: parent: 2 - proto: CableApcExtension entities: + - uid: 187 + components: + - type: Transform + pos: -18.5,-260.5 + parent: 2 + - uid: 188 + components: + - type: Transform + pos: -20.5,-252.5 + parent: 2 + - uid: 189 + components: + - type: Transform + pos: -20.5,-253.5 + parent: 2 + - uid: 190 + components: + - type: Transform + pos: -18.5,-265.5 + parent: 2 + - uid: 191 + components: + - type: Transform + pos: -18.5,-259.5 + parent: 2 + - uid: 192 + components: + - type: Transform + pos: -18.5,-254.5 + parent: 2 + - uid: 193 + components: + - type: Transform + pos: -18.5,-255.5 + parent: 2 + - uid: 194 + components: + - type: Transform + pos: -15.5,-257.5 + parent: 2 + - uid: 199 + components: + - type: Transform + pos: -20.5,-254.5 + parent: 2 + - uid: 200 + components: + - type: Transform + pos: -20.5,-251.5 + parent: 2 + - uid: 201 + components: + - type: Transform + pos: -16.5,-257.5 + parent: 2 + - uid: 210 + components: + - type: Transform + pos: -18.5,-258.5 + parent: 2 + - uid: 211 + components: + - type: Transform + pos: -18.5,-253.5 + parent: 2 + - uid: 221 + components: + - type: Transform + pos: -18.5,-264.5 + parent: 2 + - uid: 229 + components: + - type: Transform + pos: -18.5,-256.5 + parent: 2 + - uid: 230 + components: + - type: Transform + pos: -18.5,-261.5 + parent: 2 + - uid: 668 + components: + - type: Transform + pos: -20.5,-263.5 + parent: 2 + - uid: 697 + components: + - type: Transform + pos: -20.5,-264.5 + parent: 2 + - uid: 863 + components: + - type: Transform + pos: -12.5,-257.5 + parent: 2 + - uid: 865 + components: + - type: Transform + pos: -12.5,-256.5 + parent: 2 + - uid: 867 + components: + - type: Transform + pos: -12.5,-254.5 + parent: 2 - uid: 938 components: - type: Transform @@ -12515,11 +13313,6 @@ entities: - type: Transform pos: 0.5,-24.5 parent: 2 - - uid: 968 - components: - - type: Transform - pos: -17.5,-252.5 - parent: 2 - uid: 969 components: - type: Transform @@ -20750,11 +21543,6 @@ entities: - type: Transform pos: -2.5,-330.5 parent: 2 - - uid: 2615 - components: - - type: Transform - pos: -17.5,-256.5 - parent: 2 - uid: 2616 components: - type: Transform @@ -22210,11 +22998,6 @@ entities: - type: Transform pos: -4.5,-243.5 parent: 2 - - uid: 2907 - components: - - type: Transform - pos: -16.5,-255.5 - parent: 2 - uid: 2908 components: - type: Transform @@ -22805,121 +23588,11 @@ entities: - type: Transform pos: 5.5,-264.5 parent: 2 - - uid: 3026 - components: - - type: Transform - pos: -16.5,-265.5 - parent: 2 - - uid: 3027 - components: - - type: Transform - pos: -18.5,-265.5 - parent: 2 - - uid: 3028 - components: - - type: Transform - pos: -18.5,-266.5 - parent: 2 - - uid: 3029 - components: - - type: Transform - pos: -19.5,-265.5 - parent: 2 - - uid: 3030 - components: - - type: Transform - pos: -20.5,-265.5 - parent: 2 - - uid: 3031 - components: - - type: Transform - pos: -21.5,-265.5 - parent: 2 - uid: 3032 components: - type: Transform pos: -11.5,-248.5 parent: 2 - - uid: 3033 - components: - - type: Transform - pos: -16.5,-262.5 - parent: 2 - - uid: 3034 - components: - - type: Transform - pos: -17.5,-265.5 - parent: 2 - - uid: 3035 - components: - - type: Transform - pos: -16.5,-264.5 - parent: 2 - - uid: 3036 - components: - - type: Transform - pos: -16.5,-263.5 - parent: 2 - - uid: 3037 - components: - - type: Transform - pos: -16.5,-261.5 - parent: 2 - - uid: 3038 - components: - - type: Transform - pos: -16.5,-260.5 - parent: 2 - - uid: 3039 - components: - - type: Transform - pos: -16.5,-259.5 - parent: 2 - - uid: 3040 - components: - - type: Transform - pos: -16.5,-258.5 - parent: 2 - - uid: 3041 - components: - - type: Transform - pos: -16.5,-257.5 - parent: 2 - - uid: 3042 - components: - - type: Transform - pos: -16.5,-256.5 - parent: 2 - - uid: 3043 - components: - - type: Transform - pos: -16.5,-254.5 - parent: 2 - - uid: 3044 - components: - - type: Transform - pos: -16.5,-253.5 - parent: 2 - - uid: 3045 - components: - - type: Transform - pos: -16.5,-252.5 - parent: 2 - - uid: 3046 - components: - - type: Transform - pos: -18.5,-256.5 - parent: 2 - - uid: 3047 - components: - - type: Transform - pos: -16.5,-251.5 - parent: 2 - - uid: 3048 - components: - - type: Transform - pos: -19.5,-256.5 - parent: 2 - uid: 3049 components: - type: Transform @@ -23040,61 +23713,6 @@ entities: - type: Transform pos: -10.5,-260.5 parent: 2 - - uid: 3073 - components: - - type: Transform - pos: -20.5,-256.5 - parent: 2 - - uid: 3074 - components: - - type: Transform - pos: -21.5,-256.5 - parent: 2 - - uid: 3075 - components: - - type: Transform - pos: -17.5,-263.5 - parent: 2 - - uid: 3076 - components: - - type: Transform - pos: -18.5,-263.5 - parent: 2 - - uid: 3077 - components: - - type: Transform - pos: -19.5,-263.5 - parent: 2 - - uid: 3078 - components: - - type: Transform - pos: -20.5,-263.5 - parent: 2 - - uid: 3079 - components: - - type: Transform - pos: -21.5,-263.5 - parent: 2 - - uid: 3080 - components: - - type: Transform - pos: -18.5,-252.5 - parent: 2 - - uid: 3081 - components: - - type: Transform - pos: -19.5,-252.5 - parent: 2 - - uid: 3082 - components: - - type: Transform - pos: -20.5,-252.5 - parent: 2 - - uid: 3083 - components: - - type: Transform - pos: -21.5,-252.5 - parent: 2 - uid: 3084 components: - type: Transform @@ -23120,15 +23738,378 @@ entities: - type: Transform pos: -12.5,-243.5 parent: 2 -- proto: CableApcStack - entities: - - uid: 934 + - uid: 4761 components: - type: Transform - parent: 932 - - type: Physics - canCollide: False - - type: InsideEntityStorage + pos: -20.5,-262.5 + parent: 2 + - uid: 4762 + components: + - type: Transform + pos: -23.5,-263.5 + parent: 2 + - uid: 4768 + components: + - type: Transform + pos: -21.5,-263.5 + parent: 2 + - uid: 4769 + components: + - type: Transform + pos: -22.5,-263.5 + parent: 2 + - uid: 10166 + components: + - type: Transform + pos: -20.5,-257.5 + parent: 2 + - uid: 10200 + components: + - type: Transform + pos: -14.5,-257.5 + parent: 2 + - uid: 10575 + components: + - type: Transform + pos: -24.5,-263.5 + parent: 2 + - uid: 10589 + components: + - type: Transform + pos: -20.5,-260.5 + parent: 2 + - uid: 10593 + components: + - type: Transform + pos: -20.5,-258.5 + parent: 2 + - uid: 10594 + components: + - type: Transform + pos: -12.5,-252.5 + parent: 2 + - uid: 10601 + components: + - type: Transform + pos: -13.5,-257.5 + parent: 2 + - uid: 10603 + components: + - type: Transform + pos: -20.5,-259.5 + parent: 2 + - uid: 12861 + components: + - type: Transform + pos: -20.5,-261.5 + parent: 2 + - uid: 12927 + components: + - type: Transform + pos: -12.5,-255.5 + parent: 2 + - uid: 12957 + components: + - type: Transform + pos: -12.5,-253.5 + parent: 2 + - uid: 12961 + components: + - type: Transform + pos: -12.5,-258.5 + parent: 2 + - uid: 12962 + components: + - type: Transform + pos: -20.5,-255.5 + parent: 2 + - uid: 13002 + components: + - type: Transform + pos: -20.5,-256.5 + parent: 2 + - uid: 15048 + components: + - type: Transform + pos: -20.5,-249.5 + parent: 2 + - uid: 15635 + components: + - type: Transform + pos: -18.5,-263.5 + parent: 2 + - uid: 15638 + components: + - type: Transform + pos: -19.5,-252.5 + parent: 2 + - uid: 15658 + components: + - type: Transform + pos: -18.5,-257.5 + parent: 2 + - uid: 15663 + components: + - type: Transform + pos: -18.5,-262.5 + parent: 2 + - uid: 15665 + components: + - type: Transform + pos: -20.5,-250.5 + parent: 2 + - uid: 15667 + components: + - type: Transform + pos: -18.5,-252.5 + parent: 2 + - uid: 15689 + components: + - type: Transform + pos: -17.5,-257.5 + parent: 2 + - uid: 16527 + components: + - type: Transform + pos: 8.5,-252.5 + parent: 2 + - uid: 16528 + components: + - type: Transform + pos: 9.5,-252.5 + parent: 2 + - uid: 16530 + components: + - type: Transform + pos: 10.5,-252.5 + parent: 2 + - uid: 16531 + components: + - type: Transform + pos: 11.5,-252.5 + parent: 2 + - uid: 16577 + components: + - type: Transform + pos: -21.5,-261.5 + parent: 2 + - uid: 16579 + components: + - type: Transform + pos: -22.5,-261.5 + parent: 2 + - uid: 16580 + components: + - type: Transform + pos: -23.5,-261.5 + parent: 2 + - uid: 16581 + components: + - type: Transform + pos: -24.5,-261.5 + parent: 2 + - uid: 16582 + components: + - type: Transform + pos: -21.5,-259.5 + parent: 2 + - uid: 16591 + components: + - type: Transform + pos: -22.5,-259.5 + parent: 2 + - uid: 16592 + components: + - type: Transform + pos: -23.5,-259.5 + parent: 2 + - uid: 16593 + components: + - type: Transform + pos: -24.5,-259.5 + parent: 2 + - uid: 16594 + components: + - type: Transform + pos: -21.5,-257.5 + parent: 2 + - uid: 16595 + components: + - type: Transform + pos: -22.5,-257.5 + parent: 2 + - uid: 16596 + components: + - type: Transform + pos: -23.5,-257.5 + parent: 2 + - uid: 16597 + components: + - type: Transform + pos: -24.5,-257.5 + parent: 2 + - uid: 16598 + components: + - type: Transform + pos: -21.5,-255.5 + parent: 2 + - uid: 16599 + components: + - type: Transform + pos: -22.5,-255.5 + parent: 2 + - uid: 16605 + components: + - type: Transform + pos: -23.5,-255.5 + parent: 2 + - uid: 16606 + components: + - type: Transform + pos: -24.5,-255.5 + parent: 2 + - uid: 16607 + components: + - type: Transform + pos: -21.5,-253.5 + parent: 2 + - uid: 16608 + components: + - type: Transform + pos: -22.5,-253.5 + parent: 2 + - uid: 16609 + components: + - type: Transform + pos: -23.5,-253.5 + parent: 2 + - uid: 16610 + components: + - type: Transform + pos: -24.5,-253.5 + parent: 2 + - uid: 16611 + components: + - type: Transform + pos: -21.5,-251.5 + parent: 2 + - uid: 16612 + components: + - type: Transform + pos: -22.5,-251.5 + parent: 2 + - uid: 16613 + components: + - type: Transform + pos: -23.5,-251.5 + parent: 2 + - uid: 16964 + components: + - type: Transform + pos: -24.5,-251.5 + parent: 2 + - uid: 16977 + components: + - type: Transform + pos: -18.5,-251.5 + parent: 2 + - uid: 16978 + components: + - type: Transform + pos: -17.5,-251.5 + parent: 2 + - uid: 16979 + components: + - type: Transform + pos: -16.5,-251.5 + parent: 2 + - uid: 16980 + components: + - type: Transform + pos: -15.5,-251.5 + parent: 2 + - uid: 17051 + components: + - type: Transform + pos: -17.5,-264.5 + parent: 2 + - uid: 17052 + components: + - type: Transform + pos: -16.5,-264.5 + parent: 2 + - uid: 17053 + components: + - type: Transform + pos: -15.5,-264.5 + parent: 2 + - uid: 17054 + components: + - type: Transform + pos: -14.5,-264.5 + parent: 2 + - uid: 17055 + components: + - type: Transform + pos: -13.5,-264.5 + parent: 2 + - uid: 17056 + components: + - type: Transform + pos: -12.5,-264.5 + parent: 2 + - uid: 17072 + components: + - type: Transform + pos: -18.5,-266.5 + parent: 2 + - uid: 17073 + components: + - type: Transform + pos: -18.5,-267.5 + parent: 2 + - uid: 17074 + components: + - type: Transform + pos: -18.5,-268.5 + parent: 2 + - uid: 17075 + components: + - type: Transform + pos: -19.5,-268.5 + parent: 2 + - uid: 17076 + components: + - type: Transform + pos: -20.5,-268.5 + parent: 2 + - uid: 17077 + components: + - type: Transform + pos: -21.5,-268.5 + parent: 2 + - uid: 17078 + components: + - type: Transform + pos: -22.5,-268.5 + parent: 2 + - uid: 17079 + components: + - type: Transform + pos: -23.5,-268.5 + parent: 2 + - uid: 17080 + components: + - type: Transform + pos: -24.5,-268.5 + parent: 2 + - uid: 17081 + components: + - type: Transform + pos: -25.5,-268.5 + parent: 2 +- proto: CableApcStack + entities: - uid: 3089 components: - type: Transform @@ -23167,11 +24148,6 @@ entities: - type: Transform pos: -3.5,-82.5 parent: 2 - - uid: 3096 - components: - - type: Transform - pos: -12.5,-251.5 - parent: 2 - uid: 3097 components: - type: Transform @@ -23182,36 +24158,6 @@ entities: - type: Transform pos: 3.5,-346.5 parent: 2 - - uid: 3099 - components: - - type: Transform - pos: -12.5,-257.5 - parent: 2 - - uid: 3100 - components: - - type: Transform - pos: -13.5,-251.5 - parent: 2 - - uid: 3101 - components: - - type: Transform - pos: -15.5,-251.5 - parent: 2 - - uid: 3102 - components: - - type: Transform - pos: -14.5,-251.5 - parent: 2 - - uid: 3103 - components: - - type: Transform - pos: -11.5,-253.5 - parent: 2 - - uid: 3104 - components: - - type: Transform - pos: -11.5,-251.5 - parent: 2 - uid: 3105 components: - type: Transform @@ -23262,21 +24208,11 @@ entities: - type: Transform pos: -10.5,-260.5 parent: 2 - - uid: 3115 - components: - - type: Transform - pos: -13.5,-257.5 - parent: 2 - uid: 3116 components: - type: Transform pos: -13.5,-258.5 parent: 2 - - uid: 3117 - components: - - type: Transform - pos: -13.5,-259.5 - parent: 2 - uid: 3118 components: - type: Transform @@ -23292,11 +24228,6 @@ entities: - type: Transform pos: -11.5,-260.5 parent: 2 - - uid: 3121 - components: - - type: Transform - pos: -11.5,-252.5 - parent: 2 - uid: 3122 components: - type: Transform @@ -25877,31 +26808,11 @@ entities: - type: Transform pos: -6.5,-165.5 parent: 2 - - uid: 3638 - components: - - type: Transform - pos: -11.5,-256.5 - parent: 2 - - uid: 3639 - components: - - type: Transform - pos: -11.5,-257.5 - parent: 2 - uid: 3640 components: - type: Transform pos: 13.5,-255.5 parent: 2 - - uid: 3641 - components: - - type: Transform - pos: -11.5,-255.5 - parent: 2 - - uid: 3642 - components: - - type: Transform - pos: -11.5,-254.5 - parent: 2 - uid: 3643 components: - type: Transform @@ -27442,21 +28353,6 @@ entities: - type: Transform pos: 19.5,-255.5 parent: 2 - - uid: 3951 - components: - - type: Transform - pos: -15.5,-250.5 - parent: 2 - - uid: 3952 - components: - - type: Transform - pos: -15.5,-249.5 - parent: 2 - - uid: 3953 - components: - - type: Transform - pos: -15.5,-248.5 - parent: 2 - uid: 3954 components: - type: Transform @@ -27479,15 +28375,23 @@ entities: - type: Transform pos: -2.0963848,-7.519528 parent: 2 - - uid: 3959 - components: - - type: Transform - parent: 3958 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: CableMV entities: + - uid: 73 + components: + - type: Transform + pos: -12.5,-257.5 + parent: 2 + - uid: 864 + components: + - type: Transform + pos: -13.5,-251.5 + parent: 2 + - uid: 866 + components: + - type: Transform + pos: -13.5,-252.5 + parent: 2 - uid: 3962 components: - type: Transform @@ -27553,16 +28457,6 @@ entities: - type: Transform pos: 1.5,-360.5 parent: 2 - - uid: 3975 - components: - - type: Transform - pos: -12.5,-252.5 - parent: 2 - - uid: 3976 - components: - - type: Transform - pos: -11.5,-252.5 - parent: 2 - uid: 3977 components: - type: Transform @@ -27603,26 +28497,11 @@ entities: - type: Transform pos: 3.5,-54.5 parent: 2 - - uid: 3985 - components: - - type: Transform - pos: -14.5,-253.5 - parent: 2 - uid: 3986 components: - type: Transform pos: -2.5,-44.5 parent: 2 - - uid: 3987 - components: - - type: Transform - pos: -14.5,-251.5 - parent: 2 - - uid: 3988 - components: - - type: Transform - pos: -15.5,-251.5 - parent: 2 - uid: 3989 components: - type: Transform @@ -28828,16 +29707,6 @@ entities: - type: Transform pos: 10.5,-252.5 parent: 2 - - uid: 4230 - components: - - type: Transform - pos: -15.5,-249.5 - parent: 2 - - uid: 4231 - components: - - type: Transform - pos: -15.5,-250.5 - parent: 2 - uid: 4232 components: - type: Transform @@ -29133,11 +30002,6 @@ entities: - type: Transform pos: -3.5,-203.5 parent: 2 - - uid: 4291 - components: - - type: Transform - pos: -15.5,-248.5 - parent: 2 - uid: 4292 components: - type: Transform @@ -31028,110 +31892,60 @@ entities: - type: Transform pos: 7.5,-339.5 parent: 2 - - uid: 4670 - components: - - type: Transform - pos: -13.5,-251.5 - parent: 2 - - uid: 4671 - components: - - type: Transform - pos: -13.5,-250.5 - parent: 2 - - uid: 4672 - components: - - type: Transform - pos: -18.5,-266.5 - parent: 2 - - uid: 4673 - components: - - type: Transform - pos: -18.5,-265.5 - parent: 2 - - uid: 4674 - components: - - type: Transform - pos: -18.5,-264.5 - parent: 2 - - uid: 4675 - components: - - type: Transform - pos: -18.5,-263.5 - parent: 2 - - uid: 4676 - components: - - type: Transform - pos: -18.5,-262.5 - parent: 2 - - uid: 4677 - components: - - type: Transform - pos: -18.5,-261.5 - parent: 2 - - uid: 4678 - components: - - type: Transform - pos: -18.5,-260.5 - parent: 2 - - uid: 4679 - components: - - type: Transform - pos: -18.5,-259.5 - parent: 2 - - uid: 4680 - components: - - type: Transform - pos: -18.5,-258.5 - parent: 2 - uid: 4681 components: - type: Transform - pos: -18.5,-257.5 + pos: -15.5,-248.5 parent: 2 - - uid: 4682 + - uid: 4757 components: - type: Transform - pos: -18.5,-256.5 + pos: -15.5,-250.5 parent: 2 - - uid: 4683 + - uid: 8511 components: - type: Transform - pos: -18.5,-255.5 + pos: -13.5,-257.5 parent: 2 - - uid: 4684 - components: - - type: Transform - pos: -18.5,-254.5 - parent: 2 - - uid: 4685 - components: - - type: Transform - pos: -17.5,-254.5 - parent: 2 - - uid: 4686 - components: - - type: Transform - pos: -16.5,-254.5 - parent: 2 - - uid: 4687 - components: - - type: Transform - pos: -15.5,-254.5 - parent: 2 - - uid: 4688 - components: - - type: Transform - pos: -14.5,-254.5 - parent: 2 - - uid: 4689 + - uid: 8543 components: - type: Transform pos: -13.5,-253.5 parent: 2 - - uid: 4690 + - uid: 10588 components: - type: Transform - pos: -13.5,-252.5 + pos: -12.5,-258.5 + parent: 2 + - uid: 10605 + components: + - type: Transform + pos: -15.5,-249.5 + parent: 2 + - uid: 10606 + components: + - type: Transform + pos: -13.5,-254.5 + parent: 2 + - uid: 11302 + components: + - type: Transform + pos: -13.5,-256.5 + parent: 2 + - uid: 11307 + components: + - type: Transform + pos: -13.5,-255.5 + parent: 2 + - uid: 13717 + components: + - type: Transform + pos: -13.5,-250.5 + parent: 2 + - uid: 13928 + components: + - type: Transform + pos: -14.5,-250.5 parent: 2 - proto: CableMVStack entities: @@ -31150,21 +31964,8 @@ entities: - type: Transform pos: -2.1301281,-7.3508615 parent: 2 - - uid: 4695 - components: - - type: Transform - parent: 4694 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: CableTerminal entities: - - uid: 4698 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -12.5,-251.5 - parent: 2 - uid: 4699 components: - type: Transform @@ -31306,11 +32107,6 @@ entities: parent: 2 - proto: CarbonDioxideCanister entities: - - uid: 4723 - components: - - type: Transform - pos: -21.5,-253.5 - parent: 2 - uid: 4724 components: - type: Transform @@ -31326,6 +32122,11 @@ entities: - type: Transform pos: 4.5,-355.5 parent: 2 + - uid: 13772 + components: + - type: Transform + pos: -25.5,-255.5 + parent: 2 - proto: Carpet entities: - uid: 4727 @@ -31364,12 +32165,6 @@ entities: rot: 3.141592653589793 rad pos: -4.5,-116.5 parent: 2 - - uid: 4733 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -4.5,-117.5 - parent: 2 - uid: 4734 components: - type: Transform @@ -31412,12 +32207,6 @@ entities: rot: 3.141592653589793 rad pos: -4.5,-124.5 parent: 2 - - uid: 4741 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -4.5,-125.5 - parent: 2 - uid: 4742 components: - type: Transform @@ -31454,12 +32243,6 @@ entities: rot: 3.141592653589793 rad pos: -3.5,-116.5 parent: 2 - - uid: 4748 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -3.5,-117.5 - parent: 2 - uid: 4749 components: - type: Transform @@ -31508,39 +32291,12 @@ entities: rot: 3.141592653589793 rad pos: -4.5,-110.5 parent: 2 - - uid: 4757 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -4.5,-109.5 - parent: 2 - - uid: 4758 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -3.5,-109.5 - parent: 2 - uid: 4759 components: - type: Transform rot: 3.141592653589793 rad pos: -3.5,-110.5 parent: 2 - - uid: 4760 - components: - - type: Transform - pos: -2.5,-110.5 - parent: 2 - - uid: 4761 - components: - - type: Transform - pos: -2.5,-109.5 - parent: 2 - - uid: 4762 - components: - - type: Transform - pos: -3.5,-125.5 - parent: 2 - uid: 4763 components: - type: Transform @@ -31566,17 +32322,6 @@ entities: - type: Transform pos: 4.5,-123.5 parent: 2 - - uid: 4768 - components: - - type: Transform - pos: -3.5,-125.5 - parent: 2 - - uid: 4769 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -2.5,-111.5 - parent: 2 - proto: CarpetBlack entities: - uid: 4770 @@ -31615,16 +32360,6 @@ entities: rot: 3.141592653589793 rad pos: 5.5,-12.5 parent: 2 - - uid: 4776 - components: - - type: Transform - pos: -5.5,-72.5 - parent: 2 - - uid: 4777 - components: - - type: Transform - pos: -5.5,-73.5 - parent: 2 - uid: 4778 components: - type: Transform @@ -31871,42 +32606,6 @@ entities: - type: Transform pos: 17.5,-74.5 parent: 2 - - uid: 4827 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,-73.5 - parent: 2 - - uid: 4828 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,-72.5 - parent: 2 - - uid: 4829 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -3.5,-72.5 - parent: 2 - - uid: 4830 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -3.5,-73.5 - parent: 2 - - uid: 4831 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -4.5,-73.5 - parent: 2 - - uid: 4832 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -4.5,-72.5 - parent: 2 - proto: CarpetBlue entities: - uid: 4833 @@ -32010,6 +32709,132 @@ entities: - type: Transform pos: -1.5,-11.5 parent: 2 +- proto: CarpetChapel + entities: + - uid: 4682 + components: + - type: Transform + pos: 2.5,-146.5 + parent: 2 + - uid: 4683 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,-146.5 + parent: 2 + - uid: 4684 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-145.5 + parent: 2 + - uid: 4685 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5,-145.5 + parent: 2 + - uid: 4686 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,-145.5 + parent: 2 + - uid: 4687 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,-144.5 + parent: 2 + - uid: 4688 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,-146.5 + parent: 2 + - uid: 4689 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-145.5 + parent: 2 + - uid: 4690 + components: + - type: Transform + pos: 5.5,-146.5 + parent: 2 + - uid: 4694 + components: + - type: Transform + pos: 3.5,-144.5 + parent: 2 + - uid: 17339 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,-142.5 + parent: 2 + - uid: 17340 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,-142.5 + parent: 2 + - uid: 17341 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,-144.5 + parent: 2 + - uid: 17342 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-142.5 + parent: 2 + - uid: 17343 + components: + - type: Transform + pos: 6.5,-144.5 + parent: 2 + - uid: 17344 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-142.5 + parent: 2 +- proto: CarpetCyan + entities: + - uid: 246 + components: + - type: Transform + pos: -3.5,-72.5 + parent: 2 + - uid: 5221 + components: + - type: Transform + pos: -4.5,-71.5 + parent: 2 + - uid: 10602 + components: + - type: Transform + pos: -2.5,-72.5 + parent: 2 + - uid: 12958 + components: + - type: Transform + pos: -4.5,-72.5 + parent: 2 + - uid: 12959 + components: + - type: Transform + pos: -2.5,-71.5 + parent: 2 + - uid: 13005 + components: + - type: Transform + pos: -3.5,-71.5 + parent: 2 - proto: CarpetOrange entities: - uid: 4851 @@ -33948,6 +34773,76 @@ entities: - type: Transform pos: -6.5,-164.5 parent: 2 + - uid: 17090 + components: + - type: Transform + pos: -21.5,-264.5 + parent: 2 + - uid: 17091 + components: + - type: Transform + pos: -21.5,-263.5 + parent: 2 + - uid: 17092 + components: + - type: Transform + pos: -21.5,-262.5 + parent: 2 + - uid: 17093 + components: + - type: Transform + pos: -21.5,-261.5 + parent: 2 + - uid: 17094 + components: + - type: Transform + pos: -21.5,-260.5 + parent: 2 + - uid: 17095 + components: + - type: Transform + pos: -21.5,-259.5 + parent: 2 + - uid: 17096 + components: + - type: Transform + pos: -21.5,-258.5 + parent: 2 + - uid: 17097 + components: + - type: Transform + pos: -21.5,-257.5 + parent: 2 + - uid: 17098 + components: + - type: Transform + pos: -21.5,-256.5 + parent: 2 + - uid: 17099 + components: + - type: Transform + pos: -21.5,-255.5 + parent: 2 + - uid: 17100 + components: + - type: Transform + pos: -21.5,-254.5 + parent: 2 + - uid: 17101 + components: + - type: Transform + pos: -21.5,-253.5 + parent: 2 + - uid: 17102 + components: + - type: Transform + pos: -21.5,-252.5 + parent: 2 + - uid: 17103 + components: + - type: Transform + pos: -21.5,-251.5 + parent: 2 - proto: Chair entities: - uid: 5203 @@ -34054,14 +34949,6 @@ entities: rot: -1.5707963267948966 rad pos: -6.5,-146.5 parent: 2 -- proto: ChairCursed - entities: - - uid: 5221 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,-145.5 - parent: 2 - proto: ChairFolding entities: - uid: 5222 @@ -34087,12 +34974,6 @@ entities: rot: 3.141592653589793 rad pos: 7.5,-57.5 parent: 2 - - uid: 5226 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -17.5,-262.5 - parent: 2 - uid: 5227 components: - type: Transform @@ -34170,18 +35051,6 @@ entities: - type: Transform pos: 3.5,-272.5 parent: 2 - - uid: 5240 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,-329.5 - parent: 2 - - uid: 5241 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 5.5,-331.5 - parent: 2 - uid: 5242 components: - type: Transform @@ -34200,11 +35069,10 @@ entities: rot: 3.141592653589793 rad pos: 2.5,-371.5 parent: 2 - - uid: 5245 + - uid: 13771 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -4.5,-72.5 + pos: -12.4766035,-253.40614 parent: 2 - proto: ChairOfficeLight entities: @@ -34338,36 +35206,6 @@ entities: rot: 1.5707963267948966 rad pos: 0.5,-58.5 parent: 2 - - uid: 5267 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,-146.5 - parent: 2 - - uid: 5268 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,-144.5 - parent: 2 - - uid: 5269 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 2.5,-146.5 - parent: 2 - - uid: 5270 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 2.5,-145.5 - parent: 2 - - uid: 5271 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 2.5,-144.5 - parent: 2 - uid: 5272 components: - type: Transform @@ -34392,6 +35230,17 @@ entities: rot: 1.5707963267948966 rad pos: -4.5,-58.5 parent: 2 + - uid: 17256 + components: + - type: Transform + pos: 6.065539,-329.53363 + parent: 2 + - uid: 17257 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.987414,-331.4555 + parent: 2 - proto: CheapRollerBedSpawnFolded entities: - uid: 5276 @@ -34818,107 +35667,6 @@ entities: - 627 - 625 - 628 -- proto: ClosetWallAtmospherics - entities: - - uid: 862 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -20.5,-266.5 - parent: 2 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 93.465614 - moles: - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 865 - - 868 - - 864 - - 863 - - 867 - - 866 - - uid: 932 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -17.5,-266.5 - parent: 2 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 75.31249 - moles: - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 933 - - 934 - - 935 - - uid: 3958 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -15.5,-266.5 - parent: 2 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 3960 - - 3961 - - 3959 - - uid: 4694 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -16.5,-266.5 - parent: 2 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 4696 - - 4695 - - 4697 - proto: ClosetWallEmergencyFilledRandom entities: - uid: 5343 @@ -35783,13 +36531,6 @@ entities: - type: Transform pos: 16.43729,-78.522385 parent: 2 -- proto: ClothingHeadHatShrineMaidenWig - entities: - - uid: 5459 - components: - - type: Transform - pos: 2.5369916,-142.75755 - parent: 2 - proto: ClothingHeadHatSurgcapPurple entities: - uid: 5460 @@ -35825,15 +36566,6 @@ entities: - type: Transform pos: 8.351893,-250.58353 parent: 2 -- proto: ClothingHeadHelmetAtmosFire - entities: - - uid: 867 - components: - - type: Transform - parent: 862 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: ClothingHeadHelmetMerc entities: - uid: 5465 @@ -35859,13 +36591,6 @@ entities: - type: InsideEntityStorage - proto: ClothingMaskGasAtmos entities: - - uid: 4696 - components: - - type: Transform - parent: 4694 - - type: Physics - canCollide: False - - type: InsideEntityStorage - uid: 5477 components: - type: Transform @@ -35950,13 +36675,6 @@ entities: rot: -1.5707963267948966 rad pos: -8.379782,-122.33475 parent: 2 -- proto: ClothingNeckStoleChaplain - entities: - - uid: 5492 - components: - - type: Transform - pos: 6.5223746,-143.07793 - parent: 2 - proto: ClothingNeckTieSci entities: - uid: 5493 @@ -35964,22 +36682,6 @@ entities: - type: Transform pos: 10.437636,-200.83151 parent: 2 -- proto: ClothingOuterSuitAtmosFire - entities: - - uid: 868 - components: - - type: Transform - parent: 862 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: ClothingOuterSuitShrineMaiden - entities: - - uid: 5494 - components: - - type: Transform - pos: 2.4225328,-143.14482 - parent: 2 - proto: ClothingOuterVestWebMerc entities: - uid: 5495 @@ -36164,6 +36866,22 @@ entities: parent: 2 - proto: ComfyChair entities: + - uid: 4696 + components: + - type: Transform + pos: -2.5,-71.5 + parent: 2 + - uid: 4733 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-73.5 + parent: 2 + - uid: 4741 + components: + - type: Transform + pos: -3.5,-71.5 + parent: 2 - uid: 5521 components: - type: Transform @@ -36212,6 +36930,12 @@ entities: - type: Transform pos: -5.5,-334.5 parent: 2 + - uid: 8643 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -11.5,-253.5 + parent: 2 - proto: ComputerAnalysisConsole entities: - uid: 5529 @@ -36297,11 +37021,11 @@ entities: - type: Transform pos: -6.5,-335.5 parent: 2 - - uid: 5541 + - uid: 17251 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -2.5,-72.5 + rot: 3.141592653589793 rad + pos: 4.5,-332.5 parent: 2 - proto: ComputerId entities: @@ -36319,6 +37043,12 @@ entities: parent: 2 - proto: ComputerMassMedia entities: + - uid: 676 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,-119.5 + parent: 2 - uid: 5544 components: - type: Transform @@ -36451,17 +37181,18 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,0.5 parent: 2 - - uid: 5564 - components: - - type: Transform - pos: -3.5,-70.5 - parent: 2 - uid: 5565 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,-364.5 parent: 2 + - uid: 17250 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,-332.5 + parent: 2 - proto: ComputerSurveillanceCameraMonitor entities: - uid: 5566 @@ -36474,19 +37205,39 @@ entities: - type: Transform pos: 23.5,-315.5 parent: 2 - - uid: 5568 + - uid: 17249 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -2.5,-71.5 + rot: 3.141592653589793 rad + pos: 6.5,-332.5 parent: 2 - proto: ComputerTelevision entities: + - uid: 619 + components: + - type: Transform + pos: 3.5,-86.5 + parent: 2 + - uid: 5226 + components: + - type: Transform + pos: 1.5,-364.5 + parent: 2 - uid: 5569 components: - type: Transform pos: -2.5,-61.5 parent: 2 + - uid: 11612 + components: + - type: Transform + pos: 2.5,-338.5 + parent: 2 + - uid: 11694 + components: + - type: Transform + pos: -0.5,-216.5 + parent: 2 - proto: ContainmentFieldGenerator entities: - uid: 5570 @@ -36998,16 +37749,6 @@ entities: parent: 2 - proto: CrystalCyan entities: - - uid: 5639 - components: - - type: Transform - pos: 2.5,-141.5 - parent: 2 - - uid: 5640 - components: - - type: Transform - pos: 6.5,-141.5 - parent: 2 - uid: 5641 components: - type: Transform @@ -37143,6 +37884,13 @@ entities: - type: Transform pos: -6.5,-315.5 parent: 2 +- proto: DefaultStationBeaconAtmospherics + entities: + - uid: 17009 + components: + - type: Transform + pos: -16.5,-256.5 + parent: 2 - proto: DefaultStationBeaconBar entities: - uid: 5662 @@ -45388,11 +46136,6 @@ entities: - type: Transform pos: -8.5,-304.5 parent: 2 - - uid: 7127 - components: - - type: Transform - pos: -15.5,-265.5 - parent: 2 - proto: DonkpocketBoxSpawner entities: - uid: 7128 @@ -45400,16 +46143,6 @@ entities: - type: Transform pos: 7.5,-200.5 parent: 2 - - uid: 7129 - components: - - type: Transform - pos: -4.5,-286.5 - parent: 2 - - uid: 7130 - components: - - type: Transform - pos: -4.5,-286.5 - parent: 2 - uid: 7131 components: - type: Transform @@ -45537,16 +46270,6 @@ entities: - type: Transform pos: 5.6909623,-253.30362 parent: 2 - - uid: 7151 - components: - - type: Transform - pos: -3.847699,-286.55716 - parent: 2 - - uid: 7152 - components: - - type: Transform - pos: -3.7202213,-286.6471 - parent: 2 - proto: DrinkBlueCuracaoBottleFull entities: - uid: 7153 @@ -45633,6 +46356,21 @@ entities: - type: Transform pos: -1.7622352,-65.288376 parent: 2 + - uid: 9452 + components: + - type: Transform + pos: -11.3203535,-251.34364 + parent: 2 + - uid: 12247 + components: + - type: Transform + pos: -11.4922285,-251.45302 + parent: 2 + - uid: 13557 + components: + - type: Transform + pos: -11.2266035,-251.51552 + parent: 2 - proto: DrinkGoldenCup entities: - uid: 7167 @@ -45734,6 +46472,13 @@ entities: - type: Transform pos: -8.335806,-122.47121 parent: 2 +- proto: DrinkShaker + entities: + - uid: 12048 + components: + - type: Transform + pos: -11.8203535,-251.34364 + parent: 2 - proto: DrinkShotGlass entities: - uid: 7183 @@ -45823,6 +46568,11 @@ entities: - type: Transform pos: -6.2410164,-148.00874 parent: 2 + - uid: 17254 + components: + - type: Transform + pos: 6.659289,-330.15863 + parent: 2 - proto: DrinkWineBottleFull entities: - uid: 7198 @@ -45835,6 +46585,11 @@ entities: - type: Transform pos: 5.4743247,-6.6932936 parent: 2 + - uid: 11606 + components: + - type: Transform + pos: 6.685281,-141.22812 + parent: 2 - proto: DrinkWineGlass entities: - uid: 7200 @@ -46256,6 +47011,11 @@ entities: parent: 2 - proto: ExtinguisherCabinetFilled entities: + - uid: 4832 + components: + - type: Transform + pos: 1.5,-36.5 + parent: 2 - uid: 7278 components: - type: Transform @@ -46292,12 +47052,6 @@ entities: rot: 1.5707963267948966 rad pos: 2.5,-65.5 parent: 2 - - uid: 7284 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,-39.5 - parent: 2 - uid: 7285 components: - type: Transform @@ -46384,6 +47138,13 @@ entities: parent: 2 - proto: FaxMachineBase entities: + - uid: 4758 + components: + - type: Transform + pos: -5.5,-70.5 + parent: 2 + - type: FaxMachine + name: Law Office - uid: 7301 components: - type: Transform @@ -46433,13 +47194,6 @@ entities: parent: 2 - type: FaxMachine name: Research Director - - uid: 7308 - components: - - type: Transform - pos: 6.5,-331.5 - parent: 2 - - type: FaxMachine - name: Lawyer - uid: 7309 components: - type: Transform @@ -46461,10 +47215,12 @@ entities: - type: Transform pos: -3.5,-11.5 parent: 2 - - uid: 7312 +- proto: filingCabinetTallRandom + entities: + - uid: 12982 components: - type: Transform - pos: 1.5,-364.5 + pos: -5.5,-72.5 parent: 2 - proto: FireAxeCabinetFilled entities: @@ -48284,6 +49040,246 @@ entities: - type: Transform pos: -12.5,-243.5 parent: 2 + - uid: 17230 + components: + - type: Transform + pos: 0.5,-261.5 + parent: 2 + - uid: 17231 + components: + - type: Transform + pos: 0.5,-269.5 + parent: 2 + - uid: 17232 + components: + - type: Transform + pos: 0.5,-242.5 + parent: 2 + - uid: 17233 + components: + - type: Transform + pos: 0.5,-234.5 + parent: 2 + - uid: 17234 + components: + - type: Transform + pos: 0.5,-236.5 + parent: 2 + - uid: 17235 + components: + - type: Transform + pos: 0.5,-240.5 + parent: 2 + - uid: 17236 + components: + - type: Transform + pos: 0.5,-263.5 + parent: 2 + - uid: 17237 + components: + - type: Transform + pos: 0.5,-267.5 + parent: 2 + - uid: 17238 + components: + - type: Transform + pos: 0.5,-288.5 + parent: 2 + - uid: 17239 + components: + - type: Transform + pos: 0.5,-290.5 + parent: 2 + - uid: 17240 + components: + - type: Transform + pos: 0.5,-294.5 + parent: 2 + - uid: 17241 + components: + - type: Transform + pos: 0.5,-296.5 + parent: 2 + - uid: 17242 + components: + - type: Transform + pos: 0.5,-320.5 + parent: 2 + - uid: 17243 + components: + - type: Transform + pos: 0.5,-322.5 + parent: 2 + - uid: 17244 + components: + - type: Transform + pos: 0.5,-328.5 + parent: 2 + - uid: 17245 + components: + - type: Transform + pos: 0.5,-326.5 + parent: 2 + - uid: 17283 + components: + - type: Transform + pos: 0.5,-20.5 + parent: 2 + - uid: 17284 + components: + - type: Transform + pos: 0.5,-18.5 + parent: 2 + - uid: 17285 + components: + - type: Transform + pos: 0.5,-24.5 + parent: 2 + - uid: 17286 + components: + - type: Transform + pos: 0.5,-26.5 + parent: 2 + - uid: 17287 + components: + - type: Transform + pos: 0.5,-45.5 + parent: 2 + - uid: 17288 + components: + - type: Transform + pos: 0.5,-47.5 + parent: 2 + - uid: 17289 + components: + - type: Transform + pos: 0.5,-51.5 + parent: 2 + - uid: 17290 + components: + - type: Transform + pos: 0.5,-53.5 + parent: 2 + - uid: 17291 + components: + - type: Transform + pos: 0.5,-72.5 + parent: 2 + - uid: 17292 + components: + - type: Transform + pos: 0.5,-74.5 + parent: 2 + - uid: 17293 + components: + - type: Transform + pos: 0.5,-78.5 + parent: 2 + - uid: 17294 + components: + - type: Transform + pos: 0.5,-99.5 + parent: 2 + - uid: 17295 + components: + - type: Transform + pos: 0.5,-80.5 + parent: 2 + - uid: 17296 + components: + - type: Transform + pos: 0.5,-101.5 + parent: 2 + - uid: 17297 + components: + - type: Transform + pos: 0.5,-105.5 + parent: 2 + - uid: 17298 + components: + - type: Transform + pos: 0.5,-107.5 + parent: 2 + - uid: 17299 + components: + - type: Transform + pos: 0.5,-126.5 + parent: 2 + - uid: 17300 + components: + - type: Transform + pos: 0.5,-128.5 + parent: 2 + - uid: 17301 + components: + - type: Transform + pos: 0.5,-132.5 + parent: 2 + - uid: 17302 + components: + - type: Transform + pos: 0.5,-134.5 + parent: 2 + - uid: 17303 + components: + - type: Transform + pos: 0.5,-153.5 + parent: 2 + - uid: 17304 + components: + - type: Transform + pos: 0.5,-155.5 + parent: 2 + - uid: 17305 + components: + - type: Transform + pos: 0.5,-159.5 + parent: 2 + - uid: 17306 + components: + - type: Transform + pos: 0.5,-161.5 + parent: 2 + - uid: 17307 + components: + - type: Transform + pos: 0.5,-180.5 + parent: 2 + - uid: 17308 + components: + - type: Transform + pos: 0.5,-182.5 + parent: 2 + - uid: 17309 + components: + - type: Transform + pos: 0.5,-186.5 + parent: 2 + - uid: 17310 + components: + - type: Transform + pos: 0.5,-188.5 + parent: 2 + - uid: 17311 + components: + - type: Transform + pos: 0.5,-207.5 + parent: 2 + - uid: 17312 + components: + - type: Transform + pos: 0.5,-209.5 + parent: 2 + - uid: 17313 + components: + - type: Transform + pos: 0.5,-213.5 + parent: 2 + - uid: 17314 + components: + - type: Transform + pos: 0.5,-215.5 + parent: 2 - proto: Fireplace entities: - uid: 7518 @@ -48432,6 +49428,13 @@ entities: - type: Transform pos: 6.6280804,-11.907726 parent: 2 +- proto: FoodBreadPlain + entities: + - uid: 11616 + components: + - type: Transform + pos: 6.482156,-141.2125 + parent: 2 - proto: FoodBurgerBacon entities: - uid: 7534 @@ -48601,55 +49604,81 @@ entities: parent: 2 - proto: GasFilter entities: + - uid: 935 + components: + - type: Transform + pos: -19.5,-251.5 + parent: 2 + - uid: 3044 + components: + - type: Transform + pos: -19.5,-257.5 + parent: 2 + - uid: 3045 + components: + - type: Transform + pos: -19.5,-255.5 + parent: 2 + - uid: 3046 + components: + - type: Transform + pos: -19.5,-263.5 + parent: 2 + - uid: 7991 + components: + - type: Transform + pos: -19.5,-253.5 + parent: 2 + - uid: 8245 + components: + - type: Transform + pos: -19.5,-261.5 + parent: 2 + - uid: 8634 + components: + - type: Transform + pos: -19.5,-259.5 + parent: 2 - uid: 9218 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,-170.5 parent: 2 -- proto: GasFilterFlipped - entities: - - uid: 7558 - components: - - type: Transform - pos: -17.5,-257.5 - parent: 2 - - uid: 7559 - components: - - type: Transform - pos: -17.5,-253.5 - parent: 2 - - uid: 7560 - components: - - type: Transform - pos: -17.5,-255.5 - parent: 2 - - uid: 7561 - components: - - type: Transform - pos: -17.5,-251.5 - parent: 2 - proto: GasMinerCarbonDioxide entities: - - uid: 7562 + - uid: 4675 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -20.5,-253.5 + pos: -24.5,-255.5 parent: 2 - proto: GasMinerNitrogenStationLarge entities: - - uid: 7563 + - uid: 3076 components: - type: Transform - pos: -20.5,-257.5 + pos: -24.5,-251.5 parent: 2 - proto: GasMinerOxygenStationLarge entities: - - uid: 7564 + - uid: 3639 components: - type: Transform - pos: -20.5,-255.5 + pos: -24.5,-253.5 + parent: 2 +- proto: GasMinerPlasma + entities: + - uid: 3102 + components: + - type: Transform + pos: -24.5,-259.5 + parent: 2 +- proto: GasMinerWaterVapor + entities: + - uid: 11306 + components: + - type: Transform + pos: -24.5,-257.5 parent: 2 - proto: GasMixer entities: @@ -48660,34 +49689,95 @@ entities: parent: 2 - type: AtmosPipeColor color: '#FFD800FF' + - uid: 13428 + components: + - type: Transform + pos: -15.5,-254.5 + parent: 2 + - type: GasMixer + inletTwoConcentration: 0.23000002 + inletOneConcentration: 0.77 + - type: AtmosPipeColor + color: '#0335FCFF' - proto: GasOutletInjector entities: - - uid: 7566 + - uid: 2907 components: - type: Transform rot: 1.5707963267948966 rad - pos: -21.5,-257.5 + pos: -23.5,-255.5 parent: 2 - - uid: 7567 + - uid: 3029 components: - type: Transform rot: 1.5707963267948966 rad - pos: -21.5,-255.5 + pos: -23.5,-257.5 parent: 2 - - uid: 7568 + - uid: 3030 components: - type: Transform rot: 1.5707963267948966 rad - pos: -21.5,-251.5 + pos: -23.5,-259.5 parent: 2 - - uid: 7569 + - uid: 3031 components: - type: Transform rot: 1.5707963267948966 rad - pos: -21.5,-253.5 + pos: -23.5,-261.5 + parent: 2 + - uid: 3034 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -23.5,-263.5 + parent: 2 + - uid: 12506 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -23.5,-251.5 + parent: 2 + - uid: 12569 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -23.5,-253.5 parent: 2 - proto: GasPassiveVent entities: + - uid: 3035 + components: + - type: Transform + pos: -25.5,-263.5 + parent: 2 + - uid: 3036 + components: + - type: Transform + pos: -25.5,-261.5 + parent: 2 + - uid: 3037 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -21.5,-249.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 3038 + components: + - type: Transform + pos: -25.5,-259.5 + parent: 2 + - uid: 4674 + components: + - type: Transform + pos: -25.5,-257.5 + parent: 2 + - uid: 4827 + components: + - type: Transform + pos: -25.5,-253.5 + parent: 2 - uid: 7570 components: - type: Transform @@ -48720,12 +49810,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 7574 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -19.5,-253.5 - parent: 2 - uid: 7575 components: - type: Transform @@ -48758,12 +49842,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 7579 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -20.5,-260.5 - parent: 2 - uid: 7580 components: - type: Transform @@ -48804,12 +49882,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#FF0000FF' - - uid: 7585 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -19.5,-249.5 - parent: 2 - uid: 7586 components: - type: Transform @@ -48818,17 +49890,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#FF0000FF' - - uid: 7587 - components: - - type: Transform - pos: -19.5,-257.5 - parent: 2 - - uid: 7588 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -19.5,-251.5 - parent: 2 - uid: 7589 components: - type: Transform @@ -48843,16 +49904,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 7591 - components: - - type: Transform - pos: -19.5,-255.5 - parent: 2 - - uid: 7592 - components: - - type: Transform - pos: -19.5,-260.5 - parent: 2 - uid: 7593 components: - type: Transform @@ -48909,12 +49960,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 7600 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -22.5,-263.5 - parent: 2 - uid: 7601 components: - type: Transform @@ -48923,8 +49968,38 @@ entities: parent: 2 - type: AtmosPipeColor color: '#FF0000FF' + - uid: 12857 + components: + - type: Transform + pos: -25.5,-251.5 + parent: 2 + - uid: 15015 + components: + - type: Transform + pos: -25.5,-255.5 + parent: 2 + - uid: 16984 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -21.5,-265.5 + parent: 2 - proto: GasPipeBend entities: + - uid: 3976 + components: + - type: Transform + pos: -17.5,-249.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 7563 + components: + - type: Transform + pos: -14.5,-250.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 7602 components: - type: Transform @@ -48947,7 +50022,7 @@ entities: pos: -1.5,-7.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7605 components: - type: Transform @@ -48955,7 +50030,7 @@ entities: pos: -1.5,-1.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7606 components: - type: Transform @@ -48963,7 +50038,7 @@ entities: pos: 4.5,0.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7607 components: - type: Transform @@ -48979,7 +50054,7 @@ entities: pos: -3.5,0.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7609 components: - type: Transform @@ -49009,7 +50084,7 @@ entities: pos: 5.5,-57.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7613 components: - type: Transform @@ -49041,7 +50116,7 @@ entities: pos: 5.5,-18.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7617 components: - type: Transform @@ -49063,7 +50138,7 @@ entities: pos: -5.5,-88.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7622 components: - type: Transform @@ -49071,14 +50146,14 @@ entities: pos: 1.5,-125.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7623 components: - type: Transform pos: 5.5,-109.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7624 components: - type: Transform @@ -49150,11 +50225,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 7633 - components: - - type: Transform - pos: -17.5,-249.5 - parent: 2 - uid: 7634 components: - type: Transform @@ -49168,7 +50238,7 @@ entities: pos: 16.5,-243.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 7636 components: - type: Transform @@ -49176,7 +50246,7 @@ entities: pos: -2.5,-261.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 7637 components: - type: Transform @@ -49197,7 +50267,7 @@ entities: pos: 5.5,-175.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7640 components: - type: Transform @@ -49231,31 +50301,19 @@ entities: pos: 4.5,-2.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7645 components: - type: Transform pos: 17.5,-262.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' - - uid: 7646 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -19.5,-250.5 - parent: 2 + color: '#FF1212FF' - uid: 7647 components: - type: Transform pos: -18.5,-243.5 parent: 2 - - uid: 7648 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -19.5,-258.5 - parent: 2 - uid: 7649 components: - type: Transform @@ -49263,13 +50321,7 @@ entities: pos: 17.5,-243.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 7650 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -19.5,-256.5 - parent: 2 + color: '#0335FCFF' - uid: 7651 components: - type: Transform @@ -49277,7 +50329,7 @@ entities: pos: -9.5,-259.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 7652 components: - type: Transform @@ -49285,7 +50337,7 @@ entities: pos: -3.5,-244.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 7653 components: - type: Transform @@ -49293,7 +50345,7 @@ entities: pos: 16.5,-262.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 7654 components: - type: Transform @@ -49301,13 +50353,7 @@ entities: pos: 4.5,-244.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' - - uid: 7655 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -19.5,-261.5 - parent: 2 + color: '#FF1212FF' - uid: 7656 components: - type: Transform @@ -49320,7 +50366,7 @@ entities: pos: 5.5,-17.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7658 components: - type: Transform @@ -49342,7 +50388,7 @@ entities: pos: 7.5,-328.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7661 components: - type: Transform @@ -49382,7 +50428,7 @@ entities: pos: 7.5,-347.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7666 components: - type: Transform @@ -49414,7 +50460,7 @@ entities: pos: 7.5,-311.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7670 components: - type: Transform @@ -49461,7 +50507,7 @@ entities: pos: -5.5,-327.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7676 components: - type: Transform @@ -49469,7 +50515,7 @@ entities: pos: -5.5,-328.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7677 components: - type: Transform @@ -49477,7 +50523,7 @@ entities: pos: -6.5,-328.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7678 components: - type: Transform @@ -49485,7 +50531,7 @@ entities: pos: -6.5,-347.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7679 components: - type: Transform @@ -49501,7 +50547,7 @@ entities: pos: 1.5,-360.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7681 components: - type: Transform @@ -49517,7 +50563,7 @@ entities: pos: 6.5,-90.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7683 components: - type: Transform @@ -49526,12 +50572,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 7684 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -17.5,-263.5 - parent: 2 - uid: 7685 components: - type: Transform @@ -49563,12 +50603,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#FF0000FF' - - uid: 7689 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -19.5,-252.5 - parent: 2 - uid: 7690 components: - type: Transform @@ -49576,7 +50610,7 @@ entities: pos: -4.5,-27.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7691 components: - type: Transform @@ -49584,7 +50618,7 @@ entities: pos: 5.5,-27.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7692 components: - type: Transform @@ -49592,14 +50626,14 @@ entities: pos: 5.5,-81.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7693 components: - type: Transform pos: -3.5,-106.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7694 components: - type: Transform @@ -49607,7 +50641,7 @@ entities: pos: -4.5,-106.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7695 components: - type: Transform @@ -49615,7 +50649,7 @@ entities: pos: 8.5,-138.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7696 components: - type: Transform @@ -49623,7 +50657,7 @@ entities: pos: -4.5,-189.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7697 components: - type: Transform @@ -49631,14 +50665,14 @@ entities: pos: 5.5,-190.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7698 components: - type: Transform pos: 5.5,-189.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7699 components: - type: Transform @@ -49646,21 +50680,21 @@ entities: pos: -4.5,-163.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7700 components: - type: Transform pos: 5.5,-152.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7701 components: - type: Transform pos: 5.5,-287.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7702 components: - type: Transform @@ -49683,7 +50717,13 @@ entities: pos: -3.5,-360.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' + - uid: 7990 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -19.5,-250.5 + parent: 2 - uid: 8124 components: - type: Transform @@ -49691,24 +50731,105 @@ entities: pos: -6.5,-124.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8138 components: - type: Transform pos: -2.5,-169.5 parent: 2 + - uid: 8623 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -14.5,-259.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 9221 components: - type: Transform rot: 3.141592653589793 rad pos: -4.5,-170.5 parent: 2 + - uid: 10208 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -25.5,-258.5 + parent: 2 + - uid: 10212 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -25.5,-264.5 + parent: 2 + - uid: 10574 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -25.5,-256.5 + parent: 2 + - uid: 12858 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -25.5,-262.5 + parent: 2 + - uid: 12859 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -25.5,-260.5 + parent: 2 + - uid: 12860 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -25.5,-254.5 + parent: 2 + - uid: 13295 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -25.5,-252.5 + parent: 2 + - uid: 13351 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -15.5,-260.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 13452 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -18.5,-253.5 + parent: 2 - uid: 13633 components: - type: Transform rot: -1.5707963267948966 rad pos: -1.5,-170.5 parent: 2 + - uid: 13770 + components: + - type: Transform + pos: -15.5,-252.5 + parent: 2 + - uid: 14818 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -18.5,-255.5 + parent: 2 + - uid: 16982 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -19.5,-265.5 + parent: 2 - proto: GasPipeFourway entities: - uid: 7705 @@ -49724,21 +50845,21 @@ entities: pos: 1.5,-7.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7707 components: - type: Transform pos: 1.5,-1.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7708 components: - type: Transform pos: 0.5,-62.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7709 components: - type: Transform @@ -49752,7 +50873,7 @@ entities: pos: 0.5,-27.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7711 components: - type: Transform @@ -49766,28 +50887,28 @@ entities: pos: 0.5,-81.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7713 components: - type: Transform pos: 0.5,-88.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7714 components: - type: Transform pos: 0.5,-96.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7715 components: - type: Transform pos: 1.5,-116.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7716 components: - type: Transform @@ -49808,28 +50929,28 @@ entities: pos: 0.5,-175.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7719 components: - type: Transform pos: 0.5,-152.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7720 components: - type: Transform pos: 0.5,-219.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7721 components: - type: Transform pos: 0.5,-189.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7722 components: - type: Transform @@ -49843,7 +50964,7 @@ entities: pos: 0.5,-230.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7724 components: - type: Transform @@ -49864,28 +50985,28 @@ entities: pos: 0.5,-163.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7727 components: - type: Transform pos: 0.5,-287.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7728 components: - type: Transform pos: 0.5,-243.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7729 components: - type: Transform pos: 0.5,-202.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7730 components: - type: Transform @@ -49899,7 +51020,7 @@ entities: pos: 0.5,-260.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7732 components: - type: Transform @@ -49913,28 +51034,28 @@ entities: pos: 0.5,-68.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7734 components: - type: Transform pos: 0.5,-197.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7735 components: - type: Transform pos: -3.5,-366.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7736 components: - type: Transform pos: 17.5,-248.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7737 components: - type: Transform @@ -49955,7 +51076,7 @@ entities: pos: 0.5,-347.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7740 components: - type: Transform @@ -49990,29 +51111,417 @@ entities: pos: 4.5,-366.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7745 components: - type: Transform pos: 1.5,-366.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - proto: GasPipeStraight entities: + - uid: 519 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -24.5,-264.5 + parent: 2 + - uid: 577 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -24.5,-252.5 + parent: 2 + - uid: 578 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -22.5,-254.5 + parent: 2 + - uid: 579 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -22.5,-251.5 + parent: 2 + - uid: 580 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -22.5,-253.5 + parent: 2 + - uid: 581 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -23.5,-254.5 + parent: 2 + - uid: 582 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -24.5,-254.5 + parent: 2 + - uid: 583 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -22.5,-255.5 + parent: 2 + - uid: 584 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -22.5,-257.5 + parent: 2 + - uid: 585 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -22.5,-259.5 + parent: 2 + - uid: 586 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -22.5,-261.5 + parent: 2 + - uid: 587 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -22.5,-263.5 + parent: 2 + - uid: 588 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -21.5,-264.5 + parent: 2 + - uid: 589 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -22.5,-256.5 + parent: 2 + - uid: 590 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -23.5,-252.5 + parent: 2 + - uid: 591 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -22.5,-252.5 + parent: 2 + - uid: 592 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -21.5,-263.5 + parent: 2 + - uid: 593 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -21.5,-262.5 + parent: 2 + - uid: 594 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -21.5,-261.5 + parent: 2 + - uid: 611 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -24.5,-258.5 + parent: 2 + - uid: 612 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -24.5,-256.5 + parent: 2 + - uid: 613 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -23.5,-256.5 + parent: 2 + - uid: 862 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -22.5,-258.5 + parent: 2 + - uid: 868 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -22.5,-260.5 + parent: 2 + - uid: 892 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -23.5,-262.5 + parent: 2 + - uid: 896 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -22.5,-264.5 + parent: 2 + - uid: 933 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -21.5,-252.5 + parent: 2 + - uid: 934 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -21.5,-251.5 + parent: 2 + - uid: 3040 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -20.5,-261.5 + parent: 2 + - uid: 3041 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -20.5,-259.5 + parent: 2 + - uid: 3042 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -23.5,-264.5 + parent: 2 + - uid: 3074 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -14.5,-256.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 3117 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -24.5,-260.5 + parent: 2 + - uid: 4673 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -22.5,-262.5 + parent: 2 + - uid: 4679 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -23.5,-260.5 + parent: 2 + - uid: 5268 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -20.5,-264.5 + parent: 2 + - uid: 5269 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -20.5,-253.5 + parent: 2 + - uid: 5270 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -20.5,-260.5 + parent: 2 + - uid: 5271 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -20.5,-251.5 + parent: 2 + - uid: 5459 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -20.5,-258.5 + parent: 2 + - uid: 5492 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -14.5,-258.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 5541 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -14.5,-254.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 5564 + components: + - type: Transform + pos: -19.5,-258.5 + parent: 2 + - uid: 5639 + components: + - type: Transform + pos: -19.5,-252.5 + parent: 2 + - uid: 5640 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -14.5,-255.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 7127 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -20.5,-255.5 + parent: 2 + - uid: 7129 + components: + - type: Transform + pos: -19.5,-260.5 + parent: 2 + - uid: 7130 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -20.5,-262.5 + parent: 2 + - uid: 7284 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -20.5,-252.5 + parent: 2 + - uid: 7308 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -20.5,-257.5 + parent: 2 + - uid: 7559 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -14.5,-251.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 7566 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -14.5,-257.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 7567 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -19.5,-249.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 7568 + components: + - type: Transform + pos: -19.5,-264.5 + parent: 2 + - uid: 7569 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -20.5,-249.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 7585 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -14.5,-253.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 7587 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -14.5,-252.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 7591 + components: + - type: Transform + pos: -19.5,-262.5 + parent: 2 + - uid: 7592 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -15.5,-250.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 7618 components: - type: Transform rot: 3.141592653589793 rad pos: -3.5,-171.5 parent: 2 + - uid: 7650 + components: + - type: Transform + pos: -19.5,-254.5 + parent: 2 + - uid: 7684 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -20.5,-256.5 + parent: 2 + - uid: 7689 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -20.5,-254.5 + parent: 2 - uid: 7746 components: - type: Transform pos: 1.5,-359.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7747 components: - type: Transform @@ -50331,7 +51840,7 @@ entities: pos: 0.5,-18.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7787 components: - type: Transform @@ -50339,7 +51848,7 @@ entities: pos: 0.5,-20.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7788 components: - type: Transform @@ -50347,7 +51856,7 @@ entities: pos: -0.5,-17.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7789 components: - type: Transform @@ -50355,7 +51864,7 @@ entities: pos: -1.5,-17.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7790 components: - type: Transform @@ -50363,7 +51872,7 @@ entities: pos: -2.5,-17.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7791 components: - type: Transform @@ -50371,7 +51880,7 @@ entities: pos: 1.5,-15.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7792 components: - type: Transform @@ -50379,7 +51888,7 @@ entities: pos: 1.5,-14.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7793 components: - type: Transform @@ -50387,7 +51896,7 @@ entities: pos: 1.5,-13.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7794 components: - type: Transform @@ -50395,7 +51904,7 @@ entities: pos: 1.5,-11.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7795 components: - type: Transform @@ -50403,7 +51912,7 @@ entities: pos: 2.5,-17.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7796 components: - type: Transform @@ -50411,7 +51920,7 @@ entities: pos: 3.5,-17.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7797 components: - type: Transform @@ -50419,21 +51928,21 @@ entities: pos: 4.5,-17.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7798 components: - type: Transform pos: 1.5,-9.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7799 components: - type: Transform pos: 1.5,-8.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7800 components: - type: Transform @@ -50441,7 +51950,7 @@ entities: pos: 0.5,-7.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7801 components: - type: Transform @@ -50449,7 +51958,7 @@ entities: pos: 0.5,-1.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7802 components: - type: Transform @@ -50457,7 +51966,7 @@ entities: pos: -0.5,-1.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7803 components: - type: Transform @@ -50465,7 +51974,7 @@ entities: pos: -0.5,-7.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7804 components: - type: Transform @@ -50473,7 +51982,7 @@ entities: pos: 1.5,-6.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7805 components: - type: Transform @@ -50481,7 +51990,7 @@ entities: pos: 1.5,-5.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7806 components: - type: Transform @@ -50489,7 +51998,7 @@ entities: pos: 1.5,-4.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7807 components: - type: Transform @@ -50497,7 +52006,7 @@ entities: pos: 1.5,-3.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7808 components: - type: Transform @@ -50505,7 +52014,7 @@ entities: pos: 1.5,-2.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7809 components: - type: Transform @@ -50513,7 +52022,7 @@ entities: pos: 2.5,-1.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7810 components: - type: Transform @@ -50521,7 +52030,7 @@ entities: pos: 3.5,-1.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7811 components: - type: Transform @@ -50529,7 +52038,7 @@ entities: pos: 4.5,-0.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7812 components: - type: Transform @@ -50537,7 +52046,7 @@ entities: pos: 1.5,-0.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7813 components: - type: Transform @@ -50545,7 +52054,7 @@ entities: pos: 0.5,0.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7814 components: - type: Transform @@ -50553,7 +52062,7 @@ entities: pos: -1.5,0.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7815 components: - type: Transform @@ -50561,7 +52070,7 @@ entities: pos: -2.5,0.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7816 components: - type: Transform @@ -50577,7 +52086,7 @@ entities: pos: -0.5,-54.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7818 components: - type: Transform @@ -50607,21 +52116,21 @@ entities: pos: 0.5,-228.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7822 components: - type: Transform pos: 0.5,-24.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7823 components: - type: Transform pos: 0.5,-26.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7824 components: - type: Transform @@ -50644,14 +52153,14 @@ entities: pos: 0.5,-28.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7827 components: - type: Transform pos: 0.5,-29.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7828 components: - type: Transform @@ -50666,7 +52175,7 @@ entities: pos: 0.5,-32.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7830 components: - type: Transform @@ -50674,98 +52183,98 @@ entities: pos: -0.5,0.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7831 components: - type: Transform pos: 0.5,-35.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7832 components: - type: Transform pos: 0.5,-36.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7833 components: - type: Transform pos: 0.5,-37.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7834 components: - type: Transform pos: 0.5,-38.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7835 components: - type: Transform pos: 0.5,-39.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7836 components: - type: Transform pos: 0.5,-41.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7837 components: - type: Transform pos: 0.5,-43.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7838 components: - type: Transform pos: 0.5,-44.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7839 components: - type: Transform pos: 0.5,-45.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7840 components: - type: Transform pos: 0.5,-47.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7841 components: - type: Transform pos: 0.5,-49.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7842 components: - type: Transform pos: 0.5,-51.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7843 components: - type: Transform pos: 0.5,-53.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7844 components: - type: Transform @@ -50789,7 +52298,7 @@ entities: pos: 1.5,-57.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7847 components: - type: Transform @@ -50813,7 +52322,7 @@ entities: pos: 0.5,-67.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7850 components: - type: Transform @@ -50900,7 +52409,7 @@ entities: pos: 5.5,-31.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7861 components: - type: Transform @@ -50908,7 +52417,7 @@ entities: pos: 4.5,-31.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7862 components: - type: Transform @@ -50916,7 +52425,7 @@ entities: pos: 3.5,-31.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7863 components: - type: Transform @@ -50924,7 +52433,7 @@ entities: pos: 2.5,-31.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7864 components: - type: Transform @@ -50932,7 +52441,7 @@ entities: pos: 1.5,-31.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7865 components: - type: Transform @@ -50975,7 +52484,7 @@ entities: pos: -0.5,-40.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7871 components: - type: Transform @@ -50983,7 +52492,7 @@ entities: pos: -1.5,-40.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7872 components: - type: Transform @@ -50991,7 +52500,7 @@ entities: pos: -3.5,-40.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7873 components: - type: Transform @@ -50999,14 +52508,14 @@ entities: pos: -2.5,-40.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7874 components: - type: Transform pos: -4.5,-41.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7875 components: - type: Transform @@ -51142,7 +52651,7 @@ entities: pos: 1.5,-42.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7892 components: - type: Transform @@ -51150,7 +52659,7 @@ entities: pos: 2.5,-42.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7893 components: - type: Transform @@ -51158,7 +52667,7 @@ entities: pos: 3.5,-42.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7894 components: - type: Transform @@ -51166,7 +52675,7 @@ entities: pos: 4.5,-42.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7895 components: - type: Transform @@ -51245,7 +52754,7 @@ entities: pos: 0.5,-12.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7905 components: - type: Transform @@ -51269,7 +52778,7 @@ entities: pos: -1.5,-54.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7908 components: - type: Transform @@ -51285,7 +52794,7 @@ entities: pos: -2.5,-54.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7910 components: - type: Transform @@ -51293,7 +52802,7 @@ entities: pos: -3.5,-54.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7911 components: - type: Transform @@ -51325,7 +52834,7 @@ entities: pos: -4.5,-54.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7915 components: - type: Transform @@ -51404,7 +52913,7 @@ entities: pos: 0.5,-55.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7925 components: - type: Transform @@ -51412,14 +52921,14 @@ entities: pos: 2.5,-57.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7926 components: - type: Transform pos: 0.5,-58.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7927 components: - type: Transform @@ -51434,35 +52943,35 @@ entities: pos: 0.5,-60.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7929 components: - type: Transform pos: 0.5,-61.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7930 components: - type: Transform pos: 0.5,-63.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7931 components: - type: Transform pos: 0.5,-64.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7932 components: - type: Transform pos: 0.5,-65.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7933 components: - type: Transform @@ -51470,7 +52979,7 @@ entities: pos: 1.5,-62.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7934 components: - type: Transform @@ -51478,7 +52987,7 @@ entities: pos: 2.5,-62.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7935 components: - type: Transform @@ -51486,7 +52995,7 @@ entities: pos: -0.5,-62.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7936 components: - type: Transform @@ -51542,7 +53051,7 @@ entities: pos: -1.5,-12.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7943 components: - type: Transform @@ -51574,14 +53083,14 @@ entities: pos: 0.5,-69.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7947 components: - type: Transform pos: 0.5,-66.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7948 components: - type: Transform @@ -51589,7 +53098,7 @@ entities: pos: 0.5,-70.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7949 components: - type: Transform @@ -51597,7 +53106,7 @@ entities: pos: 0.5,-72.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7950 components: - type: Transform @@ -51605,7 +53114,7 @@ entities: pos: 0.5,-74.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7951 components: - type: Transform @@ -51621,7 +53130,7 @@ entities: pos: 4.5,-57.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7953 components: - type: Transform @@ -51629,7 +53138,7 @@ entities: pos: 3.5,-57.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7954 components: - type: Transform @@ -51669,7 +53178,7 @@ entities: pos: 4.5,-68.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7959 components: - type: Transform @@ -51677,7 +53186,7 @@ entities: pos: 3.5,-68.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7960 components: - type: Transform @@ -51685,7 +53194,7 @@ entities: pos: 2.5,-68.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7961 components: - type: Transform @@ -51693,7 +53202,7 @@ entities: pos: 1.5,-68.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7962 components: - type: Transform @@ -51717,7 +53226,7 @@ entities: pos: -0.5,-71.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7965 components: - type: Transform @@ -51725,7 +53234,7 @@ entities: pos: -1.5,-71.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7966 components: - type: Transform @@ -51733,7 +53242,7 @@ entities: pos: -2.5,-71.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7967 components: - type: Transform @@ -51741,7 +53250,7 @@ entities: pos: -3.5,-71.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7968 components: - type: Transform @@ -51749,14 +53258,14 @@ entities: pos: -0.5,-12.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7969 components: - type: Transform pos: 0.5,-22.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7970 components: - type: Transform @@ -51764,7 +53273,7 @@ entities: pos: 4.5,-328.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7971 components: - type: Transform @@ -51780,7 +53289,7 @@ entities: pos: -4.5,-39.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7973 components: - type: Transform @@ -51788,33 +53297,28 @@ entities: pos: 0.5,-59.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7974 components: - type: Transform pos: -4.5,-136.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7975 components: - type: Transform pos: -4.5,-134.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7976 components: - type: Transform pos: -4.5,-135.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 7977 - components: - - type: Transform - pos: -17.5,-258.5 - parent: 2 + color: '#0335FCFF' - uid: 7978 components: - type: Transform @@ -51831,11 +53335,6 @@ entities: rot: 3.141592653589793 rad pos: -16.5,-245.5 parent: 2 - - uid: 7981 - components: - - type: Transform - pos: -17.5,-250.5 - parent: 2 - uid: 7982 components: - type: Transform @@ -51847,8 +53346,7 @@ entities: - uid: 7983 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -18.5,-258.5 + pos: -19.5,-256.5 parent: 2 - uid: 7984 components: @@ -51872,14 +53370,14 @@ entities: pos: 0.5,-34.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7987 components: - type: Transform pos: -9.5,-253.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 7988 components: - type: Transform @@ -51887,29 +53385,17 @@ entities: pos: -2.5,-260.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 7989 components: - type: Transform pos: -18.5,-239.5 parent: 2 - - uid: 7990 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -19.5,-251.5 - parent: 2 - - uid: 7991 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -18.5,-253.5 - parent: 2 - uid: 7992 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -20.5,-251.5 + rot: 1.5707963267948966 rad + pos: -20.5,-263.5 parent: 2 - uid: 7993 components: @@ -52238,7 +53724,7 @@ entities: pos: 0.5,-76.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8035 components: - type: Transform @@ -52253,7 +53739,7 @@ entities: pos: 0.5,-78.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8037 components: - type: Transform @@ -52261,14 +53747,14 @@ entities: pos: 0.5,-80.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8038 components: - type: Transform pos: 0.5,-82.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8039 components: - type: Transform @@ -52276,7 +53762,7 @@ entities: pos: 1.5,-81.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8040 components: - type: Transform @@ -52284,7 +53770,7 @@ entities: pos: 2.5,-81.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8041 components: - type: Transform @@ -52292,7 +53778,7 @@ entities: pos: 3.5,-81.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8042 components: - type: Transform @@ -52300,7 +53786,7 @@ entities: pos: -0.5,-81.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8043 components: - type: Transform @@ -52308,7 +53794,7 @@ entities: pos: -1.5,-81.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8044 components: - type: Transform @@ -52316,7 +53802,7 @@ entities: pos: -2.5,-81.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8045 components: - type: Transform @@ -52324,7 +53810,7 @@ entities: pos: -3.5,-81.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8046 components: - type: Transform @@ -52332,7 +53818,7 @@ entities: pos: 0.5,-83.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8047 components: - type: Transform @@ -52340,7 +53826,7 @@ entities: pos: 0.5,-84.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8048 components: - type: Transform @@ -52348,7 +53834,7 @@ entities: pos: 0.5,-85.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8049 components: - type: Transform @@ -52356,7 +53842,7 @@ entities: pos: 0.5,-86.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8050 components: - type: Transform @@ -52364,7 +53850,7 @@ entities: pos: 0.5,-87.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8051 components: - type: Transform @@ -52372,7 +53858,7 @@ entities: pos: 0.5,-89.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8052 components: - type: Transform @@ -52380,7 +53866,7 @@ entities: pos: -0.5,-88.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8053 components: - type: Transform @@ -52388,7 +53874,7 @@ entities: pos: -1.5,-88.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8054 components: - type: Transform @@ -52396,7 +53882,7 @@ entities: pos: -2.5,-88.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8055 components: - type: Transform @@ -52404,7 +53890,7 @@ entities: pos: -3.5,-88.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8056 components: - type: Transform @@ -52412,7 +53898,7 @@ entities: pos: -4.5,-88.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8057 components: - type: Transform @@ -52420,7 +53906,7 @@ entities: pos: -5.5,-87.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8058 components: - type: Transform @@ -52428,7 +53914,7 @@ entities: pos: 0.5,-92.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8059 components: - type: Transform @@ -52436,7 +53922,7 @@ entities: pos: 0.5,-93.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8060 components: - type: Transform @@ -52444,7 +53930,7 @@ entities: pos: 0.5,-95.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8061 components: - type: Transform @@ -52452,7 +53938,7 @@ entities: pos: 0.5,-94.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8062 components: - type: Transform @@ -52460,7 +53946,7 @@ entities: pos: -0.5,-91.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8063 components: - type: Transform @@ -52468,7 +53954,7 @@ entities: pos: -1.5,-91.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8064 components: - type: Transform @@ -52476,7 +53962,7 @@ entities: pos: -2.5,-96.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8065 components: - type: Transform @@ -52484,7 +53970,7 @@ entities: pos: -1.5,-96.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8066 components: - type: Transform @@ -52492,7 +53978,7 @@ entities: pos: -0.5,-96.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8067 components: - type: Transform @@ -52500,7 +53986,7 @@ entities: pos: 0.5,-97.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8068 components: - type: Transform @@ -52508,7 +53994,7 @@ entities: pos: 0.5,-98.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8069 components: - type: Transform @@ -52516,7 +54002,7 @@ entities: pos: 0.5,-99.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8070 components: - type: Transform @@ -52524,7 +54010,7 @@ entities: pos: 0.5,-101.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8071 components: - type: Transform @@ -52532,7 +54018,7 @@ entities: pos: 0.5,-103.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8072 components: - type: Transform @@ -52540,7 +54026,7 @@ entities: pos: 1.5,-96.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8073 components: - type: Transform @@ -52548,7 +54034,7 @@ entities: pos: 2.5,-96.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8074 components: - type: Transform @@ -52556,7 +54042,7 @@ entities: pos: 3.5,-96.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8075 components: - type: Transform @@ -52564,7 +54050,7 @@ entities: pos: 4.5,-96.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8076 components: - type: Transform @@ -52572,7 +54058,7 @@ entities: pos: 0.5,-105.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8077 components: - type: Transform @@ -52580,7 +54066,7 @@ entities: pos: 0.5,-107.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8078 components: - type: Transform @@ -52588,140 +54074,140 @@ entities: pos: 0.5,-108.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8079 components: - type: Transform pos: 1.5,-124.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8080 components: - type: Transform pos: 1.5,-123.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8081 components: - type: Transform pos: 1.5,-122.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8082 components: - type: Transform pos: 1.5,-121.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8083 components: - type: Transform pos: 1.5,-119.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8084 components: - type: Transform pos: 1.5,-118.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8085 components: - type: Transform pos: 1.5,-117.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8086 components: - type: Transform pos: 1.5,-115.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8087 components: - type: Transform pos: 1.5,-114.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8088 components: - type: Transform pos: 1.5,-113.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8089 components: - type: Transform pos: 1.5,-112.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8090 components: - type: Transform pos: 1.5,-111.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8091 components: - type: Transform pos: 1.5,-110.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8092 components: - type: Transform pos: 0.5,-126.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8093 components: - type: Transform pos: 0.5,-128.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8094 components: - type: Transform pos: 0.5,-130.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8095 components: - type: Transform pos: 0.5,-132.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8096 components: - type: Transform pos: 0.5,-134.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8097 components: - type: Transform pos: 0.5,-135.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8098 components: - type: Transform @@ -52729,7 +54215,7 @@ entities: pos: -3.5,-108.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8099 components: - type: Transform @@ -52737,7 +54223,7 @@ entities: pos: -5.5,-109.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8100 components: - type: Transform @@ -52745,7 +54231,7 @@ entities: pos: -4.5,-109.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8101 components: - type: Transform @@ -52753,7 +54239,7 @@ entities: pos: -1.5,-109.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8102 components: - type: Transform @@ -52761,7 +54247,7 @@ entities: pos: -2.5,-109.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8103 components: - type: Transform @@ -52769,7 +54255,7 @@ entities: pos: 2.5,-109.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8104 components: - type: Transform @@ -52777,7 +54263,7 @@ entities: pos: 4.5,-109.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8105 components: - type: Transform @@ -52785,7 +54271,7 @@ entities: pos: 2.5,-116.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8106 components: - type: Transform @@ -52793,7 +54279,7 @@ entities: pos: 3.5,-116.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8107 components: - type: Transform @@ -52801,7 +54287,7 @@ entities: pos: 4.5,-116.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8108 components: - type: Transform @@ -52809,7 +54295,7 @@ entities: pos: 5.5,-116.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8109 components: - type: Transform @@ -52817,84 +54303,84 @@ entities: pos: 6.5,-116.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8110 components: - type: Transform pos: -6.5,-110.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8111 components: - type: Transform pos: -6.5,-111.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8113 components: - type: Transform pos: -6.5,-113.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8114 components: - type: Transform pos: -6.5,-114.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8116 components: - type: Transform pos: -6.5,-116.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8117 components: - type: Transform pos: -6.5,-117.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8119 components: - type: Transform pos: -6.5,-119.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8120 components: - type: Transform pos: -6.5,-120.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8122 components: - type: Transform pos: -6.5,-122.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8123 components: - type: Transform pos: -6.5,-123.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8125 components: - type: Transform pos: 15.5,-259.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8126 components: - type: Transform @@ -52996,7 +54482,7 @@ entities: pos: 15.5,-261.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8140 components: - type: Transform @@ -53192,21 +54678,21 @@ entities: pos: -4.5,-248.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8165 components: - type: Transform pos: -9.5,-252.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8166 components: - type: Transform pos: -9.5,-251.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8167 components: - type: Transform @@ -53318,7 +54804,7 @@ entities: pos: -6.5,-260.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8181 components: - type: Transform @@ -53326,7 +54812,7 @@ entities: pos: -2.5,-248.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8182 components: - type: Transform @@ -53334,7 +54820,7 @@ entities: pos: 2.5,-138.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8183 components: - type: Transform @@ -53342,7 +54828,7 @@ entities: pos: 3.5,-138.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8184 components: - type: Transform @@ -53350,7 +54836,7 @@ entities: pos: 0.5,-168.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8185 components: - type: Transform @@ -53358,7 +54844,7 @@ entities: pos: 0.5,-200.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8186 components: - type: Transform @@ -53366,7 +54852,7 @@ entities: pos: 1.5,-138.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8187 components: - type: Transform @@ -53382,13 +54868,7 @@ entities: pos: 7.5,-138.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 8189 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -17.5,-260.5 - parent: 2 + color: '#0335FCFF' - uid: 8190 components: - type: Transform @@ -53396,7 +54876,7 @@ entities: pos: 6.5,-138.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8191 components: - type: Transform @@ -53412,7 +54892,7 @@ entities: pos: 0.5,-137.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8193 components: - type: Transform @@ -53428,7 +54908,7 @@ entities: pos: 0.5,-140.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8195 components: - type: Transform @@ -53436,7 +54916,7 @@ entities: pos: 0.5,-141.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8196 components: - type: Transform @@ -53444,7 +54924,7 @@ entities: pos: 0.5,-142.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8197 components: - type: Transform @@ -53452,7 +54932,7 @@ entities: pos: 0.5,-143.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8198 components: - type: Transform @@ -53460,7 +54940,7 @@ entities: pos: 0.5,-144.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8199 components: - type: Transform @@ -53468,7 +54948,7 @@ entities: pos: 0.5,-145.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8200 components: - type: Transform @@ -53476,7 +54956,7 @@ entities: pos: 0.5,-147.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8201 components: - type: Transform @@ -53484,7 +54964,7 @@ entities: pos: 0.5,-148.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8202 components: - type: Transform @@ -53492,7 +54972,7 @@ entities: pos: 0.5,-151.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8203 components: - type: Transform @@ -53500,7 +54980,7 @@ entities: pos: 0.5,-150.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8204 components: - type: Transform @@ -53508,7 +54988,7 @@ entities: pos: 0.5,-153.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8205 components: - type: Transform @@ -53516,7 +54996,7 @@ entities: pos: 0.5,-155.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8206 components: - type: Transform @@ -53524,7 +55004,7 @@ entities: pos: 0.5,-157.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8207 components: - type: Transform @@ -53532,7 +55012,7 @@ entities: pos: 0.5,-159.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8208 components: - type: Transform @@ -53540,7 +55020,7 @@ entities: pos: 0.5,-161.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8209 components: - type: Transform @@ -53548,7 +55028,7 @@ entities: pos: 0.5,-162.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8210 components: - type: Transform @@ -53556,7 +55036,7 @@ entities: pos: -1.5,-248.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8211 components: - type: Transform @@ -53696,7 +55176,7 @@ entities: pos: 4.5,-138.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8229 components: - type: Transform @@ -53825,12 +55305,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 8245 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -18.5,-260.5 - parent: 2 - uid: 8246 components: - type: Transform @@ -53838,7 +55312,7 @@ entities: pos: -3.5,-139.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8247 components: - type: Transform @@ -53846,7 +55320,7 @@ entities: pos: -2.5,-139.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8248 components: - type: Transform @@ -53854,7 +55328,7 @@ entities: pos: -1.5,-139.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8249 components: - type: Transform @@ -53862,7 +55336,7 @@ entities: pos: -0.5,-139.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8250 components: - type: Transform @@ -53870,14 +55344,14 @@ entities: pos: -4.5,-138.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8251 components: - type: Transform pos: -9.5,-250.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8252 components: - type: Transform @@ -53885,14 +55359,14 @@ entities: pos: -4.5,-137.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8253 components: - type: Transform pos: -4.5,-140.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8254 components: - type: Transform @@ -53907,7 +55381,7 @@ entities: pos: 1.5,-10.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8256 components: - type: Transform @@ -53922,7 +55396,7 @@ entities: pos: -4.5,-260.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8258 components: - type: Transform @@ -53938,7 +55412,7 @@ entities: pos: -1.5,-271.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8260 components: - type: Transform @@ -53946,7 +55420,7 @@ entities: pos: 0.5,-171.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8261 components: - type: Transform @@ -53954,7 +55428,7 @@ entities: pos: 0.5,-172.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8262 components: - type: Transform @@ -53962,7 +55436,7 @@ entities: pos: 0.5,-173.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8263 components: - type: Transform @@ -53970,7 +55444,7 @@ entities: pos: 0.5,-174.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8264 components: - type: Transform @@ -53978,7 +55452,7 @@ entities: pos: 0.5,-176.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8265 components: - type: Transform @@ -53986,7 +55460,7 @@ entities: pos: 0.5,-177.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8266 components: - type: Transform @@ -53994,7 +55468,7 @@ entities: pos: 0.5,-179.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8267 components: - type: Transform @@ -54002,7 +55476,7 @@ entities: pos: 0.5,-180.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8268 components: - type: Transform @@ -54010,7 +55484,7 @@ entities: pos: 0.5,-182.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8269 components: - type: Transform @@ -54018,7 +55492,7 @@ entities: pos: 0.5,-184.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8270 components: - type: Transform @@ -54026,7 +55500,7 @@ entities: pos: 0.5,-186.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8271 components: - type: Transform @@ -54034,7 +55508,7 @@ entities: pos: 0.5,-188.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8272 components: - type: Transform @@ -54042,7 +55516,7 @@ entities: pos: -0.5,-163.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8273 components: - type: Transform @@ -54116,14 +55590,14 @@ entities: pos: 15.5,-260.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8283 components: - type: Transform pos: 15.5,-262.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8284 components: - type: Transform @@ -54147,7 +55621,7 @@ entities: pos: 0.5,-164.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8287 components: - type: Transform @@ -54163,7 +55637,7 @@ entities: pos: -0.5,-152.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8289 components: - type: Transform @@ -54171,7 +55645,7 @@ entities: pos: 1.5,-88.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8290 components: - type: Transform @@ -54195,7 +55669,7 @@ entities: pos: -1.5,-152.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8293 components: - type: Transform @@ -54203,7 +55677,7 @@ entities: pos: 1.5,-152.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8294 components: - type: Transform @@ -54211,7 +55685,7 @@ entities: pos: 2.5,-152.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8295 components: - type: Transform @@ -54259,7 +55733,7 @@ entities: pos: 1.5,-146.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8301 components: - type: Transform @@ -54267,7 +55741,7 @@ entities: pos: 2.5,-146.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8302 components: - type: Transform @@ -54275,7 +55749,7 @@ entities: pos: 3.5,-146.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8303 components: - type: Transform @@ -54283,7 +55757,7 @@ entities: pos: 1.5,-149.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8304 components: - type: Transform @@ -54291,7 +55765,7 @@ entities: pos: 3.5,-149.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8305 components: - type: Transform @@ -54299,7 +55773,7 @@ entities: pos: 2.5,-149.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8306 components: - type: Transform @@ -54363,7 +55837,7 @@ entities: pos: 0.5,-217.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8314 components: - type: Transform @@ -54371,7 +55845,7 @@ entities: pos: 0.5,-218.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8315 components: - type: Transform @@ -54411,7 +55885,7 @@ entities: pos: 0.5,-213.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8320 components: - type: Transform @@ -54419,7 +55893,7 @@ entities: pos: 0.5,-207.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8321 components: - type: Transform @@ -54432,7 +55906,7 @@ entities: pos: 0.5,-196.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8323 components: - type: Transform @@ -54440,7 +55914,7 @@ entities: pos: 0.5,-193.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8324 components: - type: Transform @@ -54448,7 +55922,7 @@ entities: pos: 0.5,-206.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8325 components: - type: Transform @@ -54456,7 +55930,7 @@ entities: pos: 0.5,-190.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8326 components: - type: Transform @@ -54464,7 +55938,7 @@ entities: pos: 0.5,-191.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8327 components: - type: Transform @@ -54472,7 +55946,7 @@ entities: pos: 0.5,-204.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8328 components: - type: Transform @@ -54480,7 +55954,7 @@ entities: pos: 0.5,-203.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8329 components: - type: Transform @@ -54488,7 +55962,7 @@ entities: pos: 0.5,-209.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8330 components: - type: Transform @@ -54580,7 +56054,7 @@ entities: pos: -0.5,-189.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8341 components: - type: Transform @@ -54596,7 +56070,7 @@ entities: pos: 1.5,-202.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8343 components: - type: Transform @@ -54604,7 +56078,7 @@ entities: pos: 3.5,-205.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8344 components: - type: Transform @@ -54612,7 +56086,7 @@ entities: pos: 0.5,-195.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8345 components: - type: Transform @@ -54620,7 +56094,7 @@ entities: pos: 0.5,-192.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8346 components: - type: Transform @@ -54628,7 +56102,7 @@ entities: pos: 0.5,-211.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8347 components: - type: Transform @@ -54636,7 +56110,7 @@ entities: pos: 0.5,-220.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8348 components: - type: Transform @@ -54652,7 +56126,7 @@ entities: pos: 2.5,-205.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8350 components: - type: Transform @@ -54667,7 +56141,7 @@ entities: pos: 17.5,-244.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8352 components: - type: Transform @@ -54675,14 +56149,14 @@ entities: pos: 0.5,-198.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8353 components: - type: Transform pos: 0.5,-170.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8354 components: - type: Transform @@ -54690,7 +56164,7 @@ entities: pos: 0.5,-201.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8355 components: - type: Transform @@ -54730,7 +56204,7 @@ entities: pos: 0.5,-215.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8360 components: - type: Transform @@ -54738,7 +56212,7 @@ entities: pos: 0.5,-216.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8361 components: - type: Transform @@ -54746,7 +56220,7 @@ entities: pos: 0.5,-222.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8362 components: - type: Transform @@ -54754,7 +56228,7 @@ entities: pos: 0.5,-223.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8363 components: - type: Transform @@ -54762,7 +56236,7 @@ entities: pos: 0.5,-224.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8364 components: - type: Transform @@ -54770,7 +56244,7 @@ entities: pos: 0.5,-225.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8365 components: - type: Transform @@ -54778,7 +56252,7 @@ entities: pos: 0.5,-226.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8366 components: - type: Transform @@ -54786,7 +56260,7 @@ entities: pos: 0.5,-229.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8367 components: - type: Transform @@ -54794,7 +56268,7 @@ entities: pos: 0.5,-231.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8368 components: - type: Transform @@ -54802,7 +56276,7 @@ entities: pos: 0.5,-232.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8369 components: - type: Transform @@ -54810,7 +56284,7 @@ entities: pos: 0.5,-233.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8370 components: - type: Transform @@ -54818,7 +56292,7 @@ entities: pos: 0.5,-234.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8371 components: - type: Transform @@ -54826,7 +56300,7 @@ entities: pos: 0.5,-236.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8372 components: - type: Transform @@ -54834,7 +56308,7 @@ entities: pos: 0.5,-238.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8373 components: - type: Transform @@ -54842,7 +56316,7 @@ entities: pos: 0.5,-240.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8374 components: - type: Transform @@ -54850,7 +56324,7 @@ entities: pos: 0.5,-242.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8375 components: - type: Transform @@ -54858,7 +56332,7 @@ entities: pos: 1.5,-189.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8376 components: - type: Transform @@ -54866,7 +56340,7 @@ entities: pos: 2.5,-189.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8377 components: - type: Transform @@ -54874,7 +56348,7 @@ entities: pos: 3.5,-189.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8378 components: - type: Transform @@ -54890,7 +56364,7 @@ entities: pos: 1.5,-205.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8380 components: - type: Transform @@ -54898,7 +56372,7 @@ entities: pos: -1.5,-189.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8381 components: - type: Transform @@ -54920,7 +56394,7 @@ entities: pos: -0.5,-197.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8384 components: - type: Transform @@ -54928,7 +56402,7 @@ entities: pos: -1.5,-197.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8385 components: - type: Transform @@ -54936,21 +56410,21 @@ entities: pos: -2.5,-197.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8386 components: - type: Transform pos: 17.5,-246.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8387 components: - type: Transform pos: -4.5,-203.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8388 components: - type: Transform @@ -54958,7 +56432,7 @@ entities: pos: -3.5,-202.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8389 components: - type: Transform @@ -54966,7 +56440,7 @@ entities: pos: -2.5,-202.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8390 components: - type: Transform @@ -54974,7 +56448,7 @@ entities: pos: -1.5,-202.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8391 components: - type: Transform @@ -54982,7 +56456,7 @@ entities: pos: -0.5,-202.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8392 components: - type: Transform @@ -54990,7 +56464,7 @@ entities: pos: 1.5,-230.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8393 components: - type: Transform @@ -54998,7 +56472,7 @@ entities: pos: 2.5,-230.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8394 components: - type: Transform @@ -55006,7 +56480,7 @@ entities: pos: -0.5,-230.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8395 components: - type: Transform @@ -55014,7 +56488,7 @@ entities: pos: -1.5,-230.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8396 components: - type: Transform @@ -55022,7 +56496,7 @@ entities: pos: -0.5,-219.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8397 components: - type: Transform @@ -55030,7 +56504,7 @@ entities: pos: -1.5,-219.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8398 components: - type: Transform @@ -55038,7 +56512,7 @@ entities: pos: 1.5,-219.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8399 components: - type: Transform @@ -55046,7 +56520,7 @@ entities: pos: 2.5,-219.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8400 components: - type: Transform @@ -55150,7 +56624,7 @@ entities: pos: -2.5,-175.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8413 components: - type: Transform @@ -55158,7 +56632,7 @@ entities: pos: -0.5,-175.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8414 components: - type: Transform @@ -55166,7 +56640,7 @@ entities: pos: 1.5,-175.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8415 components: - type: Transform @@ -55174,7 +56648,7 @@ entities: pos: 2.5,-175.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8416 components: - type: Transform @@ -55257,7 +56731,7 @@ entities: pos: -5.5,-175.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8427 components: - type: Transform @@ -55265,7 +56739,7 @@ entities: pos: -3.5,-175.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8428 components: - type: Transform @@ -55273,7 +56747,7 @@ entities: pos: -4.5,-175.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8429 components: - type: Transform @@ -55281,7 +56755,7 @@ entities: pos: -1.5,-163.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8430 components: - type: Transform @@ -55289,7 +56763,7 @@ entities: pos: 1.5,-166.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8431 components: - type: Transform @@ -55297,7 +56771,7 @@ entities: pos: 2.5,-166.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8432 components: - type: Transform @@ -55313,7 +56787,7 @@ entities: pos: 1.5,-163.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8434 components: - type: Transform @@ -55321,7 +56795,7 @@ entities: pos: 2.5,-163.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8435 components: - type: Transform @@ -55353,7 +56827,7 @@ entities: pos: 4.5,-175.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8439 components: - type: Transform @@ -55361,7 +56835,7 @@ entities: pos: 5.5,-176.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8440 components: - type: Transform @@ -55370,12 +56844,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 8441 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -17.5,-260.5 - parent: 2 - uid: 8442 components: - type: Transform @@ -55479,20 +56947,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#FF0000FF' - - uid: 8455 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -13.5,-260.5 - parent: 2 - - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 8456 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -18.5,-249.5 - parent: 2 - uid: 8457 components: - type: Transform @@ -55547,35 +57001,35 @@ entities: pos: 1.5,-243.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8465 components: - type: Transform pos: 0.5,-246.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8466 components: - type: Transform pos: 0.5,-245.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8467 components: - type: Transform pos: 0.5,-252.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8468 components: - type: Transform pos: 0.5,-255.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8469 components: - type: Transform @@ -55583,28 +57037,28 @@ entities: pos: 1.5,-248.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8470 components: - type: Transform pos: 0.5,-247.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8471 components: - type: Transform pos: 0.5,-244.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8472 components: - type: Transform pos: 16.5,-252.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8473 components: - type: Transform @@ -55612,7 +57066,7 @@ entities: pos: 11.5,-248.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8474 components: - type: Transform @@ -55620,14 +57074,14 @@ entities: pos: 7.5,-256.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8475 components: - type: Transform pos: 0.5,-249.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8476 components: - type: Transform @@ -55635,21 +57089,21 @@ entities: pos: -1.5,-244.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8477 components: - type: Transform pos: -0.5,-252.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8478 components: - type: Transform pos: -0.5,-254.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8479 components: - type: Transform @@ -55657,7 +57111,7 @@ entities: pos: 12.5,-256.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8480 components: - type: Transform @@ -55665,14 +57119,14 @@ entities: pos: -6.5,-248.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8481 components: - type: Transform pos: -9.5,-249.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8482 components: - type: Transform @@ -55680,7 +57134,7 @@ entities: pos: -12.5,-259.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8483 components: - type: Transform @@ -55688,14 +57142,14 @@ entities: pos: 11.5,-256.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8484 components: - type: Transform pos: -0.5,-253.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8485 components: - type: Transform @@ -55703,14 +57157,14 @@ entities: pos: 5.5,-256.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8486 components: - type: Transform pos: -0.5,-251.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8487 components: - type: Transform @@ -55718,14 +57172,14 @@ entities: pos: -2.5,-244.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8488 components: - type: Transform pos: 0.5,-259.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8489 components: - type: Transform @@ -55733,7 +57187,7 @@ entities: pos: 8.5,-248.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8490 components: - type: Transform @@ -55741,28 +57195,28 @@ entities: pos: 7.5,-248.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8491 components: - type: Transform pos: 0.5,-257.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8492 components: - type: Transform pos: 16.5,-253.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8493 components: - type: Transform pos: 16.5,-254.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8494 components: - type: Transform @@ -55770,35 +57224,35 @@ entities: pos: 3.5,-248.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8495 components: - type: Transform pos: 0.5,-250.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8496 components: - type: Transform pos: 0.5,-254.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8497 components: - type: Transform pos: 0.5,-251.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8498 components: - type: Transform pos: 16.5,-251.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8499 components: - type: Transform @@ -55806,34 +57260,28 @@ entities: pos: -1.5,-261.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8500 components: - type: Transform pos: 15.5,-252.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 8501 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -20.5,-253.5 - parent: 2 + color: '#0335FCFF' - uid: 8502 components: - type: Transform pos: -9.5,-257.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8503 components: - type: Transform pos: -9.5,-256.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8505 components: - type: Transform @@ -55841,7 +57289,7 @@ entities: pos: 0.5,-199.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8506 components: - type: Transform @@ -55854,7 +57302,7 @@ entities: pos: 16.5,-248.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8508 components: - type: Transform @@ -55862,7 +57310,7 @@ entities: pos: -8.5,-248.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8509 components: - type: Transform @@ -55870,7 +57318,7 @@ entities: pos: -5.5,-260.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8510 components: - type: Transform @@ -55878,20 +57326,14 @@ entities: pos: -5.5,-248.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' - - uid: 8511 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -19.5,-253.5 - parent: 2 + color: '#FF1212FF' - uid: 8512 components: - type: Transform pos: 17.5,-247.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8513 components: - type: Transform @@ -55899,7 +57341,7 @@ entities: pos: 17.5,-249.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8514 components: - type: Transform @@ -55907,21 +57349,21 @@ entities: pos: -7.5,-248.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8515 components: - type: Transform pos: 0.5,-261.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8516 components: - type: Transform pos: 4.5,-257.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8517 components: - type: Transform @@ -55929,7 +57371,7 @@ entities: pos: -0.5,-259.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8518 components: - type: Transform @@ -55937,35 +57379,35 @@ entities: pos: 4.5,-248.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8519 components: - type: Transform pos: 0.5,-263.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8520 components: - type: Transform pos: 15.5,-249.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8521 components: - type: Transform pos: -0.5,-246.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8522 components: - type: Transform pos: 16.5,-255.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8523 components: - type: Transform @@ -55973,7 +57415,7 @@ entities: pos: 15.5,-256.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8524 components: - type: Transform @@ -55981,7 +57423,7 @@ entities: pos: 14.5,-248.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8525 components: - type: Transform @@ -55989,7 +57431,7 @@ entities: pos: 9.5,-248.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8526 components: - type: Transform @@ -55997,7 +57439,7 @@ entities: pos: 6.5,-248.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8527 components: - type: Transform @@ -56005,7 +57447,7 @@ entities: pos: 2.5,-248.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8528 components: - type: Transform @@ -56013,7 +57455,7 @@ entities: pos: 2.5,-243.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8529 components: - type: Transform @@ -56021,14 +57463,14 @@ entities: pos: -10.5,-260.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8530 components: - type: Transform pos: 0.5,-258.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8531 components: - type: Transform @@ -56036,14 +57478,14 @@ entities: pos: -9.5,-260.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8532 components: - type: Transform pos: 15.5,-250.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8533 components: - type: Transform @@ -56051,7 +57493,7 @@ entities: pos: 13.5,-256.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8534 components: - type: Transform @@ -56059,7 +57501,7 @@ entities: pos: 12.5,-248.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8535 components: - type: Transform @@ -56067,7 +57509,7 @@ entities: pos: -7.5,-260.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8536 components: - type: Transform @@ -56075,21 +57517,21 @@ entities: pos: -8.5,-260.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8537 components: - type: Transform pos: -9.5,-255.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8538 components: - type: Transform pos: -9.5,-254.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8539 components: - type: Transform @@ -56097,14 +57539,14 @@ entities: pos: -10.5,-259.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8540 components: - type: Transform pos: -9.5,-258.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8541 components: - type: Transform @@ -56112,19 +57554,14 @@ entities: pos: -11.5,-259.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8542 components: - type: Transform pos: 5.5,-177.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 8543 - components: - - type: Transform - pos: -17.5,-256.5 - parent: 2 + color: '#0335FCFF' - uid: 8544 components: - type: Transform @@ -56132,18 +57569,12 @@ entities: pos: -3.5,-248.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8545 components: - type: Transform pos: -15.5,-246.5 parent: 2 - - uid: 8546 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -19.5,-260.5 - parent: 2 - uid: 8548 components: - type: Transform @@ -56157,14 +57588,14 @@ entities: pos: 10.5,-249.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8550 components: - type: Transform pos: 16.5,-250.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8551 components: - type: Transform @@ -56172,7 +57603,7 @@ entities: pos: 13.5,-248.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8552 components: - type: Transform @@ -56180,42 +57611,42 @@ entities: pos: 14.5,-256.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8553 components: - type: Transform pos: 17.5,-245.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8554 components: - type: Transform pos: 16.5,-245.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8555 components: - type: Transform pos: -0.5,-245.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8556 components: - type: Transform pos: -0.5,-247.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8557 components: - type: Transform pos: -0.5,-250.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8558 components: - type: Transform @@ -56223,28 +57654,28 @@ entities: pos: 3.5,-256.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8559 components: - type: Transform pos: 4.5,-259.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8560 components: - type: Transform pos: -0.5,-260.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8561 components: - type: Transform pos: 4.5,-258.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8562 components: - type: Transform @@ -56252,7 +57683,7 @@ entities: pos: 2.5,-256.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8563 components: - type: Transform @@ -56260,7 +57691,7 @@ entities: pos: 1.5,-256.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8564 components: - type: Transform @@ -56268,21 +57699,21 @@ entities: pos: 3.5,-244.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8565 components: - type: Transform pos: 15.5,-254.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8566 components: - type: Transform pos: 15.5,-256.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8567 components: - type: Transform @@ -56290,7 +57721,7 @@ entities: pos: -1.5,-260.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8568 components: - type: Transform @@ -56298,14 +57729,14 @@ entities: pos: 0.5,-256.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8569 components: - type: Transform pos: -0.5,-257.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8570 components: - type: Transform @@ -56313,7 +57744,7 @@ entities: pos: -1.5,-243.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8571 components: - type: Transform @@ -56321,7 +57752,7 @@ entities: pos: 0.5,-244.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8572 components: - type: Transform @@ -56329,7 +57760,7 @@ entities: pos: 10.5,-255.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8573 components: - type: Transform @@ -56337,7 +57768,7 @@ entities: pos: 10.5,-250.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8574 components: - type: Transform @@ -56345,14 +57776,14 @@ entities: pos: 8.5,-256.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8575 components: - type: Transform pos: 15.5,-251.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8576 components: - type: Transform @@ -56360,7 +57791,7 @@ entities: pos: 0.5,-256.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8577 components: - type: Transform @@ -56368,7 +57799,7 @@ entities: pos: 16.5,-248.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8578 components: - type: Transform @@ -56388,14 +57819,14 @@ entities: pos: 9.5,-256.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8581 components: - type: Transform pos: -0.5,-258.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8582 components: - type: Transform @@ -56403,7 +57834,7 @@ entities: pos: 1.5,-260.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8583 components: - type: Transform @@ -56411,14 +57842,14 @@ entities: pos: 2.5,-244.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8584 components: - type: Transform pos: 15.5,-257.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8585 components: - type: Transform @@ -56426,33 +57857,28 @@ entities: pos: 10.5,-254.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8586 components: - type: Transform pos: 15.5,-253.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8587 components: - type: Transform pos: 15.5,-258.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 8588 - components: - - type: Transform - pos: -17.5,-261.5 - parent: 2 + color: '#0335FCFF' - uid: 8589 components: - type: Transform pos: -0.5,-249.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8590 components: - type: Transform @@ -56460,7 +57886,7 @@ entities: pos: 16.5,-260.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8591 components: - type: Transform @@ -56468,7 +57894,7 @@ entities: pos: 16.5,-258.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8592 components: - type: Transform @@ -56476,7 +57902,7 @@ entities: pos: -1.5,-165.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8593 components: - type: Transform @@ -56484,7 +57910,7 @@ entities: pos: -0.5,-165.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8594 components: - type: Transform @@ -56492,7 +57918,7 @@ entities: pos: 16.5,-261.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8595 components: - type: Transform @@ -56500,14 +57926,14 @@ entities: pos: -2.5,-271.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8596 components: - type: Transform pos: 0.5,-269.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8597 components: - type: Transform @@ -56515,14 +57941,14 @@ entities: pos: 16.5,-259.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8598 components: - type: Transform pos: 1.5,-243.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8599 components: - type: Transform @@ -56530,7 +57956,7 @@ entities: pos: 2.5,-260.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8600 components: - type: Transform @@ -56538,7 +57964,7 @@ entities: pos: -0.5,-260.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8601 components: - type: Transform @@ -56546,7 +57972,7 @@ entities: pos: -0.5,-243.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8602 components: - type: Transform @@ -56554,7 +57980,7 @@ entities: pos: 0.5,-265.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8603 components: - type: Transform @@ -56562,7 +57988,7 @@ entities: pos: 0.5,-267.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8604 components: - type: Transform @@ -56583,7 +58009,7 @@ entities: pos: 0.5,-270.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8607 components: - type: Transform @@ -56591,33 +58017,21 @@ entities: pos: 18.5,-248.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 8608 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -18.5,-252.5 - parent: 2 + color: '#0335FCFF' - uid: 8609 components: - type: Transform pos: 16.5,-247.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8610 components: - type: Transform pos: 16.5,-246.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' - - uid: 8611 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -17.5,-254.5 - parent: 2 + color: '#FF1212FF' - uid: 8612 components: - type: Transform @@ -56641,7 +58055,7 @@ entities: pos: -2.5,-165.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8615 components: - type: Transform @@ -56649,7 +58063,7 @@ entities: pos: -3.5,-165.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8616 components: - type: Transform @@ -56657,7 +58071,7 @@ entities: pos: 6.5,-328.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8617 components: - type: Transform @@ -56701,12 +58115,7 @@ entities: pos: 7.5,-338.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 8623 - components: - - type: Transform - pos: -17.5,-262.5 - parent: 2 + color: '#0335FCFF' - uid: 8624 components: - type: Transform @@ -56714,7 +58123,7 @@ entities: pos: 7.5,-339.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8625 components: - type: Transform @@ -56722,7 +58131,7 @@ entities: pos: 7.5,-337.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8626 components: - type: Transform @@ -56730,7 +58139,7 @@ entities: pos: 7.5,-341.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8627 components: - type: Transform @@ -56738,14 +58147,14 @@ entities: pos: 7.5,-340.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8628 components: - type: Transform pos: 0.5,-332.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8629 components: - type: Transform @@ -56753,7 +58162,7 @@ entities: pos: -6.5,-334.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8630 components: - type: Transform @@ -56769,7 +58178,7 @@ entities: pos: -6.5,-335.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8632 components: - type: Transform @@ -56777,7 +58186,7 @@ entities: pos: -0.5,-347.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8633 components: - type: Transform @@ -56785,13 +58194,7 @@ entities: pos: -11.5,-260.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 8634 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -18.5,-250.5 - parent: 2 + color: '#0335FCFF' - uid: 8635 components: - type: Transform @@ -56799,54 +58202,12 @@ entities: pos: -5.5,-243.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 8636 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -20.5,-257.5 - parent: 2 - - uid: 8637 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -18.5,-255.5 - parent: 2 - - uid: 8638 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -19.5,-255.5 - parent: 2 - - uid: 8639 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -20.5,-255.5 - parent: 2 - - uid: 8640 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -18.5,-256.5 - parent: 2 - - uid: 8641 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -18.5,-257.5 - parent: 2 + color: '#0335FCFF' - uid: 8642 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -19.5,-257.5 - parent: 2 - - uid: 8643 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -17.5,-261.5 + rot: 1.5707963267948966 rad + pos: -17.5,-252.5 parent: 2 - uid: 8644 components: @@ -56862,7 +58223,7 @@ entities: pos: 1.5,-242.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 8646 components: - type: Transform @@ -56870,7 +58231,7 @@ entities: pos: 5.5,-2.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8647 components: - type: Transform @@ -56902,7 +58263,7 @@ entities: pos: 0.5,-272.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8651 components: - type: Transform @@ -56910,7 +58271,7 @@ entities: pos: 0.5,-275.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8652 components: - type: Transform @@ -56918,7 +58279,7 @@ entities: pos: 0.5,-276.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8653 components: - type: Transform @@ -56926,7 +58287,7 @@ entities: pos: 0.5,-278.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8654 components: - type: Transform @@ -56934,7 +58295,7 @@ entities: pos: 0.5,-279.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8655 components: - type: Transform @@ -56942,7 +58303,7 @@ entities: pos: 0.5,-280.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8656 components: - type: Transform @@ -56950,7 +58311,7 @@ entities: pos: 0.5,-281.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8657 components: - type: Transform @@ -56958,7 +58319,7 @@ entities: pos: 0.5,-282.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8658 components: - type: Transform @@ -56966,7 +58327,7 @@ entities: pos: 0.5,-283.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8659 components: - type: Transform @@ -56974,7 +58335,7 @@ entities: pos: 0.5,-285.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8660 components: - type: Transform @@ -56982,7 +58343,7 @@ entities: pos: 0.5,-288.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8661 components: - type: Transform @@ -56990,7 +58351,7 @@ entities: pos: 0.5,-290.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8662 components: - type: Transform @@ -56998,7 +58359,7 @@ entities: pos: 0.5,-292.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8663 components: - type: Transform @@ -57006,7 +58367,7 @@ entities: pos: 0.5,-294.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8664 components: - type: Transform @@ -57022,7 +58383,7 @@ entities: pos: 0.5,-296.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8666 components: - type: Transform @@ -57158,7 +58519,7 @@ entities: pos: 1.5,-277.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8684 components: - type: Transform @@ -57166,7 +58527,7 @@ entities: pos: 2.5,-277.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8685 components: - type: Transform @@ -57174,7 +58535,7 @@ entities: pos: 3.5,-277.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8686 components: - type: Transform @@ -57182,7 +58543,7 @@ entities: pos: 4.5,-277.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8687 components: - type: Transform @@ -57190,7 +58551,7 @@ entities: pos: 5.5,-277.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8688 components: - type: Transform @@ -57198,7 +58559,7 @@ entities: pos: 6.5,-277.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8689 components: - type: Transform @@ -57302,7 +58663,7 @@ entities: pos: 7.5,-342.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8702 components: - type: Transform @@ -57310,7 +58671,7 @@ entities: pos: 1.5,-273.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8703 components: - type: Transform @@ -57318,7 +58679,7 @@ entities: pos: 2.5,-273.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8704 components: - type: Transform @@ -57326,7 +58687,7 @@ entities: pos: 3.5,-273.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8705 components: - type: Transform @@ -57334,7 +58695,7 @@ entities: pos: 4.5,-273.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8706 components: - type: Transform @@ -57342,7 +58703,7 @@ entities: pos: -0.5,-271.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8707 components: - type: Transform @@ -57350,7 +58711,7 @@ entities: pos: 1.5,-284.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8708 components: - type: Transform @@ -57358,7 +58719,7 @@ entities: pos: 2.5,-284.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8709 components: - type: Transform @@ -57366,7 +58727,7 @@ entities: pos: 3.5,-284.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8710 components: - type: Transform @@ -57374,7 +58735,7 @@ entities: pos: 4.5,-284.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8711 components: - type: Transform @@ -57412,7 +58773,7 @@ entities: pos: -0.5,-287.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8716 components: - type: Transform @@ -57420,7 +58781,7 @@ entities: pos: -1.5,-287.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8717 components: - type: Transform @@ -57428,7 +58789,7 @@ entities: pos: -2.5,-287.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8718 components: - type: Transform @@ -57436,7 +58797,7 @@ entities: pos: -3.5,-287.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8719 components: - type: Transform @@ -57444,7 +58805,7 @@ entities: pos: -4.5,-287.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8720 components: - type: Transform @@ -57452,7 +58813,7 @@ entities: pos: -3.5,-271.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8721 components: - type: Transform @@ -57460,7 +58821,7 @@ entities: pos: -4.5,-271.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8722 components: - type: Transform @@ -57475,7 +58836,7 @@ entities: pos: -2.5,-347.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8724 components: - type: Transform @@ -57491,7 +58852,7 @@ entities: pos: -1.5,-297.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8726 components: - type: Transform @@ -57499,7 +58860,7 @@ entities: pos: -6.5,-346.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8727 components: - type: Transform @@ -57522,14 +58883,14 @@ entities: pos: 0.5,-320.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8730 components: - type: Transform pos: 0.5,-319.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8731 components: - type: Transform @@ -57553,7 +58914,7 @@ entities: pos: -4.5,-315.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8734 components: - type: Transform @@ -57561,7 +58922,7 @@ entities: pos: -2.5,-315.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8735 components: - type: Transform @@ -57569,7 +58930,7 @@ entities: pos: -1.5,-315.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8736 components: - type: Transform @@ -57593,7 +58954,7 @@ entities: pos: -0.5,-315.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8739 components: - type: Transform @@ -57609,7 +58970,7 @@ entities: pos: 0.5,-316.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8741 components: - type: Transform @@ -57617,7 +58978,7 @@ entities: pos: 0.5,-317.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8742 components: - type: Transform @@ -57696,7 +59057,7 @@ entities: pos: 0.5,-308.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8752 components: - type: Transform @@ -57704,7 +59065,7 @@ entities: pos: 0.5,-309.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8753 components: - type: Transform @@ -57712,7 +59073,7 @@ entities: pos: 0.5,-310.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8754 components: - type: Transform @@ -57720,7 +59081,7 @@ entities: pos: 0.5,-311.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8755 components: - type: Transform @@ -57728,7 +59089,7 @@ entities: pos: 0.5,-312.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8756 components: - type: Transform @@ -57736,7 +59097,7 @@ entities: pos: 0.5,-313.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8757 components: - type: Transform @@ -57744,7 +59105,7 @@ entities: pos: 0.5,-314.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8758 components: - type: Transform @@ -57799,7 +59160,7 @@ entities: pos: -0.5,-307.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8765 components: - type: Transform @@ -57807,7 +59168,7 @@ entities: pos: -1.5,-307.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8766 components: - type: Transform @@ -57815,7 +59176,7 @@ entities: pos: -2.5,-307.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8767 components: - type: Transform @@ -57823,7 +59184,7 @@ entities: pos: -3.5,-307.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8768 components: - type: Transform @@ -57831,7 +59192,7 @@ entities: pos: -4.5,-307.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8769 components: - type: Transform @@ -57839,7 +59200,7 @@ entities: pos: -5.5,-307.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8770 components: - type: Transform @@ -57847,7 +59208,7 @@ entities: pos: 1.5,-306.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8771 components: - type: Transform @@ -57879,7 +59240,7 @@ entities: pos: 2.5,-306.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8775 components: - type: Transform @@ -57887,7 +59248,7 @@ entities: pos: 3.5,-306.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8776 components: - type: Transform @@ -57919,7 +59280,7 @@ entities: pos: 4.5,-306.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8780 components: - type: Transform @@ -57927,7 +59288,7 @@ entities: pos: 5.5,-306.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8781 components: - type: Transform @@ -57935,7 +59296,7 @@ entities: pos: 8.5,-306.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8782 components: - type: Transform @@ -57967,7 +59328,7 @@ entities: pos: 6.5,-305.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8786 components: - type: Transform @@ -57996,7 +59357,7 @@ entities: pos: 0.5,-305.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8790 components: - type: Transform @@ -58027,49 +59388,49 @@ entities: pos: 10.5,-307.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8794 components: - type: Transform pos: 10.5,-308.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8795 components: - type: Transform pos: 10.5,-309.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8796 components: - type: Transform pos: 10.5,-310.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8797 components: - type: Transform pos: 7.5,-307.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8798 components: - type: Transform pos: 7.5,-308.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8799 components: - type: Transform pos: 7.5,-309.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8800 components: - type: Transform @@ -58127,7 +59488,7 @@ entities: pos: 7.5,-310.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8808 components: - type: Transform @@ -58142,7 +59503,7 @@ entities: pos: 9.5,-305.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8810 components: - type: Transform @@ -58150,7 +59511,7 @@ entities: pos: -1.5,-303.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8811 components: - type: Transform @@ -58166,7 +59527,7 @@ entities: pos: -0.5,-303.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8813 components: - type: Transform @@ -58174,7 +59535,7 @@ entities: pos: 0.5,-304.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8814 components: - type: Transform @@ -58198,7 +59559,7 @@ entities: pos: 0.5,-302.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8817 components: - type: Transform @@ -58206,7 +59567,7 @@ entities: pos: 0.5,-301.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8818 components: - type: Transform @@ -58214,7 +59575,7 @@ entities: pos: 0.5,-300.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8819 components: - type: Transform @@ -58222,7 +59583,7 @@ entities: pos: 0.5,-299.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8820 components: - type: Transform @@ -58230,7 +59591,7 @@ entities: pos: 0.5,-298.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8821 components: - type: Transform @@ -58293,21 +59654,21 @@ entities: pos: 0.5,-322.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8829 components: - type: Transform pos: 0.5,-324.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8830 components: - type: Transform pos: 0.5,-326.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8831 components: - type: Transform @@ -58322,7 +59683,7 @@ entities: pos: -0.5,-330.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8833 components: - type: Transform @@ -58330,7 +59691,7 @@ entities: pos: -1.5,-330.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8834 components: - type: Transform @@ -58338,7 +59699,7 @@ entities: pos: -2.5,-330.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8835 components: - type: Transform @@ -58409,133 +59770,133 @@ entities: pos: 0.5,-331.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8844 components: - type: Transform pos: 0.5,-333.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8845 components: - type: Transform pos: 0.5,-334.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8846 components: - type: Transform pos: 0.5,-335.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8847 components: - type: Transform pos: 0.5,-336.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8848 components: - type: Transform pos: 0.5,-337.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8849 components: - type: Transform pos: 0.5,-338.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8850 components: - type: Transform pos: 0.5,-339.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8851 components: - type: Transform pos: 0.5,-340.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8852 components: - type: Transform pos: 0.5,-341.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8853 components: - type: Transform pos: 0.5,-343.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8854 components: - type: Transform pos: 0.5,-345.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8855 components: - type: Transform pos: 0.5,-346.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8856 components: - type: Transform pos: 0.5,-349.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8857 components: - type: Transform pos: 0.5,-350.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8858 components: - type: Transform pos: 0.5,-351.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8859 components: - type: Transform pos: 0.5,-352.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8860 components: - type: Transform pos: 0.5,-353.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8861 components: - type: Transform pos: 0.5,-355.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8862 components: - type: Transform @@ -58911,7 +60272,7 @@ entities: pos: -0.5,-327.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8911 components: - type: Transform @@ -58919,7 +60280,7 @@ entities: pos: -1.5,-327.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8912 components: - type: Transform @@ -58927,7 +60288,7 @@ entities: pos: -2.5,-327.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8913 components: - type: Transform @@ -58935,7 +60296,7 @@ entities: pos: -3.5,-327.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8914 components: - type: Transform @@ -58943,7 +60304,7 @@ entities: pos: 5.5,-330.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8915 components: - type: Transform @@ -58951,63 +60312,63 @@ entities: pos: 6.5,-330.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8916 components: - type: Transform pos: -6.5,-329.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8917 components: - type: Transform pos: -6.5,-330.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8918 components: - type: Transform pos: -6.5,-331.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8919 components: - type: Transform pos: -6.5,-332.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8920 components: - type: Transform pos: -6.5,-333.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8921 components: - type: Transform pos: 7.5,-331.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8922 components: - type: Transform pos: 7.5,-332.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8923 components: - type: Transform pos: 7.5,-333.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8924 components: - type: Transform @@ -59015,7 +60376,7 @@ entities: pos: 7.5,-334.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8925 components: - type: Transform @@ -59023,7 +60384,7 @@ entities: pos: -6.5,-336.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8926 components: - type: Transform @@ -59031,7 +60392,7 @@ entities: pos: -6.5,-337.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8927 components: - type: Transform @@ -59039,7 +60400,7 @@ entities: pos: -6.5,-338.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8928 components: - type: Transform @@ -59047,7 +60408,7 @@ entities: pos: -6.5,-339.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8929 components: - type: Transform @@ -59055,7 +60416,7 @@ entities: pos: -6.5,-340.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8930 components: - type: Transform @@ -59063,7 +60424,7 @@ entities: pos: -6.5,-341.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8931 components: - type: Transform @@ -59071,7 +60432,7 @@ entities: pos: -6.5,-342.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8932 components: - type: Transform @@ -59079,7 +60440,7 @@ entities: pos: -6.5,-343.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8933 components: - type: Transform @@ -59087,7 +60448,7 @@ entities: pos: -6.5,-344.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8934 components: - type: Transform @@ -59095,7 +60456,7 @@ entities: pos: 7.5,-335.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8935 components: - type: Transform @@ -59103,7 +60464,7 @@ entities: pos: 7.5,-344.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8936 components: - type: Transform @@ -59111,7 +60472,7 @@ entities: pos: 7.5,-345.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8937 components: - type: Transform @@ -59119,7 +60480,7 @@ entities: pos: 7.5,-346.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8938 components: - type: Transform @@ -59127,7 +60488,7 @@ entities: pos: 1.5,-347.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8939 components: - type: Transform @@ -59135,7 +60496,7 @@ entities: pos: 2.5,-347.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8940 components: - type: Transform @@ -59143,7 +60504,7 @@ entities: pos: 3.5,-347.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8941 components: - type: Transform @@ -59151,7 +60512,7 @@ entities: pos: 5.5,-347.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8942 components: - type: Transform @@ -59159,7 +60520,7 @@ entities: pos: 4.5,-347.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8943 components: - type: Transform @@ -59167,7 +60528,7 @@ entities: pos: -1.5,-347.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8944 components: - type: Transform @@ -59175,7 +60536,7 @@ entities: pos: -3.5,-347.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8945 components: - type: Transform @@ -59183,7 +60544,7 @@ entities: pos: -4.5,-347.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8946 components: - type: Transform @@ -59191,7 +60552,7 @@ entities: pos: -5.5,-347.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8947 components: - type: Transform @@ -59199,7 +60560,7 @@ entities: pos: 6.5,-347.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8948 components: - type: Transform @@ -59207,14 +60568,14 @@ entities: pos: 5.5,-328.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8949 components: - type: Transform pos: 7.5,-329.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8950 components: - type: Transform @@ -59222,7 +60583,7 @@ entities: pos: 3.5,-328.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8951 components: - type: Transform @@ -59230,7 +60591,7 @@ entities: pos: 2.5,-328.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8952 components: - type: Transform @@ -59238,7 +60599,7 @@ entities: pos: 1.5,-328.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8953 components: - type: Transform @@ -59267,7 +60628,7 @@ entities: pos: -0.5,-356.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8957 components: - type: Transform @@ -59275,7 +60636,7 @@ entities: pos: 3.5,-358.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8958 components: - type: Transform @@ -59283,7 +60644,7 @@ entities: pos: 2.5,-358.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8959 components: - type: Transform @@ -59297,7 +60658,7 @@ entities: pos: 0.5,-357.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8961 components: - type: Transform @@ -59321,7 +60682,7 @@ entities: pos: -1.5,-356.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8964 components: - type: Transform @@ -59329,7 +60690,7 @@ entities: pos: -2.5,-356.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8965 components: - type: Transform @@ -59360,42 +60721,42 @@ entities: pos: -3.5,-364.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8969 components: - type: Transform pos: -3.5,-365.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8970 components: - type: Transform pos: -3.5,-367.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8971 components: - type: Transform pos: -3.5,-369.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8972 components: - type: Transform pos: 4.5,-369.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8973 components: - type: Transform pos: 4.5,-367.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8974 components: - type: Transform @@ -59403,7 +60764,7 @@ entities: pos: 3.5,-366.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8975 components: - type: Transform @@ -59411,7 +60772,7 @@ entities: pos: 2.5,-366.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8976 components: - type: Transform @@ -59419,7 +60780,7 @@ entities: pos: 0.5,-366.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8977 components: - type: Transform @@ -59427,7 +60788,7 @@ entities: pos: -0.5,-366.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8978 components: - type: Transform @@ -59435,7 +60796,7 @@ entities: pos: -2.5,-366.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8979 components: - type: Transform @@ -59443,7 +60804,7 @@ entities: pos: -1.5,-366.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8980 components: - type: Transform @@ -59451,7 +60812,7 @@ entities: pos: 4.5,-365.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8981 components: - type: Transform @@ -59459,7 +60820,7 @@ entities: pos: 4.5,-364.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8982 components: - type: Transform @@ -59467,7 +60828,7 @@ entities: pos: 4.5,-362.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8983 components: - type: Transform @@ -59475,7 +60836,7 @@ entities: pos: 4.5,-361.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8984 components: - type: Transform @@ -59483,7 +60844,7 @@ entities: pos: 5.5,-360.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8985 components: - type: Transform @@ -59491,7 +60852,7 @@ entities: pos: 5.5,-363.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8986 components: - type: Transform @@ -59499,7 +60860,7 @@ entities: pos: 5.5,-366.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8987 components: - type: Transform @@ -59507,7 +60868,7 @@ entities: pos: -4.5,-366.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8988 components: - type: Transform @@ -59515,7 +60876,7 @@ entities: pos: -4.5,-363.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8989 components: - type: Transform @@ -59523,7 +60884,7 @@ entities: pos: 3.5,-360.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8990 components: - type: Transform @@ -59531,7 +60892,7 @@ entities: pos: 2.5,-360.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8991 components: - type: Transform @@ -59827,7 +61188,7 @@ entities: pos: 1.5,-90.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9029 components: - type: Transform @@ -59835,7 +61196,7 @@ entities: pos: 2.5,-90.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9030 components: - type: Transform @@ -59843,7 +61204,7 @@ entities: pos: 3.5,-90.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9031 components: - type: Transform @@ -59851,7 +61212,7 @@ entities: pos: 4.5,-90.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9032 components: - type: Transform @@ -59859,7 +61220,7 @@ entities: pos: 5.5,-90.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9033 components: - type: Transform @@ -59867,7 +61228,7 @@ entities: pos: 6.5,-89.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9034 components: - type: Transform @@ -59907,7 +61268,7 @@ entities: pos: 1.5,-197.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9039 components: - type: Transform @@ -59915,7 +61276,7 @@ entities: pos: 2.5,-197.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9040 components: - type: Transform @@ -59923,7 +61284,7 @@ entities: pos: 3.5,-197.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9041 components: - type: Transform @@ -59931,7 +61292,7 @@ entities: pos: 5.5,-197.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9042 components: - type: Transform @@ -59939,13 +61300,7 @@ entities: pos: 4.5,-197.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 9043 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -20.5,-263.5 - parent: 2 + color: '#0335FCFF' - uid: 9044 components: - type: Transform @@ -59954,12 +61309,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 9045 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -21.5,-263.5 - parent: 2 - uid: 9046 components: - type: Transform @@ -59984,27 +61333,13 @@ entities: parent: 2 - type: AtmosPipeColor color: '#FFD800FF' - - uid: 9049 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -13.5,-259.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 9050 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -19.5,-263.5 - parent: 2 - uid: 9051 components: - type: Transform pos: 16.5,-244.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 9052 components: - type: Transform @@ -60021,18 +61356,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#FF0000FF' - - uid: 9054 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -18.5,-261.5 - parent: 2 - - uid: 9055 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -18.5,-251.5 - parent: 2 - uid: 9056 components: - type: Transform @@ -60040,12 +61363,7 @@ entities: pos: -12.5,-260.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 9057 - components: - - type: Transform - pos: -17.5,-252.5 - parent: 2 + color: '#0335FCFF' - uid: 9058 components: - type: Transform @@ -60060,7 +61378,7 @@ entities: pos: -0.5,-27.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9060 components: - type: Transform @@ -60068,7 +61386,7 @@ entities: pos: -1.5,-27.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9061 components: - type: Transform @@ -60076,7 +61394,7 @@ entities: pos: -2.5,-27.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9062 components: - type: Transform @@ -60084,7 +61402,7 @@ entities: pos: -3.5,-27.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9063 components: - type: Transform @@ -60092,7 +61410,7 @@ entities: pos: 1.5,-27.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9064 components: - type: Transform @@ -60100,7 +61418,7 @@ entities: pos: 2.5,-27.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9065 components: - type: Transform @@ -60108,7 +61426,7 @@ entities: pos: 3.5,-27.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9066 components: - type: Transform @@ -60116,7 +61434,7 @@ entities: pos: 4.5,-27.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9067 components: - type: Transform @@ -60124,7 +61442,7 @@ entities: pos: -4.5,-26.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9068 components: - type: Transform @@ -60132,7 +61450,7 @@ entities: pos: -4.5,-25.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9069 components: - type: Transform @@ -60140,7 +61458,7 @@ entities: pos: -4.5,-24.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9070 components: - type: Transform @@ -60148,7 +61466,7 @@ entities: pos: -4.5,-23.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9071 components: - type: Transform @@ -60156,7 +61474,7 @@ entities: pos: 5.5,-26.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9072 components: - type: Transform @@ -60164,7 +61482,7 @@ entities: pos: 5.5,-25.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9073 components: - type: Transform @@ -60172,7 +61490,7 @@ entities: pos: 5.5,-24.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9074 components: - type: Transform @@ -60180,7 +61498,7 @@ entities: pos: 5.5,-23.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9075 components: - type: Transform @@ -60188,7 +61506,7 @@ entities: pos: 5.5,-55.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9076 components: - type: Transform @@ -60196,7 +61514,7 @@ entities: pos: 5.5,-54.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9077 components: - type: Transform @@ -60204,7 +61522,7 @@ entities: pos: 5.5,-53.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9078 components: - type: Transform @@ -60212,7 +61530,7 @@ entities: pos: 5.5,-52.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9079 components: - type: Transform @@ -60220,7 +61538,7 @@ entities: pos: 5.5,-51.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9080 components: - type: Transform @@ -60228,7 +61546,7 @@ entities: pos: 5.5,-50.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9081 components: - type: Transform @@ -60236,7 +61554,7 @@ entities: pos: 5.5,-80.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9082 components: - type: Transform @@ -60244,7 +61562,7 @@ entities: pos: 5.5,-79.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9083 components: - type: Transform @@ -60252,7 +61570,7 @@ entities: pos: 5.5,-78.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9084 components: - type: Transform @@ -60260,7 +61578,7 @@ entities: pos: 5.5,-77.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9085 components: - type: Transform @@ -60268,7 +61586,7 @@ entities: pos: -4.5,-80.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9086 components: - type: Transform @@ -60276,7 +61594,7 @@ entities: pos: -4.5,-79.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9087 components: - type: Transform @@ -60284,7 +61602,7 @@ entities: pos: -4.5,-78.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9088 components: - type: Transform @@ -60292,7 +61610,7 @@ entities: pos: -4.5,-77.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9089 components: - type: Transform @@ -60300,7 +61618,7 @@ entities: pos: -4.5,-105.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9090 components: - type: Transform @@ -60308,7 +61626,7 @@ entities: pos: -4.5,-104.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9091 components: - type: Transform @@ -60367,14 +61685,14 @@ entities: pos: -4.5,-133.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9098 components: - type: Transform pos: -4.5,-131.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9099 components: - type: Transform @@ -60438,35 +61756,35 @@ entities: pos: -3.5,-189.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9107 components: - type: Transform pos: -4.5,-188.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9108 components: - type: Transform pos: -4.5,-187.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9109 components: - type: Transform pos: -4.5,-186.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9110 components: - type: Transform pos: -4.5,-185.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9111 components: - type: Transform @@ -60482,7 +61800,7 @@ entities: pos: 7.5,-190.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9113 components: - type: Transform @@ -60490,7 +61808,7 @@ entities: pos: 6.5,-190.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9114 components: - type: Transform @@ -60498,7 +61816,7 @@ entities: pos: -4.5,-158.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9115 components: - type: Transform @@ -60506,7 +61824,7 @@ entities: pos: -4.5,-159.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9116 components: - type: Transform @@ -60514,7 +61832,7 @@ entities: pos: -4.5,-160.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9117 components: - type: Transform @@ -60522,7 +61840,7 @@ entities: pos: -4.5,-161.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9118 components: - type: Transform @@ -60530,7 +61848,7 @@ entities: pos: -4.5,-162.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9119 components: - type: Transform @@ -60538,7 +61856,7 @@ entities: pos: -2.5,-163.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9120 components: - type: Transform @@ -60546,7 +61864,7 @@ entities: pos: -3.5,-163.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9121 components: - type: Transform @@ -60554,7 +61872,7 @@ entities: pos: 5.5,-156.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9122 components: - type: Transform @@ -60562,7 +61880,7 @@ entities: pos: 5.5,-155.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9123 components: - type: Transform @@ -60570,7 +61888,7 @@ entities: pos: 5.5,-154.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9124 components: - type: Transform @@ -60578,7 +61896,7 @@ entities: pos: 5.5,-153.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9125 components: - type: Transform @@ -60586,56 +61904,56 @@ entities: pos: 4.5,-152.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9126 components: - type: Transform pos: 5.5,-272.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9127 components: - type: Transform pos: 5.5,-271.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9128 components: - type: Transform pos: 5.5,-270.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9129 components: - type: Transform pos: 5.5,-269.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9130 components: - type: Transform pos: 5.5,-268.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9131 components: - type: Transform pos: 5.5,-267.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9132 components: - type: Transform pos: 5.5,-266.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9133 components: - type: Transform @@ -60643,7 +61961,7 @@ entities: pos: 1.5,-287.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9134 components: - type: Transform @@ -60651,7 +61969,7 @@ entities: pos: 2.5,-287.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9135 components: - type: Transform @@ -60659,7 +61977,7 @@ entities: pos: 3.5,-287.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9136 components: - type: Transform @@ -60667,35 +61985,35 @@ entities: pos: 4.5,-287.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9137 components: - type: Transform pos: 5.5,-288.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9138 components: - type: Transform pos: 5.5,-289.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9139 components: - type: Transform pos: 5.5,-290.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9140 components: - type: Transform pos: 5.5,-291.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9141 components: - type: Transform @@ -60703,7 +62021,7 @@ entities: pos: -4.5,-326.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9142 components: - type: Transform @@ -60711,7 +62029,7 @@ entities: pos: -4.5,-325.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9143 components: - type: Transform @@ -60757,21 +62075,21 @@ entities: pos: -4.5,-360.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9149 components: - type: Transform pos: -3.5,-361.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9150 components: - type: Transform pos: -3.5,-362.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9151 components: - type: Transform @@ -60779,7 +62097,7 @@ entities: pos: -12.5,-243.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9152 components: - type: Transform @@ -60787,7 +62105,7 @@ entities: pos: -10.5,-248.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 9153 components: - type: Transform @@ -60795,7 +62113,7 @@ entities: pos: -11.5,-248.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 9154 components: - type: Transform @@ -60803,7 +62121,7 @@ entities: pos: -12.5,-248.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 9155 components: - type: Transform @@ -60811,7 +62129,7 @@ entities: pos: -11.5,-243.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9156 components: - type: Transform @@ -60819,7 +62137,7 @@ entities: pos: -10.5,-243.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9157 components: - type: Transform @@ -60827,7 +62145,7 @@ entities: pos: -9.5,-243.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9158 components: - type: Transform @@ -60835,7 +62153,7 @@ entities: pos: -8.5,-243.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9159 components: - type: Transform @@ -60843,7 +62161,7 @@ entities: pos: -7.5,-243.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9160 components: - type: Transform @@ -60851,7 +62169,7 @@ entities: pos: -6.5,-243.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9161 components: - type: Transform @@ -60859,7 +62177,7 @@ entities: pos: -4.5,-243.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9162 components: - type: Transform @@ -60867,7 +62185,7 @@ entities: pos: -3.5,-243.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9163 components: - type: Transform @@ -60875,16 +62193,213 @@ entities: pos: -2.5,-243.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9220 components: - type: Transform pos: 0.5,-169.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' + - uid: 11318 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -24.5,-262.5 + parent: 2 + - uid: 11327 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -21.5,-254.5 + parent: 2 + - uid: 11383 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -21.5,-260.5 + parent: 2 + - uid: 11450 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -21.5,-253.5 + parent: 2 + - uid: 11467 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -21.5,-259.5 + parent: 2 + - uid: 11588 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -21.5,-256.5 + parent: 2 + - uid: 11590 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -21.5,-255.5 + parent: 2 + - uid: 11600 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -21.5,-258.5 + parent: 2 + - uid: 11601 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -21.5,-257.5 + parent: 2 + - uid: 13214 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -23.5,-258.5 + parent: 2 + - uid: 13773 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -16.5,-252.5 + parent: 2 + - uid: 13774 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -15.5,-255.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 13821 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -15.5,-253.5 + parent: 2 + - uid: 13824 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -15.5,-256.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 13851 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -15.5,-259.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 13899 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -15.5,-257.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 13900 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -16.5,-254.5 + parent: 2 + - uid: 13946 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -17.5,-254.5 + parent: 2 + - uid: 14851 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -15.5,-258.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 16983 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -20.5,-265.5 + parent: 2 + - uid: 17016 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -13.5,-258.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 17017 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -13.5,-261.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 17018 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -13.5,-262.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 17019 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -13.5,-263.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' + - uid: 17064 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -23.5,-269.5 + parent: 2 + - uid: 17065 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -23.5,-267.5 + parent: 2 - proto: GasPipeTJunction entities: + - uid: 3043 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -17.5,-250.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 3987 + components: + - type: Transform + pos: -16.5,-250.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 7574 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -13.5,-259.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' - uid: 7620 components: - type: Transform @@ -60898,7 +62413,7 @@ entities: pos: -6.5,-112.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8115 components: - type: Transform @@ -60906,7 +62421,7 @@ entities: pos: -6.5,-115.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8118 components: - type: Transform @@ -60914,7 +62429,7 @@ entities: pos: -6.5,-118.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 8121 components: - type: Transform @@ -60922,14 +62437,21 @@ entities: pos: -6.5,-121.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' + - uid: 8189 + components: + - type: Transform + pos: -13.5,-260.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' - uid: 9164 components: - type: Transform pos: 1.5,-358.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9165 components: - type: Transform @@ -60961,7 +62483,7 @@ entities: pos: 0.5,-31.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9169 components: - type: Transform @@ -60992,7 +62514,7 @@ entities: pos: 0.5,-17.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9173 components: - type: Transform @@ -61000,7 +62522,7 @@ entities: pos: 0.5,-284.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9174 components: - type: Transform @@ -61008,14 +62530,14 @@ entities: pos: 1.5,-17.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9175 components: - type: Transform pos: -0.5,-297.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9176 components: - type: Transform @@ -61031,7 +62553,7 @@ entities: pos: 0.5,-318.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9178 components: - type: Transform @@ -61039,7 +62561,7 @@ entities: pos: -4.5,-81.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9179 components: - type: Transform @@ -61055,7 +62577,7 @@ entities: pos: 0.5,-57.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9181 components: - type: Transform @@ -61069,7 +62591,7 @@ entities: pos: 0.5,-42.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9183 components: - type: Transform @@ -61077,7 +62599,7 @@ entities: pos: 0.5,-54.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9184 components: - type: Transform @@ -61085,7 +62607,7 @@ entities: pos: 18.5,-249.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 9185 components: - type: Transform @@ -61108,7 +62630,7 @@ entities: pos: 0.5,-40.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9188 components: - type: Transform @@ -61116,7 +62638,7 @@ entities: pos: -4.5,-40.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9189 components: - type: Transform @@ -61140,7 +62662,7 @@ entities: pos: -2.5,-12.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9192 components: - type: Transform @@ -61171,7 +62693,7 @@ entities: pos: 1.5,-12.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9196 components: - type: Transform @@ -61211,7 +62733,7 @@ entities: pos: 0.5,-52.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9201 components: - type: Transform @@ -61234,7 +62756,7 @@ entities: pos: 0.5,-71.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9204 components: - type: Transform @@ -61242,7 +62764,7 @@ entities: pos: 0.5,-21.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9205 components: - type: Transform @@ -61250,7 +62772,7 @@ entities: pos: 1.5,0.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9206 components: - type: Transform @@ -61266,7 +62788,7 @@ entities: pos: 0.5,-19.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9208 components: - type: Transform @@ -61274,7 +62796,7 @@ entities: pos: 4.5,-1.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9209 components: - type: Transform @@ -61282,7 +62804,7 @@ entities: pos: 0.5,-25.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9210 components: - type: Transform @@ -61290,7 +62812,7 @@ entities: pos: 0.5,-46.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9211 components: - type: Transform @@ -61298,7 +62820,7 @@ entities: pos: 0.5,-23.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9212 components: - type: Transform @@ -61321,7 +62843,7 @@ entities: pos: -4.5,-132.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9215 components: - type: Transform @@ -61336,7 +62858,7 @@ entities: pos: 0.5,-33.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9217 components: - type: Transform @@ -61344,7 +62866,7 @@ entities: pos: 0.5,-289.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9219 components: - type: Transform @@ -61366,7 +62888,7 @@ entities: pos: 0.5,-48.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9224 components: - type: Transform @@ -61374,7 +62896,7 @@ entities: pos: 0.5,-50.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9225 components: - type: Transform @@ -61398,7 +62920,7 @@ entities: pos: 0.5,-167.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9228 components: - type: Transform @@ -61421,7 +62943,7 @@ entities: pos: 0.5,-75.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9231 components: - type: Transform @@ -61460,7 +62982,7 @@ entities: pos: 0.5,-79.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9236 components: - type: Transform @@ -61468,7 +62990,7 @@ entities: pos: 0.5,-73.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9237 components: - type: Transform @@ -61476,7 +62998,7 @@ entities: pos: 0.5,-102.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9238 components: - type: Transform @@ -61484,7 +63006,7 @@ entities: pos: 0.5,-104.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9239 components: - type: Transform @@ -61492,7 +63014,7 @@ entities: pos: 0.5,-131.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9240 components: - type: Transform @@ -61500,7 +63022,7 @@ entities: pos: 0.5,-91.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9241 components: - type: Transform @@ -61508,7 +63030,7 @@ entities: pos: 0.5,-129.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9242 components: - type: Transform @@ -61516,7 +63038,7 @@ entities: pos: 0.5,-100.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9243 components: - type: Transform @@ -61524,7 +63046,7 @@ entities: pos: -3.5,-260.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9244 components: - type: Transform @@ -61532,7 +63054,7 @@ entities: pos: 0.5,-106.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9245 components: - type: Transform @@ -61540,14 +63062,14 @@ entities: pos: 0.5,-109.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9246 components: - type: Transform pos: 1.5,-109.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9247 components: - type: Transform @@ -61555,7 +63077,7 @@ entities: pos: 0.5,-125.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9248 components: - type: Transform @@ -61563,7 +63085,7 @@ entities: pos: 1.5,-120.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9249 components: - type: Transform @@ -61571,7 +63093,7 @@ entities: pos: 0.5,-127.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9250 components: - type: Transform @@ -61579,7 +63101,7 @@ entities: pos: 0.5,-158.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9251 components: - type: Transform @@ -61587,7 +63109,7 @@ entities: pos: 0.5,-156.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9252 components: - type: Transform @@ -61595,7 +63117,7 @@ entities: pos: 0.5,-133.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9253 components: - type: Transform @@ -61603,28 +63125,28 @@ entities: pos: -3.5,-109.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9254 components: - type: Transform pos: -6.5,-109.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9255 components: - type: Transform pos: -0.5,-109.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9256 components: - type: Transform pos: 3.5,-109.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9257 components: - type: Transform @@ -61632,7 +63154,7 @@ entities: pos: 0.5,-183.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9258 components: - type: Transform @@ -61719,7 +63241,7 @@ entities: pos: 0.5,-185.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9269 components: - type: Transform @@ -61735,7 +63257,7 @@ entities: pos: 0.5,-138.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9271 components: - type: Transform @@ -61743,7 +63265,7 @@ entities: pos: 0.5,-139.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9272 components: - type: Transform @@ -61751,7 +63273,7 @@ entities: pos: 0.5,-146.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9273 components: - type: Transform @@ -61759,7 +63281,7 @@ entities: pos: 0.5,-149.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9274 components: - type: Transform @@ -61767,7 +63289,7 @@ entities: pos: 0.5,-160.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9275 components: - type: Transform @@ -61775,7 +63297,7 @@ entities: pos: 0.5,-221.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9276 components: - type: Transform @@ -61821,7 +63343,7 @@ entities: pos: 0.5,-194.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9282 components: - type: Transform @@ -61829,7 +63351,7 @@ entities: pos: 0.5,-212.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9283 components: - type: Transform @@ -61837,7 +63359,7 @@ entities: pos: -4.5,-139.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9284 components: - type: Transform @@ -61853,7 +63375,7 @@ entities: pos: 0.5,-154.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9286 components: - type: Transform @@ -61861,7 +63383,7 @@ entities: pos: 0.5,-166.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9287 components: - type: Transform @@ -61869,7 +63391,7 @@ entities: pos: 0.5,-210.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9288 components: - type: Transform @@ -61877,7 +63399,7 @@ entities: pos: 0.5,-227.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9289 components: - type: Transform @@ -61885,7 +63407,7 @@ entities: pos: 0.5,-187.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9290 components: - type: Transform @@ -61893,7 +63415,7 @@ entities: pos: 0.5,-181.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9291 components: - type: Transform @@ -61924,7 +63446,7 @@ entities: pos: 0.5,-237.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9295 components: - type: Transform @@ -61939,7 +63461,7 @@ entities: pos: 0.5,-239.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9297 components: - type: Transform @@ -61962,7 +63484,7 @@ entities: pos: 0.5,-165.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9300 components: - type: Transform @@ -61977,7 +63499,7 @@ entities: pos: 3.5,-175.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9302 components: - type: Transform @@ -61985,7 +63507,7 @@ entities: pos: 6.5,-256.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 9303 components: - type: Transform @@ -62001,7 +63523,7 @@ entities: pos: 0.5,-214.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9305 components: - type: Transform @@ -62016,7 +63538,7 @@ entities: pos: 0.5,-274.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9307 components: - type: Transform @@ -62024,14 +63546,14 @@ entities: pos: 0.5,-291.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9308 components: - type: Transform pos: -4.5,-202.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9309 components: - type: Transform @@ -62039,7 +63561,7 @@ entities: pos: 0.5,-208.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9310 components: - type: Transform @@ -62047,7 +63569,7 @@ entities: pos: 0.5,-205.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9311 components: - type: Transform @@ -62055,7 +63577,7 @@ entities: pos: 0.5,-293.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9312 components: - type: Transform @@ -62071,7 +63593,7 @@ entities: pos: 0.5,-241.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9314 components: - type: Transform @@ -62079,7 +63601,7 @@ entities: pos: 0.5,-235.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9315 components: - type: Transform @@ -62095,7 +63617,7 @@ entities: pos: 0.5,-323.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9317 components: - type: Transform @@ -62103,7 +63625,7 @@ entities: pos: 0.5,-325.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9318 components: - type: Transform @@ -62111,7 +63633,7 @@ entities: pos: 0.5,-342.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9319 components: - type: Transform @@ -62127,7 +63649,7 @@ entities: pos: 0.5,-344.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9321 components: - type: Transform @@ -62144,12 +63666,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 9323 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -17.5,-259.5 - parent: 2 - uid: 9324 components: - type: Transform @@ -62163,7 +63679,7 @@ entities: pos: -4.5,-327.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9326 components: - type: Transform @@ -62177,7 +63693,7 @@ entities: pos: 0.5,-248.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9328 components: - type: Transform @@ -62193,35 +63709,35 @@ entities: pos: 5.5,-56.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9330 components: - type: Transform pos: -0.5,-244.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 9331 components: - type: Transform pos: 4.5,-81.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9332 components: - type: Transform pos: 4.5,-256.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 9333 components: - type: Transform pos: -2.5,-189.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9334 components: - type: Transform @@ -62229,7 +63745,7 @@ entities: pos: -3.5,-363.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9335 components: - type: Transform @@ -62242,7 +63758,7 @@ entities: pos: -1.5,-175.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9337 components: - type: Transform @@ -62250,14 +63766,14 @@ entities: pos: -0.5,-248.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 9338 components: - type: Transform pos: 5.5,-138.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9339 components: - type: Transform @@ -62265,14 +63781,14 @@ entities: pos: 0.5,-262.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9340 components: - type: Transform pos: 15.5,-248.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9341 components: - type: Transform @@ -62280,7 +63796,7 @@ entities: pos: 10.5,-256.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 9342 components: - type: Transform @@ -62288,7 +63804,7 @@ entities: pos: 16.5,-256.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 9343 components: - type: Transform @@ -62296,7 +63812,7 @@ entities: pos: -0.5,-261.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 9344 components: - type: Transform @@ -62304,7 +63820,7 @@ entities: pos: 16.5,-249.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 9345 components: - type: Transform @@ -62312,7 +63828,7 @@ entities: pos: 0.5,-77.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9346 components: - type: Transform @@ -62328,7 +63844,7 @@ entities: pos: 1.5,-244.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 9348 components: - type: Transform @@ -62343,7 +63859,7 @@ entities: pos: 0.5,-56.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9350 components: - type: Transform @@ -62357,7 +63873,7 @@ entities: pos: -0.5,-256.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 9352 components: - type: Transform @@ -62365,7 +63881,7 @@ entities: pos: 0.5,-330.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9353 components: - type: Transform @@ -62373,7 +63889,7 @@ entities: pos: 0.5,-297.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9354 components: - type: Transform @@ -62381,7 +63897,7 @@ entities: pos: 0.5,-90.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9355 components: - type: Transform @@ -62389,7 +63905,7 @@ entities: pos: 0.5,-268.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9356 components: - type: Transform @@ -62397,7 +63913,7 @@ entities: pos: 4.5,-358.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9357 components: - type: Transform @@ -62405,7 +63921,7 @@ entities: pos: -3.5,-107.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9358 components: - type: Transform @@ -62428,7 +63944,7 @@ entities: pos: 0.5,-136.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9361 components: - type: Transform @@ -62436,7 +63952,7 @@ entities: pos: 15.5,-255.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9362 components: - type: Transform @@ -62444,14 +63960,14 @@ entities: pos: 3.5,-152.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9363 components: - type: Transform pos: 4.5,-189.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9364 components: - type: Transform @@ -62483,7 +63999,7 @@ entities: pos: 0.5,-271.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9368 components: - type: Transform @@ -62507,7 +64023,7 @@ entities: pos: 0.5,-277.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9371 components: - type: Transform @@ -62515,7 +64031,7 @@ entities: pos: 0.5,-295.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9372 components: - type: Transform @@ -62562,14 +64078,14 @@ entities: pos: 0.5,-273.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9378 components: - type: Transform pos: 10.5,-248.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9379 components: - type: Transform @@ -62577,7 +64093,7 @@ entities: pos: 1.5,-16.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9380 components: - type: Transform @@ -62585,14 +64101,14 @@ entities: pos: 0.5,-266.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9381 components: - type: Transform pos: 5.5,-248.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9382 components: - type: Transform @@ -62600,7 +64116,7 @@ entities: pos: 0.5,-348.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9383 components: - type: Transform @@ -62616,7 +64132,7 @@ entities: pos: 7.5,-336.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9385 components: - type: Transform @@ -62624,7 +64140,7 @@ entities: pos: 0.5,-321.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9386 components: - type: Transform @@ -62632,7 +64148,7 @@ entities: pos: 5.5,-273.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9387 components: - type: Transform @@ -62640,7 +64156,7 @@ entities: pos: 0.5,-315.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9388 components: - type: Transform @@ -62648,7 +64164,7 @@ entities: pos: 0.5,-286.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9389 components: - type: Transform @@ -62664,7 +64180,7 @@ entities: pos: 0.5,-307.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9391 components: - type: Transform @@ -62672,7 +64188,7 @@ entities: pos: 0.5,-306.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9392 components: - type: Transform @@ -62680,7 +64196,7 @@ entities: pos: 6.5,-306.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9393 components: - type: Transform @@ -62703,21 +64219,21 @@ entities: pos: 9.5,-306.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9396 components: - type: Transform pos: 10.5,-306.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9397 components: - type: Transform pos: 7.5,-306.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9398 components: - type: Transform @@ -62741,7 +64257,7 @@ entities: pos: 0.5,-303.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9401 components: - type: Transform @@ -62764,7 +64280,7 @@ entities: pos: 0.5,-329.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9404 components: - type: Transform @@ -62772,7 +64288,7 @@ entities: pos: 0.5,-328.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9405 components: - type: Transform @@ -62780,7 +64296,7 @@ entities: pos: 0.5,-327.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9406 components: - type: Transform @@ -62788,7 +64304,7 @@ entities: pos: 4.5,-368.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9407 components: - type: Transform @@ -62796,7 +64312,7 @@ entities: pos: -3.5,-368.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9408 components: - type: Transform @@ -62812,7 +64328,7 @@ entities: pos: -0.5,-255.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 9410 components: - type: Transform @@ -62820,7 +64336,7 @@ entities: pos: 0.5,-354.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9411 components: - type: Transform @@ -62828,7 +64344,7 @@ entities: pos: 0.5,-30.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9412 components: - type: Transform @@ -62843,7 +64359,7 @@ entities: pos: 7.5,-330.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9414 components: - type: Transform @@ -62851,7 +64367,7 @@ entities: pos: -6.5,-345.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9415 components: - type: Transform @@ -62859,7 +64375,7 @@ entities: pos: 7.5,-343.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9416 components: - type: Transform @@ -62867,7 +64383,7 @@ entities: pos: 0.5,-358.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9417 components: - type: Transform @@ -62875,7 +64391,7 @@ entities: pos: 0.5,-356.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9418 components: - type: Transform @@ -62890,14 +64406,14 @@ entities: pos: 4.5,-363.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9420 components: - type: Transform pos: 4.5,-360.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9421 components: - type: Transform @@ -62905,7 +64421,7 @@ entities: pos: 0.5,-178.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9422 components: - type: Transform @@ -62944,7 +64460,7 @@ entities: pos: 16.5,-257.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 9427 components: - type: Transform @@ -62960,7 +64476,7 @@ entities: pos: 0.5,-264.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9429 components: - type: Transform @@ -63052,7 +64568,7 @@ entities: pos: 0.5,-253.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9441 components: - type: Transform @@ -63060,7 +64576,7 @@ entities: pos: -3.5,-315.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9442 components: - type: Transform @@ -63075,13 +64591,23 @@ entities: pos: -9.5,-248.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 9457 components: - type: Transform rot: 1.5707963267948966 rad pos: -4.5,-169.5 parent: 2 + - uid: 13823 + components: + - type: Transform + pos: -18.5,-254.5 + parent: 2 + - uid: 13865 + components: + - type: Transform + pos: -18.5,-252.5 + parent: 2 - proto: GasPort entities: - uid: 5634 @@ -63115,26 +64641,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#FFD800FF' - - uid: 9448 - components: - - type: Transform - anchored: False - rot: -1.5707963267948966 rad - pos: -20.5,-263.5 - parent: 2 - - type: Physics - canCollide: True - bodyType: Dynamic - - uid: 9449 - components: - - type: Transform - anchored: False - rot: -1.5707963267948966 rad - pos: -19.5,-263.5 - parent: 2 - - type: Physics - canCollide: True - bodyType: Dynamic - uid: 9450 components: - type: Transform @@ -63143,13 +64649,61 @@ entities: parent: 2 - type: AtmosPipeColor color: '#FEF101FF' + - uid: 13566 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -16.5,-255.5 + parent: 2 + - uid: 14831 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -16.5,-253.5 + parent: 2 - proto: GasPressurePump entities: + - uid: 3073 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -19.5,-258.5 + parent: 2 + - uid: 5494 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -19.5,-260.5 + parent: 2 + - uid: 5568 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -19.5,-262.5 + parent: 2 - uid: 5635 components: - type: Transform pos: -1.5,-169.5 parent: 2 + - uid: 7152 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -19.5,-264.5 + parent: 2 + - uid: 7312 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -19.5,-252.5 + parent: 2 + - uid: 8441 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -19.5,-254.5 + parent: 2 - uid: 9451 components: - type: Transform @@ -63157,47 +64711,7 @@ entities: pos: -14.5,-260.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' - - uid: 9452 - components: - - type: MetaData - name: Plasma Pump - - type: Transform - rot: 1.5707963267948966 rad - pos: -17.5,-250.5 - parent: 2 - - uid: 9453 - components: - - type: MetaData - name: O2 pump - - type: Transform - rot: 1.5707963267948966 rad - pos: -17.5,-256.5 - parent: 2 - - uid: 9454 - components: - - type: MetaData - name: N2 pump - - type: Transform - rot: 1.5707963267948966 rad - pos: -17.5,-258.5 - parent: 2 - - uid: 9455 - components: - - type: MetaData - name: Co2 pump - - type: Transform - rot: 1.5707963267948966 rad - pos: -17.5,-252.5 - parent: 2 - - uid: 9456 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -14.5,-259.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' + color: '#0335FCFF' - uid: 9458 components: - type: Transform @@ -63207,7 +64721,7 @@ entities: - type: GasPressurePump targetPressure: 4500 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 9459 components: - type: Transform @@ -63235,7 +64749,7 @@ entities: pos: -5.5,-315.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9463 components: - type: Transform @@ -63243,7 +64757,25 @@ entities: pos: 5.5,-358.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' + - uid: 13628 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -17.5,-253.5 + parent: 2 + - uid: 14824 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -17.5,-255.5 + parent: 2 + - uid: 14944 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -19.5,-256.5 + parent: 2 - proto: GasThermoMachineFreezer entities: - uid: 9464 @@ -63251,14 +64783,40 @@ entities: - type: Transform pos: -4.5,-168.5 parent: 2 -- proto: GasValve - entities: - - uid: 9465 + - uid: 17107 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -18.5,-263.5 + rot: 3.141592653589793 rad + pos: -15.5,-265.5 parent: 2 +- proto: GasThermoMachineHeater + entities: + - uid: 17108 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -16.5,-265.5 + parent: 2 +- proto: GasValve + entities: + - uid: 3985 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -18.5,-249.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 7646 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -18.5,-250.5 + parent: 2 + - type: GasValve + open: False + - type: AtmosPipeColor + color: '#FF1212FF' - proto: GasVentPump entities: - uid: 9466 @@ -63271,14 +64829,14 @@ entities: deviceLists: - 65 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9467 components: - type: Transform pos: -3.5,1.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9468 components: - type: Transform @@ -63289,7 +64847,7 @@ entities: deviceLists: - 9 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9469 components: - type: Transform @@ -63297,7 +64855,7 @@ entities: pos: 1.5,-210.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9470 components: - type: Transform @@ -63305,14 +64863,14 @@ entities: pos: -3.5,-17.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9471 components: - type: Transform pos: -1.5,-6.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9472 components: - type: Transform @@ -63320,7 +64878,7 @@ entities: pos: -1.5,-2.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9473 components: - type: Transform @@ -63331,7 +64889,7 @@ entities: deviceLists: - 12 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9474 components: - type: Transform @@ -63339,7 +64897,7 @@ entities: pos: 5.5,0.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9475 components: - type: Transform @@ -63347,7 +64905,7 @@ entities: pos: 1.5,-46.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9476 components: - type: Transform @@ -63358,7 +64916,7 @@ entities: deviceLists: - 16 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9477 components: - type: Transform @@ -63369,7 +64927,7 @@ entities: deviceLists: - 15 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9478 components: - type: Transform @@ -63380,7 +64938,7 @@ entities: deviceLists: - 55 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9479 components: - type: Transform @@ -63388,7 +64946,7 @@ entities: pos: -0.5,-160.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9480 components: - type: Transform @@ -63396,14 +64954,14 @@ entities: pos: -0.5,-227.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9481 components: - type: Transform pos: -3.5,-259.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9482 components: - type: Transform @@ -63411,7 +64969,7 @@ entities: pos: 6.5,-31.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9483 components: - type: Transform @@ -63419,7 +64977,7 @@ entities: pos: -4.5,-42.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9484 components: - type: Transform @@ -63430,7 +64988,7 @@ entities: deviceLists: - 55 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9485 components: - type: Transform @@ -63441,7 +64999,7 @@ entities: deviceLists: - 18 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9486 components: - type: Transform @@ -63452,14 +65010,14 @@ entities: deviceLists: - 63 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9487 components: - type: Transform pos: -2.5,-11.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9488 components: - type: Transform @@ -63467,7 +65025,7 @@ entities: pos: -0.5,-79.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9489 components: - type: Transform @@ -63475,7 +65033,7 @@ entities: pos: -1.5,-62.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9490 components: - type: Transform @@ -63483,7 +65041,7 @@ entities: pos: 2.5,-16.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9491 components: - type: Transform @@ -63491,7 +65049,7 @@ entities: pos: 5.5,-68.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9492 components: - type: Transform @@ -63502,7 +65060,7 @@ entities: deviceLists: - 19 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9493 components: - type: Transform @@ -63510,7 +65068,7 @@ entities: pos: 1.5,-73.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9494 components: - type: Transform @@ -63521,7 +65079,7 @@ entities: deviceLists: - 14 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9495 components: - type: Transform @@ -63532,14 +65090,14 @@ entities: deviceLists: - 17 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9496 components: - type: Transform pos: -4.5,-324.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9497 components: - type: Transform @@ -63547,7 +65105,7 @@ entities: pos: 1.5,-289.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9498 components: - type: Transform @@ -63555,7 +65113,7 @@ entities: pos: -0.5,-25.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9499 components: - type: Transform @@ -63563,7 +65121,7 @@ entities: pos: -0.5,-52.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9500 components: - type: Transform @@ -63571,7 +65129,7 @@ entities: pos: -2.5,-13.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9501 components: - type: Transform @@ -63582,7 +65140,7 @@ entities: deviceLists: - 16 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9502 components: - type: Transform @@ -63593,7 +65151,7 @@ entities: deviceLists: - 21 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9503 components: - type: Transform @@ -63603,7 +65161,7 @@ entities: deviceLists: - 24 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9504 components: - type: Transform @@ -63614,7 +65172,7 @@ entities: deviceLists: - 25 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9505 components: - type: Transform @@ -63634,7 +65192,7 @@ entities: pos: -3.5,-96.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9507 components: - type: Transform @@ -63642,7 +65200,7 @@ entities: pos: 1.5,-100.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9508 components: - type: Transform @@ -63653,7 +65211,7 @@ entities: deviceLists: - 22 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9509 components: - type: Transform @@ -63661,7 +65219,7 @@ entities: pos: -0.5,-106.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9510 components: - type: Transform @@ -63672,7 +65230,7 @@ entities: deviceLists: - 26 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9511 components: - type: Transform @@ -63683,7 +65241,7 @@ entities: deviceLists: - 26 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9512 components: - type: Transform @@ -63691,7 +65249,7 @@ entities: pos: -0.5,-136.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9513 components: - type: Transform @@ -63699,7 +65257,7 @@ entities: pos: 3.5,-110.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9514 components: - type: Transform @@ -63707,7 +65265,7 @@ entities: pos: 5.5,-110.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9515 components: - type: Transform @@ -63718,7 +65276,7 @@ entities: deviceLists: - 30 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9516 components: - type: Transform @@ -63729,7 +65287,7 @@ entities: deviceLists: - 26 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9517 components: - type: Transform @@ -63740,7 +65298,7 @@ entities: deviceLists: - 26 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9518 components: - type: Transform @@ -63751,7 +65309,7 @@ entities: deviceLists: - 26 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9519 components: - type: Transform @@ -63762,7 +65320,7 @@ entities: deviceLists: - 26 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9520 components: - type: Transform @@ -63773,7 +65331,7 @@ entities: deviceLists: - 26 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9521 components: - type: Transform @@ -63784,7 +65342,7 @@ entities: deviceLists: - 39 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9522 components: - type: Transform @@ -63794,7 +65352,7 @@ entities: deviceLists: - 29 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9523 components: - type: Transform @@ -63802,7 +65360,7 @@ entities: pos: -0.5,-133.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9524 components: - type: Transform @@ -63813,7 +65371,7 @@ entities: deviceLists: - 27 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9525 components: - type: Transform @@ -63824,7 +65382,7 @@ entities: deviceLists: - 28 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9526 components: - type: Transform @@ -63832,7 +65390,7 @@ entities: pos: 1.5,-194.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9527 components: - type: Transform @@ -63869,14 +65427,14 @@ entities: deviceLists: - 35 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9530 components: - type: Transform pos: -4.5,-38.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9531 components: - type: Transform @@ -63884,7 +65442,7 @@ entities: pos: 1.5,-154.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9532 components: - type: Transform @@ -63892,7 +65450,7 @@ entities: pos: 1.5,-167.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9533 components: - type: Transform @@ -63900,7 +65458,7 @@ entities: pos: -0.5,-187.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9534 components: - type: Transform @@ -63908,7 +65466,7 @@ entities: pos: 1.5,-181.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9535 components: - type: Transform @@ -63916,7 +65474,7 @@ entities: pos: 1.5,-19.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9536 components: - type: Transform @@ -63924,7 +65482,7 @@ entities: pos: 1.5,-127.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9537 components: - type: Transform @@ -63935,7 +65493,7 @@ entities: deviceLists: - 23 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9538 components: - type: Transform @@ -63946,7 +65504,7 @@ entities: deviceLists: - 44 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9539 components: - type: Transform @@ -63954,7 +65512,7 @@ entities: pos: -0.5,-221.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9540 components: - type: Transform @@ -63965,7 +65523,7 @@ entities: deviceLists: - 37 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9541 components: - type: Transform @@ -63973,7 +65531,7 @@ entities: pos: 4.5,-149.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9542 components: - type: Transform @@ -63984,7 +65542,7 @@ entities: deviceLists: - 33 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9543 components: - type: Transform @@ -63995,7 +65553,7 @@ entities: deviceLists: - 49 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9544 components: - type: Transform @@ -64006,7 +65564,7 @@ entities: deviceLists: - 70 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9545 components: - type: Transform @@ -64017,7 +65575,7 @@ entities: deviceLists: - 45 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9546 components: - type: Transform @@ -64028,7 +65586,7 @@ entities: deviceLists: - 71 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9547 components: - type: Transform @@ -64036,7 +65594,7 @@ entities: pos: 18.5,-243.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9548 components: - type: Transform @@ -64047,7 +65605,7 @@ entities: deviceLists: - 70 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9549 components: - type: Transform @@ -64055,7 +65613,7 @@ entities: pos: -0.5,-241.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9550 components: - type: Transform @@ -64066,7 +65624,7 @@ entities: deviceLists: - 71 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9551 components: - type: Transform @@ -64074,7 +65632,7 @@ entities: pos: 1.5,-235.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9552 components: - type: Transform @@ -64085,7 +65643,7 @@ entities: deviceLists: - 70 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9553 components: - type: Transform @@ -64096,7 +65654,7 @@ entities: deviceLists: - 48 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9554 components: - type: Transform @@ -64107,7 +65665,7 @@ entities: deviceLists: - 49 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9555 components: - type: Transform @@ -64130,7 +65688,7 @@ entities: pos: 1.5,-208.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9557 components: - type: Transform @@ -64141,7 +65699,7 @@ entities: deviceLists: - 46 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9558 components: - type: Transform @@ -64149,7 +65707,7 @@ entities: pos: -0.5,-214.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9559 components: - type: Transform @@ -64157,7 +65715,7 @@ entities: pos: -2.5,-219.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9560 components: - type: Transform @@ -64165,7 +65723,7 @@ entities: pos: 3.5,-219.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9561 components: - type: Transform @@ -64173,7 +65731,7 @@ entities: pos: -2.5,-230.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9562 components: - type: Transform @@ -64181,7 +65739,7 @@ entities: pos: 3.5,-230.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9563 components: - type: Transform @@ -64189,7 +65747,7 @@ entities: pos: -0.5,-286.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9564 components: - type: Transform @@ -64200,14 +65758,14 @@ entities: deviceLists: - 57 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9565 components: - type: Transform pos: -3.5,-314.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9566 components: - type: Transform @@ -64218,7 +65776,7 @@ entities: deviceLists: - 61 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9567 components: - type: Transform @@ -64226,7 +65784,7 @@ entities: pos: -6.5,-175.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9568 components: - type: Transform @@ -64249,7 +65807,7 @@ entities: deviceLists: - 41 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9570 components: - type: Transform @@ -64257,7 +65815,7 @@ entities: pos: 3.5,-163.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9571 components: - type: Transform @@ -64265,7 +65823,7 @@ entities: pos: 6.5,-336.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9572 components: - type: Transform @@ -64276,7 +65834,7 @@ entities: deviceLists: - 63 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9573 components: - type: Transform @@ -64287,7 +65845,7 @@ entities: deviceLists: - 63 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9574 components: - type: Transform @@ -64295,7 +65853,7 @@ entities: pos: 10.5,-251.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9575 components: - type: Transform @@ -64303,7 +65861,7 @@ entities: pos: -2.5,-107.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9576 components: - type: Transform @@ -64311,7 +65869,7 @@ entities: pos: 6.5,-18.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9577 components: - type: Transform @@ -64319,14 +65877,14 @@ entities: pos: 5.5,-178.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9578 components: - type: Transform pos: 3.5,-151.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9579 components: - type: Transform @@ -64337,7 +65895,7 @@ entities: deviceLists: - 16 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9580 components: - type: Transform @@ -64345,7 +65903,7 @@ entities: pos: 1.5,-262.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9581 components: - type: Transform @@ -64356,7 +65914,7 @@ entities: deviceLists: - 71 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9582 components: - type: Transform @@ -64364,7 +65922,7 @@ entities: pos: 15.5,-263.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9583 components: - type: Transform @@ -64375,7 +65933,7 @@ entities: deviceLists: - 38 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9584 components: - type: Transform @@ -64398,7 +65956,7 @@ entities: deviceLists: - 68 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9586 components: - type: Transform @@ -64409,7 +65967,7 @@ entities: deviceLists: - 13 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9587 components: - type: Transform @@ -64417,7 +65975,7 @@ entities: pos: 1.5,-50.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9588 components: - type: Transform @@ -64425,7 +65983,7 @@ entities: pos: 3.5,-260.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9589 components: - type: Transform @@ -64436,7 +65994,7 @@ entities: deviceLists: - 44 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9590 components: - type: Transform @@ -64444,7 +66002,7 @@ entities: pos: -4.5,-165.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9591 components: - type: Transform @@ -64455,7 +66013,7 @@ entities: deviceLists: - 44 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9592 components: - type: Transform @@ -64463,7 +66021,7 @@ entities: pos: -0.5,-268.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9593 components: - type: Transform @@ -64474,7 +66032,7 @@ entities: deviceLists: - 21 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9594 components: - type: Transform @@ -64485,7 +66043,7 @@ entities: deviceLists: - 21 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9595 components: - type: Transform @@ -64493,7 +66051,7 @@ entities: pos: -5.5,-81.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9596 components: - type: Transform @@ -64504,7 +66062,7 @@ entities: deviceLists: - 22 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9597 components: - type: Transform @@ -64529,7 +66087,7 @@ entities: deviceLists: - 29 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9599 components: - type: Transform @@ -64537,7 +66095,7 @@ entities: pos: -0.5,-354.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9600 components: - type: Transform @@ -64545,7 +66103,7 @@ entities: pos: 6.5,-343.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9601 components: - type: Transform @@ -64553,7 +66111,7 @@ entities: pos: 5.5,-139.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9602 components: - type: Transform @@ -64561,7 +66119,7 @@ entities: pos: 6.5,-2.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9603 components: - type: Transform @@ -64569,7 +66127,7 @@ entities: pos: -0.5,-295.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9604 components: - type: Transform @@ -64577,7 +66135,7 @@ entities: pos: 1.5,-348.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9605 components: - type: Transform @@ -64588,7 +66146,7 @@ entities: deviceLists: - 54 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9606 components: - type: Transform @@ -64596,7 +66154,7 @@ entities: pos: -1.5,-176.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9607 components: - type: Transform @@ -64607,7 +66165,7 @@ entities: deviceLists: - 14 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9608 components: - type: Transform @@ -64627,7 +66185,7 @@ entities: pos: 5.5,-284.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9610 components: - type: Transform @@ -64638,7 +66196,7 @@ entities: deviceLists: - 67 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9611 components: - type: Transform @@ -64646,7 +66204,7 @@ entities: pos: -0.5,-212.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9612 components: - type: Transform @@ -64657,7 +66215,7 @@ entities: deviceLists: - 53 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9613 components: - type: Transform @@ -64668,7 +66226,7 @@ entities: deviceLists: - 5 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9614 components: - type: Transform @@ -64676,7 +66234,7 @@ entities: pos: -2.5,-297.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9615 components: - type: Transform @@ -64684,7 +66242,7 @@ entities: pos: 1.5,-321.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9616 components: - type: Transform @@ -64695,14 +66253,14 @@ entities: deviceLists: - 8 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9617 components: - type: Transform pos: 5.5,-265.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9618 components: - type: Transform @@ -64713,7 +66271,7 @@ entities: deviceLists: - 56 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9619 components: - type: Transform @@ -64723,7 +66281,7 @@ entities: deviceLists: - 60 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9620 components: - type: Transform @@ -64734,7 +66292,7 @@ entities: deviceLists: - 55 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9621 components: - type: Transform @@ -64746,7 +66304,7 @@ entities: - 61 - 57 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9622 components: - type: Transform @@ -64754,7 +66312,7 @@ entities: pos: 10.5,-311.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9623 components: - type: Transform @@ -64762,14 +66320,14 @@ entities: pos: 6.5,-311.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9624 components: - type: Transform pos: 9.5,-304.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9625 components: - type: Transform @@ -64780,7 +66338,7 @@ entities: deviceLists: - 59 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9626 components: - type: Transform @@ -64788,7 +66346,7 @@ entities: pos: 4.5,-330.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9627 components: - type: Transform @@ -64796,7 +66354,7 @@ entities: pos: 1.5,-342.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9628 components: - type: Transform @@ -64807,7 +66365,7 @@ entities: deviceLists: - 44 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9629 components: - type: Transform @@ -64815,7 +66373,7 @@ entities: pos: -3.5,-330.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9630 components: - type: Transform @@ -64825,7 +66383,7 @@ entities: deviceLists: - 11 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9631 components: - type: Transform @@ -64836,7 +66394,7 @@ entities: deviceLists: - 67 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9632 components: - type: Transform @@ -64848,7 +66406,7 @@ entities: - 61 - 57 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9633 components: - type: Transform @@ -64858,7 +66416,7 @@ entities: deviceLists: - 63 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9634 components: - type: Transform @@ -64869,7 +66427,7 @@ entities: deviceLists: - 63 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9635 components: - type: Transform @@ -64880,7 +66438,7 @@ entities: deviceLists: - 63 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9636 components: - type: Transform @@ -64891,7 +66449,7 @@ entities: deviceLists: - 63 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9637 components: - type: Transform @@ -64902,7 +66460,7 @@ entities: deviceLists: - 64 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9638 components: - type: Transform @@ -64913,7 +66471,7 @@ entities: deviceLists: - 64 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9639 components: - type: Transform @@ -64924,7 +66482,7 @@ entities: deviceLists: - 63 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9640 components: - type: Transform @@ -64935,7 +66493,7 @@ entities: deviceLists: - 63 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9641 components: - type: Transform @@ -64945,7 +66503,7 @@ entities: deviceLists: - 65 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9642 components: - type: Transform @@ -64956,7 +66514,7 @@ entities: deviceLists: - 65 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9643 components: - type: Transform @@ -64967,7 +66525,7 @@ entities: deviceLists: - 7 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9644 components: - type: Transform @@ -64978,7 +66536,7 @@ entities: deviceLists: - 51 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9645 components: - type: Transform @@ -64986,7 +66544,7 @@ entities: pos: 1.5,-274.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9646 components: - type: Transform @@ -64996,7 +66554,7 @@ entities: deviceLists: - 20 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9647 components: - type: Transform @@ -65007,28 +66565,28 @@ entities: deviceLists: - 43 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9648 components: - type: Transform pos: 5.5,-22.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9649 components: - type: Transform pos: -4.5,-22.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9650 components: - type: Transform pos: 5.5,-49.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9651 components: - type: Transform @@ -65039,21 +66597,21 @@ entities: deviceLists: - 62 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9652 components: - type: Transform pos: -4.5,-76.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9653 components: - type: Transform pos: 5.5,-76.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9654 components: - type: Transform @@ -65067,7 +66625,7 @@ entities: pos: -4.5,-103.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9656 components: - type: Transform @@ -65078,14 +66636,14 @@ entities: deviceLists: - 38 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9657 components: - type: Transform pos: -4.5,-130.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9658 components: - type: Transform @@ -65100,14 +66658,14 @@ entities: pos: -5.5,-132.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9660 components: - type: Transform pos: -4.5,-184.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9661 components: - type: Transform @@ -65118,7 +66676,7 @@ entities: deviceLists: - 13 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9662 components: - type: Transform @@ -65126,7 +66684,7 @@ entities: pos: 8.5,-190.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9663 components: - type: Transform @@ -65134,14 +66692,14 @@ entities: pos: -0.5,-48.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9664 components: - type: Transform pos: -4.5,-157.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9665 components: - type: Transform @@ -65149,7 +66707,7 @@ entities: pos: 5.5,-157.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9666 components: - type: Transform @@ -65160,7 +66718,7 @@ entities: deviceLists: - 22 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9667 components: - type: Transform @@ -65171,7 +66729,7 @@ entities: deviceLists: - 29 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9668 components: - type: Transform @@ -65179,7 +66737,7 @@ entities: pos: 5.5,-292.5 parent: 2 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9669 components: - type: Transform @@ -65190,7 +66748,7 @@ entities: deviceLists: - 63 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' - uid: 9670 components: - type: Transform @@ -65201,7 +66759,15 @@ entities: deviceLists: - 72 - type: AtmosPipeColor - color: '#0055CCFF' + color: '#0335FCFF' + - uid: 17022 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -13.5,-264.5 + parent: 2 + - type: AtmosPipeColor + color: '#0335FCFF' - proto: GasVentScrubber entities: - uid: 9671 @@ -65462,7 +67028,7 @@ entities: pos: 17.5,-263.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 9701 components: - type: Transform @@ -66003,7 +67569,7 @@ entities: deviceLists: - 70 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 9758 components: - type: Transform @@ -66025,7 +67591,7 @@ entities: deviceLists: - 71 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 9760 components: - type: Transform @@ -66211,7 +67777,7 @@ entities: pos: 15.5,-243.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 9779 components: - type: Transform @@ -66256,7 +67822,7 @@ entities: pos: -0.5,-262.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 9784 components: - type: Transform @@ -66274,14 +67840,14 @@ entities: pos: 10.5,-253.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 9786 components: - type: Transform pos: -3.5,-243.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 9787 components: - type: Transform @@ -66318,7 +67884,7 @@ entities: deviceLists: - 68 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 9791 components: - type: Transform @@ -66326,7 +67892,7 @@ entities: pos: 4.5,-260.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 9792 components: - type: Transform @@ -66363,7 +67929,7 @@ entities: pos: 1.5,-241.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 9797 components: - type: Transform @@ -66424,7 +67990,7 @@ entities: pos: -2.5,-260.5 parent: 2 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 9804 components: - type: Transform @@ -66639,7 +68205,7 @@ entities: deviceLists: - 71 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 9827 components: - type: Transform @@ -66659,7 +68225,7 @@ entities: deviceLists: - 71 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' - uid: 9829 components: - type: Transform @@ -66752,7 +68318,22 @@ entities: deviceLists: - 72 - type: AtmosPipeColor - color: '#990000FF' + color: '#FF1212FF' + - uid: 17020 + components: + - type: Transform + pos: -13.5,-257.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' + - uid: 17021 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -16.5,-251.5 + parent: 2 + - type: AtmosPipeColor + color: '#FF1212FF' - proto: GasVolumePump entities: - uid: 9839 @@ -66821,6 +68402,121 @@ entities: parent: 2 - proto: Grille entities: + - uid: 920 + components: + - type: Transform + pos: -20.5,-250.5 + parent: 2 + - uid: 3039 + components: + - type: Transform + pos: -20.5,-263.5 + parent: 2 + - uid: 3048 + components: + - type: Transform + pos: -20.5,-259.5 + parent: 2 + - uid: 3961 + components: + - type: Transform + pos: -20.5,-251.5 + parent: 2 + - uid: 3975 + components: + - type: Transform + pos: -20.5,-249.5 + parent: 2 + - uid: 3988 + components: + - type: Transform + pos: -22.5,-259.5 + parent: 2 + - uid: 4230 + components: + - type: Transform + pos: -22.5,-257.5 + parent: 2 + - uid: 4231 + components: + - type: Transform + pos: -22.5,-251.5 + parent: 2 + - uid: 4670 + components: + - type: Transform + pos: -20.5,-253.5 + parent: 2 + - uid: 4671 + components: + - type: Transform + pos: -20.5,-258.5 + parent: 2 + - uid: 4672 + components: + - type: Transform + pos: -20.5,-254.5 + parent: 2 + - uid: 7558 + components: + - type: Transform + pos: -20.5,-252.5 + parent: 2 + - uid: 7560 + components: + - type: Transform + pos: -22.5,-253.5 + parent: 2 + - uid: 7562 + components: + - type: Transform + pos: -20.5,-264.5 + parent: 2 + - uid: 7564 + components: + - type: Transform + pos: -20.5,-256.5 + parent: 2 + - uid: 7600 + components: + - type: Transform + pos: -20.5,-257.5 + parent: 2 + - uid: 7655 + components: + - type: Transform + pos: -20.5,-255.5 + parent: 2 + - uid: 7977 + components: + - type: Transform + pos: -22.5,-263.5 + parent: 2 + - uid: 7981 + components: + - type: Transform + pos: -20.5,-261.5 + parent: 2 + - uid: 8501 + components: + - type: Transform + pos: -22.5,-255.5 + parent: 2 + - uid: 8636 + components: + - type: Transform + pos: 1.5,-83.5 + parent: 2 + - uid: 8638 + components: + - type: Transform + pos: -7.5,-82.5 + parent: 2 + - uid: 8640 + components: + - type: Transform + pos: 0.5,-83.5 + parent: 2 - uid: 9850 components: - type: Transform @@ -67004,16 +68700,10 @@ entities: - type: Transform pos: -6.5,-72.5 parent: 2 - - uid: 9886 - components: - - type: Transform - pos: 0.5,-83.5 - parent: 2 - uid: 9887 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -3.5,-285.5 + pos: -8.5,-90.5 parent: 2 - uid: 9888 components: @@ -67053,12 +68743,12 @@ entities: - uid: 9895 components: - type: Transform - pos: -7.5,-90.5 + pos: -10.5,-88.5 parent: 2 - uid: 9896 components: - type: Transform - pos: -7.5,-82.5 + pos: -9.5,-82.5 parent: 2 - uid: 9897 components: @@ -67151,11 +68841,6 @@ entities: - type: Transform pos: 1.5,-93.5 parent: 2 - - uid: 9915 - components: - - type: Transform - pos: 1.5,-83.5 - parent: 2 - uid: 9916 components: - type: Transform @@ -67269,7 +68954,7 @@ entities: - uid: 9938 components: - type: Transform - pos: 1.5,-122.5 + pos: -9.5,-90.5 parent: 2 - uid: 9939 components: @@ -67292,11 +68977,6 @@ entities: rot: 3.141592653589793 rad pos: 3.5,20.5 parent: 2 - - uid: 9943 - components: - - type: Transform - pos: -18.5,-249.5 - parent: 2 - uid: 9944 components: - type: Transform @@ -67986,20 +69666,13 @@ entities: - uid: 10074 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -18.5,-257.5 + pos: -10.5,-83.5 parent: 2 - uid: 10075 components: - type: Transform pos: 14.5,-245.5 parent: 2 - - uid: 10076 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -18.5,-261.5 - parent: 2 - uid: 10077 components: - type: Transform @@ -68011,12 +69684,6 @@ entities: rot: 1.5707963267948966 rad pos: -8.5,-255.5 parent: 2 - - uid: 10079 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -18.5,-260.5 - parent: 2 - uid: 10080 components: - type: Transform @@ -68063,11 +69730,6 @@ entities: - type: Transform pos: -18.5,-344.5 parent: 2 - - uid: 10089 - components: - - type: Transform - pos: -3.5,-273.5 - parent: 2 - uid: 10090 components: - type: Transform @@ -68118,12 +69780,6 @@ entities: - type: Transform pos: -6.5,-278.5 parent: 2 - - uid: 10100 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -2.5,-286.5 - parent: 2 - uid: 10101 components: - type: Transform @@ -68136,34 +69792,6 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,-275.5 parent: 2 - - uid: 10103 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -4.5,-284.5 - parent: 2 - - uid: 10104 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,-272.5 - parent: 2 - - uid: 10105 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -4.5,-274.5 - parent: 2 - - uid: 10106 - components: - - type: Transform - pos: -1.5,-282.5 - parent: 2 - - uid: 10107 - components: - - type: Transform - pos: -0.5,-283.5 - parent: 2 - uid: 10108 components: - type: Transform @@ -68328,8 +69956,7 @@ entities: - uid: 10136 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -18.5,-255.5 + pos: -1.5,-275.5 parent: 2 - uid: 10137 components: @@ -68495,12 +70122,6 @@ entities: - type: Transform pos: -19.5,-87.5 parent: 2 - - uid: 10166 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -18.5,-253.5 - parent: 2 - uid: 10167 components: - type: Transform @@ -68694,12 +70315,6 @@ entities: rot: -1.5707963267948966 rad pos: -0.5,-369.5 parent: 2 - - uid: 10200 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -18.5,-251.5 - parent: 2 - uid: 10201 components: - type: Transform @@ -68741,12 +70356,6 @@ entities: - type: Transform pos: -4.5,-381.5 parent: 2 - - uid: 10208 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -18.5,-259.5 - parent: 2 - uid: 10209 components: - type: Transform @@ -68762,12 +70371,6 @@ entities: - type: Transform pos: 20.5,-246.5 parent: 2 - - uid: 10212 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -21.5,-263.5 - parent: 2 - uid: 10213 components: - type: Transform @@ -70655,6 +72258,530 @@ entities: - type: Transform pos: -15.5,-161.5 parent: 2 + - uid: 10583 + components: + - type: Transform + pos: -3.5,-273.5 + parent: 2 + - uid: 10584 + components: + - type: Transform + pos: -3.5,-272.5 + parent: 2 + - uid: 10604 + components: + - type: Transform + pos: -4.5,-273.5 + parent: 2 + - uid: 12328 + components: + - type: Transform + pos: -9.5,-89.5 + parent: 2 + - uid: 12330 + components: + - type: Transform + pos: -8.5,-82.5 + parent: 2 + - uid: 12331 + components: + - type: Transform + pos: -10.5,-89.5 + parent: 2 + - uid: 12332 + components: + - type: Transform + pos: -9.5,-83.5 + parent: 2 + - uid: 12333 + components: + - type: Transform + pos: -10.5,-84.5 + parent: 2 + - uid: 12334 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,-122.5 + parent: 2 + - uid: 12480 + components: + - type: Transform + pos: -7.5,-90.5 + parent: 2 + - uid: 12888 + components: + - type: Transform + pos: -4.5,-274.5 + parent: 2 + - uid: 12896 + components: + - type: Transform + pos: -2.5,-272.5 + parent: 2 + - uid: 14947 + components: + - type: Transform + pos: -20.5,-260.5 + parent: 2 + - uid: 14951 + components: + - type: Transform + pos: -20.5,-262.5 + parent: 2 + - uid: 14952 + components: + - type: Transform + pos: -22.5,-261.5 + parent: 2 + - uid: 16516 + components: + - type: Transform + pos: -24.5,-270.5 + parent: 2 + - uid: 16985 + components: + - type: Transform + pos: -20.5,-265.5 + parent: 2 + - uid: 16990 + components: + - type: Transform + pos: -11.5,-266.5 + parent: 2 + - uid: 16991 + components: + - type: Transform + pos: -10.5,-266.5 + parent: 2 + - uid: 16992 + components: + - type: Transform + pos: -10.5,-265.5 + parent: 2 + - uid: 16993 + components: + - type: Transform + pos: -10.5,-263.5 + parent: 2 + - uid: 16994 + components: + - type: Transform + pos: -10.5,-262.5 + parent: 2 + - uid: 16995 + components: + - type: Transform + pos: -10.5,-264.5 + parent: 2 + - uid: 16996 + components: + - type: Transform + pos: -11.5,-262.5 + parent: 2 + - uid: 17067 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -18.5,-270.5 + parent: 2 + - uid: 17068 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -17.5,-270.5 + parent: 2 + - uid: 17069 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -16.5,-270.5 + parent: 2 + - uid: 17070 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -16.5,-269.5 + parent: 2 + - uid: 17071 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -16.5,-268.5 + parent: 2 + - uid: 17082 + components: + - type: Transform + pos: -25.5,-270.5 + parent: 2 + - uid: 17085 + components: + - type: Transform + pos: -26.5,-270.5 + parent: 2 + - uid: 17086 + components: + - type: Transform + pos: -26.5,-266.5 + parent: 2 + - uid: 17087 + components: + - type: Transform + pos: -25.5,-266.5 + parent: 2 + - uid: 17088 + components: + - type: Transform + pos: -24.5,-266.5 + parent: 2 + - uid: 17114 + components: + - type: Transform + anchored: False + pos: -32.5,-260.5 + parent: 2 + - uid: 17115 + components: + - type: Transform + anchored: False + pos: -32.5,-259.5 + parent: 2 + - uid: 17116 + components: + - type: Transform + anchored: False + pos: -32.5,-258.5 + parent: 2 + - uid: 17117 + components: + - type: Transform + anchored: False + pos: -32.5,-257.5 + parent: 2 + - uid: 17118 + components: + - type: Transform + anchored: False + pos: -32.5,-256.5 + parent: 2 + - uid: 17119 + components: + - type: Transform + anchored: False + pos: -32.5,-255.5 + parent: 2 + - uid: 17120 + components: + - type: Transform + anchored: False + pos: -32.5,-253.5 + parent: 2 + - uid: 17121 + components: + - type: Transform + anchored: False + pos: -32.5,-254.5 + parent: 2 + - uid: 17122 + components: + - type: Transform + anchored: False + pos: -32.5,-251.5 + parent: 2 + - uid: 17123 + components: + - type: Transform + anchored: False + pos: -32.5,-252.5 + parent: 2 + - uid: 17160 + components: + - type: Transform + pos: -28.5,-246.5 + parent: 2 + - uid: 17166 + components: + - type: Transform + pos: -27.5,-245.5 + parent: 2 + - uid: 17167 + components: + - type: Transform + pos: -27.5,-244.5 + parent: 2 + - uid: 17168 + components: + - type: Transform + pos: -27.5,-243.5 + parent: 2 + - uid: 17169 + components: + - type: Transform + pos: -27.5,-242.5 + parent: 2 + - uid: 17171 + components: + - type: Transform + pos: -27.5,-240.5 + parent: 2 + - uid: 17172 + components: + - type: Transform + pos: -27.5,-239.5 + parent: 2 + - uid: 17173 + components: + - type: Transform + pos: -27.5,-238.5 + parent: 2 + - uid: 17174 + components: + - type: Transform + pos: -27.5,-237.5 + parent: 2 + - uid: 17175 + components: + - type: Transform + pos: -27.5,-236.5 + parent: 2 + - uid: 17176 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 21.5,-270.5 + parent: 2 + - uid: 17177 + components: + - type: Transform + pos: -31.5,-249.5 + parent: 2 + - uid: 17178 + components: + - type: Transform + pos: -31.5,-248.5 + parent: 2 + - uid: 17179 + components: + - type: Transform + pos: -31.5,-247.5 + parent: 2 + - uid: 17180 + components: + - type: Transform + pos: -31.5,-246.5 + parent: 2 + - uid: 17181 + components: + - type: Transform + pos: -30.5,-246.5 + parent: 2 + - uid: 17182 + components: + - type: Transform + pos: -29.5,-246.5 + parent: 2 + - uid: 17184 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 20.5,-270.5 + parent: 2 + - uid: 17185 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-270.5 + parent: 2 + - uid: 17186 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 18.5,-270.5 + parent: 2 + - uid: 17187 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.5,-270.5 + parent: 2 + - uid: 17188 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 15.5,-270.5 + parent: 2 + - uid: 17189 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 16.5,-270.5 + parent: 2 + - uid: 17190 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 14.5,-270.5 + parent: 2 + - uid: 17191 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 13.5,-270.5 + parent: 2 + - uid: 17198 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 21.5,-268.5 + parent: 2 + - uid: 17199 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 20.5,-268.5 + parent: 2 + - uid: 17200 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-268.5 + parent: 2 + - uid: 17201 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 18.5,-268.5 + parent: 2 + - uid: 17202 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.5,-268.5 + parent: 2 + - uid: 17203 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 16.5,-268.5 + parent: 2 + - uid: 17204 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 15.5,-268.5 + parent: 2 + - uid: 17205 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 14.5,-268.5 + parent: 2 + - uid: 17206 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 13.5,-268.5 + parent: 2 + - uid: 17211 + components: + - type: Transform + pos: -1.5,-283.5 + parent: 2 + - uid: 17212 + components: + - type: Transform + pos: -0.5,-283.5 + parent: 2 + - uid: 17213 + components: + - type: Transform + pos: -1.5,-282.5 + parent: 2 + - uid: 17214 + components: + - type: Transform + pos: -2.5,-286.5 + parent: 2 + - uid: 17215 + components: + - type: Transform + pos: -3.5,-286.5 + parent: 2 + - uid: 17216 + components: + - type: Transform + pos: -3.5,-285.5 + parent: 2 + - uid: 17217 + components: + - type: Transform + pos: -4.5,-285.5 + parent: 2 + - uid: 17218 + components: + - type: Transform + pos: -4.5,-284.5 + parent: 2 + - uid: 17357 + components: + - type: Transform + anchored: False + pos: -32.5,-261.5 + parent: 17356 + - uid: 17359 + components: + - type: Transform + anchored: False + pos: -32.5,-262.5 + parent: 17358 + - uid: 17361 + components: + - type: Transform + anchored: False + pos: -32.5,-263.5 + parent: 17360 + - uid: 17363 + components: + - type: Transform + anchored: False + pos: -32.5,-264.5 + parent: 17362 + - uid: 17367 + components: + - type: Transform + anchored: False + pos: -32.5,-266.5 + parent: 17366 + - uid: 17369 + components: + - type: Transform + anchored: False + pos: -32.5,-267.5 + parent: 17368 + - uid: 17371 + components: + - type: Transform + anchored: False + pos: -32.5,-268.5 + parent: 17370 + - uid: 17373 + components: + - type: Transform + anchored: False + pos: -32.5,-269.5 + parent: 17372 + - uid: 17389 + components: + - type: Transform + anchored: False + pos: -27.5,-235.5 + parent: 17388 + - uid: 17391 + components: + - type: Transform + anchored: False + pos: -27.5,-234.5 + parent: 17390 - proto: GrilleBroken entities: - uid: 10566 @@ -70697,6 +72824,30 @@ entities: rot: -1.5707963267948966 rad pos: -4.5,-247.5 parent: 2 + - uid: 17170 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -27.5,-241.5 + parent: 2 + - uid: 17183 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -27.5,-246.5 + parent: 2 + - uid: 17365 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -32.5,-265.5 + parent: 17364 + - uid: 17375 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -32.5,-270.5 + parent: 17374 - proto: GrilleDiagonal entities: - uid: 10573 @@ -70704,21 +72855,6 @@ entities: - type: Transform pos: -1.5,4.5 parent: 2 - - uid: 10574 - components: - - type: Transform - pos: -8.5,-82.5 - parent: 2 - - uid: 10575 - components: - - type: Transform - pos: -10.5,-84.5 - parent: 2 - - uid: 10576 - components: - - type: Transform - pos: -9.5,-83.5 - parent: 2 - uid: 10577 components: - type: Transform @@ -70730,42 +72866,6 @@ entities: rot: 3.141592653589793 rad pos: -0.5,3.5 parent: 2 - - uid: 10579 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -9.5,-88.5 - parent: 2 - - uid: 10580 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -9.5,-89.5 - parent: 2 - - uid: 10581 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -8.5,-90.5 - parent: 2 - - uid: 10582 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -9.5,-84.5 - parent: 2 - - uid: 10583 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -10.5,-88.5 - parent: 2 - - uid: 10584 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,-122.5 - parent: 2 - uid: 10585 components: - type: Transform @@ -70784,18 +72884,6 @@ entities: rot: -1.5707963267948966 rad pos: -8.5,-309.5 parent: 2 - - uid: 10588 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -8.5,-89.5 - parent: 2 - - uid: 10589 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -8.5,-83.5 - parent: 2 - uid: 10590 components: - type: Transform @@ -70814,17 +72902,6 @@ entities: rot: 3.141592653589793 rad pos: 8.5,-202.5 parent: 2 - - uid: 10593 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -3.5,-274.5 - parent: 2 - - uid: 10594 - components: - - type: Transform - pos: -3.5,-272.5 - parent: 2 - uid: 10595 components: - type: Transform @@ -70859,41 +72936,6 @@ entities: - type: Transform pos: -10.5,-307.5 parent: 2 - - uid: 10601 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -2.5,-273.5 - parent: 2 - - uid: 10602 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -3.5,-284.5 - parent: 2 - - uid: 10603 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -2.5,-285.5 - parent: 2 - - uid: 10604 - components: - - type: Transform - pos: -1.5,-275.5 - parent: 2 - - uid: 10605 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -3.5,-286.5 - parent: 2 - - uid: 10606 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -1.5,-283.5 - parent: 2 - uid: 10607 components: - type: Transform @@ -74144,7 +76186,7 @@ entities: pos: 8.5,-176.5 parent: 2 - type: Door - secondsUntilStateChange: -141291.3 + secondsUntilStateChange: -147335.61 state: Closing - uid: 11227 components: @@ -74238,6 +76280,11 @@ entities: - type: Transform pos: -1.4858844,-371.00397 parent: 2 + - uid: 16539 + components: + - type: Transform + pos: -8.480622,-89.43178 + parent: 2 - proto: HydroponicsToolSpade entities: - uid: 11242 @@ -74245,8 +76292,18 @@ entities: - type: Transform pos: -1.2279739,-371.28754 parent: 2 + - uid: 16540 + components: + - type: Transform + pos: -8.449372,-89.36928 + parent: 2 - proto: hydroponicsTray entities: + - uid: 559 + components: + - type: Transform + pos: -9.5,-88.5 + parent: 2 - uid: 11243 components: - type: Transform @@ -74290,6 +76347,11 @@ entities: rot: -1.5707963267948966 rad pos: -9.5,-87.5 parent: 2 + - uid: 16537 + components: + - type: Transform + pos: -9.5,-84.5 + parent: 2 - proto: Igniter entities: - uid: 11251 @@ -74302,6 +76364,13 @@ entities: - type: Transform pos: -13.227223,-246.42015 parent: 2 +- proto: InflatableDoorStack + entities: + - uid: 17048 + components: + - type: Transform + pos: -12.358273,-263.51736 + parent: 2 - proto: InflatableWall entities: - uid: 11253 @@ -74340,6 +76409,13 @@ entities: rot: -1.5707963267948966 rad pos: 17.5,-162.5 parent: 2 +- proto: InflatableWallStack + entities: + - uid: 17011 + components: + - type: Transform + pos: -12.514523,-263.3455 + parent: 2 - proto: InflatableWallStack1 entities: - uid: 11259 @@ -74479,15 +76555,6 @@ entities: - type: Transform pos: 4.3160653,0.73260295 parent: 2 -- proto: JetpackMini - entities: - - uid: 4697 - components: - - type: Transform - parent: 4694 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: JetpackMiniFilled entities: - uid: 11279 @@ -74505,6 +76572,23 @@ entities: - type: Transform pos: 9.644433,-115.27022 parent: 2 +- proto: JetpackSecurityFilled + entities: + - uid: 16534 + components: + - type: Transform + pos: 8.380586,-343.29535 + parent: 2 + - uid: 16535 + components: + - type: Transform + pos: 8.474336,-343.35785 + parent: 2 + - uid: 16536 + components: + - type: Transform + pos: 8.583711,-343.43597 + parent: 2 - proto: KitchenElectricGrill entities: - uid: 11282 @@ -74536,11 +76620,6 @@ entities: - type: Transform pos: 0.5,-86.5 parent: 2 - - uid: 11287 - components: - - type: Transform - pos: -4.5,-285.5 - parent: 2 - uid: 11288 components: - type: Transform @@ -74585,6 +76664,13 @@ entities: - type: Transform pos: -5.5,-91.5 parent: 2 +- proto: KnifePlastic + entities: + - uid: 10579 + components: + - type: Transform + pos: 6.372781,-141.47812 + parent: 2 - proto: KoboldCubeBox entities: - uid: 11296 @@ -74623,16 +76709,21 @@ entities: parent: 2 - proto: LampGold entities: - - uid: 11302 - components: - - type: Transform - pos: -5.572312,-71.25691 - parent: 2 - - uid: 11303 + - uid: 4695 components: - type: Transform rot: -1.5707963267948966 rad - pos: 5.654855,-328.25574 + pos: -2.333134,-72.039474 + parent: 2 + - uid: 13915 + components: + - type: Transform + pos: -13.5078535,-253.96864 + parent: 2 + - uid: 17247 + components: + - type: Transform + pos: 5.487414,-330.11176 parent: 2 - proto: LampInterrogator entities: @@ -74650,15 +76741,15 @@ entities: parent: 2 - proto: Lantern entities: - - uid: 11306 + - uid: 11623 components: - type: Transform - pos: 3.728132,-143.36674 + pos: 3.5,-143.5 parent: 2 - - uid: 11307 + - uid: 11648 components: - type: Transform - pos: 5.2072816,-143.33742 + pos: 5.5,-143.5 parent: 2 - proto: LargeBeaker entities: @@ -74719,32 +76810,33 @@ entities: - type: Transform pos: -13.643399,-246.28522 parent: 2 -- proto: LockerAtmosphericsFilledHardsuit +- proto: LockableButtonAtmospherics entities: - - uid: 11316 + - uid: 16524 components: - type: Transform - anchored: True - pos: -13.5,-263.5 + pos: -22.5,-266.5 parent: 2 - - type: Physics - bodyType: Static - - uid: 11317 + - type: DeviceLinkSource + linkedPorts: + 15823: + - Pressed: Toggle + 9057: + - Pressed: Toggle + 16513: + - Pressed: Toggle +- proto: LockerAtmosphericsFilled + entities: + - uid: 17001 components: - type: Transform - anchored: True - pos: -13.5,-264.5 + pos: -12.5,-265.5 parent: 2 - - type: Physics - bodyType: Static - - uid: 11318 + - uid: 17002 components: - type: Transform - anchored: True - pos: -13.5,-262.5 + pos: -11.5,-265.5 parent: 2 - - type: Physics - bodyType: Static - proto: LockerBoozeFilled entities: - uid: 11319 @@ -74843,10 +76935,10 @@ entities: ent: null - proto: LockerDetectiveFilled entities: - - uid: 11327 + - uid: 17248 components: - type: Transform - pos: -2.5,-73.5 + pos: 4.5,-328.5 parent: 2 - proto: LockerElectricalSupplies entities: @@ -75225,13 +77317,6 @@ entities: - type: Transform pos: 3.5,-261.5 parent: 2 -- proto: LuxuryPen - entities: - - uid: 11383 - components: - - type: Transform - pos: 5.7372117,-332.35062 - parent: 2 - proto: MachineAnomalyGenerator entities: - uid: 11384 @@ -75623,11 +77708,6 @@ entities: - type: Transform pos: 3.5,-18.5 parent: 2 - - uid: 11450 - components: - - type: Transform - pos: 4.5,-143.5 - parent: 2 - uid: 11451 components: - type: Transform @@ -75718,11 +77798,6 @@ entities: parent: 2 - proto: MaterialBones1 entities: - - uid: 11467 - components: - - type: Transform - pos: -9.6216,-313.45743 - parent: 2 - uid: 11468 components: - type: Transform @@ -75979,6 +78054,13 @@ entities: rot: -1.5707963267948966 rad pos: -1.3979578,-304.19202 parent: 2 +- proto: MicrophoneInstrument + entities: + - uid: 12887 + components: + - type: Transform + pos: -8.550903,-118.54294 + parent: 2 - proto: MiningWindow entities: - uid: 11511 @@ -76428,6 +78510,13 @@ entities: - type: Transform pos: -6.3614616,-189.46121 parent: 2 +- proto: NewsReaderCartridge + entities: + - uid: 12875 + components: + - type: Transform + pos: -8.535278,-118.25987 + parent: 2 - proto: NitrogenCanister entities: - uid: 11586 @@ -76440,20 +78529,20 @@ entities: - type: Transform pos: -4.5,-311.5 parent: 2 - - uid: 11588 - components: - - type: Transform - pos: -13.5,-250.5 - parent: 2 - uid: 11589 components: - type: Transform pos: 4.5,-1.5 parent: 2 - - uid: 11590 + - uid: 13903 components: - type: Transform - pos: -21.5,-257.5 + pos: -25.5,-251.5 + parent: 2 + - uid: 17113 + components: + - type: Transform + pos: -13.5,-257.5 parent: 2 - proto: NitrousOxideCanister entities: @@ -76515,15 +78604,15 @@ entities: parent: 2 - proto: OreBag entities: - - uid: 11600 + - uid: 13074 components: - type: Transform - pos: -4.660206,-273.15723 + pos: -4.617825,-272.35403 parent: 2 - - uid: 11601 + - uid: 17229 components: - type: Transform - pos: -4.3602595,-273.51703 + pos: -4.399075,-272.47903 parent: 2 - proto: OreProcessor entities: @@ -76534,6 +78623,11 @@ entities: parent: 2 - proto: OxygenCanister entities: + - uid: 11287 + components: + - type: Transform + pos: -25.5,-253.5 + parent: 2 - uid: 11603 components: - type: Transform @@ -76549,11 +78643,6 @@ entities: - type: Transform pos: -5.5,-312.5 parent: 2 - - uid: 11606 - components: - - type: Transform - pos: -21.5,-255.5 - parent: 2 - uid: 11607 components: - type: Transform @@ -76564,6 +78653,11 @@ entities: - type: Transform pos: -6.5,-258.5 parent: 2 + - uid: 17112 + components: + - type: Transform + pos: -13.5,-259.5 + parent: 2 - proto: PaintingAmogusTriptych entities: - uid: 11609 @@ -76580,16 +78674,6 @@ entities: parent: 2 - proto: Paper entities: - - uid: 11611 - components: - - type: Transform - pos: -5.538568,-72.16771 - parent: 2 - - uid: 11612 - components: - - type: Transform - pos: -5.6735435,-72.06651 - parent: 2 - uid: 11613 components: - type: Transform @@ -76600,16 +78684,6 @@ entities: - type: Transform pos: 1.1885252,-250.9767 parent: 2 - - uid: 11615 - components: - - type: Transform - pos: 5.1001754,-328.37433 - parent: 2 - - uid: 11616 - components: - - type: Transform - pos: 5.271862,-328.51956 - parent: 2 - proto: PaperBin10 entities: - uid: 11617 @@ -76635,11 +78709,6 @@ entities: - type: Transform pos: -1.5,-303.5 parent: 2 - - uid: 11621 - components: - - type: Transform - pos: 6.5,-332.5 - parent: 2 - proto: PaperBin5 entities: - uid: 11622 @@ -76648,11 +78717,6 @@ entities: rot: 3.141592653589793 rad pos: -5.5,-139.5 parent: 2 - - uid: 11623 - components: - - type: Transform - pos: -5.5,-72.5 - parent: 2 - proto: PaperOffice entities: - uid: 11624 @@ -76734,8 +78798,35 @@ entities: rot: 1.5707963267948966 rad pos: 18.5,-259.5 parent: 2 +- proto: PartRodMetal + entities: + - uid: 17059 + components: + - type: Transform + pos: -13.120564,-263.43057 + parent: 2 + - uid: 17060 + components: + - type: Transform + pos: -13.120564,-263.43057 + parent: 2 + - uid: 17209 + components: + - type: Transform + pos: 21.52842,-255.49559 + parent: 2 + - uid: 17210 + components: + - type: Transform + pos: 21.65342,-255.66747 + parent: 2 - proto: Pen entities: + - uid: 4760 + components: + - type: Transform + pos: -5.4438367,-71.46576 + parent: 2 - uid: 11635 components: - type: Transform @@ -76761,6 +78852,11 @@ entities: - type: Transform pos: 4.3734927,-272.86963 parent: 2 + - uid: 12874 + components: + - type: Transform + pos: -5.6625867,-71.481384 + parent: 2 - proto: PhoneInstrument entities: - uid: 11640 @@ -76783,11 +78879,6 @@ entities: - type: Transform pos: -7.5629373,-271.36987 parent: 2 - - uid: 11643 - components: - - type: Transform - pos: -4.5245614,-272.94254 - parent: 2 - uid: 11644 components: - type: Transform @@ -76809,8 +78900,20 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage +- proto: PlaqueAtmos + entities: + - uid: 13971 + components: + - type: Transform + pos: -12.5,-250.5 + parent: 2 - proto: PlasmaCanister entities: + - uid: 9045 + components: + - type: Transform + pos: -25.5,-259.5 + parent: 2 - uid: 11646 components: - type: Transform @@ -76821,11 +78924,6 @@ entities: - type: Transform pos: -5.5,-311.5 parent: 2 - - uid: 11648 - components: - - type: Transform - pos: -21.5,-251.5 - parent: 2 - proto: PlasmaReinforcedWindowDirectional entities: - uid: 11649 @@ -76961,13 +79059,6 @@ entities: parent: 11563 - type: Physics canCollide: False -- proto: PlushieSpaceLizard - entities: - - uid: 11669 - components: - - type: Transform - pos: -22.266762,-264.84647 - parent: 2 - proto: PortableFlasher entities: - uid: 11670 @@ -77012,14 +79103,6 @@ entities: - type: Transform pos: 4.5,-67.5 parent: 2 - - uid: 11678 - components: - - type: Transform - anchored: True - pos: -17.5,-265.5 - parent: 2 - - type: Physics - bodyType: Static - uid: 11679 components: - type: Transform @@ -77076,21 +79159,6 @@ entities: parent: 2 - proto: PortableScrubber entities: - - uid: 11689 - components: - - type: Transform - pos: -20.5,-263.5 - parent: 2 - - uid: 11690 - components: - - type: Transform - pos: -11.5,-254.5 - parent: 2 - - uid: 11691 - components: - - type: Transform - pos: -11.5,-253.5 - parent: 2 - uid: 11692 components: - type: Transform @@ -77101,11 +79169,6 @@ entities: - type: Transform pos: 2.5,-112.5 parent: 2 - - uid: 11694 - components: - - type: Transform - pos: -19.5,-263.5 - parent: 2 - uid: 11695 components: - type: Transform @@ -77151,6 +79214,13 @@ entities: deleteOnEmptyLinks: True linkedEntities: - 11697 +- proto: PosterContrabandAtmosiaDeclarationIndependence + entities: + - uid: 17008 + components: + - type: Transform + pos: -10.5,-254.5 + parent: 2 - proto: PosterContrabandBeachStarYamamoto entities: - uid: 11700 @@ -77459,18 +79529,6 @@ entities: parent: 2 - proto: Poweredlight entities: - - uid: 11751 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,-251.5 - parent: 2 - - uid: 11752 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,-257.5 - parent: 2 - uid: 11753 components: - type: Transform @@ -77654,18 +79712,6 @@ entities: rot: -1.5707963267948966 rad pos: -13.5,-261.5 parent: 2 - - uid: 11785 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -17.5,-252.5 - parent: 2 - - uid: 11786 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -18.5,-265.5 - parent: 2 - uid: 11787 components: - type: Transform @@ -77678,6 +79724,88 @@ entities: rot: -1.5707963267948966 rad pos: -13.5,-246.5 parent: 2 + - uid: 16965 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -25.5,-251.5 + parent: 2 + - uid: 16966 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -25.5,-253.5 + parent: 2 + - uid: 16967 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -25.5,-255.5 + parent: 2 + - uid: 16968 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -25.5,-257.5 + parent: 2 + - uid: 16969 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -25.5,-259.5 + parent: 2 + - uid: 16970 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -25.5,-261.5 + parent: 2 + - uid: 16971 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -25.5,-263.5 + parent: 2 + - uid: 16972 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -21.5,-250.5 + parent: 2 + - uid: 16973 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -21.5,-264.5 + parent: 2 + - uid: 16974 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -21.5,-256.5 + parent: 2 + - uid: 17057 + components: + - type: Transform + pos: -12.5,-263.5 + parent: 2 + - uid: 17083 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -17.5,-267.5 + parent: 2 + - uid: 17084 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -22.5,-269.5 + parent: 2 + - uid: 17089 + components: + - type: Transform + pos: -25.5,-265.5 + parent: 2 - proto: PoweredlightBlue entities: - uid: 11789 @@ -77703,12 +79831,6 @@ entities: - type: Transform pos: 4.5,-14.5 parent: 2 - - uid: 11793 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -21.5,-260.5 - parent: 2 - proto: PoweredlightExterior entities: - uid: 11794 @@ -78707,12 +80829,6 @@ entities: rot: 1.5707963267948966 rad pos: -5.5,-8.5 parent: 2 - - uid: 11967 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -21.5,-251.5 - parent: 2 - uid: 11968 components: - type: Transform @@ -78939,12 +81055,6 @@ entities: - type: Transform pos: -5.5,-95.5 parent: 2 - - uid: 12008 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -21.5,-257.5 - parent: 2 - uid: 12009 components: - type: Transform @@ -79136,12 +81246,6 @@ entities: - type: Transform pos: 1.5,-241.5 parent: 2 - - uid: 12043 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -21.5,-253.5 - parent: 2 - uid: 12044 components: - type: Transform @@ -79164,12 +81268,6 @@ entities: rot: 1.5707963267948966 rad pos: -2.5,-249.5 parent: 2 - - uid: 12048 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -21.5,-255.5 - parent: 2 - uid: 12049 components: - type: Transform @@ -79837,23 +81935,23 @@ entities: - type: Transform pos: -7.5,-260.5 parent: 2 - - uid: 12167 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -20.5,-263.5 - parent: 2 - - uid: 12168 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -20.5,-265.5 - parent: 2 - uid: 12169 components: - type: Transform pos: -6.5,-248.5 parent: 2 + - uid: 13850 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -11.5,-252.5 + parent: 2 + - uid: 16975 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -11.5,-256.5 + parent: 2 - proto: PoweredSmallLightEmpty entities: - uid: 12170 @@ -80143,13 +82241,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage - - uid: 935 - components: - - type: Transform - parent: 932 - - type: Physics - canCollide: False - - type: InsideEntityStorage - uid: 12221 components: - type: Transform @@ -80280,29 +82371,6 @@ entities: rot: -1.5707963267948966 rad pos: 5.5,-41.5 parent: 2 - - uid: 12244 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -0.5,-280.5 - parent: 2 - - uid: 12245 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 6.5,-142.5 - parent: 2 - - uid: 12246 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,-142.5 - parent: 2 - - uid: 12247 - components: - - type: Transform - pos: -0.5,-278.5 - parent: 2 - uid: 12248 components: - type: Transform @@ -80726,74 +82794,6 @@ entities: - type: Transform pos: 5.5,-42.5 parent: 2 - - uid: 12323 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 0.5,-278.5 - parent: 2 - - uid: 12324 - components: - - type: Transform - pos: 0.5,-280.5 - parent: 2 - - uid: 12325 - components: - - type: Transform - pos: 3.5,-142.5 - parent: 2 - - uid: 12326 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,-142.5 - parent: 2 - - uid: 12327 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,-141.5 - parent: 2 - - uid: 12328 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 5.5,-141.5 - parent: 2 - - uid: 12329 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 3.5,-141.5 - parent: 2 - - uid: 12330 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 6.5,-141.5 - parent: 2 - - uid: 12331 - components: - - type: Transform - pos: -6.5,-152.5 - parent: 2 - - uid: 12332 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -6.5,-152.5 - parent: 2 - - uid: 12333 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -6.5,-150.5 - parent: 2 - - uid: 12334 - components: - - type: Transform - pos: -6.5,-150.5 - parent: 2 - uid: 12335 components: - type: Transform @@ -81632,10 +83632,15 @@ entities: parent: 2 - proto: RandomArtifactSpawner entities: - - uid: 12480 + - uid: 10580 components: - type: Transform - pos: -8.5,-314.5 + pos: -9.5,-313.5 + parent: 2 + - uid: 11690 + components: + - type: Transform + pos: -9.5,-315.5 parent: 2 - uid: 16962 components: @@ -81649,6 +83654,16 @@ entities: - type: Transform pos: -9.5,-311.5 parent: 2 + - uid: 16532 + components: + - type: Transform + pos: 3.5,-278.5 + parent: 2 + - uid: 16533 + components: + - type: Transform + pos: 3.5,-279.5 + parent: 2 - proto: RandomBoard entities: - uid: 12482 @@ -81739,11 +83754,6 @@ entities: - type: Transform pos: 4.5,-6.5 parent: 2 - - uid: 12498 - components: - - type: Transform - pos: -7.5,-118.5 - parent: 2 - proto: RandomFoodMeal entities: - uid: 12499 @@ -81783,11 +83793,6 @@ entities: - type: Transform pos: 3.5,-87.5 parent: 2 - - uid: 12506 - components: - - type: Transform - pos: 3.5,-90.5 - parent: 2 - uid: 12507 components: - type: Transform @@ -82008,18 +84013,6 @@ entities: rot: 3.141592653589793 rad pos: -1.5,-95.5 parent: 2 - - uid: 12544 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,-83.5 - parent: 2 - - uid: 12545 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -5.5,-69.5 - parent: 2 - uid: 12546 components: - type: Transform @@ -82153,16 +84146,6 @@ entities: - type: Transform pos: -7.5,-134.5 parent: 2 - - uid: 12569 - components: - - type: Transform - pos: -5.5,-279.5 - parent: 2 - - uid: 12570 - components: - - type: Transform - pos: -5.5,-280.5 - parent: 2 - proto: RandomVendingDrinks entities: - uid: 12571 @@ -82226,6 +84209,136 @@ entities: parent: 2 - proto: ReinforcedPlasmaWindow entities: + - uid: 143 + components: + - type: Transform + pos: -22.5,-257.5 + parent: 2 + - uid: 144 + components: + - type: Transform + pos: -22.5,-255.5 + parent: 2 + - uid: 3047 + components: + - type: Transform + pos: -20.5,-261.5 + parent: 2 + - uid: 4291 + components: + - type: Transform + pos: -20.5,-250.5 + parent: 2 + - uid: 5240 + components: + - type: Transform + pos: -20.5,-253.5 + parent: 2 + - uid: 5241 + components: + - type: Transform + pos: -20.5,-255.5 + parent: 2 + - uid: 5245 + components: + - type: Transform + pos: -20.5,-256.5 + parent: 2 + - uid: 5267 + components: + - type: Transform + pos: -20.5,-262.5 + parent: 2 + - uid: 7151 + components: + - type: Transform + pos: -20.5,-263.5 + parent: 2 + - uid: 7561 + components: + - type: Transform + pos: -20.5,-264.5 + parent: 2 + - uid: 7579 + components: + - type: Transform + pos: -22.5,-259.5 + parent: 2 + - uid: 7588 + components: + - type: Transform + pos: -20.5,-251.5 + parent: 2 + - uid: 7633 + components: + - type: Transform + pos: -20.5,-257.5 + parent: 2 + - uid: 7648 + components: + - type: Transform + pos: -20.5,-252.5 + parent: 2 + - uid: 8455 + components: + - type: Transform + pos: -22.5,-263.5 + parent: 2 + - uid: 8456 + components: + - type: Transform + pos: -20.5,-258.5 + parent: 2 + - uid: 8546 + components: + - type: Transform + pos: -22.5,-261.5 + parent: 2 + - uid: 8588 + components: + - type: Transform + pos: -20.5,-254.5 + parent: 2 + - uid: 8608 + components: + - type: Transform + pos: -20.5,-249.5 + parent: 2 + - uid: 8611 + components: + - type: Transform + pos: -20.5,-259.5 + parent: 2 + - uid: 9050 + components: + - type: Transform + pos: -24.5,-266.5 + parent: 2 + - uid: 9323 + components: + - type: Transform + pos: -26.5,-266.5 + parent: 2 + - uid: 9448 + components: + - type: Transform + pos: -25.5,-270.5 + parent: 2 + - uid: 9455 + components: + - type: Transform + pos: -22.5,-253.5 + parent: 2 + - uid: 10089 + components: + - type: Transform + pos: -23.5,-267.5 + parent: 2 + - uid: 10107 + components: + - type: Transform + pos: -23.5,-269.5 + parent: 2 - uid: 12581 components: - type: Transform @@ -82376,8 +84489,147 @@ entities: - type: Transform pos: -7.5,-312.5 parent: 2 + - uid: 14357 + components: + - type: Transform + pos: -22.5,-251.5 + parent: 2 + - uid: 15007 + components: + - type: Transform + pos: -20.5,-260.5 + parent: 2 + - uid: 15869 + components: + - type: Transform + pos: -24.5,-270.5 + parent: 2 + - uid: 16435 + components: + - type: Transform + pos: -25.5,-266.5 + parent: 2 + - uid: 16477 + components: + - type: Transform + pos: -26.5,-270.5 + parent: 2 + - uid: 16986 + components: + - type: Transform + pos: -20.5,-265.5 + parent: 2 +- proto: ReinforcedShiv + entities: + - uid: 17207 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.43732,-269.6301 + parent: 2 - proto: ReinforcedWindow entities: + - uid: 4828 + components: + - type: Transform + pos: -2.5,-286.5 + parent: 2 + - uid: 4829 + components: + - type: Transform + pos: -3.5,-286.5 + parent: 2 + - uid: 4830 + components: + - type: Transform + pos: -3.5,-285.5 + parent: 2 + - uid: 4831 + components: + - type: Transform + pos: -4.5,-285.5 + parent: 2 + - uid: 8639 + components: + - type: Transform + pos: -8.5,-90.5 + parent: 2 + - uid: 9055 + components: + - type: Transform + pos: -17.5,-270.5 + parent: 2 + - uid: 9456 + components: + - type: Transform + pos: -9.5,-89.5 + parent: 2 + - uid: 9465 + components: + - type: Transform + pos: -9.5,-82.5 + parent: 2 + - uid: 9886 + components: + - type: Transform + pos: -10.5,-83.5 + parent: 2 + - uid: 9915 + components: + - type: Transform + pos: -7.5,-82.5 + parent: 2 + - uid: 9943 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,-122.5 + parent: 2 + - uid: 10076 + components: + - type: Transform + pos: -10.5,-88.5 + parent: 2 + - uid: 10105 + components: + - type: Transform + pos: -16.5,-268.5 + parent: 2 + - uid: 11669 + components: + - type: Transform + pos: -7.5,-152.5 + parent: 2 + - uid: 11793 + components: + - type: Transform + pos: -9.5,-90.5 + parent: 2 + - uid: 11967 + components: + - type: Transform + pos: -7.5,-90.5 + parent: 2 + - uid: 12324 + components: + - type: Transform + pos: -10.5,-89.5 + parent: 2 + - uid: 12325 + components: + - type: Transform + pos: -9.5,-83.5 + parent: 2 + - uid: 12326 + components: + - type: Transform + pos: -8.5,-82.5 + parent: 2 + - uid: 12329 + components: + - type: Transform + pos: -10.5,-84.5 + parent: 2 - uid: 12608 components: - type: Transform @@ -82605,11 +84857,6 @@ entities: rot: -1.5707963267948966 rad pos: -6.5,-73.5 parent: 2 - - uid: 12653 - components: - - type: Transform - pos: -7.5,-82.5 - parent: 2 - uid: 12654 components: - type: Transform @@ -82685,11 +84932,6 @@ entities: - type: Transform pos: 7.5,-96.5 parent: 2 - - uid: 12669 - components: - - type: Transform - pos: -7.5,-90.5 - parent: 2 - uid: 12670 components: - type: Transform @@ -82711,11 +84953,6 @@ entities: - type: Transform pos: 7.5,-64.5 parent: 2 - - uid: 12674 - components: - - type: Transform - pos: -18.5,-249.5 - parent: 2 - uid: 12675 components: - type: Transform @@ -82811,11 +85048,6 @@ entities: - type: Transform pos: -2.5,-120.5 parent: 2 - - uid: 12694 - components: - - type: Transform - pos: 1.5,-122.5 - parent: 2 - uid: 12695 components: - type: Transform @@ -82856,11 +85088,6 @@ entities: - type: Transform pos: -7.5,-150.5 parent: 2 - - uid: 12703 - components: - - type: Transform - pos: -7.5,-152.5 - parent: 2 - uid: 12704 components: - type: Transform @@ -83270,12 +85497,6 @@ entities: rot: 1.5707963267948966 rad pos: -22.5,-246.5 parent: 2 - - uid: 12781 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -18.5,-251.5 - parent: 2 - uid: 12782 components: - type: Transform @@ -83681,54 +85902,12 @@ entities: rot: -1.5707963267948966 rad pos: 5.5,-364.5 parent: 2 - - uid: 12856 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -18.5,-260.5 - parent: 2 - - uid: 12857 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -18.5,-253.5 - parent: 2 - - uid: 12858 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -18.5,-257.5 - parent: 2 - - uid: 12859 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -21.5,-263.5 - parent: 2 - - uid: 12860 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -18.5,-259.5 - parent: 2 - - uid: 12861 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -18.5,-255.5 - parent: 2 - uid: 12862 components: - type: Transform rot: 3.141592653589793 rad pos: -7.5,-300.5 parent: 2 - - uid: 12863 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -18.5,-261.5 - parent: 2 - uid: 12864 components: - type: Transform @@ -83777,6 +85956,141 @@ entities: rot: -1.5707963267948966 rad pos: 10.5,-117.5 parent: 2 + - uid: 13352 + components: + - type: Transform + pos: -10.5,-263.5 + parent: 2 + - uid: 13363 + components: + - type: Transform + pos: -10.5,-265.5 + parent: 2 + - uid: 13427 + components: + - type: Transform + pos: -10.5,-264.5 + parent: 2 + - uid: 14009 + components: + - type: Transform + pos: -10.5,-266.5 + parent: 2 + - uid: 14833 + components: + - type: Transform + pos: -11.5,-266.5 + parent: 2 + - uid: 15726 + components: + - type: Transform + pos: 0.5,-93.5 + parent: 2 + - uid: 15766 + components: + - type: Transform + pos: 1.5,-93.5 + parent: 2 + - uid: 15779 + components: + - type: Transform + pos: 1.5,-83.5 + parent: 2 + - uid: 15822 + components: + - type: Transform + pos: 0.5,-83.5 + parent: 2 + - uid: 16432 + components: + - type: Transform + pos: -18.5,-270.5 + parent: 2 + - uid: 16433 + components: + - type: Transform + pos: -1.5,-276.5 + parent: 2 + - uid: 16434 + components: + - type: Transform + pos: -0.5,-275.5 + parent: 2 + - uid: 16510 + components: + - type: Transform + pos: 3.5,-331.5 + parent: 2 + - uid: 16512 + components: + - type: Transform + pos: -16.5,-270.5 + parent: 2 + - uid: 16522 + components: + - type: Transform + pos: -16.5,-269.5 + parent: 2 + - uid: 16988 + components: + - type: Transform + pos: -10.5,-262.5 + parent: 2 + - uid: 16989 + components: + - type: Transform + pos: -11.5,-262.5 + parent: 2 + - uid: 17219 + components: + - type: Transform + pos: -4.5,-284.5 + parent: 2 + - uid: 17220 + components: + - type: Transform + pos: -0.5,-283.5 + parent: 2 + - uid: 17221 + components: + - type: Transform + pos: -1.5,-283.5 + parent: 2 + - uid: 17222 + components: + - type: Transform + pos: -1.5,-282.5 + parent: 2 + - uid: 17223 + components: + - type: Transform + pos: -1.5,-275.5 + parent: 2 + - uid: 17224 + components: + - type: Transform + pos: -4.5,-274.5 + parent: 2 + - uid: 17225 + components: + - type: Transform + pos: -4.5,-273.5 + parent: 2 + - uid: 17226 + components: + - type: Transform + pos: -3.5,-273.5 + parent: 2 + - uid: 17227 + components: + - type: Transform + pos: -3.5,-272.5 + parent: 2 + - uid: 17228 + components: + - type: Transform + pos: -2.5,-272.5 + parent: 2 - proto: ReinforcedWindowDiagonal entities: - uid: 12872 @@ -83789,33 +86103,12 @@ entities: - type: Transform pos: -6.5,-52.5 parent: 2 - - uid: 12874 - components: - - type: Transform - pos: -8.5,-82.5 - parent: 2 - - uid: 12875 - components: - - type: Transform - pos: -9.5,-83.5 - parent: 2 - - uid: 12876 - components: - - type: Transform - pos: -10.5,-84.5 - parent: 2 - uid: 12877 components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,3.5 parent: 2 - - uid: 12878 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -9.5,-84.5 - parent: 2 - uid: 12879 components: - type: Transform @@ -83840,42 +86133,6 @@ entities: rot: 3.141592653589793 rad pos: -0.5,3.5 parent: 2 - - uid: 12883 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -9.5,-88.5 - parent: 2 - - uid: 12884 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -8.5,-83.5 - parent: 2 - - uid: 12885 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -8.5,-90.5 - parent: 2 - - uid: 12886 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -10.5,-88.5 - parent: 2 - - uid: 12887 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -8.5,-89.5 - parent: 2 - - uid: 12888 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -9.5,-89.5 - parent: 2 - uid: 12889 components: - type: Transform @@ -83917,12 +86174,6 @@ entities: rot: 3.141592653589793 rad pos: 8.5,-202.5 parent: 2 - - uid: 12896 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,-122.5 - parent: 2 - uid: 12897 components: - type: Transform @@ -84105,16 +86356,16 @@ entities: parent: 2 - proto: SeedExtractor entities: + - uid: 12327 + components: + - type: Transform + pos: -8.5,-83.5 + parent: 2 - uid: 12926 components: - type: Transform pos: 3.5,-374.5 parent: 2 - - uid: 12927 - components: - - type: Transform - pos: -8.5,-84.5 - parent: 2 - proto: ShardCrystalGreen entities: - uid: 12928 @@ -84287,36 +86538,6 @@ entities: - type: Transform pos: -2.0033119,-5.403715 parent: 2 - - uid: 12957 - components: - - type: Transform - pos: -11.535454,-257.38806 - parent: 2 - - uid: 12958 - components: - - type: Transform - pos: -11.540955,-257.3627 - parent: 2 - - uid: 12959 - components: - - type: Transform - pos: -11.535454,-257.38806 - parent: 2 - - uid: 12960 - components: - - type: Transform - pos: -11.535454,-257.38806 - parent: 2 - - uid: 12961 - components: - - type: Transform - pos: -11.535454,-257.38806 - parent: 2 - - uid: 12962 - components: - - type: Transform - pos: -11.535454,-257.38806 - parent: 2 - uid: 12963 components: - type: Transform @@ -84352,6 +86573,36 @@ entities: - type: Transform pos: 4.3490157,-242.4043 parent: 2 + - uid: 16997 + components: + - type: Transform + pos: -11.535457,-263.4705 + parent: 2 + - uid: 17003 + components: + - type: Transform + pos: -11.535457,-263.4705 + parent: 2 + - uid: 17004 + components: + - type: Transform + pos: -11.535457,-263.4705 + parent: 2 + - uid: 17005 + components: + - type: Transform + pos: -11.535457,-263.4705 + parent: 2 + - uid: 17006 + components: + - type: Transform + pos: -11.535457,-263.4705 + parent: 2 + - uid: 17007 + components: + - type: Transform + pos: -11.535457,-263.4705 + parent: 2 - proto: SheetUranium entities: - uid: 12970 @@ -84465,16 +86716,6 @@ entities: - Pressed: Toggle 829: - Pressed: Toggle - - uid: 12982 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -5.5,-118.5 - parent: 2 - - type: DeviceLinkSource - linkedPorts: - 79: - - Pressed: DoorBolt - uid: 12983 components: - type: Transform @@ -84589,7 +86830,7 @@ entities: parent: 2 - proto: SignAtmos entities: - - uid: 12994 + - uid: 12669 components: - type: Transform pos: -3.5,-249.5 @@ -84644,11 +86885,6 @@ entities: - type: Transform pos: 2.5,-147.5 parent: 2 - - uid: 13002 - components: - - type: Transform - pos: 6.5,-147.5 - parent: 2 - proto: SignChem entities: - uid: 13003 @@ -84666,10 +86902,9 @@ entities: parent: 2 - proto: SignConference entities: - - uid: 13005 + - uid: 12674 components: - type: Transform - rot: 3.141592653589793 rad pos: 3.5,-13.5 parent: 2 - proto: SignCryogenicsMed @@ -85063,12 +87298,25 @@ entities: parent: 2 - proto: SignEVA entities: + - uid: 12960 + components: + - type: Transform + pos: 6.5,-119.5 + parent: 2 - uid: 13066 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,-3.5 parent: 2 +- proto: SignGravity + entities: + - uid: 17208 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.5,-262.5 + parent: 2 - proto: SignHead entities: - uid: 13067 @@ -85112,13 +87360,19 @@ entities: rot: 3.141592653589793 rad pos: -2.5,-56.5 parent: 2 -- proto: SignLawyer +- proto: SignKitchen entities: - - uid: 13074 + - uid: 10576 components: - type: Transform - rot: 3.141592653589793 rad - pos: 3.5,-329.5 + pos: 3.5,-92.5 + parent: 2 +- proto: SignLawyer + entities: + - uid: 4698 + components: + - type: Transform + pos: -5.5,-69.5 parent: 2 - proto: SignLibrary entities: @@ -85149,6 +87403,13 @@ entities: rot: 3.141592653589793 rad pos: -0.5,-173.5 parent: 2 +- proto: SignNews + entities: + - uid: 721 + components: + - type: Transform + pos: -5.5,-118.5 + parent: 2 - proto: SignNosmoking entities: - uid: 13079 @@ -85868,6 +88129,13 @@ entities: rot: 3.141592653589793 rad pos: 21.5,-302.5 parent: 2 +- proto: SignTheater + entities: + - uid: 675 + components: + - type: Transform + pos: -5.5,-123.5 + parent: 2 - proto: SignVirology entities: - uid: 13200 @@ -85961,11 +88229,6 @@ entities: parent: 2 - proto: SMESBasic entities: - - uid: 13214 - components: - - type: Transform - pos: -11.5,-251.5 - parent: 2 - uid: 13215 components: - type: Transform @@ -86449,18 +88712,6 @@ entities: - type: Transform pos: 17.648165,-82.3042 parent: 2 -- proto: SpaceHeater - entities: - - uid: 13295 - components: - - type: Transform - pos: -11.5,-256.5 - parent: 2 - - uid: 13296 - components: - - type: Transform - pos: -11.5,-255.5 - parent: 2 - proto: SpaceVillainArcadeComputerCircuitboard entities: - uid: 13297 @@ -86523,10 +88774,10 @@ entities: parent: 2 - proto: SpawnMobCrabAtmos entities: - - uid: 13305 + - uid: 17061 components: - type: Transform - pos: -15.5,-265.5 + pos: -12.5,-253.5 parent: 2 - proto: SpawnMobFoxRenault entities: @@ -86624,20 +88875,15 @@ entities: parent: 2 - proto: SpawnPointAtmos entities: - - uid: 13321 + - uid: 17062 components: - type: Transform - pos: -14.5,-264.5 + pos: -13.5,-264.5 parent: 2 - - uid: 13322 + - uid: 17063 components: - type: Transform - pos: -14.5,-263.5 - parent: 2 - - uid: 13323 - components: - - type: Transform - pos: -14.5,-262.5 + pos: -12.5,-264.5 parent: 2 - proto: SpawnPointBartender entities: @@ -86743,10 +88989,10 @@ entities: parent: 2 - proto: SpawnPointDetective entities: - - uid: 13340 + - uid: 17258 components: - type: Transform - pos: -5.5,-73.5 + pos: 5.5,-331.5 parent: 2 - proto: SpawnPointHeadOfPersonnel entities: @@ -86808,15 +89054,15 @@ entities: parent: 2 - proto: SpawnPointLawyer entities: - - uid: 13351 + - uid: 12884 components: - type: Transform - pos: 5.5,-329.5 + pos: -4.5,-72.5 parent: 2 - - uid: 13352 + - uid: 13321 components: - type: Transform - pos: 5.5,-331.5 + pos: -4.5,-71.5 parent: 2 - proto: SpawnPointLibrarian entities: @@ -86889,11 +89135,6 @@ entities: - type: Transform pos: -8.5,-115.5 parent: 2 - - uid: 13363 - components: - - type: Transform - pos: -6.5,-118.5 - parent: 2 - uid: 13364 components: - type: Transform @@ -86906,6 +89147,13 @@ entities: - type: Transform pos: 4.5,-285.5 parent: 2 +- proto: SpawnPointReporter + entities: + - uid: 12885 + components: + - type: Transform + pos: -7.5,-119.5 + parent: 2 - proto: SpawnPointResearchAssistant entities: - uid: 13366 @@ -87270,20 +89518,6 @@ entities: rot: 1.5707963267948966 rad pos: 24.5,-307.5 parent: 2 -- proto: StatueVenusBlue - entities: - - uid: 13427 - components: - - type: Transform - pos: 3.5,-141.5 - parent: 2 -- proto: StatueVenusRed - entities: - - uid: 13428 - components: - - type: Transform - pos: 5.5,-141.5 - parent: 2 - proto: SteelBench entities: - uid: 13429 @@ -87353,6 +89587,12 @@ entities: parent: 2 - proto: StoolBar entities: + - uid: 9453 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.5,-255.5 + parent: 2 - uid: 13440 components: - type: Transform @@ -87389,13 +89629,50 @@ entities: rot: -1.5707963267948966 rad pos: 4.5,-89.5 parent: 2 + - uid: 13769 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,-255.5 + parent: 2 + - uid: 13969 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -13.5,-255.5 + parent: 2 - proto: StorageCanister entities: + - uid: 9043 + components: + - type: Transform + pos: -25.5,-261.5 + parent: 2 + - uid: 12323 + components: + - type: Transform + pos: -25.5,-263.5 + parent: 2 - uid: 13446 components: - type: Transform pos: -21.5,-240.5 parent: 2 + - uid: 17109 + components: + - type: Transform + pos: -17.5,-249.5 + parent: 2 + - uid: 17110 + components: + - type: Transform + pos: -19.5,-249.5 + parent: 2 + - uid: 17111 + components: + - type: Transform + pos: -12.5,-257.5 + parent: 2 - proto: Stunbaton entities: - uid: 5608 @@ -87417,6 +89694,11 @@ entities: parent: 2 - proto: SubstationBasic entities: + - uid: 9449 + components: + - type: Transform + pos: -13.5,-250.5 + parent: 2 - uid: 13449 components: - type: Transform @@ -87432,11 +89714,6 @@ entities: - type: Transform pos: 3.5,-53.5 parent: 2 - - uid: 13452 - components: - - type: Transform - pos: -11.5,-252.5 - parent: 2 - uid: 13453 components: - type: Transform @@ -87512,6 +89789,18 @@ entities: - type: Transform pos: 29.942026,-307.55215 parent: 2 +- proto: SuitStorageAtmos + entities: + - uid: 17010 + components: + - type: Transform + pos: -14.5,-265.5 + parent: 2 + - uid: 17015 + components: + - type: Transform + pos: -13.5,-265.5 + parent: 2 - proto: SuitStorageBasic entities: - uid: 13467 @@ -87971,6 +90260,17 @@ entities: parent: 2 - proto: SurveillanceCameraSecurity entities: + - uid: 11752 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,-71.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraSecurity + nameSet: True + id: Law Office - uid: 13541 components: - type: Transform @@ -88067,12 +90367,6 @@ entities: rot: 3.141592653589793 rad pos: -4.5,-53.5 parent: 2 - - uid: 13557 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -3.5,-70.5 - parent: 2 - uid: 13558 components: - type: Transform @@ -88105,6 +90399,11 @@ entities: parent: 2 - proto: SurveillanceCameraWirelessRouterEntertainment entities: + - uid: 12653 + components: + - type: Transform + pos: -6.5,-118.5 + parent: 2 - uid: 13563 components: - type: Transform @@ -88117,18 +90416,22 @@ entities: parent: 2 - proto: SurveillanceWirelessCameraMovableEntertainment entities: + - uid: 79 + components: + - type: Transform + pos: -7.5,-118.5 + parent: 2 + - type: SurveillanceCamera + setupAvailableNetworks: + - SurveillanceCameraEntertainment + nameSet: True + id: Channel 13 - uid: 13565 components: - type: Transform rot: -1.5707963267948966 rad pos: 6.5,-371.5 parent: 2 - - uid: 13566 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -8.5,-119.5 - parent: 2 - uid: 13567 components: - type: Transform @@ -88155,6 +90458,11 @@ entities: parent: 2 - proto: Table entities: + - uid: 720 + components: + - type: Transform + pos: -8.5,-118.5 + parent: 2 - uid: 13572 components: - type: Transform @@ -88181,12 +90489,6 @@ entities: - type: Transform pos: 8.5,-175.5 parent: 2 - - uid: 13577 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -11.5,-257.5 - parent: 2 - uid: 13578 components: - type: Transform @@ -88243,8 +90545,38 @@ entities: rot: -1.5707963267948966 rad pos: 1.5,-202.5 parent: 2 + - uid: 16538 + components: + - type: Transform + pos: -8.5,-89.5 + parent: 2 + - uid: 16998 + components: + - type: Transform + pos: -11.5,-263.5 + parent: 2 + - uid: 16999 + components: + - type: Transform + pos: -13.5,-263.5 + parent: 2 + - uid: 17044 + components: + - type: Transform + pos: -12.5,-263.5 + parent: 2 + - uid: 17058 + components: + - type: Transform + pos: -14.5,-263.5 + parent: 2 - proto: TableCarpet entities: + - uid: 4697 + components: + - type: Transform + pos: -2.5,-72.5 + parent: 2 - uid: 13588 components: - type: Transform @@ -88323,6 +90655,11 @@ entities: rot: 3.141592653589793 rad pos: 13.5,-82.5 parent: 2 + - uid: 14853 + components: + - type: Transform + pos: -3.5,-72.5 + parent: 2 - proto: TableCounterMetal entities: - uid: 13601 @@ -88476,11 +90813,6 @@ entities: - type: Transform pos: -7.5,-112.5 parent: 2 - - uid: 13628 - components: - - type: Transform - pos: -7.5,-118.5 - parent: 2 - uid: 13629 components: - type: Transform @@ -88587,6 +90919,11 @@ entities: parent: 2 - proto: TableReinforced entities: + - uid: 11786 + components: + - type: Transform + pos: 1.5,-89.5 + parent: 2 - uid: 13650 components: - type: Transform @@ -88963,11 +91300,6 @@ entities: rot: 1.5707963267948966 rad pos: 15.5,-247.5 parent: 2 - - uid: 13717 - components: - - type: Transform - pos: -4.5,-273.5 - parent: 2 - uid: 13718 components: - type: Transform @@ -88990,11 +91322,6 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,-271.5 parent: 2 - - uid: 13722 - components: - - type: Transform - pos: -4.5,-285.5 - parent: 2 - uid: 13723 components: - type: Transform @@ -89232,42 +91559,6 @@ entities: - type: Transform pos: -6.5,-340.5 parent: 2 - - uid: 13769 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-328.5 - parent: 2 - - uid: 13770 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,-328.5 - parent: 2 - - uid: 13771 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,-331.5 - parent: 2 - - uid: 13772 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,-332.5 - parent: 2 - - uid: 13773 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5,-332.5 - parent: 2 - - uid: 13774 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-332.5 - parent: 2 - uid: 13775 components: - type: Transform @@ -89431,6 +91722,11 @@ entities: - type: Transform pos: -5.5,-340.5 parent: 2 + - uid: 13955 + components: + - type: Transform + pos: 8.5,-343.5 + parent: 2 - proto: TableReinforcedGlass entities: - uid: 13806 @@ -89523,26 +91819,6 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,-121.5 parent: 2 - - uid: 13821 - components: - - type: Transform - pos: 6.5,-142.5 - parent: 2 - - uid: 13822 - components: - - type: Transform - pos: 6.5,-143.5 - parent: 2 - - uid: 13823 - components: - - type: Transform - pos: 2.5,-142.5 - parent: 2 - - uid: 13824 - components: - - type: Transform - pos: 2.5,-143.5 - parent: 2 - uid: 13825 components: - type: Transform @@ -89651,6 +91927,62 @@ entities: parent: 2 - proto: TableWood entities: + - uid: 467 + components: + - type: Transform + pos: 6.5,-141.5 + parent: 2 + - uid: 4777 + components: + - type: Transform + pos: 2.5,-141.5 + parent: 2 + - uid: 9454 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -13.5,-254.5 + parent: 2 + - uid: 12008 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -11.5,-254.5 + parent: 2 + - uid: 12167 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -11.5,-251.5 + parent: 2 + - uid: 12244 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -12.5,-251.5 + parent: 2 + - uid: 12246 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -13.5,-253.5 + parent: 2 + - uid: 12863 + components: + - type: Transform + pos: -5.5,-70.5 + parent: 2 + - uid: 13305 + components: + - type: Transform + pos: -5.5,-71.5 + parent: 2 + - uid: 13340 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -12.5,-254.5 + parent: 2 - uid: 13844 components: - type: Transform @@ -89682,15 +92014,17 @@ entities: - type: Transform pos: 0.5,-64.5 parent: 2 - - uid: 13850 + - uid: 17252 components: - type: Transform - pos: -5.5,-71.5 + rot: 3.141592653589793 rad + pos: 5.5,-330.5 parent: 2 - - uid: 13851 + - uid: 17253 components: - type: Transform - pos: -5.5,-72.5 + rot: 3.141592653589793 rad + pos: 6.5,-330.5 parent: 2 - proto: TargetDarts entities: @@ -89943,12 +92277,20 @@ entities: parent: 2 - proto: ToiletDirtyWater entities: - - uid: 13865 + - uid: 11689 components: - type: Transform rot: -1.5707963267948966 rad pos: -6.5,-150.5 parent: 2 +- proto: ToiletEmpty + entities: + - uid: 11678 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -6.5,-152.5 + parent: 2 - proto: ToolboxArtisticFilled entities: - uid: 13866 @@ -90136,20 +92478,6 @@ entities: - type: Transform pos: 4.883979,-282.15594 parent: 2 -- proto: ToyFigurineChaplain - entities: - - uid: 13899 - components: - - type: Transform - pos: 6.4167213,-142.44421 - parent: 2 -- proto: ToyFigurineChef - entities: - - uid: 13900 - components: - - type: Transform - pos: 3.5768247,-91.526825 - parent: 2 - proto: ToyFigurineChemist entities: - uid: 13901 @@ -90164,13 +92492,6 @@ entities: - type: Transform pos: -7.7240214,-124.14133 parent: 2 -- proto: ToyFigurineDetective - entities: - - uid: 13903 - components: - - type: Transform - pos: -5.2573676,-71.2794 - parent: 2 - proto: ToyFigurineFootsoldier entities: - uid: 13904 @@ -90269,13 +92590,6 @@ entities: - type: Transform pos: -3.5431526,-346.0501 parent: 2 -- proto: ToyFigurineLawyer - entities: - - uid: 13915 - components: - - type: Transform - pos: 6.025828,-332.01364 - parent: 2 - proto: ToyFigurineLibrarian entities: - uid: 13916 @@ -90365,13 +92679,6 @@ entities: - type: Transform pos: -5.49094,-305.1008 parent: 2 -- proto: ToyFigurineSalvage - entities: - - uid: 13928 - components: - - type: Transform - pos: -4.4907207,-272.15012 - parent: 2 - proto: ToyFigurineScientist entities: - uid: 13929 @@ -90482,22 +92789,6 @@ entities: - type: Transform pos: -6.493462,-127.34697 parent: 2 -- proto: trayScanner - entities: - - uid: 3960 - components: - - type: Transform - parent: 3958 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: TrumpetInstrument - entities: - - uid: 13946 - components: - - type: Transform - pos: -22.876137,-264.95584 - parent: 2 - proto: TwoWayLever entities: - uid: 13947 @@ -90623,10 +92914,10 @@ entities: parent: 2 - proto: VendingMachineAtmosDrobe entities: - - uid: 13955 + - uid: 16976 components: - type: Transform - pos: -14.5,-265.5 + pos: -13.5,-251.5 parent: 2 - proto: VendingMachineBooze entities: @@ -90717,10 +93008,11 @@ entities: parent: 2 - proto: VendingMachineCondiments entities: - - uid: 13969 + - uid: 13296 components: - type: Transform - pos: 3.5,-85.5 + rot: 3.141592653589793 rad + pos: 3.5,-90.5 parent: 2 - proto: VendingMachineCuraDrobe entities: @@ -90731,10 +93023,10 @@ entities: parent: 2 - proto: VendingMachineDetDrobe entities: - - uid: 13971 + - uid: 17255 components: - type: Transform - pos: -5.5,-70.5 + pos: 5.5,-328.5 parent: 2 - proto: VendingMachineDinnerware entities: @@ -90804,10 +93096,10 @@ entities: parent: 2 - proto: VendingMachineLawDrobe entities: - - uid: 13982 + - uid: 4723 components: - type: Transform - pos: 6.5,-329.5 + pos: -5.5,-73.5 parent: 2 - proto: VendingMachineMedical entities: @@ -90929,13 +93221,6 @@ entities: - type: Transform pos: 5.5,-374.5 parent: 2 -- proto: VendingMachineTankDispenserEngineering - entities: - - uid: 14001 - components: - - type: Transform - pos: -13.5,-259.5 - parent: 2 - proto: VendingMachineTankDispenserEVA entities: - uid: 14002 @@ -90973,10 +93258,10 @@ entities: - type: Transform pos: 9.5,-120.5 parent: 2 - - uid: 14009 + - uid: 17047 components: - type: Transform - pos: -14.5,-250.5 + pos: -11.5,-257.5 parent: 2 - proto: VendingMachineTheater entities: @@ -91654,6 +93939,28 @@ entities: parent: 2 - proto: WallmountTelevision entities: + - uid: 11751 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-279.5 + parent: 2 + - uid: 11785 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-38.5 + parent: 2 + - uid: 12043 + components: + - type: Transform + pos: 2.5,-122.5 + parent: 2 + - uid: 12994 + components: + - type: Transform + pos: -2.5,-188.5 + parent: 2 - uid: 14130 components: - type: Transform @@ -91902,6 +94209,322 @@ entities: parent: 2 - proto: WallReinforced entities: + - uid: 85 + components: + - type: Transform + pos: -26.5,-250.5 + parent: 2 + - uid: 901 + components: + - type: Transform + pos: -25.5,-264.5 + parent: 2 + - uid: 904 + components: + - type: Transform + pos: -22.5,-260.5 + parent: 2 + - uid: 932 + components: + - type: Transform + pos: -23.5,-254.5 + parent: 2 + - uid: 968 + components: + - type: Transform + pos: -25.5,-262.5 + parent: 2 + - uid: 2615 + components: + - type: Transform + pos: -24.5,-258.5 + parent: 2 + - uid: 3026 + components: + - type: Transform + pos: -26.5,-263.5 + parent: 2 + - uid: 3027 + components: + - type: Transform + pos: -23.5,-264.5 + parent: 2 + - uid: 3028 + components: + - type: Transform + pos: -24.5,-264.5 + parent: 2 + - uid: 3033 + components: + - type: Transform + pos: -26.5,-264.5 + parent: 2 + - uid: 3075 + components: + - type: Transform + pos: -27.5,-260.5 + parent: 2 + - uid: 3077 + components: + - type: Transform + pos: -27.5,-256.5 + parent: 2 + - uid: 3078 + components: + - type: Transform + pos: -27.5,-257.5 + parent: 2 + - uid: 3079 + components: + - type: Transform + pos: -27.5,-252.5 + parent: 2 + - uid: 3080 + components: + - type: Transform + pos: -26.5,-257.5 + parent: 2 + - uid: 3081 + components: + - type: Transform + pos: -25.5,-252.5 + parent: 2 + - uid: 3082 + components: + - type: Transform + pos: -26.5,-252.5 + parent: 2 + - uid: 3083 + components: + - type: Transform + pos: -26.5,-253.5 + parent: 2 + - uid: 3096 + components: + - type: Transform + pos: -22.5,-252.5 + parent: 2 + - uid: 3099 + components: + - type: Transform + pos: -26.5,-260.5 + parent: 2 + - uid: 3100 + components: + - type: Transform + pos: -26.5,-261.5 + parent: 2 + - uid: 3101 + components: + - type: Transform + pos: -26.5,-259.5 + parent: 2 + - uid: 3103 + components: + - type: Transform + pos: -27.5,-250.5 + parent: 2 + - uid: 3104 + components: + - type: Transform + pos: -24.5,-250.5 + parent: 2 + - uid: 3115 + components: + - type: Transform + pos: -22.5,-250.5 + parent: 2 + - uid: 3121 + components: + - type: Transform + pos: -27.5,-259.5 + parent: 2 + - uid: 3638 + components: + - type: Transform + pos: -23.5,-252.5 + parent: 2 + - uid: 3641 + components: + - type: Transform + pos: -27.5,-255.5 + parent: 2 + - uid: 3642 + components: + - type: Transform + pos: -27.5,-258.5 + parent: 2 + - uid: 3951 + components: + - type: Transform + pos: -25.5,-250.5 + parent: 2 + - uid: 3952 + components: + - type: Transform + pos: -27.5,-251.5 + parent: 2 + - uid: 3953 + components: + - type: Transform + pos: -23.5,-250.5 + parent: 2 + - uid: 3958 + components: + - type: Transform + pos: -27.5,-254.5 + parent: 2 + - uid: 3959 + components: + - type: Transform + pos: -25.5,-260.5 + parent: 2 + - uid: 3960 + components: + - type: Transform + pos: -25.5,-254.5 + parent: 2 + - uid: 4676 + components: + - type: Transform + pos: -27.5,-261.5 + parent: 2 + - uid: 4677 + components: + - type: Transform + pos: -23.5,-260.5 + parent: 2 + - uid: 4678 + components: + - type: Transform + pos: -27.5,-253.5 + parent: 2 + - uid: 4680 + components: + - type: Transform + pos: -26.5,-251.5 + parent: 2 + - uid: 8637 + components: + - type: Transform + pos: -23.5,-270.5 + parent: 2 + - uid: 8641 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,-122.5 + parent: 2 + - uid: 9049 + components: + - type: Transform + pos: -21.5,-270.5 + parent: 2 + - uid: 9054 + components: + - type: Transform + pos: -15.5,-266.5 + parent: 2 + - uid: 10079 + components: + - type: Transform + pos: -22.5,-266.5 + parent: 2 + - uid: 10100 + components: + - type: Transform + pos: -20.5,-270.5 + parent: 2 + - uid: 10104 + components: + - type: Transform + pos: -16.5,-267.5 + parent: 2 + - uid: 10106 + components: + - type: Transform + pos: -23.5,-266.5 + parent: 2 + - uid: 10581 + components: + - type: Transform + pos: -24.5,-252.5 + parent: 2 + - uid: 11303 + components: + - type: Transform + pos: -27.5,-263.5 + parent: 2 + - uid: 11316 + components: + - type: Transform + pos: -26.5,-255.5 + parent: 2 + - uid: 11317 + components: + - type: Transform + pos: -26.5,-256.5 + parent: 2 + - uid: 12498 + components: + - type: Transform + pos: -26.5,-262.5 + parent: 2 + - uid: 12544 + components: + - type: Transform + pos: -23.5,-262.5 + parent: 2 + - uid: 12545 + components: + - type: Transform + pos: -22.5,-262.5 + parent: 2 + - uid: 12570 + components: + - type: Transform + pos: -27.5,-264.5 + parent: 2 + - uid: 12703 + components: + - type: Transform + pos: -22.5,-254.5 + parent: 2 + - uid: 12781 + components: + - type: Transform + pos: -27.5,-262.5 + parent: 2 + - uid: 12856 + components: + - type: Transform + pos: -22.5,-264.5 + parent: 2 + - uid: 12883 + components: + - type: Transform + pos: -26.5,-258.5 + parent: 2 + - uid: 12886 + components: + - type: Transform + pos: -24.5,-262.5 + parent: 2 + - uid: 13322 + components: + - type: Transform + pos: -26.5,-254.5 + parent: 2 + - uid: 13323 + components: + - type: Transform + pos: -24.5,-260.5 + parent: 2 + - uid: 13822 + components: + - type: Transform + pos: -24.5,-254.5 + parent: 2 - uid: 14172 components: - type: Transform @@ -92759,11 +95382,6 @@ entities: rot: 1.5707963267948966 rad pos: 3.5,-335.5 parent: 2 - - uid: 14343 - components: - - type: Transform - pos: -18.5,-254.5 - parent: 2 - uid: 14344 components: - type: Transform @@ -92829,11 +95447,6 @@ entities: - type: Transform pos: -3.5,-52.5 parent: 2 - - uid: 14357 - components: - - type: Transform - pos: -20.5,-250.5 - parent: 2 - uid: 14358 components: - type: Transform @@ -94250,11 +96863,6 @@ entities: - type: Transform pos: -12.5,-244.5 parent: 2 - - uid: 14639 - components: - - type: Transform - pos: -12.5,-262.5 - parent: 2 - uid: 14640 components: - type: Transform @@ -94288,7 +96896,7 @@ entities: - uid: 14646 components: - type: Transform - pos: -12.5,-264.5 + pos: -12.5,-262.5 parent: 2 - uid: 14647 components: @@ -94338,7 +96946,7 @@ entities: - uid: 14656 components: - type: Transform - pos: -12.5,-263.5 + pos: -12.5,-266.5 parent: 2 - uid: 14657 components: @@ -95143,7 +97751,7 @@ entities: - uid: 14814 components: - type: Transform - pos: -21.5,-252.5 + pos: -22.5,-256.5 parent: 2 - uid: 14815 components: @@ -95158,12 +97766,7 @@ entities: - uid: 14817 components: - type: Transform - pos: -20.5,-258.5 - parent: 2 - - uid: 14818 - components: - - type: Transform - pos: -19.5,-258.5 + pos: -22.5,-258.5 parent: 2 - uid: 14819 components: @@ -95174,17 +97777,12 @@ entities: - uid: 14820 components: - type: Transform - pos: -20.5,-254.5 + pos: -23.5,-258.5 parent: 2 - uid: 14821 components: - type: Transform - pos: -22.5,-254.5 - parent: 2 - - uid: 14822 - components: - - type: Transform - pos: -20.5,-256.5 + pos: -25.5,-256.5 parent: 2 - uid: 14823 components: @@ -95192,11 +97790,6 @@ entities: rot: 1.5707963267948966 rad pos: 11.5,-255.5 parent: 2 - - uid: 14824 - components: - - type: Transform - pos: -19.5,-250.5 - parent: 2 - uid: 14825 components: - type: Transform @@ -95218,7 +97811,7 @@ entities: - uid: 14828 components: - type: Transform - pos: -22.5,-255.5 + pos: -25.5,-258.5 parent: 2 - uid: 14829 components: @@ -95231,20 +97824,10 @@ entities: - type: Transform pos: 19.5,-244.5 parent: 2 - - uid: 14831 - components: - - type: Transform - pos: -19.5,-252.5 - parent: 2 - uid: 14832 components: - type: Transform - pos: -22.5,-251.5 - parent: 2 - - uid: 14833 - components: - - type: Transform - pos: -19.5,-256.5 + pos: -24.5,-256.5 parent: 2 - uid: 14834 components: @@ -95337,30 +97920,19 @@ entities: - uid: 14849 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -19.5,-264.5 + pos: -23.5,-256.5 parent: 2 - uid: 14850 components: - type: Transform pos: -1.5,-261.5 parent: 2 - - uid: 14851 - components: - - type: Transform - pos: -22.5,-257.5 - parent: 2 - uid: 14852 components: - type: Transform rot: 1.5707963267948966 rad pos: 9.5,-259.5 parent: 2 - - uid: 14853 - components: - - type: Transform - pos: -21.5,-258.5 - parent: 2 - uid: 14854 components: - type: Transform @@ -95435,7 +98007,8 @@ entities: - uid: 14867 components: - type: Transform - pos: -22.5,-259.5 + rot: -1.5707963267948966 rad + pos: 3.5,-122.5 parent: 2 - uid: 14868 components: @@ -95496,12 +98069,13 @@ entities: - uid: 14878 components: - type: Transform - pos: -21.5,-266.5 + pos: -5.5,-256.5 parent: 2 - uid: 14879 components: - type: Transform - pos: -21.5,-250.5 + rot: 3.141592653589793 rad + pos: 20.5,-266.5 parent: 2 - uid: 14880 components: @@ -95575,7 +98149,8 @@ entities: - uid: 14892 components: - type: Transform - pos: -22.5,-258.5 + rot: 3.141592653589793 rad + pos: 14.5,-266.5 parent: 2 - uid: 14893 components: @@ -95640,7 +98215,7 @@ entities: - uid: 14904 components: - type: Transform - pos: -19.5,-254.5 + pos: -6.5,-74.5 parent: 2 - uid: 14905 components: @@ -95843,11 +98418,6 @@ entities: - type: Transform pos: 20.5,-249.5 parent: 2 - - uid: 14944 - components: - - type: Transform - pos: -22.5,-253.5 - parent: 2 - uid: 14945 components: - type: Transform @@ -95858,11 +98428,6 @@ entities: - type: Transform pos: 19.5,-238.5 parent: 2 - - uid: 14947 - components: - - type: Transform - pos: -21.5,-254.5 - parent: 2 - uid: 14948 components: - type: Transform @@ -95879,16 +98444,6 @@ entities: - type: Transform pos: -7.5,-188.5 parent: 2 - - uid: 14951 - components: - - type: Transform - pos: -22.5,-256.5 - parent: 2 - - uid: 14952 - components: - - type: Transform - pos: -20.5,-252.5 - parent: 2 - uid: 14953 components: - type: Transform @@ -96176,11 +98731,6 @@ entities: rot: 1.5707963267948966 rad pos: 9.5,-255.5 parent: 2 - - uid: 15007 - components: - - type: Transform - pos: -18.5,-262.5 - parent: 2 - uid: 15008 components: - type: Transform @@ -96216,11 +98766,6 @@ entities: - type: Transform pos: -8.5,-271.5 parent: 2 - - uid: 15015 - components: - - type: Transform - pos: -18.5,-252.5 - parent: 2 - uid: 15016 components: - type: Transform @@ -96396,11 +98941,6 @@ entities: rot: 1.5707963267948966 rad pos: -1.5,-288.5 parent: 2 - - uid: 15048 - components: - - type: Transform - pos: -18.5,-250.5 - parent: 2 - uid: 15049 components: - type: Transform @@ -96743,11 +99283,6 @@ entities: - type: Transform pos: 9.5,-284.5 parent: 2 - - uid: 15107 - components: - - type: Transform - pos: -22.5,-250.5 - parent: 2 - uid: 15108 components: - type: Transform @@ -98461,12 +100996,6 @@ entities: rot: 3.141592653589793 rad pos: 7.5,-344.5 parent: 2 - - uid: 15412 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 8.5,-343.5 - parent: 2 - uid: 15413 components: - type: Transform @@ -99755,16 +102284,6 @@ entities: rot: 1.5707963267948966 rad pos: 8.5,-385.5 parent: 2 - - uid: 15629 - components: - - type: Transform - pos: -18.5,-256.5 - parent: 2 - - uid: 15630 - components: - - type: Transform - pos: -18.5,-258.5 - parent: 2 - uid: 15631 components: - type: Transform @@ -99788,36 +102307,6 @@ entities: rot: 1.5707963267948966 rad pos: -6.5,-383.5 parent: 2 - - uid: 15635 - components: - - type: Transform - pos: -22.5,-262.5 - parent: 2 - - uid: 15636 - components: - - type: Transform - pos: -21.5,-262.5 - parent: 2 - - uid: 15637 - components: - - type: Transform - pos: -12.5,-265.5 - parent: 2 - - uid: 15638 - components: - - type: Transform - pos: -19.5,-262.5 - parent: 2 - - uid: 15639 - components: - - type: Transform - pos: -22.5,-261.5 - parent: 2 - - uid: 15640 - components: - - type: Transform - pos: -22.5,-260.5 - parent: 2 - uid: 15641 components: - type: Transform @@ -99910,26 +102399,6 @@ entities: - type: Transform pos: -7.5,-247.5 parent: 2 - - uid: 15657 - components: - - type: Transform - pos: -14.5,-266.5 - parent: 2 - - uid: 15658 - components: - - type: Transform - pos: -13.5,-266.5 - parent: 2 - - uid: 15659 - components: - - type: Transform - pos: -22.5,-266.5 - parent: 2 - - uid: 15660 - components: - - type: Transform - pos: -18.5,-266.5 - parent: 2 - uid: 15661 components: - type: Transform @@ -99941,33 +102410,18 @@ entities: rot: 3.141592653589793 rad pos: 6.5,-119.5 parent: 2 - - uid: 15663 - components: - - type: Transform - pos: -22.5,-252.5 - parent: 2 - uid: 15664 components: - type: Transform rot: -1.5707963267948966 rad pos: 11.5,-342.5 parent: 2 - - uid: 15665 - components: - - type: Transform - pos: -16.5,-266.5 - parent: 2 - uid: 15666 components: - type: Transform rot: -1.5707963267948966 rad pos: -6.5,-345.5 parent: 2 - - uid: 15667 - components: - - type: Transform - pos: -19.5,-266.5 - parent: 2 - uid: 15668 components: - type: Transform @@ -100093,12 +102547,6 @@ entities: rot: -1.5707963267948966 rad pos: -2.5,-337.5 parent: 2 - - uid: 15689 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -21.5,-264.5 - parent: 2 - uid: 15690 components: - type: Transform @@ -100138,12 +102586,6 @@ entities: rot: -1.5707963267948966 rad pos: -10.5,-299.5 parent: 2 - - uid: 15697 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -20.5,-264.5 - parent: 2 - uid: 15698 components: - type: Transform @@ -100195,30 +102637,10 @@ entities: - type: Transform pos: 20.5,-240.5 parent: 2 - - uid: 15707 - components: - - type: Transform - pos: -17.5,-266.5 - parent: 2 - - uid: 15708 - components: - - type: Transform - pos: -20.5,-262.5 - parent: 2 - - uid: 15709 - components: - - type: Transform - pos: -15.5,-266.5 - parent: 2 - - uid: 15710 - components: - - type: Transform - pos: -13.5,-265.5 - parent: 2 - uid: 15711 components: - type: Transform - pos: -20.5,-266.5 + pos: -27.5,-266.5 parent: 2 - uid: 15712 components: @@ -100299,11 +102721,6 @@ entities: rot: 1.5707963267948966 rad pos: -14.5,-160.5 parent: 2 - - uid: 15726 - components: - - type: Transform - pos: -21.5,-256.5 - parent: 2 - uid: 15727 components: - type: Transform @@ -100360,6 +102777,312 @@ entities: - type: Transform pos: -5.5,-186.5 parent: 2 + - uid: 15825 + components: + - type: Transform + pos: -21.5,-266.5 + parent: 2 + - uid: 16436 + components: + - type: Transform + pos: -16.5,-266.5 + parent: 2 + - uid: 16511 + components: + - type: Transform + pos: -22.5,-270.5 + parent: 2 + - uid: 16523 + components: + - type: Transform + pos: -19.5,-270.5 + parent: 2 + - uid: 16525 + components: + - type: Transform + pos: -27.5,-270.5 + parent: 2 + - uid: 16526 + components: + - type: Transform + pos: -25.5,-240.5 + parent: 2 + - uid: 16987 + components: + - type: Transform + pos: -20.5,-266.5 + parent: 2 + - uid: 17012 + components: + - type: Transform + pos: -13.5,-266.5 + parent: 2 + - uid: 17013 + components: + - type: Transform + pos: -14.5,-266.5 + parent: 2 + - uid: 17124 + components: + - type: Transform + pos: -29.5,-267.5 + parent: 2 + - uid: 17125 + components: + - type: Transform + pos: -29.5,-266.5 + parent: 2 + - uid: 17126 + components: + - type: Transform + pos: -29.5,-265.5 + parent: 2 + - uid: 17127 + components: + - type: Transform + pos: -29.5,-264.5 + parent: 2 + - uid: 17128 + components: + - type: Transform + pos: -29.5,-262.5 + parent: 2 + - uid: 17129 + components: + - type: Transform + pos: -29.5,-261.5 + parent: 2 + - uid: 17130 + components: + - type: Transform + pos: -29.5,-260.5 + parent: 2 + - uid: 17131 + components: + - type: Transform + pos: -29.5,-259.5 + parent: 2 + - uid: 17132 + components: + - type: Transform + pos: -29.5,-258.5 + parent: 2 + - uid: 17133 + components: + - type: Transform + pos: -29.5,-256.5 + parent: 2 + - uid: 17134 + components: + - type: Transform + pos: -29.5,-255.5 + parent: 2 + - uid: 17135 + components: + - type: Transform + pos: -29.5,-254.5 + parent: 2 + - uid: 17136 + components: + - type: Transform + pos: -29.5,-253.5 + parent: 2 + - uid: 17137 + components: + - type: Transform + pos: -29.5,-252.5 + parent: 2 + - uid: 17138 + components: + - type: Transform + pos: -31.5,-269.5 + parent: 2 + - uid: 17139 + components: + - type: Transform + pos: -31.5,-268.5 + parent: 2 + - uid: 17140 + components: + - type: Transform + pos: -31.5,-267.5 + parent: 2 + - uid: 17141 + components: + - type: Transform + pos: -31.5,-265.5 + parent: 2 + - uid: 17142 + components: + - type: Transform + pos: -31.5,-264.5 + parent: 2 + - uid: 17143 + components: + - type: Transform + pos: -31.5,-263.5 + parent: 2 + - uid: 17144 + components: + - type: Transform + pos: -31.5,-262.5 + parent: 2 + - uid: 17145 + components: + - type: Transform + pos: -31.5,-261.5 + parent: 2 + - uid: 17146 + components: + - type: Transform + pos: -31.5,-259.5 + parent: 2 + - uid: 17147 + components: + - type: Transform + pos: -31.5,-258.5 + parent: 2 + - uid: 17148 + components: + - type: Transform + pos: -31.5,-257.5 + parent: 2 + - uid: 17149 + components: + - type: Transform + pos: -31.5,-255.5 + parent: 2 + - uid: 17150 + components: + - type: Transform + pos: -31.5,-256.5 + parent: 2 + - uid: 17151 + components: + - type: Transform + pos: -31.5,-253.5 + parent: 2 + - uid: 17152 + components: + - type: Transform + pos: -31.5,-252.5 + parent: 2 + - uid: 17153 + components: + - type: Transform + pos: -31.5,-251.5 + parent: 2 + - uid: 17154 + components: + - type: Transform + pos: -25.5,-241.5 + parent: 2 + - uid: 17155 + components: + - type: Transform + pos: -25.5,-242.5 + parent: 2 + - uid: 17156 + components: + - type: Transform + pos: -25.5,-243.5 + parent: 2 + - uid: 17157 + components: + - type: Transform + pos: -25.5,-245.5 + parent: 2 + - uid: 17158 + components: + - type: Transform + pos: -25.5,-246.5 + parent: 2 + - uid: 17159 + components: + - type: Transform + pos: -25.5,-247.5 + parent: 2 + - uid: 17161 + components: + - type: Transform + pos: -29.5,-250.5 + parent: 2 + - uid: 17162 + components: + - type: Transform + pos: -29.5,-249.5 + parent: 2 + - uid: 17163 + components: + - type: Transform + pos: -29.5,-248.5 + parent: 2 + - uid: 17164 + components: + - type: Transform + pos: -28.5,-248.5 + parent: 2 + - uid: 17165 + components: + - type: Transform + pos: -27.5,-248.5 + parent: 2 + - uid: 17192 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 18.5,-269.5 + parent: 2 + - uid: 17193 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-269.5 + parent: 2 + - uid: 17194 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 20.5,-269.5 + parent: 2 + - uid: 17195 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 16.5,-269.5 + parent: 2 + - uid: 17196 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 15.5,-269.5 + parent: 2 + - uid: 17197 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 14.5,-269.5 + parent: 2 + - uid: 17382 + components: + - type: Transform + pos: -25.5,-235.5 + parent: 17381 + - uid: 17383 + components: + - type: Transform + pos: -25.5,-236.5 + parent: 17381 + - uid: 17384 + components: + - type: Transform + pos: -25.5,-237.5 + parent: 17381 + - uid: 17385 + components: + - type: Transform + pos: -25.5,-238.5 + parent: 17381 - proto: WallReinforcedDiagonal entities: - uid: 15737 @@ -100525,12 +103248,6 @@ entities: - type: Transform pos: -7.5,-55.5 parent: 2 - - uid: 15766 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -7.5,-70.5 - parent: 2 - uid: 15767 components: - type: Transform @@ -100599,12 +103316,6 @@ entities: rot: -1.5707963267948966 rad pos: 9.5,-135.5 parent: 2 - - uid: 15779 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 3.5,-122.5 - parent: 2 - uid: 15780 components: - type: Transform @@ -100849,29 +103560,11 @@ entities: rot: 1.5707963267948966 rad pos: -7.5,-128.5 parent: 2 - - uid: 15822 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -5.5,-256.5 - parent: 2 - - uid: 15823 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 14.5,-266.5 - parent: 2 - uid: 15824 components: - type: Transform pos: 14.5,-238.5 parent: 2 - - uid: 15825 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 20.5,-266.5 - parent: 2 - uid: 15826 components: - type: Transform @@ -101118,12 +103811,6 @@ entities: rot: 3.141592653589793 rad pos: 10.5,-121.5 parent: 2 - - uid: 15869 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -6.5,-74.5 - parent: 2 - uid: 15870 components: - type: Transform @@ -104093,43 +106780,52 @@ entities: - type: Transform pos: 13.5,-75.5 parent: 2 -- proto: WarningAir - entities: - - uid: 16432 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -18.5,-262.5 - parent: 2 - proto: WarningCO2 entities: - - uid: 16433 + - uid: 12245 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -18.5,-252.5 + pos: -26.5,-255.5 parent: 2 - proto: WarningN2 entities: - - uid: 16434 + - uid: 13982 components: - type: Transform - pos: -18.5,-258.5 + pos: -26.5,-251.5 parent: 2 - proto: WarningO2 entities: - - uid: 16435 + - uid: 14639 components: - type: Transform - pos: -18.5,-256.5 + pos: -26.5,-253.5 parent: 2 - proto: WarningPlasma entities: - - uid: 16436 + - uid: 14001 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -18.5,-250.5 + pos: -26.5,-259.5 + parent: 2 +- proto: WarningTritium + entities: + - uid: 13722 + components: + - type: Transform + pos: -26.5,-263.5 + parent: 2 +- proto: WarningWaste + entities: + - uid: 13577 + components: + - type: Transform + pos: -26.5,-261.5 + parent: 2 + - uid: 14822 + components: + - type: Transform + pos: -26.5,-257.5 parent: 2 - proto: WarpPoint entities: @@ -104294,6 +106990,13 @@ entities: - type: Transform pos: -2.5,-82.5 parent: 2 +- proto: WaterVaporCanister + entities: + - uid: 14343 + components: + - type: Transform + pos: -25.5,-257.5 + parent: 2 - proto: WeaponCapacitorRecharger entities: - uid: 16459 @@ -104390,15 +107093,6 @@ entities: - type: Transform pos: 0.072262526,-370.32172 parent: 2 -- proto: WelderIndustrial - entities: - - uid: 3961 - components: - - type: Transform - parent: 3958 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: WelderIndustrialAdvanced entities: - uid: 16472 @@ -104430,14 +107124,6 @@ entities: - type: Transform pos: 3.5,-151.5 parent: 2 - - uid: 16477 - components: - - type: Transform - anchored: True - pos: -16.5,-265.5 - parent: 2 - - type: Physics - bodyType: Static - uid: 16478 components: - type: Transform @@ -104473,6 +107159,11 @@ entities: - type: Transform pos: 10.5,-298.5 parent: 2 + - uid: 17049 + components: + - type: Transform + pos: -13.5,-262.5 + parent: 2 - proto: WetFloorSign entities: - uid: 16485 @@ -104526,6 +107217,138 @@ entities: - DoorStatus: DoorBolt 16556: - DoorStatus: DoorBolt + - uid: 17315 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-240.5 + parent: 2 + - uid: 17316 + components: + - type: Transform + pos: 0.5,-236.5 + parent: 2 + - uid: 17317 + components: + - type: Transform + pos: 0.5,-263.5 + parent: 2 + - uid: 17318 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-267.5 + parent: 2 + - uid: 17319 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-294.5 + parent: 2 + - uid: 17320 + components: + - type: Transform + pos: 0.5,-290.5 + parent: 2 + - uid: 17321 + components: + - type: Transform + pos: 0.5,-322.5 + parent: 2 + - uid: 17322 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-326.5 + parent: 2 + - uid: 17323 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-213.5 + parent: 2 + - uid: 17324 + components: + - type: Transform + pos: 0.5,-209.5 + parent: 2 + - uid: 17325 + components: + - type: Transform + pos: 0.5,-182.5 + parent: 2 + - uid: 17326 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-186.5 + parent: 2 + - uid: 17327 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-159.5 + parent: 2 + - uid: 17328 + components: + - type: Transform + pos: 0.5,-155.5 + parent: 2 + - uid: 17329 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-132.5 + parent: 2 + - uid: 17330 + components: + - type: Transform + pos: 0.5,-128.5 + parent: 2 + - uid: 17331 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-105.5 + parent: 2 + - uid: 17332 + components: + - type: Transform + pos: 0.5,-101.5 + parent: 2 + - uid: 17333 + components: + - type: Transform + pos: 0.5,-74.5 + parent: 2 + - uid: 17334 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-78.5 + parent: 2 + - uid: 17335 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-51.5 + parent: 2 + - uid: 17336 + components: + - type: Transform + pos: 0.5,-47.5 + parent: 2 + - uid: 17337 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,-24.5 + parent: 2 + - uid: 17338 + components: + - type: Transform + pos: 0.5,-20.5 + parent: 2 - proto: WindoorSecureArmoryLocked entities: - uid: 16491 @@ -104554,6 +107377,32 @@ entities: - type: Transform pos: 1.5,-366.5 parent: 2 +- proto: WindoorSecureAtmosphericsLocked + entities: + - uid: 17050 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,-264.5 + parent: 2 + - uid: 17104 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -19.5,-266.5 + parent: 2 + - uid: 17105 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -18.5,-266.5 + parent: 2 + - uid: 17106 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -17.5,-266.5 + parent: 2 - proto: WindoorSecureBrigLocked entities: - uid: 16496 @@ -104638,6 +107487,150 @@ entities: parent: 2 - proto: WindoorSecureExternalLocked entities: + - uid: 195 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-324.5 + parent: 2 + - uid: 196 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-265.5 + parent: 2 + - uid: 198 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-238.5 + parent: 2 + - uid: 202 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-103.5 + parent: 2 + - uid: 203 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-184.5 + parent: 2 + - uid: 204 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-103.5 + parent: 2 + - uid: 205 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-157.5 + parent: 2 + - uid: 206 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-22.5 + parent: 2 + - uid: 207 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-76.5 + parent: 2 + - uid: 212 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-157.5 + parent: 2 + - uid: 213 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-184.5 + parent: 2 + - uid: 220 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-265.5 + parent: 2 + - uid: 222 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-22.5 + parent: 2 + - uid: 227 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-238.5 + parent: 2 + - uid: 228 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-324.5 + parent: 2 + - uid: 231 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-76.5 + parent: 2 + - uid: 15107 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-130.5 + parent: 2 + - uid: 15412 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-49.5 + parent: 2 + - uid: 15629 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-49.5 + parent: 2 + - uid: 15636 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-292.5 + parent: 2 + - uid: 15637 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-130.5 + parent: 2 + - uid: 15659 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-211.5 + parent: 2 + - uid: 15697 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-292.5 + parent: 2 + - uid: 15707 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-211.5 + parent: 2 - uid: 16508 components: - type: Transform @@ -104650,78 +107643,6 @@ entities: rot: -1.5707963267948966 rad pos: -3.5,-76.5 parent: 2 - - uid: 16510 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,-22.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 5 - - type: DeviceLinkSource - linkedPorts: - 189: - - DoorStatus: Close - 199: - - DoorStatus: Close - 200: - - DoorStatus: Close - 188: - - DoorStatus: Close - - uid: 16511 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,-184.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 4 - - type: DeviceLinkSource - linkedPorts: - 212: - - DoorStatus: Close - 205: - - DoorStatus: Close - 204: - - DoorStatus: Close - 202: - - DoorStatus: Close - - uid: 16512 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,-211.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 4 - - type: DeviceLinkSource - linkedPorts: - 206: - - DoorStatus: Close - 222: - - DoorStatus: Close - 231: - - DoorStatus: Close - 207: - - DoorStatus: Close - - uid: 16513 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,-211.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 4 - - type: DeviceLinkSource - linkedPorts: - 207: - - DoorStatus: Close - 231: - - DoorStatus: Close - 222: - - DoorStatus: Close - 206: - - DoorStatus: Close - uid: 16514 components: - type: Transform @@ -104734,24 +107655,6 @@ entities: rot: -1.5707963267948966 rad pos: -3.5,-22.5 parent: 2 - - uid: 16516 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,-324.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 4 - - type: DeviceLinkSource - linkedPorts: - 216: - - DoorStatus: Close - 235: - - DoorStatus: Close - 236: - - DoorStatus: Close - 237: - - DoorStatus: Close - uid: 16517 components: - type: Transform @@ -104784,354 +107687,12 @@ entities: parent: 2 - type: DeviceLinkSink invokeCounter: 1 - - uid: 16522 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,-49.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 4 - - type: DeviceLinkSource - linkedPorts: - 190: - - DoorStatus: Close - 221: - - DoorStatus: Close - 230: - - DoorStatus: Close - 187: - - DoorStatus: Close - - uid: 16523 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,-130.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 4 - - type: DeviceLinkSource - linkedPorts: - 195: - - DoorStatus: Close - 220: - - DoorStatus: Close - 228: - - DoorStatus: Close - 196: - - DoorStatus: Close - - uid: 16524 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,-184.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 4 - - type: DeviceLinkSource - linkedPorts: - 205: - - DoorStatus: Close - 212: - - DoorStatus: Close - 202: - - DoorStatus: Close - 204: - - DoorStatus: Close - - uid: 16525 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,-76.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 4 - - type: DeviceLinkSource - linkedPorts: - 191: - - DoorStatus: Close - 210: - - DoorStatus: Close - 211: - - DoorStatus: Close - 192: - - DoorStatus: Close - - uid: 16526 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,-292.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 4 - - type: DeviceLinkSource - linkedPorts: - 234: - - DoorStatus: Close - 225: - - DoorStatus: Close - 226: - - DoorStatus: Close - 224: - - DoorStatus: Close - - uid: 16527 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,-292.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 4 - - type: DeviceLinkSource - linkedPorts: - 234: - - DoorStatus: Close - 225: - - DoorStatus: Close - 226: - - DoorStatus: Close - 224: - - DoorStatus: Close - - uid: 16528 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,-324.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 6 - - type: DeviceLinkSource - linkedPorts: - 216: - - DoorStatus: Close - 235: - - DoorStatus: Close - 236: - - DoorStatus: Close - 237: - - DoorStatus: Close - uid: 16529 components: - type: Transform rot: -1.5707963267948966 rad pos: -3.5,-130.5 parent: 2 - - uid: 16530 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,-103.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 4 - - type: DeviceLinkSource - linkedPorts: - 193: - - DoorStatus: Close - 229: - - DoorStatus: Close - 201: - - DoorStatus: Close - 194: - - DoorStatus: Close - - uid: 16531 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,-157.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 4 - - type: DeviceLinkSource - linkedPorts: - 198: - - DoorStatus: Close - 227: - - DoorStatus: Close - 213: - - DoorStatus: Close - 203: - - DoorStatus: Close - - uid: 16532 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,-238.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 4 - - type: DeviceLinkSource - linkedPorts: - 209: - - DoorStatus: Close - 232: - - DoorStatus: Close - 215: - - DoorStatus: Close - 208: - - DoorStatus: Close - - uid: 16533 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,-49.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 4 - - type: DeviceLinkSource - linkedPorts: - 190: - - DoorStatus: Close - 221: - - DoorStatus: Close - 230: - - DoorStatus: Close - 187: - - DoorStatus: Close - - uid: 16534 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,-22.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 4 - - type: DeviceLinkSource - linkedPorts: - 189: - - DoorStatus: Close - 199: - - DoorStatus: Close - 200: - - DoorStatus: Close - 188: - - DoorStatus: Close - - uid: 16535 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,-76.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 4 - - type: DeviceLinkSource - linkedPorts: - 191: - - DoorStatus: Close - 210: - - DoorStatus: Close - 211: - - DoorStatus: Close - 192: - - DoorStatus: Close - - uid: 16536 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,-103.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 4 - - type: DeviceLinkSource - linkedPorts: - 193: - - DoorStatus: Close - 229: - - DoorStatus: Close - 201: - - DoorStatus: Close - 194: - - DoorStatus: Close - - uid: 16537 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,-130.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 4 - - type: DeviceLinkSource - linkedPorts: - 195: - - DoorStatus: Close - 228: - - DoorStatus: Close - 220: - - DoorStatus: Close - 196: - - DoorStatus: Close - - uid: 16538 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,-157.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 4 - - type: DeviceLinkSource - linkedPorts: - 198: - - DoorStatus: Close - 227: - - DoorStatus: Close - 213: - - DoorStatus: Close - 203: - - DoorStatus: Close - - uid: 16539 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,-238.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 4 - - type: DeviceLinkSource - linkedPorts: - 209: - - DoorStatus: Close - 232: - - DoorStatus: Close - 215: - - DoorStatus: Close - 208: - - DoorStatus: Close - - uid: 16540 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,-265.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 4 - - type: DeviceLinkSource - linkedPorts: - 233: - - DoorStatus: Close - 214: - - DoorStatus: Close - 197: - - DoorStatus: Close - 223: - - DoorStatus: Close - - uid: 16541 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,-265.5 - parent: 2 - - type: DeviceLinkSink - invokeCounter: 4 - - type: DeviceLinkSource - linkedPorts: - 233: - - DoorStatus: Close - 214: - - DoorStatus: Close - 223: - - DoorStatus: Close - 197: - - DoorStatus: Close - uid: 16542 components: - type: Transform @@ -105356,37 +107917,11 @@ entities: - type: Transform pos: 3.5,-12.5 parent: 2 - - uid: 16577 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -3.5,-285.5 - parent: 2 - uid: 16578 components: - type: Transform pos: 3.5,-10.5 parent: 2 - - uid: 16579 - components: - - type: Transform - pos: 1.5,-93.5 - parent: 2 - - uid: 16580 - components: - - type: Transform - pos: 0.5,-93.5 - parent: 2 - - uid: 16581 - components: - - type: Transform - pos: 1.5,-83.5 - parent: 2 - - uid: 16582 - components: - - type: Transform - pos: 0.5,-83.5 - parent: 2 - uid: 16583 components: - type: Transform @@ -105428,58 +107963,6 @@ entities: - type: Transform pos: -4.5,-289.5 parent: 2 - - uid: 16591 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -4.5,-274.5 - parent: 2 - - uid: 16592 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -3.5,-273.5 - parent: 2 - - uid: 16593 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,-283.5 - parent: 2 - - uid: 16594 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,-272.5 - parent: 2 - - uid: 16595 - components: - - type: Transform - pos: -0.5,-275.5 - parent: 2 - - uid: 16596 - components: - - type: Transform - pos: -1.5,-276.5 - parent: 2 - - uid: 16597 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -2.5,-286.5 - parent: 2 - - uid: 16598 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -4.5,-284.5 - parent: 2 - - uid: 16599 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -1.5,-282.5 - parent: 2 - uid: 16600 components: - type: Transform @@ -105505,60 +107988,6 @@ entities: - type: Transform pos: 11.5,-279.5 parent: 2 - - uid: 16605 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 3.5,-331.5 - parent: 2 -- proto: WindowDiagonal - entities: - - uid: 16606 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -2.5,-273.5 - parent: 2 - - uid: 16607 - components: - - type: Transform - pos: -3.5,-272.5 - parent: 2 - - uid: 16608 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -3.5,-274.5 - parent: 2 - - uid: 16609 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -1.5,-283.5 - parent: 2 - - uid: 16610 - components: - - type: Transform - pos: -1.5,-275.5 - parent: 2 - - uid: 16611 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -2.5,-285.5 - parent: 2 - - uid: 16612 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -3.5,-284.5 - parent: 2 - - uid: 16613 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -3.5,-286.5 - parent: 2 - proto: WindowDirectional entities: - uid: 16614 @@ -107543,6 +109972,30 @@ entities: rot: 1.5707963267948966 rad pos: -15.5,-161.5 parent: 2 + - uid: 17000 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,-265.5 + parent: 2 + - uid: 17014 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -14.5,-263.5 + parent: 2 + - uid: 17045 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -13.5,-263.5 + parent: 2 + - uid: 17046 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,-263.5 + parent: 2 - proto: Wirecutter entities: - uid: 16956 diff --git a/Resources/Prototypes/Maps/train.yml b/Resources/Prototypes/Maps/train.yml index 20cb0fde01..771d928c00 100644 --- a/Resources/Prototypes/Maps/train.yml +++ b/Resources/Prototypes/Maps/train.yml @@ -32,8 +32,8 @@ Detective: [ 1, 1 ] #engineering ChiefEngineer: [ 1, 1 ] - AtmosphericTechnician: [ 3, 3 ] - StationEngineer: [ 5, 5 ] + AtmosphericTechnician: [ 2, 2 ] + StationEngineer: [ 4, 4 ] TechnicalAssistant: [ 3, 3 ] #medical ChiefMedicalOfficer: [ 1, 1 ] @@ -61,3 +61,4 @@ Mime: [ 1, 1 ] Musician: [ 1, 1 ] Borg: [ 2, 2 ] + Reporter: [ 1, 1 ] From e5fe6f7824aa215e9d7c7e1c909e6c7cc9c11b92 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Wed, 7 Aug 2024 10:04:44 +1000 Subject: [PATCH 225/422] Add mapping load acts (#30722) Smug doesn't seem to have time to fix mapping state and I don't want to dump more time into it so. --- Content.Client/Commands/MappingClientSideSetupCommand.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Content.Client/Commands/MappingClientSideSetupCommand.cs b/Content.Client/Commands/MappingClientSideSetupCommand.cs index eb2d13c954..3255e85e18 100644 --- a/Content.Client/Commands/MappingClientSideSetupCommand.cs +++ b/Content.Client/Commands/MappingClientSideSetupCommand.cs @@ -1,3 +1,4 @@ +using Content.Client.Actions; using Content.Client.Mapping; using Content.Client.Markers; using JetBrains.Annotations; @@ -25,7 +26,7 @@ internal sealed class MappingClientSideSetupCommand : LocalizedCommands _entitySystemManager.GetEntitySystem().MarkersVisible = true; _lightManager.Enabled = false; shell.ExecuteCommand("showsubfloorforever"); - _stateManager.RequestStateChange(); + _entitySystemManager.GetEntitySystem().LoadActionAssignments("/mapping_actions.yml", false); } } } From b4dfeec696c0d5f26d6bf8fbc770e3b69117ba11 Mon Sep 17 00:00:00 2001 From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Date: Wed, 7 Aug 2024 12:15:41 +1200 Subject: [PATCH 226/422] Add more storage admin logs & fix some interaction validation (#30725) --- Content.Shared.Database/LogType.cs | 5 + .../EntitySystems/SharedStorageSystem.cs | 226 +++++++++--------- 2 files changed, 120 insertions(+), 111 deletions(-) diff --git a/Content.Shared.Database/LogType.cs b/Content.Shared.Database/LogType.cs index eb2b8e1f6f..85cac5899d 100644 --- a/Content.Shared.Database/LogType.cs +++ b/Content.Shared.Database/LogType.cs @@ -110,4 +110,9 @@ public enum LogType /// A player did an item-use interaction of an item they were holding onto another object. /// InteractUsing = 92, + + /// + /// Storage & entity-storage related interactions + /// + Storage = 93, } diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs index cac3b86ad6..868d26c3ae 100644 --- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs +++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs @@ -2,7 +2,9 @@ using System.Collections.Frozen; using System.Diagnostics.CodeAnalysis; using System.Linq; using Content.Shared.ActionBlocker; +using Content.Shared.Administration.Logs; using Content.Shared.Containers.ItemSlots; +using Content.Shared.Database; using Content.Shared.Destructible; using Content.Shared.DoAfter; using Content.Shared.Hands.Components; @@ -57,6 +59,7 @@ public abstract class SharedStorageSystem : EntitySystem [Dependency] private readonly SharedUserInterfaceSystem _ui = default!; [Dependency] protected readonly UseDelaySystem UseDelay = default!; [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; + [Dependency] private readonly ISharedAdminLogManager _adminLog = default!; private EntityQuery _itemQuery; private EntityQuery _stackQuery; @@ -577,151 +580,79 @@ public abstract class SharedStorageSystem : EntitySystem /// private void OnInteractWithItem(StorageInteractWithItemEvent msg, EntitySessionEventArgs args) { - if (args.SenderSession.AttachedEntity is not { } player) - return; - - var uid = GetEntity(msg.StorageUid); - var entity = GetEntity(msg.InteractedItemUid); - - if (!TryComp(uid, out var storageComp)) - return; - - if (!_ui.IsUiOpen(uid, StorageComponent.StorageUiKey.Key, player)) - return; - - if (!Exists(entity)) - { - Log.Error($"Player {args.SenderSession} interacted with non-existent item {msg.InteractedItemUid} stored in {ToPrettyString(uid)}"); - return; - } - - if (!ActionBlocker.CanInteract(player, entity) || !storageComp.Container.Contains(entity)) - return; - - // Does the player have hands? - if (!TryComp(player, out HandsComponent? hands) || hands.Count == 0) + if (!ValidateInput(args, msg.StorageUid, msg.InteractedItemUid, out var player, out var storage, out var item)) return; // If the user's active hand is empty, try pick up the item. - if (hands.ActiveHandEntity == null) + if (player.Comp.ActiveHandEntity == null) { - if (_sharedHandsSystem.TryPickupAnyHand(player, entity, handsComp: hands) - && storageComp.StorageRemoveSound != null) - Audio.PlayPredicted(storageComp.StorageRemoveSound, uid, player, _audioParams); + _adminLog.Add( + LogType.Storage, + LogImpact.Low, + $"{ToPrettyString(player):player} is attempting to take {ToPrettyString(item):item} out of {ToPrettyString(storage):storage}"); + + if (_sharedHandsSystem.TryPickupAnyHand(player, item, handsComp: player.Comp) + && storage.Comp.StorageRemoveSound != null) { - return; + Audio.PlayPredicted(storage.Comp.StorageRemoveSound, storage, player, _audioParams); } + + return; } + _adminLog.Add( + LogType.Storage, + LogImpact.Low, + $"{ToPrettyString(player):player} is interacting with {ToPrettyString(item):item} while it is stored in {ToPrettyString(storage):storage} using {ToPrettyString(player.Comp.ActiveHandEntity):used}"); + // Else, interact using the held item - _interactionSystem.InteractUsing(player, hands.ActiveHandEntity.Value, entity, Transform(entity).Coordinates, checkCanInteract: false); + _interactionSystem.InteractUsing(player, player.Comp.ActiveHandEntity.Value, item, Transform(item).Coordinates, checkCanInteract: false); } private void OnSetItemLocation(StorageSetItemLocationEvent msg, EntitySessionEventArgs args) { - if (args.SenderSession.AttachedEntity is not { } player) + if (!ValidateInput(args, msg.StorageEnt, msg.ItemEnt, out var player, out var storage, out var item)) return; - var storageEnt = GetEntity(msg.StorageEnt); - var itemEnt = GetEntity(msg.ItemEnt); + _adminLog.Add( + LogType.Storage, + LogImpact.Low, + $"{ToPrettyString(player):player} is updating the location of {ToPrettyString(item):item} within {ToPrettyString(storage):storage}"); - if (!TryComp(storageEnt, out var storageComp)) - return; - - if (!_ui.IsUiOpen(storageEnt, StorageComponent.StorageUiKey.Key, player)) - return; - - if (!Exists(itemEnt)) - { - Log.Error($"Player {args.SenderSession} set location of non-existent item {msg.ItemEnt} stored in {ToPrettyString(storageEnt)}"); - return; - } - - if (!ActionBlocker.CanInteract(player, itemEnt)) - return; - - TrySetItemStorageLocation((itemEnt, null), (storageEnt, storageComp), msg.Location); + TrySetItemStorageLocation(item!, storage!, msg.Location); } private void OnRemoveItem(StorageRemoveItemEvent msg, EntitySessionEventArgs args) { - if (args.SenderSession.AttachedEntity is not { } player) + if (!ValidateInput(args, msg.StorageEnt, msg.ItemEnt, out var player, out var storage, out var item)) return; - var storageEnt = GetEntity(msg.StorageEnt); - var itemEnt = GetEntity(msg.ItemEnt); - - if (!TryComp(storageEnt, out var storageComp)) - return; - - if (!_ui.IsUiOpen(storageEnt, StorageComponent.StorageUiKey.Key, player)) - return; - - if (!Exists(itemEnt)) - { - Log.Error($"Player {args.SenderSession} set location of non-existent item {msg.ItemEnt} stored in {ToPrettyString(storageEnt)}"); - return; - } - - if (!ActionBlocker.CanInteract(player, itemEnt)) - return; - - TransformSystem.DropNextTo(itemEnt, player); - Audio.PlayPredicted(storageComp.StorageRemoveSound, storageEnt, player, _audioParams); + _adminLog.Add( + LogType.Storage, + LogImpact.Low, + $"{ToPrettyString(player):player} is removing {ToPrettyString(item):item} from {ToPrettyString(storage):storage}"); + TransformSystem.DropNextTo(item.Owner, player.Owner); + Audio.PlayPredicted(storage.Comp.StorageRemoveSound, storage, player, _audioParams); } private void OnInsertItemIntoLocation(StorageInsertItemIntoLocationEvent msg, EntitySessionEventArgs args) { - if (args.SenderSession.AttachedEntity is not { } player) + if (!ValidateInput(args, msg.StorageEnt, msg.ItemEnt, out var player, out var storage, out var item, held: true)) return; - var storageEnt = GetEntity(msg.StorageEnt); - var itemEnt = GetEntity(msg.ItemEnt); - - if (!TryComp(storageEnt, out var storageComp)) - return; - - if (!_ui.IsUiOpen(storageEnt, StorageComponent.StorageUiKey.Key, player)) - return; - - if (!Exists(itemEnt)) - { - Log.Error($"Player {args.SenderSession} set location of non-existent item {msg.ItemEnt} stored in {ToPrettyString(storageEnt)}"); - return; - } - - if (!ActionBlocker.CanInteract(player, itemEnt) || !_sharedHandsSystem.IsHolding(player, itemEnt, out _)) - return; - - InsertAt((storageEnt, storageComp), (itemEnt, null), msg.Location, out _, player, stackAutomatically: false); + _adminLog.Add( + LogType.Storage, + LogImpact.Low, + $"{ToPrettyString(player):player} is inserting {ToPrettyString(item):item} into {ToPrettyString(storage):storage}"); + InsertAt(storage!, item!, msg.Location, out _, player, stackAutomatically: false); } - // TODO: if/when someone cleans up this shitcode please make all these - // handlers use a shared helper for checking that the ui is open etc, thanks private void OnSaveItemLocation(StorageSaveItemLocationEvent msg, EntitySessionEventArgs args) { - if (args.SenderSession.AttachedEntity is not {} player) + if (!ValidateInput(args, msg.Storage, msg.Item, out var player, out var storage, out var item, held: true)) return; - var storage = GetEntity(msg.Storage); - var item = GetEntity(msg.Item); - - if (!HasComp(storage)) - return; - - if (!_ui.IsUiOpen(storage, StorageComponent.StorageUiKey.Key, player)) - return; - - if (!Exists(item)) - { - Log.Error($"Player {args.SenderSession} saved location of non-existent item {msg.Item} stored in {ToPrettyString(storage)}"); - return; - } - - if (!ActionBlocker.CanInteract(player, item)) - return; - - SaveItemLocation(storage, item); + SaveItemLocation(storage!, item.Owner); } private void OnBoundUIOpen(EntityUid uid, StorageComponent storageComp, BoundUIOpenedEvent args) @@ -1500,6 +1431,79 @@ public abstract class SharedStorageSystem : EntitySystem public abstract void PlayPickupAnimation(EntityUid uid, EntityCoordinates initialCoordinates, EntityCoordinates finalCoordinates, Angle initialRotation, EntityUid? user = null); + private bool ValidateInput( + EntitySessionEventArgs args, + NetEntity netStorage, + out Entity player, + out Entity storage) + { + player = default; + storage = default; + + if (args.SenderSession.AttachedEntity is not { } playerUid) + return false; + + if (!TryComp(playerUid, out HandsComponent? hands) || hands.Count == 0) + return false; + + if (!TryGetEntity(netStorage, out var storageUid)) + return false; + + if (!TryComp(storageUid, out StorageComponent? storageComp)) + return false; + + // TODO STORAGE use BUI events + // This would automatically validate that the UI is open & that the user can interact. + // However, we still need to manually validate that items being used are in the users hands or in the storage. + if (!_ui.IsUiOpen(storageUid.Value, StorageComponent.StorageUiKey.Key, playerUid)) + return false; + + if (!ActionBlocker.CanInteract(playerUid, storageUid)) + return false; + + player = new(playerUid, hands); + storage = new(storageUid.Value, storageComp); + return true; + } + + private bool ValidateInput(EntitySessionEventArgs args, + NetEntity netStorage, + NetEntity netItem, + out Entity player, + out Entity storage, + out Entity item, + bool held = false) + { + item = default!; + if (!ValidateInput(args, netStorage, out player, out storage)) + return false; + + if (!TryGetEntity(netItem, out var itemUid)) + return false; + + if (held) + { + if (!_sharedHandsSystem.IsHolding(player, itemUid, out _)) + return false; + } + else + { + if (!storage.Comp.Container.Contains(itemUid.Value)) + return false; + + DebugTools.Assert(storage.Comp.StoredItems.ContainsKey(itemUid.Value)); + } + + if (!TryComp(itemUid, out ItemComponent? itemComp)) + return false; + + if (!ActionBlocker.CanInteract(player, itemUid)) + return false; + + item = new(itemUid.Value, itemComp); + return true; + } + [Serializable, NetSerializable] protected sealed class StorageComponentState : ComponentState { From 05630bd4ba20dc6eb499e47e4bb7fc12d4060c95 Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Tue, 6 Aug 2024 19:32:31 -0600 Subject: [PATCH 227/422] bagel update (#30727) * bagel update * remove invalid --- Resources/Maps/bagel.yml | 3214 +++++++++++++++++--------------------- 1 file changed, 1461 insertions(+), 1753 deletions(-) diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml index c7030f6cf5..fa707fc965 100644 --- a/Resources/Maps/bagel.yml +++ b/Resources/Maps/bagel.yml @@ -21,6 +21,8 @@ tilemap: 49: FloorGrass 50: FloorGrassDark 51: FloorGrassJungle + 3: FloorGrayConcrete + 2: FloorGrayConcreteMono 56: FloorGreenCircuit 59: FloorHullReinforced 60: FloorHydro @@ -74,7 +76,7 @@ entities: version: 6 -1,-1: ind: -1,-1 - tiles: XQAAAAADXQAAAAABfgAAAAAAfQAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAXQAAAAADZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAABfgAAAAAAfQAAAAAAfgAAAAAAXQAAAAAAZAAAAAAAXQAAAAABZAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAACfgAAAAAAfQAAAAAAfgAAAAAAXQAAAAACZAAAAAAAXQAAAAACXQAAAAACfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAADfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAdAAAAAADdAAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAdAAAAAADcwAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAABfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAACegAAAAADfgAAAAAAHwAAAAADXQAAAAABXQAAAAACfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAADMwAAAAAAegAAAAACegAAAAACegAAAAABfgAAAAAAHwAAAAADXQAAAAAAXQAAAAABfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAegAAAAACegAAAAACegAAAAACMwAAAAAAegAAAAACegAAAAAAegAAAAACfgAAAAAAHwAAAAACXQAAAAACXQAAAAABfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAegAAAAACegAAAAACegAAAAABJAAAAAACegAAAAABegAAAAAAegAAAAADfgAAAAAAHwAAAAACXQAAAAADXQAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAegAAAAACegAAAAADegAAAAACfgAAAAAAegAAAAACegAAAAACegAAAAABfgAAAAAAHwAAAAADTQAAAAAATQAAAAADfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAADXQAAAAABXQAAAAACXQAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAACHwAAAAAB + tiles: XQAAAAADXQAAAAABfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAZAAAAAAAHwAAAAADHwAAAAACHwAAAAADHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAZAAAAAAAXQAAAAADZAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAACXQAAAAABfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAZAAAAAAAXQAAAAABZAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAZAAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACZAAAAAAAXQAAAAACXQAAAAACfgAAAAAAAAAAAAAAfgAAAAAAfgAAAAAALgAAAAAAfgAAAAAAXQAAAAAAXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfgAAAAAAdAAAAAADdAAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAdAAAAAADcwAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAACegAAAAADfgAAAAAAHwAAAAADXQAAAAABXQAAAAACfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAADMwAAAAAAegAAAAACegAAAAACegAAAAABfgAAAAAAHwAAAAADXQAAAAAAXQAAAAABfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAegAAAAACegAAAAACegAAAAACMwAAAAAAegAAAAACegAAAAAAegAAAAACfgAAAAAAHwAAAAACXQAAAAACXQAAAAABfgAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAegAAAAACegAAAAACegAAAAABJAAAAAACegAAAAABegAAAAAAegAAAAADfgAAAAAAHwAAAAACXQAAAAADXQAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAegAAAAACegAAAAADegAAAAACfgAAAAAAegAAAAACegAAAAACegAAAAABfgAAAAAAHwAAAAADTQAAAAAATQAAAAADfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAAAfgAAAAAAHwAAAAADXQAAAAABXQAAAAACXQAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAACHwAAAAAB version: 6 0,0: ind: 0,0 @@ -90,7 +92,7 @@ entities: version: 6 -1,-2: ind: -1,-2 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAXQAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAHwAAAAADHwAAAAADHwAAAAAAHwAAAAAAHwAAAAABHwAAAAADfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAHwAAAAABHwAAAAACHwAAAAABHwAAAAABHwAAAAAAHwAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAHwAAAAACHwAAAAACHwAAAAABHwAAAAACHwAAAAADHwAAAAAAfgAAAAAAXQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAACXQAAAAABXQAAAAAAXQAAAAAATQAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAAAXQAAAAADXQAAAAABTQAAAAADXQAAAAACXQAAAAADXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAADXQAAAAACXQAAAAABXQAAAAADXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAABTQAAAAABXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAABfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAfQAAAAAAfgAAAAAALgAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAACHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTQAAAAADTQAAAAACfgAAAAAAfQAAAAAAfgAAAAAALgAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAAAHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAfQAAAAAAfgAAAAAAbgAAAAADfgAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAC + tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAXQAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAHwAAAAADHwAAAAADHwAAAAAAHwAAAAAAHwAAAAABHwAAAAADfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAHwAAAAABHwAAAAACHwAAAAABHwAAAAABHwAAAAAAHwAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAHwAAAAACHwAAAAACHwAAAAABHwAAAAACHwAAAAADHwAAAAAAfgAAAAAAXQAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAACHwAAAAACHwAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAACXQAAAAABXQAAAAAAXQAAAAAATQAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAAAXQAAAAADXQAAAAABTQAAAAADXQAAAAACXQAAAAADXQAAAAABXQAAAAABXQAAAAABXQAAAAADXQAAAAADXQAAAAACXQAAAAABXQAAAAADXQAAAAACXQAAAAABXQAAAAAAXQAAAAADXQAAAAABTQAAAAABXQAAAAAAXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAABXQAAAAABfgAAAAAALgAAAAAAfgAAAAAAAgAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAABXQAAAAAAXQAAAAAAfgAAAAAALgAAAAAAfgAAAAAAAwAAAAAAfgAAAAAAHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAALgAAAAAAfgAAAAAAAwAAAAAAfgAAAAAAHwAAAAACHwAAAAAAHwAAAAACHwAAAAADfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAADTQAAAAADTQAAAAACfgAAAAAAbQAAAAAAfgAAAAAAAwAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAAAHwAAAAACfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAABfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAQgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAXQAAAAAC version: 6 0,-3: ind: 0,-3 @@ -142,11 +144,11 @@ entities: version: 6 2,-3: ind: 2,-3 - tiles: fgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAABegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAegAAAAACegAAAAAAegAAAAAAegAAAAACAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAagAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAZAAAAAAAagAAAAAAagAAAAABagAAAAABPAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAagAAAAADPAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAagAAAAACfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAATQAAAAACTQAAAAACTQAAAAADfgAAAAAAcAAAAAAAcAAAAAACcAAAAAAAfgAAAAAAfgAAAAAAPAAAAAAAagAAAAADagAAAAABagAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADeQAAAAACcAAAAAAAfgAAAAAAfgAAAAAAagAAAAAAagAAAAABPAAAAAAAPAAAAAAAfgAAAAAAcAAAAAAAcAAAAAADcAAAAAABcAAAAAAAcAAAAAAAfgAAAAAAcAAAAAABeQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAA + tiles: fgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAegAAAAAAegAAAAADfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAABegAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAABegAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAegAAAAACegAAAAAAegAAAAAAegAAAAACAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAagAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAZAAAAAAAagAAAAAAagAAAAABagAAAAABPAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAPAAAAAAAPAAAAAAAagAAAAADPAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATQAAAAAATQAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAagAAAAACfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAATQAAAAACTQAAAAACTQAAAAADfgAAAAAAcAAAAAAAcAAAAAACcAAAAAAAfgAAAAAAfgAAAAAAPAAAAAAAagAAAAADagAAAAABagAAAAABfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAADeQAAAAACcAAAAAAAfgAAAAAAfgAAAAAAagAAAAAAagAAAAABPAAAAAAAPAAAAAAAfgAAAAAAcAAAAAAAcAAAAAADcAAAAAABcAAAAAAAcAAAAAAAfgAAAAAAcAAAAAABeQAAAAAAcAAAAAAAcAAAAAAAcAAAAAAA version: 6 2,-2: ind: 2,-2 - tiles: PAAAAAAAagAAAAACPAAAAAAAPAAAAAAAfgAAAAAAcAAAAAABcwAAAAAAeAAAAAADcwAAAAADcAAAAAACcAAAAAACcAAAAAAAeQAAAAAAcAAAAAABcAAAAAADcAAAAAABPAAAAAAAagAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAcAAAAAACcwAAAAABeAAAAAACcwAAAAAAcAAAAAAAfgAAAAAAcAAAAAACeQAAAAADcAAAAAAAcAAAAAADcAAAAAABPAAAAAAAagAAAAABagAAAAAAagAAAAAAXQAAAAADcAAAAAACdwAAAAAAcwAAAAAAdwAAAAAAcAAAAAACcAAAAAABcAAAAAACeQAAAAAAcAAAAAABcAAAAAABdQAAAAAAagAAAAACagAAAAABPAAAAAAAPAAAAAAAfgAAAAAAcAAAAAAAcwAAAAACeAAAAAAAcwAAAAABcAAAAAACfgAAAAAAcAAAAAADeQAAAAACcAAAAAADcAAAAAABdQAAAAAAagAAAAACagAAAAACPAAAAAAAPAAAAAAAfgAAAAAAcAAAAAACcwAAAAABeAAAAAADcwAAAAACcAAAAAABcAAAAAADcAAAAAAAeQAAAAAAcAAAAAACcAAAAAAAdQAAAAAAagAAAAADPAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAcAAAAAACcAAAAAACcAAAAAACcAAAAAABcAAAAAAAfgAAAAAAcAAAAAADcAAAAAAAcAAAAAABcAAAAAADcAAAAAABPAAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAfgAAAAAAfgAAAAAAcAAAAAADcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABfgAAAAAAcAAAAAAAcAAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAABfgAAAAAAcAAAAAABcAAAAAAAcAAAAAACcAAAAAABcAAAAAACfgAAAAAAcAAAAAACcAAAAAAAcAAAAAADfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAABcAAAAAABcAAAAAACeQAAAAABeQAAAAAAeQAAAAACcAAAAAAAcAAAAAAAcAAAAAADeQAAAAAAcAAAAAAAfgAAAAAAKAAAAAADXQAAAAAAXQAAAAACXQAAAAAAXQAAAAADfgAAAAAAcAAAAAADcAAAAAABcAAAAAADcAAAAAADcAAAAAABfgAAAAAAcAAAAAADeQAAAAAAcAAAAAACfgAAAAAAHwAAAAAAfgAAAAAAcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABeQAAAAAAcAAAAAADcAAAAAACHwAAAAADcAAAAAACcAAAAAACcAAAAAADcAAAAAABfgAAAAAAdAAAAAADdAAAAAABcAAAAAACdAAAAAACdAAAAAABfgAAAAAAcAAAAAABeQAAAAADcAAAAAADfgAAAAAAXQAAAAAAcAAAAAACdQAAAAABdQAAAAACcAAAAAABfgAAAAAAdAAAAAACdAAAAAABeQAAAAAAdAAAAAABdAAAAAABfgAAAAAAcAAAAAACeQAAAAACcAAAAAADfgAAAAAAfgAAAAAAcAAAAAABdQAAAAAAdQAAAAACcAAAAAABcAAAAAABcAAAAAAAeQAAAAACeQAAAAACeQAAAAACcAAAAAADcAAAAAACcAAAAAAAeQAAAAADcAAAAAADcAAAAAAAcAAAAAAAcAAAAAACdQAAAAADdQAAAAAAcAAAAAADfgAAAAAAdAAAAAADdAAAAAABeQAAAAAAdAAAAAACdAAAAAADfgAAAAAAcAAAAAAAeQAAAAAAcAAAAAADcAAAAAAAcAAAAAAAcAAAAAABcAAAAAACcAAAAAADcAAAAAADfgAAAAAAdAAAAAADdAAAAAACcAAAAAADdAAAAAACdAAAAAAAfgAAAAAAcAAAAAACcAAAAAAAcAAAAAABcAAAAAADcAAAAAAC + tiles: PAAAAAAAagAAAAACPAAAAAAAPAAAAAAAfgAAAAAAcAAAAAABcwAAAAAAeAAAAAADcwAAAAADcAAAAAACcAAAAAACcAAAAAAAeQAAAAAAcAAAAAABcAAAAAADcAAAAAABPAAAAAAAagAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAcAAAAAACcwAAAAABeAAAAAACcwAAAAAAcAAAAAAAfgAAAAAAcAAAAAACeQAAAAADcAAAAAAAcAAAAAADcAAAAAABPAAAAAAAagAAAAABagAAAAAAagAAAAAAXQAAAAADcAAAAAACdwAAAAAAcwAAAAAAdwAAAAAAcAAAAAACcAAAAAABcAAAAAACeQAAAAAAcAAAAAABcAAAAAABdQAAAAAAagAAAAACagAAAAABPAAAAAAAPAAAAAAAfgAAAAAAcAAAAAAAcwAAAAACeAAAAAAAcwAAAAABcAAAAAACfgAAAAAAcAAAAAADeQAAAAACcAAAAAADcAAAAAABdQAAAAAAagAAAAACagAAAAACPAAAAAAAPAAAAAAAfgAAAAAAcAAAAAACcwAAAAABeAAAAAADcwAAAAACcAAAAAABcAAAAAADcAAAAAAAeQAAAAAAcAAAAAACcAAAAAAAdQAAAAAAagAAAAADPAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAcAAAAAACcAAAAAACcAAAAAACcAAAAAABcAAAAAAAfgAAAAAAcAAAAAADcAAAAAAAcAAAAAABcAAAAAADcAAAAAABPAAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAfgAAAAAAfgAAAAAAcAAAAAADcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABfgAAAAAAcAAAAAAAcAAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAABfgAAAAAAcAAAAAABcAAAAAAAcAAAAAACcAAAAAABcAAAAAACfgAAAAAAcAAAAAACcAAAAAAAcAAAAAADfgAAAAAAfgAAAAAAXQAAAAADXQAAAAAAXQAAAAACXQAAAAABcAAAAAABcAAAAAACeQAAAAABeQAAAAAAeQAAAAACcAAAAAAAcAAAAAAAcAAAAAADeQAAAAAAcAAAAAAAfgAAAAAAKAAAAAADXQAAAAAAXQAAAAACXQAAAAAAXQAAAAADfgAAAAAAcAAAAAADcAAAAAABcAAAAAADcAAAAAADcAAAAAABfgAAAAAAcAAAAAADeQAAAAAAcAAAAAACfgAAAAAAHwAAAAAAfgAAAAAAcAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABeQAAAAAAcAAAAAADcAAAAAACHwAAAAADcAAAAAACcAAAAAACcAAAAAADcAAAAAABcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAcAAAAAABeQAAAAADcAAAAAADfgAAAAAAXQAAAAAAcAAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAcAAAAAAAfgAAAAAAcAAAAAACeQAAAAACcAAAAAADfgAAAAAAfgAAAAAAcAAAAAABeQAAAAAAcAAAAAAAcAAAAAABcAAAAAABcAAAAAAAcAAAAAAAcAAAAAAAeQAAAAAAeQAAAAAAcAAAAAACcAAAAAAAeQAAAAADcAAAAAADcAAAAAAAcAAAAAAAcAAAAAACeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAeQAAAAAAcAAAAAAAfgAAAAAAcAAAAAAAeQAAAAAAcAAAAAADcAAAAAAAcAAAAAAAcAAAAAABcAAAAAACcAAAAAADcAAAAAADcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAfgAAAAAAcAAAAAACcAAAAAAAcAAAAAABcAAAAAADcAAAAAAC version: 6 3,-3: ind: 3,-3 @@ -158,11 +160,11 @@ entities: version: 6 2,-1: ind: 2,-1 - tiles: fgAAAAAAcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAeQAAAAADeQAAAAADeQAAAAAAcAAAAAAAfgAAAAAAcAAAAAAAcAAAAAABcAAAAAAAcAAAAAACcAAAAAADfgAAAAAAHwAAAAADHwAAAAACHwAAAAABHwAAAAACfgAAAAAAcAAAAAABcAAAAAACcAAAAAABfgAAAAAAXQAAAAABcAAAAAAAcAAAAAABcAAAAAADcAAAAAAAcAAAAAADfgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAHwAAAAACHwAAAAACcAAAAAAAeQAAAAACcAAAAAAAfgAAAAAAXQAAAAAAcAAAAAADcAAAAAABcAAAAAABcAAAAAACcAAAAAACfgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAHwAAAAABfgAAAAAAcAAAAAADeQAAAAAAcAAAAAABfgAAAAAAXQAAAAABfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABeQAAAAAAcAAAAAABfgAAAAAAXQAAAAADHwAAAAAAHwAAAAACHwAAAAADfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAADHwAAAAADHwAAAAACHwAAAAACfgAAAAAAcAAAAAACeQAAAAADcAAAAAACfgAAAAAAcAAAAAABHwAAAAAAHwAAAAACHwAAAAACfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADHwAAAAADHwAAAAAAHwAAAAABHwAAAAABcAAAAAACeQAAAAADcAAAAAABcAAAAAAAcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAACHwAAAAADHwAAAAACHwAAAAADfgAAAAAAcAAAAAACcAAAAAADcAAAAAADfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAACHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbQAAAAAAHwAAAAAAHwAAAAADHwAAAAABHwAAAAACHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADHwAAAAABHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAADfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADfgAAAAAAHwAAAAADXQAAAAAAXQAAAAABXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAACfgAAAAAAHwAAAAABXQAAAAADXQAAAAACXQAAAAAC + tiles: fgAAAAAAcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAeQAAAAADeQAAAAADeQAAAAAAcAAAAAAAfgAAAAAAcAAAAAAAcAAAAAABcAAAAAAAcAAAAAACcAAAAAADfgAAAAAAHwAAAAADHwAAAAACHwAAAAABHwAAAAACfgAAAAAAcAAAAAABcAAAAAACcAAAAAABfgAAAAAAXQAAAAABcAAAAAAAcAAAAAABcAAAAAADcAAAAAAAcAAAAAADfgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAHwAAAAACHwAAAAACcAAAAAAAeQAAAAACcAAAAAAAfgAAAAAAXQAAAAAAcAAAAAADcAAAAAABcAAAAAABcAAAAAACcAAAAAACfgAAAAAAUgAAAAAAUgAAAAAAUgAAAAAAHwAAAAABfgAAAAAAcAAAAAADeQAAAAAAcAAAAAABfgAAAAAAXQAAAAABfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAcAAAAAABeQAAAAAAcAAAAAABfgAAAAAAXQAAAAADHwAAAAAAHwAAAAACHwAAAAADfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAADHwAAAAADHwAAAAACHwAAAAACfgAAAAAAcAAAAAACeQAAAAADcAAAAAACfgAAAAAAcAAAAAABHwAAAAAAHwAAAAACHwAAAAACfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADHwAAAAADHwAAAAAAHwAAAAABHwAAAAABcAAAAAACeQAAAAADcAAAAAABcAAAAAAAcAAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAACHwAAAAADHwAAAAACHwAAAAADfgAAAAAAcAAAAAACcAAAAAADcAAAAAADfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAACHwAAAAACHwAAAAAAHwAAAAACHwAAAAABfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAbQAAAAAAHwAAAAAAHwAAAAADHwAAAAABHwAAAAACHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADHwAAAAABHwAAAAAAHwAAAAADfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAADfgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAACXQAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAAC version: 6 3,-1: ind: 3,-1 - tiles: cAAAAAACfgAAAAAAcAAAAAACAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAcAAAAAADcAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAcAAAAAAAcAAAAAADfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAcAAAAAABcAAAAAACfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAcAAAAAABcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAcAAAAAACcAAAAAACXQAAAAADfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAcAAAAAAAcAAAAAAAXQAAAAADfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAACXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: cAAAAAACfgAAAAAAcAAAAAACAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAcAAAAAADcAAAAAABfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAcAAAAAAAcAAAAAADfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAcAAAAAABcAAAAAACfgAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAcAAAAAABcAAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAcAAAAAACcAAAAAACXQAAAAADfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAcAAAAAAAcAAAAAAAXQAAAAADfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAZAAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAZAAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAACXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 1,-4: ind: 1,-4 @@ -278,11 +280,11 @@ entities: version: 6 2,0: ind: 2,0 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADXQAAAAACXQAAAAACXQAAAAADXQAAAAADXQAAAAACXQAAAAAAfgAAAAAAHwAAAAADXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABXQAAAAACXQAAAAADfgAAAAAAXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAACfgAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAABXQAAAAACXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAADXQAAAAACXQAAAAABXQAAAAABXQAAAAADXQAAAAADXQAAAAADfgAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAACfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAABXQAAAAADXQAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAACfgAAAAAAHwAAAAABHwAAAAACHwAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAABfgAAAAAAegAAAAACegAAAAACegAAAAAAXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAHwAAAAABXQAAAAAAXQAAAAAAXQAAAAADfgAAAAAAegAAAAABegAAAAABegAAAAACfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAegAAAAAAegAAAAADegAAAAADfgAAAAAAfgAAAAAA + tiles: fgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADXQAAAAACXQAAAAACXQAAAAADXQAAAAADXQAAAAACXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABXQAAAAACXQAAAAADfgAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAACfgAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAACXQAAAAACXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAADXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAXQAAAAABXQAAAAAAXQAAAAAAXQAAAAACXQAAAAADXQAAAAADXQAAAAABXQAAAAACXQAAAAABXQAAAAAAXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAADXQAAAAACXQAAAAABXQAAAAABXQAAAAADXQAAAAADXQAAAAADfgAAAAAAXQAAAAADXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAABXQAAAAACXQAAAAADXQAAAAAAXQAAAAACfgAAAAAAXQAAAAAAXQAAAAABXQAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAABXQAAAAADXQAAAAABXQAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAXQAAAAACXQAAAAAAXQAAAAACXQAAAAABXQAAAAABXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAACXQAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAAAfgAAAAAAHwAAAAADHwAAAAAAHwAAAAADHwAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAABXQAAAAADXQAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAbAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAACfgAAAAAAHwAAAAABHwAAAAACHwAAAAAAfgAAAAAAXQAAAAABfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAXQAAAAABXQAAAAADXQAAAAABfgAAAAAAegAAAAACegAAAAACegAAAAAAXQAAAAACXQAAAAACfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAHwAAAAABXQAAAAAAXQAAAAAAXQAAAAADfgAAAAAAegAAAAABegAAAAABegAAAAACfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAAAfgAAAAAAegAAAAAAegAAAAADegAAAAADfgAAAAAAfgAAAAAA version: 6 3,1: ind: 3,1 - tiles: XQAAAAABXQAAAAABXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAADXQAAAAACXQAAAAADXQAAAAACfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAAAXQAAAAACfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAACfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAACXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAABXQAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAACaAAAAAABXQAAAAAAaAAAAAACXQAAAAADXQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAACDAAAAAACDAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: XQAAAAABXQAAAAABXQAAAAAAXQAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAACXQAAAAACXQAAAAADfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAADXQAAAAAAXQAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAADXQAAAAABXQAAAAADXQAAAAACXQAAAAADXQAAAAACfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAACXQAAAAAAXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAAAXQAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAABXQAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAAAXQAAAAACfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAAAMQAAAAAAMQAAAAAAfgAAAAAAXQAAAAAAXQAAAAABXQAAAAACXQAAAAABXQAAAAACfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAADXQAAAAABXQAAAAACXQAAAAACXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAACXQAAAAABXQAAAAACXQAAAAABXQAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAABfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAADXQAAAAABXQAAAAACXQAAAAACaAAAAAABXQAAAAAAaAAAAAACXQAAAAADXQAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXQAAAAAAXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAACDAAAAAACDAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -3,1: ind: -3,1 @@ -294,7 +296,7 @@ entities: version: 6 -2,1: ind: -2,1 - tiles: fgAAAAAAfgAAAAAAfgAAAAAAIAAAAAAAegAAAAACegAAAAABegAAAAACegAAAAAAegAAAAAAIAAAAAACfgAAAAAAHwAAAAADHwAAAAACHwAAAAABfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAIAAAAAACegAAAAADegAAAAAAegAAAAADegAAAAACegAAAAAAIAAAAAABHwAAAAABQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAXQAAAAABbQAAAAAAfgAAAAAAfgAAAAAAIAAAAAABegAAAAADegAAAAABegAAAAADegAAAAACegAAAAABIAAAAAACfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAHwAAAAAAXQAAAAABLgAAAAAALgAAAAAAfgAAAAAAIAAAAAABegAAAAACegAAAAAAegAAAAACegAAAAACegAAAAABIAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAXQAAAAABLgAAAAAALgAAAAAAfgAAAAAAIAAAAAADegAAAAAAegAAAAAAegAAAAADegAAAAABegAAAAADIAAAAAAAHwAAAAADIwAAAAAAHwAAAAABIwAAAAADfgAAAAAAXQAAAAADLgAAAAAALgAAAAAAfgAAAAAAIAAAAAACegAAAAADegAAAAAAegAAAAABegAAAAAAegAAAAAAIAAAAAACfgAAAAAAIwAAAAAAHwAAAAAAIwAAAAABfgAAAAAAXQAAAAACLgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATQAAAAADXQAAAAACXQAAAAADXQAAAAACXQAAAAADXQAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAABXQAAAAABXQAAAAADXQAAAAADXQAAAAABTgAAAAABXQAAAAACTgAAAAAAXQAAAAACTgAAAAABXQAAAAABTgAAAAADXQAAAAADTgAAAAABXQAAAAAATgAAAAACXQAAAAADTgAAAAACXQAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABHwAAAAAAHwAAAAABHwAAAAADHwAAAAAAHwAAAAACHwAAAAABHwAAAAADHwAAAAAAfgAAAAAATQAAAAAATQAAAAACTQAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAABfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAACXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAACXQAAAAADXQAAAAABXQAAAAABXQAAAAABXQAAAAACXQAAAAACXQAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA + tiles: fgAAAAAAfgAAAAAAfgAAAAAAIAAAAAAAegAAAAACegAAAAABegAAAAACegAAAAAAegAAAAAAIAAAAAACfgAAAAAAHwAAAAADHwAAAAACHwAAAAABfgAAAAAAXQAAAAAAfgAAAAAAfgAAAAAAbQAAAAAAIAAAAAACegAAAAADegAAAAAAegAAAAADegAAAAACegAAAAAAIAAAAAABHwAAAAABQAAAAAAAQAAAAAAAQAAAAAAAfgAAAAAAXQAAAAABbQAAAAAAfgAAAAAAfgAAAAAAIAAAAAABegAAAAADegAAAAABegAAAAADegAAAAACegAAAAABIAAAAAACfgAAAAAAQAAAAAAAQAAAAAAAQAAAAAAAHwAAAAAAXQAAAAABLgAAAAAALgAAAAAAfgAAAAAAIAAAAAABegAAAAACegAAAAAAegAAAAACegAAAAACegAAAAABIAAAAAACfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAXQAAAAABLgAAAAAALgAAAAAAfgAAAAAAIAAAAAADegAAAAAAegAAAAAAegAAAAADegAAAAABegAAAAADIAAAAAAAHwAAAAADIwAAAAAAHwAAAAABIwAAAAADfgAAAAAAXQAAAAADLgAAAAAALgAAAAAAfgAAAAAAIAAAAAACegAAAAADegAAAAAAegAAAAABegAAAAAAegAAAAAAIAAAAAACfgAAAAAAIwAAAAAAHwAAAAAAIwAAAAABfgAAAAAAXQAAAAACLgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAABXQAAAAACXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAATQAAAAADXQAAAAACXQAAAAADXQAAAAACXQAAAAADXQAAAAADXQAAAAACXQAAAAADXQAAAAAAXQAAAAACXQAAAAABXQAAAAADXQAAAAADXQAAAAADXQAAAAABXQAAAAABXQAAAAADXQAAAAADXQAAAAABTgAAAAABXQAAAAACTgAAAAAAXQAAAAACTgAAAAABXQAAAAABTgAAAAADXQAAAAADTgAAAAABXQAAAAAATgAAAAACXQAAAAADTgAAAAACXQAAAAABXQAAAAABXQAAAAABXQAAAAAAXQAAAAACXQAAAAACXQAAAAACXQAAAAABXQAAAAABXQAAAAAAXQAAAAADXQAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAAAXQAAAAABHwAAAAAAHwAAAAABHwAAAAADHwAAAAAAHwAAAAACHwAAAAABHwAAAAADHwAAAAAAfgAAAAAATQAAAAAATQAAAAACTQAAAAAAfgAAAAAAfgAAAAAAXQAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAACXQAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAADXQAAAAADXQAAAAACXQAAAAAAXQAAAAAAXQAAAAABXQAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAXQAAAAAAXQAAAAAAXQAAAAADXQAAAAABXQAAAAADXQAAAAADXQAAAAAAXQAAAAAAXQAAAAADXQAAAAACXQAAAAABXQAAAAACXQAAAAABXQAAAAAAXQAAAAAAXQAAAAABXQAAAAABXQAAAAADXQAAAAABXQAAAAAAXQAAAAACXQAAAAAAXQAAAAADXQAAAAACXQAAAAADXQAAAAABXQAAAAABXQAAAAABXQAAAAACXQAAAAACXQAAAAACXQAAAAACXQAAAAADXQAAAAABXQAAAAABfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA version: 6 -2,2: ind: -2,2 @@ -619,7 +621,6 @@ entities: 1520: -47,17 1711: -25,-6 1820: -19,27 - 1838: -26,32 1839: -27,32 1840: -28,32 1841: -23,32 @@ -636,7 +637,6 @@ entities: 2079: -40,-20 2161: -11,32 2162: -13,32 - 2236: 3,11 2237: 3,15 2264: -5,21 2265: -5,20 @@ -676,6 +676,12 @@ entities: 3539: 45,-9 3672: -17,-54 3835: 2,27 + 3877: 44,0 + 3878: 44,1 + 3879: 45,0 + 3880: 45,1 + 3881: 47,17 + 3882: 47,18 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' @@ -1838,7 +1844,6 @@ entities: color: '#EFD54196' id: BrickTileWhiteLineN decals: - 1833: -26,32 1834: -27,32 1835: -28,32 1836: -29,32 @@ -2169,6 +2174,7 @@ entities: 1070: -27,-1 1682: -9,-21 2535: -55,17 + 3911: -26,32 - node: color: '#DE3A3A96' id: CautionGreyscale @@ -2290,6 +2296,12 @@ entities: 3535: 44,-22 3536: 44,-23 3537: 44,-24 + 3871: 34,-19 + 3872: 35,-19 + 3873: 36,-19 + 3874: 37,-19 + 3875: 38,-19 + 3876: 39,-19 - node: color: '#79150096' id: CheckerNWSE @@ -2728,6 +2740,24 @@ entities: 3567: 22,-41 3568: 28,-42 3569: 28,-41 + 3886: -13,-16 + 3887: -12,-17 + 3888: -11,-16 + 3889: -11,-13 + 3890: -10,-15 + 3891: -11,-15 + 3892: -10,-16 + 3893: -10,-15 + 3894: -9,-15 + 3895: -10,-13 + 3896: -11,-18 + 3897: -11,-19 + 3898: -11,-20 + 3899: -11,-20 + 3900: -11,-21 + 3901: -13,-19 + 3902: -13,-20 + 3903: -12,-14 - node: angle: 3.141592653589793 rad color: '#FFFFFFFF' @@ -2766,7 +2796,6 @@ entities: 834: -5,-25 835: -4,-25 1631: -39,9 - 1649: -10,-15 1680: -7,-16 2238: -1,13 2314: 52,-38 @@ -2788,14 +2817,13 @@ entities: 2788: -59,26 2789: -60,26 2924: 45,9 - 3138: 43,2 - 3139: 45,0 - 3140: 45,-1 3141: 48,4 - 3188: 40,-2 3329: -59,20 3330: -59,22 3331: -59,22 + 3883: -12,-16 + 3884: -13,-17 + 3885: -12,-15 - node: angle: 3.141592653589793 rad color: '#FFFFFFFF' @@ -3037,17 +3065,9 @@ entities: 1633: -39,8 1634: -39,7 1635: -39,-1 - 1651: -10,-16 - 1652: -10,-14 - 1653: -11,-14 - 1654: -10,-13 - 1655: -11,-13 1656: -8,-12 1657: -8,-14 1658: -9,-13 - 1659: -10,-13 - 1660: -11,-17 - 1661: -11,-18 1677: -9,-16 1678: -8,-16 1679: -8,-16 @@ -3121,10 +3141,7 @@ entities: 3146: 46,3 3147: 43,3 3148: 42,3 - 3149: 44,2 - 3150: 45,1 3151: 46,-1 - 3152: 45,-2 3153: 46,1 3154: 47,2 3155: 48,1 @@ -3160,7 +3177,6 @@ entities: 3644: 35,-23 3645: 34,-25 3646: 33,-23 - 3647: 33,-21 3648: 33,-22 3801: -33,8 3802: -34,9 @@ -3233,7 +3249,6 @@ entities: 836: -3,-25 837: -6,-25 1215: 6,-22 - 1650: -11,-16 2007: -40,-8 2239: 0,13 2240: -1,14 @@ -3262,8 +3277,6 @@ entities: 3142: 49,4 3143: 44,3 3144: 40,3 - 3189: 41,-2 - 3190: 42,-2 - node: angle: 3.141592653589793 rad color: '#FFFFFFFF' @@ -3439,9 +3452,6 @@ entities: 3087: 36,2 3160: 49,5 3161: 48,5 - 3185: 40,-2 - 3186: 41,-2 - 3187: 42,-2 - node: color: '#D0BF4AA7' id: FullTileOverlayGreyscale @@ -3625,10 +3635,15 @@ entities: color: '#52B4E996' id: HalfTileOverlayGreyscale decals: - 245: 33,-17 - 246: 34,-17 2870: 47,-17 2871: 48,-17 + 3864: 40,-17 + 3865: 39,-17 + 3866: 38,-17 + 3867: 37,-17 + 3868: 36,-17 + 3869: 35,-17 + 3870: 34,-17 - node: color: '#9FED5896' id: HalfTileOverlayGreyscale @@ -3701,8 +3716,13 @@ entities: color: '#52B4E996' id: HalfTileOverlayGreyscale180 decals: - 2845: 34,-21 - 2846: 33,-21 + 3853: 34,-21 + 3854: 35,-21 + 3855: 36,-21 + 3856: 37,-21 + 3857: 38,-21 + 3858: 39,-21 + 3859: 40,-21 - node: color: '#9FED5896' id: HalfTileOverlayGreyscale180 @@ -3864,10 +3884,10 @@ entities: color: '#52B4E996' id: HalfTileOverlayGreyscale90 decals: - 244: 35,-20 2872: 49,-18 2873: 49,-19 - 3503: 35,-18 + 3862: 41,-20 + 3863: 41,-18 - node: color: '#9FED5896' id: HalfTileOverlayGreyscale90 @@ -4037,33 +4057,6 @@ entities: 3000: -108,28 3001: -108,29 3326: 35,18 - - node: - color: '#52B4E996' - id: MiniTileOverlay - decals: - 3543: 40,-21 - 3544: 40,-20 - 3545: 41,-20 - 3546: 41,-21 - 3547: 40,-18 - 3548: 40,-17 - 3549: 41,-17 - 3550: 41,-18 - 3551: 38,-18 - 3552: 37,-18 - 3553: 37,-17 - 3554: 38,-17 - 3555: 38,-20 - 3556: 37,-20 - 3557: 37,-21 - 3558: 38,-21 - - node: - color: '#52B4E996' - id: MonoOverlay - decals: - 2839: 34,-20 - 2840: 33,-19 - 2841: 34,-18 - node: color: '#80C71F95' id: MonoOverlay @@ -4430,12 +4423,10 @@ entities: 665: -17,-6 701: -18,1 702: -18,2 - 1638: -11,-16 - 1639: -11,-15 - 1640: -11,-14 - 1641: -11,-13 - 1642: -11,-12 - 1648: -10,-12 + 3906: -13,-14 + 3907: -13,-15 + 3908: -13,-16 + 3909: -13,-17 - node: color: '#EFCC4196' id: QuarterTileOverlayGreyscale @@ -4712,13 +4703,6 @@ entities: decals: 558: 48,12 648: 36,4 - 3131: 45,-2 - 3132: 45,-1 - 3133: 45,0 - 3134: 45,1 - 3135: 45,2 - 3136: 44,2 - 3137: 43,2 3163: 49,6 3164: 50,6 3165: 54,6 @@ -5188,6 +5172,8 @@ entities: 1645: -8,-13 1646: -8,-12 1647: -9,-12 + 3904: -10,-12 + 3905: -11,-12 - node: color: '#DF81C96C' id: QuarterTileOverlayGreyscale90 @@ -5217,7 +5203,6 @@ entities: decals: 2232: 1,11 2233: 2,11 - 2234: 3,11 2235: 4,11 2279: -15,23 2280: -15,24 @@ -5227,6 +5212,11 @@ entities: 2284: -18,25 2285: -19,25 2286: -20,25 + - node: + color: '#EFD24193' + id: QuarterTileOverlayGreyscale90 + decals: + 3912: 3,11 - node: color: '#FFFFFFFF' id: Remains @@ -5351,7 +5341,7 @@ entities: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale180 decals: - 2844: 35,-21 + 3860: 41,-21 - node: color: '#9FED5896' id: ThreeQuarterTileOverlayGreyscale180 @@ -5424,7 +5414,7 @@ entities: id: ThreeQuarterTileOverlayGreyscale90 decals: 2874: 49,-17 - 3502: 35,-17 + 3861: 41,-17 - node: color: '#A4610696' id: ThreeQuarterTileOverlayGreyscale90 @@ -5579,7 +5569,6 @@ entities: color: '#52B4E996' id: WarnFullGreyscale decals: - 3500: 36,-19 3501: 42,-19 - node: color: '#D381C996' @@ -5655,7 +5644,6 @@ entities: id: WarnLineGreyscaleE decals: 2865: 45,-22 - 3499: 35,-19 3528: 45,-10 3560: 41,-19 - node: @@ -5838,7 +5826,6 @@ entities: 3505: 32,-18 3526: 43,-14 3527: 43,-10 - 3559: 37,-19 - node: color: '#9FED5896' id: WarnLineGreyscaleW @@ -5896,11 +5883,6 @@ entities: 3613: 5,-56 3614: 5,-55 3615: 5,-54 - - node: - color: '#DE3A3A96' - id: WarnLineN - decals: - 1667: -9,-19 - node: color: '#FFFFFFFF' id: WarnLineN @@ -5930,7 +5912,6 @@ entities: 1801: 18,-25 2567: 39,-35 3024: -41,23 - 3209: 43,2 3356: -15,48 3357: -14,48 3358: -13,48 @@ -5998,6 +5979,7 @@ entities: 3384: -15,41 3441: -1,-13 3824: -31,20 + 3852: 40,-36 - node: color: '#DE3A3A96' id: WarnLineW @@ -6073,6 +6055,7 @@ entities: 3839: -4,37 3840: -5,37 3841: -6,37 + 3910: -26,32 - node: angle: -3.141592653589793 rad color: '#FFFFFFFF' @@ -6525,16 +6508,13 @@ entities: 0: 13107 1: 32768 -4,-4: - 0: 13107 - 1: 34952 + 0: 15291 -4,-5: - 0: 13107 - 1: 34952 + 0: 48059 -5,-4: 0: 48011 -4,-3: - 0: 13107 - 1: 34952 + 0: 15295 -5,-3: 0: 35768 -4,-2: @@ -6550,28 +6530,29 @@ entities: -4,0: 0: 47927 -3,-4: - 0: 65534 + 0: 61439 + -3,-3: + 0: 270 -3,-1: 1: 35 0: 8 - -3,-3: - 0: 238 -3,-5: - 0: 43704 + 0: 15018 -3,-2: 1: 8736 0: 34816 -2,-4: - 0: 13143 + 0: 4375 + 1: 1024 -2,-3: - 0: 17 + 0: 1 -2,-2: 0: 65532 -2,-1: 0: 191 1: 24576 -2,-5: - 0: 16372 + 0: 10096 -2,0: 1: 33860 0: 4352 @@ -6588,7 +6569,7 @@ entities: -1,2: 0: 65520 0,3: - 0: 49073 + 0: 49081 -1,3: 0: 49072 1,1: @@ -6596,7 +6577,7 @@ entities: 1,2: 0: 8190 1,3: - 0: 65532 + 0: 65533 1,4: 0: 63346 2,1: @@ -6725,8 +6706,7 @@ entities: -5,-7: 0: 61681 -4,-6: - 0: 13311 - 1: 32768 + 0: 46079 -5,-6: 0: 64511 -5,-5: @@ -6738,8 +6718,7 @@ entities: -3,-7: 0: 62719 -3,-6: - 0: 35071 - 1: 12288 + 0: 43263 -2,-8: 0: 61695 -2,-7: @@ -6794,7 +6773,7 @@ entities: 4,-11: 0: 65295 4,-10: - 0: 65520 + 0: 65521 4,-9: 0: 65535 -4,-12: @@ -7242,11 +7221,11 @@ entities: 10,-11: 0: 65383 10,-9: - 0: 47280 + 0: 47283 10,-13: 0: 30327 10,-10: - 0: 26210 + 0: 33378 10,-8: 0: 48127 11,-12: @@ -7270,9 +7249,9 @@ entities: 12,-9: 0: 61663 9,-6: - 0: 57583 + 0: 61679 9,-5: - 0: 61182 + 0: 65535 9,-7: 0: 60654 10,-7: @@ -7396,9 +7375,9 @@ entities: 10,-2: 0: 35763 10,-1: - 0: 30479 + 0: 65295 10,0: - 0: 65399 + 0: 65535 11,-3: 0: 49083 11,-2: @@ -7406,7 +7385,7 @@ entities: 11,-1: 0: 65311 11,0: - 0: 65519 + 0: 65535 12,-3: 0: 30579 12,-2: @@ -7436,7 +7415,7 @@ entities: 1: 273 0: 4096 15,-2: - 1: 35064 + 1: 248 16,-4: 1: 1 15,-3: @@ -7880,7 +7859,7 @@ entities: 11,3: 0: 15355 12,4: - 0: 24575 + 0: 8191 13,1: 0: 65286 13,2: @@ -8079,7 +8058,7 @@ entities: 9,2: 0: 65535 10,1: - 0: 48114 + 0: 48115 10,2: 0: 15359 13,5: @@ -8110,7 +8089,7 @@ entities: 1: 39312 -12,8: 4: 12 - 5: 3072 + 6: 3072 -11,5: 0: 63351 -11,6: @@ -8119,7 +8098,7 @@ entities: -11,8: 4: 1 1: 17476 - 5: 256 + 6: 256 -11,7: 1: 17484 -10,5: @@ -8145,7 +8124,7 @@ entities: -8,6: 0: 4095 -8,7: - 1: 7 + 1: 15 0: 65280 -16,4: 0: 240 @@ -8197,8 +8176,8 @@ entities: -7,6: 0: 4095 -7,7: - 0: 65280 - 1: 13 + 1: 1 + 0: 65294 -7,8: 0: 65295 -6,5: @@ -8206,7 +8185,7 @@ entities: -6,6: 0: 20223 -6,7: - 0: 65518 + 0: 65519 -6,8: 0: 61006 -5,8: @@ -8222,10 +8201,10 @@ entities: 0: 255 1: 57344 -8,11: - 6: 816 + 5: 816 1: 34952 -9,11: - 6: 2176 + 5: 2176 1: 8738 -8,12: 1: 34959 @@ -8245,7 +8224,7 @@ entities: -6,11: 0: 4095 -6,12: - 6: 61166 + 5: 61166 -5,9: 0: 65535 -5,10: @@ -8253,7 +8232,7 @@ entities: -5,11: 0: 36863 -5,12: - 6: 30515 + 5: 30515 0: 12 -4,9: 0: 65535 @@ -8263,7 +8242,7 @@ entities: 0: 4095 -4,12: 0: 1 - 6: 65518 + 5: 65518 -4,13: 1: 61680 -5,13: @@ -8277,7 +8256,7 @@ entities: -5,15: 1: 17487 -3,12: - 6: 13107 + 5: 13107 1: 34944 -3,13: 1: 47792 @@ -8343,7 +8322,7 @@ entities: 1: 61713 -12,9: 0: 16 - 6: 3084 + 5: 3084 -13,9: 1: 39305 -13,10: @@ -8353,18 +8332,18 @@ entities: 0: 12544 -12,10: 3: 12 - 6: 3072 + 5: 3072 -12,11: - 6: 12 + 5: 12 -11,9: - 6: 257 + 5: 257 1: 17476 -11,10: 3: 1 - 6: 256 + 5: 256 1: 17476 -11,11: - 6: 1 + 5: 1 1: 17476 -11,12: 1: 17487 @@ -8418,7 +8397,7 @@ entities: 1: 15 -13,12: 1: 34952 - 5: 48 + 6: 48 4: 12288 -12,13: 1: 61455 @@ -8452,11 +8431,11 @@ entities: 1: 62671 -7,14: 1: 244 - 6: 57344 + 5: 57344 0: 1024 -7,15: 1: 61440 - 6: 238 + 5: 238 0: 1024 -7,16: 1: 65524 @@ -8515,7 +8494,7 @@ entities: -14,12: 0: 1 1: 8738 - 5: 128 + 6: 128 4: 32768 -17,12: 0: 52232 @@ -9040,7 +9019,7 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 6666.982 + - 0 - 0 - 0 - 0 @@ -9055,7 +9034,7 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 0 + - 6666.982 - 0 - 0 - 0 @@ -9422,7 +9401,6 @@ entities: - 4502 - 5518 - 12511 - - 5808 - uid: 5092 components: - type: Transform @@ -9641,7 +9619,6 @@ entities: - 17872 - 17879 - 17875 - - 11834 - 19862 - 19861 - 19852 @@ -10893,13 +10870,6 @@ entities: - type: Transform pos: 47.5,7.5 parent: 60 - - uid: 7700 - components: - - type: MetaData - name: Cargo Breakroom - - type: Transform - pos: 48.5,19.5 - parent: 60 - uid: 9283 components: - type: MetaData @@ -10907,6 +10877,12 @@ entities: - type: Transform pos: 42.5,5.5 parent: 60 + - uid: 10679 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 48.5,15.5 + parent: 60 - uid: 11831 components: - type: Transform @@ -10926,12 +10902,11 @@ entities: parent: 60 - proto: AirlockCargoLocked entities: - - uid: 13158 + - uid: 100 components: - - type: MetaData - name: Cargo Breakroom - type: Transform - pos: 48.5,15.5 + rot: 1.5707963267948966 rad + pos: 48.5,19.5 parent: 60 - proto: AirlockChapelLocked entities: @@ -11288,6 +11263,30 @@ entities: linkedPorts: 1435: - DoorStatus: DoorBolt +- proto: AirlockExternalAtmosphericsLocked + entities: + - uid: 12194 + components: + - type: Transform + pos: -26.5,28.5 + parent: 60 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 13627: + - DoorStatus: DoorBolt + - uid: 13627 + components: + - type: Transform + pos: -23.5,28.5 + parent: 60 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 12194: + - DoorStatus: DoorBolt - proto: AirlockExternalEngineeringLocked entities: - uid: 23569 @@ -11896,6 +11895,28 @@ entities: linkedPorts: 1441: - DoorStatus: DoorBolt + - uid: 2167 + components: + - type: Transform + pos: -11.5,-9.5 + parent: 60 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 2418: + - DoorStatus: DoorBolt + - uid: 2418 + components: + - type: Transform + pos: -13.5,-11.5 + parent: 60 + - type: DeviceLinkSink + invokeCounter: 1 + - type: DeviceLinkSource + linkedPorts: + 2167: + - DoorStatus: DoorBolt - uid: 3900 components: - type: Transform @@ -11947,10 +11968,11 @@ entities: parent: 7536 - proto: AirlockFreezer entities: - - uid: 13696 + - uid: 13598 components: - type: Transform - pos: -10.5,-16.5 + rot: 3.141592653589793 rad + pos: -12.5,-17.5 parent: 60 - proto: AirlockFreezerKitchenHydroLocked entities: @@ -12730,6 +12752,11 @@ entities: - type: Transform pos: 28.5,10.5 parent: 60 + - uid: 13753 + components: + - type: Transform + pos: 16.5,-39.5 + parent: 60 - uid: 14443 components: - type: MetaData @@ -12895,13 +12922,6 @@ entities: parent: 60 - proto: AirlockMedicalLocked entities: - - uid: 103 - components: - - type: MetaData - name: Triage - - type: Transform - pos: 36.5,-18.5 - parent: 60 - uid: 104 components: - type: MetaData @@ -13127,15 +13147,13 @@ entities: - type: Transform pos: -2.5,-46.5 parent: 60 - - uid: 12757 +- proto: AirlockSecurityLocked + entities: + - uid: 175 components: - - type: MetaData - name: Perma Brig - type: Transform pos: -8.5,-21.5 parent: 60 -- proto: AirlockSecurityLocked - entities: - uid: 1889 components: - type: MetaData @@ -13150,12 +13168,7 @@ entities: - type: Transform pos: -31.5,-19.5 parent: 60 - - uid: 13701 - components: - - type: Transform - pos: -8.5,-19.5 - parent: 60 - - uid: 13727 + - uid: 13881 components: - type: Transform pos: -6.5,-16.5 @@ -13797,14 +13810,6 @@ entities: - type: Transform pos: 11.5,-29.5 parent: 60 - - uid: 3130 - components: - - type: MetaData - name: Medical Examination APC - - type: Transform - rot: -1.5707963267948966 rad - pos: 36.5,-19.5 - parent: 60 - uid: 3339 components: - type: MetaData @@ -13905,6 +13910,11 @@ entities: - type: Transform pos: -47.5,-22.5 parent: 60 + - uid: 6042 + components: + - type: Transform + pos: 36.5,-15.5 + parent: 60 - uid: 6263 components: - type: MetaData @@ -15111,10 +15121,9 @@ entities: parent: 60 - proto: BaseGasCondenser entities: - - uid: 4326 + - uid: 400 components: - type: Transform - rot: -1.5707963267948966 rad pos: 41.5,-34.5 parent: 60 - uid: 18453 @@ -15124,6 +15133,11 @@ entities: parent: 60 - proto: Beaker entities: + - uid: 2244 + components: + - type: Transform + pos: -12.753071,-14.410143 + parent: 60 - uid: 4133 components: - type: Transform @@ -15271,6 +15285,11 @@ entities: - type: Transform pos: -7.5,-12.5 parent: 60 + - uid: 13760 + components: + - type: Transform + pos: 47.5,16.5 + parent: 60 - uid: 14632 components: - type: Transform @@ -15408,16 +15427,16 @@ entities: - type: InsideEntityStorage - proto: BedsheetMedical entities: + - uid: 402 + components: + - type: Transform + pos: 36.5,-16.5 + parent: 60 - uid: 1502 components: - type: Transform pos: -18.5,-7.5 parent: 60 - - uid: 4491 - components: - - type: Transform - pos: 38.5,-20.5 - parent: 60 - uid: 9005 components: - type: Transform @@ -15428,16 +15447,16 @@ entities: - type: Transform pos: 40.5,-16.5 parent: 60 - - uid: 12354 - components: - - type: Transform - pos: 38.5,-16.5 - parent: 60 - uid: 12508 components: - type: Transform pos: 30.5,-16.5 parent: 60 + - uid: 12758 + components: + - type: Transform + pos: 36.5,-20.5 + parent: 60 - proto: BedsheetMime entities: - uid: 6682 @@ -16535,6 +16554,21 @@ entities: - type: Transform pos: 23.744236,-27.558329 parent: 60 +- proto: ButtonFrameCaution + entities: + - uid: 13637 + components: + - type: Transform + pos: -48.5,15.5 + parent: 60 +- proto: ButtonFrameExit + entities: + - uid: 15263 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -52.5,14.5 + parent: 60 - proto: CableApcExtension entities: - uid: 23 @@ -16597,11 +16631,26 @@ entities: - type: Transform pos: -11.5,2.5 parent: 60 + - uid: 513 + components: + - type: Transform + pos: 36.5,-15.5 + parent: 60 - uid: 533 components: - type: Transform pos: 41.5,-18.5 parent: 60 + - uid: 547 + components: + - type: Transform + pos: -10.5,-16.5 + parent: 60 + - uid: 549 + components: + - type: Transform + pos: -10.5,-15.5 + parent: 60 - uid: 551 components: - type: Transform @@ -16812,6 +16861,16 @@ entities: - type: Transform pos: -25.5,-21.5 parent: 60 + - uid: 2166 + components: + - type: Transform + pos: -12.5,-11.5 + parent: 60 + - uid: 2179 + components: + - type: Transform + pos: -14.5,-11.5 + parent: 60 - uid: 2216 components: - type: Transform @@ -16837,6 +16896,11 @@ entities: - type: Transform pos: 33.5,-38.5 parent: 60 + - uid: 2399 + components: + - type: Transform + pos: -13.5,-11.5 + parent: 60 - uid: 2529 components: - type: Transform @@ -16897,6 +16961,11 @@ entities: - type: Transform pos: -58.5,-22.5 parent: 60 + - uid: 3182 + components: + - type: Transform + pos: -12.5,-19.5 + parent: 60 - uid: 3246 components: - type: Transform @@ -17002,6 +17071,11 @@ entities: - type: Transform pos: 45.5,-41.5 parent: 60 + - uid: 3729 + components: + - type: Transform + pos: -25.5,28.5 + parent: 60 - uid: 3747 components: - type: Transform @@ -17017,6 +17091,11 @@ entities: - type: Transform pos: -18.5,-37.5 parent: 60 + - uid: 4017 + components: + - type: Transform + pos: -10.5,-17.5 + parent: 60 - uid: 4221 components: - type: Transform @@ -17812,6 +17891,11 @@ entities: - type: Transform pos: 3.5,33.5 parent: 60 + - uid: 7741 + components: + - type: Transform + pos: -10.5,-18.5 + parent: 60 - uid: 7907 components: - type: Transform @@ -22887,6 +22971,11 @@ entities: - type: Transform pos: -12.5,-48.5 parent: 60 + - uid: 11559 + components: + - type: Transform + pos: -12.5,-16.5 + parent: 60 - uid: 11632 components: - type: Transform @@ -22947,6 +23036,11 @@ entities: - type: Transform pos: 9.5,-47.5 parent: 60 + - uid: 11644 + components: + - type: Transform + pos: -12.5,-18.5 + parent: 60 - uid: 11645 components: - type: Transform @@ -23042,6 +23136,11 @@ entities: - type: Transform pos: -45.5,27.5 parent: 60 + - uid: 11724 + components: + - type: Transform + pos: -10.5,-19.5 + parent: 60 - uid: 11758 components: - type: Transform @@ -23602,6 +23701,11 @@ entities: - type: Transform pos: 44.5,-16.5 parent: 60 + - uid: 12354 + components: + - type: Transform + pos: -12.5,-17.5 + parent: 60 - uid: 12362 components: - type: Transform @@ -24437,6 +24541,11 @@ entities: - type: Transform pos: 13.5,5.5 parent: 60 + - uid: 13089 + components: + - type: Transform + pos: 36.5,-16.5 + parent: 60 - uid: 13203 components: - type: Transform @@ -25317,6 +25426,11 @@ entities: - type: Transform pos: 31.5,-51.5 parent: 60 + - uid: 13686 + components: + - type: Transform + pos: -22.5,28.5 + parent: 60 - uid: 13695 components: - type: Transform @@ -25337,6 +25451,21 @@ entities: - type: Transform pos: -8.5,-20.5 parent: 60 + - uid: 13724 + components: + - type: Transform + pos: -24.5,28.5 + parent: 60 + - uid: 13727 + components: + - type: Transform + pos: -12.5,-9.5 + parent: 60 + - uid: 13728 + components: + - type: Transform + pos: -12.5,-10.5 + parent: 60 - uid: 13729 components: - type: Transform @@ -25367,6 +25496,11 @@ entities: - type: Transform pos: -6.5,33.5 parent: 60 + - uid: 13742 + components: + - type: Transform + pos: -23.5,28.5 + parent: 60 - uid: 13747 components: - type: Transform @@ -25402,11 +25536,26 @@ entities: - type: Transform pos: -6.5,-18.5 parent: 60 + - uid: 13786 + components: + - type: Transform + pos: -10.5,-14.5 + parent: 60 - uid: 13892 components: - type: Transform pos: -50.5,15.5 parent: 60 + - uid: 13929 + components: + - type: Transform + pos: -11.5,-14.5 + parent: 60 + - uid: 13933 + components: + - type: Transform + pos: -12.5,-15.5 + parent: 60 - uid: 14345 components: - type: Transform @@ -26112,6 +26261,11 @@ entities: - type: Transform pos: -20.5,17.5 parent: 60 + - uid: 14652 + components: + - type: Transform + pos: -12.5,-14.5 + parent: 60 - uid: 14904 components: - type: Transform @@ -31884,11 +32038,6 @@ entities: parent: 60 - proto: CableApcStack entities: - - uid: 6603 - components: - - type: Transform - pos: 4.182043,13.598589 - parent: 60 - uid: 7186 components: - type: Transform @@ -31914,6 +32063,16 @@ entities: - type: Transform pos: -65.09276,9.579465 parent: 60 + - uid: 13477 + components: + - type: Transform + pos: 6.8387346,15.685855 + parent: 60 + - uid: 13687 + components: + - type: Transform + pos: 6.8387346,15.685855 + parent: 60 - uid: 16074 components: - type: Transform @@ -41085,10 +41244,15 @@ entities: - type: Transform pos: 6.563483,-46.526386 parent: 60 - - uid: 13978 + - uid: 13606 components: - type: Transform - pos: 4.525793,13.457964 + pos: 7.0887346,15.42023 + parent: 60 + - uid: 13634 + components: + - type: Transform + pos: 7.0887346,15.42023 parent: 60 - uid: 16076 components: @@ -41252,11 +41416,6 @@ entities: - type: Transform pos: 43.5,-18.5 parent: 60 - - uid: 895 - components: - - type: Transform - pos: -9.5,-15.5 - parent: 60 - uid: 994 components: - type: Transform @@ -41642,11 +41801,6 @@ entities: - type: Transform pos: 35.5,-18.5 parent: 60 - - uid: 2553 - components: - - type: Transform - pos: 36.5,-19.5 - parent: 60 - uid: 2571 components: - type: Transform @@ -41717,6 +41871,11 @@ entities: - type: Transform pos: 40.5,-18.5 parent: 60 + - uid: 3172 + components: + - type: Transform + pos: -7.5,-17.5 + parent: 60 - uid: 3185 components: - type: Transform @@ -41732,6 +41891,11 @@ entities: - type: Transform pos: 37.5,-9.5 parent: 60 + - uid: 3225 + components: + - type: Transform + pos: -8.5,-17.5 + parent: 60 - uid: 3232 components: - type: Transform @@ -41752,11 +41916,21 @@ entities: - type: Transform pos: -9.5,29.5 parent: 60 + - uid: 3638 + components: + - type: Transform + pos: -6.5,-17.5 + parent: 60 - uid: 3815 components: - type: Transform pos: -7.5,38.5 parent: 60 + - uid: 4108 + components: + - type: Transform + pos: -13.5,-14.5 + parent: 60 - uid: 4457 components: - type: Transform @@ -42042,6 +42216,11 @@ entities: - type: Transform pos: -25.5,-14.5 parent: 60 + - uid: 5833 + components: + - type: Transform + pos: 36.5,-15.5 + parent: 60 - uid: 5879 components: - type: Transform @@ -42087,6 +42266,11 @@ entities: - type: Transform pos: 45.5,-9.5 parent: 60 + - uid: 6140 + components: + - type: Transform + pos: 36.5,-16.5 + parent: 60 - uid: 6161 components: - type: Transform @@ -42097,11 +42281,6 @@ entities: - type: Transform pos: -2.5,-55.5 parent: 60 - - uid: 6177 - components: - - type: Transform - pos: -4.5,-18.5 - parent: 60 - uid: 6196 components: - type: Transform @@ -44257,6 +44436,11 @@ entities: - type: Transform pos: 43.5,-7.5 parent: 60 + - uid: 12300 + components: + - type: Transform + pos: -13.5,-13.5 + parent: 60 - uid: 12306 components: - type: Transform @@ -44357,21 +44541,6 @@ entities: - type: Transform pos: -13.5,-3.5 parent: 60 - - uid: 12559 - components: - - type: Transform - pos: -13.5,-12.5 - parent: 60 - - uid: 12560 - components: - - type: Transform - pos: -13.5,-13.5 - parent: 60 - - uid: 12561 - components: - - type: Transform - pos: -13.5,-14.5 - parent: 60 - uid: 12641 components: - type: Transform @@ -44552,71 +44721,11 @@ entities: - type: Transform pos: -58.5,9.5 parent: 60 - - uid: 13620 - components: - - type: Transform - pos: -4.5,-17.5 - parent: 60 - - uid: 13621 - components: - - type: Transform - pos: -5.5,-17.5 - parent: 60 - uid: 13641 components: - type: Transform pos: -7.5,-20.5 parent: 60 - - uid: 13658 - components: - - type: Transform - pos: -5.5,-19.5 - parent: 60 - - uid: 13671 - components: - - type: Transform - pos: -4.5,-17.5 - parent: 60 - - uid: 13677 - components: - - type: Transform - pos: -7.5,-16.5 - parent: 60 - - uid: 13678 - components: - - type: Transform - pos: -7.5,-10.5 - parent: 60 - - uid: 13679 - components: - - type: Transform - pos: -10.5,-18.5 - parent: 60 - - uid: 13680 - components: - - type: Transform - pos: -8.5,-17.5 - parent: 60 - - uid: 13682 - components: - - type: Transform - pos: -7.5,-17.5 - parent: 60 - - uid: 13683 - components: - - type: Transform - pos: -11.5,-18.5 - parent: 60 - - uid: 13684 - components: - - type: Transform - pos: -8.5,-16.5 - parent: 60 - - uid: 13686 - components: - - type: Transform - pos: -10.5,-17.5 - parent: 60 - uid: 13702 components: - type: Transform @@ -44687,26 +44796,6 @@ entities: - type: Transform pos: -8.5,-19.5 parent: 60 - - uid: 13716 - components: - - type: Transform - pos: -10.5,-16.5 - parent: 60 - - uid: 13718 - components: - - type: Transform - pos: -7.5,-15.5 - parent: 60 - - uid: 13720 - components: - - type: Transform - pos: -8.5,-15.5 - parent: 60 - - uid: 13721 - components: - - type: Transform - pos: -10.5,-15.5 - parent: 60 - uid: 13725 components: - type: Transform @@ -44722,65 +44811,15 @@ entities: - type: Transform pos: -8.5,-18.5 parent: 60 - - uid: 13752 - components: - - type: Transform - pos: -9.5,-13.5 - parent: 60 - - uid: 13753 - components: - - type: Transform - pos: -9.5,-14.5 - parent: 60 - - uid: 13755 - components: - - type: Transform - pos: -9.5,-12.5 - parent: 60 - - uid: 13756 - components: - - type: Transform - pos: -9.5,-11.5 - parent: 60 - - uid: 13757 - components: - - type: Transform - pos: -9.5,-10.5 - parent: 60 - - uid: 13758 - components: - - type: Transform - pos: -10.5,-10.5 - parent: 60 - - uid: 13759 - components: - - type: Transform - pos: -8.5,-10.5 - parent: 60 - - uid: 13760 - components: - - type: Transform - pos: -8.5,-13.5 - parent: 60 - - uid: 13764 - components: - - type: Transform - pos: -10.5,-13.5 - parent: 60 - - uid: 13765 - components: - - type: Transform - pos: -11.5,-13.5 - parent: 60 - uid: 13766 components: - type: Transform - pos: -11.5,-14.5 + pos: -10.5,-16.5 parent: 60 - - uid: 13767 + - uid: 13817 components: - type: Transform - pos: -11.5,-12.5 + pos: -11.5,-16.5 parent: 60 - uid: 14329 components: @@ -44907,6 +44946,21 @@ entities: - type: Transform pos: -23.5,22.5 parent: 60 + - uid: 14696 + components: + - type: Transform + pos: -13.5,-19.5 + parent: 60 + - uid: 14697 + components: + - type: Transform + pos: -7.5,-16.5 + parent: 60 + - uid: 14701 + components: + - type: Transform + pos: -12.5,-18.5 + parent: 60 - uid: 14705 components: - type: Transform @@ -44972,11 +45026,26 @@ entities: - type: Transform pos: -25.5,57.5 parent: 60 + - uid: 15264 + components: + - type: Transform + pos: -12.5,-19.5 + parent: 60 - uid: 15398 components: - type: Transform pos: -23.5,47.5 parent: 60 + - uid: 15442 + components: + - type: Transform + pos: -12.5,-17.5 + parent: 60 + - uid: 15445 + components: + - type: Transform + pos: -9.5,-17.5 + parent: 60 - uid: 15518 components: - type: Transform @@ -44992,6 +45061,26 @@ entities: - type: Transform pos: -44.5,15.5 parent: 60 + - uid: 16060 + components: + - type: Transform + pos: -13.5,-15.5 + parent: 60 + - uid: 16095 + components: + - type: Transform + pos: -9.5,-16.5 + parent: 60 + - uid: 16123 + components: + - type: Transform + pos: -8.5,-16.5 + parent: 60 + - uid: 16131 + components: + - type: Transform + pos: -13.5,-16.5 + parent: 60 - uid: 16175 components: - type: Transform @@ -45637,6 +45726,11 @@ entities: - type: Transform pos: -7.5,2.5 parent: 60 + - uid: 18640 + components: + - type: Transform + pos: -12.5,-16.5 + parent: 60 - uid: 18752 components: - type: Transform @@ -45707,16 +45801,6 @@ entities: - type: Transform pos: -12.5,-3.5 parent: 60 - - uid: 18766 - components: - - type: Transform - pos: -12.5,-12.5 - parent: 60 - - uid: 18768 - components: - - type: Transform - pos: -5.5,-14.5 - parent: 60 - uid: 18769 components: - type: Transform @@ -46307,11 +46391,6 @@ entities: - type: Transform pos: 47.5,-32.5 parent: 60 - - uid: 21041 - components: - - type: Transform - pos: -5.5,-18.5 - parent: 60 - uid: 21139 components: - type: Transform @@ -47249,10 +47328,15 @@ entities: parent: 60 - proto: CableMVStack entities: + - uid: 6601 + components: + - type: Transform + pos: 6.9793596,15.529605 + parent: 60 - uid: 6605 components: - type: Transform - pos: 4.353918,13.536089 + pos: 6.9793596,15.529605 parent: 60 - uid: 7189 components: @@ -47391,10 +47475,10 @@ entities: parent: 60 - proto: CannabisSeeds entities: - - uid: 16123 + - uid: 12355 components: - type: Transform - pos: -10.519617,-17.43405 + pos: -12.431261,-20.388779 parent: 60 - proto: CapacitorStockPart entities: @@ -47771,6 +47855,11 @@ entities: - type: Transform pos: -48.5,-18.5 parent: 60 + - uid: 4257 + components: + - type: Transform + pos: 19.5,-38.5 + parent: 60 - uid: 4263 components: - type: Transform @@ -47826,6 +47915,21 @@ entities: - type: Transform pos: -50.5,-18.5 parent: 60 + - uid: 5752 + components: + - type: Transform + pos: 21.5,-38.5 + parent: 60 + - uid: 5808 + components: + - type: Transform + pos: 20.5,-37.5 + parent: 60 + - uid: 6550 + components: + - type: Transform + pos: 19.5,-37.5 + parent: 60 - uid: 7037 components: - type: Transform @@ -47836,6 +47940,16 @@ entities: - type: Transform pos: -48.5,-20.5 parent: 60 + - uid: 12507 + components: + - type: Transform + pos: 20.5,-38.5 + parent: 60 + - uid: 13679 + components: + - type: Transform + pos: 21.5,-37.5 + parent: 60 - uid: 14147 components: - type: Transform @@ -48078,36 +48192,6 @@ entities: - type: Transform pos: 52.5,-44.5 parent: 60 - - uid: 21580 - components: - - type: Transform - pos: 20.5,-37.5 - parent: 60 - - uid: 21597 - components: - - type: Transform - pos: 19.5,-37.5 - parent: 60 - - uid: 21600 - components: - - type: Transform - pos: 20.5,-38.5 - parent: 60 - - uid: 21601 - components: - - type: Transform - pos: 18.5,-38.5 - parent: 60 - - uid: 21602 - components: - - type: Transform - pos: 18.5,-37.5 - parent: 60 - - uid: 21606 - components: - - type: Transform - pos: 19.5,-38.5 - parent: 60 - proto: CarpetOrange entities: - uid: 4211 @@ -48572,6 +48656,11 @@ entities: - type: Transform pos: -56.5,-18.5 parent: 60 + - uid: 399 + components: + - type: Transform + pos: -12.5,-11.5 + parent: 60 - uid: 1362 components: - type: Transform @@ -51356,6 +51445,11 @@ entities: - type: Transform pos: -60.5,-5.5 parent: 60 + - uid: 15569 + components: + - type: Transform + pos: -12.5,-10.5 + parent: 60 - uid: 16028 components: - type: Transform @@ -51376,6 +51470,11 @@ entities: - type: Transform pos: 6.5,31.5 parent: 60 + - uid: 16096 + components: + - type: Transform + pos: -12.5,-9.5 + parent: 60 - uid: 16146 components: - type: Transform @@ -54528,6 +54627,17 @@ entities: rot: 3.141592653589793 rad pos: 44.5,12.5 parent: 60 + - uid: 13621 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 50.5,18.5 + parent: 60 + - uid: 13797 + components: + - type: Transform + pos: 4.5,13.5 + parent: 60 - uid: 15697 components: - type: Transform @@ -55178,12 +55288,6 @@ entities: - type: Transform pos: -47.5,12.5 parent: 60 - - uid: 4257 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 41.5,3.5 - parent: 60 - uid: 4273 components: - type: Transform @@ -55346,11 +55450,6 @@ entities: rot: -1.5707963267948966 rad pos: 13.5,-48.5 parent: 60 - - uid: 12271 - components: - - type: Transform - pos: 47.5,18.5 - parent: 60 - uid: 13082 components: - type: Transform @@ -55367,11 +55466,11 @@ entities: - type: Transform pos: 41.5,-0.5 parent: 60 - - uid: 13478 + - uid: 13659 components: - type: Transform - rot: 3.141592653589793 rad - pos: 47.5,16.5 + rot: 1.5707963267948966 rad + pos: 40.575027,3.6337824 parent: 60 - uid: 14191 components: @@ -55516,12 +55615,6 @@ entities: parent: 60 - proto: ChairOfficeLight entities: - - uid: 100 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 38.5,-17.5 - parent: 60 - uid: 128 components: - type: Transform @@ -55579,6 +55672,12 @@ entities: - type: Transform pos: 41.5,-19.5 parent: 60 + - uid: 7695 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 38.567585,-20.270008 + parent: 60 - uid: 9507 components: - type: Transform @@ -55596,6 +55695,11 @@ entities: rot: -1.5707963267948966 rad pos: -18.5,-4.5 parent: 60 + - uid: 12561 + components: + - type: Transform + pos: 38.39571,-16.441883 + parent: 60 - uid: 21697 components: - type: Transform @@ -55630,11 +55734,6 @@ entities: parent: 60 - proto: ChairWood entities: - - uid: 175 - components: - - type: Transform - pos: 16.5,-37.5 - parent: 60 - uid: 2847 components: - type: Transform @@ -55743,6 +55842,11 @@ entities: rot: 1.5707963267948966 rad pos: 23.5,-18.5 parent: 60 + - uid: 6559 + components: + - type: Transform + pos: 17.567825,-37.564503 + parent: 60 - uid: 7492 components: - type: Transform @@ -55772,6 +55876,12 @@ entities: rot: -1.5707963267948966 rad pos: 23.5,-0.5 parent: 60 + - uid: 13650 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 18.4897,-38.423878 + parent: 60 - uid: 14118 components: - type: Transform @@ -55943,12 +56053,6 @@ entities: rot: 1.5707963267948966 rad pos: 18.5,-29.5 parent: 60 - - uid: 16131 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 17.5,-38.5 - parent: 60 - uid: 24411 components: - type: Transform @@ -55975,15 +56079,15 @@ entities: parent: 60 - proto: CheapRollerBed entities: - - uid: 146 + - uid: 13648 components: - type: Transform - pos: 35.4955,-20.026983 + pos: 34.484013,-20.163263 parent: 60 - - uid: 12300 + - uid: 13649 components: - type: Transform - pos: 35.48971,-19.620663 + pos: 34.452763,-20.522638 parent: 60 - uid: 18779 components: @@ -55995,11 +56099,6 @@ entities: - type: Transform pos: 45.462997,-27.047497 parent: 60 - - uid: 21364 - components: - - type: Transform - pos: 35.4955,-20.448858 - parent: 60 - proto: CheapRollerBedSpawnFolded entities: - uid: 3115 @@ -56045,15 +56144,23 @@ entities: - type: Transform pos: 2.5348077,-76.44673 parent: 60 + - uid: 13678 + components: + - type: Transform + pos: 20.505325,-37.595753 + parent: 60 - uid: 19496 components: - type: Transform pos: 24.51098,26.60742 parent: 60 - - uid: 23669 +- proto: ChurchBell + entities: + - uid: 11333 components: - type: Transform - pos: 19.551128,-37.52751 + rot: 1.5707963267948966 rad + pos: -28.5,20.5 parent: 60 - proto: ChurchOrganInstrument entities: @@ -56077,6 +56184,11 @@ entities: parent: 60 - proto: CigarCase entities: + - uid: 13656 + components: + - type: Transform + pos: 17.510271,-38.33983 + parent: 60 - uid: 20067 components: - type: Transform @@ -58399,15 +58511,10 @@ entities: parent: 60 - proto: ClothingHeadHatFez entities: - - uid: 3180 + - uid: 13611 components: - type: Transform - pos: 41.532803,-36.60932 - parent: 60 - - uid: 7860 - components: - - type: Transform - pos: 41.371563,-36.423416 + pos: 42.399185,-38.15878 parent: 60 - proto: ClothingHeadHatPaper entities: @@ -58505,20 +58612,22 @@ entities: parent: 60 - proto: ClothingHeadHatWelding entities: + - uid: 6584 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.3543596,15.57648 + parent: 60 - uid: 9612 components: - type: Transform pos: -34.442913,15.721314 parent: 60 - - uid: 13817 + - uid: 13716 components: - type: Transform - pos: 3.4523659,13.738024 - parent: 60 - - uid: 13818 - components: - - type: Transform - pos: 3.6398659,13.628649 + rot: 3.141592653589793 rad + pos: 6.5262346,15.435855 parent: 60 - uid: 21464 components: @@ -59066,7 +59175,7 @@ entities: - uid: 3178 components: - type: Transform - pos: 41.548428,-37.343697 + pos: 42.524185,-38.361904 parent: 60 - uid: 4682 components: @@ -59115,6 +59224,18 @@ entities: - type: Transform pos: -47.44876,21.462833 parent: 60 +- proto: ClothingOuterHardsuitSecurity + entities: + - uid: 13624 + components: + - type: Transform + pos: -24.31193,1.3244922 + parent: 60 + - uid: 13662 + components: + - type: Transform + pos: -24.31193,1.3244922 + parent: 60 - proto: ClothingOuterHoodieBlack entities: - uid: 17781 @@ -59228,7 +59349,7 @@ entities: - uid: 3179 components: - type: Transform - pos: 41.610928,-37.92182 + pos: 42.492935,-38.59628 parent: 60 - proto: ClothingShoesLeather entities: @@ -59465,24 +59586,6 @@ entities: - type: Transform pos: -21.5,1.5 parent: 60 - - uid: 2165 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 20.5,-37.5 - parent: 60 - - uid: 2166 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 18.5,-38.5 - parent: 60 - - uid: 2167 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 18.5,-37.5 - parent: 60 - uid: 2249 components: - type: Transform @@ -59505,12 +59608,30 @@ entities: - type: Transform pos: -43.5,-15.5 parent: 60 + - uid: 4326 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,-38.5 + parent: 60 - uid: 4329 components: - type: Transform rot: -1.5707963267948966 rad pos: -63.5,0.5 parent: 60 + - uid: 4532 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 19.5,-38.5 + parent: 60 + - uid: 4902 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 21.5,-37.5 + parent: 60 - uid: 5844 components: - type: Transform @@ -59567,18 +59688,18 @@ entities: rot: 3.141592653589793 rad pos: -49.5,-8.5 parent: 60 - - uid: 11333 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 20.5,-38.5 - parent: 60 - uid: 12715 components: - type: Transform rot: 1.5707963267948966 rad pos: 9.5,-34.5 parent: 60 + - uid: 13677 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 19.5,-37.5 + parent: 60 - uid: 14117 components: - type: Transform @@ -59756,12 +59877,6 @@ entities: parent: 60 - proto: ComputerCargoOrders entities: - - uid: 11559 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 40.5,3.5 - parent: 60 - uid: 13084 components: - type: Transform @@ -59808,6 +59923,12 @@ entities: rot: 3.141592653589793 rad pos: -25.5,-30.5 parent: 60 + - uid: 6582 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -26.5,-11.5 + parent: 60 - uid: 8705 components: - type: Transform @@ -60103,12 +60224,6 @@ entities: - type: Transform pos: -1.5,3.5 parent: 60 - - uid: 6387 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -26.5,-11.5 - parent: 60 - proto: ComputerSurveillanceWirelessCameraMonitor entities: - uid: 17202 @@ -60553,33 +60668,11 @@ entities: containers: - EntityStorageComponent - entity_storage - - uid: 6582 + - uid: 13604 components: - type: Transform - pos: 5.5,13.5 + pos: 4.5,15.5 parent: 60 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 1.6495836 - - 6.2055764 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - uid: 17023 components: - type: Transform @@ -61091,6 +61184,16 @@ entities: - 0 - proto: CrateTrashCart entities: + - uid: 13600 + components: + - type: Transform + pos: 47.5,18.5 + parent: 60 + - uid: 17449 + components: + - type: Transform + pos: -5.5,-15.5 + parent: 60 - uid: 21481 components: - type: Transform @@ -62050,11 +62153,6 @@ entities: rot: 3.141592653589793 rad pos: 6.5,9.5 parent: 60 - - uid: 5417 - components: - - type: Transform - pos: 6.5,10.5 - parent: 60 - uid: 5690 components: - type: Transform @@ -62079,6 +62177,11 @@ entities: rot: -1.5707963267948966 rad pos: 3.5,14.5 parent: 60 + - uid: 6585 + components: + - type: Transform + pos: 6.5,10.5 + parent: 60 - uid: 7619 components: - type: Transform @@ -62496,17 +62599,17 @@ entities: rot: 3.141592653589793 rad pos: 0.5,-44.5 parent: 60 - - uid: 5420 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 3.5,10.5 - parent: 60 - uid: 6091 components: - type: Transform pos: -37.5,1.5 parent: 60 + - uid: 6602 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 7.5,9.5 + parent: 60 - uid: 8711 components: - type: Transform @@ -64342,12 +64445,6 @@ entities: rot: -1.5707963267948966 rad pos: 14.5,5.5 parent: 60 - - uid: 5415 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 7.5,9.5 - parent: 60 - uid: 5418 components: - type: Transform @@ -64589,6 +64686,12 @@ entities: rot: 1.5707963267948966 rad pos: 2.5,14.5 parent: 60 + - uid: 6603 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,10.5 + parent: 60 - uid: 6614 components: - type: Transform @@ -66102,11 +66205,6 @@ entities: rot: -1.5707963267948966 rad pos: -36.5,1.5 parent: 60 - - uid: 6141 - components: - - type: Transform - pos: 3.5,11.5 - parent: 60 - uid: 6327 components: - type: Transform @@ -66140,6 +66238,11 @@ entities: - type: Transform pos: -56.5,14.5 parent: 60 + - uid: 13756 + components: + - type: Transform + pos: 7.5,10.5 + parent: 60 - uid: 13983 components: - type: Transform @@ -66361,11 +66464,6 @@ entities: - type: Transform pos: -24.5,-5.5 parent: 60 - - uid: 6142 - components: - - type: Transform - pos: 3.5,11.5 - parent: 60 - uid: 6328 components: - type: Transform @@ -66426,6 +66524,11 @@ entities: - type: Transform pos: -73.5,18.5 parent: 60 + - uid: 13757 + components: + - type: Transform + pos: 7.5,10.5 + parent: 60 - uid: 13975 components: - type: Transform @@ -66568,11 +66671,6 @@ entities: - type: Transform pos: -62.5,-15.5 parent: 60 - - uid: 5221 - components: - - type: Transform - pos: 47.5,17.5 - parent: 60 - uid: 10819 components: - type: Transform @@ -66971,6 +67069,11 @@ entities: - type: Transform pos: 51.394554,17.7191 parent: 60 + - uid: 13788 + components: + - type: Transform + pos: -7.5137773,-11.361463 + parent: 60 - uid: 14454 components: - type: Transform @@ -66986,6 +67089,11 @@ entities: - type: Transform pos: -27.035704,-13.425097 parent: 60 + - uid: 16380 + components: + - type: Transform + pos: -7.6075273,-11.314588 + parent: 60 - uid: 20082 components: - type: Transform @@ -67531,11 +67639,6 @@ entities: - type: Transform pos: -10.5,-51.5 parent: 60 - - uid: 13109 - components: - - type: Transform - pos: 43.5,1.5 - parent: 60 - uid: 13258 components: - type: Transform @@ -67626,16 +67729,6 @@ entities: - type: Transform pos: -35.5,-16.5 parent: 60 - - uid: 21724 - components: - - type: Transform - pos: -13.5,-19.5 - parent: 60 - - uid: 21725 - components: - - type: Transform - pos: -13.5,-11.5 - parent: 60 - uid: 21726 components: - type: Transform @@ -68031,16 +68124,6 @@ entities: - 491 - 8774 - 8957 - - uid: 12193 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 44.5,1.5 - parent: 60 - - type: DeviceList - devices: - - 21548 - - 9282 - uid: 12733 components: - type: Transform @@ -68066,16 +68149,6 @@ entities: - 11338 - 11339 - 11340 - - uid: 19528 - components: - - type: Transform - pos: 42.5,4.5 - parent: 60 - - type: DeviceList - devices: - - 19529 - - 11131 - - 19522 - uid: 21484 components: - type: Transform @@ -68225,7 +68298,6 @@ entities: - 19060 - 19061 - 19062 - - 11834 - 19862 - 19861 - 19852 @@ -68728,7 +68800,7 @@ entities: - 21733 - proto: FireAxeCabinetFilled entities: - - uid: 15693 + - uid: 7172 components: - type: Transform pos: -25.5,33.5 @@ -68740,20 +68812,20 @@ entities: parent: 60 - proto: FireExtinguisher entities: - - uid: 7741 + - uid: 7720 components: - type: Transform - pos: 44.693237,-0.25845933 + pos: 46.383842,-1.3846426 parent: 60 - - uid: 12191 + - uid: 13608 components: - type: Transform - pos: 44.505737,-0.30533433 + pos: 46.540092,-1.4627676 parent: 60 - - uid: 16060 + - uid: 13663 components: - type: Transform - pos: 44.318237,-0.41470933 + pos: 46.274467,-1.3065176 parent: 60 - proto: FirelockEdge entities: @@ -69546,6 +69618,11 @@ entities: - type: Transform pos: -41.5,-29.5 parent: 60 + - uid: 4127 + components: + - type: Transform + pos: 4.5,12.5 + parent: 60 - uid: 4330 components: - type: Transform @@ -69596,6 +69673,11 @@ entities: - type: Transform pos: 18.5,-24.5 parent: 60 + - uid: 5221 + components: + - type: Transform + pos: 40.5,4.5 + parent: 60 - uid: 5466 components: - type: Transform @@ -69655,11 +69737,6 @@ entities: - type: Transform pos: 44.5,-38.5 parent: 60 - - uid: 5808 - components: - - type: Transform - pos: 36.5,-18.5 - parent: 60 - uid: 5889 components: - type: Transform @@ -69944,11 +70021,6 @@ entities: - type: Transform pos: 40.5,-41.5 parent: 60 - - uid: 11131 - components: - - type: Transform - pos: 43.5,2.5 - parent: 60 - uid: 11338 components: - type: Transform @@ -69979,11 +70051,6 @@ entities: - type: Transform pos: 27.5,-9.5 parent: 60 - - uid: 11834 - components: - - type: Transform - pos: 50.5,19.5 - parent: 60 - uid: 12511 components: - type: Transform @@ -70047,7 +70114,12 @@ entities: - type: Transform pos: 35.5,9.5 parent: 60 - - uid: 13797 + - uid: 13243 + components: + - type: Transform + pos: 3.5,12.5 + parent: 60 + - uid: 13623 components: - type: Transform pos: 41.5,4.5 @@ -70222,11 +70294,6 @@ entities: - type: Transform pos: 15.5,26.5 parent: 60 - - uid: 19522 - components: - - type: Transform - pos: 43.5,3.5 - parent: 60 - uid: 19676 components: - type: Transform @@ -70345,16 +70412,6 @@ entities: - type: Transform pos: -59.580887,2.6484475 parent: 60 - - uid: 13243 - components: - - type: Transform - pos: 44.365112,0.6790407 - parent: 60 - - uid: 13499 - components: - - type: Transform - pos: 44.474487,0.5227907 - parent: 60 - uid: 18112 components: - type: Transform @@ -70440,6 +70497,13 @@ entities: parent: 60 - type: Fixtures fixtures: {} + - uid: 13567 + components: + - type: Transform + pos: -10.5,-20.5 + parent: 60 + - type: Fixtures + fixtures: {} - uid: 18254 components: - type: Transform @@ -71961,11 +72025,11 @@ entities: parent: 60 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 13741 + - uid: 13683 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -12.5,-13.5 + rot: -1.5707963267948966 rad + pos: -5.5,-13.5 parent: 60 - uid: 13934 components: @@ -79419,6 +79483,12 @@ entities: parent: 60 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 4137 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,-13.5 + parent: 60 - uid: 4143 components: - type: Transform @@ -82926,12 +82996,6 @@ entities: parent: 60 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 12758 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,-13.5 - parent: 60 - uid: 12824 components: - type: Transform @@ -83389,11 +83453,17 @@ entities: parent: 60 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 13639 + - uid: 13643 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -10.5,-13.5 + rot: 1.5707963267948966 rad + pos: -7.5,-13.5 + parent: 60 + - uid: 13645 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,-13.5 parent: 60 - uid: 13651 components: @@ -93670,6 +93740,12 @@ entities: parent: 60 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 7860 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 41.5,-35.5 + parent: 60 - uid: 8072 components: - type: Transform @@ -93762,12 +93838,6 @@ entities: - type: Transform pos: -20.5,41.5 parent: 60 - - uid: 18640 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 40.5,-34.5 - parent: 60 - uid: 21442 components: - type: Transform @@ -96550,12 +96620,6 @@ entities: parent: 60 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 10578 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -9.5,-13.5 - parent: 60 - uid: 12001 components: - type: Transform @@ -96654,6 +96718,12 @@ entities: parent: 60 - type: AtmosPipeColor color: '#FF1212FF' + - uid: 13754 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -9.5,-13.5 + parent: 60 - uid: 13971 components: - type: Transform @@ -97299,6 +97369,11 @@ entities: rot: 1.5707963267948966 rad pos: -31.5,-15.5 parent: 60 + - uid: 103 + components: + - type: Transform + pos: 50.5,19.5 + parent: 60 - uid: 113 components: - type: Transform @@ -97432,11 +97507,6 @@ entities: - type: Transform pos: 40.5,-15.5 parent: 60 - - uid: 536 - components: - - type: Transform - pos: -13.5,-18.5 - parent: 60 - uid: 537 components: - type: Transform @@ -97531,6 +97601,11 @@ entities: rot: 1.5707963267948966 rad pos: -24.5,-12.5 parent: 60 + - uid: 895 + components: + - type: Transform + pos: -4.5,-17.5 + parent: 60 - uid: 949 components: - type: Transform @@ -97596,11 +97671,16 @@ entities: - type: Transform pos: -5.5,7.5 parent: 60 - - uid: 1297 + - uid: 1292 components: - type: Transform pos: -5.5,-19.5 parent: 60 + - uid: 1297 + components: + - type: Transform + pos: -9.5,-10.5 + parent: 60 - uid: 1330 components: - type: Transform @@ -98037,11 +98117,6 @@ entities: rot: 1.5707963267948966 rad pos: 47.5,-19.5 parent: 60 - - uid: 3225 - components: - - type: Transform - pos: 36.5,-20.5 - parent: 60 - uid: 3327 components: - type: Transform @@ -98319,11 +98394,6 @@ entities: rot: -1.5707963267948966 rad pos: -11.5,-38.5 parent: 60 - - uid: 4017 - components: - - type: Transform - pos: -4.5,-17.5 - parent: 60 - uid: 4038 components: - type: Transform @@ -98364,6 +98434,11 @@ entities: - type: Transform pos: 32.5,-59.5 parent: 60 + - uid: 4121 + components: + - type: Transform + pos: -4.5,-18.5 + parent: 60 - uid: 4131 components: - type: Transform @@ -98636,11 +98711,6 @@ entities: - type: Transform pos: -8.5,-56.5 parent: 60 - - uid: 4902 - components: - - type: Transform - pos: 40.5,4.5 - parent: 60 - uid: 4947 components: - type: Transform @@ -99206,6 +99276,11 @@ entities: - type: Transform pos: -22.5,27.5 parent: 60 + - uid: 6606 + components: + - type: Transform + pos: 50.5,15.5 + parent: 60 - uid: 6649 components: - type: Transform @@ -99866,11 +99941,6 @@ entities: rot: 1.5707963267948966 rad pos: -53.5,51.5 parent: 60 - - uid: 8153 - components: - - type: Transform - pos: -4.5,-18.5 - parent: 60 - uid: 8163 components: - type: Transform @@ -100058,11 +100128,6 @@ entities: - type: Transform pos: 50.5,-18.5 parent: 60 - - uid: 9041 - components: - - type: Transform - pos: 36.5,-16.5 - parent: 60 - uid: 9052 components: - type: Transform @@ -100268,6 +100333,11 @@ entities: - type: Transform pos: 42.5,-20.5 parent: 60 + - uid: 11150 + components: + - type: Transform + pos: -25.5,27.5 + parent: 60 - uid: 11341 components: - type: Transform @@ -100303,11 +100373,6 @@ entities: - type: Transform pos: -1.5,37.5 parent: 60 - - uid: 11644 - components: - - type: Transform - pos: 51.5,19.5 - parent: 60 - uid: 11699 components: - type: Transform @@ -100328,11 +100393,6 @@ entities: - type: Transform pos: 47.5,31.5 parent: 60 - - uid: 11726 - components: - - type: Transform - pos: 50.5,15.5 - parent: 60 - uid: 11732 components: - type: Transform @@ -100398,6 +100458,11 @@ entities: - type: Transform pos: 56.5,-27.5 parent: 60 + - uid: 11865 + components: + - type: Transform + pos: -13.5,-13.5 + parent: 60 - uid: 11874 components: - type: Transform @@ -100453,6 +100518,21 @@ entities: - type: Transform pos: 40.5,-69.5 parent: 60 + - uid: 12191 + components: + - type: Transform + pos: -8.5,-16.5 + parent: 60 + - uid: 12193 + components: + - type: Transform + pos: -13.5,-16.5 + parent: 60 + - uid: 12271 + components: + - type: Transform + pos: -9.5,6.5 + parent: 60 - uid: 12274 components: - type: Transform @@ -100653,11 +100733,6 @@ entities: - type: Transform pos: 63.5,-6.5 parent: 60 - - uid: 12781 - components: - - type: Transform - pos: 63.5,-5.5 - parent: 60 - uid: 12790 components: - type: Transform @@ -100843,11 +100918,6 @@ entities: - type: Transform pos: -79.5,12.5 parent: 60 - - uid: 13089 - components: - - type: Transform - pos: 49.5,19.5 - parent: 60 - uid: 13110 components: - type: Transform @@ -100983,55 +101053,10 @@ entities: - type: Transform pos: 52.5,18.5 parent: 60 - - uid: 13445 + - uid: 13626 components: - type: Transform - pos: -23.5,28.5 - parent: 60 - - uid: 13613 - components: - - type: Transform - pos: -11.5,-18.5 - parent: 60 - - uid: 13638 - components: - - type: Transform - pos: -11.5,-14.5 - parent: 60 - - uid: 13640 - components: - - type: Transform - pos: -11.5,-12.5 - parent: 60 - - uid: 13645 - components: - - type: Transform - pos: -9.5,-10.5 - parent: 60 - - uid: 13646 - components: - - type: Transform - pos: -8.5,-10.5 - parent: 60 - - uid: 13647 - components: - - type: Transform - pos: -10.5,-10.5 - parent: 60 - - uid: 13648 - components: - - type: Transform - pos: -13.5,-14.5 - parent: 60 - - uid: 13649 - components: - - type: Transform - pos: -13.5,-13.5 - parent: 60 - - uid: 13650 - components: - - type: Transform - pos: -13.5,-12.5 + pos: -25.5,29.5 parent: 60 - uid: 13664 components: @@ -101043,31 +101068,36 @@ entities: - type: Transform pos: -7.5,-20.5 parent: 60 - - uid: 13694 + - uid: 13690 components: - type: Transform - pos: -11.5,-13.5 + pos: -13.5,-19.5 parent: 60 - - uid: 13742 - components: - - type: Transform - pos: -6.5,-12.5 - parent: 60 - - uid: 13743 + - uid: 13758 components: - type: Transform pos: -7.5,-16.5 parent: 60 - - uid: 13749 + - uid: 13763 components: - type: Transform - pos: -8.5,-16.5 + pos: -6.5,-12.5 parent: 60 - - uid: 13786 + - uid: 13764 + components: + - type: Transform + pos: -5.5,-14.5 + parent: 60 + - uid: 13765 components: - type: Transform pos: -6.5,-13.5 parent: 60 + - uid: 13785 + components: + - type: Transform + pos: -8.5,-10.5 + parent: 60 - uid: 13811 components: - type: Transform @@ -101083,6 +101113,11 @@ entities: - type: Transform pos: 7.5,18.5 parent: 60 + - uid: 13818 + components: + - type: Transform + pos: -13.5,-14.5 + parent: 60 - uid: 13820 components: - type: Transform @@ -101206,16 +101241,6 @@ entities: - type: Transform pos: -27.5,27.5 parent: 60 - - uid: 14696 - components: - - type: Transform - pos: -25.5,27.5 - parent: 60 - - uid: 14697 - components: - - type: Transform - pos: -25.5,29.5 - parent: 60 - uid: 14699 components: - type: Transform @@ -101718,6 +101743,16 @@ entities: - type: Transform pos: 1.5,37.5 parent: 60 + - uid: 16995 + components: + - type: Transform + pos: -9.5,-17.5 + parent: 60 + - uid: 16996 + components: + - type: Transform + pos: -9.5,-16.5 + parent: 60 - uid: 17034 components: - type: Transform @@ -102193,6 +102228,11 @@ entities: - type: Transform pos: 5.5,0.5 parent: 60 + - uid: 17993 + components: + - type: Transform + pos: -13.5,-15.5 + parent: 60 - uid: 17994 components: - type: Transform @@ -102316,12 +102356,12 @@ entities: - uid: 18682 components: - type: Transform - pos: -9.5,6.5 + pos: -7.5,-10.5 parent: 60 - - uid: 18771 + - uid: 18768 components: - type: Transform - pos: -5.5,-14.5 + pos: -10.5,-10.5 parent: 60 - uid: 18777 components: @@ -103158,11 +103198,6 @@ entities: - type: Transform pos: -9.5,1.5 parent: 60 - - uid: 21151 - components: - - type: Transform - pos: -7.5,-10.5 - parent: 60 - uid: 21174 components: - type: Transform @@ -104960,11 +104995,6 @@ entities: - type: Transform pos: -60.5,11.5 parent: 60 - - uid: 12887 - components: - - type: Transform - pos: 63.5,-4.5 - parent: 60 - uid: 12937 components: - type: Transform @@ -105533,6 +105563,11 @@ entities: - type: Transform pos: 31.5,-17.5 parent: 60 + - uid: 13445 + components: + - type: Transform + pos: -10.5,-20.5 + parent: 60 - uid: 15497 components: - type: Transform @@ -105731,19 +105766,21 @@ entities: rot: 3.141592653589793 rad pos: 28.5,-30.5 parent: 60 + - uid: 11834 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,-13.5 + parent: 60 - uid: 12910 components: - type: Transform pos: -58.5,-24.5 parent: 60 - - uid: 13636 - components: - - type: Transform - pos: -10.5,-12.5 - parent: 60 - - uid: 21150 + - uid: 13613 components: - type: Transform + rot: 3.141592653589793 rad pos: -10.5,-13.5 parent: 60 - proto: InflatableDoorStack @@ -106155,6 +106192,11 @@ entities: parent: 60 - proto: KitchenMicrowave entities: + - uid: 367 + components: + - type: Transform + pos: -12.5,-13.5 + parent: 60 - uid: 1530 components: - type: Transform @@ -106207,6 +106249,11 @@ entities: - type: Transform pos: 24.5,-30.5 parent: 60 + - uid: 16132 + components: + - type: Transform + pos: -12.5,-14.5 + parent: 60 - uid: 18694 components: - type: Transform @@ -106318,12 +106365,6 @@ entities: - type: Transform pos: 25.565468,-15.324441 parent: 60 - - uid: 2629 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 16.302364,-38.05794 - parent: 60 - uid: 4234 components: - type: Transform @@ -106652,6 +106693,11 @@ entities: - 0 - 0 - 0 + - uid: 6387 + components: + - type: Transform + pos: 6.5,12.5 + parent: 60 - uid: 11679 components: - type: Transform @@ -106721,29 +106767,6 @@ entities: - 0 - 0 - 0 - - uid: 16096 - components: - - type: Transform - pos: -4.5,21.5 - parent: 60 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 1.6495836 - - 6.2055764 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - uid: 17035 components: - type: Transform @@ -107176,23 +107199,8 @@ entities: - type: Transform pos: 48.5,-8.5 parent: 60 - - uid: 21336 - components: - - type: Transform - pos: 35.5,-16.5 - parent: 60 - - uid: 21337 - components: - - type: Transform - pos: 35.5,-17.5 - parent: 60 - proto: LockerMedicineFilled entities: - - uid: 3210 - components: - - type: Transform - pos: 39.5,-16.5 - parent: 60 - uid: 5681 components: - type: Transform @@ -107203,10 +107211,15 @@ entities: - type: Transform pos: 32.5,-10.5 parent: 60 - - uid: 9039 + - uid: 13646 components: - type: Transform - pos: 37.5,-20.5 + pos: 32.5,-16.5 + parent: 60 + - uid: 13647 + components: + - type: Transform + pos: 35.5,-16.5 parent: 60 - proto: LockerMime entities: @@ -107486,11 +107499,6 @@ entities: ent: null - proto: LockerWallMedicalFilled entities: - - uid: 4137 - components: - - type: Transform - pos: 37.5,-15.5 - parent: 60 - uid: 8969 components: - type: Transform @@ -107561,29 +107569,11 @@ entities: - type: Transform pos: -64.5,-19.5 parent: 60 - - uid: 16095 + - uid: 13755 components: - type: Transform - pos: -4.5,20.5 + pos: 7.5,12.5 parent: 60 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 1.6495836 - - 6.2055764 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - uid: 21463 components: - type: Transform @@ -107984,11 +107974,6 @@ entities: - type: Transform pos: 30.5,-16.5 parent: 60 - - uid: 7695 - components: - - type: Transform - pos: 38.5,-20.5 - parent: 60 - uid: 8750 components: - type: Transform @@ -108004,10 +107989,15 @@ entities: - type: Transform pos: 40.5,-16.5 parent: 60 - - uid: 12356 + - uid: 12757 components: - type: Transform - pos: 38.5,-16.5 + pos: 36.5,-16.5 + parent: 60 + - uid: 13066 + components: + - type: Transform + pos: 36.5,-20.5 parent: 60 - proto: MedicalTechFab entities: @@ -108231,6 +108221,13 @@ entities: - type: Transform pos: -3.4904737,-27.546751 parent: 60 +- proto: MopBucketFull + entities: + - uid: 13720 + components: + - type: Transform + pos: -10.5,-19.5 + parent: 60 - proto: MopItem entities: - uid: 7199 @@ -108243,6 +108240,11 @@ entities: - type: Transform pos: 7.438483,-44.620136 parent: 60 + - uid: 13721 + components: + - type: Transform + pos: -10.534099,-18.99607 + parent: 60 - proto: Morgue entities: - uid: 229 @@ -108636,10 +108638,10 @@ entities: - type: Transform pos: -50.5,51.5 parent: 60 - - uid: 11753 + - uid: 13109 components: - type: Transform - pos: 54.5,-1.5 + pos: 50.5,-1.5 parent: 60 - uid: 15248 components: @@ -108723,10 +108725,15 @@ entities: parent: 60 - proto: OreBag entities: - - uid: 12194 + - uid: 7675 components: - type: Transform - pos: 42.498352,-0.3113162 + pos: 43.36414,-1.1815176 + parent: 60 + - uid: 13666 + components: + - type: Transform + pos: 43.42664,-0.9783926 parent: 60 - proto: OreProcessor entities: @@ -108815,10 +108822,10 @@ entities: - type: Transform pos: 60.5,-23.5 parent: 60 - - uid: 13066 + - uid: 13137 components: - type: Transform - pos: 53.5,-1.5 + pos: 49.5,-1.5 parent: 60 - uid: 15246 components: @@ -108882,6 +108889,13 @@ entities: - type: Transform pos: 8.5436735,-62.480114 parent: 60 +- proto: PackPaperRolling + entities: + - uid: 11151 + components: + - type: Transform + pos: -10.628071,-18.30077 + parent: 60 - proto: PaintingAmogusTriptych entities: - uid: 23383 @@ -109566,6 +109580,11 @@ entities: - type: Transform pos: 36.441284,2.541195 parent: 60 + - uid: 19522 + components: + - type: Transform + pos: 43.496902,-0.14746776 + parent: 60 - proto: PlantBGoneSpray entities: - uid: 936 @@ -110302,10 +110321,10 @@ entities: - type: Transform pos: 37.5,-12.5 parent: 60 - - uid: 12507 + - uid: 12781 components: - type: Transform - pos: 36.5,-17.5 + pos: 37.5,-15.5 parent: 60 - proto: PosterLegitBlessThisSpess entities: @@ -110844,11 +110863,6 @@ entities: - type: Transform pos: -23.49266,-26.555698 parent: 60 - - uid: 16132 - components: - - type: Transform - pos: 21.533903,-38.692165 - parent: 60 - uid: 24363 components: - type: Transform @@ -110963,17 +110977,6 @@ entities: - type: Transform pos: -30.486118,-20.71535 parent: 60 - - uid: 24143 - components: - - type: Transform - pos: -5.5057654,-15.736094 - parent: 60 - - type: ContainerContainer - containers: - stash: !type:ContainerSlot - showEnts: False - occludes: True - ent: 24144 - proto: PottedPlant4 entities: - uid: 15519 @@ -111365,16 +111368,6 @@ entities: - type: Transform pos: 0.5,20.5 parent: 60 - - uid: 1534 - components: - - type: Transform - pos: 4.5,13.5 - parent: 60 - - uid: 4127 - components: - - type: Transform - pos: 37.5,-17.5 - parent: 60 - uid: 4698 components: - type: Transform @@ -111385,6 +111378,12 @@ entities: - type: Transform pos: 0.5,15.5 parent: 60 + - uid: 6177 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,12.5 + parent: 60 - uid: 6782 components: - type: Transform @@ -111429,6 +111428,12 @@ entities: parent: 60 - type: Physics canCollide: False + - uid: 13717 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,15.5 + parent: 60 - uid: 16987 components: - type: Transform @@ -111808,11 +111813,6 @@ entities: parent: 60 - type: ApcPowerReceiver powerLoad: 0 - - uid: 2777 - components: - - type: Transform - pos: -10.5,-20.5 - parent: 60 - uid: 3057 components: - type: Transform @@ -112003,13 +112003,6 @@ entities: parent: 60 - type: ApcPowerReceiver powerLoad: 0 - - uid: 5752 - components: - - type: Transform - pos: 3.5,11.5 - parent: 60 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 5826 components: - type: Transform @@ -112078,12 +112071,6 @@ entities: parent: 60 - type: ApcPowerReceiver powerLoad: 0 - - uid: 6042 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 37.5,-17.5 - parent: 60 - uid: 6146 components: - type: Transform @@ -112373,14 +112360,6 @@ entities: parent: 60 - type: ApcPowerReceiver powerLoad: 0 - - uid: 10679 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -16.5,-15.5 - parent: 60 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 10680 components: - type: Transform @@ -112595,14 +112574,12 @@ entities: parent: 60 - type: ApcPowerReceiver powerLoad: 0 - - uid: 11865 + - uid: 11726 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 45.5,1.5 + rot: 3.141592653589793 rad + pos: -11.5,-16.5 parent: 60 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 12224 components: - type: Transform @@ -112652,6 +112629,12 @@ entities: parent: 60 - type: ApcPowerReceiver powerLoad: 0 + - uid: 13478 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -16.5,-16.5 + parent: 60 - uid: 13480 components: - type: Transform @@ -112659,6 +112642,17 @@ entities: parent: 60 - type: ApcPowerReceiver powerLoad: 0 + - uid: 13494 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 45.5,-1.5 + parent: 60 + - uid: 13499 + components: + - type: Transform + pos: -27.5,32.5 + parent: 60 - uid: 13592 components: - type: Transform @@ -112789,20 +112783,6 @@ entities: parent: 60 - type: ApcPowerReceiver powerLoad: 0 - - uid: 15263 - components: - - type: Transform - pos: -29.5,32.5 - parent: 60 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 15264 - components: - - type: Transform - pos: -25.5,32.5 - parent: 60 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 15266 components: - type: Transform @@ -112968,24 +112948,6 @@ entities: parent: 60 - type: ApcPowerReceiver powerLoad: 0 - - uid: 16993 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -5.5,-15.5 - parent: 60 - - uid: 16994 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -10.5,-18.5 - parent: 60 - - uid: 16995 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -10.5,-11.5 - parent: 60 - uid: 17018 components: - type: Transform @@ -113298,14 +113260,6 @@ entities: parent: 60 - type: ApcPowerReceiver powerLoad: 0 - - uid: 19684 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 42.5,-1.5 - parent: 60 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 19879 components: - type: Transform @@ -113829,6 +113783,12 @@ entities: parent: 60 - type: ApcPowerReceiver powerLoad: 0 + - uid: 769 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.5,-20.5 + parent: 60 - uid: 937 components: - type: Transform @@ -113859,6 +113819,12 @@ entities: parent: 60 - type: ApcPowerReceiver powerLoad: 0 + - uid: 1534 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -12.5,-10.5 + parent: 60 - uid: 2091 components: - type: Transform @@ -113947,14 +113913,6 @@ entities: parent: 60 - type: ApcPowerReceiver powerLoad: 0 - - uid: 3729 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 51.5,16.5 - parent: 60 - - type: ApcPowerReceiver - powerLoad: 0 - uid: 3968 components: - type: Transform @@ -114382,6 +114340,12 @@ entities: parent: 60 - type: ApcPowerReceiver powerLoad: 0 + - uid: 13750 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 40.5,-35.5 + parent: 60 - uid: 13775 components: - type: Transform @@ -114930,6 +114894,11 @@ entities: parent: 60 - proto: Rack entities: + - uid: 536 + components: + - type: Transform + pos: 5.5,13.5 + parent: 60 - uid: 958 components: - type: Transform @@ -114960,12 +114929,6 @@ entities: - type: Transform pos: 11.5,-35.5 parent: 60 - - uid: 2418 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 40.5,2.5 - parent: 60 - uid: 2533 components: - type: Transform @@ -115101,16 +115064,16 @@ entities: - type: Transform pos: -33.5,-36.5 parent: 60 - - uid: 6554 - components: - - type: Transform - pos: 4.5,15.5 - parent: 60 - uid: 6564 components: - type: Transform pos: -0.5,15.5 parent: 60 + - uid: 7703 + components: + - type: Transform + pos: 46.5,-1.5 + parent: 60 - uid: 7737 components: - type: Transform @@ -115196,31 +115159,21 @@ entities: - type: Transform pos: 53.5,-4.5 parent: 60 + - uid: 13636 + components: + - type: Transform + pos: 45.5,-1.5 + parent: 60 - uid: 15158 components: - type: Transform pos: -27.5,32.5 parent: 60 - - uid: 15159 - components: - - type: Transform - pos: -29.5,32.5 - parent: 60 - - uid: 15569 - components: - - type: Transform - pos: -25.5,32.5 - parent: 60 - uid: 16065 components: - type: Transform pos: 4.5,23.5 parent: 60 - - uid: 16380 - components: - - type: Transform - pos: 44.5,-0.5 - parent: 60 - uid: 17155 components: - type: Transform @@ -115851,11 +115804,6 @@ entities: - type: Transform pos: 55.5,-5.5 parent: 60 - - uid: 3638 - components: - - type: Transform - pos: 42.5,-37.5 - parent: 60 - uid: 5302 components: - type: Transform @@ -115967,6 +115915,12 @@ entities: - type: Transform pos: 12.5,-44.5 parent: 60 + - uid: 7164 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,-17.5 + parent: 60 - uid: 9094 components: - type: Transform @@ -115977,6 +115931,12 @@ entities: - type: Transform pos: -29.5,-33.5 parent: 60 + - uid: 13701 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.5,-12.5 + parent: 60 - uid: 18010 components: - type: Transform @@ -116226,11 +116186,6 @@ entities: - type: Transform pos: 35.5,-40.5 parent: 60 - - uid: 3182 - components: - - type: Transform - pos: 42.5,-38.5 - parent: 60 - uid: 3375 components: - type: Transform @@ -116706,6 +116661,11 @@ entities: - type: Transform pos: -53.5,51.5 parent: 60 + - uid: 6999 + components: + - type: Transform + pos: -13.5,-19.5 + parent: 60 - uid: 7237 components: - type: Transform @@ -116821,6 +116781,16 @@ entities: - type: Transform pos: -56.5,2.5 parent: 60 + - uid: 13618 + components: + - type: Transform + pos: -13.5,-16.5 + parent: 60 + - uid: 13978 + components: + - type: Transform + pos: -13.5,-13.5 + parent: 60 - uid: 14807 components: - type: Transform @@ -116947,6 +116917,11 @@ entities: - type: Transform pos: -13.5,47.5 parent: 60 + - uid: 15444 + components: + - type: Transform + pos: -13.5,-15.5 + parent: 60 - uid: 15491 components: - type: Transform @@ -116972,6 +116947,11 @@ entities: - type: Transform pos: -20.5,47.5 parent: 60 + - uid: 16133 + components: + - type: Transform + pos: -13.5,-14.5 + parent: 60 - uid: 16972 components: - type: Transform @@ -117219,11 +117199,6 @@ entities: - type: Transform pos: -5.5,-21.5 parent: 60 - - uid: 513 - components: - - type: Transform - pos: -13.5,-12.5 - parent: 60 - uid: 524 components: - type: Transform @@ -117234,20 +117209,10 @@ entities: - type: Transform pos: 5.5,7.5 parent: 60 - - uid: 541 - components: - - type: Transform - pos: -13.5,-18.5 - parent: 60 - uid: 546 components: - type: Transform - pos: -13.5,-14.5 - parent: 60 - - uid: 549 - components: - - type: Transform - pos: -13.5,-13.5 + pos: -4.5,-18.5 parent: 60 - uid: 556 components: @@ -117395,6 +117360,11 @@ entities: - type: Transform pos: -8.5,-32.5 parent: 60 + - uid: 1293 + components: + - type: Transform + pos: -7.5,-10.5 + parent: 60 - uid: 1337 components: - type: Transform @@ -117674,6 +117644,11 @@ entities: - type: Transform pos: 48.5,-19.5 parent: 60 + - uid: 3130 + components: + - type: Transform + pos: -10.5,-10.5 + parent: 60 - uid: 3131 components: - type: Transform @@ -119090,11 +119065,6 @@ entities: - type: Transform pos: 42.5,-22.5 parent: 60 - - uid: 7703 - components: - - type: Transform - pos: 51.5,19.5 - parent: 60 - uid: 7726 components: - type: Transform @@ -119208,6 +119178,11 @@ entities: rot: 1.5707963267948966 rad pos: -62.5,-3.5 parent: 60 + - uid: 8565 + components: + - type: Transform + pos: -9.5,-10.5 + parent: 60 - uid: 8780 components: - type: Transform @@ -119268,6 +119243,11 @@ entities: - type: Transform pos: -24.5,-7.5 parent: 60 + - uid: 9041 + components: + - type: Transform + pos: -5.5,-19.5 + parent: 60 - uid: 9231 components: - type: Transform @@ -119377,6 +119357,11 @@ entities: rot: 1.5707963267948966 rad pos: -53.5,-9.5 parent: 60 + - uid: 10578 + components: + - type: Transform + pos: -4.5,-17.5 + parent: 60 - uid: 10582 components: - type: Transform @@ -119387,21 +119372,6 @@ entities: - type: Transform pos: 22.5,3.5 parent: 60 - - uid: 10620 - components: - - type: Transform - pos: 40.5,4.5 - parent: 60 - - uid: 11125 - components: - - type: Transform - pos: 36.5,-16.5 - parent: 60 - - uid: 11150 - components: - - type: Transform - pos: 49.5,19.5 - parent: 60 - uid: 11438 components: - type: Transform @@ -119605,6 +119575,11 @@ entities: rot: -1.5707963267948966 rad pos: 58.5,13.5 parent: 60 + - uid: 12021 + components: + - type: Transform + pos: -9.5,-17.5 + parent: 60 - uid: 12035 components: - type: Transform @@ -119615,6 +119590,11 @@ entities: - type: Transform pos: 47.5,30.5 parent: 60 + - uid: 12195 + components: + - type: Transform + pos: -25.5,27.5 + parent: 60 - uid: 12281 components: - type: Transform @@ -119871,6 +119851,31 @@ entities: - type: Transform pos: -9.5,-20.5 parent: 60 + - uid: 13625 + components: + - type: Transform + pos: -25.5,29.5 + parent: 60 + - uid: 13632 + components: + - type: Transform + pos: -9.5,6.5 + parent: 60 + - uid: 13694 + components: + - type: Transform + pos: -7.5,-16.5 + parent: 60 + - uid: 13696 + components: + - type: Transform + pos: -9.5,-16.5 + parent: 60 + - uid: 13767 + components: + - type: Transform + pos: -8.5,-10.5 + parent: 60 - uid: 13813 components: - type: Transform @@ -119891,16 +119896,6 @@ entities: - type: Transform pos: -48.5,17.5 parent: 60 - - uid: 13929 - components: - - type: Transform - pos: -25.5,29.5 - parent: 60 - - uid: 13933 - components: - - type: Transform - pos: -23.5,28.5 - parent: 60 - uid: 13941 components: - type: Transform @@ -119956,11 +119951,6 @@ entities: - type: Transform pos: -13.5,29.5 parent: 60 - - uid: 14652 - components: - - type: Transform - pos: -25.5,27.5 - parent: 60 - uid: 14654 components: - type: Transform @@ -120225,6 +120215,11 @@ entities: - type: Transform pos: -27.5,40.5 parent: 60 + - uid: 15660 + components: + - type: Transform + pos: -8.5,-16.5 + parent: 60 - uid: 15715 components: - type: Transform @@ -120447,11 +120442,6 @@ entities: - type: Transform pos: 3.5,4.5 parent: 60 - - uid: 17993 - components: - - type: Transform - pos: -9.5,6.5 - parent: 60 - uid: 18058 components: - type: Transform @@ -120552,6 +120542,21 @@ entities: - type: Transform pos: 39.5,-15.5 parent: 60 + - uid: 18766 + components: + - type: Transform + pos: -6.5,-13.5 + parent: 60 + - uid: 18767 + components: + - type: Transform + pos: -6.5,-12.5 + parent: 60 + - uid: 18771 + components: + - type: Transform + pos: -5.5,-14.5 + parent: 60 - uid: 19063 components: - type: Transform @@ -120811,11 +120816,6 @@ entities: - type: Transform pos: -20.5,-4.5 parent: 60 - - uid: 24364 - components: - - type: Transform - pos: 36.5,-20.5 - parent: 60 - proto: RemoteSignaller entities: - uid: 3017 @@ -120993,14 +120993,6 @@ entities: - type: Transform pos: -40.541443,11.441846 parent: 60 -- proto: ScalpelShiv - entities: - - uid: 24144 - components: - - type: Transform - parent: 24143 - - type: Physics - canCollide: False - proto: Screen entities: - uid: 5582 @@ -121383,21 +121375,21 @@ entities: - type: Transform pos: -57.47909,29.480463 parent: 60 - - uid: 14701 + - uid: 13549 components: - type: Transform - pos: -25.5,32.5 + pos: -27.462288,32.46317 + parent: 60 + - uid: 13635 + components: + - type: Transform + pos: -27.462288,32.46317 parent: 60 - uid: 15162 components: - type: Transform pos: -27.5,32.5 parent: 60 - - uid: 15200 - components: - - type: Transform - pos: -29.5,32.5 - parent: 60 - uid: 17024 components: - type: Transform @@ -121437,10 +121429,10 @@ entities: parent: 60 - proto: Shovel entities: - - uid: 13494 + - uid: 11125 components: - type: Transform - pos: 44.552612,0.5384157 + pos: 45.481277,-1.4287177 parent: 60 - uid: 19029 components: @@ -121503,11 +121495,6 @@ entities: - type: Transform pos: 29.5,-38.5 parent: 60 - - uid: 17449 - components: - - type: Transform - pos: -52.5,17.5 - parent: 60 - proto: ShuttersNormalOpen entities: - uid: 147 @@ -121942,16 +121929,6 @@ entities: - type: Transform pos: 42.5,-20.5 parent: 60 - - uid: 24370 - components: - - type: Transform - pos: 36.5,-20.5 - parent: 60 - - uid: 24371 - components: - - type: Transform - pos: 36.5,-16.5 - parent: 60 - uid: 24372 components: - type: Transform @@ -122061,6 +122038,11 @@ entities: - type: Transform pos: -50.5,28.5 parent: 60 + - uid: 13639 + components: + - type: Transform + pos: -52.5,17.5 + parent: 60 - proto: ShuttersWindowOpen entities: - uid: 6771 @@ -122576,18 +122558,6 @@ entities: - Pressed: Toggle 4045: - Pressed: Toggle - - uid: 2508 - components: - - type: MetaData - name: Maint Access to Chamber - - type: Transform - rot: 1.5707963267948966 rad - pos: -52.5,14.5 - parent: 60 - - type: DeviceLinkSource - linkedPorts: - 17449: - - Pressed: Toggle - uid: 2511 components: - type: MetaData @@ -122703,10 +122673,6 @@ entities: - Pressed: Toggle 24366: - Pressed: Toggle - 24370: - - Pressed: Toggle - 24371: - - Pressed: Toggle 24372: - Pressed: Toggle - uid: 13095 @@ -122840,6 +122806,18 @@ entities: - Pressed: Toggle 2506: - Pressed: Toggle + - uid: 15200 + components: + - type: MetaData + name: Maint Shutter + - type: Transform + rot: 1.5707963267948966 rad + pos: -52.5,14.5 + parent: 60 + - type: DeviceLinkSource + linkedPorts: + 13639: + - Pressed: Toggle - uid: 16370 components: - type: Transform @@ -124359,6 +124337,20 @@ entities: - type: Transform pos: -35.5,10.5 parent: 60 +- proto: SignSalvage + entities: + - uid: 13640 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 42.5,4.5 + parent: 60 + - uid: 13759 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 36.5,3.5 + parent: 60 - proto: SignScience entities: - uid: 9467 @@ -124473,11 +124465,15 @@ entities: parent: 60 - proto: SignShipDock entities: - - uid: 13251 + - uid: 7700 components: - type: Transform - rot: 3.141592653589793 rad - pos: 36.5,3.5 + pos: 42.5,19.5 + parent: 60 + - uid: 11131 + components: + - type: Transform + pos: 18.5,22.5 parent: 60 - proto: SignSmoking entities: @@ -124543,6 +124539,11 @@ entities: - type: Transform pos: -46.5,-35.5 parent: 60 + - uid: 13741 + components: + - type: Transform + pos: -13.5,-10.5 + parent: 60 - uid: 18803 components: - type: Transform @@ -124689,11 +124690,11 @@ entities: rot: -1.5707963267948966 rad pos: 20.5,12.5 parent: 60 - - uid: 13688 + - uid: 16994 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -10.5,-17.5 + rot: -1.5707963267948966 rad + pos: -12.5,-19.5 parent: 60 - uid: 24307 components: @@ -124715,6 +124716,12 @@ entities: rot: -1.5707963267948966 rad pos: 35.5,-33.5 parent: 60 + - uid: 12356 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.5,-12.5 + parent: 60 - uid: 12931 components: - type: Transform @@ -124732,12 +124739,6 @@ entities: rot: -1.5707963267948966 rad pos: -2.5,-27.5 parent: 60 - - uid: 21149 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -9.5,-15.5 - parent: 60 - uid: 24159 components: - type: Transform @@ -127016,6 +127017,12 @@ entities: parent: 60 - proto: SolidSecretDoor entities: + - uid: 3180 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -11.5,-19.5 + parent: 60 - uid: 5307 components: - type: Transform @@ -127478,25 +127485,25 @@ entities: parent: 60 - proto: SpawnPointMedicalIntern entities: - - uid: 4108 + - uid: 545 components: - type: Transform - pos: 37.5,-19.5 + pos: 39.5,-17.5 parent: 60 - - uid: 4121 + - uid: 9039 components: - type: Transform - pos: 38.5,-19.5 + pos: 38.5,-17.5 parent: 60 - - uid: 13788 + - uid: 13633 components: - type: Transform - pos: 40.5,-19.5 + pos: 37.5,-17.5 parent: 60 - - uid: 17298 + - uid: 13638 components: - type: Transform - pos: 39.5,-19.5 + pos: 36.5,-17.5 parent: 60 - proto: SpawnPointMime entities: @@ -127676,15 +127683,15 @@ entities: parent: 60 - proto: SpawnPointServiceWorker entities: - - uid: 7196 + - uid: 6141 components: - type: Transform - pos: 18.5,-38.5 + pos: 19.5,-37.5 parent: 60 - - uid: 21077 + - uid: 6554 components: - type: Transform - pos: 20.5,-37.5 + pos: 21.5,-38.5 parent: 60 - proto: SpawnPointStationEngineer entities: @@ -127936,6 +127943,18 @@ entities: rot: -1.5707963267948966 rad pos: -14.5,-7.5 parent: 60 + - uid: 13562 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -16.5,-14.5 + parent: 60 + - uid: 16993 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -16.5,-15.5 + parent: 60 - proto: Stool entities: - uid: 42 @@ -129775,11 +129794,11 @@ entities: - SurveillanceCameraSecurity nameSet: True id: Security Break Room - - uid: 13627 + - uid: 13658 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -7.5,-14.5 + rot: 3.141592653589793 rad + pos: -11.5,-13.5 parent: 60 - type: SurveillanceCamera setupAvailableNetworks: @@ -130244,6 +130263,11 @@ entities: - type: Transform pos: 9.5,-36.5 parent: 60 + - uid: 146 + components: + - type: Transform + pos: -12.5,-14.5 + parent: 60 - uid: 328 components: - type: Transform @@ -130435,12 +130459,6 @@ entities: - type: Transform pos: 3.5,-39.5 parent: 60 - - uid: 4954 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 41.5,4.5 - parent: 60 - uid: 5020 components: - type: Transform @@ -130521,16 +130539,6 @@ entities: - type: Transform pos: 55.5,-12.5 parent: 60 - - uid: 6584 - components: - - type: Transform - pos: 3.5,13.5 - parent: 60 - - uid: 6585 - components: - - type: Transform - pos: 4.5,13.5 - parent: 60 - uid: 6712 components: - type: Transform @@ -130577,6 +130585,11 @@ entities: rot: -1.5707963267948966 rad pos: 27.5,-33.5 parent: 60 + - uid: 7196 + components: + - type: Transform + pos: 43.5,-1.5 + parent: 60 - uid: 7239 components: - type: Transform @@ -130598,6 +130611,16 @@ entities: - type: Transform pos: -58.5,-16.5 parent: 60 + - uid: 7620 + components: + - type: Transform + pos: 43.5,-0.5 + parent: 60 + - uid: 7702 + components: + - type: Transform + pos: 43.5,0.5 + parent: 60 - uid: 7787 components: - type: Transform @@ -130663,6 +130686,11 @@ entities: - type: Transform pos: 40.5,-10.5 parent: 60 + - uid: 9176 + components: + - type: Transform + pos: 40.5,4.5 + parent: 60 - uid: 9464 components: - type: Transform @@ -130734,6 +130762,11 @@ entities: - type: Transform pos: -51.5,-5.5 parent: 60 + - uid: 10620 + components: + - type: Transform + pos: 49.5,18.5 + parent: 60 - uid: 11103 components: - type: Transform @@ -130754,11 +130787,6 @@ entities: - type: Transform pos: -54.5,-5.5 parent: 60 - - uid: 11151 - components: - - type: Transform - pos: 50.5,19.5 - parent: 60 - uid: 11482 components: - type: Transform @@ -130769,11 +130797,6 @@ entities: - type: Transform pos: -3.5,-51.5 parent: 60 - - uid: 11724 - components: - - type: Transform - pos: 44.5,0.5 - parent: 60 - uid: 11811 components: - type: Transform @@ -130784,11 +130807,6 @@ entities: - type: Transform pos: 38.5,-10.5 parent: 60 - - uid: 12195 - components: - - type: Transform - pos: 42.5,-0.5 - parent: 60 - uid: 12577 components: - type: Transform @@ -130814,6 +130832,11 @@ entities: - type: Transform pos: 44.5,13.5 parent: 60 + - uid: 13114 + components: + - type: Transform + pos: 41.5,4.5 + parent: 60 - uid: 13146 components: - type: Transform @@ -130854,16 +130877,28 @@ entities: - type: Transform pos: 47.5,3.5 parent: 60 - - uid: 13477 - components: - - type: Transform - pos: 47.5,17.5 - parent: 60 - uid: 13498 components: - type: Transform pos: 48.5,9.5 parent: 60 + - uid: 13620 + components: + - type: Transform + pos: -12.5,-13.5 + parent: 60 + - uid: 13688 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,15.5 + parent: 60 + - uid: 13689 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,15.5 + parent: 60 - uid: 13691 components: - type: Transform @@ -131272,21 +131307,21 @@ entities: - type: Transform pos: 23.5,-40.5 parent: 60 + - uid: 4491 + components: + - type: Transform + pos: 20.5,-38.5 + parent: 60 + - uid: 4954 + components: + - type: Transform + pos: 20.5,-37.5 + parent: 60 - uid: 7493 components: - type: Transform pos: 19.5,-29.5 parent: 60 - - uid: 13562 - components: - - type: Transform - pos: 19.5,-38.5 - parent: 60 - - uid: 13567 - components: - - type: Transform - pos: 19.5,-37.5 - parent: 60 - uid: 14120 components: - type: Transform @@ -131312,11 +131347,6 @@ entities: - type: Transform pos: 19.5,-30.5 parent: 60 - - uid: 16133 - components: - - type: Transform - pos: 16.5,-38.5 - parent: 60 - uid: 17818 components: - type: Transform @@ -131374,10 +131404,10 @@ entities: - type: Transform pos: -63.5,-11.5 parent: 60 - - uid: 5833 + - uid: 5420 components: - type: Transform - pos: 37.5,-17.5 + pos: 37.5,-20.5 parent: 60 - uid: 6668 components: @@ -131404,11 +131434,6 @@ entities: - type: Transform pos: 34.5,-9.5 parent: 60 - - uid: 12355 - components: - - type: Transform - pos: 37.5,-16.5 - parent: 60 - uid: 12357 components: - type: Transform @@ -131424,6 +131449,26 @@ entities: - type: Transform pos: 38.5,-14.5 parent: 60 + - uid: 12560 + components: + - type: Transform + pos: 36.5,-18.5 + parent: 60 + - uid: 13251 + components: + - type: Transform + pos: 37.5,-18.5 + parent: 60 + - uid: 13680 + components: + - type: Transform + pos: 38.5,-18.5 + parent: 60 + - uid: 13681 + components: + - type: Transform + pos: 37.5,-16.5 + parent: 60 - uid: 18831 components: - type: Transform @@ -131863,6 +131908,16 @@ entities: - type: Transform pos: 47.5,-12.5 parent: 60 + - uid: 13661 + components: + - type: Transform + pos: 3.5,12.5 + parent: 60 + - uid: 13685 + components: + - type: Transform + pos: 4.5,12.5 + parent: 60 - uid: 13951 components: - type: Transform @@ -132338,6 +132393,11 @@ entities: - type: Transform pos: 21.5,-18.5 parent: 60 + - uid: 6551 + components: + - type: Transform + pos: 17.5,-38.5 + parent: 60 - uid: 6843 components: - type: Transform @@ -133020,16 +133080,16 @@ entities: - type: Transform pos: 38.5,15.5 parent: 60 - - uid: 12021 - components: - - type: Transform - pos: 50.5,15.5 - parent: 60 - uid: 12301 components: - type: Transform pos: 31.5,-12.5 parent: 60 + - uid: 13682 + components: + - type: Transform + pos: 50.5,19.5 + parent: 60 - uid: 14516 components: - type: Transform @@ -133059,6 +133119,12 @@ entities: - type: Transform pos: 19.5,14.5 parent: 60 + - uid: 13726 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -12.5,-20.5 + parent: 60 - proto: ToiletEmpty entities: - uid: 4323 @@ -133077,12 +133143,6 @@ entities: - type: Transform pos: 58.5,-44.5 parent: 60 - - uid: 13687 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -10.5,-18.5 - parent: 60 - proto: ToolboxArtistic entities: - uid: 21788 @@ -133107,11 +133167,6 @@ entities: - type: Transform pos: 61.51187,-30.58106 parent: 60 - - uid: 6601 - components: - - type: Transform - pos: 4.5497127,15.661254 - parent: 60 - uid: 9614 components: - type: Transform @@ -133122,6 +133177,11 @@ entities: - type: Transform pos: 14.490113,-48.331394 parent: 60 + - uid: 13684 + components: + - type: Transform + pos: 5.4793596,13.51398 + parent: 60 - uid: 19151 components: - type: Transform @@ -133303,16 +133363,16 @@ entities: - type: Transform pos: -31.45853,-30.433151 parent: 60 - - uid: 6602 - components: - - type: Transform - pos: 4.775793,13.661089 - parent: 60 - uid: 11681 components: - type: Transform pos: -3.587097,-51.43958 parent: 60 + - uid: 17298 + components: + - type: Transform + pos: 7.651234,15.67023 + parent: 60 - proto: TubaInstrument entities: - uid: 17380 @@ -133593,10 +133653,10 @@ entities: parent: 60 - proto: VendingMachineAtmosDrobe entities: - - uid: 2244 + - uid: 13605 components: - type: Transform - pos: -22.5,28.5 + pos: -29.5,32.5 parent: 60 - proto: VendingMachineBooze entities: @@ -133636,11 +133696,6 @@ entities: - type: Transform pos: -17.5,-53.5 parent: 60 - - uid: 6140 - components: - - type: Transform - pos: 4.5,11.5 - parent: 60 - uid: 18522 components: - type: Transform @@ -133848,10 +133903,10 @@ entities: parent: 60 - proto: VendingMachineEngivend entities: - - uid: 6550 + - uid: 12559 components: - type: Transform - pos: 7.5,15.5 + pos: -4.5,21.5 parent: 60 - proto: VendingMachineGames entities: @@ -134061,13 +134116,6 @@ entities: - type: Transform pos: 52.5,-31.5 parent: 60 -- proto: VendingMachineWallMedical - entities: - - uid: 9176 - components: - - type: Transform - pos: 33.5,-8.5 - parent: 60 - proto: VendingMachineWinter entities: - uid: 9009 @@ -134077,16 +134125,16 @@ entities: parent: 60 - proto: VendingMachineYouTool entities: - - uid: 6551 - components: - - type: Transform - pos: 6.5,15.5 - parent: 60 - uid: 6624 components: - type: Transform pos: 12.5,15.5 parent: 60 + - uid: 12887 + components: + - type: Transform + pos: -4.5,20.5 + parent: 60 - proto: ViolinInstrument entities: - uid: 7241 @@ -134117,6 +134165,18 @@ entities: rot: -1.5707963267948966 rad pos: 14.5,19.5 parent: 60 + - uid: 13158 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -27.5,-11.5 + parent: 60 + - uid: 13718 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -25.5,-11.5 + parent: 60 - proto: WallmountTelevision entities: - uid: 8148 @@ -134991,23 +135051,13 @@ entities: - uid: 542 components: - type: Transform - pos: -13.5,-19.5 + pos: -11.5,-12.5 parent: 60 - uid: 543 components: - type: Transform pos: -13.5,-17.5 parent: 60 - - uid: 545 - components: - - type: Transform - pos: -13.5,-16.5 - parent: 60 - - uid: 547 - components: - - type: Transform - pos: -13.5,-15.5 - parent: 60 - uid: 550 components: - type: Transform @@ -135287,11 +135337,6 @@ entities: - type: Transform pos: -13.5,-20.5 parent: 60 - - uid: 769 - components: - - type: Transform - pos: -13.5,-11.5 - parent: 60 - uid: 770 components: - type: Transform @@ -135372,16 +135417,6 @@ entities: - type: Transform pos: 5.5,11.5 parent: 60 - - uid: 1292 - components: - - type: Transform - pos: 4.5,12.5 - parent: 60 - - uid: 1293 - components: - - type: Transform - pos: 3.5,12.5 - parent: 60 - uid: 1294 components: - type: Transform @@ -135874,6 +135909,16 @@ entities: rot: -1.5707963267948966 rad pos: 29.5,-25.5 parent: 60 + - uid: 2508 + components: + - type: Transform + pos: -12.5,-12.5 + parent: 60 + - uid: 2553 + components: + - type: Transform + pos: -12.5,-8.5 + parent: 60 - uid: 2587 components: - type: Transform @@ -135889,6 +135934,11 @@ entities: - type: Transform pos: 36.5,-15.5 parent: 60 + - uid: 2629 + components: + - type: Transform + pos: -11.5,-11.5 + parent: 60 - uid: 2655 components: - type: Transform @@ -135905,6 +135955,11 @@ entities: - type: Transform pos: 42.5,-29.5 parent: 60 + - uid: 2672 + components: + - type: Transform + pos: -13.5,-12.5 + parent: 60 - uid: 2678 components: - type: Transform @@ -135973,6 +136028,11 @@ entities: rot: 3.141592653589793 rad pos: 37.5,-33.5 parent: 60 + - uid: 2777 + components: + - type: Transform + pos: -11.5,-10.5 + parent: 60 - uid: 2817 components: - type: Transform @@ -136015,6 +136075,11 @@ entities: rot: 3.141592653589793 rad pos: 46.5,-33.5 parent: 60 + - uid: 2856 + components: + - type: Transform + pos: -11.5,-8.5 + parent: 60 - uid: 2866 components: - type: Transform @@ -139259,6 +139324,11 @@ entities: - type: Transform pos: -9.5,-45.5 parent: 60 + - uid: 8153 + components: + - type: Transform + pos: -13.5,-18.5 + parent: 60 - uid: 8158 components: - type: Transform @@ -140415,11 +140485,6 @@ entities: - type: Transform pos: 8.5,-34.5 parent: 60 - - uid: 13602 - components: - - type: Transform - pos: -11.5,-17.5 - parent: 60 - uid: 13614 components: - type: Transform @@ -140435,56 +140500,16 @@ entities: - type: Transform pos: -9.5,-19.5 parent: 60 - - uid: 13618 - components: - - type: Transform - pos: -10.5,-19.5 - parent: 60 - - uid: 13619 - components: - - type: Transform - pos: -11.5,-19.5 - parent: 60 - - uid: 13623 - components: - - type: Transform - pos: -11.5,-15.5 - parent: 60 - - uid: 13633 - components: - - type: Transform - pos: -11.5,-10.5 - parent: 60 - - uid: 13635 - components: - - type: Transform - pos: -11.5,-11.5 - parent: 60 - uid: 13672 components: - type: Transform pos: -6.5,-10.5 parent: 60 - - uid: 13717 - components: - - type: Transform - pos: -9.5,-17.5 - parent: 60 - uid: 13719 components: - type: Transform pos: -4.5,-16.5 parent: 60 - - uid: 13726 - components: - - type: Transform - pos: -9.5,-18.5 - parent: 60 - - uid: 13728 - components: - - type: Transform - pos: -9.5,-16.5 - parent: 60 - uid: 13740 components: - type: Transform @@ -140500,11 +140525,6 @@ entities: - type: Transform pos: -6.5,-14.5 parent: 60 - - uid: 13750 - components: - - type: Transform - pos: -11.5,-16.5 - parent: 60 - uid: 13790 components: - type: Transform @@ -141665,6 +141685,11 @@ entities: - type: Transform pos: -16.5,51.5 parent: 60 + - uid: 15693 + components: + - type: Transform + pos: -9.5,-18.5 + parent: 60 - uid: 15716 components: - type: Transform @@ -144420,11 +144445,6 @@ entities: - type: Transform pos: -24.5,6.5 parent: 60 - - uid: 367 - components: - - type: Transform - pos: 43.5,0.5 - parent: 60 - uid: 411 components: - type: Transform @@ -144932,6 +144952,11 @@ entities: rot: 1.5707963267948966 rad pos: 15.5,-38.5 parent: 60 + - uid: 2165 + components: + - type: Transform + pos: -11.5,-18.5 + parent: 60 - uid: 2168 components: - type: Transform @@ -145174,11 +145199,6 @@ entities: - type: Transform pos: 35.5,-38.5 parent: 60 - - uid: 2399 - components: - - type: Transform - pos: 40.5,-36.5 - parent: 60 - uid: 2401 components: - type: Transform @@ -145226,11 +145246,6 @@ entities: - type: Transform pos: 40.5,-37.5 parent: 60 - - uid: 2672 - components: - - type: Transform - pos: 40.5,-35.5 - parent: 60 - uid: 2673 components: - type: Transform @@ -145327,11 +145342,6 @@ entities: rot: -1.5707963267948966 rad pos: 46.5,-37.5 parent: 60 - - uid: 2856 - components: - - type: Transform - pos: 41.5,-35.5 - parent: 60 - uid: 2858 components: - type: Transform @@ -145542,12 +145552,6 @@ entities: - type: Transform pos: 33.5,-34.5 parent: 60 - - uid: 3172 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 43.5,-36.5 - parent: 60 - uid: 3173 components: - type: Transform @@ -145566,6 +145570,11 @@ entities: rot: 1.5707963267948966 rad pos: 42.5,-21.5 parent: 60 + - uid: 3210 + components: + - type: Transform + pos: -11.5,-17.5 + parent: 60 - uid: 3227 components: - type: Transform @@ -146205,11 +146214,6 @@ entities: - type: Transform pos: -36.5,-33.5 parent: 60 - - uid: 4532 - components: - - type: Transform - pos: 36.5,-19.5 - parent: 60 - uid: 4569 components: - type: Transform @@ -146361,6 +146365,16 @@ entities: - type: Transform pos: 47.5,10.5 parent: 60 + - uid: 5415 + components: + - type: Transform + pos: 51.5,19.5 + parent: 60 + - uid: 5417 + components: + - type: Transform + pos: 49.5,19.5 + parent: 60 - uid: 5435 components: - type: Transform @@ -146454,6 +146468,11 @@ entities: - type: Transform pos: 45.5,-2.5 parent: 60 + - uid: 6142 + components: + - type: Transform + pos: 42.5,-37.5 + parent: 60 - uid: 6225 components: - type: Transform @@ -146561,11 +146580,6 @@ entities: - type: Transform pos: -1.5,13.5 parent: 60 - - uid: 6606 - components: - - type: Transform - pos: 2.5,13.5 - parent: 60 - uid: 6619 components: - type: Transform @@ -146651,11 +146665,6 @@ entities: - type: Transform pos: 11.5,-25.5 parent: 60 - - uid: 7172 - components: - - type: Transform - pos: 43.5,1.5 - parent: 60 - uid: 7220 components: - type: Transform @@ -146683,11 +146692,6 @@ entities: - type: Transform pos: 17.5,-39.5 parent: 60 - - uid: 7620 - components: - - type: Transform - pos: 36.5,-17.5 - parent: 60 - uid: 7624 components: - type: Transform @@ -146708,11 +146712,6 @@ entities: - type: Transform pos: 61.5,-21.5 parent: 60 - - uid: 7675 - components: - - type: Transform - pos: 16.5,-39.5 - parent: 60 - uid: 7689 components: - type: Transform @@ -147608,16 +147607,6 @@ entities: - type: Transform pos: 36.5,3.5 parent: 60 - - uid: 13114 - components: - - type: Transform - pos: 43.5,-0.5 - parent: 60 - - uid: 13137 - components: - - type: Transform - pos: 44.5,1.5 - parent: 60 - uid: 13141 components: - type: Transform @@ -147668,6 +147657,27 @@ entities: - type: Transform pos: 39.5,-1.5 parent: 60 + - uid: 13743 + components: + - type: Transform + pos: 41.5,-36.5 + parent: 60 + - uid: 13745 + components: + - type: Transform + pos: 40.5,-36.5 + parent: 60 + - uid: 13749 + components: + - type: Transform + pos: 42.5,-36.5 + parent: 60 + - uid: 13752 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,13.5 + parent: 60 - uid: 13828 components: - type: Transform @@ -147903,11 +147913,6 @@ entities: - type: Transform pos: -32.5,33.5 parent: 60 - - uid: 15660 - components: - - type: Transform - pos: 43.5,-1.5 - parent: 60 - uid: 16167 components: - type: Transform @@ -148048,6 +148053,11 @@ entities: - type: Transform pos: 28.5,-37.5 parent: 60 + - uid: 18671 + components: + - type: Transform + pos: -11.5,-20.5 + parent: 60 - uid: 19197 components: - type: Transform @@ -149330,20 +149340,15 @@ entities: - type: Transform pos: -29.5,-36.5 parent: 60 - - uid: 6999 - components: - - type: Transform - pos: 42.5,-36.5 - parent: 60 - uid: 7198 components: - type: Transform pos: 5.5,-44.5 parent: 60 - - uid: 7720 + - uid: 13609 components: - type: Transform - pos: -10.5,-14.5 + pos: 41.5,-37.5 parent: 60 - proto: WaterTankHighCapacity entities: @@ -149539,11 +149544,6 @@ entities: - type: Transform pos: -32.344437,-34.56709 parent: 60 - - uid: 7164 - components: - - type: Transform - pos: 3.713293,13.629839 - parent: 60 - proto: WelderIndustrial entities: - uid: 4097 @@ -149617,16 +149617,6 @@ entities: - type: Transform pos: -28.5,-36.5 parent: 60 - - uid: 6559 - components: - - type: Transform - pos: 7.5,12.5 - parent: 60 - - uid: 6560 - components: - - type: Transform - pos: 6.5,12.5 - parent: 60 - uid: 8738 components: - type: Transform @@ -149637,6 +149627,11 @@ entities: - type: Transform pos: -30.5,14.5 parent: 60 + - uid: 15159 + components: + - type: Transform + pos: -8.5,29.5 + parent: 60 - uid: 15202 components: - type: Transform @@ -149881,12 +149876,6 @@ entities: rot: 1.5707963267948966 rad pos: 39.5,-46.5 parent: 60 - - uid: 19883 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -8.5,-15.5 - parent: 60 - proto: WindoorSecureArmoryLocked entities: - uid: 1466 @@ -149944,16 +149933,6 @@ entities: parent: 60 - proto: WindoorSecureCargoLocked entities: - - uid: 2179 - components: - - type: Transform - pos: 41.5,4.5 - parent: 60 - - uid: 7702 - components: - - type: Transform - pos: 50.5,19.5 - parent: 60 - uid: 13104 components: - type: Transform @@ -150048,6 +150027,16 @@ entities: parent: 60 - proto: WindoorSecureEngineeringLocked entities: + - uid: 541 + components: + - type: Transform + pos: 4.5,12.5 + parent: 60 + - uid: 13660 + components: + - type: Transform + pos: 3.5,12.5 + parent: 60 - uid: 13804 components: - type: Transform @@ -150085,6 +150074,18 @@ entities: rot: -1.5707963267948966 rad pos: 46.5,-17.5 parent: 60 +- proto: WindoorSecureSalvageLocked + entities: + - uid: 6560 + components: + - type: Transform + pos: 40.5,4.5 + parent: 60 + - uid: 13602 + components: + - type: Transform + pos: 41.5,4.5 + parent: 60 - proto: WindoorSecureScienceLocked entities: - uid: 7057 @@ -150325,6 +150326,11 @@ entities: - type: Transform pos: -57.5,18.5 parent: 60 + - uid: 13671 + components: + - type: Transform + pos: 50.5,15.5 + parent: 60 - uid: 13751 components: - type: Transform @@ -150642,23 +150648,6 @@ entities: parent: 60 - proto: WindowReinforcedDirectional entities: - - uid: 399 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -4.5,-18.5 - parent: 60 - - uid: 400 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -4.5,-18.5 - parent: 60 - - uid: 402 - components: - - type: Transform - pos: -4.5,-18.5 - parent: 60 - uid: 1345 components: - type: Transform @@ -151112,12 +151101,6 @@ entities: rot: 3.141592653589793 rad pos: -40.5,-15.5 parent: 60 - - uid: 8565 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -6.5,-13.5 - parent: 60 - uid: 9023 components: - type: Transform @@ -151157,6 +151140,12 @@ entities: - type: Transform pos: 46.5,-17.5 parent: 60 + - uid: 11753 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,-11.5 + parent: 60 - uid: 12599 components: - type: Transform @@ -151167,186 +151156,10 @@ entities: - type: Transform pos: -47.5,15.5 parent: 60 - - uid: 13549 + - uid: 13619 components: - type: Transform - rot: 3.141592653589793 rad - pos: -5.5,-19.5 - parent: 60 - - uid: 13598 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -4.5,-17.5 - parent: 60 - - uid: 13600 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -8.5,-10.5 - parent: 60 - - uid: 13604 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -11.5,-18.5 - parent: 60 - - uid: 13605 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,-14.5 - parent: 60 - - uid: 13606 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,-13.5 - parent: 60 - - uid: 13608 - components: - - type: Transform - pos: -6.5,-13.5 - parent: 60 - - uid: 13609 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -6.5,-12.5 - parent: 60 - - uid: 13611 - components: - - type: Transform - pos: -11.5,-18.5 - parent: 60 - - uid: 13624 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -9.5,-10.5 - parent: 60 - - uid: 13625 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -7.5,-10.5 - parent: 60 - - uid: 13626 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -7.5,-10.5 - parent: 60 - - uid: 13632 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -10.5,-10.5 - parent: 60 - - uid: 13634 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,-12.5 - parent: 60 - - uid: 13637 - components: - - type: Transform - pos: -7.5,-10.5 - parent: 60 - - uid: 13643 - components: - - type: Transform - pos: -8.5,-14.5 - parent: 60 - - uid: 13656 - components: - - type: Transform - pos: -9.5,-10.5 - parent: 60 - - uid: 13659 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -11.5,-14.5 - parent: 60 - - uid: 13660 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -11.5,-13.5 - parent: 60 - - uid: 13661 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -11.5,-12.5 - parent: 60 - - uid: 13662 - components: - - type: Transform - pos: -8.5,-10.5 - parent: 60 - - uid: 13663 - components: - - type: Transform - pos: -10.5,-10.5 - parent: 60 - - uid: 13666 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -6.5,-12.5 - parent: 60 - - uid: 13681 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -5.5,-14.5 - parent: 60 - - uid: 13685 - components: - - type: Transform - pos: -8.5,-16.5 - parent: 60 - - uid: 13689 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -7.5,-16.5 - parent: 60 - - uid: 13690 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -7.5,-16.5 - parent: 60 - - uid: 13724 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -5.5,-14.5 - parent: 60 - - uid: 13745 - components: - - type: Transform - pos: -5.5,-14.5 - parent: 60 - - uid: 13754 - components: - - type: Transform - pos: -7.5,-16.5 - parent: 60 - - uid: 13763 - components: - - type: Transform - pos: -7.5,-14.5 - parent: 60 - - uid: 13785 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -5.5,-14.5 + pos: -11.5,-16.5 parent: 60 - uid: 13801 components: @@ -151358,12 +151171,6 @@ entities: - type: Transform pos: -4.5,17.5 parent: 60 - - uid: 13881 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,-18.5 - parent: 60 - uid: 14114 components: - type: Transform @@ -151398,23 +151205,6 @@ entities: rot: 3.141592653589793 rad pos: -19.5,16.5 parent: 60 - - uid: 15442 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -7.5,-11.5 - parent: 60 - - uid: 15444 - components: - - type: Transform - pos: -10.5,-18.5 - parent: 60 - - uid: 15445 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -5.5,-15.5 - parent: 60 - uid: 15728 components: - type: Transform @@ -151466,12 +151256,6 @@ entities: rot: 1.5707963267948966 rad pos: -27.5,2.5 parent: 60 - - uid: 16996 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -10.5,-11.5 - parent: 60 - uid: 17843 components: - type: Transform @@ -151525,18 +151309,6 @@ entities: rot: -1.5707963267948966 rad pos: -5.5,-6.5 parent: 60 - - uid: 18671 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -8.5,-16.5 - parent: 60 - - uid: 18767 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -8.5,-16.5 - parent: 60 - uid: 19907 components: - type: Transform @@ -151560,46 +151332,11 @@ entities: - type: Transform pos: -47.5,5.5 parent: 60 - - uid: 21144 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -11.5,-12.5 - parent: 60 - - uid: 21145 - components: - - type: Transform - pos: -11.5,-14.5 - parent: 60 - - uid: 21146 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -11.5,-18.5 - parent: 60 - - uid: 21147 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -6.5,-12.5 - parent: 60 - - uid: 21148 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -6.5,-13.5 - parent: 60 - uid: 21152 components: - type: Transform pos: -46.5,5.5 parent: 60 - - uid: 21153 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -10.5,-10.5 - parent: 60 - uid: 21214 components: - type: Transform @@ -154382,35 +154119,6 @@ entities: rot: 1.5707963267948966 rad pos: -25.5,2.5 parent: 60 - - uid: 24177 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -4.5,-17.5 - parent: 60 - - uid: 24178 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -5.5,-19.5 - parent: 60 - - uid: 24179 - components: - - type: Transform - pos: -5.5,-19.5 - parent: 60 - - uid: 24181 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -4.5,-17.5 - parent: 60 - - uid: 24182 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -5.5,-19.5 - parent: 60 - proto: Wirecutter entities: - uid: 19191 From 5247878060a9245240bf51deb14b5bbc78e8bea8 Mon Sep 17 00:00:00 2001 From: NakataRin <45946146+NakataRin@users.noreply.github.com> Date: Wed, 7 Aug 2024 07:38:47 +0400 Subject: [PATCH 228/422] Fix Mind Transfer and Role Assignment Logic for Antagonists (#30711) * AntagSelectionSystemFix * readded the stuff that shouldn've been deleted in the first place * re-arrange * undo indentation --------- Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> --- Content.Server/Antag/AntagSelectionSystem.cs | 23 +++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/Content.Server/Antag/AntagSelectionSystem.cs b/Content.Server/Antag/AntagSelectionSystem.cs index 64b26509c4..270b39b3a2 100644 --- a/Content.Server/Antag/AntagSelectionSystem.cs +++ b/Content.Server/Antag/AntagSelectionSystem.cs @@ -18,6 +18,7 @@ using Content.Shared.GameTicking; using Content.Shared.GameTicking.Components; using Content.Shared.Ghost; using Content.Shared.Humanoid; +using Content.Shared.Mind; using Content.Shared.Players; using Content.Shared.Preferences.Loadouts; using Content.Shared.Roles; @@ -231,7 +232,7 @@ public sealed partial class AntagSelectionSystem : GameRuleSystem(curMind.Value, out var mindComp) || + mindComp.OwnedEntity != antagEnt) + { + curMind = _mind.CreateMind(session.UserId, Name(antagEnt.Value)); + _mind.SetUserId(curMind.Value, session.UserId); + } + _mind.TransferTo(curMind.Value, antagEnt, ghostCheckOverride: true); + _role.MindAddRoles(curMind.Value, def.MindComponents, null, true); + ent.Comp.SelectedMinds.Add((curMind.Value, Name(player))); SendBriefing(session, def.Briefing); } @@ -460,7 +467,7 @@ public sealed partial class AntagSelectionSystem : GameRuleSystem ent, ref ObjectivesTextGetInfoEvent args) { - if (ent.Comp.AgentName is not {} name) + if (ent.Comp.AgentName is not { } name) return; args.Minds = ent.Comp.SelectedMinds; From 6ccc10e240058d6186b7d22be0b6fb9ea4931c18 Mon Sep 17 00:00:00 2001 From: Errant <35878406+Errant-4@users.noreply.github.com> Date: Wed, 7 Aug 2024 05:41:40 +0200 Subject: [PATCH 229/422] Vox Medical Mask sprite fix (#30702) vox medical mask --- .../Mask/medical.rsi/equipped-MASK-vox.png | Bin 500 -> 513 bytes .../Mask/medical.rsi/up-equipped-MASK-vox.png | Bin 553 -> 425 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/medical.rsi/equipped-MASK-vox.png index c3fa7f5917dcbaa54a49a75ac39cc63591ef2a05..4c94f2c09155ce894a06d5dc9309f5f647684a9a 100644 GIT binary patch delta 480 zcmeyu+{iLPyPjK!fq`3y@zUM8KMV|vn>}3|Ln`9l-m(umfCTYggeRQ3h_sm{$NA|fGWhWGnkADLlzvv>A{kG{)*dD&AUHeV&C?1r(wbRS!&lSOIfefzMuSh z(fQhl^~Su%um8QbFRo;xVRtcyUb{omvu?rLza;~7lq~1>o}ACP?&EEhhvpW?VwKc@ zj%r{)ChFn*dS!t>^?yEf1zbO!RQvq@vH9Z3yP}j{8(m+Y?9)1>->B){_QsXF_G!h1 z>iVjCd=Lp}dQ`RdUUp^7?a(_$JExt?KbHJ?%CfE6r$cAls{c@DHS_u5gLQ9{cIz7I zrO$qOJu7#E*2ZuAD-5phk>ao|S<5iJlA-;=vdEjOtoD3kH_3dGXC}Qj*KAwD-AYq| zsvQ>>M|7>cv2bJ6ZoMy-0#&j3y^|yuSp*yyFbFoq4~z>M4sUu|Cc(x41fH&bF6*2U FngCMw);$0K literal 500 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|VnS zPZ!6KiaBp*EzDzb6lnYJ{Ys!zLSgEPMU_k}5%U^Du1v@hnsnLM*Y&XR0zn(bS=Sz9 zSn#aW~r_YHTQGQ_%2L1zcluj^Cy#;Gj1ncoVR~n*za$Lx8?19SHcWbR$>)c zZ($mVSF#rF+&k@LJI9-tlv^zF zk1d>Jn0HUTaChtJtQBEe;;PEmqZe$7V~%DtD%`nm%SrB?EL-$*j{oQU%LjGcgvCq< zr()%tV^T5IyP05lZrSC~T-6xh zdC7!x_BE9nwNBsb^N&4qdgq=X->~G=$5?#)CbFqMa0c zvMg(TH-6GH&)>q_75aISi|1$K^Q-@+zxr~@xDxIbgsWgIiT(q|%jA4S>aV@5`63dr zXyd-1hsSUH{LNHlaQk{pm$-PGwNwAu+q?8n1=i%B{g-vZEhlgBvU|>p3%2wqZv3gp zb3f_xGHZuL<+feZ4cY2%R3sj9^VOd4T4BStk^;7aT{^CU&~Sj-cuRN(^Q){I+kI=7 RnlS)@r>mdKI;RB2CIA@dsxbfn delta 521 zcmZ3WE%=Gp21Aack6zX?w{P6ZTYo9}(#{;$k6|oxy3T6aoHZ)D7r19@ zv_j`u`)t#gaIFo2HXCJ|RT9LH{%=`$wU#4nKI82hGP@%;2i7<#9eg%}^O}6qm#R0< x3KoX^F<|Gs#`;8Zru9aq7-v{$Be`=<{9@(H^^ab&{9^zDPgg&ebxuqPO#tZ2@{<4n From 9903d36c7da126668546e41a92bed54edc4f0ca0 Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 7 Aug 2024 03:42:48 +0000 Subject: [PATCH 230/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 9e66cf9a9e..7e2e9234c3 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Cojoke-dot - changes: - - message: You can now shoot over racks - type: Tweak - id: 6552 - time: '2024-05-08T06:46:04.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27797 - author: ShadowCommander changes: - message: Lizards now stop tail pulling when they are downed. @@ -3780,3 +3773,10 @@ id: 7051 time: '2024-08-06T13:12:14.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30699 +- author: Errant + changes: + - message: Medical Mask sprite now works on vox. + type: Fix + id: 7052 + time: '2024-08-07T03:41:40.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30702 From 2dabf33d46de01e9e4f346882c4872fe3b00efff Mon Sep 17 00:00:00 2001 From: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com> Date: Wed, 7 Aug 2024 03:43:21 +0000 Subject: [PATCH 231/422] fix(FieldGenerators): Add missing connection check (#30468) . --- .../EntitySystems/ContainmentFieldGeneratorSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs b/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs index f02c2bfd0d..ca32beb8db 100644 --- a/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs +++ b/Content.Server/Singularity/EntitySystems/ContainmentFieldGeneratorSystem.cs @@ -117,7 +117,7 @@ public sealed class ContainmentFieldGeneratorSystem : EntitySystem private void OnUnanchorAttempt(EntityUid uid, ContainmentFieldGeneratorComponent component, UnanchorAttemptEvent args) { - if (component.Enabled) + if (component.Enabled || component.IsConnected) { _popupSystem.PopupEntity(Loc.GetString("comp-containment-anchor-warning"), args.User, args.User, PopupType.LargeCaution); args.Cancel(); From ce97225c2db44c4f772bdf985f2f2e81f42e34c6 Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Wed, 7 Aug 2024 01:15:35 -0400 Subject: [PATCH 232/422] Replace IClickAlert with events (#30728) * Replace IAlertClick with events * whoop * eek! --- Content.Client/Alerts/ClientAlertsSystem.cs | 2 +- .../Abilities/Mime/MimePowersSystem.cs | 20 +++++++++++++ Content.Server/Alert/Click/BreakVow.cs | 22 -------------- Content.Server/Alert/Click/RemoveCuffs.cs | 21 -------------- Content.Server/Alert/Click/RemoveEnsnare.cs | 28 ------------------ Content.Server/Alert/Click/ResistFire.cs | 25 ---------------- Content.Server/Alert/Click/RetakeVow.cs | 22 -------------- Content.Server/Alert/Click/StopBeingPulled.cs | 29 ------------------- Content.Server/Alert/Click/StopPiloting.cs | 26 ----------------- Content.Server/Alert/Click/StopPulling.cs | 27 ----------------- Content.Server/Alert/Click/ToggleInternals.cs | 19 ------------ Content.Server/Alert/Click/Unbuckle.cs | 19 ------------ .../Atmos/EntitySystems/FlammableSystem.cs | 10 +++++++ .../Body/Components/InternalsComponent.cs | 1 + .../Body/Systems/InternalsSystem.cs | 9 ++++++ .../Ensnaring/EnsnareableSystem.Ensnaring.cs | 19 ++++++++++++ .../Shuttles/Systems/ShuttleConsoleSystem.cs | 9 ++++++ Content.Shared/Abilities/Mime/MimePowers.cs | 7 +++++ Content.Shared/Alert/AlertPrototype.cs | 22 +++++++++++--- Content.Shared/Alert/AlertsSystem.cs | 17 +++++++++-- Content.Shared/Alert/IAlertClick.cs | 14 --------- .../ExtinguishOnInteractComponent.cs | 3 ++ .../Buckle/Components/BuckleComponent.cs | 2 ++ .../Buckle/SharedBuckleSystem.Buckle.cs | 8 +++++ .../Cuffs/Components/CuffableComponent.cs | 2 ++ Content.Shared/Cuffs/SharedCuffableSystem.cs | 9 ++++++ .../Components/EnsnareableComponent.cs | 2 ++ .../Internals/InternalsDoAfterEvent.cs | 5 +++- .../Pulling/Components/PullableComponent.cs | 2 ++ .../Pulling/Components/PullerComponent.cs | 2 ++ .../Movement/Pulling/Systems/PullingSystem.cs | 22 ++++++++++++++ .../Shuttles/Components/PilotComponent.cs | 2 ++ Resources/Prototypes/Alerts/alerts.yml | 20 ++++++------- 33 files changed, 177 insertions(+), 270 deletions(-) delete mode 100644 Content.Server/Alert/Click/BreakVow.cs delete mode 100644 Content.Server/Alert/Click/RemoveCuffs.cs delete mode 100644 Content.Server/Alert/Click/RemoveEnsnare.cs delete mode 100644 Content.Server/Alert/Click/ResistFire.cs delete mode 100644 Content.Server/Alert/Click/RetakeVow.cs delete mode 100644 Content.Server/Alert/Click/StopBeingPulled.cs delete mode 100644 Content.Server/Alert/Click/StopPiloting.cs delete mode 100644 Content.Server/Alert/Click/StopPulling.cs delete mode 100644 Content.Server/Alert/Click/ToggleInternals.cs delete mode 100644 Content.Server/Alert/Click/Unbuckle.cs create mode 100644 Content.Shared/Abilities/Mime/MimePowers.cs delete mode 100644 Content.Shared/Alert/IAlertClick.cs diff --git a/Content.Client/Alerts/ClientAlertsSystem.cs b/Content.Client/Alerts/ClientAlertsSystem.cs index 359c8957f9..525ef1f018 100644 --- a/Content.Client/Alerts/ClientAlertsSystem.cs +++ b/Content.Client/Alerts/ClientAlertsSystem.cs @@ -93,6 +93,6 @@ public sealed class ClientAlertsSystem : AlertsSystem public void AlertClicked(ProtoId alertType) { - RaiseNetworkEvent(new ClickAlertEvent(alertType)); + RaisePredictiveEvent(new ClickAlertEvent(alertType)); } } diff --git a/Content.Server/Abilities/Mime/MimePowersSystem.cs b/Content.Server/Abilities/Mime/MimePowersSystem.cs index f3bf6e703f..85230faab0 100644 --- a/Content.Server/Abilities/Mime/MimePowersSystem.cs +++ b/Content.Server/Abilities/Mime/MimePowersSystem.cs @@ -1,4 +1,5 @@ using Content.Server.Popups; +using Content.Shared.Abilities.Mime; using Content.Shared.Actions; using Content.Shared.Actions.Events; using Content.Shared.Alert; @@ -29,6 +30,9 @@ namespace Content.Server.Abilities.Mime base.Initialize(); SubscribeLocalEvent(OnComponentInit); SubscribeLocalEvent(OnInvisibleWall); + + SubscribeLocalEvent(OnBreakVowAlert); + SubscribeLocalEvent(OnRetakeVowAlert); } public override void Update(float frameTime) @@ -99,6 +103,22 @@ namespace Content.Server.Abilities.Mime args.Handled = true; } + private void OnBreakVowAlert(Entity ent, ref BreakVowAlertEvent args) + { + if (args.Handled) + return; + BreakVow(ent, ent); + args.Handled = true; + } + + private void OnRetakeVowAlert(Entity ent, ref RetakeVowAlertEvent args) + { + if (args.Handled) + return; + RetakeVow(ent, ent); + args.Handled = true; + } + /// /// Break this mime's vow to not speak. /// diff --git a/Content.Server/Alert/Click/BreakVow.cs b/Content.Server/Alert/Click/BreakVow.cs deleted file mode 100644 index 400dabbb01..0000000000 --- a/Content.Server/Alert/Click/BreakVow.cs +++ /dev/null @@ -1,22 +0,0 @@ -using Content.Shared.Alert; -using Content.Server.Abilities.Mime; - -namespace Content.Server.Alert.Click -{ - /// - /// Break your mime vows - /// - [DataDefinition] - public sealed partial class BreakVow : IAlertClick - { - public void AlertClicked(EntityUid player) - { - var entManager = IoCManager.Resolve(); - - if (entManager.TryGetComponent(player, out MimePowersComponent? mimePowers)) - { - entManager.System().BreakVow(player, mimePowers); - } - } - } -} diff --git a/Content.Server/Alert/Click/RemoveCuffs.cs b/Content.Server/Alert/Click/RemoveCuffs.cs deleted file mode 100644 index b55484283a..0000000000 --- a/Content.Server/Alert/Click/RemoveCuffs.cs +++ /dev/null @@ -1,21 +0,0 @@ -using Content.Server.Cuffs; -using Content.Shared.Alert; -using JetBrains.Annotations; - -namespace Content.Server.Alert.Click -{ - /// - /// Try to remove handcuffs from yourself - /// - [UsedImplicitly] - [DataDefinition] - public sealed partial class RemoveCuffs : IAlertClick - { - public void AlertClicked(EntityUid player) - { - var entityManager = IoCManager.Resolve(); - var cuffableSys = entityManager.System(); - cuffableSys.TryUncuff(player, player); - } - } -} diff --git a/Content.Server/Alert/Click/RemoveEnsnare.cs b/Content.Server/Alert/Click/RemoveEnsnare.cs deleted file mode 100644 index c33f4ae341..0000000000 --- a/Content.Server/Alert/Click/RemoveEnsnare.cs +++ /dev/null @@ -1,28 +0,0 @@ -using Content.Server.Ensnaring; -using Content.Shared.Alert; -using Content.Shared.Ensnaring.Components; -using JetBrains.Annotations; - -namespace Content.Server.Alert.Click; -[UsedImplicitly] -[DataDefinition] -public sealed partial class RemoveEnsnare : IAlertClick -{ - public void AlertClicked(EntityUid player) - { - var entManager = IoCManager.Resolve(); - if (entManager.TryGetComponent(player, out EnsnareableComponent? ensnareableComponent)) - { - foreach (var ensnare in ensnareableComponent.Container.ContainedEntities) - { - if (!entManager.TryGetComponent(ensnare, out EnsnaringComponent? ensnaringComponent)) - return; - - entManager.EntitySysManager.GetEntitySystem().TryFree(player, player, ensnare, ensnaringComponent); - - // Only one snare at a time. - break; - } - } - } -} diff --git a/Content.Server/Alert/Click/ResistFire.cs b/Content.Server/Alert/Click/ResistFire.cs deleted file mode 100644 index 9ae49c3f45..0000000000 --- a/Content.Server/Alert/Click/ResistFire.cs +++ /dev/null @@ -1,25 +0,0 @@ -using Content.Server.Atmos.Components; -using Content.Server.Atmos.EntitySystems; -using Content.Shared.Alert; -using JetBrains.Annotations; - -namespace Content.Server.Alert.Click -{ - /// - /// Resist fire - /// - [UsedImplicitly] - [DataDefinition] - public sealed partial class ResistFire : IAlertClick - { - public void AlertClicked(EntityUid player) - { - var entManager = IoCManager.Resolve(); - - if (entManager.TryGetComponent(player, out FlammableComponent? flammable)) - { - entManager.System().Resist(player, flammable); - } - } - } -} diff --git a/Content.Server/Alert/Click/RetakeVow.cs b/Content.Server/Alert/Click/RetakeVow.cs deleted file mode 100644 index 1b7a15ea74..0000000000 --- a/Content.Server/Alert/Click/RetakeVow.cs +++ /dev/null @@ -1,22 +0,0 @@ -using Content.Shared.Alert; -using Content.Server.Abilities.Mime; - -namespace Content.Server.Alert.Click -{ - /// - /// Retake your mime vows - /// - [DataDefinition] - public sealed partial class RetakeVow : IAlertClick - { - public void AlertClicked(EntityUid player) - { - var entManager = IoCManager.Resolve(); - - if (entManager.TryGetComponent(player, out MimePowersComponent? mimePowers)) - { - entManager.System().RetakeVow(player, mimePowers); - } - } - } -} diff --git a/Content.Server/Alert/Click/StopBeingPulled.cs b/Content.Server/Alert/Click/StopBeingPulled.cs deleted file mode 100644 index b02da38ecf..0000000000 --- a/Content.Server/Alert/Click/StopBeingPulled.cs +++ /dev/null @@ -1,29 +0,0 @@ -using Content.Shared.ActionBlocker; -using Content.Shared.Alert; -using Content.Shared.Movement.Pulling.Components; -using Content.Shared.Movement.Pulling.Systems; -using JetBrains.Annotations; - -namespace Content.Server.Alert.Click -{ - /// - /// Stop pulling something - /// - [UsedImplicitly] - [DataDefinition] - public sealed partial class StopBeingPulled : IAlertClick - { - public void AlertClicked(EntityUid player) - { - var entityManager = IoCManager.Resolve(); - - if (!entityManager.System().CanInteract(player, null)) - return; - - if (entityManager.TryGetComponent(player, out PullableComponent? playerPullable)) - { - entityManager.System().TryStopPull(player, playerPullable, user: player); - } - } - } -} diff --git a/Content.Server/Alert/Click/StopPiloting.cs b/Content.Server/Alert/Click/StopPiloting.cs deleted file mode 100644 index cd4e333c0a..0000000000 --- a/Content.Server/Alert/Click/StopPiloting.cs +++ /dev/null @@ -1,26 +0,0 @@ -using Content.Server.Shuttles.Systems; -using Content.Shared.Alert; -using Content.Shared.Shuttles.Components; -using JetBrains.Annotations; - -namespace Content.Server.Alert.Click -{ - /// - /// Stop piloting shuttle - /// - [UsedImplicitly] - [DataDefinition] - public sealed partial class StopPiloting : IAlertClick - { - public void AlertClicked(EntityUid player) - { - var entManager = IoCManager.Resolve(); - - if (entManager.TryGetComponent(player, out PilotComponent? pilotComponent) - && pilotComponent.Console != null) - { - entManager.System().RemovePilot(player, pilotComponent); - } - } - } -} diff --git a/Content.Server/Alert/Click/StopPulling.cs b/Content.Server/Alert/Click/StopPulling.cs deleted file mode 100644 index 76f9569429..0000000000 --- a/Content.Server/Alert/Click/StopPulling.cs +++ /dev/null @@ -1,27 +0,0 @@ -using Content.Shared.Alert; -using Content.Shared.Movement.Pulling.Components; -using Content.Shared.Movement.Pulling.Systems; -using JetBrains.Annotations; - -namespace Content.Server.Alert.Click -{ - /// - /// Stop pulling something - /// - [UsedImplicitly] - [DataDefinition] - public sealed partial class StopPulling : IAlertClick - { - public void AlertClicked(EntityUid player) - { - var entManager = IoCManager.Resolve(); - var ps = entManager.System(); - - if (entManager.TryGetComponent(player, out PullerComponent? puller) && - entManager.TryGetComponent(puller.Pulling, out PullableComponent? pullableComp)) - { - ps.TryStopPull(puller.Pulling.Value, pullableComp, user: player); - } - } - } -} diff --git a/Content.Server/Alert/Click/ToggleInternals.cs b/Content.Server/Alert/Click/ToggleInternals.cs deleted file mode 100644 index 523db04df3..0000000000 --- a/Content.Server/Alert/Click/ToggleInternals.cs +++ /dev/null @@ -1,19 +0,0 @@ -using Content.Server.Body.Systems; -using Content.Shared.Alert; -using JetBrains.Annotations; - -namespace Content.Server.Alert.Click; - -/// -/// Attempts to toggle the internals for a particular entity -/// -[UsedImplicitly] -[DataDefinition] -public sealed partial class ToggleInternals : IAlertClick -{ - public void AlertClicked(EntityUid player) - { - var internalsSystem = IoCManager.Resolve().GetEntitySystem(); - internalsSystem.ToggleInternals(player, player, false); - } -} diff --git a/Content.Server/Alert/Click/Unbuckle.cs b/Content.Server/Alert/Click/Unbuckle.cs deleted file mode 100644 index 3e53955d8c..0000000000 --- a/Content.Server/Alert/Click/Unbuckle.cs +++ /dev/null @@ -1,19 +0,0 @@ -using Content.Shared.Alert; -using Content.Shared.Buckle; -using JetBrains.Annotations; - -namespace Content.Server.Alert.Click -{ - /// - /// Unbuckles if player is currently buckled. - /// - [UsedImplicitly] - [DataDefinition] - public sealed partial class Unbuckle : IAlertClick - { - public void AlertClicked(EntityUid player) - { - IoCManager.Resolve().System().TryUnbuckle(player, player); - } - } -} diff --git a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs index dd0ac25d70..cc816a3f10 100644 --- a/Content.Server/Atmos/EntitySystems/FlammableSystem.cs +++ b/Content.Server/Atmos/EntitySystems/FlammableSystem.cs @@ -72,6 +72,7 @@ namespace Content.Server.Atmos.EntitySystems SubscribeLocalEvent(OnIsHot); SubscribeLocalEvent(OnTileFire); SubscribeLocalEvent(OnRejuvenate); + SubscribeLocalEvent(OnResistFireAlert); SubscribeLocalEvent(IgniteOnCollide); SubscribeLocalEvent(OnIgniteLand); @@ -250,6 +251,15 @@ namespace Content.Server.Atmos.EntitySystems Extinguish(uid, component); } + private void OnResistFireAlert(Entity ent, ref ResistFireAlertEvent args) + { + if (args.Handled) + return; + + Resist(ent, ent); + args.Handled = true; + } + public void UpdateAppearance(EntityUid uid, FlammableComponent? flammable = null, AppearanceComponent? appearance = null) { if (!Resolve(uid, ref flammable, ref appearance)) diff --git a/Content.Server/Body/Components/InternalsComponent.cs b/Content.Server/Body/Components/InternalsComponent.cs index ef908f9655..a7edab4a6b 100644 --- a/Content.Server/Body/Components/InternalsComponent.cs +++ b/Content.Server/Body/Components/InternalsComponent.cs @@ -25,4 +25,5 @@ namespace Content.Server.Body.Components [DataField] public ProtoId InternalsAlert = "Internals"; } + } diff --git a/Content.Server/Body/Systems/InternalsSystem.cs b/Content.Server/Body/Systems/InternalsSystem.cs index e352b0a58a..7e86cb6f07 100644 --- a/Content.Server/Body/Systems/InternalsSystem.cs +++ b/Content.Server/Body/Systems/InternalsSystem.cs @@ -38,6 +38,7 @@ public sealed class InternalsSystem : EntitySystem SubscribeLocalEvent(OnInternalsShutdown); SubscribeLocalEvent>(OnGetInteractionVerbs); SubscribeLocalEvent(OnDoAfter); + SubscribeLocalEvent(OnToggleInternalsAlert); SubscribeLocalEvent(OnStartingGear); } @@ -161,6 +162,14 @@ public sealed class InternalsSystem : EntitySystem args.Handled = true; } + private void OnToggleInternalsAlert(Entity ent, ref ToggleInternalsAlertEvent args) + { + if (args.Handled) + return; + ToggleInternals(ent, ent, false, internals: ent.Comp); + args.Handled = true; + } + private void OnInternalsStartup(Entity ent, ref ComponentStartup args) { _alerts.ShowAlert(ent, ent.Comp.InternalsAlert, GetSeverity(ent)); diff --git a/Content.Server/Ensnaring/EnsnareableSystem.Ensnaring.cs b/Content.Server/Ensnaring/EnsnareableSystem.Ensnaring.cs index 51d3242ce4..c9dec3782f 100644 --- a/Content.Server/Ensnaring/EnsnareableSystem.Ensnaring.cs +++ b/Content.Server/Ensnaring/EnsnareableSystem.Ensnaring.cs @@ -28,6 +28,7 @@ public sealed partial class EnsnareableSystem SubscribeLocalEvent(OnStepTrigger); SubscribeLocalEvent(OnThrowHit); SubscribeLocalEvent(OnAttemptPacifiedThrow); + SubscribeLocalEvent(OnRemoveEnsnareAlert); } private void OnAttemptPacifiedThrow(Entity ent, ref AttemptPacifiedThrowEvent args) @@ -35,6 +36,24 @@ public sealed partial class EnsnareableSystem args.Cancel("pacified-cannot-throw-snare"); } + private void OnRemoveEnsnareAlert(Entity ent, ref RemoveEnsnareAlertEvent args) + { + if (args.Handled) + return; + + foreach (var ensnare in ent.Comp.Container.ContainedEntities) + { + if (!TryComp(ensnare, out var ensnaringComponent)) + return; + + TryFree(ent, ent, ensnare, ensnaringComponent); + + args.Handled = true; + // Only one snare at a time. + break; + } + } + private void OnComponentRemove(EntityUid uid, EnsnaringComponent component, ComponentRemove args) { if (!TryComp(component.Ensnared, out var ensnared)) diff --git a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs index 7a19fd13b2..00a913aad8 100644 --- a/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs +++ b/Content.Server/Shuttles/Systems/ShuttleConsoleSystem.cs @@ -71,6 +71,7 @@ public sealed partial class ShuttleConsoleSystem : SharedShuttleConsoleSystem SubscribeLocalEvent(OnUndock); SubscribeLocalEvent(OnGetState); + SubscribeLocalEvent(OnStopPilotingAlert); SubscribeLocalEvent(OnFtlDestStartup); SubscribeLocalEvent(OnFtlDestShutdown); @@ -196,6 +197,14 @@ public sealed partial class ShuttleConsoleSystem : SharedShuttleConsoleSystem args.State = new PilotComponentState(GetNetEntity(component.Console)); } + private void OnStopPilotingAlert(Entity ent, ref StopPilotingAlertEvent args) + { + if (ent.Comp.Console != null) + { + RemovePilot(ent, ent); + } + } + /// /// Returns the position and angle of all dockingcomponents. /// diff --git a/Content.Shared/Abilities/Mime/MimePowers.cs b/Content.Shared/Abilities/Mime/MimePowers.cs new file mode 100644 index 0000000000..969d7a1395 --- /dev/null +++ b/Content.Shared/Abilities/Mime/MimePowers.cs @@ -0,0 +1,7 @@ +using Content.Shared.Alert; + +namespace Content.Shared.Abilities.Mime; + +public sealed partial class BreakVowAlertEvent : BaseAlertEvent; + +public sealed partial class RetakeVowAlertEvent : BaseAlertEvent; diff --git a/Content.Shared/Alert/AlertPrototype.cs b/Content.Shared/Alert/AlertPrototype.cs index f53da27c0d..a82cbd3daf 100644 --- a/Content.Shared/Alert/AlertPrototype.cs +++ b/Content.Shared/Alert/AlertPrototype.cs @@ -76,11 +76,11 @@ public sealed partial class AlertPrototype : IPrototype public bool SupportsSeverity => MaxSeverity != -1; /// - /// Defines what to do when the alert is clicked. - /// This will always be null on clientside. + /// Event raised on the user when they click on this alert. + /// Can be null. /// - [DataField(serverOnly: true)] - public IAlertClick? OnClick { get; private set; } + [DataField] + public BaseAlertEvent? ClickEvent; /// severity level, if supported by this alert /// the icon path to the texture for the provided severity level @@ -114,3 +114,17 @@ public sealed partial class AlertPrototype : IPrototype return Icons[severity.Value - _minSeverity]; } } + +[ImplicitDataDefinitionForInheritors] +public abstract partial class BaseAlertEvent : HandledEntityEventArgs +{ + public EntityUid User; + + public ProtoId AlertId; + + protected BaseAlertEvent(EntityUid user, ProtoId alertId) + { + User = user; + AlertId = alertId; + } +} diff --git a/Content.Shared/Alert/AlertsSystem.cs b/Content.Shared/Alert/AlertsSystem.cs index 83c6fcd0dd..c8f2a8e6bc 100644 --- a/Content.Shared/Alert/AlertsSystem.cs +++ b/Content.Shared/Alert/AlertsSystem.cs @@ -195,7 +195,7 @@ public abstract class AlertsSystem : EntitySystem SubscribeLocalEvent(OnAutoRemoveUnPaused); - SubscribeNetworkEvent(HandleClickAlert); + SubscribeAllEvent(HandleClickAlert); SubscribeLocalEvent(HandlePrototypesReloaded); LoadPrototypes(); } @@ -328,7 +328,20 @@ public abstract class AlertsSystem : EntitySystem return; } - alert.OnClick?.AlertClicked(player.Value); + ActivateAlert(player.Value, alert); + } + + public bool ActivateAlert(EntityUid user, AlertPrototype alert) + { + if (alert.ClickEvent is not { } clickEvent) + return false; + + clickEvent.Handled = false; + clickEvent.User = user; + clickEvent.AlertId = alert.ID; + + RaiseLocalEvent(user, (object) clickEvent, true); + return clickEvent.Handled; } private void OnPlayerAttached(EntityUid uid, AlertsComponent component, PlayerAttachedEvent args) diff --git a/Content.Shared/Alert/IAlertClick.cs b/Content.Shared/Alert/IAlertClick.cs deleted file mode 100644 index c11fc10c0d..0000000000 --- a/Content.Shared/Alert/IAlertClick.cs +++ /dev/null @@ -1,14 +0,0 @@ -namespace Content.Shared.Alert -{ - /// - /// Defines what should happen when an alert is clicked. - /// - public interface IAlertClick - { - /// - /// Invoked on server side when user clicks an alert. - /// - /// - void AlertClicked(EntityUid player); - } -} diff --git a/Content.Shared/Atmos/Components/ExtinguishOnInteractComponent.cs b/Content.Shared/Atmos/Components/ExtinguishOnInteractComponent.cs index 02c1e3eb26..cd3ecdd1c4 100644 --- a/Content.Shared/Atmos/Components/ExtinguishOnInteractComponent.cs +++ b/Content.Shared/Atmos/Components/ExtinguishOnInteractComponent.cs @@ -1,3 +1,4 @@ +using Content.Shared.Alert; using Robust.Shared.Audio; namespace Content.Shared.Atmos.Components; @@ -27,3 +28,5 @@ public sealed partial class ExtinguishOnInteractComponent : Component [DataField] public LocId ExtinguishFailed = "candle-extinguish-failed"; } + +public sealed partial class ResistFireAlertEvent : BaseAlertEvent; diff --git a/Content.Shared/Buckle/Components/BuckleComponent.cs b/Content.Shared/Buckle/Components/BuckleComponent.cs index ee86e6d4de..c4810e8af0 100644 --- a/Content.Shared/Buckle/Components/BuckleComponent.cs +++ b/Content.Shared/Buckle/Components/BuckleComponent.cs @@ -1,4 +1,5 @@ using System.Diagnostics.CodeAnalysis; +using Content.Shared.Alert; using Content.Shared.Interaction; using Robust.Shared.GameStates; using Robust.Shared.Serialization; @@ -79,6 +80,7 @@ public sealed class BuckleState(NetEntity? buckledTo, bool dontCollide, TimeSpan public readonly TimeSpan? BuckleTime = buckleTime; } +public sealed partial class UnbuckleAlertEvent : BaseAlertEvent; /// /// Event raised directed at a strap entity before some entity gets buckled to it. diff --git a/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs b/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs index 0fbfd51d69..4f91a29ebe 100644 --- a/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs +++ b/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs @@ -41,6 +41,7 @@ public abstract partial class SharedBuckleSystem SubscribeLocalEvent(OnPullAttempt); SubscribeLocalEvent(OnBeingPulledAttempt); SubscribeLocalEvent(OnPullStarted); + SubscribeLocalEvent(OnUnbuckleAlert); SubscribeLocalEvent(OnBuckleInsertIntoEntityStorageAttempt); @@ -86,6 +87,13 @@ public abstract partial class SharedBuckleSystem Unbuckle(ent!, args.PullerUid); } + private void OnUnbuckleAlert(Entity ent, ref UnbuckleAlertEvent args) + { + if (args.Handled) + return; + args.Handled = TryUnbuckle(ent, ent, ent); + } + #endregion #region Transform diff --git a/Content.Shared/Cuffs/Components/CuffableComponent.cs b/Content.Shared/Cuffs/Components/CuffableComponent.cs index 4ddfe1b53e..a7eba34d8c 100644 --- a/Content.Shared/Cuffs/Components/CuffableComponent.cs +++ b/Content.Shared/Cuffs/Components/CuffableComponent.cs @@ -46,6 +46,8 @@ public sealed partial class CuffableComponent : Component public ProtoId CuffedAlert = "Handcuffed"; } +public sealed partial class RemoveCuffsAlertEvent : BaseAlertEvent; + [Serializable, NetSerializable] public sealed class CuffableComponentState : ComponentState { diff --git a/Content.Shared/Cuffs/SharedCuffableSystem.cs b/Content.Shared/Cuffs/SharedCuffableSystem.cs index 8889e0c971..d4cadcdbb8 100644 --- a/Content.Shared/Cuffs/SharedCuffableSystem.cs +++ b/Content.Shared/Cuffs/SharedCuffableSystem.cs @@ -66,6 +66,7 @@ namespace Content.Shared.Cuffs SubscribeLocalEvent(OnRejuvenate); SubscribeLocalEvent(OnStartup); SubscribeLocalEvent(HandleStopPull); + SubscribeLocalEvent(OnRemoveCuffsAlert); SubscribeLocalEvent(HandleMoveAttempt); SubscribeLocalEvent(OnEquipAttempt); SubscribeLocalEvent(OnUnequipAttempt); @@ -248,6 +249,14 @@ namespace Content.Shared.Cuffs args.Cancelled = true; } + private void OnRemoveCuffsAlert(Entity ent, ref RemoveCuffsAlertEvent args) + { + if (args.Handled) + return; + TryUncuff(ent, ent, cuffable: ent.Comp); + args.Handled = true; + } + private void AddUncuffVerb(EntityUid uid, CuffableComponent component, GetVerbsEvent args) { // Can the user access the cuffs, and is there even anything to uncuff? diff --git a/Content.Shared/Ensnaring/Components/EnsnareableComponent.cs b/Content.Shared/Ensnaring/Components/EnsnareableComponent.cs index 2536fac4ed..cd7824bb96 100644 --- a/Content.Shared/Ensnaring/Components/EnsnareableComponent.cs +++ b/Content.Shared/Ensnaring/Components/EnsnareableComponent.cs @@ -47,6 +47,8 @@ public sealed partial class EnsnareableComponent : Component public ProtoId EnsnaredAlert = "Ensnared"; } +public sealed partial class RemoveEnsnareAlertEvent : BaseAlertEvent; + [Serializable, NetSerializable] public sealed class EnsnareableComponentState : ComponentState { diff --git a/Content.Shared/Internals/InternalsDoAfterEvent.cs b/Content.Shared/Internals/InternalsDoAfterEvent.cs index 13b6087ec0..9c0174b4fd 100644 --- a/Content.Shared/Internals/InternalsDoAfterEvent.cs +++ b/Content.Shared/Internals/InternalsDoAfterEvent.cs @@ -1,4 +1,5 @@ -using Content.Shared.DoAfter; +using Content.Shared.Alert; +using Content.Shared.DoAfter; using Robust.Shared.Serialization; namespace Content.Shared.Internals; @@ -7,3 +8,5 @@ namespace Content.Shared.Internals; public sealed partial class InternalsDoAfterEvent : SimpleDoAfterEvent { } + +public sealed partial class ToggleInternalsAlertEvent : BaseAlertEvent; diff --git a/Content.Shared/Movement/Pulling/Components/PullableComponent.cs b/Content.Shared/Movement/Pulling/Components/PullableComponent.cs index 100cd9d6d3..aa44669fd1 100644 --- a/Content.Shared/Movement/Pulling/Components/PullableComponent.cs +++ b/Content.Shared/Movement/Pulling/Components/PullableComponent.cs @@ -42,3 +42,5 @@ public sealed partial class PullableComponent : Component [DataField] public ProtoId PulledAlert = "Pulled"; } + +public sealed partial class StopBeingPulledAlertEvent : BaseAlertEvent; diff --git a/Content.Shared/Movement/Pulling/Components/PullerComponent.cs b/Content.Shared/Movement/Pulling/Components/PullerComponent.cs index 32e4d9b1f3..197d7cfd7c 100644 --- a/Content.Shared/Movement/Pulling/Components/PullerComponent.cs +++ b/Content.Shared/Movement/Pulling/Components/PullerComponent.cs @@ -44,3 +44,5 @@ public sealed partial class PullerComponent : Component [DataField] public ProtoId PullingAlert = "Pulling"; } + +public sealed partial class StopPullingAlertEvent : BaseAlertEvent; diff --git a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs index 557c316e26..b5fc694833 100644 --- a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs +++ b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs @@ -58,6 +58,7 @@ public sealed class PullingSystem : EntitySystem SubscribeLocalEvent>(AddPullVerbs); SubscribeLocalEvent(OnPullableContainerInsert); SubscribeLocalEvent(OnModifyUncuffDuration); + SubscribeLocalEvent(OnStopBeingPulledAlert); SubscribeLocalEvent(OnAfterState); SubscribeLocalEvent(OnPullerContainerInsert); @@ -65,6 +66,7 @@ public sealed class PullingSystem : EntitySystem SubscribeLocalEvent(OnVirtualItemDeleted); SubscribeLocalEvent(OnRefreshMovespeed); SubscribeLocalEvent(OnDropHandItems); + SubscribeLocalEvent(OnStopPullingAlert); SubscribeLocalEvent(OnBuckled); SubscribeLocalEvent(OnGotBuckled); @@ -105,6 +107,15 @@ public sealed class PullingSystem : EntitySystem TryStopPull(pullerComp.Pulling.Value, pullableComp, uid); } + private void OnStopPullingAlert(Entity ent, ref StopPullingAlertEvent args) + { + if (args.Handled) + return; + if (!TryComp(ent.Comp.Pulling, out var pullable)) + return; + args.Handled = TryStopPull(ent.Comp.Pulling.Value, pullable, ent); + } + private void OnPullerContainerInsert(Entity ent, ref EntGotInsertedIntoContainerMessage args) { if (ent.Comp.Pulling == null) @@ -133,6 +144,14 @@ public sealed class PullingSystem : EntitySystem args.Duration *= 2; } + private void OnStopBeingPulledAlert(Entity ent, ref StopBeingPulledAlertEvent args) + { + if (args.Handled) + return; + + args.Handled = TryStopPull(ent, ent, ent); + } + public override void Shutdown() { base.Shutdown(); @@ -491,6 +510,9 @@ public sealed class PullingSystem : EntitySystem if (pullerUidNull == null) return true; + if (user != null && !_blocker.CanInteract(user.Value, pullableUid)) + return false; + var msg = new AttemptStopPullingEvent(user); RaiseLocalEvent(pullableUid, msg, true); diff --git a/Content.Shared/Shuttles/Components/PilotComponent.cs b/Content.Shared/Shuttles/Components/PilotComponent.cs index cb42db4436..8823d309c3 100644 --- a/Content.Shared/Shuttles/Components/PilotComponent.cs +++ b/Content.Shared/Shuttles/Components/PilotComponent.cs @@ -39,4 +39,6 @@ namespace Content.Shared.Shuttles.Components public override bool SendOnlyToOwner => true; } + + public sealed partial class StopPilotingAlertEvent : BaseAlertEvent; } diff --git a/Resources/Prototypes/Alerts/alerts.yml b/Resources/Prototypes/Alerts/alerts.yml index c08453460f..ff66f2586b 100644 --- a/Resources/Prototypes/Alerts/alerts.yml +++ b/Resources/Prototypes/Alerts/alerts.yml @@ -87,7 +87,7 @@ - type: alert id: Fire icons: [ /Textures/Interface/Alerts/Fire/fire.png ] - onClick: !type:ResistFire { } + clickEvent: !type:ResistFireAlertEvent name: alerts-on-fire-name description: alerts-on-fire-desc @@ -136,14 +136,14 @@ - type: alert id: Handcuffed - onClick: !type:RemoveCuffs { } + clickEvent: !type:RemoveCuffsAlertEvent icons: [ /Textures/Interface/Alerts/Handcuffed/Handcuffed.png ] name: alerts-handcuffed-name description: alerts-handcuffed-desc - type: alert id: Ensnared - onClick: !type:RemoveEnsnare { } + clickEvent: !type:RemoveEnsnareAlertEvent icons: - sprite: /Textures/Interface/Alerts/ensnared.rsi state: ensnared @@ -153,7 +153,7 @@ - type: alert id: Buckled category: Buckled - onClick: !type:Unbuckle { } + clickEvent: !type:UnbuckleAlertEvent icons: [ /Textures/Interface/Alerts/Buckle/buckled.png ] name: alerts-buckled-name description: alerts-buckled-desc @@ -275,7 +275,7 @@ - type: alert id: Internals category: Internals - onClick: !type:ToggleInternals {} + clickEvent: !type:ToggleInternalsAlertEvent icons: - sprite: /Textures/Interface/Alerts/internals.rsi state: internal0 @@ -291,7 +291,7 @@ - type: alert id: PilotingShuttle category: Piloting - onClick: !type:StopPiloting { } + clickEvent: !type:StopPilotingAlertEvent icons: [ /Textures/Interface/Alerts/piloting.png ] name: alerts-piloting-name description: alerts-piloting-desc @@ -365,27 +365,27 @@ id: VowOfSilence icons: [ /Textures/Interface/Alerts/Abilities/silenced.png ] name: alerts-vow-silence-name - onClick: !type:BreakVow { } + clickEvent: !type:BreakVowAlertEvent description: alerts-vow-silence-desc - type: alert id: VowBroken icons: [ /Textures/Interface/Actions/scream.png ] name: alerts-vow-broken-name - onClick: !type:RetakeVow { } + clickEvent: !type:RetakeVowAlertEvent description: alerts-vow-broken-desc - type: alert id: Pulled icons: [ /Textures/Interface/Alerts/Pull/pulled.png ] - onClick: !type:StopBeingPulled { } + clickEvent: !type:StopBeingPulledAlertEvent name: alerts-pulled-name description: alerts-pulled-desc - type: alert id: Pulling icons: [ /Textures/Interface/Alerts/Pull/pulling.png ] - onClick: !type:StopPulling { } + clickEvent: !type:StopPullingAlertEvent name: alerts-pulling-name description: alerts-pulling-desc From 7dc6a569692ee159acc80191fbe6aa2bbfeb077f Mon Sep 17 00:00:00 2001 From: Lye <128915833+Lyroth001@users.noreply.github.com> Date: Wed, 7 Aug 2024 08:42:00 +0100 Subject: [PATCH 233/422] Space Dragons can't be flashed (#30658) * added flash immunity component to Space Dragon * Changed use of component to use of whitelist --- Resources/Prototypes/Entities/Mobs/Player/dragon.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml index 73246dcced..ff6b66323f 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/dragon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/dragon.yml @@ -96,6 +96,16 @@ - type: Flammable damage: types: {} + - type: StatusEffects # Overwriting basesimplemob to remove flash, getting flashed as dragon just feelsbad + allowed: + - SlowedDown + - Stutter + - Electrocution + - ForcedSleep + - TemporaryBlindness + - Pacified + - RadiationProtection + - Drowsiness - type: Temperature heatDamageThreshold: 800 - type: Metabolizer From c61384122b0bcb69e4da1d54036d3786a19af8c0 Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 7 Aug 2024 07:43:07 +0000 Subject: [PATCH 234/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 7e2e9234c3..4556182328 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: ShadowCommander - changes: - - message: Lizards now stop tail pulling when they are downed. - type: Fix - id: 6553 - time: '2024-05-08T06:49:28.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27796 - author: Plykiya changes: - message: Re-added supplybots. @@ -3780,3 +3773,10 @@ id: 7052 time: '2024-08-07T03:41:40.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30702 +- author: Lyroth001 + changes: + - message: Dragons are immune to flashes + type: Tweak + id: 7053 + time: '2024-08-07T07:42:00.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30658 From d10fa77372ccea37994e713c872221026f62d4dd Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Wed, 7 Aug 2024 02:49:17 -0600 Subject: [PATCH 235/422] bagel update (#30730) big gas miners --- Resources/Maps/bagel.yml | 7296 +++++++++++++++++++------------------- 1 file changed, 3626 insertions(+), 3670 deletions(-) diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml index fa707fc965..09e40b30ce 100644 --- a/Resources/Maps/bagel.yml +++ b/Resources/Maps/bagel.yml @@ -473,98 +473,98 @@ entities: color: '#FFFFFFFF' id: Arrows decals: - 806: 54,25 - 807: 52,25 - 808: 46,25 - 809: 44,25 - 913: -51,14 - 2759: 4,-39 - 3192: 53,14 - 3257: 5,-35 + 803: 54,25 + 804: 52,25 + 805: 46,25 + 806: 44,25 + 910: -51,14 + 2735: 4,-39 + 3143: 53,14 + 3207: 5,-35 - node: angle: -1.5707963267948966 rad color: '#FFFFFFFF' id: Arrows decals: - 395: -4,13 - 396: -4,14 - 397: -4,15 - 398: -4,16 - 561: 49,-1 - 704: 41,6 - 1045: -3,-64 - 1046: -3,-71 - 3074: -19,29 - 3076: -4,18 - 3077: -4,19 - 3333: -40,32 - 3334: -40,34 - 3335: -40,36 - 3336: -40,38 - 3337: -40,40 - 3338: -40,42 - 3339: -40,44 - 3341: -36,30 - 3762: -39,-8 - 3808: 8,43 - 3809: 8,51 + 392: -4,13 + 393: -4,14 + 394: -4,15 + 395: -4,16 + 558: 49,-1 + 701: 41,6 + 1042: -3,-64 + 1043: -3,-71 + 3044: -19,29 + 3046: -4,18 + 3047: -4,19 + 3283: -40,32 + 3284: -40,34 + 3285: -40,36 + 3286: -40,38 + 3287: -40,40 + 3288: -40,42 + 3289: -40,44 + 3291: -36,30 + 3690: -39,-8 + 3736: 8,43 + 3737: 8,51 - node: color: '#FFFFFFFF' id: Arrows decals: - 725: -30,36 - 1273: -56,1 - 1683: -9,-21 - 3075: -11,27 + 722: -30,36 + 1270: -56,1 + 1663: -9,-21 + 3045: -11,27 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' id: Arrows decals: - 560: 49,3 - 751: -62,40 - 1047: 3,-71 - 1048: 3,-64 - 3340: -36,31 - 3351: -26,38 - 3759: 47,-23 - 3763: -40,-4 - 3806: -8,51 - 3807: -8,43 + 557: 49,3 + 748: -62,40 + 1044: 3,-71 + 1045: 3,-64 + 3290: -36,31 + 3301: -26,38 + 3687: 47,-23 + 3691: -40,-4 + 3734: -8,51 + 3735: -8,43 - node: color: '#FFFFFFFF' id: ArrowsGreyscale decals: - 573: 23,17 + 570: 23,17 - node: cleanable: True color: '#FFFFFFFF' id: ArrowsGreyscale decals: - 2790: 9,-41 + 2766: 9,-41 - node: cleanable: True color: '#8932B8FF' id: Blasto decals: - 2427: -46.09135,-29.907255 + 2403: -46.09135,-29.907255 - node: color: '#DE3A3A96' id: Bot decals: - 3342: -20,41 - 3345: -13,39 + 3292: -20,41 + 3295: -13,39 - node: angle: -1.5707963267948966 rad color: '#FFFFFFFF' id: Bot decals: - 3810: -7,46 - 3811: -7,47 - 3812: -7,48 - 3813: 7,46 - 3814: 7,47 - 3815: 7,48 + 3738: -7,46 + 3739: -7,47 + 3740: -7,48 + 3741: 7,46 + 3742: 7,47 + 3743: 7,48 - node: color: '#FFFFFFFF' id: Bot @@ -574,1620 +574,1620 @@ entities: 147: 6,-26 184: -2,-45 185: 12,11 - 361: -37,1 - 403: -27,35 - 404: -28,35 - 405: -29,35 - 406: -29,36 - 407: -28,36 - 408: -27,36 - 505: -15,-10 - 506: -32,26 - 569: 22,18 - 570: 22,19 - 571: 20,18 - 572: 20,19 - 705: -9,-38 - 731: -31,34 - 732: -31,35 - 733: -105,17 - 734: -119,17 - 735: -98,17 - 803: 54,26 - 804: 52,26 - 805: 46,26 - 914: 44,26 - 1044: -4,-69 - 1069: -26,2 - 1224: -52,13 - 1225: -50,13 - 1234: -55,16 - 1235: -56,16 - 1267: -58,-4 - 1268: -57,-4 - 1269: -56,-4 - 1320: 54,8 - 1321: 53,8 - 1322: 52,8 - 1323: 54,10 - 1324: 53,10 - 1325: 52,10 - 1328: 54,12 - 1329: 53,12 - 1330: 52,12 - 1377: 6,-20 - 1489: 30,-23 - 1519: -48,16 - 1520: -47,17 - 1711: -25,-6 - 1820: -19,27 - 1839: -27,32 - 1840: -28,32 - 1841: -23,32 - 1842: -21,32 - 1974: -33,12 - 1975: -33,14 - 1978: -41,14 - 1994: -40,-6 - 2001: -41,-10 - 2019: -42,-8 - 2029: -57,7 - 2030: -57,14 - 2031: -44,-4 - 2079: -40,-20 - 2161: -11,32 - 2162: -13,32 - 2237: 3,15 - 2264: -5,21 - 2265: -5,20 - 2344: 17,28 - 2345: 47,14 - 2346: 47,-2 - 2347: 19,-21 - 2363: 2,-1 - 2369: 3,-8 - 2373: -20,5 - 2374: -19,5 - 2378: -13,11 - 2387: -42,19 - 2388: -42,20 - 2389: 30,9 - 2390: 36,4 - 2537: 20,16 - 2538: 19,16 - 2773: 4,-35 - 2801: -31,-19 - 2802: -6,-27 - 2803: 3,-28 - 2848: 45,-27 - 2849: 37,-25 - 2850: 32,-21 - 2851: 50,-32 - 2880: 19,26 - 2915: 29,-27 - 2923: 45,10 - 3242: -25,32 - 3243: -29,32 - 3244: -30,32 - 3256: 6,-35 - 3266: 4,-38 - 3267: 6,-38 - 3493: 39,-13 - 3539: 45,-9 - 3672: -17,-54 - 3835: 2,27 - 3877: 44,0 - 3878: 44,1 - 3879: 45,0 - 3880: 45,1 - 3881: 47,17 - 3882: 47,18 + 358: -37,1 + 400: -27,35 + 401: -28,35 + 402: -29,35 + 403: -29,36 + 404: -28,36 + 405: -27,36 + 502: -15,-10 + 503: -32,26 + 566: 22,18 + 567: 22,19 + 568: 20,18 + 569: 20,19 + 702: -9,-38 + 728: -31,34 + 729: -31,35 + 730: -105,17 + 731: -119,17 + 732: -98,17 + 800: 54,26 + 801: 52,26 + 802: 46,26 + 911: 44,26 + 1041: -4,-69 + 1066: -26,2 + 1221: -52,13 + 1222: -50,13 + 1231: -55,16 + 1232: -56,16 + 1264: -58,-4 + 1265: -57,-4 + 1266: -56,-4 + 1317: 54,8 + 1318: 53,8 + 1319: 52,8 + 1320: 54,10 + 1321: 53,10 + 1322: 52,10 + 1325: 54,12 + 1326: 53,12 + 1327: 52,12 + 1374: 6,-20 + 1486: 30,-23 + 1516: -48,16 + 1517: -47,17 + 1691: -25,-6 + 1800: -19,27 + 1817: -27,32 + 1818: -28,32 + 1819: -23,32 + 1820: -21,32 + 1952: -33,12 + 1953: -33,14 + 1956: -41,14 + 1972: -40,-6 + 1979: -41,-10 + 1997: -42,-8 + 2007: -57,7 + 2008: -57,14 + 2009: -44,-4 + 2057: -40,-20 + 2139: -11,32 + 2140: -13,32 + 2213: 3,15 + 2240: -5,21 + 2241: -5,20 + 2320: 17,28 + 2321: 47,14 + 2322: 47,-2 + 2323: 19,-21 + 2339: 2,-1 + 2345: 3,-8 + 2349: -20,5 + 2350: -19,5 + 2354: -13,11 + 2363: -42,19 + 2364: -42,20 + 2365: 30,9 + 2366: 36,4 + 2513: 20,16 + 2514: 19,16 + 2749: 4,-35 + 2777: -31,-19 + 2778: -6,-27 + 2779: 3,-28 + 2818: 45,-27 + 2819: 37,-25 + 2820: 32,-21 + 2821: 50,-32 + 2850: 19,26 + 2885: 29,-27 + 2893: 45,10 + 3192: -25,32 + 3193: -29,32 + 3194: -30,32 + 3206: 6,-35 + 3216: 4,-38 + 3217: 6,-38 + 3443: 39,-13 + 3485: 45,-9 + 3600: -17,-54 + 3763: 2,27 + 3805: 44,0 + 3806: 44,1 + 3807: 45,0 + 3808: 45,1 + 3809: 47,17 + 3810: 47,18 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' id: Bot decals: - 3760: 51,-24 - 3761: 47,-21 + 3688: 51,-24 + 3689: 47,-21 - node: color: '#52B4E996' id: BotGreyscale decals: - 3343: -21,41 - 3344: -14,39 - 3743: 49,-9 - 3744: 48,-9 + 3293: -21,41 + 3294: -14,39 + 3671: 49,-9 + 3672: 48,-9 - node: color: '#DE3A3AFF' id: BotLeft decals: - 2799: -33,-21 + 2775: -33,-21 - node: color: '#FFFFFFFF' id: BotLeft decals: - 1270: -52,-1 - 1271: -52,-2 - 1272: -52,-3 - 1993: -40,-5 - 2002: -43,-11 - 2274: 2,28 - 2275: 2,29 - 2276: 6,23 - 2277: 7,23 - 2278: 8,23 - 2771: 4,-37 - 3254: 6,-36 - 3349: -19,46 - 3745: 50,-11 - 3828: -25,-1 - 3829: -25,0 + 1267: -52,-1 + 1268: -52,-2 + 1269: -52,-3 + 1971: -40,-5 + 1980: -43,-11 + 2250: 2,28 + 2251: 2,29 + 2252: 6,23 + 2253: 7,23 + 2254: 8,23 + 2747: 4,-37 + 3204: 6,-36 + 3299: -19,46 + 3673: 50,-11 + 3756: -25,-1 + 3757: -25,0 - node: color: '#FFFFFFFF' id: BotLeftGreyscale decals: - 2409: 39,-6 + 2385: 39,-6 - node: color: '#DE3A3AFF' id: BotRight decals: - 2796: -35,-17 - 2797: -35,-18 - 2798: -35,-19 - 2800: -35,-20 + 2772: -35,-17 + 2773: -35,-18 + 2774: -35,-19 + 2776: -35,-20 - node: color: '#FFFFFFFF' id: BotRight decals: - 2260: -5,13 - 2261: -5,14 - 2262: -5,15 - 2263: -5,16 - 2266: -5,19 - 2267: -5,18 - 2268: 5,13 - 2772: 4,-36 - 3255: 6,-37 - 3350: -15,46 - 3394: -35,5 + 2236: -5,13 + 2237: -5,14 + 2238: -5,15 + 2239: -5,16 + 2242: -5,19 + 2243: -5,18 + 2244: 5,13 + 2748: 4,-36 + 3205: 6,-37 + 3300: -15,46 + 3344: -35,5 - node: color: '#FF8FC9FF' id: BotRightGreyscale decals: - 2074: -45,7 + 2052: -45,7 - node: color: '#FFFFFFFF' id: BotRightGreyscale decals: - 3831: -29,-1 - 3832: -29,0 - 3833: -29,1 - 3846: 7,34 - 3847: 7,35 - 3848: 7,36 - 3849: 8,36 - 3850: 8,34 - 3851: 8,35 + 3759: -29,-1 + 3760: -29,0 + 3761: -29,1 + 3774: 7,34 + 3775: 7,35 + 3776: 7,36 + 3777: 8,36 + 3778: 8,34 + 3779: 8,35 - node: color: '#79150096' id: Box decals: - 1910: -24,-12 - 1911: -24,-13 + 1888: -24,-12 + 1889: -24,-13 - node: color: '#9FED5896' id: Box decals: - 1909: -30,-8 + 1887: -30,-8 - node: color: '#EFB341FF' id: Box decals: - 1907: -30,-13 + 1885: -30,-13 - node: color: '#FFFFFFFF' id: Box decals: - 1594: 53,24 - 1595: 45,24 - 1596: 38,6 - 1597: 38,10 - 2034: -26,0 - 2035: -28,0 + 1591: 53,24 + 1592: 45,24 + 1593: 38,6 + 1594: 38,10 + 2012: -26,0 + 2013: -28,0 - node: color: '#52B4E996' id: BoxGreyscale decals: - 1908: -30,-12 + 1886: -30,-12 - node: color: '#DE3A3A96' id: BoxGreyscale decals: - 1681: -9,-21 + 1661: -9,-21 - node: color: '#FFFFFFFF' id: BoxGreyscale decals: - 3347: -24,45 - 3348: -23,46 + 3297: -24,45 + 3298: -23,46 - node: color: '#FFFFFFFF' id: BrickTileDarkBox decals: - 1274: -53,-2 - 1275: -55,-2 - 1276: -57,-2 - 3268: -49,-7 - 3269: -49,-5 - 3270: -49,-3 - 3271: -49,-1 - 3272: -49,3 - 3273: -51,3 - 3274: -53,3 - 3275: -55,3 - 3276: -47,12 - 3277: -49,12 - 3278: -51,12 + 1271: -53,-2 + 1272: -55,-2 + 1273: -57,-2 + 3218: -49,-7 + 3219: -49,-5 + 3220: -49,-3 + 3221: -49,-1 + 3222: -49,3 + 3223: -51,3 + 3224: -53,3 + 3225: -55,3 + 3226: -47,12 + 3227: -49,12 + 3228: -51,12 - node: color: '#FFFFFFFF' id: BrickTileDarkCornerNe decals: - 2375: -13,13 - 2384: -19,18 - 3035: 25,1 + 2351: -13,13 + 2360: -19,18 + 3005: 25,1 - node: color: '#FFFFFFFF' id: BrickTileDarkCornerNw decals: - 2381: -21,18 - 3036: 21,1 + 2357: -21,18 + 3006: 21,1 - node: color: '#FFFFFFFF' id: BrickTileDarkCornerSe decals: - 2376: -13,11 - 2382: -19,17 - 2971: -110,9 - 2982: -115,12 - 3324: 37,17 + 2352: -13,11 + 2358: -19,17 + 2941: -110,9 + 2952: -115,12 + 3274: 37,17 - node: color: '#FFFFFFFF' id: BrickTileDarkCornerSw decals: - 2383: -21,17 - 2968: -114,9 - 2987: -109,12 - 3323: 35,17 + 2359: -21,17 + 2938: -114,9 + 2957: -109,12 + 3273: 35,17 - node: color: '#FFFFFFFF' id: BrickTileDarkEndN decals: - 3039: 23,2 + 3009: 23,2 - node: color: '#FFFFFFFF' id: BrickTileDarkEndS decals: - 3033: 21,0 - 3034: 25,0 - 3040: 23,-1 + 3003: 21,0 + 3004: 25,0 + 3010: 23,-1 - node: color: '#FFFFFFFF' id: BrickTileDarkInnerNe decals: - 2379: -14,13 - 2979: -114,9 - 3050: 23,1 + 2355: -14,13 + 2949: -114,9 + 3020: 23,1 - node: color: '#FFFFFFFF' id: BrickTileDarkInnerNw decals: - 2978: -110,9 - 3051: 23,1 + 2948: -110,9 + 3021: 23,1 - node: color: '#FFFFFFFF' id: BrickTileDarkInnerSe decals: - 2380: -14,11 - 3038: 21,1 - 3049: 23,1 - 3845: 6,37 + 2356: -14,11 + 3008: 21,1 + 3019: 23,1 + 3773: 6,37 - node: color: '#FFFFFFFF' id: BrickTileDarkInnerSw decals: - 3037: 25,1 - 3048: 23,1 + 3007: 25,1 + 3018: 23,1 - node: color: '#FFFFFFFF' id: BrickTileDarkLineE decals: - 2377: -13,12 - 2974: -110,10 - 2975: -114,10 - 2989: -115,13 - 3041: 23,0 - 3325: 37,18 - 3842: 6,34 - 3843: 6,35 - 3844: 6,36 + 2353: -13,12 + 2944: -110,10 + 2945: -114,10 + 2959: -115,13 + 3011: 23,0 + 3275: 37,18 + 3770: 6,34 + 3771: 6,35 + 3772: 6,36 - node: color: '#FFFFFFFF' id: BrickTileDarkLineN decals: - 2386: -20,18 - 2976: -111,9 - 2977: -113,9 - 2980: -115,10 - 2981: -109,10 - 2983: -111,10 - 2984: -113,10 - 3046: 22,1 - 3047: 24,1 - 3211: 37,15 - 3212: 36,15 - 3213: 35,15 - 3214: 34,15 + 2362: -20,18 + 2946: -111,9 + 2947: -113,9 + 2950: -115,10 + 2951: -109,10 + 2953: -111,10 + 2954: -113,10 + 3016: 22,1 + 3017: 24,1 + 3161: 37,15 + 3162: 36,15 + 3163: 35,15 + 3164: 34,15 - node: color: '#FFFFFFFF' id: BrickTileDarkLineS decals: - 2385: -20,17 - 2969: -113,9 - 2970: -111,9 - 2985: -111,12 - 2986: -113,12 - 3044: 24,1 - 3045: 22,1 - 3322: 36,17 + 2361: -20,17 + 2939: -113,9 + 2940: -111,9 + 2955: -111,12 + 2956: -113,12 + 3014: 24,1 + 3015: 22,1 + 3272: 36,17 - node: color: '#FFFFFFFF' id: BrickTileDarkLineW decals: - 2972: -114,10 - 2973: -110,10 - 2988: -109,13 - 3042: 23,0 + 2942: -114,10 + 2943: -110,10 + 2958: -109,13 + 3012: 23,0 - node: color: '#FFFFFFFF' id: BrickTileSteelBox decals: - 1407: -38,24 - 1408: -36,24 - 1409: -34,24 - 1410: -26,24 - 1411: -28,24 - 1412: -30,24 - 2933: -24,24 - 2934: -22,24 - 2935: -20,24 - 2936: -18,24 - 2937: -16,24 - 2938: -40,24 + 1404: -38,24 + 1405: -36,24 + 1406: -34,24 + 1407: -26,24 + 1408: -28,24 + 1409: -30,24 + 2903: -24,24 + 2904: -22,24 + 2905: -20,24 + 2906: -18,24 + 2907: -16,24 + 2908: -40,24 - node: color: '#52B4E996' id: BrickTileSteelCornerNe decals: - 1900: -34,-10 - 2047: -20,-5 - 2048: -20,-5 - 3753: 51,-22 + 1878: -34,-10 + 2025: -20,-5 + 2026: -20,-5 + 3681: 51,-22 - node: color: '#9FED5896' id: BrickTileSteelCornerNe decals: - 1532: -3,-26 - 1897: -34,-7 + 1529: -3,-26 + 1875: -34,-7 - node: color: '#D381C996' id: BrickTileSteelCornerNe decals: - 1230: -45,14 - 1919: -50,5 - 1929: -45,0 - 1964: -42,-4 - 2011: -40,12 + 1227: -45,14 + 1897: -50,5 + 1907: -45,0 + 1942: -42,-4 + 1989: -40,12 - node: color: '#DE3A3A96' id: BrickTileSteelCornerNe decals: - 1737: -19,-16 - 1887: -19,-10 - 1888: -19,-13 - 2734: -8,-45 + 1717: -19,-16 + 1865: -19,-10 + 1866: -19,-13 + 2710: -8,-45 - node: color: '#52B4E996' id: BrickTileSteelCornerNw decals: - 1899: -35,-10 - 2049: -19,-5 - 2050: -19,-5 - 3747: 47,-22 + 1877: -35,-10 + 2027: -19,-5 + 2028: -19,-5 + 3675: 47,-22 - node: color: '#9FED5896' id: BrickTileSteelCornerNw decals: - 1534: -5,-26 - 1535: -8,-27 - 1898: -35,-7 + 1531: -5,-26 + 1532: -8,-27 + 1876: -35,-7 - node: color: '#D381C996' id: BrickTileSteelCornerNw decals: - 1133: -52,5 - 1960: -46,-4 - 2012: -43,12 + 1130: -52,5 + 1938: -46,-4 + 1990: -43,12 - node: color: '#DE3A3A96' id: BrickTileSteelCornerNw decals: - 1738: -21,-16 - 1889: -20,-10 - 1890: -20,-13 - 2735: -9,-45 + 1718: -21,-16 + 1867: -20,-10 + 1868: -20,-13 + 2711: -9,-45 - node: color: '#52B4E996' id: BrickTileSteelCornerSe decals: - 1902: -34,-11 - 2053: -20,-4 - 2054: -20,-4 - 3751: 51,-24 + 1880: -34,-11 + 2031: -20,-4 + 2032: -20,-4 + 3679: 51,-24 - node: color: '#9FED5896' id: BrickTileSteelCornerSe decals: - 1895: -34,-8 + 1873: -34,-8 - node: color: '#D381C996' id: BrickTileSteelCornerSe decals: - 1254: -52,-7 - 1930: -45,-2 - 1939: -48,-9 - 1967: -42,-9 - 2014: -40,11 - 2033: -44,-11 + 1251: -52,-7 + 1908: -45,-2 + 1917: -48,-9 + 1945: -42,-9 + 1992: -40,11 + 2011: -44,-11 - node: color: '#DE3A3A96' id: BrickTileSteelCornerSe decals: - 1740: -19,-17 - 1893: -19,-14 - 1894: -19,-11 + 1720: -19,-17 + 1871: -19,-14 + 1872: -19,-11 - node: color: '#52B4E996' id: BrickTileSteelCornerSw decals: - 1901: -35,-11 - 2051: -19,-4 - 2052: -19,-4 - 3752: 47,-24 + 1879: -35,-11 + 2029: -19,-4 + 2030: -19,-4 + 3680: 47,-24 - node: color: '#9FED5896' id: BrickTileSteelCornerSw decals: - 1896: -35,-8 + 1874: -35,-8 - node: color: '#D381C996' id: BrickTileSteelCornerSw decals: - 1244: -58,-3 - 1251: -55,-7 - 1280: -60,1 - 1940: -50,-9 - 1954: -46,-11 - 2013: -43,11 + 1241: -58,-3 + 1248: -55,-7 + 1277: -60,1 + 1918: -50,-9 + 1932: -46,-11 + 1991: -43,11 - node: color: '#DE3A3A96' id: BrickTileSteelCornerSw decals: - 1739: -21,-17 - 1891: -20,-14 - 1892: -20,-11 + 1719: -21,-17 + 1869: -20,-14 + 1870: -20,-11 - node: color: '#D381C996' id: BrickTileSteelInnerNe decals: - 911: -51,14 - 1920: -50,4 - 1926: -48,0 + 908: -51,14 + 1898: -50,4 + 1904: -48,0 - node: color: '#FFFFFFFF' id: BrickTileSteelInnerNe decals: - 3799: -2,-71 + 3727: -2,-71 - node: color: '#52B4E996' id: BrickTileSteelInnerNw decals: - 3492: 41,-15 + 3442: 41,-15 - node: color: '#9FED5896' id: BrickTileSteelInnerNw decals: - 1536: -5,-27 + 1533: -5,-27 - node: color: '#D381C996' id: BrickTileSteelInnerNw decals: - 910: -51,14 - 1134: -52,4 + 907: -51,14 + 1131: -52,4 - node: color: '#FFFFFFFF' id: BrickTileSteelInnerNw decals: - 3798: 2,-71 + 3726: 2,-71 - node: color: '#D381C996' id: BrickTileSteelInnerSe decals: - 1925: -48,2 - 1933: -48,-2 - 1969: -44,-9 + 1903: -48,2 + 1911: -48,-2 + 1947: -44,-9 - node: color: '#FFFFFFFF' id: BrickTileSteelInnerSe decals: - 3791: -2,-64 + 3719: -2,-64 - node: color: '#D381C996' id: BrickTileSteelInnerSw decals: - 1247: -55,-3 + 1244: -55,-3 - node: color: '#FFFFFFFF' id: BrickTileSteelInnerSw decals: - 3790: 2,-64 + 3718: 2,-64 - node: color: '#52B4E996' id: BrickTileSteelLineE decals: - 3754: 51,-23 + 3682: 51,-23 - node: color: '#9FED5896' id: BrickTileSteelLineE decals: - 1529: -3,-29 - 1530: -3,-28 - 1531: -3,-27 + 1526: -3,-29 + 1527: -3,-28 + 1528: -3,-27 - node: color: '#D381C996' id: BrickTileSteelLineE decals: - 1255: -52,-6 - 1256: -52,-5 - 1257: -52,-4 - 1258: -52,-3 - 1259: -52,-2 - 1266: -52,-1 - 1934: -48,-4 - 1935: -48,-3 - 1936: -48,-5 - 1937: -48,-7 - 1938: -48,-8 - 1965: -42,-7 - 1966: -42,-8 - 1970: -44,-10 + 1252: -52,-6 + 1253: -52,-5 + 1254: -52,-4 + 1255: -52,-3 + 1256: -52,-2 + 1263: -52,-1 + 1912: -48,-4 + 1913: -48,-3 + 1914: -48,-5 + 1915: -48,-7 + 1916: -48,-8 + 1943: -42,-7 + 1944: -42,-8 + 1948: -44,-10 - node: color: '#DE3A3A96' id: BrickTileSteelLineE decals: - 2736: -8,-46 + 2712: -8,-46 - node: color: '#FFFFFFFF' id: BrickTileSteelLineE decals: - 3778: -2,-70 - 3779: -2,-69 - 3780: -2,-68 - 3781: -2,-67 - 3782: -2,-66 - 3783: -2,-65 + 3706: -2,-70 + 3707: -2,-69 + 3708: -2,-68 + 3709: -2,-67 + 3710: -2,-66 + 3711: -2,-65 - node: color: '#52B4E996' id: BrickTileSteelLineN decals: - 3489: 40,-15 - 3490: 39,-15 - 3491: 38,-15 - 3748: 49,-22 - 3749: 48,-22 - 3758: 50,-22 + 3439: 40,-15 + 3440: 39,-15 + 3441: 38,-15 + 3676: 49,-22 + 3677: 48,-22 + 3686: 50,-22 - node: color: '#9FED5896' id: BrickTileSteelLineN decals: - 1533: -4,-26 - 1537: -6,-27 - 1538: -7,-27 + 1530: -4,-26 + 1534: -6,-27 + 1535: -7,-27 - node: color: '#D381C996' id: BrickTileSteelLineN decals: - 908: -50,14 - 909: -52,14 - 1135: -53,4 - 1226: -49,14 - 1227: -48,14 - 1228: -47,14 - 1260: -55,-1 - 1261: -57,-1 - 1921: -49,4 - 1922: -48,4 - 1923: -47,4 - 1927: -47,0 - 1928: -46,0 - 1961: -45,-4 - 1962: -44,-4 - 1963: -43,-4 + 905: -50,14 + 906: -52,14 + 1132: -53,4 + 1223: -49,14 + 1224: -48,14 + 1225: -47,14 + 1257: -55,-1 + 1258: -57,-1 + 1899: -49,4 + 1900: -48,4 + 1901: -47,4 + 1905: -47,0 + 1906: -46,0 + 1939: -45,-4 + 1940: -44,-4 + 1941: -43,-4 - node: color: '#DE3A3A96' id: BrickTileSteelLineN decals: - 1662: -8,-18 - 1663: -9,-18 - 1670: -6,-18 - 1741: -20,-16 + 1643: -8,-18 + 1644: -9,-18 + 1650: -6,-18 + 1721: -20,-16 - node: color: '#FFFFFFFF' id: BrickTileSteelLineN decals: - 3795: 1,-71 - 3796: 0,-71 - 3797: -1,-71 + 3723: 1,-71 + 3724: 0,-71 + 3725: -1,-71 - node: color: '#52B4E996' id: BrickTileSteelLineS decals: - 3755: 48,-24 - 3756: 49,-24 - 3757: 50,-24 + 3683: 48,-24 + 3684: 49,-24 + 3685: 50,-24 - node: color: '#D381C996' id: BrickTileSteelLineS decals: - 902: -46,11 - 903: -47,11 - 904: -48,11 - 905: -49,11 - 906: -50,11 - 907: -52,11 - 1239: -55,2 - 1245: -57,-3 - 1246: -56,-3 - 1252: -54,-7 - 1253: -53,-7 - 1279: -59,1 - 1924: -47,2 - 1931: -46,-2 - 1932: -47,-2 - 1968: -43,-9 - 2015: -41,11 - 2016: -42,11 - 2032: -45,-11 + 899: -46,11 + 900: -47,11 + 901: -48,11 + 902: -49,11 + 903: -50,11 + 904: -52,11 + 1236: -55,2 + 1242: -57,-3 + 1243: -56,-3 + 1249: -54,-7 + 1250: -53,-7 + 1276: -59,1 + 1902: -47,2 + 1909: -46,-2 + 1910: -47,-2 + 1946: -43,-9 + 1993: -41,11 + 1994: -42,11 + 2010: -45,-11 - node: color: '#DE3A3A96' id: BrickTileSteelLineS decals: - 1664: -6,-19 - 1665: -7,-19 - 1666: -8,-19 - 1742: -20,-17 + 1645: -6,-19 + 1646: -7,-19 + 1647: -8,-19 + 1722: -20,-17 - node: color: '#FFFFFFFF' id: BrickTileSteelLineS decals: - 3650: -15,-53 - 3792: 1,-64 - 3793: 0,-64 - 3794: -1,-64 + 3578: -15,-53 + 3720: 1,-64 + 3721: 0,-64 + 3722: -1,-64 - node: color: '#52B4E996' id: BrickTileSteelLineW decals: - 3487: 41,-13 - 3488: 41,-14 - 3750: 47,-23 + 3437: 41,-13 + 3438: 41,-14 + 3678: 47,-23 - node: color: '#9FED5896' id: BrickTileSteelLineW decals: - 1527: -8,-29 - 1528: -8,-28 + 1524: -8,-29 + 1525: -8,-28 - node: color: '#D381C996' id: BrickTileSteelLineW decals: - 1248: -55,-4 - 1249: -55,-5 - 1250: -55,-6 - 1277: -58,-2 - 1281: -60,2 - 1941: -50,-8 - 1942: -50,-7 - 1943: -50,-6 - 1944: -50,-5 - 1945: -50,-4 - 1946: -50,-3 - 1947: -50,-2 - 1948: -50,-1 - 1949: -50,0 - 1955: -46,-10 - 1956: -46,-9 - 1957: -46,-8 - 1958: -46,-7 - 1959: -46,-5 - 2071: -45,7 - 2072: -45,8 - 2073: -45,9 + 1245: -55,-4 + 1246: -55,-5 + 1247: -55,-6 + 1274: -58,-2 + 1278: -60,2 + 1919: -50,-8 + 1920: -50,-7 + 1921: -50,-6 + 1922: -50,-5 + 1923: -50,-4 + 1924: -50,-3 + 1925: -50,-2 + 1926: -50,-1 + 1927: -50,0 + 1933: -46,-10 + 1934: -46,-9 + 1935: -46,-8 + 1936: -46,-7 + 1937: -46,-5 + 2049: -45,7 + 2050: -45,8 + 2051: -45,9 - node: color: '#DE3A3A96' id: BrickTileSteelLineW decals: - 2737: -9,-46 + 2713: -9,-46 - node: color: '#FFFFFFFF' id: BrickTileSteelLineW decals: - 815: 18,12 - 3784: 2,-70 - 3785: 2,-69 - 3786: 2,-68 - 3787: 2,-67 - 3788: 2,-66 - 3789: 2,-65 + 812: 18,12 + 3712: 2,-70 + 3713: 2,-69 + 3714: 2,-68 + 3715: 2,-67 + 3716: 2,-66 + 3717: 2,-65 - node: color: '#334E6DC8' id: BrickTileWhiteBox decals: - 3026: 21,-1 + 2996: 21,-1 - node: color: '#52B4E996' id: BrickTileWhiteBox decals: - 3030: 22,2 + 3000: 22,2 - node: color: '#9FED5896' id: BrickTileWhiteBox decals: - 3028: 22,0 + 2998: 22,0 - node: color: '#A4610696' id: BrickTileWhiteBox decals: - 3032: 25,2 + 3002: 25,2 - node: color: '#D381C996' id: BrickTileWhiteBox decals: - 3031: 21,2 + 3001: 21,2 - node: color: '#D4D4D496' id: BrickTileWhiteBox decals: - 3029: 24,0 + 2999: 24,0 - node: color: '#DE3A3A96' id: BrickTileWhiteBox decals: - 3027: 25,-1 + 2997: 25,-1 - node: color: '#EFB34196' id: BrickTileWhiteBox decals: - 3043: 24,2 + 3013: 24,2 - node: color: '#334E6DC8' id: BrickTileWhiteCornerNe decals: - 2743: 8,-28 - 2764: 5,-39 + 2719: 8,-28 + 2740: 5,-39 - node: color: '#52B4E996' id: BrickTileWhiteCornerNe decals: - 3506: 30,-17 - 3507: 30,-20 - 3521: 45,-9 - 3730: 49,-10 + 3452: 30,-17 + 3453: 30,-20 + 3467: 45,-9 + 3658: 49,-10 - node: color: '#79150096' id: BrickTileWhiteCornerNe decals: - 2064: -41,-20 - 3395: -33,4 - 3397: -31,1 + 2042: -41,-20 + 3345: -33,4 + 3347: -31,1 - node: color: '#B02E26FF' id: BrickTileWhiteCornerNe decals: - 2727: -4,-45 + 2703: -4,-45 - node: color: '#D381C996' id: BrickTileWhiteCornerNe decals: - 2028: -54,7 + 2006: -54,7 - node: color: '#DE3A3A96' id: BrickTileWhiteCornerNe decals: - 1718: -24,-19 + 1698: -24,-19 - node: color: '#EFB34141' id: BrickTileWhiteCornerNe decals: - 1903: -34,-13 + 1881: -34,-13 - node: color: '#EFD54193' id: BrickTileWhiteCornerNe decals: - 3287: 24,21 + 3237: 24,21 - node: color: '#EFD54196' id: BrickTileWhiteCornerNe decals: - 1810: -21,32 - 1832: -25,32 + 1790: -21,32 + 1812: -25,32 - node: color: '#EFD84196' id: BrickTileWhiteCornerNe decals: - 1849: -15,29 + 1827: -15,29 - node: color: '#FFFFFFFF' id: BrickTileWhiteCornerNe decals: - 762: 40,-28 + 759: 40,-28 - node: color: '#334E6DC8' id: BrickTileWhiteCornerNw decals: - 2744: 3,-28 - 2763: 3,-39 + 2720: 3,-28 + 2739: 3,-39 - node: color: '#52B4E996' id: BrickTileWhiteCornerNw decals: - 3508: 29,-17 - 3509: 29,-20 - 3520: 43,-9 - 3729: 47,-10 + 3454: 29,-17 + 3455: 29,-20 + 3466: 43,-9 + 3657: 47,-10 - node: color: '#79150096' id: BrickTileWhiteCornerNw decals: - 2065: -47,-20 - 3396: -35,4 + 2043: -47,-20 + 3346: -35,4 - node: color: '#B02E26FF' id: BrickTileWhiteCornerNw decals: - 2730: -6,-45 + 2706: -6,-45 - node: color: '#D381C996' id: BrickTileWhiteCornerNw decals: - 1232: -47,16 - 2027: -56,7 + 1229: -47,16 + 2005: -56,7 - node: color: '#DE3A3A96' id: BrickTileWhiteCornerNw decals: - 1717: -31,-19 + 1697: -31,-19 - node: color: '#EFB34141' id: BrickTileWhiteCornerNw decals: - 1904: -35,-13 + 1882: -35,-13 - node: color: '#EFCC4196' id: BrickTileWhiteCornerNw decals: - 2156: -13,32 + 2134: -13,32 - node: color: '#EFD54193' id: BrickTileWhiteCornerNw decals: - 3286: 19,21 + 3236: 19,21 - node: color: '#EFD54196' id: BrickTileWhiteCornerNw decals: - 1811: -23,32 - 1831: -31,32 + 1791: -23,32 + 1811: -31,32 - node: color: '#FFFFFFFF' id: BrickTileWhiteCornerNw decals: - 760: 38,-28 - 821: 19,14 - 2372: -4,-10 + 757: 38,-28 + 818: 19,14 + 2348: -4,-10 - node: color: '#334E6DC8' id: BrickTileWhiteCornerSe decals: - 2750: 5,-33 - 2756: 8,-30 - 2760: 5,-40 + 2726: 5,-33 + 2732: 8,-30 + 2736: 5,-40 - node: color: '#52B4E996' id: BrickTileWhiteCornerSe decals: - 3510: 30,-21 - 3511: 30,-18 - 3733: 49,-15 + 3456: 30,-21 + 3457: 30,-18 + 3661: 49,-15 - node: color: '#79150096' id: BrickTileWhiteCornerSe decals: - 2066: -41,-22 - 3398: -31,-1 + 2044: -41,-22 + 3348: -31,-1 - node: color: '#DE3A3A96' id: BrickTileWhiteCornerSe decals: - 1719: -24,-21 + 1699: -24,-21 - node: color: '#EFB34141' id: BrickTileWhiteCornerSe decals: - 1905: -34,-14 + 1883: -34,-14 - node: color: '#EFD54193' id: BrickTileWhiteCornerSe decals: - 3288: 24,17 + 3238: 24,17 - node: color: '#EFD54196' id: BrickTileWhiteCornerSe decals: - 1808: -15,27 + 1788: -15,27 - node: color: '#FFFFFFFF' id: BrickTileWhiteCornerSe decals: - 761: 40,-32 - 820: 20,11 + 758: 40,-32 + 817: 20,11 - node: color: '#334E6DC8' id: BrickTileWhiteCornerSw decals: - 2748: 3,-33 - 2762: 3,-40 + 2724: 3,-33 + 2738: 3,-40 - node: color: '#52B4E996' id: BrickTileWhiteCornerSw decals: - 3512: 29,-18 - 3513: 29,-21 - 3731: 47,-11 - 3732: 48,-15 + 3458: 29,-18 + 3459: 29,-21 + 3659: 47,-11 + 3660: 48,-15 - node: color: '#79150096' id: BrickTileWhiteCornerSw decals: - 2067: -47,-22 - 3399: -35,-1 + 2045: -47,-22 + 3349: -35,-1 - node: color: '#DE3A3A96' id: BrickTileWhiteCornerSw decals: - 1720: -31,-21 + 1700: -31,-21 - node: color: '#EFB34141' id: BrickTileWhiteCornerSw decals: - 1906: -35,-14 + 1884: -35,-14 - node: color: '#EFCC4196' id: BrickTileWhiteCornerSw decals: - 2152: -13,27 - 2172: -5,23 + 2130: -13,27 + 2150: -5,23 - node: color: '#EFD54193' id: BrickTileWhiteCornerSw decals: - 3289: 19,17 + 3239: 19,17 - node: color: '#EFD54196' id: BrickTileWhiteCornerSw decals: - 1813: -23,28 - 1817: -19,27 + 1793: -23,28 + 1797: -19,27 - node: color: '#FFFFFFFF' id: BrickTileWhiteCornerSw decals: - 759: 38,-32 - 819: 19,11 - 3415: -4,-11 + 756: 38,-32 + 816: 19,11 + 3365: -4,-11 - node: color: '#79150096' id: BrickTileWhiteInnerNe decals: - 3404: -33,1 + 3354: -33,1 - node: color: '#DE3A3A96' id: BrickTileWhiteInnerNe decals: - 1715: -29,-14 - 1758: -22,-23 + 1695: -29,-14 + 1738: -22,-23 - node: color: '#EFCC4196' id: BrickTileWhiteInnerNe decals: - 2150: -3,23 - 2295: -3,21 + 2128: -3,23 + 2271: -3,21 - node: color: '#EFD84196' id: BrickTileWhiteInnerNe decals: - 1855: -21,29 + 1833: -21,29 - node: color: '#DE3A3A96' id: BrickTileWhiteInnerNw decals: - 1706: -31,-6 - 1716: -25,-14 - 1756: -18,-23 - 1757: -17,-22 + 1686: -31,-6 + 1696: -25,-14 + 1736: -18,-23 + 1737: -17,-22 - node: color: '#EFCC4196' id: BrickTileWhiteInnerNw decals: - 2294: -4,21 + 2270: -4,21 - node: color: '#334E6DC8' id: BrickTileWhiteInnerSe decals: - 2753: 5,-30 + 2729: 5,-30 - node: color: '#DE3A3A96' id: BrickTileWhiteInnerSe decals: - 1710: -29,-6 - 1884: -31,-17 + 1690: -29,-6 + 1862: -31,-17 - node: color: '#EFCC4196' id: BrickTileWhiteInnerSe decals: - 2175: -3,23 - 2273: -3,27 + 2153: -3,23 + 2249: -3,27 - node: color: '#52B4E996' id: BrickTileWhiteInnerSw decals: - 3742: 48,-11 + 3670: 48,-11 - node: color: '#DE3A3A96' id: BrickTileWhiteInnerSw decals: - 1709: -25,-6 + 1689: -25,-6 - node: color: '#EFCC4196' id: BrickTileWhiteInnerSw decals: - 2169: -5,27 - 2174: -4,23 + 2147: -5,27 + 2152: -4,23 - node: color: '#EFD54196' id: BrickTileWhiteInnerSw decals: - 1816: -19,28 + 1796: -19,28 - node: color: '#334E6DC8' id: BrickTileWhiteLineE decals: - 2751: 5,-32 - 2752: 5,-31 - 2757: 8,-29 + 2727: 5,-32 + 2728: 5,-31 + 2733: 8,-29 - node: color: '#52B4E996' id: BrickTileWhiteLineE decals: - 2854: 45,-25 - 2855: 45,-24 - 2856: 45,-23 - 2857: 45,-21 - 2858: 45,-20 - 2861: 45,-19 - 2862: 45,-18 - 2863: 45,-17 - 3522: 45,-11 - 3523: 45,-12 - 3524: 45,-13 - 3525: 45,-15 - 3727: 45,-14 - 3734: 49,-14 - 3735: 49,-13 - 3736: 49,-12 - 3737: 49,-11 + 2824: 45,-25 + 2825: 45,-24 + 2826: 45,-23 + 2827: 45,-21 + 2828: 45,-20 + 2831: 45,-19 + 2832: 45,-18 + 2833: 45,-17 + 3468: 45,-11 + 3469: 45,-12 + 3470: 45,-13 + 3471: 45,-15 + 3655: 45,-14 + 3662: 49,-14 + 3663: 49,-13 + 3664: 49,-12 + 3665: 49,-11 - node: color: '#79150096' id: BrickTileWhiteLineE decals: - 3403: -31,0 - 3410: -33,3 - 3411: -33,2 + 3353: -31,0 + 3360: -33,3 + 3361: -33,2 - node: color: '#B02E26FF' id: BrickTileWhiteLineE decals: - 2728: -4,-46 + 2704: -4,-46 - node: color: '#DE3A3A96' id: BrickTileWhiteLineE decals: - 854: -33,-21 - 855: -33,-19 - 856: -33,-18 - 857: -33,-16 - 1691: -22,-6 - 1692: -22,-5 - 1731: -24,-20 + 851: -33,-21 + 852: -33,-19 + 853: -33,-18 + 854: -33,-16 + 1671: -22,-6 + 1672: -22,-5 + 1711: -24,-20 - node: color: '#EFCC4196' id: BrickTileWhiteLineE decals: - 2148: -3,24 - 2149: -3,25 + 2126: -3,24 + 2127: -3,25 - node: color: '#EFD54193' id: BrickTileWhiteLineE decals: - 3290: 24,18 - 3291: 24,19 - 3292: 24,20 + 3240: 24,18 + 3241: 24,19 + 3242: 24,20 - node: color: '#EFD54196' id: BrickTileWhiteLineE decals: - 1809: -21,31 + 1789: -21,31 - node: color: '#EFD84196' id: BrickTileWhiteLineE decals: - 1856: -21,30 + 1834: -21,30 - node: color: '#FFFFFFFF' id: BrickTileWhiteLineE decals: - 767: 40,-31 - 768: 40,-30 - 769: 40,-29 - 817: 20,12 - 818: 20,13 + 764: 40,-31 + 765: 40,-30 + 766: 40,-29 + 814: 20,12 + 815: 20,13 - node: color: '#334E6DC8' id: BrickTileWhiteLineN decals: - 2740: 4,-28 - 2741: 5,-28 - 2742: 6,-28 - 3263: 7,-38 - 3264: 5,-38 - 3265: 3,-38 + 2716: 4,-28 + 2717: 5,-28 + 2718: 6,-28 + 3213: 7,-38 + 3214: 5,-38 + 3215: 3,-38 - node: color: '#52B4E996' id: BrickTileWhiteLineN decals: - 3738: 48,-10 + 3666: 48,-10 - node: color: '#79150096' id: BrickTileWhiteLineN decals: - 2060: -42,-20 - 2061: -43,-20 - 2062: -45,-20 - 2063: -46,-20 - 3409: -34,4 - 3412: -32,1 + 2038: -42,-20 + 2039: -43,-20 + 2040: -45,-20 + 2041: -46,-20 + 3359: -34,4 + 3362: -32,1 - node: color: '#B02E26FF' id: BrickTileWhiteLineN decals: - 2731: -5,-45 + 2707: -5,-45 - node: color: '#D381C996' id: BrickTileWhiteLineN decals: - 1233: -46,16 - 2026: -55,7 + 1230: -46,16 + 2004: -55,7 - node: color: '#DE3A3A96' id: BrickTileWhiteLineN decals: - 1695: -23,-3 - 1696: -24,-3 - 1697: -25,-3 - 1698: -26,-3 - 1699: -28,-3 - 1700: -29,-3 - 1701: -30,-3 - 1712: -26,-14 - 1713: -27,-14 - 1714: -28,-14 - 1727: -25,-19 - 1728: -27,-19 - 1729: -29,-19 - 1730: -30,-19 - 1750: -19,-23 - 1751: -20,-23 - 1752: -21,-23 + 1675: -23,-3 + 1676: -24,-3 + 1677: -25,-3 + 1678: -26,-3 + 1679: -28,-3 + 1680: -29,-3 + 1681: -30,-3 + 1692: -26,-14 + 1693: -27,-14 + 1694: -28,-14 + 1707: -25,-19 + 1708: -27,-19 + 1709: -29,-19 + 1710: -30,-19 + 1730: -19,-23 + 1731: -20,-23 + 1732: -21,-23 - node: color: '#EFB3414A' id: BrickTileWhiteLineN decals: - 3065: 22,5 - 3066: 24,5 + 3035: 22,5 + 3036: 24,5 - node: color: '#EFCC4196' id: BrickTileWhiteLineN decals: - 2143: 2,23 - 2144: 1,23 - 2145: 0,23 - 2146: -1,23 - 2147: -2,23 - 2157: -11,32 + 2121: 2,23 + 2122: 1,23 + 2123: 0,23 + 2124: -1,23 + 2125: -2,23 + 2135: -11,32 - node: color: '#EFD54193' id: BrickTileWhiteLineN decals: - 3298: 20,21 - 3299: 21,21 - 3300: 22,21 - 3301: 23,21 + 3248: 20,21 + 3249: 21,21 + 3250: 22,21 + 3251: 23,21 - node: color: '#EFD54196' id: BrickTileWhiteLineN decals: - 1834: -27,32 - 1835: -28,32 - 1836: -29,32 - 1837: -30,32 + 1813: -27,32 + 1814: -28,32 + 1815: -29,32 + 1816: -30,32 - node: color: '#EFD5692E' id: BrickTileWhiteLineN decals: - 2569: 39,-35 - 2570: 40,-35 - 2571: 41,-35 + 2545: 39,-35 + 2546: 40,-35 + 2547: 41,-35 - node: color: '#EFD84196' id: BrickTileWhiteLineN decals: - 1850: -16,29 - 1851: -18,29 - 1852: -17,29 - 1853: -19,29 - 1854: -20,29 + 1828: -16,29 + 1829: -18,29 + 1830: -17,29 + 1831: -19,29 + 1832: -20,29 - node: color: '#FFFFFFFF' id: BrickTileWhiteLineN decals: - 770: 39,-28 + 767: 39,-28 - node: color: '#334E6DC8' id: BrickTileWhiteLineS decals: - 2354: 3,-1 - 2355: 2,-1 - 2356: 1,-1 - 2357: -1,-1 - 2358: -2,-1 - 2359: -3,-1 - 2749: 4,-33 - 2754: 6,-30 - 2755: 7,-30 - 2761: 4,-40 - 3260: 7,-35 - 3261: 5,-35 - 3262: 3,-35 + 2330: 3,-1 + 2331: 2,-1 + 2332: 1,-1 + 2333: -1,-1 + 2334: -2,-1 + 2335: -3,-1 + 2725: 4,-33 + 2730: 6,-30 + 2731: 7,-30 + 2737: 4,-40 + 3210: 7,-35 + 3211: 5,-35 + 3212: 3,-35 - node: color: '#79150096' id: BrickTileWhiteLineS decals: - 2055: -42,-22 - 2056: -43,-22 - 2057: -44,-22 - 2058: -45,-22 - 2059: -46,-22 - 3400: -34,-1 - 3401: -33,-1 - 3402: -32,-1 + 2033: -42,-22 + 2034: -43,-22 + 2035: -44,-22 + 2036: -45,-22 + 2037: -46,-22 + 3350: -34,-1 + 3351: -33,-1 + 3352: -32,-1 - node: color: '#D381C925' id: BrickTileWhiteLineS decals: - 811: -44,6 + 808: -44,6 - node: color: '#D381C996' id: BrickTileWhiteLineS decals: - 2022: -54,14 - 2023: -55,14 - 2024: -56,14 - 2025: -57,14 + 2000: -54,14 + 2001: -55,14 + 2002: -56,14 + 2003: -57,14 - node: color: '#DE3A3A96' id: BrickTileWhiteLineS decals: - 1707: -26,-6 - 1708: -28,-6 - 1721: -30,-21 - 1722: -29,-21 - 1723: -28,-21 - 1724: -27,-21 - 1725: -26,-21 - 1726: -25,-21 - 1878: -23,-17 - 1879: -24,-17 - 1880: -25,-17 - 1881: -27,-17 - 1882: -29,-17 - 1883: -30,-17 + 1687: -26,-6 + 1688: -28,-6 + 1701: -30,-21 + 1702: -29,-21 + 1703: -28,-21 + 1704: -27,-21 + 1705: -26,-21 + 1706: -25,-21 + 1856: -23,-17 + 1857: -24,-17 + 1858: -25,-17 + 1859: -27,-17 + 1860: -29,-17 + 1861: -30,-17 - node: color: '#EFCC4196' id: BrickTileWhiteLineS decals: - 2138: 2,23 - 2139: 1,23 - 2140: 0,23 - 2141: -1,23 - 2142: -2,23 - 2151: -11,27 - 2163: -10,27 - 2164: -9,27 - 2165: -8,27 - 2166: -7,27 - 2167: -6,27 - 2269: 1,27 - 2270: 0,27 - 2271: -1,27 - 2272: -2,27 + 2116: 2,23 + 2117: 1,23 + 2118: 0,23 + 2119: -1,23 + 2120: -2,23 + 2129: -11,27 + 2141: -10,27 + 2142: -9,27 + 2143: -8,27 + 2144: -7,27 + 2145: -6,27 + 2245: 1,27 + 2246: 0,27 + 2247: -1,27 + 2248: -2,27 - node: color: '#EFD54193' id: BrickTileWhiteLineS decals: - 3293: 22,17 - 3294: 21,17 - 3295: 20,17 + 3243: 22,17 + 3244: 21,17 + 3245: 20,17 - node: color: '#EFD54196' id: BrickTileWhiteLineS decals: - 1814: -21,28 - 1815: -20,28 - 1818: -17,27 - 1819: -16,27 + 1794: -21,28 + 1795: -20,28 + 1798: -17,27 + 1799: -16,27 - node: color: '#FFFFFFFF' id: BrickTileWhiteLineS decals: - 763: 39,-32 - 794: -3,-9 - 2370: -3,-11 - 2371: -4,-11 + 760: 39,-32 + 791: -3,-9 + 2346: -3,-11 + 2347: -4,-11 - node: color: '#334E6DC8' id: BrickTileWhiteLineW decals: - 2745: 3,-29 - 2746: 3,-31 - 2747: 3,-32 + 2721: 3,-29 + 2722: 3,-31 + 2723: 3,-32 - node: color: '#52B4E996' id: BrickTileWhiteLineW decals: - 2852: 43,-22 - 2853: 43,-23 - 3279: 43,-25 - 3494: 43,-21 - 3495: 43,-20 - 3496: 43,-18 - 3497: 43,-17 - 3516: 43,-15 - 3517: 43,-13 - 3518: 43,-12 - 3519: 43,-11 - 3739: 48,-12 - 3740: 48,-13 - 3741: 48,-14 + 2822: 43,-22 + 2823: 43,-23 + 3229: 43,-25 + 3444: 43,-21 + 3445: 43,-20 + 3446: 43,-18 + 3447: 43,-17 + 3462: 43,-15 + 3463: 43,-13 + 3464: 43,-12 + 3465: 43,-11 + 3667: 48,-12 + 3668: 48,-13 + 3669: 48,-14 - node: color: '#79150096' id: BrickTileWhiteLineW decals: - 3405: -35,0 - 3406: -35,1 - 3407: -35,2 - 3408: -35,3 + 3355: -35,0 + 3356: -35,1 + 3357: -35,2 + 3358: -35,3 - node: color: '#B02E26FF' id: BrickTileWhiteLineW decals: - 2729: -6,-46 + 2705: -6,-46 - node: color: '#D381C996' id: BrickTileWhiteLineW decals: - 1231: -47,15 + 1228: -47,15 - node: color: '#DE3A3A96' id: BrickTileWhiteLineW decals: - 848: -35,-21 - 849: -35,-20 - 850: -35,-19 - 851: -35,-18 - 852: -35,-17 - 853: -35,-16 - 1705: -31,-5 - 1753: -17,-21 - 1754: -17,-20 - 1755: -17,-19 - 1875: -21,-20 - 1876: -21,-22 + 845: -35,-21 + 846: -35,-20 + 847: -35,-19 + 848: -35,-18 + 849: -35,-17 + 850: -35,-16 + 1685: -31,-5 + 1733: -17,-21 + 1734: -17,-20 + 1735: -17,-19 + 1853: -21,-20 + 1854: -21,-22 - node: color: '#EFCC4196' id: BrickTileWhiteLineW decals: - 2153: -13,29 - 2154: -13,30 - 2155: -13,31 - 2168: -5,26 - 2170: -5,25 - 2171: -5,24 - 2173: -4,22 + 2131: -13,29 + 2132: -13,30 + 2133: -13,31 + 2146: -5,26 + 2148: -5,25 + 2149: -5,24 + 2151: -4,22 - node: color: '#EFD54193' id: BrickTileWhiteLineW decals: - 3296: 19,19 - 3297: 19,20 + 3246: 19,19 + 3247: 19,20 - node: color: '#EFD54196' id: BrickTileWhiteLineW decals: - 1812: -23,29 + 1792: -23,29 - node: color: '#FFFFFFFF' id: BrickTileWhiteLineW decals: - 764: 38,-31 - 765: 38,-30 - 766: 38,-29 - 816: 19,13 + 761: 38,-31 + 762: 38,-30 + 763: 38,-29 + 813: 19,13 - node: color: '#FFFFFFFF' id: Bushb1 decals: - 951: -5.0759892,-67.511505 + 948: -5.0759892,-67.511505 - node: color: '#FFFFFFFF' id: Bushb2 decals: - 487: -6.033051,-6.006569 + 484: -6.033051,-6.006569 - node: color: '#FFFFFFFF' id: Bushb3 decals: - 952: 5.128752,-67.43338 + 949: 5.128752,-67.43338 - node: color: '#FFFFFFFF' id: Bushe2 decals: - 961: -4.964998,-66.74588 - 1549: -48.067986,5.0444627 + 958: -4.964998,-66.74588 + 1546: -48.067986,5.0444627 - node: color: '#FFFFFFFF' id: Bushe3 decals: - 927: 49.993763,22.959341 + 924: 49.993763,22.959341 - node: color: '#FFFFFFFF' id: Bushe4 decals: - 926: 48.900013,22.974966 - 960: -5.339998,-66.605255 - 962: 5.097502,-68.605255 - 1550: -46.83361,5.0444627 + 923: 48.900013,22.974966 + 957: -5.339998,-66.605255 + 959: 5.097502,-68.605255 + 1547: -46.83361,5.0444627 - node: color: '#FFFFFFFF' id: Bushf1 decals: - 1547: -46.89611,5.0132127 + 1544: -46.89611,5.0132127 - node: color: '#FFFFFFFF' id: Bushf3 decals: - 1548: -48.14611,4.9663377 + 1545: -48.14611,4.9663377 - node: color: '#FFFFFFFF' id: Bushh1 decals: - 1343: 11.007317,-66.29063 + 1340: 11.007317,-66.29063 - node: color: '#FFFFFFFF' id: Bushh2 decals: - 1344: 11.022942,-68.72813 + 1341: 11.022942,-68.72813 - node: color: '#FFFFFFFF' id: Bushi1 decals: 219: 32.840233,-26.000742 - 394: 8.857405,4.0894966 - 923: 48.025013,28.959341 - 3321: 28.940447,-35.765743 + 391: 8.857405,4.0894966 + 920: 48.025013,28.959341 + 3271: 28.940447,-35.765743 - node: color: '#FFFFFFFF' id: Bushi2 decals: - 1338: 11.038567,-68.5875 + 1335: 11.038567,-68.5875 - node: color: '#FFFFFFFF' id: Bushi3 decals: 218: 34.512108,-25.938242 - 392: 12.107405,4.5426216 - 924: 49.946888,28.959341 - 979: -0.82901984,-67.68338 - 1337: 10.976067,-67.41563 + 389: 12.107405,4.5426216 + 921: 49.946888,28.959341 + 976: -0.82901984,-67.68338 + 1334: 10.976067,-67.41563 - node: color: '#FFFFFFFF' id: Bushi4 decals: - 393: 11.013655,3.2457466 - 978: 0.8428552,-67.55838 - 1336: 10.991692,-65.86875 + 390: 11.013655,3.2457466 + 975: 0.8428552,-67.55838 + 1333: 10.991692,-65.86875 - node: color: '#FFFFFFFF' id: Bushj2 decals: 220: 33.887108,-25.969492 - 964: -5.121248,-68.96463 - 1546: -47.52111,5.1225877 + 961: -5.121248,-68.96463 + 1543: -47.52111,5.1225877 - node: color: '#FFFFFFFF' id: Bushj3 decals: - 963: 5.097502,-65.99588 - 980: -5,-66 + 960: 5.097502,-65.99588 + 977: -5,-66 - node: color: '#FFFFFFFF' id: Bushm2 decals: - 1342: 10.991692,-67.525 + 1339: 10.991692,-67.525 - node: color: '#FFFFFFFF' id: Bushn1 decals: - 488: -6.033051,-6.444069 - 925: 48.978138,29.037466 + 485: -6.033051,-6.444069 + 922: 48.978138,29.037466 - node: color: '#FFFFFFFF' id: Caution decals: - 1070: -27,-1 - 1682: -9,-21 - 2535: -55,17 - 3911: -26,32 + 1067: -27,-1 + 1662: -9,-21 + 2511: -55,17 + 3839: -26,32 - node: color: '#DE3A3A96' id: CautionGreyscale decals: - 1684: -7,-18 + 1664: -7,-18 - node: color: '#52B4E996' id: CheckerNESW decals: - 1345: -20,-8 - 1346: -20,-7 - 1347: -19,-7 - 1348: -19,-8 + 1342: -20,-8 + 1343: -20,-7 + 1344: -19,-7 + 1345: -19,-8 - node: color: '#D4D4D428' id: CheckerNESW @@ -2201,69 +2201,69 @@ entities: color: '#D4D4D453' id: CheckerNESW decals: - 1843: -20,30 - 1844: -17,30 - 1845: -16,30 + 1821: -20,30 + 1822: -17,30 + 1823: -16,30 - node: color: '#D4D4D46C' id: CheckerNESW decals: - 1288: 24,-38 - 1289: 24,-37 - 1290: 25,-37 - 1291: 25,-38 - 1292: 26,-38 - 1293: 26,-37 - 1294: 27,-38 - 1295: 27,-37 - 1296: 27,-36 - 1297: 26,-36 - 1298: 25,-36 - 1299: 24,-36 - 1300: 23,-36 - 1301: 23,-35 - 1302: 24,-35 - 1303: 26,-34 - 1304: 24,-34 - 1305: 23,-34 - 1306: 25,-34 - 1307: 26,-33 - 1308: 25,-33 - 1309: 24,-33 - 1310: 23,-33 - 1311: 23,-32 - 1312: 24,-32 - 1313: 25,-32 - 1314: 26,-32 - 1315: 26,-31 - 1316: 25,-31 - 1317: 24,-31 - 1318: 23,-31 + 1285: 24,-38 + 1286: 24,-37 + 1287: 25,-37 + 1288: 25,-38 + 1289: 26,-38 + 1290: 26,-37 + 1291: 27,-38 + 1292: 27,-37 + 1293: 27,-36 + 1294: 26,-36 + 1295: 25,-36 + 1296: 24,-36 + 1297: 23,-36 + 1298: 23,-35 + 1299: 24,-35 + 1300: 26,-34 + 1301: 24,-34 + 1302: 23,-34 + 1303: 25,-34 + 1304: 26,-33 + 1305: 25,-33 + 1306: 24,-33 + 1307: 23,-33 + 1308: 23,-32 + 1309: 24,-32 + 1310: 25,-32 + 1311: 26,-32 + 1312: 26,-31 + 1313: 25,-31 + 1314: 24,-31 + 1315: 23,-31 - node: color: '#D4D4D496' id: CheckerNESW decals: - 3571: 24,-39 - 3572: 25,-39 - 3573: 26,-39 - 3574: 27,-39 - 3575: 26,-35 - 3576: 25,-35 - 3724: 23,-38 - 3725: 23,-37 - 3726: 23,-39 + 3500: 24,-39 + 3501: 25,-39 + 3502: 26,-39 + 3503: 27,-39 + 3504: 26,-35 + 3505: 25,-35 + 3652: 23,-38 + 3653: 23,-37 + 3654: 23,-39 - node: color: '#334E6DC8' id: CheckerNWSE decals: - 618: -63,17 - 619: -64,17 - 620: -65,17 - 621: -66,17 - 622: -67,17 - 623: -68,17 - 624: -69,17 - 625: -62,17 + 615: -63,17 + 616: -64,17 + 617: -65,17 + 618: -66,17 + 619: -67,17 + 620: -68,17 + 621: -69,17 + 622: -62,17 - node: color: '#52B4E996' id: CheckerNWSE @@ -2283,113 +2283,113 @@ entities: 234: 34,-13 235: 35,-13 236: 36,-13 - 1848: -20,30 - 2832: 44,-14 - 2833: 44,-13 - 2834: 44,-12 - 2835: 44,-11 - 2836: 44,-10 - 3531: 44,-18 - 3532: 44,-19 - 3533: 44,-20 - 3534: 44,-21 - 3535: 44,-22 - 3536: 44,-23 - 3537: 44,-24 - 3871: 34,-19 - 3872: 35,-19 - 3873: 36,-19 - 3874: 37,-19 - 3875: 38,-19 - 3876: 39,-19 + 1826: -20,30 + 2808: 44,-14 + 2809: 44,-13 + 2810: 44,-12 + 2811: 44,-11 + 2812: 44,-10 + 3477: 44,-18 + 3478: 44,-19 + 3479: 44,-20 + 3480: 44,-21 + 3481: 44,-22 + 3482: 44,-23 + 3483: 44,-24 + 3799: 34,-19 + 3800: 35,-19 + 3801: 36,-19 + 3802: 37,-19 + 3803: 38,-19 + 3804: 39,-19 - node: color: '#79150096' id: CheckerNWSE decals: - 1671: -9,-16 - 1672: -8,-16 - 1673: -7,-16 - 1674: -6,-16 + 1651: -9,-16 + 1652: -8,-16 + 1653: -7,-16 + 1654: -6,-16 - node: color: '#A4610696' id: CheckerNWSE decals: - 518: 48,16 - 519: 47,16 - 520: 47,17 - 521: 47,18 - 522: 48,18 - 523: 48,17 - 524: 49,16 - 525: 49,17 - 526: 49,18 - 527: 50,18 - 528: 50,17 - 529: 51,18 - 530: 51,17 - 712: 50,16 - 713: 51,16 + 515: 48,16 + 516: 47,16 + 517: 47,17 + 518: 47,18 + 519: 48,18 + 520: 48,17 + 521: 49,16 + 522: 49,17 + 523: 49,18 + 524: 50,18 + 525: 50,17 + 526: 51,18 + 527: 51,17 + 709: 50,16 + 710: 51,16 - node: color: '#D381C93E' id: CheckerNWSE decals: - 319: -45,2 - 320: -45,3 - 321: -44,3 - 322: -44,2 - 323: -43,2 - 324: -43,3 - 325: -42,3 - 326: -42,2 - 327: -42,4 - 328: -43,4 - 329: -44,4 - 330: -45,4 - 331: -45,5 - 332: -44,5 - 333: -43,5 - 334: -42,5 + 316: -45,2 + 317: -45,3 + 318: -44,3 + 319: -44,2 + 320: -43,2 + 321: -43,3 + 322: -42,3 + 323: -42,2 + 324: -42,4 + 325: -43,4 + 326: -44,4 + 327: -45,4 + 328: -45,5 + 329: -44,5 + 330: -43,5 + 331: -42,5 - node: color: '#D381C996' id: CheckerNWSE decals: - 337: -54,8 - 338: -55,8 - 339: -56,8 - 340: -57,8 - 341: -57,9 - 342: -56,9 - 343: -55,9 - 344: -54,9 - 345: -54,10 - 346: -55,10 - 347: -56,10 - 348: -57,10 - 349: -57,11 - 350: -56,11 - 351: -55,11 - 352: -54,11 - 353: -54,12 - 354: -55,12 - 355: -56,12 - 356: -57,12 - 357: -57,13 - 358: -56,13 - 359: -55,13 - 360: -54,13 + 334: -54,8 + 335: -55,8 + 336: -56,8 + 337: -57,8 + 338: -57,9 + 339: -56,9 + 340: -55,9 + 341: -54,9 + 342: -54,10 + 343: -55,10 + 344: -56,10 + 345: -57,10 + 346: -57,11 + 347: -56,11 + 348: -55,11 + 349: -54,11 + 350: -54,12 + 351: -55,12 + 352: -56,12 + 353: -57,12 + 354: -57,13 + 355: -56,13 + 356: -55,13 + 357: -54,13 - node: color: '#D4D4D406' id: CheckerNWSE decals: - 2410: -33,-4 - 2411: -33,-3 - 2412: -34,-3 - 2413: -35,-3 - 2414: -35,-4 - 2415: -34,-4 - 2416: -35,-5 - 2417: -34,-5 - 2418: -33,-5 + 2386: -33,-4 + 2387: -33,-3 + 2388: -34,-3 + 2389: -35,-3 + 2390: -35,-4 + 2391: -34,-4 + 2392: -35,-5 + 2393: -34,-5 + 2394: -33,-5 - node: color: '#D4D4D428' id: CheckerNWSE @@ -2404,176 +2404,176 @@ entities: 171: 10,14 172: 11,14 173: 12,14 - 364: 14,-14 - 365: 14,-13 - 366: 14,-12 - 1087: 1,-55 - 1088: 0,-55 - 1089: -1,-55 - 1090: -1,-56 - 1091: 0,-56 - 1092: 1,-56 - 1093: 1,-57 - 1094: 0,-57 - 1095: -1,-57 - 1096: 0,-58 - 1097: 0,-54 + 361: 14,-14 + 362: 14,-13 + 363: 14,-12 + 1084: 1,-55 + 1085: 0,-55 + 1086: -1,-55 + 1087: -1,-56 + 1088: 0,-56 + 1089: 1,-56 + 1090: 1,-57 + 1091: 0,-57 + 1092: -1,-57 + 1093: 0,-58 + 1094: 0,-54 - node: color: '#DE3A3A96' id: CheckerNWSE decals: - 1846: -16,30 - 1847: -17,30 + 1824: -16,30 + 1825: -17,30 - node: color: '#EFB34196' id: CheckerNWSE decals: - 421: 10,17 - 422: 9,17 - 423: 8,17 - 424: 8,18 - 425: 9,18 - 426: 10,18 - 427: 10,19 - 428: 9,19 - 429: 8,19 - 430: 8,20 - 431: 8,21 - 432: 9,21 - 433: 9,20 - 434: 10,20 - 435: 10,21 + 418: 10,17 + 419: 9,17 + 420: 8,17 + 421: 8,18 + 422: 9,18 + 423: 10,18 + 424: 10,19 + 425: 9,19 + 426: 8,19 + 427: 8,20 + 428: 8,21 + 429: 9,21 + 430: 9,20 + 431: 10,20 + 432: 10,21 - node: color: '#FFEF9292' id: CheckerNWSE decals: - 2818: 44,-28 - 2819: 44,-29 - 2820: 44,-30 - 2821: 44,-31 - 2822: 44,-32 - 2823: 44,-33 - 2824: 44,-34 + 2794: 44,-28 + 2795: 44,-29 + 2796: 44,-30 + 2797: 44,-31 + 2798: 44,-32 + 2799: 44,-33 + 2800: 44,-34 - node: cleanable: True color: '#00000069' id: Damaged decals: - 2785: -58,26 - 2786: -59,26 - 2787: -60,27 + 2761: -58,26 + 2762: -59,26 + 2763: -60,27 - node: angle: 1.5707963267948966 rad color: '#79150096' id: Delivery decals: - 2782: -7,-47 + 2758: -7,-47 - node: color: '#DE3A3A96' id: Delivery decals: - 2932: -32,-20 - 3413: -32,2 - 3414: -31,2 - 3746: 51,-21 + 2902: -32,-20 + 3363: -32,2 + 3364: -31,2 + 3674: 51,-21 - node: color: '#FFFFFFFF' id: Delivery decals: 148: 7,-26 - 399: -25,35 - 400: -25,36 - 401: -26,36 - 402: -26,35 - 1326: 51,10 - 1327: 51,8 - 1331: 51,12 - 1521: -46,17 - 1591: 41,19 - 1592: 40,19 - 1593: 39,19 - 1804: -21,26 - 1805: -23,26 - 1973: -41,-5 - 2572: 41,-35 - 2930: 42,6 - 2931: -18,26 - 3067: 0,30 - 3078: 23,3 - 3091: 38,1 - 3346: -21,43 - 3353: -17,47 - 3354: -18,48 - 3355: -16,48 - 3431: 17,-21 - 3432: 16,-21 - 3433: 15,-21 - 3434: 1,-27 - 3435: 0,-27 - 3436: -1,-27 - 3437: -1,-22 - 3438: 0,-22 - 3439: 1,-22 - 3448: -13,-25 - 3449: -13,-24 - 3450: -13,-23 - 3451: -19,7 - 3452: -19,8 - 3453: -19,9 - 3454: -13,7 - 3455: -13,8 - 3456: -13,9 - 3475: 18,7 - 3476: 18,8 - 3477: 18,9 - 3478: 14,7 - 3479: 14,8 - 3480: 14,9 - 3481: 18,23 - 3482: 18,24 - 3483: 18,25 - 3598: 1,-75 - 3599: 0,-75 - 3600: -1,-75 - 3601: 1,-60 - 3602: 0,-60 - 3603: -1,-60 - 3604: 1,-53 - 3605: 0,-53 - 3606: -1,-53 - 3607: -1,-44 - 3608: 0,-44 - 3609: 1,-44 - 3616: 4,-56 - 3617: 4,-55 - 3618: 4,-54 - 3619: -4,-56 - 3620: -4,-55 - 3621: -4,-54 + 396: -25,35 + 397: -25,36 + 398: -26,36 + 399: -26,35 + 1323: 51,10 + 1324: 51,8 + 1328: 51,12 + 1518: -46,17 + 1588: 41,19 + 1589: 40,19 + 1590: 39,19 + 1784: -21,26 + 1785: -23,26 + 1951: -41,-5 + 2548: 41,-35 + 2900: 42,6 + 2901: -18,26 + 3037: 0,30 + 3048: 23,3 + 3061: 38,1 + 3296: -21,43 + 3303: -17,47 + 3304: -18,48 + 3305: -16,48 + 3381: 17,-21 + 3382: 16,-21 + 3383: 15,-21 + 3384: 1,-27 + 3385: 0,-27 + 3386: -1,-27 + 3387: -1,-22 + 3388: 0,-22 + 3389: 1,-22 + 3398: -13,-25 + 3399: -13,-24 + 3400: -13,-23 + 3401: -19,7 + 3402: -19,8 + 3403: -19,9 + 3404: -13,7 + 3405: -13,8 + 3406: -13,9 + 3425: 18,7 + 3426: 18,8 + 3427: 18,9 + 3428: 14,7 + 3429: 14,8 + 3430: 14,9 + 3431: 18,23 + 3432: 18,24 + 3433: 18,25 + 3527: 1,-75 + 3528: 0,-75 + 3529: -1,-75 + 3530: 1,-60 + 3531: 0,-60 + 3532: -1,-60 + 3533: 1,-53 + 3534: 0,-53 + 3535: -1,-53 + 3536: -1,-44 + 3537: 0,-44 + 3538: 1,-44 + 3545: 4,-56 + 3546: 4,-55 + 3547: 4,-54 + 3548: -4,-56 + 3549: -4,-55 + 3550: -4,-54 - node: color: '#52B4E996' id: DeliveryGreyscale decals: - 3514: 31,-20 - 3515: 31,-18 + 3460: 31,-20 + 3461: 31,-18 - node: color: '#D381C941' id: DeliveryGreyscale decals: - 3327: -53,0 - 3328: -56,0 + 3277: -53,0 + 3278: -56,0 - node: color: '#D381C996' id: DeliveryGreyscale decals: - 1240: -56,1 + 1237: -56,1 - node: cleanable: True color: '#FFFFFFFF' id: DeliveryGreyscale decals: - 3238: -61,17 - 3239: -70,17 + 3188: -61,17 + 3189: -70,17 - node: cleanable: True color: '#FFFFFFFF' @@ -2589,175 +2589,175 @@ entities: 52: 18,-51 53: 17,-51 54: 17,-51 - 2455: -45,-32 - 2456: -46,-32 - 2457: -46,-33 - 2458: -47,-33 - 2459: -46,-34 - 2460: -48,-32 - 2461: -49,-31 - 2462: -46,-30 - 2463: -49,-33 - 2464: -49,-32 - 2465: -48,-33 - 2466: -50,-32 - 2467: -50,-31 - 2468: -47,-32 - 2469: -48,-31 - 2470: -47,-34 - 2471: -47,-35 - 2472: -46,-35 - 2473: -45,-34 - 2474: -44,-34 - 2475: -44,-32 - 2476: -46,-31 - 2477: -49,-30 - 2478: -52,-30 - 2479: -52,-33 - 2480: -45,-29 - 2481: -31,-31 - 2482: -31,-32 - 2483: -29,-32 - 2484: -32,-32 - 2485: -35,-32 - 2486: -34,-32 - 2487: -39,-32 - 2488: -40,-31 - 2489: -34,-31 - 2490: -20,-35 - 2491: -11,-45 - 2492: -11,-44 - 2493: -13,-45 - 2494: -14,-45 - 2501: 53,-7 - 2502: 53,-9 - 2503: 53,-10 - 2504: 53,-11 - 2505: 54,-11 - 2506: 55,-12 - 2507: 55,-15 - 2508: 50,-6 - 2509: 47,-5 - 2510: 33,-5 - 2511: 33,-6 - 2512: 31,-7 - 2513: 29,-8 - 2514: 33,-3 - 2515: 30,-10 - 2516: 31,-2 - 2517: 30,-1 - 2518: 32,1 - 2519: 31,2 - 2520: 57,-25 - 2521: 59,-42 - 2522: 58,-43 - 2523: 56,-43 - 2524: 47,-43 - 2525: 45,-41 - 2526: 31,-40 - 2527: 30,-40 - 2539: 36,20 - 2540: 37,20 - 2541: 35,21 - 2542: 32,20 - 2543: 30,20 - 2544: 27,21 - 2545: 31,17 - 2546: 32,11 - 2547: 29,12 - 2556: -31,-35 - 2557: -33,-36 - 2558: -30,-35 - 2559: -17,-38 - 2560: -17,-37 - 2561: -18,-35 - 2562: -13,-46 - 2563: -12,-47 - 2564: -8,-50 - 2565: -8,-52 - 2566: -15,-49 - 2629: 13,-46 - 2630: 14,-47 - 2631: 15,-45 - 2632: 17,-44 - 2633: 19,-47 - 2634: 11,-46 - 2635: 10,-47 - 2636: 10,-49 - 2637: 13,-40 - 2638: 12,-40 - 2639: 11,-41 - 2640: 5,-51 - 2774: 5,-43 - 2775: 6,-43 - 2776: -3,-43 - 2777: -6,-41 - 2778: -13,-40 - 2779: -12,-41 - 2780: -12,-42 - 2781: -14,-41 - 2791: 41,-50 - 2792: 42,-52 - 2793: 41,-49 - 2794: 38,-52 - 2795: 22,-49 - 2939: -59,44 - 2940: -59,45 - 2941: -60,46 - 2942: -58,47 - 2943: -57,44 - 2944: -58,43 - 2945: -59,40 - 2946: -60,41 - 2947: -60,42 - 2948: -61,43 - 2949: -61,44 - 2950: -62,45 - 2951: -62,47 - 2952: -63,47 - 2953: -61,48 - 2954: -61,49 - 2955: -62,50 - 2956: -62,51 - 2957: -58,52 - 2958: -58,51 - 2959: -59,51 - 2960: -59,50 - 2961: -58,49 - 2962: -53,46 - 2963: -56,46 - 2964: -58,37 - 2965: -59,37 - 2966: -60,39 - 2967: -59,36 - 3234: 40,-48 - 3235: 41,-45 - 3236: 40,-44 - 3237: 43,-46 - 3240: -23,-33 - 3241: -24,-33 - 3566: 27,-41 - 3567: 22,-41 - 3568: 28,-42 - 3569: 28,-41 - 3886: -13,-16 - 3887: -12,-17 - 3888: -11,-16 - 3889: -11,-13 - 3890: -10,-15 - 3891: -11,-15 - 3892: -10,-16 - 3893: -10,-15 - 3894: -9,-15 - 3895: -10,-13 - 3896: -11,-18 - 3897: -11,-19 - 3898: -11,-20 - 3899: -11,-20 - 3900: -11,-21 - 3901: -13,-19 - 3902: -13,-20 - 3903: -12,-14 + 2431: -45,-32 + 2432: -46,-32 + 2433: -46,-33 + 2434: -47,-33 + 2435: -46,-34 + 2436: -48,-32 + 2437: -49,-31 + 2438: -46,-30 + 2439: -49,-33 + 2440: -49,-32 + 2441: -48,-33 + 2442: -50,-32 + 2443: -50,-31 + 2444: -47,-32 + 2445: -48,-31 + 2446: -47,-34 + 2447: -47,-35 + 2448: -46,-35 + 2449: -45,-34 + 2450: -44,-34 + 2451: -44,-32 + 2452: -46,-31 + 2453: -49,-30 + 2454: -52,-30 + 2455: -52,-33 + 2456: -45,-29 + 2457: -31,-31 + 2458: -31,-32 + 2459: -29,-32 + 2460: -32,-32 + 2461: -35,-32 + 2462: -34,-32 + 2463: -39,-32 + 2464: -40,-31 + 2465: -34,-31 + 2466: -20,-35 + 2467: -11,-45 + 2468: -11,-44 + 2469: -13,-45 + 2470: -14,-45 + 2477: 53,-7 + 2478: 53,-9 + 2479: 53,-10 + 2480: 53,-11 + 2481: 54,-11 + 2482: 55,-12 + 2483: 55,-15 + 2484: 50,-6 + 2485: 47,-5 + 2486: 33,-5 + 2487: 33,-6 + 2488: 31,-7 + 2489: 29,-8 + 2490: 33,-3 + 2491: 30,-10 + 2492: 31,-2 + 2493: 30,-1 + 2494: 32,1 + 2495: 31,2 + 2496: 57,-25 + 2497: 59,-42 + 2498: 58,-43 + 2499: 56,-43 + 2500: 47,-43 + 2501: 45,-41 + 2502: 31,-40 + 2503: 30,-40 + 2515: 36,20 + 2516: 37,20 + 2517: 35,21 + 2518: 32,20 + 2519: 30,20 + 2520: 27,21 + 2521: 31,17 + 2522: 32,11 + 2523: 29,12 + 2532: -31,-35 + 2533: -33,-36 + 2534: -30,-35 + 2535: -17,-38 + 2536: -17,-37 + 2537: -18,-35 + 2538: -13,-46 + 2539: -12,-47 + 2540: -8,-50 + 2541: -8,-52 + 2542: -15,-49 + 2605: 13,-46 + 2606: 14,-47 + 2607: 15,-45 + 2608: 17,-44 + 2609: 19,-47 + 2610: 11,-46 + 2611: 10,-47 + 2612: 10,-49 + 2613: 13,-40 + 2614: 12,-40 + 2615: 11,-41 + 2616: 5,-51 + 2750: 5,-43 + 2751: 6,-43 + 2752: -3,-43 + 2753: -6,-41 + 2754: -13,-40 + 2755: -12,-41 + 2756: -12,-42 + 2757: -14,-41 + 2767: 41,-50 + 2768: 42,-52 + 2769: 41,-49 + 2770: 38,-52 + 2771: 22,-49 + 2909: -59,44 + 2910: -59,45 + 2911: -60,46 + 2912: -58,47 + 2913: -57,44 + 2914: -58,43 + 2915: -59,40 + 2916: -60,41 + 2917: -60,42 + 2918: -61,43 + 2919: -61,44 + 2920: -62,45 + 2921: -62,47 + 2922: -63,47 + 2923: -61,48 + 2924: -61,49 + 2925: -62,50 + 2926: -62,51 + 2927: -58,52 + 2928: -58,51 + 2929: -59,51 + 2930: -59,50 + 2931: -58,49 + 2932: -53,46 + 2933: -56,46 + 2934: -58,37 + 2935: -59,37 + 2936: -60,39 + 2937: -59,36 + 3184: 40,-48 + 3185: 41,-45 + 3186: 40,-44 + 3187: 43,-46 + 3190: -23,-33 + 3191: -24,-33 + 3495: 27,-41 + 3496: 22,-41 + 3497: 28,-42 + 3498: 28,-41 + 3814: -13,-16 + 3815: -12,-17 + 3816: -11,-16 + 3817: -11,-13 + 3818: -10,-15 + 3819: -11,-15 + 3820: -10,-16 + 3821: -10,-15 + 3822: -9,-15 + 3823: -10,-13 + 3824: -11,-18 + 3825: -11,-19 + 3826: -11,-20 + 3827: -11,-20 + 3828: -11,-21 + 3829: -13,-19 + 3830: -13,-20 + 3831: -12,-14 - node: angle: 3.141592653589793 rad color: '#FFFFFFFF' @@ -2774,8 +2774,8 @@ entities: color: '#FFFFFFFF' id: DirtHeavy decals: - 3092: 37,-2 - 3093: 37,2 + 3062: 37,-2 + 3063: 37,2 - node: cleanable: True color: '#FFFFFFFF' @@ -2786,44 +2786,44 @@ entities: 86: 13,11 133: -51,-30 149: -39,-14 - 458: -59,19 - 459: -60,22 - 460: -60,23 - 581: 51,0 - 582: 50,0 - 583: 49,-1 - 584: 49,3 - 834: -5,-25 - 835: -4,-25 - 1631: -39,9 - 1680: -7,-16 - 2238: -1,13 - 2314: 52,-38 - 2315: 52,-38 - 2421: 53,-22 - 2422: 53,-23 - 2428: -46,-30 - 2429: -45,-30 - 2430: -45,-32 - 2431: -46,-33 - 2432: -46,-33 - 2433: -50,-33 - 2434: -48,-32 - 2548: 30,12 - 2549: 27,11 - 2550: 30,18 - 2551: 29,21 - 2723: -63,-10 - 2788: -59,26 - 2789: -60,26 - 2924: 45,9 - 3141: 48,4 - 3329: -59,20 - 3330: -59,22 - 3331: -59,22 - 3883: -12,-16 - 3884: -13,-17 - 3885: -12,-15 + 455: -59,19 + 456: -60,22 + 457: -60,23 + 578: 51,0 + 579: 50,0 + 580: 49,-1 + 581: 49,3 + 831: -5,-25 + 832: -4,-25 + 1628: -39,9 + 1660: -7,-16 + 2214: -1,13 + 2290: 52,-38 + 2291: 52,-38 + 2397: 53,-22 + 2398: 53,-23 + 2404: -46,-30 + 2405: -45,-30 + 2406: -45,-32 + 2407: -46,-33 + 2408: -46,-33 + 2409: -50,-33 + 2410: -48,-32 + 2524: 30,12 + 2525: 27,11 + 2526: 30,18 + 2527: 29,21 + 2699: -63,-10 + 2764: -59,26 + 2765: -60,26 + 2894: 45,9 + 3101: 48,4 + 3279: -59,20 + 3280: -59,22 + 3281: -59,22 + 3811: -12,-16 + 3812: -13,-17 + 3813: -12,-15 - node: angle: 3.141592653589793 rad color: '#FFFFFFFF' @@ -2839,39 +2839,39 @@ entities: color: '#FFFFFFFF' id: DirtHeavyMonotile decals: - 3561: 5,16 - 3562: 0,12 - 3563: -2,14 - 3564: 2,14 - 3565: 8,14 + 3490: 5,16 + 3491: 0,12 + 3492: -2,14 + 3493: 2,14 + 3494: 8,14 - node: color: '#FFFFFFFF' id: DirtLight decals: - 279: -23,-6 - 280: -23,-8 - 281: -28,-20 - 282: -25,-19 - 283: -29,-16 - 284: -30,-15 - 285: -24,-15 - 286: -23,-12 - 287: -32,-11 - 514: -38,8 - 515: -38,6 - 516: -38,5 - 517: -39,12 - 859: -30,-20 - 860: -21,-19 - 861: -33,-20 - 862: -33,-17 - 863: -32,-20 - 3099: 37,1 - 3100: 37,-1 - 3101: 38,0 - 3102: 36,0 - 3103: 36,-1 - 3104: 40,0 + 276: -23,-6 + 277: -23,-8 + 278: -28,-20 + 279: -25,-19 + 280: -29,-16 + 281: -30,-15 + 282: -24,-15 + 283: -23,-12 + 284: -32,-11 + 511: -38,8 + 512: -38,6 + 513: -38,5 + 514: -39,12 + 856: -30,-20 + 857: -21,-19 + 858: -33,-20 + 859: -33,-17 + 860: -32,-20 + 3069: 37,1 + 3070: 37,-1 + 3071: 38,0 + 3072: 36,0 + 3073: 36,-1 + 3074: 40,0 - node: cleanable: True color: '#FFFFFFFF' @@ -2923,266 +2923,266 @@ entities: 153: -38,-14 154: -38,-18 155: -39,-19 - 362: 11,-21 - 363: 12,-21 - 373: 15,-14 - 374: 15,-15 - 375: 15,-12 - 376: 15,-11 - 377: 16,-9 - 378: 17,-2 - 379: 17,0 - 380: 17,1 - 381: 16,2 - 382: 16,-5 - 412: -26,31 - 413: -27,30 - 414: -23,31 - 415: -23,29 - 416: -21,29 - 417: -18,29 - 418: -22,27 - 419: -24,30 - 420: -29,31 - 451: -16,12 - 452: -16,23 - 453: -23,24 - 454: -39,24 - 455: -42,22 - 456: -43,21 - 457: -56,16 - 463: -58,20 - 464: -59,18 - 465: -60,17 - 466: -59,25 - 467: -60,24 - 468: -56,24 - 469: -57,20 - 588: 47,-1 - 589: 48,-2 - 590: 49,-2 - 591: 51,1 - 592: 50,1 - 593: 51,2 - 594: 48,2 - 595: 47,0 - 596: 44,4 - 597: 49,4 - 598: 43,5 - 599: 43,6 - 600: 55,12 - 601: 54,11 - 602: 53,11 - 603: 55,13 - 604: 55,9 - 605: 49,14 - 606: 50,13 - 607: 41,6 - 608: 41,5 - 609: 40,5 - 610: 37,4 - 611: 36,5 - 678: -22,25 - 679: -17,18 - 680: -37,4 - 681: -37,-11 - 682: -37,-15 - 683: -19,-20 - 684: -17,-14 - 685: -17,-7 - 686: -16,-5 - 694: -16,7 - 696: -16,4 - 697: -15,9 - 698: -16,0 - 831: -9,-25 - 832: -8,-25 - 833: -8,-25 - 838: -4,-24 - 839: -1,-25 - 840: 7,-21 - 841: 16,-25 - 842: 16,-25 - 843: 13,-25 - 892: 7,-20 - 893: 8,-20 - 894: 9,-20 - 895: 9,-21 - 896: 10,-23 - 897: 12,-23 - 898: -6,-23 - 899: -25,-23 - 900: -34,-23 - 901: -37,-24 - 1071: -10,-55 - 1072: -14,-56 - 1073: -19,-55 - 1074: -7,-54 - 1075: -2,-54 - 1076: -3,-57 - 1077: 2,-59 - 1078: -3,-64 - 1079: 0,-61 - 1080: -3,-66 - 1081: -3,-71 - 1082: -1,-73 - 1083: 2,-71 - 1084: 1,-55 - 1085: -1,-47 - 1086: 0,-45 - 1155: 20,24 - 1156: 15,25 - 1157: 16,27 - 1158: 34,23 - 1159: 38,24 - 1160: 44,26 - 1161: 45,25 - 1162: 52,25 - 1163: 53,26 - 1164: 52,21 - 1165: 44,21 - 1166: 41,20 - 1167: 52,14 - 1168: 48,18 - 1169: 49,16 - 1170: 45,7 - 1171: 20,8 - 1172: 32,7 - 1173: 34,8 - 1174: 16,8 - 1175: 5,8 - 1176: -7,9 - 1177: -8,8 - 1216: 7,-22 - 1217: 5,-23 - 1218: 4,-23 - 1219: 7,-24 - 1220: 23,-23 - 1221: 18,-28 - 1222: 21,-35 - 1223: 19,-34 - 1632: -38,9 - 1633: -39,8 - 1634: -39,7 - 1635: -39,-1 - 1656: -8,-12 - 1657: -8,-14 - 1658: -9,-13 - 1677: -9,-16 - 1678: -8,-16 - 1679: -8,-16 - 2003: -39,-12 - 2004: -39,-8 - 2005: -40,-7 - 2006: -39,-8 - 2008: -39,-9 - 2009: -39,-3 - 2010: -39,3 - 2242: 1,13 - 2243: 0,14 - 2244: 0,15 - 2245: 0,15 - 2246: 1,15 - 2247: 3,14 - 2248: 5,15 - 2249: 7,13 - 2250: 9,14 - 2251: 11,12 - 2252: 11,14 - 2253: 5,17 - 2254: 4,17 - 2255: 4,18 - 2256: -4,17 - 2257: -4,19 - 2258: -3,20 - 2259: -2,17 - 2296: 3,19 - 2297: 4,20 - 2299: -4,21 - 2300: -3,22 - 2301: -3,24 - 2302: -2,21 - 2303: -2,20 - 2304: -3,23 - 2305: -5,28 - 2306: -5,27 - 2307: -11,28 - 2308: -12,29 - 2309: -13,30 - 2310: -13,31 - 2311: -12,32 - 2312: -22,31 - 2313: -30,30 - 2316: 51,-38 - 2317: 51,-38 - 2326: 49,-39 - 2442: -52,-35 - 2443: -52,-35 - 2444: -52,-32 - 2445: -49,-31 - 2446: -49,-31 - 2447: -48,-32 - 2448: -48,-32 - 2449: -45,-33 - 2450: -45,-33 - 2451: -45,-33 - 2452: -46,-32 - 2453: -46,-32 - 2454: -46,-32 - 2552: 28,21 - 2553: 31,18 - 2554: 31,12 - 2555: 27,12 - 2925: 44,9 - 2926: 46,8 - 2927: 44,10 - 2928: 45,12 - 3145: 45,3 - 3146: 46,3 - 3147: 43,3 - 3148: 42,3 - 3151: 46,-1 - 3153: 46,1 - 3154: 47,2 - 3155: 48,1 - 3156: 51,4 - 3157: 48,3 - 3158: 46,2 - 3159: 40,2 - 3171: 49,6 - 3172: 48,7 - 3173: 53,6 - 3174: 45,5 - 3175: 41,8 - 3176: 40,9 - 3177: 39,8 - 3178: 41,13 - 3179: 41,15 - 3180: 40,16 - 3181: 56,7 - 3182: 41,1 - 3183: 41,0 - 3184: 42,2 - 3191: 40,-1 - 3202: 56,12 - 3203: 54,15 - 3204: 49,17 - 3205: 55,7 - 3206: 49,9 - 3207: 50,11 - 3208: 37,7 - 3540: 43,-19 - 3541: 43,-23 - 3542: 41,-24 - 3644: 35,-23 - 3645: 34,-25 - 3646: 33,-23 - 3648: 33,-22 - 3801: -33,8 - 3802: -34,9 - 3803: -35,8 - 3804: -35,7 - 3805: -37,8 + 359: 11,-21 + 360: 12,-21 + 370: 15,-14 + 371: 15,-15 + 372: 15,-12 + 373: 15,-11 + 374: 16,-9 + 375: 17,-2 + 376: 17,0 + 377: 17,1 + 378: 16,2 + 379: 16,-5 + 409: -26,31 + 410: -27,30 + 411: -23,31 + 412: -23,29 + 413: -21,29 + 414: -18,29 + 415: -22,27 + 416: -24,30 + 417: -29,31 + 448: -16,12 + 449: -16,23 + 450: -23,24 + 451: -39,24 + 452: -42,22 + 453: -43,21 + 454: -56,16 + 460: -58,20 + 461: -59,18 + 462: -60,17 + 463: -59,25 + 464: -60,24 + 465: -56,24 + 466: -57,20 + 585: 47,-1 + 586: 48,-2 + 587: 49,-2 + 588: 51,1 + 589: 50,1 + 590: 51,2 + 591: 48,2 + 592: 47,0 + 593: 44,4 + 594: 49,4 + 595: 43,5 + 596: 43,6 + 597: 55,12 + 598: 54,11 + 599: 53,11 + 600: 55,13 + 601: 55,9 + 602: 49,14 + 603: 50,13 + 604: 41,6 + 605: 41,5 + 606: 40,5 + 607: 37,4 + 608: 36,5 + 675: -22,25 + 676: -17,18 + 677: -37,4 + 678: -37,-11 + 679: -37,-15 + 680: -19,-20 + 681: -17,-14 + 682: -17,-7 + 683: -16,-5 + 691: -16,7 + 693: -16,4 + 694: -15,9 + 695: -16,0 + 828: -9,-25 + 829: -8,-25 + 830: -8,-25 + 835: -4,-24 + 836: -1,-25 + 837: 7,-21 + 838: 16,-25 + 839: 16,-25 + 840: 13,-25 + 889: 7,-20 + 890: 8,-20 + 891: 9,-20 + 892: 9,-21 + 893: 10,-23 + 894: 12,-23 + 895: -6,-23 + 896: -25,-23 + 897: -34,-23 + 898: -37,-24 + 1068: -10,-55 + 1069: -14,-56 + 1070: -19,-55 + 1071: -7,-54 + 1072: -2,-54 + 1073: -3,-57 + 1074: 2,-59 + 1075: -3,-64 + 1076: 0,-61 + 1077: -3,-66 + 1078: -3,-71 + 1079: -1,-73 + 1080: 2,-71 + 1081: 1,-55 + 1082: -1,-47 + 1083: 0,-45 + 1152: 20,24 + 1153: 15,25 + 1154: 16,27 + 1155: 34,23 + 1156: 38,24 + 1157: 44,26 + 1158: 45,25 + 1159: 52,25 + 1160: 53,26 + 1161: 52,21 + 1162: 44,21 + 1163: 41,20 + 1164: 52,14 + 1165: 48,18 + 1166: 49,16 + 1167: 45,7 + 1168: 20,8 + 1169: 32,7 + 1170: 34,8 + 1171: 16,8 + 1172: 5,8 + 1173: -7,9 + 1174: -8,8 + 1213: 7,-22 + 1214: 5,-23 + 1215: 4,-23 + 1216: 7,-24 + 1217: 23,-23 + 1218: 18,-28 + 1219: 21,-35 + 1220: 19,-34 + 1629: -38,9 + 1630: -39,8 + 1631: -39,7 + 1632: -39,-1 + 1640: -8,-12 + 1641: -8,-14 + 1642: -9,-13 + 1657: -9,-16 + 1658: -8,-16 + 1659: -8,-16 + 1981: -39,-12 + 1982: -39,-8 + 1983: -40,-7 + 1984: -39,-8 + 1986: -39,-9 + 1987: -39,-3 + 1988: -39,3 + 2218: 1,13 + 2219: 0,14 + 2220: 0,15 + 2221: 0,15 + 2222: 1,15 + 2223: 3,14 + 2224: 5,15 + 2225: 7,13 + 2226: 9,14 + 2227: 11,12 + 2228: 11,14 + 2229: 5,17 + 2230: 4,17 + 2231: 4,18 + 2232: -4,17 + 2233: -4,19 + 2234: -3,20 + 2235: -2,17 + 2272: 3,19 + 2273: 4,20 + 2275: -4,21 + 2276: -3,22 + 2277: -3,24 + 2278: -2,21 + 2279: -2,20 + 2280: -3,23 + 2281: -5,28 + 2282: -5,27 + 2283: -11,28 + 2284: -12,29 + 2285: -13,30 + 2286: -13,31 + 2287: -12,32 + 2288: -22,31 + 2289: -30,30 + 2292: 51,-38 + 2293: 51,-38 + 2302: 49,-39 + 2418: -52,-35 + 2419: -52,-35 + 2420: -52,-32 + 2421: -49,-31 + 2422: -49,-31 + 2423: -48,-32 + 2424: -48,-32 + 2425: -45,-33 + 2426: -45,-33 + 2427: -45,-33 + 2428: -46,-32 + 2429: -46,-32 + 2430: -46,-32 + 2528: 28,21 + 2529: 31,18 + 2530: 31,12 + 2531: 27,12 + 2895: 44,9 + 2896: 46,8 + 2897: 44,10 + 2898: 45,12 + 3105: 45,3 + 3106: 46,3 + 3107: 43,3 + 3108: 42,3 + 3109: 46,-1 + 3110: 46,1 + 3111: 47,2 + 3112: 48,1 + 3113: 51,4 + 3114: 48,3 + 3115: 46,2 + 3116: 40,2 + 3128: 49,6 + 3129: 48,7 + 3130: 53,6 + 3131: 45,5 + 3132: 41,8 + 3133: 40,9 + 3134: 39,8 + 3135: 41,13 + 3136: 41,15 + 3137: 40,16 + 3138: 56,7 + 3139: 41,1 + 3140: 41,0 + 3141: 42,2 + 3142: 40,-1 + 3153: 56,12 + 3154: 54,15 + 3155: 49,17 + 3156: 55,7 + 3157: 49,9 + 3158: 50,11 + 3159: 37,7 + 3486: 43,-19 + 3487: 43,-23 + 3488: 41,-24 + 3573: 35,-23 + 3574: 34,-25 + 3575: 33,-23 + 3576: 33,-22 + 3729: -33,8 + 3730: -34,9 + 3731: -35,8 + 3732: -35,7 + 3733: -37,8 - node: angle: 3.141592653589793 rad color: '#FFFFFFFF' @@ -3204,19 +3204,19 @@ entities: color: '#FFFFFFFF' id: DirtMedium decals: - 275: -26,-19 - 276: -25,-20 - 277: -28,-19 - 278: -23,-5 - 511: -38,7 - 512: -39,10 - 513: -39,11 - 858: -31,-20 - 3094: 36,-2 - 3095: 38,-2 - 3096: 36,2 - 3097: 38,2 - 3098: 37,1 + 272: -26,-19 + 273: -25,-20 + 274: -28,-19 + 275: -23,-5 + 508: -38,7 + 509: -39,10 + 510: -39,11 + 855: -31,-20 + 3064: 36,-2 + 3065: 38,-2 + 3066: 36,2 + 3067: 38,2 + 3068: 37,1 - node: cleanable: True color: '#FFFFFFFF' @@ -3235,48 +3235,48 @@ entities: 134: -50,-33 150: -39,-15 151: -39,-16 - 372: 14,-14 - 409: -23,30 - 410: -22,29 - 411: -25,31 - 461: -58,21 - 462: -59,25 - 585: 50,2 - 586: 50,4 - 587: 49,0 - 693: -16,6 - 695: -14,7 - 836: -3,-25 - 837: -6,-25 - 1215: 6,-22 - 2007: -40,-8 - 2239: 0,13 - 2240: -1,14 - 2241: 1,14 - 2298: -3,21 - 2318: 52,-36 - 2319: 52,-37 - 2320: 56,-37 - 2321: 55,-38 - 2322: 47,-36 - 2323: 48,-36 - 2324: 50,-39 - 2325: 50,-39 - 2423: 53,-21 - 2424: 53,-24 - 2435: -46,-32 - 2436: -46,-34 - 2437: -45,-33 - 2438: -47,-30 - 2439: -49,-31 - 2440: -51,-33 - 2441: -52,-34 - 2724: -64,-10 - 2725: -62,-9 - 2726: -60,-12 - 3142: 49,4 - 3143: 44,3 - 3144: 40,3 + 369: 14,-14 + 406: -23,30 + 407: -22,29 + 408: -25,31 + 458: -58,21 + 459: -59,25 + 582: 50,2 + 583: 50,4 + 584: 49,0 + 690: -16,6 + 692: -14,7 + 833: -3,-25 + 834: -6,-25 + 1212: 6,-22 + 1985: -40,-8 + 2215: 0,13 + 2216: -1,14 + 2217: 1,14 + 2274: -3,21 + 2294: 52,-36 + 2295: 52,-37 + 2296: 56,-37 + 2297: 55,-38 + 2298: 47,-36 + 2299: 48,-36 + 2300: 50,-39 + 2301: 50,-39 + 2399: 53,-21 + 2400: 53,-24 + 2411: -46,-32 + 2412: -46,-34 + 2413: -45,-33 + 2414: -47,-30 + 2415: -49,-31 + 2416: -51,-33 + 2417: -52,-34 + 2700: -64,-10 + 2701: -62,-9 + 2702: -60,-12 + 3102: 49,4 + 3103: 44,3 + 3104: 40,3 - node: angle: 3.141592653589793 rad color: '#FFFFFFFF' @@ -3289,169 +3289,169 @@ entities: color: '#FED83DFF' id: Donk decals: - 2419: -62.43933,-13.441491 + 2395: -62.43933,-13.441491 - node: color: '#FFFFFFFF' id: Flowersbr1 decals: 217: 34.965233,-25.985117 - 1339: 11.007317,-66.54063 + 1336: 11.007317,-66.54063 - node: color: '#FFFFFFFF' id: Flowersbr3 decals: - 976: -0.48526984,-68.87088 - 977: 0.23348016,-66.02713 + 973: -0.48526984,-68.87088 + 974: 0.23348016,-66.02713 - node: color: '#FFFFFFFF' id: Flowerspv1 decals: - 975: 0.7647302,-68.49588 - 1341: 11.007317,-69.05625 + 972: 0.7647302,-68.49588 + 1338: 11.007317,-69.05625 - node: color: '#FFFFFFFF' id: Flowerspv3 decals: - 921: 48.118763,22.943716 + 918: 48.118763,22.943716 - node: color: '#FFFFFFFF' id: Flowersy1 decals: 215: 33.152733,-25.953867 - 973: 0.6866052,-66.792755 - 3320: 29.018572,-35.56262 + 970: 0.6866052,-66.792755 + 3270: 29.018572,-35.56262 - node: color: '#FFFFFFFF' id: Flowersy2 decals: 216: 33.933983,-26.047617 - 390: 12.076155,3.7926216 - 974: -0.76651984,-68.074005 - 1340: 11.038567,-68.22813 + 387: 12.076155,3.7926216 + 971: -0.76651984,-68.074005 + 1337: 11.038567,-68.22813 - node: color: '#FFFFFFFF' id: Flowersy3 decals: - 922: 49.540638,22.974966 - 972: -0.48526984,-65.65213 + 919: 49.540638,22.974966 + 969: -0.48526984,-65.65213 - node: color: '#FFFFFFFF' id: Flowersy4 decals: - 391: 11.34178,4.3394966 - 484: -5.970551,-6.928444 - 485: -5.986176,-6.053444 - 714: 9.393604,3.3875775 - 971: -0.26651984,-69.93338 - 3319: 29.924822,-37.81262 + 388: 11.34178,4.3394966 + 481: -5.970551,-6.928444 + 482: -5.986176,-6.053444 + 711: 9.393604,3.3875775 + 968: -0.26651984,-69.93338 + 3269: 29.924822,-37.81262 - node: color: '#00000026' id: FullTileOverlayGreyscale decals: - 3673: 15,-7 - 3674: 16,-7 - 3675: 17,-7 - 3676: 17,-6 - 3677: 16,-6 - 3678: 15,-6 + 3601: 15,-7 + 3602: 16,-7 + 3603: 17,-7 + 3604: 17,-6 + 3605: 16,-6 + 3606: 15,-6 - node: color: '#0000004A' id: FullTileOverlayGreyscale decals: - 3679: 17,-5 - 3680: 17,-6 - 3681: 17,-7 - 3682: 16,-7 - 3683: 15,-7 - 3684: 15,-6 - 3685: 16,-6 - 3686: 16,-5 - 3687: 15,-5 - 3688: 15,-4 - 3689: 16,-4 - 3690: 17,-4 - 3691: 17,-3 - 3692: 16,-3 - 3693: 15,-3 - 3694: 15,-2 - 3695: 17,-2 - 3696: 16,-2 - 3697: 16,-1 - 3698: 17,-1 - 3699: 15,-1 - 3700: 15,0 - 3701: 15,1 - 3702: 15,2 - 3703: 15,3 - 3704: 15,4 - 3705: 16,4 - 3706: 17,4 - 3707: 17,3 - 3708: 16,3 - 3709: 16,2 - 3710: 17,2 - 3711: 17,1 - 3712: 16,1 - 3713: 16,0 - 3714: 17,0 - 3715: 17,5 - 3716: 16,5 - 3717: 15,5 - 3718: 17,-8 - 3719: 16,-8 - 3720: 15,-8 - 3721: 26,0 + 3607: 17,-5 + 3608: 17,-6 + 3609: 17,-7 + 3610: 16,-7 + 3611: 15,-7 + 3612: 15,-6 + 3613: 16,-6 + 3614: 16,-5 + 3615: 15,-5 + 3616: 15,-4 + 3617: 16,-4 + 3618: 17,-4 + 3619: 17,-3 + 3620: 16,-3 + 3621: 15,-3 + 3622: 15,-2 + 3623: 17,-2 + 3624: 16,-2 + 3625: 16,-1 + 3626: 17,-1 + 3627: 15,-1 + 3628: 15,0 + 3629: 15,1 + 3630: 15,2 + 3631: 15,3 + 3632: 15,4 + 3633: 16,4 + 3634: 17,4 + 3635: 17,3 + 3636: 16,3 + 3637: 16,2 + 3638: 17,2 + 3639: 17,1 + 3640: 16,1 + 3641: 16,0 + 3642: 17,0 + 3643: 17,5 + 3644: 16,5 + 3645: 15,5 + 3646: 17,-8 + 3647: 16,-8 + 3648: 15,-8 + 3649: 26,0 - node: color: '#334E6DC8' id: FullTileOverlayGreyscale decals: - 489: 0,3 - 490: 1,3 - 491: 2,3 - 492: 3,3 - 493: -1,3 - 494: -2,3 - 495: -3,3 - 2767: 5,-36 - 2768: 3,-36 - 2769: 5,-37 - 2770: 3,-37 - 3258: 7,-37 - 3259: 7,-36 + 486: 0,3 + 487: 1,3 + 488: 2,3 + 489: 3,3 + 490: -1,3 + 491: -2,3 + 492: -3,3 + 2743: 5,-36 + 2744: 3,-36 + 2745: 5,-37 + 2746: 3,-37 + 3208: 7,-37 + 3209: 7,-36 - node: color: '#52B4E996' id: FullTileOverlayGreyscale decals: 221: 46,-22 237: 33,-16 - 247: 46,-10 - 248: 42,-24 - 2847: 33,-22 - 2859: 46,-17 - 2860: 46,-19 - 2869: 46,-18 - 3728: 48,-16 + 244: 46,-10 + 245: 42,-24 + 2817: 33,-22 + 2829: 46,-17 + 2830: 46,-19 + 2839: 46,-18 + 3656: 48,-16 - node: color: '#A4610696' id: FullTileOverlayGreyscale decals: - 531: 48,15 - 538: 42,6 - 539: 42,5 - 550: 44,4 - 551: 47,8 - 552: 47,7 - 3079: 37,3 - 3080: 39,-1 - 3081: 39,0 - 3082: 36,-2 - 3083: 37,-2 - 3084: 38,-2 - 3085: 38,2 - 3086: 37,2 - 3087: 36,2 - 3160: 49,5 - 3161: 48,5 + 528: 48,15 + 535: 42,6 + 536: 42,5 + 547: 44,4 + 548: 47,8 + 549: 47,7 + 3049: 37,3 + 3050: 39,-1 + 3051: 39,0 + 3052: 36,-2 + 3053: 37,-2 + 3054: 38,-2 + 3055: 38,2 + 3056: 37,2 + 3057: 36,2 + 3117: 49,5 + 3118: 48,5 - node: color: '#D0BF4AA7' id: FullTileOverlayGreyscale @@ -3462,84 +3462,84 @@ entities: color: '#D381C93E' id: FullTileOverlayGreyscale decals: - 318: -46,3 + 315: -46,3 - node: color: '#D381C996' id: FullTileOverlayGreyscale decals: - 507: -39,10 + 504: -39,10 - node: color: '#D4D4D406' id: FullTileOverlayGreyscale decals: - 2391: 41,-10 - 2392: 40,-10 - 2393: 39,-10 - 2394: 38,-10 - 2395: 37,-10 - 2396: 36,-10 - 2397: 36,-9 - 2398: 36,-8 - 2399: 36,-7 - 2400: 36,-6 - 2401: 38,-9 - 2402: 38,-8 - 2403: 38,-7 - 2404: 38,-6 - 2405: 40,-9 - 2406: 40,-8 - 2407: 40,-7 - 2408: 40,-6 + 2367: 41,-10 + 2368: 40,-10 + 2369: 39,-10 + 2370: 38,-10 + 2371: 37,-10 + 2372: 36,-10 + 2373: 36,-9 + 2374: 36,-8 + 2375: 36,-7 + 2376: 36,-6 + 2377: 38,-9 + 2378: 38,-8 + 2379: 38,-7 + 2380: 38,-6 + 2381: 40,-9 + 2382: 40,-8 + 2383: 40,-7 + 2384: 40,-6 - node: color: '#DE3A3A96' id: FullTileOverlayGreyscale decals: - 254: -33,-13 - 255: -33,-10 - 256: -33,-7 - 257: -21,-13 - 258: -21,-10 - 259: -21,-7 - 273: -26,-18 - 274: -28,-18 - 288: -22,-21 - 289: -22,-19 + 251: -33,-13 + 252: -33,-10 + 253: -33,-7 + 254: -21,-13 + 255: -21,-10 + 256: -21,-7 + 270: -26,-18 + 271: -28,-18 + 285: -22,-21 + 286: -22,-19 - node: color: '#EFCC4196' id: FullTileOverlayGreyscale decals: - 2216: -2,14 - 2217: 2,14 - 2218: 1,13 - 2219: 0,13 - 2220: -1,13 - 2221: -1,14 - 2222: 0,14 - 2223: 1,14 - 2224: 1,15 - 2225: 0,15 - 2226: -1,15 - 2227: 0,12 + 2194: -2,14 + 2195: 2,14 + 2196: 1,13 + 2197: 0,13 + 2198: -1,13 + 2199: -1,14 + 2200: 0,14 + 2201: 1,14 + 2202: 1,15 + 2203: 0,15 + 2204: -1,15 + 2205: 0,12 - node: color: '#EFD54193' id: FullTileOverlayGreyscale decals: - 3281: 8,14 - 3282: 5,16 - 3302: -14,28 + 3231: 8,14 + 3232: 5,16 + 3252: -14,28 - node: color: '#EFD84196' id: FullTileOverlayGreyscale decals: - 1857: -19,30 - 1858: -18,30 - 1859: -15,30 + 1835: -19,30 + 1836: -18,30 + 1837: -15,30 - node: cleanable: True color: '#169C9CFF' id: Gene decals: - 2420: 53.01786,-22.012398 + 2396: 53.01786,-22.012398 - node: color: '#FFFFFFFF' id: Grassb1 @@ -3550,100 +3550,100 @@ entities: id: Grassb2 decals: 214: 33.699608,-25.985117 - 954: -5.121248,-69.02713 + 951: -5.121248,-69.02713 - node: color: '#FFFFFFFF' id: Grassb3 decals: - 953: 5.175627,-68.99588 + 950: 5.175627,-68.99588 - node: color: '#FFFFFFFF' id: Grassb4 decals: - 486: -5.939301,-7.022194 - 956: 5.144377,-65.90213 + 483: -5.939301,-7.022194 + 953: 5.144377,-65.90213 - node: color: '#FFFFFFFF' id: Grassb5 decals: 213: 32.824608,-26.016367 - 955: -5.105623,-65.949005 + 952: -5.105623,-65.949005 - node: color: '#FFFFFFFF' id: Grassd1 decals: - 389: 11.06053,2.6519966 - 969: -0.84464484,-69.58963 - 3313: 29.893572,-37.234493 - 3316: 29.924822,-35.203243 + 386: 11.06053,2.6519966 + 966: -0.84464484,-69.58963 + 3263: 29.893572,-37.234493 + 3266: 29.924822,-35.203243 - node: color: '#FFFFFFFF' id: Grassd2 decals: 211: 35.121483,-26.016367 - 388: 10.02928,3.2613716 - 919: 50,29 - 920: 48,23 - 965: 0.9053552,-65.02713 - 970: 0.8272302,-69.83963 - 1335: 10.976067,-66.05625 - 3314: 29.002947,-37.109493 + 385: 10.02928,3.2613716 + 916: 50,29 + 917: 48,23 + 962: 0.9053552,-65.02713 + 967: 0.8272302,-69.83963 + 1332: 10.976067,-66.05625 + 3264: 29.002947,-37.109493 - node: color: '#FFFFFFFF' id: Grassd3 decals: - 387: 11.107405,3.8082466 - 966: -0.92276984,-64.99588 - 3315: 29.018572,-35.15637 + 384: 11.107405,3.8082466 + 963: -0.92276984,-64.99588 + 3265: 29.018572,-35.15637 - node: color: '#FFFFFFFF' id: Grasse1 decals: 210: 34.449608,-26.000742 - 385: 10.37303,4.2613716 - 386: 11.919905,3.4176216 - 967: 0.48348016,-65.511505 - 968: -0.71964484,-67.042755 - 1334: 11.054192,-66.97813 - 1543: -46.974236,5.0132127 + 382: 10.37303,4.2613716 + 383: 11.919905,3.4176216 + 964: 0.48348016,-65.511505 + 965: -0.71964484,-67.042755 + 1331: 11.054192,-66.97813 + 1540: -46.974236,5.0132127 - node: color: '#FFFFFFFF' id: Grasse2 decals: 209: 33.683983,-26.016367 - 383: 9.31053,4.0426216 - 384: 11.357405,4.8394966 - 915: 49,23 - 916: 49,29 - 1333: 11.007317,-67.97813 - 1542: -47.98986,4.9819627 - 3312: 29.065447,-38.00012 - 3317: 29.049822,-36.15637 + 380: 9.31053,4.0426216 + 381: 11.357405,4.8394966 + 912: 49,23 + 913: 49,29 + 1330: 11.007317,-67.97813 + 1539: -47.98986,4.9819627 + 3262: 29.065447,-38.00012 + 3267: 29.049822,-36.15637 - node: color: '#FFFFFFFF' id: Grasse3 decals: 208: 32.949608,-25.985117 - 482: -6.001801,-6.928444 - 483: -6.017426,-6.131569 - 917: 50,23 - 918: 48,29 - 1332: 10.976067,-68.97813 - 3311: 29.846697,-37.93762 - 3318: 29.909197,-36.18762 + 479: -6.001801,-6.928444 + 480: -6.017426,-6.131569 + 914: 50,23 + 915: 48,29 + 1329: 10.976067,-68.97813 + 3261: 29.846697,-37.93762 + 3268: 29.909197,-36.18762 - node: color: '#52B4E996' id: HalfTileOverlayGreyscale decals: - 2870: 47,-17 - 2871: 48,-17 - 3864: 40,-17 - 3865: 39,-17 - 3866: 38,-17 - 3867: 37,-17 - 3868: 36,-17 - 3869: 35,-17 - 3870: 34,-17 + 2840: 47,-17 + 2841: 48,-17 + 3792: 40,-17 + 3793: 39,-17 + 3794: 38,-17 + 3795: 37,-17 + 3796: 36,-17 + 3797: 35,-17 + 3798: 34,-17 - node: color: '#9FED5896' id: HalfTileOverlayGreyscale @@ -3657,15 +3657,15 @@ entities: color: '#A4610696' id: HalfTileOverlayGreyscale decals: - 577: 47,14 - 578: 48,14 - 579: 49,14 - 2921: 45,9 - 2922: 44,9 - 3193: 56,15 - 3194: 55,15 - 3195: 54,15 - 3196: 53,15 + 574: 47,14 + 575: 48,14 + 576: 49,14 + 2891: 45,9 + 2892: 44,9 + 3144: 56,15 + 3145: 55,15 + 3146: 54,15 + 3147: 53,15 - node: color: '#D0BF4AA7' id: HalfTileOverlayGreyscale @@ -3677,16 +3677,16 @@ entities: color: '#D381C996' id: HalfTileOverlayGreyscale decals: - 306: -42,14 - 307: -41,14 - 308: -40,14 - 309: -39,14 - 310: -38,14 - 508: -33,9 - 509: -32,9 - 1636: -43,0 - 1637: -42,0 - 3800: -34,9 + 303: -42,14 + 304: -41,14 + 305: -40,14 + 306: -39,14 + 307: -38,14 + 505: -33,9 + 506: -32,9 + 1633: -43,0 + 1634: -42,0 + 3728: -34,9 - node: color: '#EFB34196' id: HalfTileOverlayGreyscale @@ -3697,32 +3697,32 @@ entities: color: '#EFCC4196' id: HalfTileOverlayGreyscale decals: - 2122: 8,32 - 2123: 7,32 - 2124: 6,32 - 2125: 5,32 - 2126: 4,32 - 2187: 5,21 - 2188: 4,21 - 2189: 3,21 - 2190: 2,21 - 2191: 1,21 - 2192: 0,21 - 2193: -1,21 - 2194: -2,21 - 2214: 6,15 - 2215: 4,15 + 2100: 8,32 + 2101: 7,32 + 2102: 6,32 + 2103: 5,32 + 2104: 4,32 + 2165: 5,21 + 2166: 4,21 + 2167: 3,21 + 2168: 2,21 + 2169: 1,21 + 2170: 0,21 + 2171: -1,21 + 2172: -2,21 + 2192: 6,15 + 2193: 4,15 - node: color: '#52B4E996' id: HalfTileOverlayGreyscale180 decals: - 3853: 34,-21 - 3854: 35,-21 - 3855: 36,-21 - 3856: 37,-21 - 3857: 38,-21 - 3858: 39,-21 - 3859: 40,-21 + 3781: 34,-21 + 3782: 35,-21 + 3783: 36,-21 + 3784: 37,-21 + 3785: 38,-21 + 3786: 39,-21 + 3787: 40,-21 - node: color: '#9FED5896' id: HalfTileOverlayGreyscale180 @@ -3734,9 +3734,9 @@ entities: color: '#A4610696' id: HalfTileOverlayGreyscale180 decals: - 544: 44,5 - 545: 45,5 - 557: 47,12 + 541: 44,5 + 542: 45,5 + 554: 47,12 - node: color: '#D0BF4AA7' id: HalfTileOverlayGreyscale180 @@ -3748,16 +3748,16 @@ entities: color: '#D381C93E' id: HalfTileOverlayGreyscale180 decals: - 335: -36,2 + 332: -36,2 - node: color: '#D381C996' id: HalfTileOverlayGreyscale180 decals: - 302: -38,11 - 303: -42,13 - 304: -41,13 - 305: -40,13 - 1997: -42,-11 + 299: -38,11 + 300: -42,13 + 301: -41,13 + 302: -40,13 + 1975: -42,-11 - node: color: '#EFB34196' id: HalfTileOverlayGreyscale180 @@ -3768,27 +3768,27 @@ entities: color: '#EFCC4196' id: HalfTileOverlayGreyscale180 decals: - 2127: 8,23 - 2128: 7,23 - 2129: 6,23 - 2130: 5,23 - 2131: 4,23 - 2179: 4,17 - 2180: 3,17 - 2181: 1,17 - 2182: 2,17 - 2183: 0,17 - 2184: -1,17 - 2185: -2,17 - 2186: -3,17 - 2211: 5,13 - 2212: 4,13 + 2105: 8,23 + 2106: 7,23 + 2107: 6,23 + 2108: 5,23 + 2109: 4,23 + 2157: 4,17 + 2158: 3,17 + 2159: 1,17 + 2160: 2,17 + 2161: 0,17 + 2162: -1,17 + 2163: -2,17 + 2164: -3,17 + 2189: 5,13 + 2190: 4,13 - node: color: '#334E6DC8' id: HalfTileOverlayGreyscale270 decals: - 497: -4,1 - 498: -3,2 + 494: -4,1 + 495: -3,2 - node: color: '#52B4E996' id: HalfTileOverlayGreyscale270 @@ -3806,24 +3806,24 @@ entities: 10: 50,-28 11: 47,-27 12: 47,-26 - 2811: 43,-27 - 2812: 43,-29 - 2813: 43,-30 - 2814: 43,-31 - 2815: 43,-33 - 2816: 43,-34 + 2787: 43,-27 + 2788: 43,-29 + 2789: 43,-30 + 2790: 43,-31 + 2791: 43,-33 + 2792: 43,-34 - node: color: '#A4610696' id: HalfTileOverlayGreyscale270 decals: - 541: 43,6 - 542: 43,7 - 543: 43,8 - 553: 48,7 - 554: 48,8 - 555: 48,9 - 556: 48,10 - 3162: 48,6 + 538: 43,6 + 539: 43,7 + 540: 43,8 + 550: 48,7 + 551: 48,8 + 552: 48,9 + 553: 48,10 + 3119: 48,6 - node: color: '#D0BF4AA7' id: HalfTileOverlayGreyscale270 @@ -3843,7 +3843,7 @@ entities: color: '#D381C996' id: HalfTileOverlayGreyscale270 decals: - 311: -39,12 + 308: -39,12 - node: color: '#D4D4D428' id: HalfTileOverlayGreyscale270 @@ -3857,37 +3857,37 @@ entities: color: '#DE3A3A96' id: HalfTileOverlayGreyscale270 decals: - 267: -32,-13 - 268: -32,-12 - 269: -32,-11 - 270: -32,-10 - 271: -32,-9 - 272: -32,-8 - 1689: -32,-14 - 1690: -32,-7 + 264: -32,-13 + 265: -32,-12 + 266: -32,-11 + 267: -32,-10 + 268: -32,-9 + 269: -32,-8 + 1669: -32,-14 + 1670: -32,-7 - node: color: '#EFCC4196' id: HalfTileOverlayGreyscale270 decals: - 2176: -5,18 - 2177: -5,19 - 2178: -5,20 - 2201: 9,14 - 2213: 3,14 + 2154: -5,18 + 2155: -5,19 + 2156: -5,20 + 2179: 9,14 + 2191: 3,14 - node: color: '#334E6DC8' id: HalfTileOverlayGreyscale90 decals: - 496: 3,2 - 687: -15,3 + 493: 3,2 + 684: -15,3 - node: color: '#52B4E996' id: HalfTileOverlayGreyscale90 decals: - 2872: 49,-18 - 2873: 49,-19 - 3862: 41,-20 - 3863: 41,-18 + 2842: 49,-18 + 2843: 49,-19 + 3790: 41,-20 + 3791: 41,-18 - node: color: '#9FED5896' id: HalfTileOverlayGreyscale90 @@ -3899,26 +3899,26 @@ entities: 28: 52,-31 29: 52,-32 30: 52,-33 - 2804: 45,-34 - 2805: 45,-32 - 2806: 45,-31 - 2807: 45,-30 - 2808: 45,-29 - 2809: 45,-28 - 2810: 45,-27 + 2780: 45,-34 + 2781: 45,-32 + 2782: 45,-31 + 2783: 45,-30 + 2784: 45,-29 + 2785: 45,-28 + 2786: 45,-27 - node: color: '#A4610696' id: HalfTileOverlayGreyscale90 decals: - 532: 41,5 - 533: 41,6 - 534: 41,7 - 535: 41,8 - 536: 41,9 - 537: 41,10 - 547: 46,6 - 548: 46,7 - 549: 46,8 + 529: 41,5 + 530: 41,6 + 531: 41,7 + 532: 41,8 + 533: 41,9 + 534: 41,10 + 544: 46,6 + 545: 46,7 + 546: 46,8 - node: color: '#D0BF4AA7' id: HalfTileOverlayGreyscale90 @@ -3932,8 +3932,8 @@ entities: color: '#D381C996' id: HalfTileOverlayGreyscale90 decals: - 300: -37,12 - 301: -37,13 + 297: -37,12 + 298: -37,13 - node: color: '#D4D4D428' id: HalfTileOverlayGreyscale90 @@ -3944,22 +3944,22 @@ entities: color: '#DE3A3A96' id: HalfTileOverlayGreyscale90 decals: - 260: -22,-13 - 261: -22,-12 - 262: -22,-11 - 263: -22,-10 - 264: -22,-9 - 265: -22,-8 - 266: -22,-7 - 1688: -22,-14 + 257: -22,-13 + 258: -22,-12 + 259: -22,-11 + 260: -22,-10 + 261: -22,-9 + 262: -22,-8 + 263: -22,-7 + 1668: -22,-14 - node: color: '#EFCC4196' id: HalfTileOverlayGreyscale90 decals: - 2199: 6,18 - 2200: 6,20 - 2209: 7,13 - 2210: 7,14 + 2177: 6,18 + 2178: 6,20 + 2187: 7,13 + 2188: 7,14 - node: angle: -3.141592653589793 rad color: '#FFFFFFFF' @@ -3971,277 +3971,277 @@ entities: color: '#FFFFFFFF' id: LoadingArea decals: - 559: 54,11 - 703: 43,6 + 556: 54,11 + 700: 43,6 - node: color: '#FFFFFFFF' id: LoadingArea decals: 143: 3,-26 - 510: -33,9 - 2877: -18,27 + 507: -33,9 + 2847: -18,27 - node: angle: 1.5707963267948966 rad color: '#D381C996' id: LoadingAreaGreyscale decals: - 1972: -42,-5 + 1950: -42,-5 - node: color: '#FFFFFFFF' id: MiniTileDarkCornerNe decals: - 3019: -116,21 - 3020: -116,25 + 2989: -116,21 + 2990: -116,25 - node: color: '#FFFFFFFF' id: MiniTileDarkCornerNw decals: - 3017: -108,21 - 3021: -108,25 + 2987: -108,21 + 2991: -108,25 - node: color: '#FFFFFFFF' id: MiniTileDarkCornerSe decals: - 3016: -116,30 - 3022: -116,27 + 2986: -116,30 + 2992: -116,27 - node: color: '#FFFFFFFF' id: MiniTileDarkCornerSw decals: - 3018: -108,30 - 3023: -108,27 + 2988: -108,30 + 2993: -108,27 - node: color: '#FFFFFFFF' id: MiniTileDarkLineE decals: - 2990: -116,22 - 2991: -116,23 - 2992: -116,24 - 2993: -116,26 - 2994: -116,28 - 2995: -116,29 + 2960: -116,22 + 2961: -116,23 + 2962: -116,24 + 2963: -116,26 + 2964: -116,28 + 2965: -116,29 - node: color: '#FFFFFFFF' id: MiniTileDarkLineN decals: - 3009: -109,21 - 3010: -110,21 - 3011: -111,21 - 3012: -112,21 - 3013: -113,21 - 3014: -114,21 - 3015: -115,21 + 2979: -109,21 + 2980: -110,21 + 2981: -111,21 + 2982: -112,21 + 2983: -113,21 + 2984: -114,21 + 2985: -115,21 - node: color: '#FFFFFFFF' id: MiniTileDarkLineS decals: - 3002: -109,30 - 3003: -110,30 - 3004: -111,30 - 3005: -112,30 - 3006: -113,30 - 3007: -114,30 - 3008: -115,30 + 2972: -109,30 + 2973: -110,30 + 2974: -111,30 + 2975: -112,30 + 2976: -113,30 + 2977: -114,30 + 2978: -115,30 - node: color: '#FFFFFFFF' id: MiniTileDarkLineW decals: - 1515: -41,2 - 1516: -41,3 - 1517: -41,4 - 1518: -41,5 - 2996: -108,22 - 2997: -108,23 - 2998: -108,24 - 2999: -108,26 - 3000: -108,28 - 3001: -108,29 - 3326: 35,18 + 1512: -41,2 + 1513: -41,3 + 1514: -41,4 + 1515: -41,5 + 2966: -108,22 + 2967: -108,23 + 2968: -108,24 + 2969: -108,26 + 2970: -108,28 + 2971: -108,29 + 3276: 35,18 - node: color: '#80C71F95' id: MonoOverlay decals: - 1522: 47,-30 - 1523: 48,-29 - 1524: 49,-28 - 1525: 49,-30 - 1526: 47,-28 + 1519: 47,-30 + 1520: 48,-29 + 1521: 49,-28 + 1522: 49,-30 + 1523: 47,-28 - node: color: '#D4D4D40C' id: PavementCheckerAOverlay decals: - 2898: 35,-34 - 2899: 32,-33 - 2900: 31,-29 + 2868: 35,-34 + 2869: 32,-33 + 2870: 31,-29 - node: color: '#D4D4D428' id: PavementCheckerAOverlay decals: - 2887: 29,-34 - 2888: 30,-32 - 2889: 28,-34 - 2890: 28,-27 - 2891: 30,-29 - 2892: 32,-27 - 2893: 33,-28 - 2894: 33,-31 - 2895: 33,-30 - 2896: 34,-34 - 2897: 33,-33 + 2857: 29,-34 + 2858: 30,-32 + 2859: 28,-34 + 2860: 28,-27 + 2861: 30,-29 + 2862: 32,-27 + 2863: 33,-28 + 2864: 33,-31 + 2865: 33,-30 + 2866: 34,-34 + 2867: 33,-33 - node: color: '#D4D4D40C' id: PavementCheckerBOverlay decals: - 2911: 33,-34 - 2912: 28,-32 - 2913: 31,-27 - 2914: 32,-28 + 2881: 33,-34 + 2882: 28,-32 + 2883: 31,-27 + 2884: 32,-28 - node: color: '#D4D4D412' id: PavementCheckerBOverlay decals: - 2902: 30,-33 - 2903: 30,-34 - 2904: 29,-32 - 2905: 28,-33 - 2906: 30,-31 - 2907: 28,-28 - 2908: 30,-27 - 2909: 30,-28 - 2910: 31,-29 + 2872: 30,-33 + 2873: 30,-34 + 2874: 29,-32 + 2875: 28,-33 + 2876: 30,-31 + 2877: 28,-28 + 2878: 30,-27 + 2879: 30,-28 + 2880: 31,-29 - node: color: '#D4D4D428' id: PavementCheckerBOverlay decals: - 2881: 35,-30 - 2882: 32,-29 - 2883: 31,-28 - 2884: 29,-28 - 2885: 30,-30 - 2886: 29,-33 - 2901: 31,-33 + 2851: 35,-30 + 2852: 32,-29 + 2853: 31,-28 + 2854: 29,-28 + 2855: 30,-30 + 2856: 29,-33 + 2871: 31,-33 - node: cleanable: True color: '#169C9CFF' id: Prima decals: - 2721: 4.4262443,-52.031498 + 2697: 4.4262443,-52.031498 - node: color: '#334E6DC8' id: QuarterTileOverlayGreyscale decals: - 470: -1,-8 - 471: -1,-7 - 472: -1,-6 - 473: -1,-5 - 474: -1,-4 - 475: -1,-3 - 502: -3,1 - 503: -4,0 - 616: -74,18 - 617: -73,18 - 880: -1,-21 - 881: -1,-20 - 882: -1,-19 - 883: -1,-18 - 884: -1,-17 - 885: -1,-16 - 886: -1,-15 - 887: -1,-14 - 888: -1,-13 - 889: -1,-12 - 890: -1,-11 - 891: -1,-10 + 467: -1,-8 + 468: -1,-7 + 469: -1,-6 + 470: -1,-5 + 471: -1,-4 + 472: -1,-3 + 499: -3,1 + 500: -4,0 + 613: -74,18 + 614: -73,18 + 877: -1,-21 + 878: -1,-20 + 879: -1,-19 + 880: -1,-18 + 881: -1,-17 + 882: -1,-16 + 883: -1,-15 + 884: -1,-14 + 885: -1,-13 + 886: -1,-12 + 887: -1,-11 + 888: -1,-10 - node: color: '#52B4E92E' id: QuarterTileOverlayGreyscale decals: - 1012: 4,-66 + 1009: 4,-66 - node: color: '#52B4E944' id: QuarterTileOverlayGreyscale decals: - 1066: -3,-59 - 1067: -3,-58 - 1068: -3,-57 + 1063: -3,-59 + 1064: -3,-58 + 1065: -3,-57 - node: color: '#52B4E996' id: QuarterTileOverlayGreyscale decals: - 2838: 44,-15 - 2867: 48,-19 - 3538: 44,-25 + 2814: 44,-15 + 2837: 48,-19 + 3484: 44,-25 - node: color: '#79150096' id: QuarterTileOverlayGreyscale decals: - 938: 45,26 - 939: 48,27 - 2678: 37,26 - 2679: 36,26 - 2680: 35,26 - 2681: 34,26 - 2682: 33,26 - 2683: 32,26 - 2684: 20,26 - 2685: 21,26 - 2686: 22,26 - 2687: 23,26 - 2688: 24,26 - 2689: 25,26 - 2690: 26,26 - 2691: 27,26 - 2692: 28,26 - 2693: 29,26 - 2694: 30,26 - 2695: 31,26 - 2878: 19,26 + 935: 45,26 + 936: 48,27 + 2654: 37,26 + 2655: 36,26 + 2656: 35,26 + 2657: 34,26 + 2658: 33,26 + 2659: 32,26 + 2660: 20,26 + 2661: 21,26 + 2662: 22,26 + 2663: 23,26 + 2664: 24,26 + 2665: 25,26 + 2666: 26,26 + 2667: 27,26 + 2668: 28,26 + 2669: 29,26 + 2670: 30,26 + 2671: 31,26 + 2848: 19,26 - node: color: '#A4610696' id: QuarterTileOverlayGreyscale decals: - 580: 50,14 - 635: 27,9 - 636: 25,9 - 637: 26,9 - 638: 21,9 - 639: 20,9 - 640: 19,9 - 3088: 37,1 - 3089: 37,0 - 3090: 37,-1 - 3105: 51,4 - 3106: 50,4 - 3107: 49,4 - 3108: 48,4 - 3109: 48,3 - 3110: 47,3 - 3111: 46,3 - 3112: 45,3 - 3113: 44,3 - 3114: 43,3 - 3115: 42,3 - 3116: 41,3 - 3117: 40,3 + 577: 50,14 + 632: 27,9 + 633: 25,9 + 634: 26,9 + 635: 21,9 + 636: 20,9 + 637: 19,9 + 3058: 37,1 + 3059: 37,0 + 3060: 37,-1 + 3075: 51,4 + 3076: 50,4 + 3077: 49,4 + 3078: 48,4 + 3079: 48,3 + 3080: 47,3 + 3081: 46,3 + 3082: 45,3 + 3083: 44,3 + 3084: 43,3 + 3085: 42,3 + 3086: 41,3 + 3087: 40,3 - node: color: '#D381C996' id: QuarterTileOverlayGreyscale decals: - 313: -35,11 - 314: -35,12 - 315: -35,13 - 316: -35,14 - 317: -35,15 - 1598: -31,9 - 1600: -37,9 - 1601: -38,9 - 1602: -39,9 - 1603: -39,8 - 1604: -39,7 - 1605: -39,6 - 1979: -40,-4 - 1980: -39,-4 - 1981: -39,-3 + 310: -35,11 + 311: -35,12 + 312: -35,13 + 313: -35,14 + 314: -35,15 + 1595: -31,9 + 1597: -37,9 + 1598: -38,9 + 1599: -39,9 + 1600: -39,8 + 1601: -39,7 + 1602: -39,6 + 1957: -40,-4 + 1958: -39,-4 + 1959: -39,-3 - node: color: '#D4D4D428' id: QuarterTileOverlayGreyscale @@ -4249,252 +4249,252 @@ entities: 178: 15,-5 179: 15,-6 180: 15,-7 - 367: 15,-14 - 368: 15,-13 - 369: 15,-12 - 370: 15,-11 - 371: 15,-15 - 1119: -3,-54 - 1126: -2,-52 - 1127: -2,-51 - 1128: -2,-50 - 1129: -2,-49 - 1130: -2,-48 - 1131: -2,-47 - 1132: -2,-46 - 1178: -17,11 - 1179: -17,12 - 1180: -17,13 - 1181: -17,14 - 1182: -17,15 - 1183: -17,17 - 1184: -17,16 - 1185: -17,18 - 1186: -17,19 - 1187: -17,20 - 1188: -17,21 - 1367: 6,-22 - 1368: 6,-21 - 1369: 6,-20 - 1370: 7,-20 - 1371: 8,-20 - 1372: 9,-20 - 1373: 6,-23 - 1374: 5,-23 - 1375: 4,-23 - 1376: 3,-23 - 1397: -4,10 - 1398: -5,10 - 1399: -6,10 - 1400: -7,10 - 1401: -7,9 - 1402: -8,9 - 1403: -9,9 - 1404: -10,9 - 1405: -11,9 - 1406: -12,9 - 1432: -31,25 - 1433: -29,25 - 1434: -30,25 - 1435: -28,25 - 1436: -27,25 - 1437: -26,25 - 1438: -25,25 - 1439: -24,25 - 1463: -22,-23 - 1464: -23,-23 - 1465: -24,-23 - 1466: -25,-23 - 1467: -26,-23 - 1471: 10,-23 - 1472: 11,-23 - 1473: 12,-23 - 1474: 13,-23 - 1475: 14,-23 - 1490: 36,10 - 1491: 36,11 - 1492: 37,11 - 1493: 38,11 - 1630: 8,7 - 2080: -39,-19 - 2081: -39,-20 - 2082: -39,-21 - 2083: -39,-22 - 2084: -39,-23 - 2119: -10,-23 - 2120: -11,-23 - 2121: -12,-23 - 2332: -28,9 - 2333: -29,9 - 2334: -30,9 - 2335: -17,5 - 2336: -17,4 - 2337: -17,3 - 2338: -18,9 - 2341: -17,9 - 2591: 15,12 - 2592: 15,11 - 2593: 15,9 - 2595: 15,-22 - 2596: 15,-23 - 2599: -17,-23 - 2624: 15,23 - 2625: 15,24 - 2626: 15,25 - 2627: 15,27 - 2628: 15,28 - 2642: -1,-41 - 2643: -1,-40 - 2644: -1,-39 - 2645: -1,-38 - 2646: -1,-37 - 2647: -1,-36 - 2648: -1,-35 - 2649: -1,-34 - 2650: -1,-33 - 2651: -1,-32 - 2652: -1,-31 - 2653: -1,-30 - 2654: -1,-29 - 2655: -1,-28 - 3663: -10,-54 - 3664: -9,-54 - 3665: -8,-54 - 3666: -7,-54 - 3667: -6,-54 - 3668: -5,-54 - 3669: -17,-54 - 3670: -18,-54 - 3671: -19,-54 + 364: 15,-14 + 365: 15,-13 + 366: 15,-12 + 367: 15,-11 + 368: 15,-15 + 1116: -3,-54 + 1123: -2,-52 + 1124: -2,-51 + 1125: -2,-50 + 1126: -2,-49 + 1127: -2,-48 + 1128: -2,-47 + 1129: -2,-46 + 1175: -17,11 + 1176: -17,12 + 1177: -17,13 + 1178: -17,14 + 1179: -17,15 + 1180: -17,17 + 1181: -17,16 + 1182: -17,18 + 1183: -17,19 + 1184: -17,20 + 1185: -17,21 + 1364: 6,-22 + 1365: 6,-21 + 1366: 6,-20 + 1367: 7,-20 + 1368: 8,-20 + 1369: 9,-20 + 1370: 6,-23 + 1371: 5,-23 + 1372: 4,-23 + 1373: 3,-23 + 1394: -4,10 + 1395: -5,10 + 1396: -6,10 + 1397: -7,10 + 1398: -7,9 + 1399: -8,9 + 1400: -9,9 + 1401: -10,9 + 1402: -11,9 + 1403: -12,9 + 1429: -31,25 + 1430: -29,25 + 1431: -30,25 + 1432: -28,25 + 1433: -27,25 + 1434: -26,25 + 1435: -25,25 + 1436: -24,25 + 1460: -22,-23 + 1461: -23,-23 + 1462: -24,-23 + 1463: -25,-23 + 1464: -26,-23 + 1468: 10,-23 + 1469: 11,-23 + 1470: 12,-23 + 1471: 13,-23 + 1472: 14,-23 + 1487: 36,10 + 1488: 36,11 + 1489: 37,11 + 1490: 38,11 + 1627: 8,7 + 2058: -39,-19 + 2059: -39,-20 + 2060: -39,-21 + 2061: -39,-22 + 2062: -39,-23 + 2097: -10,-23 + 2098: -11,-23 + 2099: -12,-23 + 2308: -28,9 + 2309: -29,9 + 2310: -30,9 + 2311: -17,5 + 2312: -17,4 + 2313: -17,3 + 2314: -18,9 + 2317: -17,9 + 2567: 15,12 + 2568: 15,11 + 2569: 15,9 + 2571: 15,-22 + 2572: 15,-23 + 2575: -17,-23 + 2600: 15,23 + 2601: 15,24 + 2602: 15,25 + 2603: 15,27 + 2604: 15,28 + 2618: -1,-41 + 2619: -1,-40 + 2620: -1,-39 + 2621: -1,-38 + 2622: -1,-37 + 2623: -1,-36 + 2624: -1,-35 + 2625: -1,-34 + 2626: -1,-33 + 2627: -1,-32 + 2628: -1,-31 + 2629: -1,-30 + 2630: -1,-29 + 2631: -1,-28 + 3591: -10,-54 + 3592: -9,-54 + 3593: -8,-54 + 3594: -7,-54 + 3595: -6,-54 + 3596: -5,-54 + 3597: -17,-54 + 3598: -18,-54 + 3599: -19,-54 - node: color: '#D4D4D437' id: QuarterTileOverlayGreyscale decals: - 1013: -3,-61 - 1014: -3,-62 - 1015: -3,-63 - 1016: -3,-64 - 1017: -3,-65 - 1018: -3,-66 - 1019: -4,-66 - 1020: -4,-67 - 1021: -4,-68 - 1022: -4,-69 - 1023: -3,-70 - 1024: -3,-71 - 1025: -3,-72 - 1026: -3,-73 - 1027: -3,-74 + 1010: -3,-61 + 1011: -3,-62 + 1012: -3,-63 + 1013: -3,-64 + 1014: -3,-65 + 1015: -3,-66 + 1016: -4,-66 + 1017: -4,-67 + 1018: -4,-68 + 1019: -4,-69 + 1020: -3,-70 + 1021: -3,-71 + 1022: -3,-72 + 1023: -3,-73 + 1024: -3,-74 - node: color: '#D4D4D441' id: QuarterTileOverlayGreyscale decals: - 948: 43,26 - 949: 47,26 + 945: 43,26 + 946: 47,26 - node: color: '#D4D4D496' id: QuarterTileOverlayGreyscale decals: - 1551: 51,22 - 1552: 50,22 - 1553: 49,22 - 1554: 48,22 - 1555: 47,22 - 1563: 52,23 - 1564: 52,22 - 1582: 41,18 - 1583: 40,18 - 1584: 39,18 + 1548: 51,22 + 1549: 50,22 + 1550: 49,22 + 1551: 48,22 + 1552: 47,22 + 1560: 52,23 + 1561: 52,22 + 1579: 41,18 + 1580: 40,18 + 1581: 39,18 - node: color: '#DE3A3A96' id: QuarterTileOverlayGreyscale decals: - 654: -17,-17 - 655: -17,-16 - 656: -17,-15 - 657: -17,-14 - 658: -17,-13 - 659: -17,-12 - 660: -17,-11 - 661: -17,-10 - 662: -17,-9 - 663: -17,-8 - 664: -17,-7 - 665: -17,-6 - 701: -18,1 - 702: -18,2 - 3906: -13,-14 - 3907: -13,-15 - 3908: -13,-16 - 3909: -13,-17 + 651: -17,-17 + 652: -17,-16 + 653: -17,-15 + 654: -17,-14 + 655: -17,-13 + 656: -17,-12 + 657: -17,-11 + 658: -17,-10 + 659: -17,-9 + 660: -17,-8 + 661: -17,-7 + 662: -17,-6 + 698: -18,1 + 699: -18,2 + 3834: -13,-14 + 3835: -13,-15 + 3836: -13,-16 + 3837: -13,-17 - node: color: '#EFCC4196' id: QuarterTileOverlayGreyscale decals: - 2207: 9,13 - 2228: -1,11 - 2229: -2,11 - 2230: -3,11 - 2231: -4,11 + 2185: 9,13 + 2206: -1,11 + 2207: -2,11 + 2208: -3,11 + 2209: -4,11 - node: color: '#FF994193' id: QuarterTileOverlayGreyscale decals: - 3657: -13,-54 - 3658: -12,-54 - 3659: -14,-54 - 3660: -15,-54 - 3661: -16,-54 - 3662: -11,-54 + 3585: -13,-54 + 3586: -12,-54 + 3587: -14,-54 + 3588: -15,-54 + 3589: -16,-54 + 3590: -11,-54 - node: color: '#FFEF9292' id: QuarterTileOverlayGreyscale decals: - 2825: 44,-35 + 2801: 44,-35 - node: color: '#334E6DC8' id: QuarterTileOverlayGreyscale180 decals: - 688: -15,4 + 685: -15,4 - node: color: '#52B4E92E' id: QuarterTileOverlayGreyscale180 decals: - 997: 3,-61 - 998: 3,-62 - 999: 3,-63 - 1000: 3,-64 - 1001: 3,-65 - 1002: 4,-66 - 1003: 4,-67 - 1004: 4,-68 - 1005: 4,-69 - 1006: 3,-70 - 1007: 3,-71 - 1008: 3,-72 - 1009: 3,-73 - 1010: 3,-74 - 1011: 3,-69 + 994: 3,-61 + 995: 3,-62 + 996: 3,-63 + 997: 3,-64 + 998: 3,-65 + 999: 4,-66 + 1000: 4,-67 + 1001: 4,-68 + 1002: 4,-69 + 1003: 3,-70 + 1004: 3,-71 + 1005: 3,-72 + 1006: 3,-73 + 1007: 3,-74 + 1008: 3,-69 - node: color: '#52B4E996' id: QuarterTileOverlayGreyscale180 decals: - 249: 41,-25 - 250: 40,-25 - 251: 39,-25 - 252: 38,-25 - 253: 37,-25 - 2837: 44,-9 - 2868: 47,-18 - 3530: 44,-17 + 246: 41,-25 + 247: 40,-25 + 248: 39,-25 + 249: 38,-25 + 250: 37,-25 + 2813: 44,-9 + 2838: 47,-18 + 3476: 44,-17 - node: color: '#79150096' id: QuarterTileOverlayGreyscale180 decals: - 931: 56,20 - 932: 54,20 - 933: 52,20 - 936: 56,22 + 928: 56,20 + 929: 54,20 + 930: 52,20 + 933: 56,22 - node: color: '#9FED5896' id: QuarterTileOverlayGreyscale180 @@ -4502,195 +4502,195 @@ entities: 13: 47,-27 23: 52,-26 31: 50,-33 - 3627: 35,-25 - 3628: 34,-25 - 3629: 33,-25 + 3556: 35,-25 + 3557: 34,-25 + 3558: 33,-25 - node: color: '#A4610696' id: QuarterTileOverlayGreyscale180 decals: - 628: 41,11 - 641: 34,7 - 642: 33,7 - 643: 32,7 - 644: 31,7 - 645: 30,7 - 646: 29,7 - 647: 28,7 - 649: 38,4 - 650: 41,13 - 651: 41,14 - 652: 41,15 - 653: 41,16 + 625: 41,11 + 638: 34,7 + 639: 33,7 + 640: 32,7 + 641: 31,7 + 642: 30,7 + 643: 29,7 + 644: 28,7 + 646: 38,4 + 647: 41,13 + 648: 41,14 + 649: 41,15 + 650: 41,16 - node: color: '#D4D4D428' id: QuarterTileOverlayGreyscale180 decals: - 1447: -28,7 - 1448: -29,7 - 1449: -30,7 - 1450: -31,7 - 1451: -32,7 - 1452: -33,7 - 1453: -34,7 - 1468: 9,-20 - 1469: 9,-21 - 1470: 9,-22 - 1497: -14,-2 - 1498: -15,-2 - 1499: -15,-3 - 1500: -15,-4 - 1501: -15,-5 - 1502: -15,-6 - 1503: -15,-7 - 1504: -15,-8 - 1505: -15,-9 - 1506: -15,5 - 1507: -15,6 - 1508: -15,7 - 1509: -14,7 - 1510: 10,7 - 1511: 9,7 - 1512: 8,7 - 1606: -12,7 - 1607: -11,7 - 1608: -10,7 - 1609: -9,7 - 1610: -8,7 - 1611: -8,8 - 1612: -7,8 - 1613: -6,8 - 1614: -5,8 - 1615: -5,9 - 1616: -4,9 - 1617: -3,9 - 1618: -2,9 - 1619: -1,9 - 2104: -28,-25 - 2105: -29,-25 - 2620: -28,23 - 2621: -29,23 - 2622: -30,23 - 2623: -31,23 - 2671: 1,-43 - 2672: 2,-78 - 2673: 2,-77 - 2674: 2,-76 - 3630: 32,-25 - 3631: 31,-25 - 3632: 30,-25 - 3633: 29,-25 - 3634: 28,-25 - 3635: 27,-25 - 3636: 26,-25 - 3637: 25,-25 - 3638: 23,-25 - 3639: 24,-25 - 3640: 22,-25 - 3641: 21,-25 - 3642: 20,-25 - 3643: 19,-25 + 1444: -28,7 + 1445: -29,7 + 1446: -30,7 + 1447: -31,7 + 1448: -32,7 + 1449: -33,7 + 1450: -34,7 + 1465: 9,-20 + 1466: 9,-21 + 1467: 9,-22 + 1494: -14,-2 + 1495: -15,-2 + 1496: -15,-3 + 1497: -15,-4 + 1498: -15,-5 + 1499: -15,-6 + 1500: -15,-7 + 1501: -15,-8 + 1502: -15,-9 + 1503: -15,5 + 1504: -15,6 + 1505: -15,7 + 1506: -14,7 + 1507: 10,7 + 1508: 9,7 + 1509: 8,7 + 1603: -12,7 + 1604: -11,7 + 1605: -10,7 + 1606: -9,7 + 1607: -8,7 + 1608: -8,8 + 1609: -7,8 + 1610: -6,8 + 1611: -5,8 + 1612: -5,9 + 1613: -4,9 + 1614: -3,9 + 1615: -2,9 + 1616: -1,9 + 2082: -28,-25 + 2083: -29,-25 + 2596: -28,23 + 2597: -29,23 + 2598: -30,23 + 2599: -31,23 + 2647: 1,-43 + 2648: 2,-78 + 2649: 2,-77 + 2650: 2,-76 + 3559: 32,-25 + 3560: 31,-25 + 3561: 30,-25 + 3562: 29,-25 + 3563: 28,-25 + 3564: 27,-25 + 3565: 26,-25 + 3566: 25,-25 + 3567: 23,-25 + 3568: 24,-25 + 3569: 22,-25 + 3570: 21,-25 + 3571: 20,-25 + 3572: 19,-25 - node: color: '#D4D4D437' id: QuarterTileOverlayGreyscale180 decals: - 1028: -4,-69 - 1060: 3,-59 - 1061: 3,-58 - 1062: 3,-57 + 1025: -4,-69 + 1057: 3,-59 + 1058: 3,-58 + 1059: 3,-57 - node: color: '#D4D4D441' id: QuarterTileOverlayGreyscale180 decals: - 943: 56,21 - 944: 55,20 - 945: 53,20 + 940: 56,21 + 941: 55,20 + 942: 53,20 - node: color: '#D4D4D496' id: QuarterTileOverlayGreyscale180 decals: - 1556: 46,23 - 1557: 46,24 - 1558: 47,24 - 1559: 48,24 - 1560: 49,24 - 1561: 50,24 - 1562: 51,24 - 1585: 39,20 - 1586: 40,20 - 1587: 41,20 + 1553: 46,23 + 1554: 46,24 + 1555: 47,24 + 1556: 48,24 + 1557: 49,24 + 1558: 50,24 + 1559: 51,24 + 1582: 39,20 + 1583: 40,20 + 1584: 41,20 - node: color: '#EFB3414A' id: QuarterTileOverlayGreyscale180 decals: - 3057: 19,6 - 3058: 20,6 - 3059: 20,7 - 3060: 21,7 - 3061: 22,7 + 3027: 19,6 + 3028: 20,6 + 3029: 20,7 + 3030: 21,7 + 3031: 22,7 - node: color: '#EFB34160' id: QuarterTileOverlayGreyscale180 decals: - 2573: 17,19 - 2574: 17,20 - 2575: 17,21 + 2549: 17,19 + 2550: 17,20 + 2551: 17,21 - node: color: '#FFEF9292' id: QuarterTileOverlayGreyscale180 decals: - 2826: 44,-27 + 2802: 44,-27 - node: color: '#334E6DC8' id: QuarterTileOverlayGreyscale270 decals: - 613: -74,16 - 614: -73,16 - 615: -72,16 + 610: -74,16 + 611: -73,16 + 612: -72,16 - node: color: '#52B4E92E' id: QuarterTileOverlayGreyscale270 decals: - 981: -3,-74 - 982: -3,-73 - 983: -3,-72 - 984: -3,-71 - 985: -3,-70 - 986: -3,-69 - 987: -4,-69 - 988: -4,-68 - 989: -4,-67 - 990: -4,-66 - 991: -3,-65 - 992: -3,-64 - 993: -3,-63 - 994: -3,-62 - 995: -3,-61 + 978: -3,-74 + 979: -3,-73 + 980: -3,-72 + 981: -3,-71 + 982: -3,-70 + 983: -3,-69 + 984: -4,-69 + 985: -4,-68 + 986: -4,-67 + 987: -4,-66 + 988: -3,-65 + 989: -3,-64 + 990: -3,-63 + 991: -3,-62 + 992: -3,-61 - node: color: '#79150096' id: QuarterTileOverlayGreyscale270 decals: - 928: 42,20 - 929: 44,20 - 930: 46,20 - 1572: 47,24 - 1573: 48,24 - 1574: 49,24 - 1575: 50,24 - 1576: 51,24 - 1577: 52,24 - 1578: 52,23 - 1588: 41,20 - 1589: 40,20 - 1590: 39,20 + 925: 42,20 + 926: 44,20 + 927: 46,20 + 1569: 47,24 + 1570: 48,24 + 1571: 49,24 + 1572: 50,24 + 1573: 51,24 + 1574: 52,24 + 1575: 52,23 + 1585: 41,20 + 1586: 40,20 + 1587: 39,20 - node: color: '#9FED584A' id: QuarterTileOverlayGreyscale270 decals: - 3215: 39,16 - 3216: 39,15 - 3217: 39,14 - 3218: 39,13 + 3165: 39,16 + 3166: 39,15 + 3167: 39,14 + 3168: 39,13 - node: color: '#9FED5896' id: QuarterTileOverlayGreyscale270 @@ -4701,32 +4701,32 @@ entities: color: '#A4610696' id: QuarterTileOverlayGreyscale270 decals: - 558: 48,12 - 648: 36,4 - 3163: 49,6 - 3164: 50,6 - 3165: 54,6 - 3166: 51,6 - 3167: 52,6 - 3168: 53,6 - 3169: 55,6 - 3170: 56,6 + 555: 48,12 + 645: 36,4 + 3120: 49,6 + 3121: 50,6 + 3122: 54,6 + 3123: 51,6 + 3124: 52,6 + 3125: 53,6 + 3126: 55,6 + 3127: 56,6 - node: color: '#D381C996' id: QuarterTileOverlayGreyscale270 decals: - 312: -39,13 - 1982: -39,1 - 1983: -39,2 - 1984: -39,3 - 1985: -39,4 - 1986: -40,-8 - 1987: -39,-8 - 1988: -39,-9 - 1989: -39,-10 - 1990: -39,-11 - 1991: -39,-12 - 1992: -40,-7 + 309: -39,13 + 1960: -39,1 + 1961: -39,2 + 1962: -39,3 + 1963: -39,4 + 1964: -40,-8 + 1965: -39,-8 + 1966: -39,-9 + 1967: -39,-10 + 1968: -39,-11 + 1969: -39,-12 + 1970: -40,-7 - node: color: '#D4D4D428' id: QuarterTileOverlayGreyscale270 @@ -4734,190 +4734,190 @@ entities: 181: 15,2 182: 15,3 183: 15,4 - 1098: -5,-56 - 1099: -6,-56 - 1100: -7,-56 - 1101: -8,-56 - 1102: -9,-56 - 1103: -10,-56 - 1104: -11,-56 - 1105: -12,-56 - 1106: -13,-56 - 1107: -14,-56 - 1108: -15,-56 - 1109: -16,-56 - 1110: -17,-56 - 1111: -18,-56 - 1112: -19,-56 - 1141: 20,23 - 1142: 21,23 - 1143: 22,23 - 1144: 23,23 - 1145: 24,23 - 1146: 25,23 - 1147: 27,23 - 1148: 28,23 - 1149: 29,23 - 1150: 30,23 - 1151: 34,23 - 1152: 35,23 - 1153: 36,23 - 1154: 37,23 - 1413: -44,19 - 1414: -44,20 - 1415: -44,21 - 1416: -44,22 - 1417: -44,23 - 1418: -44,24 - 1419: -44,25 - 1440: -20,7 - 1441: -21,7 - 1442: -22,7 - 1443: -23,7 - 1444: -24,7 - 1445: -25,7 - 1446: -26,7 - 1454: -39,-25 - 1455: -38,-25 - 1456: -37,-25 - 1457: -36,-25 - 1458: -35,-25 - 1459: -34,-25 - 1460: -33,-25 - 1461: -32,-25 - 1462: -31,-25 - 1513: 12,7 - 1514: 13,7 - 1620: 1,9 - 1621: 2,9 - 1622: 3,9 - 1623: 4,9 - 1624: 5,9 - 1625: 5,8 - 1626: 6,8 - 1627: 7,8 - 1628: 8,8 - 1629: 8,7 - 2100: -39,-17 - 2101: -39,-16 - 2102: -39,-15 - 2103: -39,-14 - 2106: -26,-25 - 2107: -25,-25 - 2108: -24,-25 - 2109: -23,-25 - 2110: -22,-25 - 2111: -21,-25 - 2112: -20,-25 - 2113: -19,-25 - 2114: -18,-25 - 2115: -17,-25 - 2116: -16,-25 - 2117: -15,-25 - 2118: -14,-25 - 2342: -17,7 - 2343: -18,7 - 2583: 15,14 - 2584: 15,15 - 2585: 15,16 - 2586: 15,17 - 2587: 15,18 - 2588: 15,19 - 2589: 15,20 - 2590: 15,21 - 2600: -17,-22 - 2614: -24,23 - 2615: -23,23 - 2616: -22,23 - 2617: -21,23 - 2618: -20,23 - 2619: -19,23 - 2670: -1,-43 - 2675: -2,-78 - 2676: -2,-77 - 2677: -2,-76 + 1095: -5,-56 + 1096: -6,-56 + 1097: -7,-56 + 1098: -8,-56 + 1099: -9,-56 + 1100: -10,-56 + 1101: -11,-56 + 1102: -12,-56 + 1103: -13,-56 + 1104: -14,-56 + 1105: -15,-56 + 1106: -16,-56 + 1107: -17,-56 + 1108: -18,-56 + 1109: -19,-56 + 1138: 20,23 + 1139: 21,23 + 1140: 22,23 + 1141: 23,23 + 1142: 24,23 + 1143: 25,23 + 1144: 27,23 + 1145: 28,23 + 1146: 29,23 + 1147: 30,23 + 1148: 34,23 + 1149: 35,23 + 1150: 36,23 + 1151: 37,23 + 1410: -44,19 + 1411: -44,20 + 1412: -44,21 + 1413: -44,22 + 1414: -44,23 + 1415: -44,24 + 1416: -44,25 + 1437: -20,7 + 1438: -21,7 + 1439: -22,7 + 1440: -23,7 + 1441: -24,7 + 1442: -25,7 + 1443: -26,7 + 1451: -39,-25 + 1452: -38,-25 + 1453: -37,-25 + 1454: -36,-25 + 1455: -35,-25 + 1456: -34,-25 + 1457: -33,-25 + 1458: -32,-25 + 1459: -31,-25 + 1510: 12,7 + 1511: 13,7 + 1617: 1,9 + 1618: 2,9 + 1619: 3,9 + 1620: 4,9 + 1621: 5,9 + 1622: 5,8 + 1623: 6,8 + 1624: 7,8 + 1625: 8,8 + 1626: 8,7 + 2078: -39,-17 + 2079: -39,-16 + 2080: -39,-15 + 2081: -39,-14 + 2084: -26,-25 + 2085: -25,-25 + 2086: -24,-25 + 2087: -23,-25 + 2088: -22,-25 + 2089: -21,-25 + 2090: -20,-25 + 2091: -19,-25 + 2092: -18,-25 + 2093: -17,-25 + 2094: -16,-25 + 2095: -15,-25 + 2096: -14,-25 + 2318: -17,7 + 2319: -18,7 + 2559: 15,14 + 2560: 15,15 + 2561: 15,16 + 2562: 15,17 + 2563: 15,18 + 2564: 15,19 + 2565: 15,20 + 2566: 15,21 + 2576: -17,-22 + 2590: -24,23 + 2591: -23,23 + 2592: -22,23 + 2593: -21,23 + 2594: -20,23 + 2595: -19,23 + 2646: -1,-43 + 2651: -2,-78 + 2652: -2,-77 + 2653: -2,-76 - node: color: '#D4D4D437' id: QuarterTileOverlayGreyscale270 decals: - 1043: 4,-69 - 1057: -3,-59 - 1058: -3,-58 - 1059: -3,-57 + 1040: 4,-69 + 1054: -3,-59 + 1055: -3,-58 + 1056: -3,-57 - node: color: '#D4D4D441' id: QuarterTileOverlayGreyscale270 decals: - 946: 45,20 - 947: 43,20 + 943: 45,20 + 944: 43,20 - node: color: '#DE3A3A96' id: QuarterTileOverlayGreyscale270 decals: - 699: -18,-1 - 700: -18,0 + 696: -18,-1 + 697: -18,0 - node: color: '#DF81C96C' id: QuarterTileOverlayGreyscale270 decals: - 3130: 48,4 + 3100: 48,4 - node: color: '#EFB3414A' id: QuarterTileOverlayGreyscale270 decals: - 3052: 27,6 - 3053: 26,6 - 3054: 26,7 - 3055: 25,7 - 3056: 24,7 + 3022: 27,6 + 3023: 26,6 + 3024: 26,7 + 3025: 25,7 + 3026: 24,7 - node: color: '#EFCC4196' id: QuarterTileOverlayGreyscale270 decals: - 2208: 9,15 + 2186: 9,15 - node: color: '#EFD54193' id: QuarterTileOverlayGreyscale270 decals: - 3280: 6,13 + 3230: 6,13 - node: color: '#334E6DC8' id: QuarterTileOverlayGreyscale90 decals: - 476: 1,-8 - 477: 1,-7 - 478: 1,-6 - 479: 1,-5 - 480: 1,-4 - 481: 1,-3 - 500: 3,1 - 501: -4,1 - 504: 4,0 - 691: -15,2 - 868: 1,-10 - 869: 1,-11 - 870: 1,-12 - 871: 1,-13 - 872: 1,-14 - 873: 1,-15 - 874: 1,-16 - 875: 1,-17 - 876: 1,-18 - 877: 1,-19 - 878: 1,-20 - 879: 1,-21 + 473: 1,-8 + 474: 1,-7 + 475: 1,-6 + 476: 1,-5 + 477: 1,-4 + 478: 1,-3 + 497: 3,1 + 498: -4,1 + 501: 4,0 + 688: -15,2 + 865: 1,-10 + 866: 1,-11 + 867: 1,-12 + 868: 1,-13 + 869: 1,-14 + 870: 1,-15 + 871: 1,-16 + 872: 1,-17 + 873: 1,-18 + 874: 1,-19 + 875: 1,-20 + 876: 1,-21 - node: color: '#52B4E92E' id: QuarterTileOverlayGreyscale90 decals: - 996: -4,-66 + 993: -4,-66 - node: color: '#52B4E944' id: QuarterTileOverlayGreyscale90 decals: - 1063: 3,-59 - 1064: 3,-58 - 1065: 3,-57 + 1060: 3,-59 + 1061: 3,-58 + 1062: 3,-57 - node: color: '#52B4E996' id: QuarterTileOverlayGreyscale90 @@ -4927,29 +4927,29 @@ entities: 240: 39,-23 241: 40,-23 242: 41,-23 - 3622: 35,-23 - 3623: 34,-23 - 3624: 33,-23 - 3625: 32,-23 - 3626: 31,-23 + 3551: 35,-23 + 3552: 34,-23 + 3553: 33,-23 + 3554: 32,-23 + 3555: 31,-23 - node: color: '#79150096' id: QuarterTileOverlayGreyscale90 decals: - 934: 56,26 - 935: 56,24 - 937: 53,26 - 940: 50,27 - 1565: 51,22 - 1566: 50,22 - 1567: 49,22 - 1568: 48,22 - 1569: 47,22 - 1570: 46,22 - 1571: 46,23 - 1579: 41,18 - 1580: 40,18 - 1581: 39,18 + 931: 56,26 + 932: 56,24 + 934: 53,26 + 937: 50,27 + 1562: 51,22 + 1563: 50,22 + 1564: 49,22 + 1565: 48,22 + 1566: 47,22 + 1567: 46,22 + 1568: 46,23 + 1576: 41,18 + 1577: 40,18 + 1578: 39,18 - node: color: '#9FED5896' id: QuarterTileOverlayGreyscale90 @@ -4959,286 +4959,286 @@ entities: color: '#A4610696' id: QuarterTileOverlayGreyscale90 decals: - 629: 34,9 - 630: 33,9 - 631: 32,9 - 632: 31,9 - 633: 30,9 - 634: 29,9 + 626: 34,9 + 627: 33,9 + 628: 32,9 + 629: 31,9 + 630: 30,9 + 631: 29,9 - node: color: '#D381C996' id: QuarterTileOverlayGreyscale90 decals: - 1599: -35,9 - 2530: -55,17 - 2531: -56,17 - 2532: -57,17 - 2533: -54,17 + 1596: -35,9 + 2506: -55,17 + 2507: -56,17 + 2508: -57,17 + 2509: -54,17 - node: color: '#D4D4D428' id: QuarterTileOverlayGreyscale90 decals: - 1113: 10,-54 - 1114: 9,-54 - 1115: 7,-54 - 1116: 8,-54 - 1117: 5,-54 - 1118: 3,-54 - 1120: 2,-47 - 1121: 2,-48 - 1122: 2,-49 - 1123: 2,-50 - 1124: 2,-51 - 1125: 2,-52 - 1378: -3,-23 - 1379: -4,-23 - 1380: -5,-23 - 1381: -6,-23 - 1382: -7,-23 - 1383: -8,-23 - 1384: -13,-23 - 1385: -14,-23 - 1386: 5,10 - 1387: 6,10 - 1388: 7,10 - 1389: 4,10 - 1390: 7,9 - 1391: 8,9 - 1392: 9,9 - 1393: 10,9 - 1394: 11,9 - 1395: 12,9 - 1396: 13,9 - 1420: -44,25 - 1421: -43,25 - 1422: -42,25 - 1423: -41,25 - 1424: -40,25 - 1425: -39,25 - 1426: -38,25 - 1427: -37,25 - 1428: -36,25 - 1429: -35,25 - 1430: -34,25 - 1431: -33,25 - 1476: 30,-23 - 1477: 29,-23 - 1478: 28,-23 - 1479: 27,-23 - 1480: 26,-23 - 1481: 25,-23 - 1482: 24,-23 - 1483: 23,-23 - 1484: 22,-23 - 1485: 21,-23 - 1486: 20,-23 - 1487: 19,-23 - 1488: 18,-23 - 1494: -15,1 - 1495: -15,0 - 1496: -14,0 - 1860: -15,21 - 1861: -15,20 - 1862: -15,19 - 1863: -15,18 - 1864: -15,17 - 1865: -15,16 - 1866: -15,15 - 1867: -15,14 - 1868: -15,13 - 1869: -15,12 - 1870: -15,11 - 2086: -28,-23 - 2087: -29,-23 - 2088: -30,-23 - 2089: -31,-23 - 2090: -32,-23 - 2091: -33,-23 - 2092: -34,-23 - 2093: -35,-23 - 2094: -36,-23 - 2095: -37,-23 - 2096: -37,-22 - 2097: -37,-21 - 2098: -37,-20 - 2099: -37,-19 - 2327: -20,9 - 2328: -21,9 - 2329: -22,9 - 2330: -23,9 - 2331: -24,9 - 2339: -14,9 - 2340: -15,9 - 2579: 17,14 - 2580: 17,13 - 2581: 17,12 - 2582: 17,11 - 2594: 17,9 - 2597: 17,-22 - 2598: 17,-23 - 2601: -18,-23 - 2602: -15,-23 - 2603: -15,-22 - 2604: -15,-21 - 2605: -15,-20 - 2606: -15,-19 - 2607: -15,-17 - 2608: -15,-16 - 2609: -15,-15 - 2610: -15,-14 - 2611: -15,-13 - 2612: -15,-12 - 2613: -15,-11 - 2656: 1,-28 - 2657: 1,-29 - 2658: 1,-30 - 2659: 1,-31 - 2660: 1,-32 - 2661: 1,-33 - 2662: 1,-34 - 2663: 1,-35 - 2664: 1,-36 - 2665: 1,-37 - 2666: 1,-38 - 2667: 1,-39 - 2668: 1,-40 - 2669: 1,-41 + 1110: 10,-54 + 1111: 9,-54 + 1112: 7,-54 + 1113: 8,-54 + 1114: 5,-54 + 1115: 3,-54 + 1117: 2,-47 + 1118: 2,-48 + 1119: 2,-49 + 1120: 2,-50 + 1121: 2,-51 + 1122: 2,-52 + 1375: -3,-23 + 1376: -4,-23 + 1377: -5,-23 + 1378: -6,-23 + 1379: -7,-23 + 1380: -8,-23 + 1381: -13,-23 + 1382: -14,-23 + 1383: 5,10 + 1384: 6,10 + 1385: 7,10 + 1386: 4,10 + 1387: 7,9 + 1388: 8,9 + 1389: 9,9 + 1390: 10,9 + 1391: 11,9 + 1392: 12,9 + 1393: 13,9 + 1417: -44,25 + 1418: -43,25 + 1419: -42,25 + 1420: -41,25 + 1421: -40,25 + 1422: -39,25 + 1423: -38,25 + 1424: -37,25 + 1425: -36,25 + 1426: -35,25 + 1427: -34,25 + 1428: -33,25 + 1473: 30,-23 + 1474: 29,-23 + 1475: 28,-23 + 1476: 27,-23 + 1477: 26,-23 + 1478: 25,-23 + 1479: 24,-23 + 1480: 23,-23 + 1481: 22,-23 + 1482: 21,-23 + 1483: 20,-23 + 1484: 19,-23 + 1485: 18,-23 + 1491: -15,1 + 1492: -15,0 + 1493: -14,0 + 1838: -15,21 + 1839: -15,20 + 1840: -15,19 + 1841: -15,18 + 1842: -15,17 + 1843: -15,16 + 1844: -15,15 + 1845: -15,14 + 1846: -15,13 + 1847: -15,12 + 1848: -15,11 + 2064: -28,-23 + 2065: -29,-23 + 2066: -30,-23 + 2067: -31,-23 + 2068: -32,-23 + 2069: -33,-23 + 2070: -34,-23 + 2071: -35,-23 + 2072: -36,-23 + 2073: -37,-23 + 2074: -37,-22 + 2075: -37,-21 + 2076: -37,-20 + 2077: -37,-19 + 2303: -20,9 + 2304: -21,9 + 2305: -22,9 + 2306: -23,9 + 2307: -24,9 + 2315: -14,9 + 2316: -15,9 + 2555: 17,14 + 2556: 17,13 + 2557: 17,12 + 2558: 17,11 + 2570: 17,9 + 2573: 17,-22 + 2574: 17,-23 + 2577: -18,-23 + 2578: -15,-23 + 2579: -15,-22 + 2580: -15,-21 + 2581: -15,-20 + 2582: -15,-19 + 2583: -15,-17 + 2584: -15,-16 + 2585: -15,-15 + 2586: -15,-14 + 2587: -15,-13 + 2588: -15,-12 + 2589: -15,-11 + 2632: 1,-28 + 2633: 1,-29 + 2634: 1,-30 + 2635: 1,-31 + 2636: 1,-32 + 2637: 1,-33 + 2638: 1,-34 + 2639: 1,-35 + 2640: 1,-36 + 2641: 1,-37 + 2642: 1,-38 + 2643: 1,-39 + 2644: 1,-40 + 2645: 1,-41 - node: color: '#D4D4D437' id: QuarterTileOverlayGreyscale90 decals: - 1029: 3,-61 - 1030: 3,-62 - 1031: 3,-63 - 1032: 3,-64 - 1033: 3,-65 - 1034: 4,-66 - 1035: 4,-67 - 1036: 4,-68 - 1037: 4,-69 - 1038: 3,-70 - 1039: 3,-71 - 1040: 3,-72 - 1041: 3,-73 - 1042: 3,-74 + 1026: 3,-61 + 1027: 3,-62 + 1028: 3,-63 + 1029: 3,-64 + 1030: 3,-65 + 1031: 4,-66 + 1032: 4,-67 + 1033: 4,-68 + 1034: 4,-69 + 1035: 3,-70 + 1036: 3,-71 + 1037: 3,-72 + 1038: 3,-73 + 1039: 3,-74 - node: color: '#D4D4D441' id: QuarterTileOverlayGreyscale90 decals: - 941: 55,26 - 942: 56,25 - 950: 51,26 + 938: 55,26 + 939: 56,25 + 947: 51,26 - node: color: '#D4D4D496' id: QuarterTileOverlayGreyscale90 decals: - 2696: 20,26 - 2697: 21,26 - 2698: 22,26 - 2699: 23,26 - 2700: 24,26 - 2701: 25,26 - 2702: 26,26 - 2703: 27,26 - 2704: 28,26 - 2705: 29,26 - 2706: 37,26 - 2707: 36,26 - 2708: 35,26 - 2709: 34,26 - 2710: 33,26 - 2711: 32,26 - 2712: 31,26 - 2713: 30,26 - 2879: 19,26 + 2672: 20,26 + 2673: 21,26 + 2674: 22,26 + 2675: 23,26 + 2676: 24,26 + 2677: 25,26 + 2678: 26,26 + 2679: 27,26 + 2680: 28,26 + 2681: 29,26 + 2682: 37,26 + 2683: 36,26 + 2684: 35,26 + 2685: 34,26 + 2686: 33,26 + 2687: 32,26 + 2688: 31,26 + 2689: 30,26 + 2849: 19,26 - node: color: '#DE3A3A96' id: QuarterTileOverlayGreyscale90 decals: - 666: -37,-17 - 667: -37,-16 - 668: -37,-15 - 669: -37,-14 - 670: -37,-13 - 671: -37,-12 - 672: -37,-11 - 673: -37,-10 - 674: -37,-9 - 675: -37,-8 - 676: -37,-7 - 677: -37,-6 - 1643: -8,-15 - 1644: -8,-14 - 1645: -8,-13 - 1646: -8,-12 - 1647: -9,-12 - 3904: -10,-12 - 3905: -11,-12 + 663: -37,-17 + 664: -37,-16 + 665: -37,-15 + 666: -37,-14 + 667: -37,-13 + 668: -37,-12 + 669: -37,-11 + 670: -37,-10 + 671: -37,-9 + 672: -37,-8 + 673: -37,-7 + 674: -37,-6 + 1635: -8,-15 + 1636: -8,-14 + 1637: -8,-13 + 1638: -8,-12 + 1639: -9,-12 + 3832: -10,-12 + 3833: -11,-12 - node: color: '#DF81C96C' id: QuarterTileOverlayGreyscale90 decals: - 3118: 40,3 - 3119: 41,3 - 3120: 42,3 - 3121: 43,3 - 3122: 44,3 - 3123: 45,3 - 3124: 46,3 - 3125: 47,3 - 3126: 48,4 - 3127: 49,4 - 3128: 50,4 - 3129: 51,4 + 3088: 40,3 + 3089: 41,3 + 3090: 42,3 + 3091: 43,3 + 3092: 44,3 + 3093: 45,3 + 3094: 46,3 + 3095: 47,3 + 3096: 48,4 + 3097: 49,4 + 3098: 50,4 + 3099: 51,4 - node: color: '#EFB34160' id: QuarterTileOverlayGreyscale90 decals: - 2576: 17,17 - 2577: 17,16 - 2578: 17,15 + 2552: 17,17 + 2553: 17,16 + 2554: 17,15 - node: color: '#EFCC4196' id: QuarterTileOverlayGreyscale90 decals: - 2232: 1,11 - 2233: 2,11 - 2235: 4,11 - 2279: -15,23 - 2280: -15,24 - 2281: -15,25 - 2282: -16,25 - 2283: -17,25 - 2284: -18,25 - 2285: -19,25 - 2286: -20,25 + 2210: 1,11 + 2211: 2,11 + 2212: 4,11 + 2255: -15,23 + 2256: -15,24 + 2257: -15,25 + 2258: -16,25 + 2259: -17,25 + 2260: -18,25 + 2261: -19,25 + 2262: -20,25 - node: color: '#EFD24193' id: QuarterTileOverlayGreyscale90 decals: - 3912: 3,11 + 3840: 3,11 - node: color: '#FFFFFFFF' id: Remains decals: - 2714: -63.989975,-10.123885 + 2690: -63.989975,-10.123885 - node: color: '#FFFFFFFF' id: Rock01 decals: - 957: -5.089998,-68.511505 - 959: 5.097502,-68.08963 + 954: -5.089998,-68.511505 + 956: 5.097502,-68.08963 - node: color: '#FFFFFFFF' id: Rock03 decals: - 1544: -47.98986,4.9975877 + 1541: -47.98986,4.9975877 - node: color: '#FFFFFFFF' id: Rock04 decals: - 958: 5.097502,-66.74588 - 1545: -47.02111,4.9975877 + 955: 5.097502,-66.74588 + 1542: -47.02111,4.9975877 - node: cleanable: True color: '#FFFFFFFF' @@ -5261,65 +5261,65 @@ entities: color: '#80C71FFF' id: Sirius decals: - 2720: -9.970831,-51.964848 + 2696: -9.970831,-51.964848 - node: color: '#FFFFFFFF' id: SpaceStationSign1 decals: - 752: -3,10 + 749: -3,10 - node: color: '#FFFFFFFF' id: SpaceStationSign2 decals: - 753: -2,10 + 750: -2,10 - node: color: '#FFFFFFFF' id: SpaceStationSign3 decals: - 754: -1,10 + 751: -1,10 - node: color: '#FFFFFFFF' id: SpaceStationSign4 decals: - 755: 0,10 + 752: 0,10 - node: color: '#FFFFFFFF' id: SpaceStationSign5 decals: - 756: 1,10 + 753: 1,10 - node: color: '#FFFFFFFF' id: SpaceStationSign6 decals: - 757: 2,10 + 754: 2,10 - node: color: '#FFFFFFFF' id: SpaceStationSign7 decals: - 758: 3,10 + 755: 3,10 - node: color: '#FFFFFFFF' id: StandClear decals: - 336: -40,-1 - 1749: -23,-20 - 1803: -22,26 + 333: -40,-1 + 1729: -23,-20 + 1783: -22,26 - node: color: '#D381C996' id: StandClearGreyscale decals: - 1243: -53,1 - 1950: -49,1 + 1240: -53,1 + 1928: -49,1 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale decals: - 2842: 32,-17 + 2815: 32,-17 - node: color: '#A4610696' id: ThreeQuarterTileOverlayGreyscale decals: - 2919: 43,9 + 2889: 43,9 - node: color: '#D0BF4AA7' id: ThreeQuarterTileOverlayGreyscale @@ -5329,29 +5329,29 @@ entities: color: '#D381C996' id: ThreeQuarterTileOverlayGreyscale decals: - 299: -43,14 - 1996: -43,-10 + 296: -43,14 + 1974: -43,-10 - node: color: '#EFCC4196' id: ThreeQuarterTileOverlayGreyscale decals: - 2195: -5,21 - 2205: 3,15 + 2173: -5,21 + 2183: 3,15 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale180 decals: - 3860: 41,-21 + 3788: 41,-21 - node: color: '#9FED5896' id: ThreeQuarterTileOverlayGreyscale180 decals: - 2830: 45,-35 + 2806: 45,-35 - node: color: '#A4610696' id: ThreeQuarterTileOverlayGreyscale180 decals: - 546: 46,5 + 543: 46,5 - node: color: '#D0BF4AA7' id: ThreeQuarterTileOverlayGreyscale180 @@ -5361,30 +5361,30 @@ entities: color: '#D381C996' id: ThreeQuarterTileOverlayGreyscale180 decals: - 1977: -37,11 - 1995: -41,-11 + 1955: -37,11 + 1973: -41,-11 - node: color: '#EFCC4196' id: ThreeQuarterTileOverlayGreyscale180 decals: - 2196: 6,17 - 2206: 7,12 + 2174: 6,17 + 2184: 7,12 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale270 decals: - 2843: 32,-21 - 2866: 48,-18 + 2816: 32,-21 + 2836: 48,-18 - node: color: '#9FED5896' id: ThreeQuarterTileOverlayGreyscale270 decals: - 2829: 43,-35 + 2805: 43,-35 - node: color: '#A4610696' id: ThreeQuarterTileOverlayGreyscale270 decals: - 540: 43,5 + 537: 43,5 - node: color: '#D0BF4AA7' id: ThreeQuarterTileOverlayGreyscale270 @@ -5394,32 +5394,32 @@ entities: color: '#D381C996' id: ThreeQuarterTileOverlayGreyscale270 decals: - 297: -39,11 - 298: -43,13 - 2000: -43,-11 + 294: -39,11 + 295: -43,13 + 1978: -43,-11 - node: color: '#EFCC4196' id: ThreeQuarterTileOverlayGreyscale270 decals: - 2198: -5,17 - 2202: 6,12 - 2203: 3,13 + 2176: -5,17 + 2180: 6,12 + 2181: 3,13 - node: color: '#334E6DC8' id: ThreeQuarterTileOverlayGreyscale90 decals: - 499: 4,1 + 496: 4,1 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale90 decals: - 2874: 49,-17 - 3861: 41,-17 + 2844: 49,-17 + 3789: 41,-17 - node: color: '#A4610696' id: ThreeQuarterTileOverlayGreyscale90 decals: - 2920: 46,9 + 2890: 46,9 - node: color: '#D0BF4AA7' id: ThreeQuarterTileOverlayGreyscale90 @@ -5429,46 +5429,46 @@ entities: color: '#D381C996' id: ThreeQuarterTileOverlayGreyscale90 decals: - 1976: -37,14 - 1999: -41,-10 + 1954: -37,14 + 1977: -41,-10 - node: color: '#EFCC4196' id: ThreeQuarterTileOverlayGreyscale90 decals: - 2197: 6,21 - 2204: 7,15 + 2175: 6,21 + 2182: 7,15 - node: cleanable: True color: '#B02E26FF' id: Tunnel decals: - 2426: 32.016933,17.019823 + 2402: 32.016933,17.019823 - node: color: '#FFFFFFFF' id: VentSmall decals: - 795: -3,-9 + 792: -3,-9 - node: cleanable: True color: '#835432FF' id: Waffle decals: - 2715: -15.97007,-46.029713 + 2691: -15.97007,-46.029713 - node: color: '#FFFFFFFF' id: WarnBox decals: - 2036: -25,2 - 3219: 12,-55 - 3220: -25,-36 - 3221: 23,-47 - 3222: 20,28 - 3223: 5,-71 - 3224: -5,-71 - 3225: -5,-64 - 3226: 5,-64 - 3227: 39,-47 - 3352: -17,48 + 2014: -25,2 + 3169: 12,-55 + 3170: -25,-36 + 3171: 23,-47 + 3172: 20,28 + 3173: 5,-71 + 3174: -5,-71 + 3175: -5,-64 + 3176: 5,-64 + 3177: 39,-47 + 3302: -17,48 - node: color: '#FFFFFFFF' id: WarnCorner @@ -5495,946 +5495,946 @@ entities: color: '#DE3A3A96' id: WarnCornerGreyscaleNE decals: - 1694: -22,-3 + 1674: -22,-3 - node: color: '#D381C996' id: WarnCornerGreyscaleNW decals: - 1278: -58,-1 + 1275: -58,-1 - node: color: '#DE3A3A96' id: WarnCornerGreyscaleNW decals: - 1702: -31,-3 + 1682: -31,-3 - node: color: '#FFFFFFFF' id: WarnCornerNE decals: - 3826: -33,21 + 3754: -33,21 - node: color: '#FFFFFFFF' id: WarnCornerNW decals: - 3823: -31,21 + 3751: -31,21 - node: color: '#FFFFFFFF' id: WarnCornerSE decals: - 3827: -33,19 + 3755: -33,19 - node: color: '#FFFFFFFF' id: WarnCornerSW decals: - 3822: -31,19 + 3750: -31,19 - node: color: '#FFFFFFFF' id: WarnCornerSmallNE decals: - 721: -30,34 - 864: -12,2 - 1366: -2,31 - 3332: -2,24 - 3392: -19,40 - 3821: -8,29 + 718: -30,34 + 861: -12,2 + 1363: -2,31 + 3282: -2,24 + 3342: -19,40 + 3749: -8,29 - node: color: '#FFFFFFFF' id: WarnCornerSmallNW decals: - 844: -8,2 - 1365: 2,31 - 2137: 2,24 - 3380: -27,38 - 3391: -15,40 - 3820: -5,29 + 841: -8,2 + 1362: 2,31 + 2115: 2,24 + 3330: -27,38 + 3341: -15,40 + 3748: -5,29 - node: color: '#FFFFFFFF' id: WarnCornerSmallSE decals: - 1053: -2,-78 - 1364: -2,36 - 3390: -19,42 - 3834: -29,-1 + 1050: -2,-78 + 1361: -2,36 + 3340: -19,42 + 3762: -29,-1 - node: color: '#FFFFFFFF' id: WarnCornerSmallSW decals: - 730: -30,36 - 1052: 2,-78 - 1363: 2,36 - 2568: 40,-35 - 3379: -27,40 - 3389: -15,42 - 3830: -25,-1 + 727: -30,36 + 1049: 2,-78 + 1360: 2,36 + 2544: 40,-35 + 3329: -27,40 + 3339: -15,42 + 3758: -25,-1 - node: color: '#52B4E996' id: WarnFullGreyscale decals: - 3501: 42,-19 + 3449: 42,-19 - node: color: '#D381C996' id: WarnFullGreyscale decals: - 2021: -58,0 + 1999: -58,0 - node: color: '#FFFFFFFF' id: WarnFullGreyscale decals: - 3063: 23,6 - 3283: 5,16 - 3285: 18,18 - 3303: -14,28 - 3304: -24,30 - 3305: -24,31 - 3306: -22,27 - 3307: -32,30 - 3308: -32,31 - 3309: -22,33 - 3310: -12,33 + 3033: 23,6 + 3233: 5,16 + 3235: 18,18 + 3253: -14,28 + 3254: -24,30 + 3255: -24,31 + 3256: -22,27 + 3257: -32,30 + 3258: -32,31 + 3259: -22,33 + 3260: -12,33 - node: color: '#FFFFFFFF' id: WarnLineE decals: - 720: -30,36 - 726: -30,35 - 746: -100,20 - 747: -100,21 - 865: -12,3 - 866: -12,4 - 867: -12,5 - 912: -54,16 - 1356: -2,32 - 1357: -2,33 - 1358: -2,34 - 1359: -2,35 - 1764: -15,-18 - 1768: -37,-18 - 1772: -37,5 - 1777: -15,6 - 1778: -15,10 - 1779: -15,22 - 1783: 17,6 - 1784: 17,10 - 1785: 41,12 - 1793: 17,22 - 1794: 17,26 - 1795: 17,-9 - 1807: -21,26 - 1872: -15,-3 - 1913: -54,6 - 1916: -52,1 - 1917: -48,1 - 2135: -2,25 - 2292: -3,26 - 2293: -3,22 - 2534: -54,17 - 2875: 45,-16 - 3071: 3,34 - 3072: 3,35 - 3073: 3,36 - 3197: 56,15 - 3198: 56,14 - 3199: 56,13 - 3200: 56,12 - 3201: 56,11 - 3388: -19,41 - 3440: 1,-13 - 3825: -33,20 + 717: -30,36 + 723: -30,35 + 743: -100,20 + 744: -100,21 + 862: -12,3 + 863: -12,4 + 864: -12,5 + 909: -54,16 + 1353: -2,32 + 1354: -2,33 + 1355: -2,34 + 1356: -2,35 + 1744: -15,-18 + 1748: -37,-18 + 1752: -37,5 + 1757: -15,6 + 1758: -15,10 + 1759: -15,22 + 1763: 17,6 + 1764: 17,10 + 1765: 41,12 + 1773: 17,22 + 1774: 17,26 + 1775: 17,-9 + 1787: -21,26 + 1850: -15,-3 + 1891: -54,6 + 1894: -52,1 + 1895: -48,1 + 2113: -2,25 + 2268: -3,26 + 2269: -3,22 + 2510: -54,17 + 2845: 45,-16 + 3041: 3,34 + 3042: 3,35 + 3043: 3,36 + 3148: 56,15 + 3149: 56,14 + 3150: 56,13 + 3151: 56,12 + 3152: 56,11 + 3338: -19,41 + 3390: 1,-13 + 3753: -33,20 - node: color: '#52B4E996' id: WarnLineGreyscaleE decals: - 2865: 45,-22 - 3528: 45,-10 - 3560: 41,-19 + 2835: 45,-22 + 3474: 45,-10 + 3489: 41,-19 - node: color: '#9FED5896' id: WarnLineGreyscaleE decals: - 2817: 45,-33 + 2793: 45,-33 - node: color: '#B02E26FF' id: WarnLineGreyscaleE decals: - 2733: -4,-47 + 2709: -4,-47 - node: color: '#D381C996' id: WarnLineGreyscaleE decals: - 1951: -48,-6 - 1953: -45,-1 - 1971: -42,-6 + 1929: -48,-6 + 1931: -45,-1 + 1949: -42,-6 - node: color: '#DE3A3A96' id: WarnLineGreyscaleE decals: - 1693: -22,-4 - 1735: -33,-20 - 1736: -33,-17 - 2738: -8,-47 + 1673: -22,-4 + 1715: -33,-20 + 1716: -33,-17 + 2714: -8,-47 - node: color: '#FFFFFFFF' id: WarnLineGreyscaleE decals: - 1746: -23,-21 - 1747: -23,-20 - 1748: -23,-19 - 1759: -18,-21 - 1760: -18,-20 - 1761: -18,-19 - 1822: -15,28 - 1827: -25,30 - 1828: -25,31 - 2288: 6,19 - 2368: 3,-6 - 3284: 17,18 - 3445: -14,-25 - 3446: -14,-24 - 3447: -14,-23 - 3463: -14,7 - 3464: -14,8 - 3465: -14,9 - 3466: -20,7 - 3467: -20,8 - 3468: -20,9 - 3469: 13,7 - 3470: 13,8 - 3471: 13,9 - 3610: -5,-56 - 3611: -5,-55 - 3612: -5,-54 + 1726: -23,-21 + 1727: -23,-20 + 1728: -23,-19 + 1739: -18,-21 + 1740: -18,-20 + 1741: -18,-19 + 1802: -15,28 + 1807: -25,30 + 1808: -25,31 + 2264: 6,19 + 2344: 3,-6 + 3234: 17,18 + 3395: -14,-25 + 3396: -14,-24 + 3397: -14,-23 + 3413: -14,7 + 3414: -14,8 + 3415: -14,9 + 3416: -20,7 + 3417: -20,8 + 3418: -20,9 + 3419: 13,7 + 3420: 13,8 + 3421: 13,9 + 3539: -5,-56 + 3540: -5,-55 + 3541: -5,-54 - node: color: '#52B4E996' id: WarnLineGreyscaleN decals: - 3529: 44,-9 + 3475: 44,-9 - node: color: '#D381C996' id: WarnLineGreyscaleN decals: - 1136: -54,4 - 1137: -55,4 - 1138: -51,5 - 1229: -46,14 - 1242: -56,4 - 1262: -56,-1 - 1263: -54,-1 - 1264: -53,-1 - 1265: -52,-1 - 2017: -41,12 - 2018: -42,12 + 1133: -54,4 + 1134: -55,4 + 1135: -51,5 + 1226: -46,14 + 1239: -56,4 + 1259: -56,-1 + 1260: -54,-1 + 1261: -53,-1 + 1262: -52,-1 + 1995: -41,12 + 1996: -42,12 - node: color: '#DE3A3A96' id: WarnLineGreyscaleN decals: - 1704: -27,-3 - 1732: -26,-19 - 1733: -28,-19 + 1684: -27,-3 + 1712: -26,-19 + 1713: -28,-19 - node: color: '#FFFFFFFF' id: WarnLineGreyscaleN decals: - 1824: -22,32 - 1998: -42,-10 - 2160: -12,32 - 2289: 5,15 - 3064: 23,5 - 3425: 1,-28 - 3426: 0,-28 - 3427: -1,-28 - 3428: 15,-22 - 3429: 16,-22 - 3430: 17,-22 - 3589: 1,-54 - 3590: 0,-54 - 3591: -1,-54 - 3592: -1,-61 - 3593: 0,-61 - 3594: 1,-61 - 3595: 1,-76 - 3596: 0,-76 - 3597: -1,-76 + 1804: -22,32 + 1976: -42,-10 + 2138: -12,32 + 2265: 5,15 + 3034: 23,5 + 3375: 1,-28 + 3376: 0,-28 + 3377: -1,-28 + 3378: 15,-22 + 3379: 16,-22 + 3380: 17,-22 + 3518: 1,-54 + 3519: 0,-54 + 3520: -1,-54 + 3521: -1,-61 + 3522: 0,-61 + 3523: 1,-61 + 3524: 1,-76 + 3525: 0,-76 + 3526: -1,-76 - node: color: '#334E6DC8' id: WarnLineGreyscaleS decals: - 2360: 4,-1 - 2361: -4,-1 - 2362: 0,-1 + 2336: 4,-1 + 2337: -4,-1 + 2338: 0,-1 - node: color: '#9FED5896' id: WarnLineGreyscaleS decals: - 2831: 44,-35 + 2807: 44,-35 - node: color: '#D381C996' id: WarnLineGreyscaleS decals: - 1139: -51,11 - 1140: -45,11 - 1236: -52,2 - 1237: -53,2 - 1238: -54,2 - 1241: -56,2 - 2020: -58,1 + 1136: -51,11 + 1137: -45,11 + 1233: -52,2 + 1234: -53,2 + 1235: -54,2 + 1238: -56,2 + 1998: -58,1 - node: color: '#DE3A3A96' id: WarnLineGreyscaleS decals: - 1687: -27,-6 - 1885: -26,-17 - 1886: -28,-17 + 1667: -27,-6 + 1863: -26,-17 + 1864: -28,-17 - node: color: '#FFFFFFFF' id: WarnLineGreyscaleS decals: - 1762: -19,-22 - 1763: -20,-22 - 1821: -18,27 - 1823: -22,28 - 1877: -21,-22 - 2158: -12,27 - 2287: 5,17 - 3062: 23,7 - 3416: 17,-20 - 3417: 16,-20 - 3418: 15,-20 - 3419: 1,-21 - 3420: 0,-21 - 3421: -1,-21 - 3422: -1,-26 - 3423: 0,-26 - 3424: 1,-26 - 3577: 1,-74 - 3578: 0,-74 - 3579: -1,-74 - 3580: 1,-59 - 3581: 0,-59 - 3582: -1,-59 - 3583: 1,-52 - 3584: 0,-52 - 3585: -1,-52 - 3586: 1,-43 - 3587: 0,-43 - 3588: -1,-43 + 1742: -19,-22 + 1743: -20,-22 + 1801: -18,27 + 1803: -22,28 + 1855: -21,-22 + 2136: -12,27 + 2263: 5,17 + 3032: 23,7 + 3366: 17,-20 + 3367: 16,-20 + 3368: 15,-20 + 3369: 1,-21 + 3370: 0,-21 + 3371: -1,-21 + 3372: -1,-26 + 3373: 0,-26 + 3374: 1,-26 + 3506: 1,-74 + 3507: 0,-74 + 3508: -1,-74 + 3509: 1,-59 + 3510: 0,-59 + 3511: -1,-59 + 3512: 1,-52 + 3513: 0,-52 + 3514: -1,-52 + 3515: 1,-43 + 3516: 0,-43 + 3517: -1,-43 - node: color: '#52B4E996' id: WarnLineGreyscaleW decals: - 2864: 43,-24 - 3498: 43,-19 - 3504: 32,-20 - 3505: 32,-18 - 3526: 43,-14 - 3527: 43,-10 + 2834: 43,-24 + 3448: 43,-19 + 3450: 32,-20 + 3451: 32,-18 + 3472: 43,-14 + 3473: 43,-10 - node: color: '#9FED5896' id: WarnLineGreyscaleW decals: - 2827: 43,-28 - 2828: 43,-32 + 2803: 43,-28 + 2804: 43,-32 - node: color: '#B02E26FF' id: WarnLineGreyscaleW decals: - 2732: -6,-47 + 2708: -6,-47 - node: color: '#D381C996' id: WarnLineGreyscaleW decals: - 1952: -46,-6 + 1930: -46,-6 - node: color: '#DE3A3A96' id: WarnLineGreyscaleW decals: - 1703: -31,-4 - 1734: -31,-20 - 1873: -21,-21 - 1874: -21,-19 - 2739: -9,-47 + 1683: -31,-4 + 1714: -31,-20 + 1851: -21,-21 + 1852: -21,-19 + 2715: -9,-47 - node: color: '#FFFFFFFF' id: WarnLineGreyscaleW decals: - 1743: -23,-21 - 1744: -23,-20 - 1745: -23,-19 - 1825: -23,30 - 1826: -23,31 - 1829: -31,30 - 1830: -31,31 - 2159: -13,28 - 2367: 5,-6 - 2536: 19,18 - 3442: -12,-25 - 3443: -12,-24 - 3444: -12,-23 - 3457: -12,7 - 3458: -12,8 - 3459: -12,9 - 3460: -18,7 - 3461: -18,8 - 3462: -18,9 - 3472: 19,7 - 3473: 19,8 - 3474: 19,9 - 3484: 19,23 - 3485: 19,24 - 3486: 19,25 - 3613: 5,-56 - 3614: 5,-55 - 3615: 5,-54 + 1723: -23,-21 + 1724: -23,-20 + 1725: -23,-19 + 1805: -23,30 + 1806: -23,31 + 1809: -31,30 + 1810: -31,31 + 2137: -13,28 + 2343: 5,-6 + 2512: 19,18 + 3392: -12,-25 + 3393: -12,-24 + 3394: -12,-23 + 3407: -12,7 + 3408: -12,8 + 3409: -12,9 + 3410: -18,7 + 3411: -18,8 + 3412: -18,9 + 3422: 19,7 + 3423: 19,8 + 3424: 19,9 + 3434: 19,23 + 3435: 19,24 + 3436: 19,25 + 3542: 5,-56 + 3543: 5,-55 + 3544: 5,-54 - node: color: '#FFFFFFFF' id: WarnLineN decals: - 709: -26,-1 - 710: -27,-1 - 711: -28,-1 - 729: -31,36 - 741: -117,18 - 742: -118,18 - 743: -119,18 - 744: -120,18 - 745: -121,18 - 1049: 0,-78 - 1050: 1,-78 - 1051: -1,-78 - 1360: -1,36 - 1361: 0,36 - 1362: 1,36 - 1766: -27,-25 - 1769: -40,-2 - 1773: -36,7 - 1788: 35,7 - 1789: 38,23 - 1799: 2,-25 - 1800: -2,-25 - 1801: 18,-25 - 2567: 39,-35 - 3024: -41,23 - 3356: -15,48 - 3357: -14,48 - 3358: -13,48 - 3359: -12,48 - 3360: -11,48 - 3361: -19,48 - 3362: -20,48 - 3363: -21,48 - 3364: -22,48 - 3365: -23,48 - 3381: -18,42 - 3382: -17,42 - 3383: -16,42 - 3816: -7,31 - 3817: -6,31 + 706: -26,-1 + 707: -27,-1 + 708: -28,-1 + 726: -31,36 + 738: -117,18 + 739: -118,18 + 740: -119,18 + 741: -120,18 + 742: -121,18 + 1046: 0,-78 + 1047: 1,-78 + 1048: -1,-78 + 1357: -1,36 + 1358: 0,36 + 1359: 1,36 + 1746: -27,-25 + 1749: -40,-2 + 1753: -36,7 + 1768: 35,7 + 1769: 38,23 + 1779: 2,-25 + 1780: -2,-25 + 1781: 18,-25 + 2543: 39,-35 + 2994: -41,23 + 3306: -15,48 + 3307: -14,48 + 3308: -13,48 + 3309: -12,48 + 3310: -11,48 + 3311: -19,48 + 3312: -20,48 + 3313: -21,48 + 3314: -22,48 + 3315: -23,48 + 3331: -18,42 + 3332: -17,42 + 3333: -16,42 + 3744: -7,31 + 3745: -6,31 - node: color: '#DE3A3A96' id: WarnLineS decals: - 1675: -9,-16 + 1655: -9,-16 - node: color: '#FFFFFFFF' id: WarnLineS decals: - 722: -24,34 - 723: -24,35 - 724: -24,36 - 727: -30,34 - 728: -30,35 - 845: -8,3 - 846: -8,4 - 847: -8,5 - 1054: -20,-56 - 1055: -20,-55 - 1056: -20,-54 - 1352: 2,32 - 1353: 2,33 - 1354: 2,34 - 1355: 2,35 - 1765: -17,-18 - 1767: -39,-18 - 1771: -39,5 - 1775: -17,6 - 1776: -17,10 - 1780: -17,22 - 1781: 15,10 - 1782: 15,6 - 1786: 39,12 - 1791: 15,22 - 1792: 15,26 - 1796: 15,-9 - 1806: -23,26 - 1871: -17,-3 - 1914: -56,6 - 1915: -54,1 - 1918: -50,1 - 2136: 2,25 - 2290: -4,22 - 2291: -5,26 - 2364: 3,-8 - 2365: 3,-7 - 2366: 3,-6 - 2876: 43,-16 - 3378: -27,39 - 3384: -15,41 - 3441: -1,-13 - 3824: -31,20 - 3852: 40,-36 + 719: -24,34 + 720: -24,35 + 721: -24,36 + 724: -30,34 + 725: -30,35 + 842: -8,3 + 843: -8,4 + 844: -8,5 + 1051: -20,-56 + 1052: -20,-55 + 1053: -20,-54 + 1349: 2,32 + 1350: 2,33 + 1351: 2,34 + 1352: 2,35 + 1745: -17,-18 + 1747: -39,-18 + 1751: -39,5 + 1755: -17,6 + 1756: -17,10 + 1760: -17,22 + 1761: 15,10 + 1762: 15,6 + 1766: 39,12 + 1771: 15,22 + 1772: 15,26 + 1776: 15,-9 + 1786: -23,26 + 1849: -17,-3 + 1892: -56,6 + 1893: -54,1 + 1896: -50,1 + 2114: 2,25 + 2266: -4,22 + 2267: -5,26 + 2340: 3,-8 + 2341: 3,-7 + 2342: 3,-6 + 2846: 43,-16 + 3328: -27,39 + 3334: -15,41 + 3391: -1,-13 + 3752: -31,20 + 3780: 40,-36 - node: color: '#DE3A3A96' id: WarnLineW decals: - 1669: -7,-18 + 1649: -7,-18 - node: color: '#FFFFFFFF' id: WarnLineW decals: - 706: -9,2 - 707: -10,2 - 708: -11,2 - 715: -25,34 - 716: -26,34 - 717: -27,34 - 718: -28,34 - 719: -29,34 - 736: -117,15 - 737: -118,15 - 738: -119,15 - 739: -120,15 - 740: -121,15 - 748: -62,40 - 749: -63,40 - 750: -64,40 - 1349: -1,31 - 1350: 0,31 - 1351: 1,31 - 1539: -58,2 - 1540: -59,2 - 1541: -60,2 - 1770: -40,0 - 1774: -36,9 - 1787: 35,9 - 1790: 38,25 - 1797: 2,-23 - 1798: -2,-23 - 1802: 18,-23 - 1912: -42,-2 - 2085: -27,-23 - 2132: 0,24 - 2133: 1,24 - 2134: -1,24 - 2758: 4,-39 - 2765: 5,-39 - 2766: 3,-39 - 3025: -41,25 - 3068: 0,29 - 3069: 1,29 - 3070: -1,29 - 3210: 43,3 - 3366: -16,51 - 3367: -15,51 - 3368: -14,51 - 3369: -13,51 - 3370: -12,51 - 3371: -11,51 - 3372: -18,51 - 3373: -19,51 - 3374: -20,51 - 3375: -21,51 - 3376: -22,51 - 3377: -23,51 - 3385: -16,40 - 3386: -17,40 - 3387: -18,40 - 3393: -43,-2 - 3818: -7,29 - 3819: -6,29 - 3836: 4,37 - 3837: 5,37 - 3838: 6,37 - 3839: -4,37 - 3840: -5,37 - 3841: -6,37 - 3910: -26,32 + 703: -9,2 + 704: -10,2 + 705: -11,2 + 712: -25,34 + 713: -26,34 + 714: -27,34 + 715: -28,34 + 716: -29,34 + 733: -117,15 + 734: -118,15 + 735: -119,15 + 736: -120,15 + 737: -121,15 + 745: -62,40 + 746: -63,40 + 747: -64,40 + 1346: -1,31 + 1347: 0,31 + 1348: 1,31 + 1536: -58,2 + 1537: -59,2 + 1538: -60,2 + 1750: -40,0 + 1754: -36,9 + 1767: 35,9 + 1770: 38,25 + 1777: 2,-23 + 1778: -2,-23 + 1782: 18,-23 + 1890: -42,-2 + 2063: -27,-23 + 2110: 0,24 + 2111: 1,24 + 2112: -1,24 + 2734: 4,-39 + 2741: 5,-39 + 2742: 3,-39 + 2995: -41,25 + 3038: 0,29 + 3039: 1,29 + 3040: -1,29 + 3160: 43,3 + 3316: -16,51 + 3317: -15,51 + 3318: -14,51 + 3319: -13,51 + 3320: -12,51 + 3321: -11,51 + 3322: -18,51 + 3323: -19,51 + 3324: -20,51 + 3325: -21,51 + 3326: -22,51 + 3327: -23,51 + 3335: -16,40 + 3336: -17,40 + 3337: -18,40 + 3343: -43,-2 + 3746: -7,29 + 3747: -6,29 + 3764: 4,37 + 3765: 5,37 + 3766: 6,37 + 3767: -4,37 + 3768: -5,37 + 3769: -6,37 + 3838: -26,32 - node: angle: -3.141592653589793 rad color: '#FFFFFFFF' id: WarningLine decals: - 438: -11,36 - 439: -12,36 - 440: -13,36 - 441: -14,36 - 442: -15,36 - 443: -16,36 - 444: -17,36 - 445: -18,36 - 446: -19,36 - 447: -20,36 - 448: -21,36 - 449: -22,36 - 450: -23,36 + 435: -11,36 + 436: -12,36 + 437: -13,36 + 438: -14,36 + 439: -15,36 + 440: -16,36 + 441: -17,36 + 442: -18,36 + 443: -19,36 + 444: -20,36 + 445: -21,36 + 446: -22,36 + 447: -23,36 - node: angle: -1.5707963267948966 rad color: '#FFFFFFFF' id: WarningLine decals: - 626: -72,20 + 623: -72,20 - node: color: '#FFFFFFFF' id: WarningLine decals: - 290: -32,11 - 291: -33,11 - 292: -34,11 - 295: -43,0 - 296: -42,0 - 574: 24,15 - 575: 23,15 - 576: 22,15 + 287: -32,11 + 288: -33,11 + 289: -34,11 + 292: -43,0 + 293: -42,0 + 571: 24,15 + 572: 23,15 + 573: 22,15 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' id: WarningLine decals: - 562: 51,0 - 563: 51,1 - 564: 51,2 - 565: 51,3 - 566: 51,-1 - 567: 51,-2 - 689: -15,3 + 559: 51,0 + 560: 51,1 + 561: 51,2 + 562: 51,3 + 563: 51,-1 + 564: 51,-2 + 686: -15,3 - node: color: '#FFFFFFFF' id: WarningLineCorner decals: - 294: -35,11 - 436: -8,31 + 291: -35,11 + 433: -8,31 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' id: WarningLineCorner decals: - 568: 56,10 - 692: -15,2 + 565: 56,10 + 689: -15,2 - node: angle: -1.5707963267948966 rad color: '#FFFFFFFF' id: WarningLineCornerFlipped decals: - 627: -72,19 + 624: -72,19 - node: color: '#FFFFFFFF' id: WarningLineCornerFlipped decals: - 293: -31,11 - 437: -5,31 + 290: -31,11 + 434: -5,31 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' id: WarningLineCornerFlipped decals: - 690: -15,4 + 687: -15,4 - node: color: '#FFFFFFFF' id: WoodTrimThinBox decals: - 1319: 12,-30 + 1316: 12,-30 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerNe decals: - 3652: -12,-51 + 3580: -12,-51 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerNw decals: - 3651: -15,-51 + 3579: -15,-51 - node: color: '#FFFFFFFF' id: WoodTrimThinInnerNw decals: - 1210: -7,14 + 1207: -7,14 - node: color: '#FFFFFFFF' id: WoodTrimThinInnerSe decals: - 1200: -12,19 - 3767: 10,-27 + 1197: -12,19 + 3695: 10,-27 - node: color: '#FFFFFFFF' id: WoodTrimThinInnerSw decals: - 830: -23,-27 - 1205: -7,19 + 827: -23,-27 + 1202: -7,19 - node: color: '#FFFFFFFF' id: WoodTrimThinLineE decals: - 782: -29,11 - 783: -29,12 - 784: -29,13 - 785: -29,14 - 786: -29,15 - 787: -29,16 - 788: -29,17 - 789: -29,18 - 790: -29,19 - 791: -29,20 - 792: -29,21 - 796: -6,-5 - 810: 11,19 - 813: -42,8 - 822: -24,-31 - 823: -24,-30 - 824: -24,-29 - 825: -24,-28 - 1196: -12,15 - 1197: -12,16 - 1198: -12,17 - 1199: -12,18 - 2045: -24,-27 - 2070: -46,-16 - 2348: 24,-21 - 2349: 24,-20 - 2350: 24,-19 - 2351: 24,-18 - 2352: 24,-17 - 2353: 24,-16 - 3655: -12,-52 - 3764: 10,-29 - 3765: 10,-28 + 779: -29,11 + 780: -29,12 + 781: -29,13 + 782: -29,14 + 783: -29,15 + 784: -29,16 + 785: -29,17 + 786: -29,18 + 787: -29,19 + 788: -29,20 + 789: -29,21 + 793: -6,-5 + 807: 11,19 + 810: -42,8 + 819: -24,-31 + 820: -24,-30 + 821: -24,-29 + 822: -24,-28 + 1193: -12,15 + 1194: -12,16 + 1195: -12,17 + 1196: -12,18 + 2023: -24,-27 + 2048: -46,-16 + 2324: 24,-21 + 2325: 24,-20 + 2326: 24,-19 + 2327: 24,-18 + 2328: 24,-17 + 2329: 24,-16 + 3583: -12,-52 + 3692: 10,-29 + 3693: 10,-28 - node: color: '#FFFFFFFF' id: WoodTrimThinLineN decals: - 793: -3,-9 - 812: -44,6 - 826: -24,-28 - 827: -25,-28 - 828: -26,-28 - 829: -27,-28 - 1189: -7,19 - 1190: -8,19 - 1191: -9,19 - 1192: -10,19 - 1193: -11,19 - 1194: -12,19 - 1195: -13,19 - 1211: -8,14 - 1212: -9,14 - 1213: -10,14 - 1214: -11,14 - 1282: 17,-38 - 1283: 16,-38 - 1284: 18,-38 - 1285: 19,-38 - 1286: 20,-38 - 1287: 21,-38 - 2041: -20,-1 - 2042: -21,-1 - 2043: -22,-1 - 2044: -23,-1 - 2046: -23,-28 - 2076: -41,9 - 2077: -44,9 - 2078: -43,9 - 2916: 43,12 - 2917: 44,12 - 2918: 45,12 - 3245: 11,-38 - 3246: 10,-38 - 3247: 9,-38 - 3248: -25,10 - 3249: -26,10 - 3250: -27,10 - 3649: -15,-53 - 3653: -13,-51 - 3654: -14,-51 + 790: -3,-9 + 809: -44,6 + 823: -24,-28 + 824: -25,-28 + 825: -26,-28 + 826: -27,-28 + 1186: -7,19 + 1187: -8,19 + 1188: -9,19 + 1189: -10,19 + 1190: -11,19 + 1191: -12,19 + 1192: -13,19 + 1208: -8,14 + 1209: -9,14 + 1210: -10,14 + 1211: -11,14 + 1279: 17,-38 + 1280: 16,-38 + 1281: 18,-38 + 1282: 19,-38 + 1283: 20,-38 + 1284: 21,-38 + 2019: -20,-1 + 2020: -21,-1 + 2021: -22,-1 + 2022: -23,-1 + 2024: -23,-28 + 2054: -41,9 + 2055: -44,9 + 2056: -43,9 + 2886: 43,12 + 2887: 44,12 + 2888: 45,12 + 3195: 11,-38 + 3196: 10,-38 + 3197: 9,-38 + 3198: -25,10 + 3199: -26,10 + 3200: -27,10 + 3577: -15,-53 + 3581: -13,-51 + 3582: -14,-51 - node: color: '#FFFFFFFF' id: WoodTrimThinLineS decals: - 798: -3,-3 - 799: -4,-3 - 800: -5,-3 - 801: -7,-3 - 802: -8,-3 - 1201: -11,19 - 1202: -10,19 - 1203: -9,19 - 1204: -8,19 - 2037: -20,2 - 2038: -21,2 - 2039: -22,2 - 2040: -23,2 - 2068: -47,-16 - 2069: -46,-16 - 2075: -41,7 - 3251: -25,22 - 3252: -26,22 - 3253: -27,22 - 3722: 13,20 - 3723: 12,20 - 3766: 11,-27 - 3768: 12,-27 - 3769: 13,-27 - 3770: 14,-27 - 3771: 15,-27 - 3772: 16,-27 - 3773: 17,-27 - 3774: 18,-27 - 3775: 19,-27 - 3776: 20,-27 - 3777: 21,-27 + 795: -3,-3 + 796: -4,-3 + 797: -5,-3 + 798: -7,-3 + 799: -8,-3 + 1198: -11,19 + 1199: -10,19 + 1200: -9,19 + 1201: -8,19 + 2015: -20,2 + 2016: -21,2 + 2017: -22,2 + 2018: -23,2 + 2046: -47,-16 + 2047: -46,-16 + 2053: -41,7 + 3201: -25,22 + 3202: -26,22 + 3203: -27,22 + 3650: 13,20 + 3651: 12,20 + 3694: 11,-27 + 3696: 12,-27 + 3697: 13,-27 + 3698: 14,-27 + 3699: 15,-27 + 3700: 16,-27 + 3701: 17,-27 + 3702: 18,-27 + 3703: 19,-27 + 3704: 20,-27 + 3705: 21,-27 - node: color: '#FFFFFFFF' id: WoodTrimThinLineW decals: - 771: -23,11 - 772: -23,12 - 773: -23,13 - 774: -23,14 - 775: -23,15 - 776: -23,16 - 777: -23,17 - 778: -23,18 - 779: -23,19 - 780: -23,20 - 781: -23,21 - 797: -6,-5 - 814: -42,8 - 1206: -7,18 - 1207: -7,17 - 1208: -7,16 - 1209: -7,15 - 3656: -15,-52 + 768: -23,11 + 769: -23,12 + 770: -23,13 + 771: -23,14 + 772: -23,15 + 773: -23,16 + 774: -23,17 + 775: -23,18 + 776: -23,19 + 777: -23,20 + 778: -23,21 + 794: -6,-5 + 811: -42,8 + 1203: -7,18 + 1204: -7,17 + 1205: -7,16 + 1206: -7,15 + 3584: -15,-52 - node: cleanable: True color: '#474F52FF' id: amyjon decals: - 2717: -59.733913,26.110247 + 2693: -59.733913,26.110247 - node: cleanable: True color: '#FFFFFFFF' id: b decals: - 2784: -64,51 + 2760: -64,51 - node: cleanable: True color: '#B02E26FF' id: beepsky decals: - 2528: -51.97618,-34.20235 + 2504: -51.97618,-34.20235 - node: cleanable: True color: '#FFFFFFFF' id: body decals: - 2529: -45.397133,-31.934364 + 2505: -45.397133,-31.934364 - node: cleanable: True color: '#1D1D21FF' id: clawprint decals: - 2496: 51.849873,-10.273688 - 2497: 52.068623,-9.992438 - 2498: 51.849873,-9.726813 - 2499: 52.084248,-9.383063 - 2500: 51.849873,-9.070563 + 2472: 51.849873,-10.273688 + 2473: 52.068623,-9.992438 + 2474: 51.849873,-9.726813 + 2475: 52.084248,-9.383063 + 2476: 51.849873,-9.070563 - node: color: '#DE3A3A96' id: clown decals: - 1668: -9,-13 + 1648: -9,-13 - node: cleanable: True color: '#F38BAAFF' id: clown decals: - 2719: 29.974606,-11.088503 + 2695: 29.974606,-11.088503 - node: cleanable: True color: '#79150096' id: electricdanger decals: - 2641: -10.991777,-32.08159 + 2617: -10.991777,-32.08159 - node: cleanable: True color: '#79150096' id: end decals: - 1686: -60,-9 + 1666: -60,-9 - node: cleanable: True color: '#B02E26FF' id: end decals: - 2425: 32.02958,-5.0098457 + 2401: 32.02958,-5.0098457 - node: cleanable: True color: '#A4610696' id: engie decals: - 1685: 32,-54 + 1665: 32,-54 - node: cleanable: True color: '#F38BAAFF' id: evac decals: - 2495: 36.93115,20.930944 + 2471: 36.93115,20.930944 - node: color: '#A46106FF' id: food decals: - 3570: 26,-41 + 3499: 26,-41 - node: color: '#D4D4D428' id: footprint decals: - 3228: 39.8631,-46.230442 - 3229: 40.128723,-45.902317 - 3230: 39.8631,-45.636692 - 3231: 40.159973,-45.371067 - 3232: 39.909973,-44.996067 - 3233: 40.191223,-44.621067 + 3178: 39.8631,-46.230442 + 3179: 40.128723,-45.902317 + 3180: 39.8631,-45.636692 + 3181: 40.159973,-45.371067 + 3182: 39.909973,-44.996067 + 3183: 40.191223,-44.621067 - node: cleanable: True color: '#FFFFFFFF' id: guy decals: - 2718: -67.988,9.536162 - 2929: 35,-29 + 2694: -67.988,9.536162 + 2899: 35,-29 - node: cleanable: True color: '#DE3A3AFF' id: largebrush decals: - 2783: -64,51 + 2759: -64,51 - node: color: '#D4D4D428' id: matt decals: - 1676: -30,-36 + 1656: -30,-36 - node: cleanable: True color: '#FED83DFF' id: shop decals: - 2716: -66.02228,7.9843655 + 2692: -66.02228,7.9843655 - node: cleanable: True color: '#DE3A3A18' id: splatter decals: - 612: 19,-8 + 609: 19,-8 - node: cleanable: True color: '#B02E26FF' id: stickman decals: - 2722: 9.979055,-45.00161 + 2698: 9.979055,-45.00161 - type: GridAtmosphere version: 2 data: @@ -8089,7 +8089,7 @@ entities: 1: 39312 -12,8: 4: 12 - 6: 3072 + 5: 3072 -11,5: 0: 63351 -11,6: @@ -8098,7 +8098,7 @@ entities: -11,8: 4: 1 1: 17476 - 6: 256 + 5: 256 -11,7: 1: 17484 -10,5: @@ -8201,10 +8201,10 @@ entities: 0: 255 1: 57344 -8,11: - 5: 816 + 6: 816 1: 34952 -9,11: - 5: 2176 + 6: 2176 1: 8738 -8,12: 1: 34959 @@ -8224,7 +8224,7 @@ entities: -6,11: 0: 4095 -6,12: - 5: 61166 + 6: 61166 -5,9: 0: 65535 -5,10: @@ -8232,7 +8232,7 @@ entities: -5,11: 0: 36863 -5,12: - 5: 30515 + 6: 30515 0: 12 -4,9: 0: 65535 @@ -8242,7 +8242,7 @@ entities: 0: 4095 -4,12: 0: 1 - 5: 65518 + 6: 65518 -4,13: 1: 61680 -5,13: @@ -8256,7 +8256,7 @@ entities: -5,15: 1: 17487 -3,12: - 5: 13107 + 6: 13107 1: 34944 -3,13: 1: 47792 @@ -8322,7 +8322,7 @@ entities: 1: 61713 -12,9: 0: 16 - 5: 3084 + 6: 3084 -13,9: 1: 39305 -13,10: @@ -8332,18 +8332,18 @@ entities: 0: 12544 -12,10: 3: 12 - 5: 3072 + 6: 3072 -12,11: - 5: 12 + 6: 12 -11,9: - 5: 257 + 6: 257 1: 17476 -11,10: 3: 1 - 5: 256 + 6: 256 1: 17476 -11,11: - 5: 1 + 6: 1 1: 17476 -11,12: 1: 17487 @@ -8397,7 +8397,7 @@ entities: 1: 15 -13,12: 1: 34952 - 6: 48 + 5: 48 4: 12288 -12,13: 1: 61455 @@ -8431,11 +8431,11 @@ entities: 1: 62671 -7,14: 1: 244 - 5: 57344 + 6: 57344 0: 1024 -7,15: 1: 61440 - 5: 238 + 6: 238 0: 1024 -7,16: 1: 65524 @@ -8494,7 +8494,7 @@ entities: -14,12: 0: 1 1: 8738 - 6: 128 + 5: 128 4: 32768 -17,12: 0: 52232 @@ -9019,7 +9019,7 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 0 + - 6666.982 - 0 - 0 - 0 @@ -9034,7 +9034,7 @@ entities: - volume: 2500 temperature: 293.15 moles: - - 6666.982 + - 0 - 0 - 0 - 0 @@ -9353,8 +9353,8 @@ entities: id: docking43669 localAnchorB: -47.5,-40 localAnchorA: 0.5,0 - damping: 1559.7855 - stiffness: 14000.604 + damping: 1559.79 + stiffness: 14000.643 - proto: AcousticGuitarInstrument entities: - uid: 2133 @@ -58976,15 +58976,6 @@ entities: - type: Transform pos: -11.221505,22.789167 parent: 60 -- proto: ClothingNeckMantleCMO - entities: - - uid: 17463 - components: - - type: Transform - parent: 7044 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: ClothingNeckMantleHOP entities: - uid: 5207 @@ -66766,7 +66757,7 @@ entities: - uid: 13100 components: - type: Transform - pos: 29.5,-12.5 + pos: 29.5,-14.5 parent: 60 - proto: DresserFilled entities: @@ -70366,10 +70357,10 @@ entities: - type: Transform pos: -20.5,2.5 parent: 60 - - uid: 6647 + - uid: 7044 components: - type: Transform - pos: 30.5,-12.5 + pos: 29.5,-12.5 parent: 60 - uid: 18472 components: @@ -71791,26 +71782,20 @@ entities: rot: -1.5707963267948966 rad pos: -44.5,36.5 parent: 60 -- proto: GasMinerNitrogen +- proto: GasMinerNitrogenStationLarge entities: - uid: 15203 components: - type: Transform - rot: -1.5707963267948966 rad pos: -44.5,32.5 parent: 60 - - type: GasMiner - maxExternalPressure: 4500 -- proto: GasMinerOxygen +- proto: GasMinerOxygenStationLarge entities: - uid: 15204 components: - type: Transform - rot: -1.5707963267948966 rad pos: -44.5,34.5 parent: 60 - - type: GasMiner - maxExternalPressure: 4500 - proto: GasMinerWaterVapor entities: - uid: 15206 @@ -106602,40 +106587,11 @@ entities: parent: 60 - proto: LockerChiefMedicalOfficerFilledHardsuit entities: - - uid: 7044 + - uid: 6647 components: - type: Transform - pos: 29.5,-14.5 + pos: 30.5,-12.5 parent: 60 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 17463 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: LockerClown entities: - uid: 6580 From d86438c22ba753756d1f41c5ad3455e28852b84a Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Wed, 7 Aug 2024 02:49:28 -0600 Subject: [PATCH 236/422] martathon update (#30731) martathon --- Resources/Maps/marathon.yml | 1205 +++++++++++++++++------------------ 1 file changed, 600 insertions(+), 605 deletions(-) diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml index 5ea1694177..cce7a0d7b3 100644 --- a/Resources/Maps/marathon.yml +++ b/Resources/Maps/marathon.yml @@ -473,7 +473,7 @@ entities: 1256: 23,25 1257: 21,25 1730: 31,21 - 2648: -31,-10 + 2647: -31,-10 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' @@ -582,35 +582,35 @@ entities: 2392: 7,35 2425: -4,-29 2426: -33,10 - 2428: -14,5 - 2429: 6,6 - 2430: -6,-9 - 2445: -43,19 - 2446: -41,19 - 2647: -33,-12 - 2666: -28,-14 - 2667: -23,-15 - 2668: -19,-23 - 2741: -20,-5 - 2840: 18,16 - 2841: 20,16 - 2856: 14,-18 - 2898: -6,-48 - 2899: -6,-49 - 2900: -6,-50 - 2901: -6,-51 - 2915: -2,-44 - 2916: -3,-44 - 2917: -1,-44 - 2918: 1,-44 - 2919: 2,-44 - 2920: 3,-44 - 2921: 4,-44 - 3033: 4,-51 - 3037: -4,-48 - 3038: -3,-48 - 3071: 12,14 - 3076: 2,-51 + 2427: -14,5 + 2428: 6,6 + 2429: -6,-9 + 2444: -43,19 + 2445: -41,19 + 2646: -33,-12 + 2665: -28,-14 + 2666: -23,-15 + 2667: -19,-23 + 2740: -20,-5 + 2794: 18,16 + 2795: 20,16 + 2797: 14,-18 + 2839: -6,-48 + 2840: -6,-49 + 2841: -6,-50 + 2842: -6,-51 + 2856: -2,-44 + 2857: -3,-44 + 2858: -1,-44 + 2859: 1,-44 + 2860: 2,-44 + 2861: 3,-44 + 2862: 4,-44 + 2974: 4,-51 + 2978: -4,-48 + 2979: -3,-48 + 3010: 12,14 + 3015: 2,-51 - node: color: '#FFFFFFFF' id: BotGreyscale @@ -629,9 +629,9 @@ entities: 2249: 33,20 2250: 33,19 2264: 40,14 - 2447: -44,19 - 2448: -42,19 - 2449: -40,19 + 2446: -44,19 + 2447: -42,19 + 2448: -40,19 - node: color: '#FFFFFFFF' id: BotRight @@ -649,13 +649,13 @@ entities: id: Box decals: 2265: 39,9 - 2896: -14,-38 - 2897: -12,-38 - 3031: -5,-54 - 3032: -4,-54 - 3034: -4,-50 - 3035: 4,-49 - 3036: 4,-50 + 2837: -14,-38 + 2838: -12,-38 + 2972: -5,-54 + 2973: -4,-54 + 2975: -4,-50 + 2976: 4,-49 + 2977: 4,-50 - node: color: '#FFFFFFFF' id: BrickTileDarkBox @@ -986,11 +986,11 @@ entities: color: '#52B4E996' id: BrickTileWhiteCornerNe decals: - 2536: -21,-15 - 2546: -13,-15 - 2602: -13,-19 - 2630: -29,-16 - 2675: -12,-9 + 2535: -21,-15 + 2545: -13,-15 + 2601: -13,-19 + 2629: -29,-16 + 2674: -12,-9 - node: color: '#DE3A3A96' id: BrickTileWhiteCornerNe @@ -1000,20 +1000,20 @@ entities: color: '#EFB34196' id: BrickTileWhiteCornerNe decals: - 2433: -40,19 - 2973: -25,-45 - 2974: -26,-43 - 2975: -20,-45 - 2983: -14,-46 - 2985: -20,-49 - 2992: -21,-57 - 3017: -1,-42 + 2432: -40,19 + 2914: -25,-45 + 2915: -26,-43 + 2916: -20,-45 + 2924: -14,-46 + 2926: -20,-49 + 2933: -21,-57 + 2958: -1,-42 - node: color: '#FFFFFFFF' id: BrickTileWhiteCornerNe decals: - 2535: -21,-15 - 2581: -13,-19 + 2534: -21,-15 + 2580: -13,-19 - node: color: '#334E6DC8' id: BrickTileWhiteCornerNw @@ -1023,11 +1023,11 @@ entities: color: '#52B4E996' id: BrickTileWhiteCornerNw decals: - 2537: -23,-15 - 2545: -15,-15 - 2603: -19,-19 - 2631: -31,-16 - 2674: -16,-9 + 2536: -23,-15 + 2544: -15,-15 + 2602: -19,-19 + 2630: -31,-16 + 2673: -16,-9 - node: color: '#DE3A3A96' id: BrickTileWhiteCornerNw @@ -1039,30 +1039,30 @@ entities: decals: 2227: 5,-24 2232: 9,-23 - 2437: -44,19 - 2972: -23,-45 - 2981: -16,-45 - 2982: -11,-46 - 2987: -16,-49 - 2995: -15,-57 - 3006: -10,-42 - 3015: 3,-40 - 3016: 1,-42 + 2436: -44,19 + 2913: -23,-45 + 2922: -16,-45 + 2923: -11,-46 + 2928: -16,-49 + 2936: -15,-57 + 2947: -10,-42 + 2956: 3,-40 + 2957: 1,-42 - node: color: '#FFFFFFFF' id: BrickTileWhiteCornerNw decals: - 2534: -23,-15 - 2574: -19,-19 + 2533: -23,-15 + 2573: -19,-19 - node: color: '#52B4E996' id: BrickTileWhiteCornerSe decals: - 2533: -21,-24 - 2548: -13,-17 - 2600: -13,-23 - 2639: -29,-24 - 2677: -12,-13 + 2532: -21,-24 + 2547: -13,-17 + 2599: -13,-23 + 2638: -29,-24 + 2676: -12,-13 - node: color: '#DE3A3A96' id: BrickTileWhiteCornerSe @@ -1073,31 +1073,31 @@ entities: id: BrickTileWhiteCornerSe decals: 1642: 7,-30 - 2440: -40,17 - 2970: -26,-41 - 2986: -20,-47 - 2988: -19,-51 - 2994: -21,-55 - 3009: -9,-39 - 3010: -5,-39 - 3011: -4,-38 - 3013: 0,-38 + 2439: -40,17 + 2911: -26,-41 + 2927: -20,-47 + 2929: -19,-51 + 2935: -21,-55 + 2950: -9,-39 + 2951: -5,-39 + 2952: -4,-38 + 2954: 0,-38 - node: color: '#FFFFFFFF' id: BrickTileWhiteCornerSe decals: - 2530: -21,-24 - 2580: -13,-23 + 2529: -21,-24 + 2579: -13,-23 - node: color: '#52B4E996' id: BrickTileWhiteCornerSw decals: 2180: -37,0 - 2532: -23,-24 - 2549: -15,-17 - 2601: -19,-23 - 2638: -31,-24 - 2676: -16,-13 + 2531: -23,-24 + 2548: -15,-17 + 2600: -19,-23 + 2637: -31,-24 + 2675: -16,-13 - node: color: '#DE3A3A96' id: BrickTileWhiteCornerSw @@ -1108,25 +1108,25 @@ entities: id: BrickTileWhiteCornerSw decals: 1641: 5,-30 - 2438: -44,17 - 2984: -16,-47 - 2989: -17,-51 - 2993: -15,-55 - 3007: -11,-39 - 3008: -7,-39 - 3012: -2,-38 - 3014: 3,-38 + 2437: -44,17 + 2925: -16,-47 + 2930: -17,-51 + 2934: -15,-55 + 2948: -11,-39 + 2949: -7,-39 + 2953: -2,-38 + 2955: 3,-38 - node: color: '#FFFFFFFF' id: BrickTileWhiteCornerSw decals: - 2531: -23,-24 - 2575: -19,-23 + 2530: -23,-24 + 2574: -19,-23 - node: color: '#EFB34196' id: BrickTileWhiteEndS decals: - 2980: -20,-40 + 2921: -20,-40 - node: color: '#334E6DC8' id: BrickTileWhiteInnerNe @@ -1137,7 +1137,7 @@ entities: color: '#52B4E996' id: BrickTileWhiteInnerNe decals: - 2523: -21,-21 + 2522: -21,-21 - node: color: '#D381C996' id: BrickTileWhiteInnerNe @@ -1147,12 +1147,12 @@ entities: color: '#EFB34196' id: BrickTileWhiteInnerNe decals: - 2976: -26,-45 + 2917: -26,-45 - node: color: '#FFFFFFFF' id: BrickTileWhiteInnerNe decals: - 2495: -21,-21 + 2494: -21,-21 - node: color: '#334E6DC8' id: BrickTileWhiteInnerNw @@ -1163,7 +1163,7 @@ entities: color: '#52B4E996' id: BrickTileWhiteInnerNw decals: - 2524: -19,-21 + 2523: -19,-21 - node: color: '#79150096' id: BrickTileWhiteInnerNw @@ -1179,12 +1179,12 @@ entities: id: BrickTileWhiteInnerNw decals: 2231: 9,-24 - 3029: 3,-42 + 2970: 3,-42 - node: color: '#FFFFFFFF' id: BrickTileWhiteInnerNw decals: - 2496: -19,-21 + 2495: -19,-21 - node: color: '#334E6DC8' id: BrickTileWhiteInnerSe @@ -1195,7 +1195,7 @@ entities: color: '#52B4E996' id: BrickTileWhiteInnerSe decals: - 2521: -21,-21 + 2520: -21,-21 - node: color: '#D381C996' id: BrickTileWhiteInnerSe @@ -1210,7 +1210,7 @@ entities: color: '#FFFFFFFF' id: BrickTileWhiteInnerSe decals: - 2493: -21,-21 + 2492: -21,-21 - node: color: '#334E6DC8' id: BrickTileWhiteInnerSw @@ -1221,7 +1221,7 @@ entities: color: '#52B4E996' id: BrickTileWhiteInnerSw decals: - 2522: -19,-21 + 2521: -19,-21 - node: color: '#79150096' id: BrickTileWhiteInnerSw @@ -1242,7 +1242,7 @@ entities: color: '#FFFFFFFF' id: BrickTileWhiteInnerSw decals: - 2494: -19,-21 + 2493: -19,-21 - node: color: '#334E6DC8' id: BrickTileWhiteLineE @@ -1262,23 +1262,23 @@ entities: color: '#52B4E996' id: BrickTileWhiteLineE decals: - 2513: -21,-17 - 2514: -21,-18 - 2515: -21,-19 - 2516: -21,-20 - 2517: -21,-22 - 2518: -21,-23 - 2547: -13,-16 - 2589: -13,-22 - 2590: -13,-21 - 2591: -13,-20 - 2625: -29,-22 - 2626: -29,-21 - 2627: -29,-20 - 2628: -29,-19 - 2629: -29,-18 - 2678: -12,-12 - 2679: -12,-10 + 2512: -21,-17 + 2513: -21,-18 + 2514: -21,-19 + 2515: -21,-20 + 2516: -21,-22 + 2517: -21,-23 + 2546: -13,-16 + 2588: -13,-22 + 2589: -13,-21 + 2590: -13,-20 + 2624: -29,-22 + 2625: -29,-21 + 2626: -29,-20 + 2627: -29,-19 + 2628: -29,-18 + 2677: -12,-12 + 2678: -12,-10 - node: color: '#D381C996' id: BrickTileWhiteLineE @@ -1301,22 +1301,22 @@ entities: 1635: 7,-26 2058: -4,-35 2059: -4,-34 - 2442: -40,18 - 2971: -26,-40 - 2977: -26,-44 + 2441: -40,18 + 2912: -26,-40 + 2918: -26,-44 - node: color: '#FFFFFFFF' id: BrickTileWhiteLineE decals: - 2487: -21,-23 - 2488: -21,-22 - 2489: -21,-20 - 2490: -21,-19 - 2499: -21,-18 - 2500: -21,-17 - 2586: -13,-22 - 2587: -13,-21 - 2588: -13,-20 + 2486: -21,-23 + 2487: -21,-22 + 2488: -21,-20 + 2489: -21,-19 + 2498: -21,-18 + 2499: -21,-17 + 2585: -13,-22 + 2586: -13,-21 + 2587: -13,-20 - node: color: '#334E6DC8' id: BrickTileWhiteLineN @@ -1337,14 +1337,14 @@ entities: color: '#52B4E996' id: BrickTileWhiteLineN decals: - 2525: -20,-21 - 2592: -15,-19 - 2593: -16,-19 - 2594: -17,-19 - 2595: -18,-19 - 2680: -13,-9 - 2681: -14,-9 - 2682: -15,-9 + 2524: -20,-21 + 2591: -15,-19 + 2592: -16,-19 + 2593: -17,-19 + 2594: -18,-19 + 2679: -13,-9 + 2680: -14,-9 + 2681: -15,-9 - node: color: '#D381C996' id: BrickTileWhiteLineN @@ -1365,20 +1365,20 @@ entities: 2233: 10,-23 2234: 11,-23 2235: 12,-23 - 2434: -41,19 - 2435: -42,19 - 2436: -43,19 - 2978: -22,-45 - 2979: -21,-45 - 3018: -9,-42 - 3019: -8,-42 - 3020: -6,-42 - 3021: -7,-42 - 3022: -5,-42 - 3023: -4,-42 - 3024: -3,-42 - 3025: -2,-42 - 3026: 2,-42 + 2433: -41,19 + 2434: -42,19 + 2435: -43,19 + 2919: -22,-45 + 2920: -21,-45 + 2959: -9,-42 + 2960: -8,-42 + 2961: -6,-42 + 2962: -7,-42 + 2963: -5,-42 + 2964: -4,-42 + 2965: -3,-42 + 2966: -2,-42 + 2967: 2,-42 - node: color: '#FFFFFFFF' id: BrickTileWhiteLineN @@ -1386,11 +1386,11 @@ entities: 1316: -26,39 1317: -28,39 1318: -27,39 - 2498: -20,-21 - 2582: -15,-19 - 2583: -16,-19 - 2584: -17,-19 - 2585: -18,-19 + 2497: -20,-21 + 2581: -15,-19 + 2582: -16,-19 + 2583: -17,-19 + 2584: -18,-19 - node: color: '#334E6DC8' id: BrickTileWhiteLineS @@ -1404,14 +1404,14 @@ entities: decals: 2178: -34,0 2179: -36,0 - 2526: -20,-21 - 2596: -17,-23 - 2597: -16,-23 - 2598: -15,-23 - 2599: -14,-23 - 2640: -30,-24 - 2684: -13,-13 - 2685: -15,-13 + 2525: -20,-21 + 2595: -17,-23 + 2596: -16,-23 + 2597: -15,-23 + 2598: -14,-23 + 2639: -30,-24 + 2683: -13,-13 + 2684: -15,-13 - node: color: '#79150096' id: BrickTileWhiteLineS @@ -1435,22 +1435,22 @@ entities: decals: 2063: -3,-35 2229: 8,-25 - 2439: -43,17 - 2441: -42,17 - 2990: -20,-51 - 2991: -16,-51 - 3027: -10,-39 - 3028: -6,-39 + 2438: -43,17 + 2440: -42,17 + 2931: -20,-51 + 2932: -16,-51 + 2968: -10,-39 + 2969: -6,-39 - node: color: '#FFFFFFFF' id: BrickTileWhiteLineS decals: 1315: -27,39 - 2497: -20,-21 - 2576: -17,-23 - 2577: -16,-23 - 2578: -15,-23 - 2579: -14,-23 + 2496: -20,-21 + 2575: -17,-23 + 2576: -16,-23 + 2577: -15,-23 + 2578: -14,-23 - node: color: '#334E6DC8' id: BrickTileWhiteLineW @@ -1471,21 +1471,21 @@ entities: color: '#52B4E996' id: BrickTileWhiteLineW decals: - 2507: -23,-22 - 2508: -23,-21 - 2509: -23,-20 - 2510: -23,-19 - 2511: -23,-18 - 2512: -23,-16 - 2519: -19,-22 - 2520: -19,-20 - 2632: -31,-17 - 2633: -31,-19 - 2634: -31,-20 - 2635: -31,-21 - 2636: -31,-22 - 2637: -31,-23 - 2683: -16,-12 + 2506: -23,-22 + 2507: -23,-21 + 2508: -23,-20 + 2509: -23,-19 + 2510: -23,-18 + 2511: -23,-16 + 2518: -19,-22 + 2519: -19,-20 + 2631: -31,-17 + 2632: -31,-19 + 2633: -31,-20 + 2634: -31,-21 + 2635: -31,-22 + 2636: -31,-23 + 2682: -16,-12 - node: color: '#79150096' id: BrickTileWhiteLineW @@ -1519,19 +1519,19 @@ entities: 1643: 9,-26 2060: -2,-35 2061: -2,-34 - 3030: 3,-41 + 2971: 3,-41 - node: color: '#FFFFFFFF' id: BrickTileWhiteLineW decals: - 2491: -19,-22 - 2492: -19,-20 - 2501: -23,-22 - 2502: -23,-21 - 2503: -23,-20 - 2504: -23,-19 - 2505: -23,-18 - 2506: -23,-16 + 2490: -19,-22 + 2491: -19,-20 + 2500: -23,-22 + 2501: -23,-21 + 2502: -23,-20 + 2503: -23,-19 + 2504: -23,-18 + 2505: -23,-16 - node: color: '#FFFFFFFF' id: Busha1 @@ -1657,7 +1657,7 @@ entities: 875: -10.897953,23.01216 876: -7.147953,23.059034 878: -12.769052,22.88716 - 2772: -20,-22 + 2771: -20,-22 - node: color: '#FFFFFFFF' id: Bushi2 @@ -1737,45 +1737,45 @@ entities: id: CheckerNESW decals: 520: -11,-2 - 2550: -19,-17 - 2551: -19,-16 - 2552: -19,-15 - 2553: -18,-15 - 2554: -17,-15 - 2555: -17,-16 - 2556: -18,-16 - 2557: -18,-17 - 2558: -17,-17 - 2559: -18,-22 - 2560: -18,-21 - 2561: -18,-20 - 2562: -17,-20 - 2563: -17,-21 - 2564: -17,-22 - 2565: -16,-22 - 2566: -16,-21 - 2567: -16,-20 - 2568: -15,-20 - 2569: -15,-21 - 2570: -15,-22 - 2571: -14,-22 - 2572: -14,-21 - 2573: -14,-20 - 2610: -33,-20 - 2611: -34,-20 - 2612: -35,-20 - 2613: -35,-19 - 2614: -34,-19 - 2615: -33,-19 - 2616: -33,-18 - 2617: -34,-18 - 2618: -35,-18 - 2619: -35,-17 - 2620: -34,-17 - 2621: -33,-17 - 2622: -33,-16 - 2623: -34,-16 - 2624: -35,-16 + 2549: -19,-17 + 2550: -19,-16 + 2551: -19,-15 + 2552: -18,-15 + 2553: -17,-15 + 2554: -17,-16 + 2555: -18,-16 + 2556: -18,-17 + 2557: -17,-17 + 2558: -18,-22 + 2559: -18,-21 + 2560: -18,-20 + 2561: -17,-20 + 2562: -17,-21 + 2563: -17,-22 + 2564: -16,-22 + 2565: -16,-21 + 2566: -16,-20 + 2567: -15,-20 + 2568: -15,-21 + 2569: -15,-22 + 2570: -14,-22 + 2571: -14,-21 + 2572: -14,-20 + 2609: -33,-20 + 2610: -34,-20 + 2611: -35,-20 + 2612: -35,-19 + 2613: -34,-19 + 2614: -33,-19 + 2615: -33,-18 + 2616: -34,-18 + 2617: -35,-18 + 2618: -35,-17 + 2619: -34,-17 + 2620: -33,-17 + 2621: -33,-16 + 2622: -34,-16 + 2623: -35,-16 - node: color: '#D4D4D496' id: CheckerNESW @@ -1786,21 +1786,21 @@ entities: id: CheckerNWSE decals: 516: -9,-4 - 2702: -32,-8 - 2703: -32,-7 - 2704: -32,-6 - 2705: -31,-6 - 2706: -30,-6 - 2707: -29,-6 - 2708: -28,-6 - 2709: -28,-7 - 2710: -28,-8 - 2711: -29,-8 - 2712: -29,-7 - 2713: -30,-7 - 2714: -30,-8 - 2715: -31,-8 - 2716: -31,-7 + 2701: -32,-8 + 2702: -32,-7 + 2703: -32,-6 + 2704: -31,-6 + 2705: -30,-6 + 2706: -29,-6 + 2707: -28,-6 + 2708: -28,-7 + 2709: -28,-8 + 2710: -29,-8 + 2711: -29,-7 + 2712: -30,-7 + 2713: -30,-8 + 2714: -31,-8 + 2715: -31,-7 - node: color: '#79150096' id: CheckerNWSE @@ -1823,14 +1823,14 @@ entities: color: '#9FED5896' id: CheckerNWSE decals: - 3077: -26,9 - 3078: -27,9 - 3079: -28,9 - 3080: -29,9 - 3081: -29,11 - 3082: -28,11 - 3083: -27,11 - 3084: -26,11 + 3016: -26,9 + 3017: -27,9 + 3018: -28,9 + 3019: -29,9 + 3020: -29,11 + 3021: -28,11 + 3022: -27,11 + 3023: -26,11 - node: color: '#A4610696' id: CheckerNWSE @@ -1848,9 +1848,9 @@ entities: color: '#D381C93E' id: CheckerNWSE decals: - 3051: 17,13 - 3052: 18,13 - 3053: 19,13 + 2991: 17,13 + 2992: 18,13 + 2993: 19,13 - node: color: '#EFB34196' id: CheckerNWSE @@ -1903,12 +1903,12 @@ entities: 1223: 26,9 1224: 26,10 2064: 4,-30 - 2764: -13,-8 - 2765: -12,-8 - 2868: 14,-24 - 2869: 14,-25 - 2870: 10,-31 - 2871: 11,-31 + 2763: -13,-8 + 2764: -12,-8 + 2809: 14,-24 + 2810: 14,-25 + 2811: 10,-31 + 2812: 11,-31 - node: color: '#FFFFFFFF' id: DiagonalCheckerAOverlay @@ -1930,21 +1930,21 @@ entities: 859: -28,-38 860: -23,-36 861: -25,-38 - 2472: -41,-11 - 2473: -42,-13 - 2474: -43,-17 - 2475: -42,-16 - 2476: -42,-17 - 2477: -41,-16 - 2478: -42,-12 - 2479: -41,-9 - 2480: -42,-8 - 2481: -42,-7 - 2482: -39,-7 - 2483: -39,-6 - 2484: -38,-7 - 2485: -38,-8 - 2486: -40,-7 + 2471: -41,-11 + 2472: -42,-13 + 2473: -43,-17 + 2474: -42,-16 + 2475: -42,-17 + 2476: -41,-16 + 2477: -42,-12 + 2478: -41,-9 + 2479: -42,-8 + 2480: -42,-7 + 2481: -39,-7 + 2482: -39,-6 + 2483: -38,-7 + 2484: -38,-8 + 2485: -40,-7 - node: color: '#FFFFFFFF' id: DirtHeavy @@ -1988,10 +1988,10 @@ entities: 2186: -14,19 2187: -21,18 2190: -15,19 - 2450: -40,-8 - 2451: -41,-7 - 2452: -42,-14 - 2453: -42,-17 + 2449: -40,-8 + 2450: -41,-7 + 2451: -42,-14 + 2452: -42,-17 - node: color: '#FFFFFFFF' id: DirtLight @@ -2138,17 +2138,17 @@ entities: 2193: -31,16 2194: -31,17 2195: -7,18 - 2454: -41,-13 - 2455: -42,-10 - 2456: -42,-9 - 2457: -41,-8 - 2458: -40,-7 + 2453: -41,-13 + 2454: -42,-10 + 2455: -42,-9 + 2456: -41,-8 + 2457: -40,-7 + 2467: -42,-15 2468: -42,-15 - 2469: -42,-15 - 2470: -42,-14 - 2471: -42,-13 - 2742: -18,-9 - 2743: -23,-12 + 2469: -42,-14 + 2470: -42,-13 + 2741: -18,-9 + 2742: -23,-12 - node: color: '#FFFFFFFF' id: DirtMedium @@ -2204,20 +2204,20 @@ entities: 1697: -58,13 2076: -12,-31 2077: -12,-29 - 2459: -39,-8 - 2460: -42,-6 - 2461: -42,-7 - 2462: -41,-8 - 2463: -41,-12 - 2464: -42,-11 - 2465: -38,-8 - 2466: -38,-6 - 2467: -39,-7 + 2458: -39,-8 + 2459: -42,-6 + 2460: -42,-7 + 2461: -41,-8 + 2462: -41,-12 + 2463: -42,-11 + 2464: -38,-8 + 2465: -38,-6 + 2466: -39,-7 - node: color: '#FFFFFFFF' id: FlowersBRTwo decals: - 2770: -20,-20 + 2769: -20,-20 - node: color: '#FFFFFFFF' id: Flowersbr1 @@ -2265,7 +2265,7 @@ entities: 64: -53,14 65: -55,22 823: -59.809006,-54.414917 - 2771: -20,-23 + 2770: -20,-23 - node: color: '#FFFFFFFF' id: Flowersy1 @@ -2305,7 +2305,7 @@ entities: 810: -63.26213,-53.76122 880: -10.293825,23.009468 881: -11.18445,22.978218 - 2769: -20,-19 + 2768: -20,-19 - node: color: '#4A8F37B1' id: FullTileOverlayGreyscale @@ -2324,17 +2324,17 @@ entities: color: '#52B4E996' id: FullTileOverlayGreyscale decals: - 2669: -14,-12 - 2670: -14,-11 - 2671: -14,-10 - 2672: -15,-11 - 2673: -13,-11 - 2717: -25,-14 - 2718: -26,-14 - 2739: -20,-5 - 2740: -18,-5 - 2744: -20,-7 - 2745: -18,-7 + 2668: -14,-12 + 2669: -14,-11 + 2670: -14,-10 + 2671: -15,-11 + 2672: -13,-11 + 2716: -25,-14 + 2717: -26,-14 + 2738: -20,-5 + 2739: -18,-5 + 2743: -20,-7 + 2744: -18,-7 - node: color: '#79150096' id: FullTileOverlayGreyscale @@ -2349,9 +2349,9 @@ entities: color: '#9FED5896' id: FullTileOverlayGreyscale decals: - 2803: -23,13 - 2804: -23,12 - 2805: -24,5 + 2786: -23,13 + 2787: -23,12 + 2788: -24,5 - node: color: '#A4610696' id: FullTileOverlayGreyscale @@ -2464,8 +2464,8 @@ entities: 801: -65.69963,-54.183094 802: -59.934006,-54.276844 803: -60.98088,-57.745594 - 2779: -27.285925,4.265137 - 2780: -29.097805,5.111672 + 2778: -27.285925,4.265137 + 2779: -29.097805,5.111672 - node: color: '#FFFFFFFF' id: Grassd2 @@ -2479,12 +2479,12 @@ entities: 787: -62.809006,-53.32372 867: -12.746777,23.114094 868: -6.8249016,22.957844 - 2766: -20,-23 - 2776: -28.74137,4.8443456 - 2777: -28.177013,4.08692 - 2778: -23.974043,4.0126615 - 2785: -27.285925,5.6760283 - 2786: -25.503746,4.9037514 + 2765: -20,-23 + 2775: -28.74137,4.8443456 + 2776: -28.177013,4.08692 + 2777: -23.974043,4.0126615 + 2784: -27.285925,5.6760283 + 2785: -25.503746,4.9037514 - node: color: '#FFFFFFFF' id: Grassd3 @@ -2496,9 +2496,9 @@ entities: 792: -59.41838,-56.79247 869: -9.168652,22.942219 870: -10.309277,23.067219 - 2782: -26.157211,4.161177 - 2783: -27.865131,5.1859293 - 2784: -26.469091,5.022563 + 2781: -26.157211,4.161177 + 2782: -27.865131,5.1859293 + 2783: -26.469091,5.022563 - node: color: '#FFFFFFFF' id: Grasse1 @@ -2509,9 +2509,9 @@ entities: 796: -62.98088,-57.776844 992: 6,-7 993: 3,-5 - 2767: -20,-22 - 2774: -29.14236,4.101771 - 2775: -28.696815,5.5275135 + 2766: -20,-22 + 2773: -29.14236,4.101771 + 2774: -28.696815,5.5275135 - node: color: '#FFFFFFFF' id: Grasse2 @@ -2523,7 +2523,7 @@ entities: 989: 5,-5 1450: -9,41 1451: -10.480507,40.958054 - 2768: -20,-20 + 2767: -20,-20 - node: color: '#FFFFFFFF' id: Grasse3 @@ -2540,7 +2540,7 @@ entities: 1448: -11,41 1449: -10,41 1452: -9.464882,40.926804 - 2781: -24.983944,4.08692 + 2780: -24.983944,4.08692 - node: color: '#334E6DC8' id: HalfTileOverlayGreyscale @@ -2583,12 +2583,12 @@ entities: 491: -7,-2 492: -8,-2 550: -16,-5 - 2731: -25,-8 - 2732: -24,-8 - 2733: -23,-8 - 2734: -22,-8 - 2735: -21,-8 - 2736: -20,-8 + 2730: -25,-8 + 2731: -24,-8 + 2732: -23,-8 + 2733: -22,-8 + 2734: -21,-8 + 2735: -20,-8 - node: color: '#79150096' id: HalfTileOverlayGreyscale @@ -2603,7 +2603,7 @@ entities: color: '#9FED5896' id: HalfTileOverlayGreyscale decals: - 2806: -24,13 + 2789: -24,13 - node: color: '#A4610696' id: HalfTileOverlayGreyscale @@ -2638,9 +2638,9 @@ entities: color: '#D381C93E' id: HalfTileOverlayGreyscale decals: - 3072: 21,16 - 3073: 22,16 - 3074: 23,16 + 3011: 21,16 + 3012: 22,16 + 3013: 23,16 - node: color: '#D381C996' id: HalfTileOverlayGreyscale @@ -2724,9 +2724,9 @@ entities: id: HalfTileOverlayGreyscale decals: 635: -1,-39 - 2891: -11,-48 - 2892: -10,-48 - 2893: -9,-48 + 2832: -11,-48 + 2833: -10,-48 + 2834: -9,-48 - node: color: '#33666DC8' id: HalfTileOverlayGreyscale180 @@ -2765,12 +2765,12 @@ entities: 529: -7,0 530: -6,0 531: -5,0 - 2723: -19,-13 - 2724: -20,-13 - 2725: -21,-13 - 2726: -23,-13 - 2727: -24,-13 - 2728: -25,-13 + 2722: -19,-13 + 2723: -20,-13 + 2724: -21,-13 + 2725: -23,-13 + 2726: -24,-13 + 2727: -25,-13 - node: color: '#79150096' id: HalfTileOverlayGreyscale180 @@ -2807,7 +2807,7 @@ entities: 2377: -20,9 2378: -21,9 2379: -22,9 - 2808: -23,9 + 2791: -23,9 - node: color: '#A4610696' id: HalfTileOverlayGreyscale180 @@ -2845,14 +2845,14 @@ entities: color: '#D381C93E' id: HalfTileOverlayGreyscale180 decals: - 3045: 14,14 - 3046: 12,14 - 3057: 22,7 - 3058: 23,7 - 3062: 17,10 - 3063: 18,10 - 3064: 19,10 - 3065: 20,10 + 2985: 14,14 + 2986: 12,14 + 2997: 22,7 + 2998: 23,7 + 3001: 17,10 + 3002: 18,10 + 3003: 19,10 + 3004: 20,10 - node: color: '#D381C996' id: HalfTileOverlayGreyscale180 @@ -2947,24 +2947,24 @@ entities: 1428: -16,34 1492: -5,36 1493: -16,36 - 2964: -10,-31 - 2965: -10,-32 + 2905: -10,-31 + 2906: -10,-32 - node: color: '#52B4E996' id: HalfTileOverlayGreyscale270 decals: 524: -5,-4 525: -5,-3 - 2729: -26,-12 - 2730: -26,-9 - 2952: -6,-28 - 2953: -6,-29 + 2728: -26,-12 + 2729: -26,-9 + 2893: -6,-28 + 2894: -6,-29 - node: color: '#9FED5896' id: HalfTileOverlayGreyscale270 decals: - 2962: -12,-28 - 2963: -12,-29 + 2903: -12,-28 + 2904: -12,-29 - node: color: '#A4610696' id: HalfTileOverlayGreyscale270 @@ -2980,14 +2980,14 @@ entities: 933: 27,0 934: 27,1 935: 27,2 - 2950: -10,-28 - 2951: -10,-29 + 2891: -10,-28 + 2892: -10,-29 - node: color: '#D381C93E' id: HalfTileOverlayGreyscale270 decals: - 3059: 21,8 - 3060: 21,9 + 2999: 21,8 + 3000: 21,9 - node: color: '#D381C996' id: HalfTileOverlayGreyscale270 @@ -2995,14 +2995,14 @@ entities: 1724: 30,21 1725: 30,22 1726: 30,23 - 2948: -8,-28 - 2949: -8,-29 + 2889: -8,-28 + 2890: -8,-29 - node: color: '#D4D4D428' id: HalfTileOverlayGreyscale270 decals: - 2968: -12,-31 - 2969: -12,-32 + 2909: -12,-31 + 2910: -12,-32 - node: color: '#DE3A3A96' id: HalfTileOverlayGreyscale270 @@ -3042,8 +3042,8 @@ entities: 468: -20,-3 469: -20,-2 470: -20,-1 - 2946: -6,-31 - 2947: -6,-32 + 2887: -6,-31 + 2888: -6,-32 - node: color: '#EDD75E93' id: HalfTileOverlayGreyscale270 @@ -3059,10 +3059,10 @@ entities: 588: 9,-30 589: 9,-29 590: 9,-28 - 2889: -14,-49 - 2890: -14,-50 - 2940: -8,-32 - 2941: -8,-31 + 2830: -14,-49 + 2831: -14,-50 + 2881: -8,-32 + 2882: -8,-31 - node: color: '#334E6DC8' id: HalfTileOverlayGreyscale90 @@ -3077,8 +3077,8 @@ entities: 1429: -15,34 1494: -15,36 1495: -4,36 - 2966: -12,-31 - 2967: -12,-32 + 2907: -12,-31 + 2908: -12,-32 - node: color: '#52B4E996' id: HalfTileOverlayGreyscale90 @@ -3089,26 +3089,26 @@ entities: 547: -15,-7 548: -15,-6 549: -15,-5 - 2737: -18,-9 - 2738: -18,-12 - 2954: -8,-28 - 2955: -8,-29 + 2736: -18,-9 + 2737: -18,-12 + 2895: -8,-28 + 2896: -8,-29 - node: color: '#9FED5896' id: HalfTileOverlayGreyscale90 decals: - 2807: -24,8 - 2960: -14,-28 - 2961: -14,-29 - 3085: -24,7 + 2790: -24,8 + 2901: -14,-28 + 2902: -14,-29 + 3024: -24,7 - node: color: '#A4610696' id: HalfTileOverlayGreyscale90 decals: 564: 5,-1 1049: 21,-4 - 2958: -12,-28 - 2959: -12,-29 + 2899: -12,-28 + 2900: -12,-29 - node: cleanable: True color: '#A4610696' @@ -3120,10 +3120,10 @@ entities: color: '#D381C93E' id: HalfTileOverlayGreyscale90 decals: - 3047: 15,15 - 3048: 15,16 - 3049: 15,17 - 3050: 15,18 + 2987: 15,15 + 2988: 15,16 + 2989: 15,17 + 2990: 15,18 - node: color: '#D381C996' id: HalfTileOverlayGreyscale90 @@ -3131,8 +3131,8 @@ entities: 1727: 32,21 1728: 32,22 1729: 32,23 - 2956: -10,-28 - 2957: -10,-29 + 2897: -10,-28 + 2898: -10,-29 - node: color: '#DE3A3A96' id: HalfTileOverlayGreyscale90 @@ -3181,8 +3181,8 @@ entities: 466: -17,-2 467: -17,-1 2341: 14,21 - 2944: -8,-31 - 2945: -8,-32 + 2885: -8,-31 + 2886: -8,-32 - node: color: '#EDD75E93' id: HalfTileOverlayGreyscale90 @@ -3201,10 +3201,10 @@ entities: 591: 12,-30 592: 12,-29 593: 12,-28 - 2894: -8,-49 - 2895: -8,-50 - 2942: -10,-31 - 2943: -10,-32 + 2835: -8,-49 + 2836: -8,-50 + 2883: -10,-31 + 2884: -10,-32 - node: color: '#FFFFFFFF' id: HatchSmall @@ -3291,8 +3291,8 @@ entities: decals: 518: -8,-4 551: -15,-5 - 2752: -22,-12 - 2753: -22,-10 + 2751: -22,-12 + 2752: -22,-10 - node: color: '#79150096' id: QuarterTileOverlayGreyscale @@ -3338,10 +3338,10 @@ entities: color: '#D381C93E' id: QuarterTileOverlayGreyscale decals: - 3067: 17,12 - 3068: 17,14 - 3069: 17,15 - 3070: 17,16 + 3006: 17,12 + 3007: 17,14 + 3008: 17,15 + 3009: 17,16 - node: color: '#D381C996' id: QuarterTileOverlayGreyscale @@ -3539,12 +3539,12 @@ entities: 544: -27,1 545: -26,1 546: -25,1 - 2656: -29,-14 - 2657: -28,-14 - 2658: -28,-13 - 2659: -28,-12 - 2756: -23,-11 - 2757: -23,-9 + 2655: -29,-14 + 2656: -28,-14 + 2657: -28,-13 + 2658: -28,-12 + 2755: -23,-11 + 2756: -23,-9 - node: color: '#79150096' id: QuarterTileOverlayGreyscale180 @@ -3567,7 +3567,7 @@ entities: color: '#9FED5896' id: QuarterTileOverlayGreyscale180 decals: - 2809: -24,9 + 2792: -24,9 - node: color: '#A4610696' id: QuarterTileOverlayGreyscale180 @@ -3760,16 +3760,16 @@ entities: 507: -13,-7 515: -6,-5 523: -10,-2 - 2660: -31,-14 - 2661: -32,-14 - 2662: -33,-14 - 2663: -34,-14 - 2664: -35,-14 - 2665: -35,-13 - 2748: -20,-11 - 2751: -20,-9 - 2762: -24,-11 - 2763: -24,-9 + 2659: -31,-14 + 2660: -32,-14 + 2661: -33,-14 + 2662: -34,-14 + 2663: -35,-14 + 2664: -35,-13 + 2747: -20,-11 + 2750: -20,-9 + 2761: -24,-11 + 2762: -24,-9 - node: color: '#79150096' id: QuarterTileOverlayGreyscale270 @@ -3795,7 +3795,7 @@ entities: color: '#D381C93E' id: QuarterTileOverlayGreyscale270 decals: - 3066: 21,10 + 3005: 21,10 - node: color: '#D381C996' id: QuarterTileOverlayGreyscale270 @@ -3974,10 +3974,10 @@ entities: 497: -9,-2 517: -9,-4 522: -11,-3 - 2747: -21,-12 - 2750: -21,-10 - 2760: -25,-10 - 2761: -25,-12 + 2746: -21,-12 + 2749: -21,-10 + 2759: -25,-10 + 2760: -25,-12 - node: color: '#A4610696' id: QuarterTileOverlayGreyscale90 @@ -4096,8 +4096,8 @@ entities: 2323: 30,38 2324: 29,38 2391: 11,36 - 2431: -44,-7 - 2432: -44,-8 + 2430: -44,-7 + 2431: -44,-8 - node: color: '#D4D4D496' id: QuarterTileOverlayGreyscale90 @@ -4173,7 +4173,7 @@ entities: color: '#FFFFFFFF' id: StandClear decals: - 2867: 14,-19 + 2808: 14,-19 - node: color: '#FFFFFFFF' id: StandClear @@ -4187,36 +4187,36 @@ entities: color: '#FFFFFFFF' id: StandClear decals: - 2773: -53,36 + 2772: -53,36 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale decals: - 2720: -26,-8 - 2746: -20,-12 - 2749: -20,-10 - 2758: -24,-12 - 2759: -24,-10 + 2719: -26,-8 + 2745: -20,-12 + 2748: -20,-10 + 2757: -24,-12 + 2758: -24,-10 - node: color: '#D381C93E' id: ThreeQuarterTileOverlayGreyscale decals: - 3055: 16,12 + 2995: 16,12 - node: color: '#EFB34196' id: ThreeQuarterTileOverlayGreyscale decals: - 2887: -14,-48 + 2828: -14,-48 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale180 decals: - 2722: -18,-13 + 2721: -18,-13 - node: color: '#D381C93E' id: ThreeQuarterTileOverlayGreyscale180 decals: - 3044: 15,14 + 2984: 15,14 - node: color: '#D381C996' id: ThreeQuarterTileOverlayGreyscale180 @@ -4226,25 +4226,25 @@ entities: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale270 decals: - 2721: -26,-13 - 2754: -22,-9 - 2755: -22,-11 + 2720: -26,-13 + 2753: -22,-9 + 2754: -22,-11 - node: color: '#D381C93E' id: ThreeQuarterTileOverlayGreyscale270 decals: - 3054: 16,10 - 3056: 21,7 + 2994: 16,10 + 2996: 21,7 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale90 decals: - 2719: -18,-8 + 2718: -18,-8 - node: color: '#EFB34196' id: ThreeQuarterTileOverlayGreyscale90 decals: - 2888: -8,-48 + 2829: -8,-48 - node: color: '#FFFFFFFF' id: VentSmall @@ -4293,67 +4293,67 @@ entities: color: '#FFFFFFFF' id: WarnCornerGreyscaleSE decals: - 2649: -31,-11 + 2648: -31,-11 - node: color: '#FFFFFFFF' id: WarnCornerGreyscaleSW decals: - 2653: -35,-11 + 2652: -35,-11 - node: color: '#FFFFFFFF' id: WarnCornerNE decals: 2072: 2,-33 - 2876: -8,-51 - 2997: -17,-53 + 2817: -8,-51 + 2938: -17,-53 - node: color: '#FFFFFFFF' id: WarnCornerNW decals: 2071: 0,-33 - 2878: -14,-51 - 2996: -19,-53 + 2819: -14,-51 + 2937: -19,-53 - node: color: '#FFFFFFFF' id: WarnCornerSE decals: 1733: 5,21 2070: 2,-35 - 2877: -8,-53 - 2902: -5,-52 - 2999: -17,-56 - 3041: 12,12 + 2818: -8,-53 + 2843: -5,-52 + 2940: -17,-56 + 2982: 12,12 - node: color: '#FFFFFFFF' id: WarnCornerSW decals: 1732: 3,21 2069: 0,-35 - 2879: -14,-53 - 2998: -19,-56 - 3042: 14,12 + 2820: -14,-53 + 2939: -19,-56 + 2983: 14,12 - node: color: '#FFFFFFFF' id: WarnCornerSmallNE decals: - 2863: 14,-20 - 2864: 14,-19 + 2804: 14,-20 + 2805: 14,-19 - node: color: '#FFFFFFFF' id: WarnCornerSmallNW decals: 1175: 21,-19 1691: -58,19 - 2932: 1,-52 + 2873: 1,-52 - node: color: '#FFFFFFFF' id: WarnCornerSmallSE decals: 1177: 20,-19 1734: 5,22 - 2865: 14,-18 - 2866: 14,-19 - 2930: -3,-50 + 2806: 14,-18 + 2807: 14,-19 + 2871: -3,-50 - node: color: '#FFFFFFFF' id: WarnCornerSmallSW @@ -4363,7 +4363,7 @@ entities: 1182: 22,-19 1690: -58,17 1735: 3,22 - 2931: 1,-50 + 2872: 1,-50 - node: angle: -3.141592653589793 rad color: '#FFFFFFFF' @@ -4380,20 +4380,20 @@ entities: id: WarnFullGreyscale decals: 2182: -35,-1 - 2540: -24,-17 - 2541: -24,-23 - 2542: -20,-16 - 2543: -16,-16 - 2607: -14,-18 - 2608: -14,-14 - 2644: -28,-23 - 2645: -28,-17 - 2646: -32,-18 - 2690: -17,-11 - 2691: -17,-10 - 2695: -22,-14 - 2696: -27,-10 - 2697: -27,-11 + 2539: -24,-17 + 2540: -24,-23 + 2541: -20,-16 + 2542: -16,-16 + 2606: -14,-18 + 2607: -14,-14 + 2643: -28,-23 + 2644: -28,-17 + 2645: -32,-18 + 2689: -17,-11 + 2690: -17,-10 + 2694: -22,-14 + 2695: -27,-10 + 2696: -27,-11 - node: color: '#D381C996' id: WarnFullGreyscale @@ -4419,14 +4419,14 @@ entities: 1218: 21,21 2073: 2,-34 2135: -2,-1 - 2881: -8,-52 - 2903: -5,-51 - 2904: -5,-50 - 2905: -5,-49 - 2906: -5,-48 - 2925: -3,-51 - 3001: -17,-54 - 3002: -17,-55 + 2822: -8,-52 + 2844: -5,-51 + 2845: -5,-50 + 2846: -5,-49 + 2847: -5,-48 + 2866: -3,-51 + 2942: -17,-54 + 2943: -17,-55 - node: color: '#334E6DC8' id: WarnLineGreyscaleE @@ -4436,14 +4436,14 @@ entities: color: '#52B4E996' id: WarnLineGreyscaleE decals: - 2529: -21,-16 - 2641: -29,-23 - 2642: -29,-17 - 2687: -12,-11 - 2692: -18,-11 - 2693: -18,-10 - 2700: -28,-11 - 2701: -28,-10 + 2528: -21,-16 + 2640: -29,-23 + 2641: -29,-17 + 2686: -12,-11 + 2691: -18,-11 + 2692: -18,-10 + 2699: -28,-11 + 2700: -28,-10 - node: color: '#D381C996' id: WarnLineGreyscaleE @@ -4453,7 +4453,7 @@ entities: color: '#FFFFFFFF' id: WarnLineGreyscaleE decals: - 2650: -31,-10 + 2649: -31,-10 - node: color: '#334E6DC8' id: WarnLineGreyscaleN @@ -4463,9 +4463,9 @@ entities: color: '#52B4E996' id: WarnLineGreyscaleN decals: - 2538: -22,-15 - 2606: -14,-19 - 2609: -14,-15 + 2537: -22,-15 + 2605: -14,-19 + 2608: -14,-15 - node: color: '#D381C996' id: WarnLineGreyscaleN @@ -4482,11 +4482,11 @@ entities: id: WarnLineGreyscaleS decals: 2181: -35,0 - 2539: -22,-24 - 2604: -18,-23 - 2605: -14,-17 - 2686: -14,-13 - 2694: -22,-13 + 2538: -22,-24 + 2603: -18,-23 + 2604: -14,-17 + 2685: -14,-13 + 2693: -22,-13 - node: color: '#D381C996' id: WarnLineGreyscaleS @@ -4508,7 +4508,7 @@ entities: color: '#EFB34196' id: WarnLineGreyscaleS decals: - 2443: -41,17 + 2442: -41,17 - node: color: '#FFFFFFFF' id: WarnLineGreyscaleS @@ -4516,9 +4516,9 @@ entities: 2201: -40,42 2202: -44,42 2203: -48,42 - 2651: -32,-11 - 2652: -33,-11 - 2654: -34,-11 + 2650: -32,-11 + 2651: -33,-11 + 2653: -34,-11 - node: color: '#334E6DC8' id: WarnLineGreyscaleW @@ -4528,26 +4528,26 @@ entities: color: '#52B4E996' id: WarnLineGreyscaleW decals: - 2527: -23,-23 - 2528: -23,-17 - 2544: -15,-16 - 2643: -31,-18 - 2688: -16,-11 - 2689: -16,-10 - 2698: -26,-11 - 2699: -26,-10 + 2526: -23,-23 + 2527: -23,-17 + 2543: -15,-16 + 2642: -31,-18 + 2687: -16,-11 + 2688: -16,-10 + 2697: -26,-11 + 2698: -26,-10 - node: color: '#EFB34196' id: WarnLineGreyscaleW decals: - 2444: -44,18 + 2443: -44,18 - node: color: '#FFFFFFFF' id: WarnLineGreyscaleW decals: 2165: -33,7 2166: -33,8 - 2655: -35,-10 + 2654: -35,-10 - node: color: '#FFFFFFFF' id: WarnLineN @@ -4573,26 +4573,26 @@ entities: 2074: 1,-35 2348: -26,-58 2349: -27,-58 - 2857: 15,-19 - 2858: 16,-19 - 2859: 17,-19 - 2882: -13,-53 - 2883: -12,-53 - 2884: -11,-53 - 2885: -10,-53 - 2886: -9,-53 - 2907: -6,-52 - 2908: -3,-47 - 2909: 1,-47 - 2910: 2,-47 - 2911: 3,-47 - 2912: 4,-47 - 2913: -2,-47 - 2914: 0,-47 - 2922: -2,-50 - 2923: -1,-50 - 2924: 0,-50 - 3005: -18,-56 + 2798: 15,-19 + 2799: 16,-19 + 2800: 17,-19 + 2823: -13,-53 + 2824: -12,-53 + 2825: -11,-53 + 2826: -10,-53 + 2827: -9,-53 + 2848: -6,-52 + 2849: -3,-47 + 2850: 1,-47 + 2851: 2,-47 + 2852: 3,-47 + 2853: 4,-47 + 2854: -2,-47 + 2855: 0,-47 + 2863: -2,-50 + 2864: -1,-50 + 2865: 0,-50 + 2946: -18,-56 - node: color: '#FFFFFFFF' id: WarnLineS @@ -4619,9 +4619,9 @@ entities: 2134: -4,-1 2423: -47,-10 2424: -47,-9 - 2880: -14,-52 - 3003: -19,-54 - 3004: -19,-55 + 2821: -14,-52 + 2944: -19,-54 + 2945: -19,-55 - node: color: '#FFFFFFFF' id: WarnLineW @@ -4651,30 +4651,30 @@ entities: 2068: 1,-33 2361: -12,-58 2362: -11,-58 - 2812: 12,10 - 2854: 13,10 - 2860: 15,-19 - 2861: 16,-19 - 2862: 17,-19 - 2872: -11,-51 - 2873: -10,-51 - 2874: -12,-51 - 2875: -9,-51 - 2926: -2,-52 - 2927: -1,-52 - 2928: 0,-52 - 2929: 0,-52 - 2933: -2,-48 - 2934: -1,-48 - 2935: 0,-48 - 2936: 1,-48 - 2937: 2,-48 - 2938: 3,-48 - 2939: 4,-48 - 3000: -18,-53 - 3039: -4,-48 - 3040: -3,-48 - 3075: 14,10 + 2793: 12,10 + 2796: 13,10 + 2801: 15,-19 + 2802: 16,-19 + 2803: 17,-19 + 2813: -11,-51 + 2814: -10,-51 + 2815: -12,-51 + 2816: -9,-51 + 2867: -2,-52 + 2868: -1,-52 + 2869: 0,-52 + 2870: 0,-52 + 2874: -2,-48 + 2875: -1,-48 + 2876: 0,-48 + 2877: 1,-48 + 2878: 2,-48 + 2879: 3,-48 + 2880: 4,-48 + 2941: -18,-53 + 2980: -4,-48 + 2981: -3,-48 + 3014: 14,10 - node: angle: -3.141592653589793 rad color: '#FFFFFFFF' @@ -10985,7 +10985,7 @@ entities: pos: -20.5,-5.5 parent: 30 - type: Door - secondsUntilStateChange: -21094.865 + secondsUntilStateChange: -21151.791 state: Opening - type: DeviceLinkSource lastSignals: @@ -59846,11 +59846,6 @@ entities: - type: Transform pos: -17.315872,-34.317642 parent: 30 - - uid: 20701 - components: - - type: Transform - pos: -17.330315,-34.519756 - parent: 30 - proto: ExosuitFabricator entities: - uid: 12799 @@ -63486,14 +63481,14 @@ entities: parent: 30 - proto: GasMinerNitrogenStationLarge entities: - - uid: 11446 + - uid: 8690 components: - type: Transform pos: 26.5,-22.5 parent: 30 - proto: GasMinerOxygenStationLarge entities: - - uid: 8690 + - uid: 11446 components: - type: Transform pos: 26.5,-24.5 From 6a5cc883cebd20f87144e3f8f37086d7efb042de Mon Sep 17 00:00:00 2001 From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> Date: Wed, 7 Aug 2024 02:19:10 -0700 Subject: [PATCH 237/422] Dragdrop fold rollerbed (#30002) * Deploy foldable * Add NetworkedComponent and access to the component * Add handled to afterinteract * Use drop target location instead of setcoordinates * Put back in hand after failed deploy This prevents dropping the bed when clicking while inside a locker. * Created BaseDeployFoldable for folding chairs, body bags, and rollerbeds * Add dragdrop to fold rollerbed to hand --- Content.Client/Interaction/DragDropSystem.cs | 3 ++ .../Foldable/DeployFoldableSystem.cs | 33 +++++++++++++++++++ .../Strip/SharedStrippableSystem.cs | 11 ++++--- 3 files changed, 42 insertions(+), 5 deletions(-) diff --git a/Content.Client/Interaction/DragDropSystem.cs b/Content.Client/Interaction/DragDropSystem.cs index aab6a62776..a34cd0f5b1 100644 --- a/Content.Client/Interaction/DragDropSystem.cs +++ b/Content.Client/Interaction/DragDropSystem.cs @@ -518,6 +518,9 @@ public sealed class DragDropSystem : SharedDragDropSystem if (dropEv2.Handled) return dropEv2.CanDrop; + if (dropEv.Handled && dropEv.CanDrop) + return true; + return null; } diff --git a/Content.Shared/Foldable/DeployFoldableSystem.cs b/Content.Shared/Foldable/DeployFoldableSystem.cs index fa2e3f8789..16315cde69 100644 --- a/Content.Shared/Foldable/DeployFoldableSystem.cs +++ b/Content.Shared/Foldable/DeployFoldableSystem.cs @@ -1,3 +1,4 @@ +using Content.Shared.DragDrop; using Content.Shared.Hands.Components; using Content.Shared.Hands.EntitySystems; using Content.Shared.Interaction; @@ -14,6 +15,38 @@ public sealed class DeployFoldableSystem : EntitySystem base.Initialize(); SubscribeLocalEvent(OnAfterInteract); + SubscribeLocalEvent(OnCanDrag); + SubscribeLocalEvent(OnDragDropDragged); + SubscribeLocalEvent(OnCanDropDragged); + } + + private void OnCanDropDragged(Entity ent, ref CanDropDraggedEvent args) + { + if (args.User != args.Target) + return; + + args.Handled = true; + args.CanDrop = true; + } + + private void OnDragDropDragged(Entity ent, ref DragDropDraggedEvent args) + { + if (!TryComp(ent, out var foldable) + || !_foldable.TrySetFolded(ent, foldable, true)) + return; + + _hands.PickupOrDrop(args.User, ent.Owner); + + args.Handled = true; + } + + private void OnCanDrag(Entity ent, ref CanDragEvent args) + { + if (!TryComp(ent, out var foldable) + || foldable.IsFolded) + return; + + args.Handled = true; } private void OnAfterInteract(Entity ent, ref AfterInteractEvent args) diff --git a/Content.Shared/Strip/SharedStrippableSystem.cs b/Content.Shared/Strip/SharedStrippableSystem.cs index 38e2f9fd7a..e42f6e3aa7 100644 --- a/Content.Shared/Strip/SharedStrippableSystem.cs +++ b/Content.Shared/Strip/SharedStrippableSystem.cs @@ -61,11 +61,12 @@ public abstract class SharedStrippableSystem : EntitySystem private void OnCanDropOn(EntityUid uid, StrippingComponent component, ref CanDropTargetEvent args) { - args.Handled = true; - args.CanDrop |= uid == args.User && - HasComp(args.Dragged) && - HasComp(args.User) && - HasComp(args.User); + var val = uid == args.User && + HasComp(args.Dragged) && + HasComp(args.User) && + HasComp(args.User); + args.Handled |= val; + args.CanDrop |= val; } private void OnCanDrop(EntityUid uid, StrippableComponent component, ref CanDropDraggedEvent args) From 150e8f0721262d7cc57eafd05ce9fad6ed16ac16 Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 7 Aug 2024 09:20:17 +0000 Subject: [PATCH 238/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 4556182328..5ac8f6e3f6 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Plykiya - changes: - - message: Re-added supplybots. - type: Add - id: 6554 - time: '2024-05-08T07:30:04.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27769 - author: Hobbitmax changes: - message: Replaced Syndicate Jaws Of Life with a Pyjama bundle on the Train map. @@ -3780,3 +3773,10 @@ id: 7053 time: '2024-08-07T07:42:00.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30658 +- author: ShadowCommander + changes: + - message: Rollerbeds can now be dragged to the player to fold and pick them up. + type: Add + id: 7054 + time: '2024-08-07T09:19:10.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30002 From 15aa75f09281c47b40e31c6c7607e48a6155fdd0 Mon Sep 17 00:00:00 2001 From: Errant <35878406+Errant-4@users.noreply.github.com> Date: Wed, 7 Aug 2024 11:26:40 +0200 Subject: [PATCH 239/422] Updated remaining ghostroles for species loadouts (#29746) * LoadoutSystem change, deathsquad species loadout * survival gear loadouts for disaster victims * skrek * centcom * syndicate agent * cburn * ERT * syndicates * Is it ever gonna be enough? * Take what you can * Move startingGearEquippedEvent after Loadouts are spawned * skreee * even more formatting * Unbreak auto internals activation * undo AddAllRoleLoadouts change * syndicate reinforcement survival loadouts * re-enable vox ghostroles --- .../Clothing/Components/LoadoutComponent.cs | 6 +- .../Prototypes/Entities/Mobs/Player/human.yml | 75 ++++++++++--------- .../Entities/Mobs/Player/humanoid.yml | 37 ++++++--- .../Loadouts/Miscellaneous/survival.yml | 2 +- Resources/Prototypes/Roles/Antags/traitor.yml | 8 -- .../Roles/Jobs/Fun/emergencyresponseteam.yml | 26 +------ .../Roles/Jobs/Fun/misc_startinggear.yml | 7 +- 7 files changed, 73 insertions(+), 88 deletions(-) diff --git a/Content.Shared/Clothing/Components/LoadoutComponent.cs b/Content.Shared/Clothing/Components/LoadoutComponent.cs index 15d0d60af5..58a46bab36 100644 --- a/Content.Shared/Clothing/Components/LoadoutComponent.cs +++ b/Content.Shared/Clothing/Components/LoadoutComponent.cs @@ -9,10 +9,8 @@ namespace Content.Shared.Clothing.Components; public sealed partial class LoadoutComponent : Component { /// - /// A list of starting gears, of which one will be given. + /// A list of starting gears, of which one will be given, before RoleLoadouts are equipped. /// All elements are weighted the same in the list. - /// - /// If not specified, will be used instead. /// [DataField("prototypes")] [AutoNetworkedField] @@ -21,8 +19,6 @@ public sealed partial class LoadoutComponent : Component /// /// A list of role loadouts, of which one will be given. /// All elements are weighted the same in the list. - /// - /// If not specified, will be used instead. /// [DataField] [AutoNetworkedField] diff --git a/Resources/Prototypes/Entities/Mobs/Player/human.yml b/Resources/Prototypes/Entities/Mobs/Player/human.yml index e07ce9c5b4..4a7a48a0d5 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/human.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/human.yml @@ -11,16 +11,17 @@ name: syndicate agent suffix: Human, Base components: - - type: RandomHumanoidAppearance - randomizeName: false - hair: HairBald - - type: Loadout - prototypes: [SyndicateOperativeGearExtremelyBasic] - - type: RandomMetadata - nameSegments: [names_death_commando] - - type: NpcFactionMember - factions: - - Syndicate + - type: RandomHumanoidAppearance + randomizeName: false + hair: HairBald + - type: Loadout + prototypes: [SyndicateOperativeGearExtremelyBasic] + roleLoadout: [ RoleSurvivalSyndicate ] + - type: RandomMetadata + nameSegments: [names_death_commando] + - type: NpcFactionMember + factions: + - Syndicate - type: entity parent: MobHumanSyndicateAgentBase @@ -28,10 +29,10 @@ name: syndicate agent suffix: Human, Traitor components: - # make the player a traitor once its taken - - type: AutoTraitor - giveUplink: false - giveObjectives: false + # make the player a traitor once its taken + - type: AutoTraitor + giveUplink: false + giveObjectives: false - type: entity parent: MobHumanSyndicateAgent @@ -40,6 +41,7 @@ components: - type: Loadout prototypes: [SyndicateReinforcementMedic] + roleLoadout: [ RoleSurvivalSyndicate ] - type: entity parent: MobHumanSyndicateAgent @@ -48,6 +50,7 @@ components: - type: Loadout prototypes: [SyndicateReinforcementSpy] + roleLoadout: [ RoleSurvivalSyndicate ] - type: entity parent: MobHumanSyndicateAgent @@ -56,19 +59,20 @@ components: - type: Loadout prototypes: [SyndicateReinforcementThief] + roleLoadout: [ RoleSurvivalSyndicate ] - type: entity parent: MobHumanSyndicateAgentBase id: MobHumanSyndicateAgentNukeops # Reinforcement exclusive to nukeops uplink suffix: Human, NukeOps components: - - type: NukeOperative - - type: RandomMetadata - nameSegments: - - nukeops-role-operator - - SyndicateNamesNormal - - type: Loadout - prototypes: [SyndicateOperativeGearFullNoUplink] + - type: NukeOperative + - type: RandomMetadata + nameSegments: + - nukeops-role-operator + - SyndicateNamesNormal + - type: Loadout + prototypes: [SyndicateOperativeGearFullNoUplink] # Nuclear Operative - type: entity @@ -77,8 +81,8 @@ parent: MobHuman id: MobHumanNukeOp components: - - type: NukeOperative - - type: RandomHumanoidAppearance + - type: NukeOperative + - type: RandomHumanoidAppearance - type: entity categories: [ HideSpawnMenu ] @@ -86,15 +90,16 @@ id: MobHumanLoneNuclearOperative name: Lone Operative components: - - type: RandomHumanoidAppearance - randomizeName: false - - type: NukeOperative - - type: Loadout - prototypes: [SyndicateLoneOperativeGearFull] - - type: RandomMetadata - nameSegments: - - SyndicateNamesPrefix - - SyndicateNamesNormal - - type: NpcFactionMember - factions: - - Syndicate + - type: RandomHumanoidAppearance + randomizeName: false + - type: NukeOperative + - type: Loadout + prototypes: [SyndicateLoneOperativeGearFull] + roleLoadout: [ RoleSurvivalSyndicate ] + - type: RandomMetadata + nameSegments: + - SyndicateNamesPrefix + - SyndicateNamesNormal + - type: NpcFactionMember + factions: + - Syndicate diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml index 47baca6134..574f31dff3 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml @@ -44,6 +44,7 @@ settings: short - type: Loadout prototypes: [ DeathSquadGear ] + roleLoadout: [ RoleSurvivalEVA ] - type: RandomMetadata nameSegments: - NamesFirstMilitaryLeader @@ -80,6 +81,7 @@ settings: short - type: Loadout prototypes: [ ERTLeaderGear ] + roleLoadout: [ RoleSurvivalExtended ] - type: RandomMetadata nameSegments: - NamesFirstMilitaryLeader @@ -109,6 +111,7 @@ settings: short - type: Loadout prototypes: [ ERTLeaderGearEVA ] + roleLoadout: [ RoleSurvivalEVA ] - type: entity id: RandomHumanoidSpawnerERTLeaderEVALecter @@ -130,6 +133,7 @@ settings: short - type: Loadout prototypes: [ ERTLeaderGearEVALecter ] + roleLoadout: [ RoleSurvivalEVA ] ## ERT Chaplain @@ -165,6 +169,7 @@ - NamesLastMilitary - type: Loadout prototypes: [ ERTChaplainGear ] + roleLoadout: [ RoleSurvivalExtended ] - type: entity id: RandomHumanoidSpawnerERTChaplainEVA @@ -190,6 +195,7 @@ settings: short - type: Loadout prototypes: [ ERTChaplainGearEVA ] + roleLoadout: [ RoleSurvivalEVA ] ## ERT Janitor @@ -225,6 +231,7 @@ - NamesLastMilitary - type: Loadout prototypes: [ ERTJanitorGear ] + roleLoadout: [ RoleSurvivalExtended ] - type: entity id: RandomHumanoidSpawnerERTJanitorEVA @@ -250,6 +257,7 @@ settings: short - type: Loadout prototypes: [ ERTJanitorGearEVA ] + roleLoadout: [ RoleSurvivalEVA ] ## ERT Engineer @@ -285,6 +293,7 @@ - NamesLastMilitary - type: Loadout prototypes: [ ERTEngineerGear ] + roleLoadout: [ RoleSurvivalExtended ] - type: entity id: RandomHumanoidSpawnerERTEngineerEVA @@ -310,6 +319,7 @@ settings: short - type: Loadout prototypes: [ ERTEngineerGearEVA ] + roleLoadout: [ RoleSurvivalEVA ] ## ERT Security @@ -345,6 +355,7 @@ - NamesLastMilitary - type: Loadout prototypes: [ ERTSecurityGear ] + roleLoadout: [ RoleSurvivalExtended ] - type: entity id: RandomHumanoidSpawnerERTSecurityEVA @@ -370,6 +381,7 @@ settings: short - type: Loadout prototypes: [ ERTSecurityGearEVA ] + roleLoadout: [ RoleSurvivalEVA ] - type: entity id: RandomHumanoidSpawnerERTSecurityEVALecter @@ -391,6 +403,7 @@ settings: short - type: Loadout prototypes: [ ERTSecurityGearEVALecter ] + roleLoadout: [ RoleSurvivalEVA ] ## ERT Medic @@ -426,6 +439,7 @@ - NamesLastMilitary - type: Loadout prototypes: [ ERTMedicalGear ] + roleLoadout: [ RoleSurvivalExtended ] - type: entity id: RandomHumanoidSpawnerERTMedicalEVA @@ -451,6 +465,7 @@ settings: short - type: Loadout prototypes: [ ERTMedicalGearEVA ] + roleLoadout: [ RoleSurvivalEVA ] ## CBURN @@ -471,6 +486,7 @@ components: - type: Loadout prototypes: [CBURNGear] + roleLoadout: [ RoleSurvivalEVA ] - type: GhostRole name: ghost-role-information-cburn-agent-name description: ghost-role-information-cburn-agent-description @@ -506,6 +522,7 @@ settings: default - type: Loadout prototypes: [ CentcomGear ] + roleLoadout: [ RoleSurvivalStandard ] ## Syndicate @@ -528,6 +545,7 @@ randomizeName: false - type: Loadout prototypes: [SyndicateOperativeGearExtremelyBasic] + roleLoadout: [ RoleSurvivalSyndicate ] - type: entity id: RandomHumanoidSpawnerNukeOp @@ -607,8 +625,6 @@ - type: randomHumanoidSettings id: LostCargoTechnician parent: EventHumanoid - speciesBlacklist: - - Vox components: - type: GhostRole name: ghost-role-information-lost-cargo-technical-name @@ -618,6 +634,8 @@ settings: short - type: Loadout prototypes: [ LostCargoTechGearSuit, LostCargoTechGearCoat ] + roleLoadout: [ RoleSurvivalStandard ] + # Clown troupe @@ -660,8 +678,6 @@ id: ClownTroupe parent: EventHumanoid randomizeName: false - speciesBlacklist: - - Vox components: - type: GhostRole name: ghost-role-information-clown-troupe-name @@ -671,6 +687,7 @@ settings: short - type: Loadout prototypes: [ ClownTroupe ] + roleLoadout: [ RoleSurvivalStandard ] - type: RandomMetadata nameSegments: - names_clown @@ -682,6 +699,7 @@ components: - type: Loadout prototypes: [ BananaClown ] + roleLoadout: [ RoleSurvivalStandard ] # Traveling exotic chef @@ -712,8 +730,6 @@ - type: randomHumanoidSettings id: TravelingChef parent: EventHumanoid - speciesBlacklist: - - Vox components: - type: GhostRole name: ghost-role-information-traveling-chef-name @@ -723,6 +739,7 @@ settings: short - type: Loadout prototypes: [ TravelingChef ] + roleLoadout: [ RoleSurvivalStandard ] # Disaster victim @@ -774,8 +791,6 @@ - type: randomHumanoidSettings id: DisasterVictimHead parent: EventHumanoidMindShielded - speciesBlacklist: - - Vox components: - type: GhostRole name: ghost-role-information-disaster-victim-name @@ -790,6 +805,7 @@ components: - type: Loadout prototypes: [ DisasterVictimRD, DisasterVictimRDAlt ] + roleLoadout: [ RoleSurvivalStandard ] - type: randomHumanoidSettings id: DisasterVictimCMO @@ -797,6 +813,7 @@ components: - type: Loadout prototypes: [ DisasterVictimCMO, DisasterVictimCMOAlt ] + roleLoadout: [ RoleSurvivalMedical ] - type: randomHumanoidSettings id: DisasterVictimCaptain @@ -804,6 +821,7 @@ components: - type: Loadout prototypes: [ DisasterVictimCaptain, DisasterVictimCaptainAlt ] + roleLoadout: [ RoleSurvivalStandard ] # Syndie Disaster Victim @@ -834,8 +852,6 @@ - type: randomHumanoidSettings id: SyndieDisasterVictim parent: EventHumanoid - speciesBlacklist: - - Vox components: - type: NpcFactionMember factions: @@ -848,3 +864,4 @@ settings: short - type: Loadout prototypes: [ SyndicateOperativeGearCivilian ] + roleLoadout: [ RoleSurvivalStandard ] diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml b/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml index 001e8a188e..2716310ecf 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml @@ -177,7 +177,7 @@ equipment: outerClothing: ClothingOuterVestTank -# Breaths Tool On Face +# Breath Tool On Face - type: loadout id: LoadoutSpeciesBreathTool effects: diff --git a/Resources/Prototypes/Roles/Antags/traitor.yml b/Resources/Prototypes/Roles/Antags/traitor.yml index cb2fd4b13e..51c61e74c6 100644 --- a/Resources/Prototypes/Roles/Antags/traitor.yml +++ b/Resources/Prototypes/Roles/Antags/traitor.yml @@ -31,7 +31,6 @@ gloves: ClothingHandsGlovesColorBlack storage: back: - - BoxSurvivalSyndicate - WeaponPistolViper - PinpointerSyndicateNuclear - DeathAcidifierImplanter @@ -51,9 +50,6 @@ pocket1: WeaponPistolViper inhand: - MedkitCombatFilled - storage: - back: - - BoxSurvivalSyndicate - type: startingGear id: SyndicateReinforcementSpy @@ -62,9 +58,6 @@ id: AgentIDCard mask: ClothingMaskGasVoiceChameleon pocket1: WeaponPistolViper - storage: - back: - - BoxSurvivalSyndicate - type: startingGear id: SyndicateReinforcementThief @@ -75,7 +68,6 @@ - ToolboxSyndicateFilled storage: back: - - BoxSurvivalSyndicate - SyndicateJawsOfLife #Syndicate Operative Outfit - Basic diff --git a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml index 011ac8812b..211a234790 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml @@ -31,7 +31,6 @@ pocket2: FlashlightSeclite storage: back: - - BoxSurvivalEngineering - WeaponDisabler - MedicatedSuture - RegenerativeMesh @@ -49,7 +48,6 @@ eyes: ClothingEyesGlassesSecurity gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterHardsuitERTLeader - suitstorage: AirTankFilled id: ERTLeaderPDA ears: ClothingHeadsetAltCentCom belt: ClothingBeltSecurityFilled @@ -57,7 +55,6 @@ pocket2: FlashlightSeclite storage: back: - - BoxSurvivalEngineering - WeaponDisabler - MedicatedSuture - RegenerativeMesh @@ -75,17 +72,15 @@ eyes: ClothingEyesGlassesSecurity gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterHardsuitERTLeader - suitstorage: WeaponRifleLecter id: ERTLeaderPDA ears: ClothingHeadsetAltCentCom belt: ClothingBeltSecurityFilled pocket1: MagazineRifle pocket2: MagazineRifle inhand: - - AirTankFilled + - WeaponRifleLecter storage: back: - - BoxSurvivalEngineering - WeaponDisabler - MedicatedSuture - RegenerativeMesh @@ -131,7 +126,6 @@ pocket2: DrinkWaterBottleFull storage: back: - - BoxSurvivalEngineering - BoxCandle - BoxBodyBag - DrinkWaterMelonJuiceJug @@ -156,7 +150,6 @@ neck: ClothingNeckStoleChaplain gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterHardsuitERTChaplain - suitstorage: AirTankFilled id: ERTChaplainPDA ears: ClothingHeadsetAltCentCom belt: ClothingBeltStorageWaistbag @@ -164,7 +157,6 @@ pocket2: DrinkWaterBottleFull storage: back: - - BoxSurvivalEngineering - BoxCandle - BoxBodyBag - DrinkWaterMelonJuiceJug @@ -211,7 +203,6 @@ pocket2: GasAnalyzer storage: back: - - BoxSurvivalEngineering - trayScanner - RCD - RCDAmmo @@ -233,7 +224,6 @@ eyes: ClothingEyesGlassesMeson gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterHardsuitERTEngineer - suitstorage: AirTankFilled id: ERTEngineerPDA ears: ClothingHeadsetAltCentCom belt: ClothingBeltChiefEngineerFilled @@ -241,7 +231,6 @@ pocket2: GasAnalyzer storage: back: - - BoxSurvivalEngineering - trayScanner - RCD - RCDAmmo @@ -286,7 +275,6 @@ pocket2: FlashlightSeclite storage: back: - - BoxSurvivalEngineering - WeaponDisabler - MedicatedSuture - RegenerativeMesh @@ -304,7 +292,6 @@ eyes: ClothingEyesGlassesSecurity gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterHardsuitERTSecurity - suitstorage: AirTankFilled id: ERTSecurityPDA ears: ClothingHeadsetAltCentCom belt: ClothingBeltSecurityFilled @@ -312,7 +299,6 @@ pocket2: FlashlightSeclite storage: back: - - BoxSurvivalEngineering - WeaponDisabler - MedicatedSuture - RegenerativeMesh @@ -330,17 +316,15 @@ eyes: ClothingEyesGlassesSecurity gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterHardsuitERTSecurity - suitstorage: WeaponRifleLecter id: ERTSecurityPDA ears: ClothingHeadsetAltCentCom belt: ClothingBeltSecurityFilled pocket1: MagazineRifle pocket2: MagazineRifle inhand: - - AirTankFilled + - WeaponRifleLecter storage: back: - - BoxSurvivalEngineering - WeaponDisabler - MedicatedSuture - RegenerativeMesh @@ -380,7 +364,6 @@ pocket1: Flare storage: back: - - BoxSurvivalMedical # Is this actually supposed to be Medical? All other ERT has Extended - Hypospray - MedkitAdvancedFilled - CrowbarRed @@ -398,14 +381,12 @@ eyes: ClothingEyesHudMedical gloves: ClothingHandsGlovesNitrile outerClothing: ClothingOuterHardsuitERTMedical - suitstorage: AirTankFilled id: ERTMedicPDA ears: ClothingHeadsetAltCentCom belt: ClothingBeltMedicalFilled pocket1: Flare storage: back: - - BoxSurvivalMedical # Is this actually supposed to be Medical? All other ERT has Extended - Hypospray - MedkitAdvancedFilled - CrowbarRed @@ -444,7 +425,6 @@ pocket1: Flare storage: back: - - BoxSurvivalEngineering - LightReplacer - BoxLightMixed - BoxLightMixed @@ -461,14 +441,12 @@ mask: ClothingMaskGasERT gloves: ClothingHandsGlovesColorPurple outerClothing: ClothingOuterHardsuitERTJanitor - suitstorage: AirTankFilled id: ERTJanitorPDA ears: ClothingHeadsetAltCentCom belt: ClothingBeltJanitorFilled pocket1: Flare storage: back: - - BoxSurvivalEngineering - LightReplacer - BoxLightMixed - BoxLightMixed diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml index e12bee8c79..f2291e492e 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml @@ -28,7 +28,6 @@ ears: ClothingHeadsetAltCentCom gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterHardsuitDeathsquad - suitstorage: AirTankFilled shoes: ClothingShoesBootsMagAdv id: DeathsquadPDA pocket1: EnergySword @@ -36,8 +35,6 @@ belt: ClothingBeltMilitaryWebbingMedFilled storage: back: - - BoxSurvivalEngineering - - WeaponPulseRifle - WeaponPulsePistol - WeaponRevolverMateba - SpeedLoaderMagnumAP @@ -48,6 +45,8 @@ - Hypospray - DeathAcidifierImplanter # crew will try to steal their amazing hardsuits - FreedomImplanter + inhand: + - WeaponPulseRifle # Syndicate Operative Outfit - Civilian - type: startingGear @@ -117,11 +116,9 @@ id: CBURNPDA pocket1: RadioHandheld pocket2: WeaponLaserGun - suitstorage: OxygenTankFilled belt: ClothingBeltBandolier storage: back: - - BoxSurvivalEngineering - WeaponShotgunDoubleBarreled - BoxShotgunIncendiary - GrenadeFlashBang From 6d0e915ebb7431bf0e7e0278c2c5b83118878523 Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 7 Aug 2024 09:27:48 +0000 Subject: [PATCH 240/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 5ac8f6e3f6..cc3bbad775 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Hobbitmax - changes: - - message: Replaced Syndicate Jaws Of Life with a Pyjama bundle on the Train map. - type: Tweak - id: 6555 - time: '2024-05-08T07:30:53.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27734 - author: Plykiya changes: - message: The ninja's katana dash is now more reliable. @@ -3780,3 +3773,14 @@ id: 7054 time: '2024-08-07T09:19:10.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30002 +- author: Errant + changes: + - message: Survivors arriving via the Unknown Shuttle event, ERT and CBURN agents, + and Death Squad members are now equipped with the appropriate species-specific + survival gear. + type: Fix + - message: Unknown Shuttle event can once again spawn vox characters. + type: Tweak + id: 7055 + time: '2024-08-07T09:26:40.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29746 From 3dd5d562daafc619c016780714fcb4388469ff8b Mon Sep 17 00:00:00 2001 From: Ko4ergaPunk <62609550+Ko4ergaPunk@users.noreply.github.com> Date: Wed, 7 Aug 2024 16:37:12 +0300 Subject: [PATCH 241/422] Rename mining walls as "mining walls" (#30729) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix * re-check * re-check vol.2 season battle pass episode * да иди ты нахуй уже * re-cheeeck --- Resources/Prototypes/Entities/Structures/Walls/walls.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml index ae7141e9b4..c4c9af83b3 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml @@ -1089,7 +1089,7 @@ - type: entity parent: BaseWall id: WallMining - name: wall + name: mining wall components: - type: Tag tags: @@ -1118,7 +1118,7 @@ - type: entity parent: WallShuttleDiagonal id: WallMiningDiagonal - name: wall + name: mining wall suffix: diagonal placement: mode: SnapgridCenter From 7754ea925d4a6fa5380a6a8a0fe20fb820b20b1b Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Wed, 7 Aug 2024 20:13:24 +0200 Subject: [PATCH 242/422] Fix warning cone rotation in inventory (#30672) --- Resources/Prototypes/Entities/Clothing/Head/misc.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml index 651f80a3a9..cdd6ee894e 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml @@ -148,6 +148,8 @@ sprite: Clothing/Head/Misc/cone.rsi - type: Clothing sprite: Clothing/Head/Misc/cone.rsi + - type: Item + storedRotation: 0 - type: PhysicalComposition #you can't just pass up some free plastic! materialComposition: Plastic: 100 From ff28feec14118e51d1c032e4a6790c58203cbf8f Mon Sep 17 00:00:00 2001 From: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Date: Wed, 7 Aug 2024 17:47:03 -0400 Subject: [PATCH 243/422] butter is slippery (#29772) * butter slippery * rerun tests * standardize --- .../Objects/Consumable/Food/ingredients.yml | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml index f1f30f6c46..102703f2a5 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml @@ -1,4 +1,5 @@ # Lots of misc stuff in here, hard to parent it. +# ^ Yeah, this stuff should probably get split into different files but not my fight today. # Powder (For when you throw stuff like flour and it explodes) @@ -481,10 +482,33 @@ components: - type: Sprite state: butter + - type: Slippery + - type: StepTrigger + intersectRatio: 0.2 + - type: CollisionWake + enabled: false + - type: Physics + bodyType: Dynamic + - type: Fixtures + fixtures: + slips: + shape: + !type:PhysShapeAabb + bounds: "-0.3,-0.2,0.3,0.2" + layer: + - SlipLayer + hard: false + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.3,-0.2,0.3,0.2" + density: 10 + mask: + - ItemMask - type: entity name: stick of cannabis butter - parent: FoodBakingBase + parent: FoodButter id: FoodCannabisButter description: Add this to your favorite baked goods for an irie time. components: From 8e3ddcc278b49c79690c4112ec6bb2031fc19e6d Mon Sep 17 00:00:00 2001 From: PJBot Date: Wed, 7 Aug 2024 21:48:11 +0000 Subject: [PATCH 244/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index cc3bbad775..8a1f87d153 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Plykiya - changes: - - message: The ninja's katana dash is now more reliable. - type: Fix - id: 6556 - time: '2024-05-08T10:21:59.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27793 - author: K-Dynamic changes: - message: Bike Horns, Suspenders and the Clown Recorder are now available from @@ -3784,3 +3777,10 @@ id: 7055 time: '2024-08-07T09:26:40.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29746 +- author: IProduceWidgets + changes: + - message: butter is slippery + type: Tweak + id: 7056 + time: '2024-08-07T21:47:03.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29772 From d4ad2e473a398319a891df7b5b64493aa7708e20 Mon Sep 17 00:00:00 2001 From: "Mr. 27" <45323883+Dutch-VanDerLinde@users.noreply.github.com> Date: Wed, 7 Aug 2024 18:59:04 -0400 Subject: [PATCH 245/422] Don't disable collision on dead mobs, fixes an issue with pulling (#30532) Update MobStateSystem.Subscribers.cs --- .../Mobs/Systems/MobStateSystem.Subscribers.cs | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs b/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs index 9ee8a064e5..f99bd43feb 100644 --- a/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs +++ b/Content.Shared/Mobs/Systems/MobStateSystem.Subscribers.cs @@ -80,11 +80,6 @@ public partial class MobStateSystem case MobState.Dead: RemComp(target); _standing.Stand(target); - if (!_standing.IsDown(target) && TryComp(target, out var physics)) - { - _physics.SetCanCollide(target, true, body: physics); - } - break; case MobState.Invalid: //unused @@ -115,12 +110,6 @@ public partial class MobStateSystem case MobState.Dead: EnsureComp(target); _standing.Down(target); - - if (_standing.IsDown(target) && TryComp(target, out var physics)) - { - _physics.SetCanCollide(target, false, body: physics); - } - _appearance.SetData(target, MobStateVisuals.State, MobState.Dead); break; case MobState.Invalid: From d86c886f61f14e67ef695495b8e63f66d80c39f1 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Thu, 8 Aug 2024 01:11:05 +0200 Subject: [PATCH 246/422] Add more advertisements (#30653) --- .../en-US/advertisements/vending/atmosdrobe.ftl | 4 +++- .../en-US/advertisements/vending/chefdrobe.ftl | 3 ++- .../en-US/advertisements/vending/chemdrobe.ftl | 3 ++- .../en-US/advertisements/vending/donut.ftl | 1 + .../en-US/advertisements/vending/hydrobe.ftl | 3 ++- .../en-US/advertisements/vending/janidrobe.ftl | 3 ++- .../en-US/advertisements/vending/lawdrobe.ftl | 1 + .../en-US/advertisements/vending/medidrobe.ftl | 1 + .../Catalog/VendingMachines/advertisements.yml | 16 ++++++++-------- 9 files changed, 22 insertions(+), 13 deletions(-) diff --git a/Resources/Locale/en-US/advertisements/vending/atmosdrobe.ftl b/Resources/Locale/en-US/advertisements/vending/atmosdrobe.ftl index 642d142fbf..f7bc093e1c 100644 --- a/Resources/Locale/en-US/advertisements/vending/atmosdrobe.ftl +++ b/Resources/Locale/en-US/advertisements/vending/atmosdrobe.ftl @@ -1,3 +1,5 @@ advertisement-atmosdrobe-1 = Get your inflammable clothing right here!!! advertisement-atmosdrobe-2 = Protects you against plasma fires! -advertisement-atmosdrobe-3 = Enjoy your off-brand engineering clothing! \ No newline at end of file +advertisement-atmosdrobe-3 = Enjoy your off-brand engineering clothing! +advertisement-atmosdrobe-4 = Always under control of your atmosphere! +advertisement-atmosdrobe-5 = Providing comfort in every breath! diff --git a/Resources/Locale/en-US/advertisements/vending/chefdrobe.ftl b/Resources/Locale/en-US/advertisements/vending/chefdrobe.ftl index a681a7aced..025c731ff3 100644 --- a/Resources/Locale/en-US/advertisements/vending/chefdrobe.ftl +++ b/Resources/Locale/en-US/advertisements/vending/chefdrobe.ftl @@ -1,3 +1,4 @@ -advertisement-chefdrobe-1 = Our clothes are guaranteed to protect you from food splatters! +advertisement-chefdrobe-1 = Our clothes are guaranteed to protect you from food splatters! advertisement-chefdrobe-2 = Perfectly white, so everyone knows about the murder in the kitchen! advertisement-chefdrobe-3 = Easy to clean, easy to see! +advertisement-chefdrobe-4 = Cook like a pro, look like a maestro! diff --git a/Resources/Locale/en-US/advertisements/vending/chemdrobe.ftl b/Resources/Locale/en-US/advertisements/vending/chemdrobe.ftl index 4472ced15e..5dd4f87dc3 100644 --- a/Resources/Locale/en-US/advertisements/vending/chemdrobe.ftl +++ b/Resources/Locale/en-US/advertisements/vending/chemdrobe.ftl @@ -1,3 +1,4 @@ advertisement-chemdrobe-1 = Our clothes are 0.5% more resistant to acid spills! Get yours now! advertisement-chemdrobe-2 = Professional laboratory clothing, designed by NanoTrasen! -advertisement-chemdrobe-3 = I'm pretty sure these will protect you against acid spills! \ No newline at end of file +advertisement-chemdrobe-3 = I'm pretty sure these will protect you against acid spills! +advertisement-chemdrobe-4 = The best fashion formula! diff --git a/Resources/Locale/en-US/advertisements/vending/donut.ftl b/Resources/Locale/en-US/advertisements/vending/donut.ftl index daa93928b6..af801f621c 100644 --- a/Resources/Locale/en-US/advertisements/vending/donut.ftl +++ b/Resources/Locale/en-US/advertisements/vending/donut.ftl @@ -3,6 +3,7 @@ advertisement-donut-2 = Hope you're hunger! advertisement-donut-3 = Over 1 million donuts sold! advertisement-donut-4 = We pride ourselves in the consistency of our products! advertisement-donut-5 = Sweet, sugary and delicious! +advertisement-donut-6 = Donut worry, be happy! thankyou-donut-1 = Enjoy your donut! thankyou-donut-2 = Another donut sold! thankyou-donut-3 = Have a nice day, officer! diff --git a/Resources/Locale/en-US/advertisements/vending/hydrobe.ftl b/Resources/Locale/en-US/advertisements/vending/hydrobe.ftl index f1fdc4fccc..64b38d8e3a 100644 --- a/Resources/Locale/en-US/advertisements/vending/hydrobe.ftl +++ b/Resources/Locale/en-US/advertisements/vending/hydrobe.ftl @@ -1,4 +1,5 @@ advertisement-hydrobe-1 = Do you love soil? Then buy our clothes! advertisement-hydrobe-2 = Get outfits to match your green thumb here! advertisement-hydrobe-3 = Here to give you an outfit perfect for handling plants! -advertisement-hydrobe-4 = Perfect outfits for tree huggers... or just literal trees! \ No newline at end of file +advertisement-hydrobe-4 = Perfect outfits for tree huggers... or just literal trees! +advertisement-hydrobe-5 = Wear green and grow! diff --git a/Resources/Locale/en-US/advertisements/vending/janidrobe.ftl b/Resources/Locale/en-US/advertisements/vending/janidrobe.ftl index 7c39a9ad4a..a23f878e74 100644 --- a/Resources/Locale/en-US/advertisements/vending/janidrobe.ftl +++ b/Resources/Locale/en-US/advertisements/vending/janidrobe.ftl @@ -1,4 +1,5 @@ advertisement-janidrobe-1 = Come and get your janitorial clothing, now endorsed by lizard janitors everywhere! advertisement-janidrobe-2 = Here to keep you clean as you clean up non-clean things! advertisement-janidrobe-3 = Stylishly yellow! - +advertisement-janidrobe-4 = Polish your appearance with JaniDrobe! +advertisement-janidrobe-5 = Shine like a shiny floor! diff --git a/Resources/Locale/en-US/advertisements/vending/lawdrobe.ftl b/Resources/Locale/en-US/advertisements/vending/lawdrobe.ftl index 5473f162da..64849d9341 100644 --- a/Resources/Locale/en-US/advertisements/vending/lawdrobe.ftl +++ b/Resources/Locale/en-US/advertisements/vending/lawdrobe.ftl @@ -6,6 +6,7 @@ advertisement-lawdrobe-5 = No one is above the law! advertisement-lawdrobe-6 = No officer, I do not consent to a search! advertisement-lawdrobe-7 = Injecting space drugs leaves no evidence! advertisement-lawdrobe-8 = You or a loved one hurt by Nanotrasen? Too bad! +advertisement-lawdrobe-9 = Case closed! Defendant has too much drip! thankyou-lawdrobe-1 = You can win any case in that outfit! thankyou-lawdrobe-2 = Get one for your client as well! thankyou-lawdrobe-3 = Win or lose, you get paid either way! diff --git a/Resources/Locale/en-US/advertisements/vending/medidrobe.ftl b/Resources/Locale/en-US/advertisements/vending/medidrobe.ftl index 68b18a8390..980628a0ce 100644 --- a/Resources/Locale/en-US/advertisements/vending/medidrobe.ftl +++ b/Resources/Locale/en-US/advertisements/vending/medidrobe.ftl @@ -1,3 +1,4 @@ advertisement-medidrobe-1 = Make those blood stains look fashionable!! advertisement-medidrobe-2 = Clean and hygienic! Don't get too many bloodstains on yourself! advertisement-medidrobe-3 = With these outfits, you'll look like a professional doctor now! +advertisement-medidrobe-4 = Jumpsuit, check. Coat, check. Someone who will wear this? Check! diff --git a/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml b/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml index aa25e87a52..5f6806afbb 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/advertisements.yml @@ -8,7 +8,7 @@ id: AtmosDrobeAds values: prefix: advertisement-atmosdrobe- - count: 3 + count: 5 - type: localizedDataset id: BarDrobeAds @@ -38,7 +38,7 @@ id: ChefDrobeAds values: prefix: advertisement-chefdrobe- - count: 3 + count: 4 - type: localizedDataset id: ChefvendAds @@ -50,7 +50,7 @@ id: ChemDrobeAds values: prefix: advertisement-chemdrobe- - count: 3 + count: 4 - type: localizedDataset id: CigaretteMachineAds @@ -110,7 +110,7 @@ id: DonutAds values: prefix: advertisement-donut- - count: 5 + count: 6 - type: localizedDataset id: EngiDrobeAds @@ -146,19 +146,19 @@ id: HyDrobeAds values: prefix: advertisement-hydrobe- - count: 4 + count: 5 - type: localizedDataset id: JaniDrobeAds values: prefix: advertisement-janidrobe- - count: 3 + count: 5 - type: localizedDataset id: LawDrobeAds values: prefix: advertisement-lawdrobe- - count: 8 + count: 9 - type: localizedDataset id: MagiVendAds @@ -170,7 +170,7 @@ id: MediDrobeAds values: prefix: advertisement-medidrobe- - count: 3 + count: 4 - type: localizedDataset id: MegaSeedAds From 9645f5528b23c361db82748648ecf8b6850e7ff4 Mon Sep 17 00:00:00 2001 From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> Date: Wed, 7 Aug 2024 19:12:01 -0700 Subject: [PATCH 247/422] Strip drag drop test (#30754) * Add test for drag drop to open strip menu * Make screencoords change based on deadzone --- Content.Client/Interaction/DragDropSystem.cs | 15 ++++-- .../Interaction/InteractionTest.Helpers.cs | 5 +- .../Tests/Strip/StrippableTest.cs | 46 +++++++++++++++++++ 3 files changed, 59 insertions(+), 7 deletions(-) create mode 100644 Content.IntegrationTests/Tests/Strip/StrippableTest.cs diff --git a/Content.Client/Interaction/DragDropSystem.cs b/Content.Client/Interaction/DragDropSystem.cs index a34cd0f5b1..4145999579 100644 --- a/Content.Client/Interaction/DragDropSystem.cs +++ b/Content.Client/Interaction/DragDropSystem.cs @@ -90,7 +90,7 @@ public sealed class DragDropSystem : SharedDragDropSystem /// private bool _isReplaying; - private float _deadzone; + public float Deadzone; private DragState _state = DragState.NotDragging; @@ -122,7 +122,7 @@ public sealed class DragDropSystem : SharedDragDropSystem private void SetDeadZone(float deadZone) { - _deadzone = deadZone; + Deadzone = deadZone; } public override void Shutdown() @@ -212,7 +212,7 @@ public sealed class DragDropSystem : SharedDragDropSystem _draggedEntity = entity; _state = DragState.MouseDown; - _mouseDownScreenPos = _inputManager.MouseScreenPosition; + _mouseDownScreenPos = args.ScreenCoordinates; _mouseDownTime = 0; // don't want anything else to process the click, @@ -240,8 +240,13 @@ public sealed class DragDropSystem : SharedDragDropSystem if (TryComp(_draggedEntity, out var draggedSprite)) { + var screenPos = _inputManager.MouseScreenPosition; + // No _draggedEntity in null window (Happens in tests) + if (!screenPos.IsValid) + return; + // pop up drag shadow under mouse - var mousePos = _eyeManager.PixelToMap(_inputManager.MouseScreenPosition); + var mousePos = _eyeManager.PixelToMap(screenPos); _dragShadow = EntityManager.SpawnEntity("dragshadow", mousePos); var dragSprite = Comp(_dragShadow.Value); dragSprite.CopyFrom(draggedSprite); @@ -534,7 +539,7 @@ public sealed class DragDropSystem : SharedDragDropSystem case DragState.MouseDown: { var screenPos = _inputManager.MouseScreenPosition; - if ((_mouseDownScreenPos!.Value.Position - screenPos.Position).Length() > _deadzone) + if ((_mouseDownScreenPos!.Value.Position - screenPos.Position).Length() > Deadzone) { StartDrag(); } diff --git a/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs b/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs index 0f2c314ed0..d431c440a2 100644 --- a/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs +++ b/Content.IntegrationTests/Tests/Interaction/InteractionTest.Helpers.cs @@ -1207,11 +1207,12 @@ public abstract partial class InteractionTest BoundKeyFunction key, BoundKeyState state, NetCoordinates? coordinates = null, - NetEntity? cursorEntity = null) + NetEntity? cursorEntity = null, + ScreenCoordinates? screenCoordinates = null) { var coords = coordinates ?? TargetCoords; var target = cursorEntity ?? Target ?? default; - ScreenCoordinates screen = default; + var screen = screenCoordinates ?? default; var funcId = InputManager.NetworkBindMap.KeyFunctionID(key); var message = new ClientFullInputCmdMessage(CTiming.CurTick, CTiming.TickFraction, funcId) diff --git a/Content.IntegrationTests/Tests/Strip/StrippableTest.cs b/Content.IntegrationTests/Tests/Strip/StrippableTest.cs new file mode 100644 index 0000000000..f65bab1f81 --- /dev/null +++ b/Content.IntegrationTests/Tests/Strip/StrippableTest.cs @@ -0,0 +1,46 @@ +using Content.Client.Interaction; +using Content.IntegrationTests.Tests.Interaction; +using Robust.Shared.GameObjects; +using Robust.Shared.Input; +using Robust.Shared.Map; + +namespace Content.IntegrationTests.Tests.Strip; + +public sealed class StrippableTest : InteractionTest +{ + protected override string PlayerPrototype => "MobHuman"; + + [Test] + public async Task DragDropOpensStrip() + { + // Spawn one tile away + TargetCoords = SEntMan.GetNetCoordinates(new EntityCoordinates(MapData.MapUid, 1, 0)); + await SpawnTarget("MobHuman"); + + var userInterface = Comp(Target); + Assert.That(userInterface.Actors.Count == 0); + + // screenCoordinates diff needs to be larger than DragDropSystem._deadzone + var screenX = CEntMan.System().Deadzone + 1f; + + // Start drag + await SetKey(EngineKeyFunctions.Use, + BoundKeyState.Down, + TargetCoords, + Target, + screenCoordinates: new ScreenCoordinates(screenX, 0f, WindowId.Main)); + + await RunTicks(5); + + // End drag + await SetKey(EngineKeyFunctions.Use, + BoundKeyState.Up, + PlayerCoords, + Player, + screenCoordinates: new ScreenCoordinates(0f, 0f, WindowId.Main)); + + await RunTicks(5); + + Assert.That(userInterface.Actors.Count > 0); + } +} From b8d10a3f5efedaea2a0ce8031a5f0a9704d38f37 Mon Sep 17 00:00:00 2001 From: Mervill Date: Wed, 7 Aug 2024 19:14:31 -0700 Subject: [PATCH 248/422] Add verbose (client predicted!) examine text to Gas Miners (#30480) * add verbose examine text to gas miners so their behaviour can be understood * no need for these to be properties * use an enum instead of two booleans for the miner state * require the gas miner to be anchored in order to not be disabled * xmldoc * pr feedback * file-scope namespace * it's to late to hide my transgressions in a rebase * turns out the normal examine distance is totally fine for this --- .../Atmos/EntitySystems/GasMinerSystem.cs | 10 +++ .../Atmos/EntitySystems/GasMinerSystem.cs | 90 +++++++++++++++++++ .../Other/Components/GasMinerComponent.cs | 43 --------- .../Other/EntitySystems/GasMinerSystem.cs | 84 ----------------- .../Atmos/Components/GasMinerComponent.cs | 60 +++++++++++++ .../EntitySystems/SharedGasMinerSystem.cs | 55 ++++++++++++ .../en-US/atmos/gas-miner-component.ftl | 11 +++ 7 files changed, 226 insertions(+), 127 deletions(-) create mode 100644 Content.Client/Atmos/EntitySystems/GasMinerSystem.cs create mode 100644 Content.Server/Atmos/EntitySystems/GasMinerSystem.cs delete mode 100644 Content.Server/Atmos/Piping/Other/Components/GasMinerComponent.cs delete mode 100644 Content.Server/Atmos/Piping/Other/EntitySystems/GasMinerSystem.cs create mode 100644 Content.Shared/Atmos/Components/GasMinerComponent.cs create mode 100644 Content.Shared/Atmos/EntitySystems/SharedGasMinerSystem.cs create mode 100644 Resources/Locale/en-US/atmos/gas-miner-component.ftl diff --git a/Content.Client/Atmos/EntitySystems/GasMinerSystem.cs b/Content.Client/Atmos/EntitySystems/GasMinerSystem.cs new file mode 100644 index 0000000000..aec138eed8 --- /dev/null +++ b/Content.Client/Atmos/EntitySystems/GasMinerSystem.cs @@ -0,0 +1,10 @@ +using Content.Shared.Atmos.EntitySystems; +using JetBrains.Annotations; + +namespace Content.Client.Atmos.EntitySystems; + +[UsedImplicitly] +public sealed class GasMinerSystem : SharedGasMinerSystem +{ + +} diff --git a/Content.Server/Atmos/EntitySystems/GasMinerSystem.cs b/Content.Server/Atmos/EntitySystems/GasMinerSystem.cs new file mode 100644 index 0000000000..f7a3b9eed8 --- /dev/null +++ b/Content.Server/Atmos/EntitySystems/GasMinerSystem.cs @@ -0,0 +1,90 @@ +using System.Diagnostics.CodeAnalysis; +using Content.Server.Atmos.Piping.Components; +using Content.Shared.Atmos; +using Content.Shared.Atmos.Components; +using Content.Shared.Atmos.EntitySystems; +using JetBrains.Annotations; +using Robust.Server.GameObjects; + +namespace Content.Server.Atmos.EntitySystems; + +[UsedImplicitly] +public sealed class GasMinerSystem : SharedGasMinerSystem +{ + [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; + [Dependency] private readonly TransformSystem _transformSystem = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnMinerUpdated); + } + + private void OnMinerUpdated(Entity ent, ref AtmosDeviceUpdateEvent args) + { + var miner = ent.Comp; + var oldState = miner.MinerState; + float toSpawn; + + if (!GetValidEnvironment(ent, out var environment) || !Transform(ent).Anchored) + { + miner.MinerState = GasMinerState.Disabled; + } + // SpawnAmount is declared in mol/s so to get the amount of gas we hope to mine, we have to multiply this by + // how long we have been waiting to spawn it and further cap the number according to the miner's state. + else if ((toSpawn = CapSpawnAmount(ent, miner.SpawnAmount * args.dt, environment)) == 0) + { + miner.MinerState = GasMinerState.Idle; + } + else + { + miner.MinerState = GasMinerState.Working; + + // Time to mine some gas. + var merger = new GasMixture(1) { Temperature = miner.SpawnTemperature }; + merger.SetMoles(miner.SpawnGas, toSpawn); + _atmosphereSystem.Merge(environment, merger); + } + + if (miner.MinerState != oldState) + { + Dirty(ent); + } + } + + private bool GetValidEnvironment(Entity ent, [NotNullWhen(true)] out GasMixture? environment) + { + var (uid, miner) = ent; + var transform = Transform(uid); + var position = _transformSystem.GetGridOrMapTilePosition(uid, transform); + + // Treat space as an invalid environment + if (_atmosphereSystem.IsTileSpace(transform.GridUid, transform.MapUid, position)) + { + environment = null; + return false; + } + + environment = _atmosphereSystem.GetContainingMixture((uid, transform), true, true); + return environment != null; + } + + private float CapSpawnAmount(Entity ent, float toSpawnTarget, GasMixture environment) + { + var (uid, miner) = ent; + + // How many moles could we theoretically spawn. Cap by pressure and amount. + var allowableMoles = Math.Min( + (miner.MaxExternalPressure - environment.Pressure) * environment.Volume / (miner.SpawnTemperature * Atmospherics.R), + miner.MaxExternalAmount - environment.TotalMoles); + + var toSpawnReal = Math.Clamp(allowableMoles, 0f, toSpawnTarget); + + if (toSpawnReal < Atmospherics.GasMinMoles) { + return 0f; + } + + return toSpawnReal; + } +} diff --git a/Content.Server/Atmos/Piping/Other/Components/GasMinerComponent.cs b/Content.Server/Atmos/Piping/Other/Components/GasMinerComponent.cs deleted file mode 100644 index 1775ec5dad..0000000000 --- a/Content.Server/Atmos/Piping/Other/Components/GasMinerComponent.cs +++ /dev/null @@ -1,43 +0,0 @@ -using Content.Shared.Atmos; - -namespace Content.Server.Atmos.Piping.Other.Components -{ - [RegisterComponent] - public sealed partial class GasMinerComponent : Component - { - [ViewVariables(VVAccess.ReadWrite)] - public bool Enabled { get; set; } = true; - - [ViewVariables(VVAccess.ReadOnly)] - public bool Idle { get; set; } = false; - - /// - /// If the number of moles in the external environment exceeds this number, no gas will be mined. - /// - [ViewVariables(VVAccess.ReadWrite)] - [DataField("maxExternalAmount")] - public float MaxExternalAmount { get; set; } = float.PositiveInfinity; - - /// - /// If the pressure (in kPA) of the external environment exceeds this number, no gas will be mined. - /// - [ViewVariables(VVAccess.ReadWrite)] - [DataField("maxExternalPressure")] - public float MaxExternalPressure { get; set; } = Atmospherics.GasMinerDefaultMaxExternalPressure; - - [ViewVariables(VVAccess.ReadWrite)] - [DataField("spawnGas")] - public Gas? SpawnGas { get; set; } = null; - - [ViewVariables(VVAccess.ReadWrite)] - [DataField("spawnTemperature")] - public float SpawnTemperature { get; set; } = Atmospherics.T20C; - - /// - /// Number of moles created per second when the miner is working. - /// - [ViewVariables(VVAccess.ReadWrite)] - [DataField("spawnAmount")] - public float SpawnAmount { get; set; } = Atmospherics.MolesCellStandard * 20f; - } -} diff --git a/Content.Server/Atmos/Piping/Other/EntitySystems/GasMinerSystem.cs b/Content.Server/Atmos/Piping/Other/EntitySystems/GasMinerSystem.cs deleted file mode 100644 index dd46fb6b4c..0000000000 --- a/Content.Server/Atmos/Piping/Other/EntitySystems/GasMinerSystem.cs +++ /dev/null @@ -1,84 +0,0 @@ -using System.Diagnostics.CodeAnalysis; -using Content.Server.Atmos.EntitySystems; -using Content.Server.Atmos.Piping.Components; -using Content.Server.Atmos.Piping.Other.Components; -using Content.Shared.Atmos; -using JetBrains.Annotations; -using Robust.Server.GameObjects; - -namespace Content.Server.Atmos.Piping.Other.EntitySystems -{ - [UsedImplicitly] - public sealed class GasMinerSystem : EntitySystem - { - [Dependency] private readonly AtmosphereSystem _atmosphereSystem = default!; - [Dependency] private readonly TransformSystem _transformSystem = default!; - - public override void Initialize() - { - base.Initialize(); - - SubscribeLocalEvent(OnMinerUpdated); - } - - private void OnMinerUpdated(Entity ent, ref AtmosDeviceUpdateEvent args) - { - var miner = ent.Comp; - - if (!GetValidEnvironment(ent, out var environment)) - { - miner.Idle = true; - return; - } - - // SpawnAmount is declared in mol/s so to get the amount of gas we hope to mine, we have to multiply this by - // how long we have been waiting to spawn it and further cap the number according to the miner's state. - var toSpawn = CapSpawnAmount(ent, miner.SpawnAmount * args.dt, environment); - miner.Idle = toSpawn == 0; - if (miner.Idle || !miner.Enabled || !miner.SpawnGas.HasValue) - return; - - // Time to mine some gas. - - var merger = new GasMixture(1) { Temperature = miner.SpawnTemperature }; - merger.SetMoles(miner.SpawnGas.Value, toSpawn); - - _atmosphereSystem.Merge(environment, merger); - } - - private bool GetValidEnvironment(Entity ent, [NotNullWhen(true)] out GasMixture? environment) - { - var (uid, miner) = ent; - var transform = Transform(uid); - var position = _transformSystem.GetGridOrMapTilePosition(uid, transform); - - // Treat space as an invalid environment - if (_atmosphereSystem.IsTileSpace(transform.GridUid, transform.MapUid, position)) - { - environment = null; - return false; - } - - environment = _atmosphereSystem.GetContainingMixture((uid, transform), true, true); - return environment != null; - } - - private float CapSpawnAmount(Entity ent, float toSpawnTarget, GasMixture environment) - { - var (uid, miner) = ent; - - // How many moles could we theoretically spawn. Cap by pressure and amount. - var allowableMoles = Math.Min( - (miner.MaxExternalPressure - environment.Pressure) * environment.Volume / (miner.SpawnTemperature * Atmospherics.R), - miner.MaxExternalAmount - environment.TotalMoles); - - var toSpawnReal = Math.Clamp(allowableMoles, 0f, toSpawnTarget); - - if (toSpawnReal < Atmospherics.GasMinMoles) { - return 0f; - } - - return toSpawnReal; - } - } -} diff --git a/Content.Shared/Atmos/Components/GasMinerComponent.cs b/Content.Shared/Atmos/Components/GasMinerComponent.cs new file mode 100644 index 0000000000..43f3032770 --- /dev/null +++ b/Content.Shared/Atmos/Components/GasMinerComponent.cs @@ -0,0 +1,60 @@ +using Robust.Shared.Serialization; +using Robust.Shared.GameStates; + +namespace Content.Shared.Atmos.Components; + +[NetworkedComponent] +[AutoGenerateComponentState] +[RegisterComponent] +public sealed partial class GasMinerComponent : Component +{ + /// + /// Operational state of the miner. + /// + [AutoNetworkedField] + [ViewVariables(VVAccess.ReadOnly)] + public GasMinerState MinerState = GasMinerState.Disabled; + + /// + /// If the number of moles in the external environment exceeds this number, no gas will be mined. + /// + [ViewVariables(VVAccess.ReadWrite)] + [DataField] + public float MaxExternalAmount = float.PositiveInfinity; + + /// + /// If the pressure (in kPA) of the external environment exceeds this number, no gas will be mined. + /// + [ViewVariables(VVAccess.ReadWrite)] + [DataField] + public float MaxExternalPressure = Atmospherics.GasMinerDefaultMaxExternalPressure; + + /// + /// Gas to spawn. + /// + [ViewVariables(VVAccess.ReadWrite)] + [DataField(required: true)] + public Gas SpawnGas; + + /// + /// Temperature in Kelvin. + /// + [ViewVariables(VVAccess.ReadWrite)] + [DataField] + public float SpawnTemperature = Atmospherics.T20C; + + /// + /// Number of moles created per second when the miner is working. + /// + [ViewVariables(VVAccess.ReadWrite)] + [DataField] + public float SpawnAmount = Atmospherics.MolesCellStandard * 20f; +} + +[Serializable, NetSerializable] +public enum GasMinerState : byte +{ + Disabled, + Idle, + Working, +} diff --git a/Content.Shared/Atmos/EntitySystems/SharedGasMinerSystem.cs b/Content.Shared/Atmos/EntitySystems/SharedGasMinerSystem.cs new file mode 100644 index 0000000000..957ff6fde4 --- /dev/null +++ b/Content.Shared/Atmos/EntitySystems/SharedGasMinerSystem.cs @@ -0,0 +1,55 @@ +using Content.Shared.Atmos.Components; +using Content.Shared.Examine; +using Content.Shared.Temperature; + +namespace Content.Shared.Atmos.EntitySystems; + +public abstract class SharedGasMinerSystem : EntitySystem +{ + [Dependency] private readonly SharedAtmosphereSystem _sharedAtmosphereSystem = default!; + + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(OnExamine); + } + + private void OnExamine(Entity ent, ref ExaminedEvent args) + { + var component = ent.Comp; + + using (args.PushGroup(nameof(GasMinerComponent))) + { + args.PushMarkup(Loc.GetString("gas-miner-mines-text", + ("gas", Loc.GetString(_sharedAtmosphereSystem.GetGas(component.SpawnGas).Name)))); + + args.PushText(Loc.GetString("gas-miner-amount-text", + ("moles", $"{component.SpawnAmount:0.#}"))); + + args.PushText(Loc.GetString("gas-miner-temperature-text", + ("tempK", $"{component.SpawnTemperature:0.#}"), + ("tempC", $"{TemperatureHelpers.KelvinToCelsius(component.SpawnTemperature):0.#}"))); + + if (component.MaxExternalAmount < float.PositiveInfinity) + { + args.PushText(Loc.GetString("gas-miner-moles-cutoff-text", + ("moles", $"{component.MaxExternalAmount:0.#}"))); + } + + if (component.MaxExternalPressure < float.PositiveInfinity) + { + args.PushText(Loc.GetString("gas-miner-pressure-cutoff-text", + ("pressure", $"{component.MaxExternalPressure:0.#}"))); + } + + args.AddMarkup(component.MinerState switch + { + GasMinerState.Disabled => Loc.GetString("gas-miner-state-disabled-text"), + GasMinerState.Idle => Loc.GetString("gas-miner-state-idle-text"), + GasMinerState.Working => Loc.GetString("gas-miner-state-working-text"), + // C# pattern matching is not exhaustive for enums + _ => throw new IndexOutOfRangeException(nameof(component.MinerState)), + }); + } + } +} diff --git a/Resources/Locale/en-US/atmos/gas-miner-component.ftl b/Resources/Locale/en-US/atmos/gas-miner-component.ftl new file mode 100644 index 0000000000..87016e4522 --- /dev/null +++ b/Resources/Locale/en-US/atmos/gas-miner-component.ftl @@ -0,0 +1,11 @@ +gas-miner-mines-text = It mines [color=lightgray]{$gas}[/color] when active. + +gas-miner-amount-text = It mines {$moles} moles of gas a second when active. +gas-miner-temperature-text = Mined gas temp: {$tempK}K ({$tempC}°C). + +gas-miner-moles-cutoff-text = Surrounding moles cutoff: {$moles} moles. +gas-miner-pressure-cutoff-text = Surrounding pressure cutoff: {$pressure} kPA. + +gas-miner-state-working-text = The miner is [color=green]active[/color] and mining gas. +gas-miner-state-idle-text = The miner is [color=yellow]idle[/color] and not mining gas. +gas-miner-state-disabled-text = The miner is [color=red]disabled[/color] and not mining gas. \ No newline at end of file From 3a50880070d7121501f39dbd9f6cf1af6fa229ae Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 8 Aug 2024 02:15:38 +0000 Subject: [PATCH 249/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 8a1f87d153..777ad15e49 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: K-Dynamic - changes: - - message: Bike Horns, Suspenders and the Clown Recorder are now available from - the Theatrical Performances Crate - type: Tweak - id: 6557 - time: '2024-05-08T12:30:43.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27668 - author: Riolume changes: - message: Added ability to drink from spray bottles @@ -3784,3 +3776,10 @@ id: 7056 time: '2024-08-07T21:47:03.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29772 +- author: Mervill + changes: + - message: Gas Miners now have detailed examine text + type: Tweak + id: 7057 + time: '2024-08-08T02:14:31.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30480 From 23e4a9a0042031255e2c7a986e758b2740ff9493 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Thu, 8 Aug 2024 12:34:00 +1000 Subject: [PATCH 250/422] Update submodule to 229.1.2 (#30764) Tests should work decently again --- RobustToolbox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RobustToolbox b/RobustToolbox index 5c0ce43e6c..49c831b48d 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 5c0ce43e6c3c22a939fad8a9f9848e489b135651 +Subproject commit 49c831b48d1449e90a65acdb0c276d2deea4ce2c From ab28e1a9a9bbee16c90721a5c0e9fb4b6efcfc35 Mon Sep 17 00:00:00 2001 From: Mervill Date: Wed, 7 Aug 2024 20:03:41 -0700 Subject: [PATCH 251/422] Remove obsolete occurrences of IComponent.Owner being assigned just before AddComponent (#30724) --- .../EntitySystems/TwoStageTriggerSystem.cs | 5 ++--- .../Humanoid/Systems/RandomHumanoidSystem.cs | 3 +-- Content.Server/Jobs/AddComponentSpecial.cs | 5 ++--- .../Worldgen/Prototypes/BiomePrototype.cs | 1 - .../Worldgen/Prototypes/WorldgenConfigPrototype.cs | 1 - .../XenoArtifacts/ArtifactSystem.Nodes.cs | 14 ++++++-------- Content.Shared/Magic/SharedMagicSystem.cs | 7 +++---- 7 files changed, 14 insertions(+), 22 deletions(-) diff --git a/Content.Server/Explosion/EntitySystems/TwoStageTriggerSystem.cs b/Content.Server/Explosion/EntitySystems/TwoStageTriggerSystem.cs index 4e95eabff0..89950edf8c 100644 --- a/Content.Server/Explosion/EntitySystems/TwoStageTriggerSystem.cs +++ b/Content.Server/Explosion/EntitySystems/TwoStageTriggerSystem.cs @@ -30,13 +30,12 @@ public sealed class TwoStageTriggerSystem : EntitySystem { foreach (var (name, entry) in component.SecondStageComponents) { - var comp = (Component) _factory.GetComponent(name); - var temp = (object) comp; + var comp = (Component)_factory.GetComponent(name); + var temp = (object)comp; if (EntityManager.TryGetComponent(uid, entry.Component.GetType(), out var c)) RemComp(uid, c); - comp.Owner = uid; _serializationManager.CopyTo(entry.Component, ref temp); EntityManager.AddComponent(uid, comp); } diff --git a/Content.Server/Humanoid/Systems/RandomHumanoidSystem.cs b/Content.Server/Humanoid/Systems/RandomHumanoidSystem.cs index 872df8eae8..fc0e47b033 100644 --- a/Content.Server/Humanoid/Systems/RandomHumanoidSystem.cs +++ b/Content.Server/Humanoid/Systems/RandomHumanoidSystem.cs @@ -50,8 +50,7 @@ public sealed class RandomHumanoidSystem : EntitySystem { foreach (var entry in prototype.Components.Values) { - var comp = (Component) _serialization.CreateCopy(entry.Component, notNullableOverride: true); - comp.Owner = humanoid; // This .owner must survive for now. + var comp = (Component)_serialization.CreateCopy(entry.Component, notNullableOverride: true); EntityManager.RemoveComponent(humanoid, comp.GetType()); EntityManager.AddComponent(humanoid, comp); } diff --git a/Content.Server/Jobs/AddComponentSpecial.cs b/Content.Server/Jobs/AddComponentSpecial.cs index c57d734354..6489068d1f 100644 --- a/Content.Server/Jobs/AddComponentSpecial.cs +++ b/Content.Server/Jobs/AddComponentSpecial.cs @@ -23,12 +23,11 @@ namespace Content.Server.Jobs foreach (var (name, data) in Components) { var component = (Component) factory.GetComponent(name); - component.Owner = mob; - var temp = (object) component; + var temp = (object)component; serializationManager.CopyTo(data.Component, ref temp); entityManager.RemoveComponent(mob, temp!.GetType()); - entityManager.AddComponent(mob, (Component) temp); + entityManager.AddComponent(mob, (Component)temp); } } } diff --git a/Content.Server/Worldgen/Prototypes/BiomePrototype.cs b/Content.Server/Worldgen/Prototypes/BiomePrototype.cs index db1b5e2a16..1cecf87a5e 100644 --- a/Content.Server/Worldgen/Prototypes/BiomePrototype.cs +++ b/Content.Server/Worldgen/Prototypes/BiomePrototype.cs @@ -54,7 +54,6 @@ public sealed partial class BiomePrototype : IPrototype, IInheritingPrototype foreach (var data in ChunkComponents.Values) { var comp = (Component) serialization.CreateCopy(data.Component, notNullableOverride: true); - comp.Owner = target; // look im sorry ok this .owner has to live until engine api exists entityManager.AddComponent(target, comp); } } diff --git a/Content.Server/Worldgen/Prototypes/WorldgenConfigPrototype.cs b/Content.Server/Worldgen/Prototypes/WorldgenConfigPrototype.cs index 49e9e1ed9d..f669377abb 100644 --- a/Content.Server/Worldgen/Prototypes/WorldgenConfigPrototype.cs +++ b/Content.Server/Worldgen/Prototypes/WorldgenConfigPrototype.cs @@ -30,7 +30,6 @@ public sealed partial class WorldgenConfigPrototype : IPrototype foreach (var data in Components.Values) { var comp = (Component) serialization.CreateCopy(data.Component, notNullableOverride: true); - comp.Owner = target; // look im sorry ok this .owner has to live until engine api exists entityManager.AddComponent(target, comp); } } diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.Nodes.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.Nodes.cs index 65aaabdf0e..a0e8420011 100644 --- a/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.Nodes.cs +++ b/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactSystem.Nodes.cs @@ -182,13 +182,12 @@ public sealed partial class ArtifactSystem EntityManager.RemoveComponent(uid, reg.Type); } - var comp = (Component) _componentFactory.GetComponent(reg); - comp.Owner = uid; + var comp = (Component)_componentFactory.GetComponent(reg); - var temp = (object) comp; + var temp = (object)comp; _serialization.CopyTo(entry.Component, ref temp); EntityManager.RemoveComponent(uid, temp!.GetType()); - EntityManager.AddComponent(uid, (Component) temp!); + EntityManager.AddComponent(uid, (Component)temp!); } node.Discovered = true; @@ -218,12 +217,11 @@ public sealed partial class ArtifactSystem // if the entity prototype contained the component originally if (entityPrototype?.Components.TryGetComponent(name, out var entry) ?? false) { - var comp = (Component) _componentFactory.GetComponent(name); - comp.Owner = uid; - var temp = (object) comp; + var comp = (Component)_componentFactory.GetComponent(name); + var temp = (object)comp; _serialization.CopyTo(entry, ref temp); EntityManager.RemoveComponent(uid, temp!.GetType()); - EntityManager.AddComponent(uid, (Component) temp); + EntityManager.AddComponent(uid, (Component)temp); continue; } diff --git a/Content.Shared/Magic/SharedMagicSystem.cs b/Content.Shared/Magic/SharedMagicSystem.cs index cc7a297aa4..02d483c0a3 100644 --- a/Content.Shared/Magic/SharedMagicSystem.cs +++ b/Content.Shared/Magic/SharedMagicSystem.cs @@ -369,11 +369,10 @@ public abstract class SharedMagicSystem : EntitySystem if (HasComp(ev.Target, data.Component.GetType())) continue; - var component = (Component) _compFact.GetComponent(name); - component.Owner = ev.Target; - var temp = (object) component; + var component = (Component)_compFact.GetComponent(name); + var temp = (object)component; _seriMan.CopyTo(data.Component, ref temp); - EntityManager.AddComponent(ev.Target, (Component) temp!); + EntityManager.AddComponent(ev.Target, (Component)temp!); } } // End Change Component Spells From 929e6a2c002f5dd23633331100f0fa6a68b6de39 Mon Sep 17 00:00:00 2001 From: TakoDragon <69509841+BackeTako@users.noreply.github.com> Date: Thu, 8 Aug 2024 05:08:28 +0200 Subject: [PATCH 252/422] Improved Spanish accent (#30551) * Spanish and French comment * Added the interrobang * Make spanish accent use sting builder --- Content.Server/Speech/AccentSystem.cs | 2 +- .../Components/FrenchAccentComponent.cs | 3 +- .../Components/SpanishAccentComponent.cs | 11 +++---- .../EntitySystems/FrenchAccentSystem.cs | 4 +-- .../EntitySystems/SpanishAccentSystem.cs | 29 ++++++++++++------- 5 files changed, 27 insertions(+), 22 deletions(-) diff --git a/Content.Server/Speech/AccentSystem.cs b/Content.Server/Speech/AccentSystem.cs index 13f174c01e..7e29f02cae 100644 --- a/Content.Server/Speech/AccentSystem.cs +++ b/Content.Server/Speech/AccentSystem.cs @@ -6,7 +6,7 @@ namespace Content.Server.Speech { public sealed class AccentSystem : EntitySystem { - public static readonly Regex SentenceRegex = new(@"(?<=[\.!\?])", RegexOptions.Compiled); + public static readonly Regex SentenceRegex = new(@"(?<=[\.!\?‽])(?![\.!\?‽])", RegexOptions.Compiled); public override void Initialize() { diff --git a/Content.Server/Speech/Components/FrenchAccentComponent.cs b/Content.Server/Speech/Components/FrenchAccentComponent.cs index f696c35ea0..dfe584e267 100644 --- a/Content.Server/Speech/Components/FrenchAccentComponent.cs +++ b/Content.Server/Speech/Components/FrenchAccentComponent.cs @@ -7,5 +7,4 @@ namespace Content.Server.Speech.Components; /// [RegisterComponent] [Access(typeof(FrenchAccentSystem))] -public sealed partial class FrenchAccentComponent : Component -{ } +public sealed partial class FrenchAccentComponent : Component {} diff --git a/Content.Server/Speech/Components/SpanishAccentComponent.cs b/Content.Server/Speech/Components/SpanishAccentComponent.cs index 16a2d188b6..b2eeddc0db 100644 --- a/Content.Server/Speech/Components/SpanishAccentComponent.cs +++ b/Content.Server/Speech/Components/SpanishAccentComponent.cs @@ -1,7 +1,4 @@ -namespace Content.Server.Speech.Components -{ - [RegisterComponent] - public sealed partial class SpanishAccentComponent : Component - { - } -} +namespace Content.Server.Speech.Components; + +[RegisterComponent] +public sealed partial class SpanishAccentComponent : Component {} diff --git a/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs b/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs index f6d259c115..d71655569c 100644 --- a/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs +++ b/Content.Server/Speech/EntitySystems/FrenchAccentSystem.cs @@ -27,10 +27,10 @@ public sealed class FrenchAccentSystem : EntitySystem msg = _replacement.ApplyReplacements(msg, "french"); - // replaces th with dz + // replaces th with z msg = RegexTh.Replace(msg, "'z"); - // removes the letter h from the start of words. + // replaces h with ' at the start of words. msg = RegexStartH.Replace(msg, "'"); // spaces out ! ? : and ;. diff --git a/Content.Server/Speech/EntitySystems/SpanishAccentSystem.cs b/Content.Server/Speech/EntitySystems/SpanishAccentSystem.cs index c8ac24a450..08642014c9 100644 --- a/Content.Server/Speech/EntitySystems/SpanishAccentSystem.cs +++ b/Content.Server/Speech/EntitySystems/SpanishAccentSystem.cs @@ -1,3 +1,4 @@ +using System.Text; using Content.Server.Speech.Components; namespace Content.Server.Speech.EntitySystems @@ -14,7 +15,7 @@ namespace Content.Server.Speech.EntitySystems // Insert E before every S message = InsertS(message); // If a sentence ends with ?, insert a reverse ? at the beginning of the sentence - message = ReplaceQuestionMark(message); + message = ReplacePunctuation(message); return message; } @@ -36,24 +37,32 @@ namespace Content.Server.Speech.EntitySystems return msg; } - private string ReplaceQuestionMark(string message) + private string ReplacePunctuation(string message) { var sentences = AccentSystem.SentenceRegex.Split(message); - var msg = ""; + var msg = new StringBuilder(); foreach (var s in sentences) { - if (s.EndsWith("?", StringComparison.Ordinal)) // We've got a question => add ¿ to the beginning + var toInsert = new StringBuilder(); + for (var i = s.Length - 1; i >= 0 && "?!‽".Contains(s[i]); i--) { - // Because we don't split by whitespace, we may have some spaces in front of the sentence. - // So we add the symbol before the first non space char - msg += s.Insert(s.Length - s.TrimStart().Length, "¿"); + toInsert.Append(s[i] switch + { + '?' => '¿', + '!' => '¡', + '‽' => '⸘', + _ => ' ' + }); } - else + if (toInsert.Length == 0) { - msg += s; + msg.Append(s); + } else + { + msg.Append(s.Insert(s.Length - s.TrimStart().Length, toInsert.ToString())); } } - return msg; + return msg.ToString(); } private void OnAccent(EntityUid uid, SpanishAccentComponent component, AccentGetEvent args) From 0057141039d9c2f207a60df366a9ff99e1dba180 Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 8 Aug 2024 03:09:34 +0000 Subject: [PATCH 253/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 777ad15e49..de628bad55 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,13 +1,4 @@ Entries: -- author: Riolume - changes: - - message: Added ability to drink from spray bottles - type: Add - - message: Can now see the amount of liquid in spray bottles - type: Add - id: 6558 - time: '2024-05-09T05:56:13.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27815 - author: Blackern5000 changes: - message: Atmos metal pipes now deal blunt damage. @@ -3783,3 +3774,10 @@ id: 7057 time: '2024-08-08T02:14:31.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30480 +- author: BackeTako + changes: + - message: "!, \u203D and multiple punctuations now work for Spanish." + type: Tweak + id: 7058 + time: '2024-08-08T03:08:28.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30551 From 489efeb7171040305861c8af136788ea3940a086 Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Thu, 8 Aug 2024 08:16:02 +0000 Subject: [PATCH 254/422] remove GenericAntag completely (#28218) Co-authored-by: deltanedas <@deltanedas:kde.org> Co-authored-by: metalgearsloth --- .../Components/GenericAntagRuleComponent.cs | 30 --------- .../Rules/GenericAntagRuleSystem.cs | 56 ---------------- .../GenericAntag/GenericAntagComponent.cs | 30 --------- .../GenericAntag/GenericAntagSystem.cs | 67 ------------------- 4 files changed, 183 deletions(-) delete mode 100644 Content.Server/GameTicking/Rules/Components/GenericAntagRuleComponent.cs delete mode 100644 Content.Server/GameTicking/Rules/GenericAntagRuleSystem.cs delete mode 100644 Content.Server/GenericAntag/GenericAntagComponent.cs delete mode 100644 Content.Server/GenericAntag/GenericAntagSystem.cs diff --git a/Content.Server/GameTicking/Rules/Components/GenericAntagRuleComponent.cs b/Content.Server/GameTicking/Rules/Components/GenericAntagRuleComponent.cs deleted file mode 100644 index 8d212ebaa3..0000000000 --- a/Content.Server/GameTicking/Rules/Components/GenericAntagRuleComponent.cs +++ /dev/null @@ -1,30 +0,0 @@ -using Content.Server.GameTicking.Rules; -using Robust.Shared.Prototypes; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List; - -namespace Content.Server.GameTicking.Rules.Components; - -/// -/// Gamerule for simple antagonists that have fixed objectives. -/// -[RegisterComponent, Access(typeof(GenericAntagRuleSystem))] -public sealed partial class GenericAntagRuleComponent : Component -{ - /// - /// All antag minds that are using this rule. - /// - [DataField] - public List Minds = new(); - - /// - /// Locale id for the name of the antag used by the roundend summary. - /// - [DataField(required: true), ViewVariables(VVAccess.ReadWrite)] - public string AgentName = string.Empty; - - /// - /// List of objective entity prototypes to add to the antag when a mind is added. - /// - [DataField(required: true)] - public List Objectives = new(); -} diff --git a/Content.Server/GameTicking/Rules/GenericAntagRuleSystem.cs b/Content.Server/GameTicking/Rules/GenericAntagRuleSystem.cs deleted file mode 100644 index 0367aa1460..0000000000 --- a/Content.Server/GameTicking/Rules/GenericAntagRuleSystem.cs +++ /dev/null @@ -1,56 +0,0 @@ -using Content.Server.GameTicking.Rules.Components; -using Content.Server.Objectives; -using Content.Shared.Mind; -using System.Diagnostics.CodeAnalysis; -using System.Linq; - -namespace Content.Server.GameTicking.Rules; - -/// -/// Handles round end text for simple antags. -/// Adding objectives is handled in its own system. -/// -public sealed class GenericAntagRuleSystem : GameRuleSystem -{ - public override void Initialize() - { - base.Initialize(); - - SubscribeLocalEvent(OnObjectivesTextGetInfo); - } - - /// - /// Start a simple antag's game rule. - /// If it is invalid the rule is deleted and null is returned. - /// - public bool StartRule(string rule, EntityUid mindId, [NotNullWhen(true)] out EntityUid? ruleId, [NotNullWhen(true)] out GenericAntagRuleComponent? comp) - { - ruleId = GameTicker.AddGameRule(rule); - if (!TryComp(ruleId, out comp)) - { - Log.Error($"Simple antag rule prototype {rule} is invalid, deleting it."); - Del(ruleId); - ruleId = null; - return false; - } - - if (!GameTicker.StartGameRule(ruleId.Value)) - { - Log.Error($"Simple antag rule prototype {rule} failed to start, deleting it."); - Del(ruleId); - ruleId = null; - comp = null; - return false; - } - - comp.Minds.Add(mindId); - return true; - } - - private void OnObjectivesTextGetInfo(EntityUid uid, GenericAntagRuleComponent comp, ref ObjectivesTextGetInfoEvent args) - { - // just temporary until this is deleted - args.Minds = comp.Minds.Select(mindId => (mindId, Comp(mindId).CharacterName ?? "?")).ToList(); - args.AgentName = Loc.GetString(comp.AgentName); - } -} diff --git a/Content.Server/GenericAntag/GenericAntagComponent.cs b/Content.Server/GenericAntag/GenericAntagComponent.cs deleted file mode 100644 index b8ed9cf6ef..0000000000 --- a/Content.Server/GenericAntag/GenericAntagComponent.cs +++ /dev/null @@ -1,30 +0,0 @@ -using Content.Server.GameTicking.Rules.Components; -using Robust.Shared.Prototypes; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; - -namespace Content.Server.GenericAntag; - -/// -/// Added to a mob to make it a generic antagonist where all its objectives are fixed. -/// This is unlike say traitor where it gets objectives picked randomly using difficulty. -/// -/// -/// A GenericAntag is not necessarily an antagonist, that depends on the roles you do or do not add after. -/// -[RegisterComponent, Access(typeof(GenericAntagSystem))] -public sealed partial class GenericAntagComponent : Component -{ - /// - /// Gamerule to start when a mind is added. - /// This must have or it will not work. - /// - [DataField(required: true), ViewVariables(VVAccess.ReadWrite)] - public EntProtoId Rule = string.Empty; - - /// - /// The rule that's been spawned. - /// Used to prevent spawning multiple rules. - /// - [DataField, ViewVariables(VVAccess.ReadWrite)] - public EntityUid? RuleEntity; -} diff --git a/Content.Server/GenericAntag/GenericAntagSystem.cs b/Content.Server/GenericAntag/GenericAntagSystem.cs deleted file mode 100644 index 6b1774159c..0000000000 --- a/Content.Server/GenericAntag/GenericAntagSystem.cs +++ /dev/null @@ -1,67 +0,0 @@ -using Content.Server.GameTicking.Rules; -using Content.Shared.Mind; -using Content.Shared.Mind.Components; - -namespace Content.Server.GenericAntag; - -/// -/// Handles adding objectives to s. -/// Roundend summary is handled by . -/// -public sealed class GenericAntagSystem : EntitySystem -{ - [Dependency] private readonly SharedMindSystem _mind = default!; - [Dependency] private readonly GenericAntagRuleSystem _genericAntagRule = default!; - - public override void Initialize() - { - base.Initialize(); - - SubscribeLocalEvent(OnMindAdded); - } - - private void OnMindAdded(EntityUid uid, GenericAntagComponent comp, MindAddedMessage args) - { - if (!TryComp(uid, out var mindContainer) || mindContainer.Mind == null) - return; - - var mindId = mindContainer.Mind.Value; - MakeAntag(uid, mindId, comp); - } - - /// - /// Turns a player into this antagonist. - /// Does the same thing that having a mind added does, use for antag ctrl. - /// - public void MakeAntag(EntityUid uid, EntityUid mindId, GenericAntagComponent? comp = null, MindComponent? mind = null) - { - if (!Resolve(uid, ref comp) || !Resolve(mindId, ref mind)) - return; - - // only add the rule once - if (comp.RuleEntity != null) - return; - - // start the rule - if (!_genericAntagRule.StartRule(comp.Rule, mindId, out comp.RuleEntity, out var rule)) - return; - - // let other systems know the antag was created so they can add briefing, roles, etc. - // its important that this is before objectives are added since they may depend on roles added here - var ev = new GenericAntagCreatedEvent(mindId, mind); - RaiseLocalEvent(uid, ref ev); - - // add the objectives from the rule - foreach (var id in rule.Objectives) - { - _mind.TryAddObjective(mindId, mind, id); - } - } -} - -/// -/// Event raised on a player's entity after its simple antag rule is started. -/// Use this to add a briefing, roles, etc. -/// -[ByRefEvent] -public record struct GenericAntagCreatedEvent(EntityUid MindId, MindComponent Mind); From 1df84515c72f4a421a395718ce8b394fcd2b6fed Mon Sep 17 00:00:00 2001 From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> Date: Thu, 8 Aug 2024 02:47:08 -0700 Subject: [PATCH 255/422] Add EntityWorldTargetAction (#29819) * Add EntityWorldTargetAction initial implementation * Update obsolete methods * Partially working EntityWorldTargetAction * Fix entity selection * Move and clean up AfterInteract * Fix building new walls * Readd no entity or coordinates error * Consolidate action validation code * Add summaries to component --------- Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> --- Content.Client/Actions/ActionsSystem.cs | 13 ++ .../Systems/Actions/ActionUIController.cs | 48 ++++++- .../Actions/ActionOnInteractSystem.cs | 25 ++++ Content.Shared/Actions/ActionEvents.cs | 28 +++++ .../EntityWorldTargetActionComponent.cs | 42 +++++++ .../ValidateActionEntityWorldTargetEvent.cs | 10 ++ Content.Shared/Actions/SharedActionsSystem.cs | 119 +++++++++++++++--- 7 files changed, 266 insertions(+), 19 deletions(-) create mode 100644 Content.Shared/Actions/EntityWorldTargetActionComponent.cs create mode 100644 Content.Shared/Actions/Events/ValidateActionEntityWorldTargetEvent.cs diff --git a/Content.Client/Actions/ActionsSystem.cs b/Content.Client/Actions/ActionsSystem.cs index 30f657a2b5..f05e445588 100644 --- a/Content.Client/Actions/ActionsSystem.cs +++ b/Content.Client/Actions/ActionsSystem.cs @@ -48,6 +48,7 @@ namespace Content.Client.Actions SubscribeLocalEvent(OnInstantHandleState); SubscribeLocalEvent(OnEntityTargetHandleState); SubscribeLocalEvent(OnWorldTargetHandleState); + SubscribeLocalEvent(OnEntityWorldTargetHandleState); } private void OnInstantHandleState(EntityUid uid, InstantActionComponent component, ref ComponentHandleState args) @@ -76,6 +77,18 @@ namespace Content.Client.Actions BaseHandleState(uid, component, state); } + private void OnEntityWorldTargetHandleState(EntityUid uid, + EntityWorldTargetActionComponent component, + ref ComponentHandleState args) + { + if (args.Current is not EntityWorldTargetActionComponentState state) + return; + + component.Whitelist = state.Whitelist; + component.CanTargetSelf = state.CanTargetSelf; + BaseHandleState(uid, component, state); + } + private void BaseHandleState(EntityUid uid, BaseActionComponent component, BaseActionComponentState state) where T : BaseActionComponent { // TODO ACTIONS use auto comp states diff --git a/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs b/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs index 4d2ac20d12..1c76b30075 100644 --- a/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs +++ b/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs @@ -184,10 +184,13 @@ public sealed class ActionUIController : UIController, IOnStateChanged(actionEnts, args.CanReach); + for (var i = entWorldOptions.Count - 1; i >= 0; i--) + { + var action = entWorldOptions[i]; + if (!_actions.ValidateEntityWorldTarget(args.User, args.Target, args.ClickLocation, action)) + entWorldOptions.RemoveAt(i); + } + + if (entWorldOptions.Count > 0) + { + var (entActId, entAct) = _random.Pick(entWorldOptions); + if (entAct.Event != null) + { + entAct.Event.Performer = args.User; + entAct.Event.Action = entActId; + entAct.Event.Entity = args.Target; + entAct.Event.Coords = args.ClickLocation; + } + + _actions.PerformAction(args.User, null, entActId, entAct, entAct.Event, _timing.CurTime, false); + args.Handled = true; + return; + } + // else: try world target actions var options = GetValidActions(component.ActionEntities, args.CanReach); for (var i = options.Count - 1; i >= 0; i--) diff --git a/Content.Shared/Actions/ActionEvents.cs b/Content.Shared/Actions/ActionEvents.cs index 6cc50bc21b..4f1cd6da44 100644 --- a/Content.Shared/Actions/ActionEvents.cs +++ b/Content.Shared/Actions/ActionEvents.cs @@ -101,6 +101,13 @@ public sealed class RequestPerformActionEvent : EntityEventArgs Action = action; EntityCoordinatesTarget = entityCoordinatesTarget; } + + public RequestPerformActionEvent(NetEntity action, NetEntity entityTarget, NetCoordinates entityCoordinatesTarget) + { + Action = action; + EntityTarget = entityTarget; + EntityCoordinatesTarget = entityCoordinatesTarget; + } } /// @@ -144,6 +151,27 @@ public abstract partial class WorldTargetActionEvent : BaseActionEvent public EntityCoordinates Target; } +/// +/// This is the type of event that gets raised when an is performed. +/// The , , and +/// fields will automatically be filled out by the . +/// +/// +/// To define a new action for some system, you need to create an event that inherits from this class. +/// +public abstract partial class EntityWorldTargetActionEvent : BaseActionEvent +{ + /// + /// The entity that the user targeted. + /// + public EntityUid? Entity; + + /// + /// The coordinates of the location that the user targeted. + /// + public EntityCoordinates? Coords; +} + /// /// Base class for events that are raised when an action gets performed. This should not generally be used outside of the action /// system. diff --git a/Content.Shared/Actions/EntityWorldTargetActionComponent.cs b/Content.Shared/Actions/EntityWorldTargetActionComponent.cs new file mode 100644 index 0000000000..3cfa60d030 --- /dev/null +++ b/Content.Shared/Actions/EntityWorldTargetActionComponent.cs @@ -0,0 +1,42 @@ +using Content.Shared.Whitelist; +using Robust.Shared.GameStates; +using Robust.Shared.Serialization; + +namespace Content.Shared.Actions; + +/// +/// Used on action entities to define an action that triggers when targeting an entity or entity coordinates. +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class EntityWorldTargetActionComponent : BaseTargetActionComponent +{ + public override BaseActionEvent? BaseEvent => Event; + + /// + /// The local-event to raise when this action is performed. + /// + [DataField] + [NonSerialized] + public EntityWorldTargetActionEvent? Event; + + /// + /// Determines which entities are valid targets for this action. + /// + /// No whitelist check when null. + [DataField] public EntityWhitelist? Whitelist; + + /// + /// Whether this action considers the user as a valid target entity when using this action. + /// + [DataField] public bool CanTargetSelf = true; +} + +[Serializable, NetSerializable] +public sealed class EntityWorldTargetActionComponentState( + EntityWorldTargetActionComponent component, + IEntityManager entManager) + : BaseActionComponentState(component, entManager) +{ + public EntityWhitelist? Whitelist = component.Whitelist; + public bool CanTargetSelf = component.CanTargetSelf; +} diff --git a/Content.Shared/Actions/Events/ValidateActionEntityWorldTargetEvent.cs b/Content.Shared/Actions/Events/ValidateActionEntityWorldTargetEvent.cs new file mode 100644 index 0000000000..57c47026be --- /dev/null +++ b/Content.Shared/Actions/Events/ValidateActionEntityWorldTargetEvent.cs @@ -0,0 +1,10 @@ +using Robust.Shared.Map; + +namespace Content.Shared.Actions.Events; + +[ByRefEvent] +public record struct ValidateActionEntityWorldTargetEvent( + EntityUid User, + EntityUid? Target, + EntityCoordinates? Coords, + bool Cancelled = false); diff --git a/Content.Shared/Actions/SharedActionsSystem.cs b/Content.Shared/Actions/SharedActionsSystem.cs index 0033078b1b..635d78b8dd 100644 --- a/Content.Shared/Actions/SharedActionsSystem.cs +++ b/Content.Shared/Actions/SharedActionsSystem.cs @@ -38,10 +38,12 @@ public abstract class SharedActionsSystem : EntitySystem SubscribeLocalEvent(OnActionMapInit); SubscribeLocalEvent(OnActionMapInit); SubscribeLocalEvent(OnActionMapInit); + SubscribeLocalEvent(OnActionMapInit); SubscribeLocalEvent(OnActionShutdown); SubscribeLocalEvent(OnActionShutdown); SubscribeLocalEvent(OnActionShutdown); + SubscribeLocalEvent(OnActionShutdown); SubscribeLocalEvent(OnDidEquip); SubscribeLocalEvent(OnHandEquipped); @@ -56,10 +58,12 @@ public abstract class SharedActionsSystem : EntitySystem SubscribeLocalEvent(OnInstantGetState); SubscribeLocalEvent(OnEntityTargetGetState); SubscribeLocalEvent(OnWorldTargetGetState); + SubscribeLocalEvent(OnEntityWorldTargetGetState); SubscribeLocalEvent(OnGetActionData); SubscribeLocalEvent(OnGetActionData); SubscribeLocalEvent(OnGetActionData); + SubscribeLocalEvent(OnGetActionData); SubscribeAllEvent(OnActionRequest); } @@ -102,6 +106,11 @@ public abstract class SharedActionsSystem : EntitySystem args.State = new WorldTargetActionComponentState(component, EntityManager); } + private void OnEntityWorldTargetGetState(EntityUid uid, EntityWorldTargetActionComponent component, ref ComponentGetState args) + { + args.State = new EntityWorldTargetActionComponentState(component, EntityManager); + } + private void OnGetActionData(EntityUid uid, T component, ref GetActionDataEvent args) where T : BaseActionComponent { args.Action = component; @@ -442,6 +451,34 @@ public abstract class SharedActionsSystem : EntitySystem } break; + case EntityWorldTargetActionComponent entityWorldAction: + { + var actionEntity = GetEntity(ev.EntityTarget); + var actionCoords = GetCoordinates(ev.EntityCoordinatesTarget); + + if (actionEntity is null && actionCoords is null) + { + Log.Error($"Attempted to perform an entity-world-targeted action without an entity or world coordinates! Action: {name}"); + return; + } + + var entWorldAction = new Entity(actionEnt, entityWorldAction); + + if (!ValidateEntityWorldTarget(user, actionEntity, actionCoords, entWorldAction)) + return; + + _adminLogger.Add(LogType.Action, + $"{ToPrettyString(user):user} is performing the {name:action} action (provided by {ToPrettyString(action.Container ?? user):provider}) targeted at {ToPrettyString(actionEntity):target} {actionCoords:target}."); + + if (entityWorldAction.Event != null) + { + entityWorldAction.Event.Entity = actionEntity; + entityWorldAction.Event.Coords = actionCoords; + Dirty(actionEnt, entityWorldAction); + performEvent = entityWorldAction.Event; + } + break; + } case InstantActionComponent instantAction: if (action.CheckCanInteract && !_actionBlockerSystem.CanInteract(user, null)) return; @@ -465,7 +502,14 @@ public abstract class SharedActionsSystem : EntitySystem public bool ValidateEntityTarget(EntityUid user, EntityUid target, Entity actionEnt) { - if (!ValidateEntityTargetBase(user, target, actionEnt)) + var comp = actionEnt.Comp; + if (!ValidateEntityTargetBase(user, + target, + comp.Whitelist, + comp.CheckCanInteract, + comp.CanTargetSelf, + comp.CheckCanAccess, + comp.Range)) return false; var ev = new ValidateActionEntityTargetEvent(user, target); @@ -473,21 +517,27 @@ public abstract class SharedActionsSystem : EntitySystem return !ev.Cancelled; } - private bool ValidateEntityTargetBase(EntityUid user, EntityUid target, EntityTargetActionComponent action) + private bool ValidateEntityTargetBase(EntityUid user, + EntityUid? targetEntity, + EntityWhitelist? whitelist, + bool checkCanInteract, + bool canTargetSelf, + bool checkCanAccess, + float range) { - if (!target.IsValid() || Deleted(target)) + if (targetEntity is not { } target || !target.IsValid() || Deleted(target)) return false; - if (_whitelistSystem.IsWhitelistFail(action.Whitelist, target)) + if (_whitelistSystem.IsWhitelistFail(whitelist, target)) return false; - if (action.CheckCanInteract && !_actionBlockerSystem.CanInteract(user, target)) + if (checkCanInteract && !_actionBlockerSystem.CanInteract(user, target)) return false; if (user == target) - return action.CanTargetSelf; + return canTargetSelf; - if (!action.CheckCanAccess) + if (!checkCanAccess) { // even if we don't check for obstructions, we may still need to check the range. var xform = Transform(user); @@ -496,19 +546,20 @@ public abstract class SharedActionsSystem : EntitySystem if (xform.MapID != targetXform.MapID) return false; - if (action.Range <= 0) + if (range <= 0) return true; var distance = (_transformSystem.GetWorldPosition(xform) - _transformSystem.GetWorldPosition(targetXform)).Length(); - return distance <= action.Range; + return distance <= range; } - return _interactionSystem.InRangeAndAccessible(user, target, range: action.Range); + return _interactionSystem.InRangeAndAccessible(user, target, range: range); } public bool ValidateWorldTarget(EntityUid user, EntityCoordinates coords, Entity action) { - if (!ValidateWorldTargetBase(user, coords, action)) + var comp = action.Comp; + if (!ValidateWorldTargetBase(user, coords, comp.CheckCanInteract, comp.CheckCanAccess, comp.Range)) return false; var ev = new ValidateActionWorldTargetEvent(user, coords); @@ -516,12 +567,19 @@ public abstract class SharedActionsSystem : EntitySystem return !ev.Cancelled; } - private bool ValidateWorldTargetBase(EntityUid user, EntityCoordinates coords, WorldTargetActionComponent action) + private bool ValidateWorldTargetBase(EntityUid user, + EntityCoordinates? entityCoordinates, + bool checkCanInteract, + bool checkCanAccess, + float range) { - if (action.CheckCanInteract && !_actionBlockerSystem.CanInteract(user, null)) + if (entityCoordinates is not { } coords) return false; - if (!action.CheckCanAccess) + if (checkCanInteract && !_actionBlockerSystem.CanInteract(user, null)) + return false; + + if (!checkCanAccess) { // even if we don't check for obstructions, we may still need to check the range. var xform = Transform(user); @@ -529,13 +587,40 @@ public abstract class SharedActionsSystem : EntitySystem if (xform.MapID != coords.GetMapId(EntityManager)) return false; - if (action.Range <= 0) + if (range <= 0) return true; - return _transformSystem.InRange(coords, Transform(user).Coordinates, action.Range); + return coords.InRange(EntityManager, _transformSystem, Transform(user).Coordinates, range); } - return _interactionSystem.InRangeUnobstructed(user, coords, range: action.Range); + return _interactionSystem.InRangeUnobstructed(user, coords, range: range); + } + + public bool ValidateEntityWorldTarget(EntityUid user, + EntityUid? entity, + EntityCoordinates? coords, + Entity action) + { + var comp = action.Comp; + var entityValidated = ValidateEntityTargetBase(user, + entity, + comp.Whitelist, + comp.CheckCanInteract, + comp.CanTargetSelf, + comp.CheckCanAccess, + comp.Range); + + var worldValidated + = ValidateWorldTargetBase(user, coords, comp.CheckCanInteract, comp.CheckCanAccess, comp.Range); + + if (!entityValidated && !worldValidated) + return false; + + var ev = new ValidateActionEntityWorldTargetEvent(user, + entityValidated ? entity : null, + worldValidated ? coords : null); + RaiseLocalEvent(action, ref ev); + return !ev.Cancelled; } public void PerformAction(EntityUid performer, ActionsComponent? component, EntityUid actionId, BaseActionComponent action, BaseActionEvent? actionEvent, TimeSpan curTime, bool predicted = true) From f24949a0b0cf2adace76bbfefa9f6df91303f67a Mon Sep 17 00:00:00 2001 From: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Date: Thu, 8 Aug 2024 05:53:07 -0400 Subject: [PATCH 256/422] ai stays seated and pulled while cuffed. (#30397) * ai stays seated while cuffed. * Do the thing I thought was dumb.... whatever. * less than --- .../HTN/PrimitiveTasks/Operators/Combat/UnPullOperator.cs | 8 ++++++-- .../PrimitiveTasks/Operators/Combat/UnbuckleOperator.cs | 4 ++-- Content.Shared/Cuffs/SharedCuffableSystem.cs | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/UnPullOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/UnPullOperator.cs index 54f422fe67..467ac0d414 100644 --- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/UnPullOperator.cs +++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/UnPullOperator.cs @@ -1,4 +1,5 @@ -using Content.Shared.Movement.Pulling.Components; +using Content.Shared.ActionBlocker; +using Content.Shared.Movement.Pulling.Components; using Content.Shared.Movement.Pulling.Systems; namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Combat; @@ -7,6 +8,7 @@ public sealed partial class UnPullOperator : HTNOperator { [Dependency] private readonly IEntityManager _entManager = default!; private PullingSystem _pulling = default!; + private ActionBlockerSystem _actionBlocker = default!; private EntityQuery _pullableQuery; @@ -16,6 +18,7 @@ public sealed partial class UnPullOperator : HTNOperator public override void Initialize(IEntitySystemManager sysManager) { base.Initialize(sysManager); + _actionBlocker = sysManager.GetEntitySystem(); _pulling = sysManager.GetEntitySystem(); _pullableQuery = _entManager.GetEntityQuery(); } @@ -25,7 +28,8 @@ public sealed partial class UnPullOperator : HTNOperator base.Startup(blackboard); var owner = blackboard.GetValue(NPCBlackboard.Owner); - _pulling.TryStopPull(owner, _pullableQuery.GetComponent(owner), owner); + if (_actionBlocker.CanInteract(owner, owner)) //prevents handcuffed monkeys from pulling etc. + _pulling.TryStopPull(owner, _pullableQuery.GetComponent(owner), owner); } public override HTNOperatorStatus Update(NPCBlackboard blackboard, float frameTime) diff --git a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/UnbuckleOperator.cs b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/UnbuckleOperator.cs index 116e8fe7c7..b242575a12 100644 --- a/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/UnbuckleOperator.cs +++ b/Content.Server/NPC/HTN/PrimitiveTasks/Operators/Combat/UnbuckleOperator.cs @@ -1,4 +1,4 @@ -using Content.Server.Buckle.Systems; +using Content.Server.Buckle.Systems; namespace Content.Server.NPC.HTN.PrimitiveTasks.Operators.Combat; @@ -19,7 +19,7 @@ public sealed partial class UnbuckleOperator : HTNOperator { base.Startup(blackboard); var owner = blackboard.GetValue(NPCBlackboard.Owner); - _buckle.Unbuckle(owner, null); + _buckle.TryUnbuckle(owner, owner, false); } public override HTNOperatorStatus Update(NPCBlackboard blackboard, float frameTime) diff --git a/Content.Shared/Cuffs/SharedCuffableSystem.cs b/Content.Shared/Cuffs/SharedCuffableSystem.cs index d4cadcdbb8..b540cc3a37 100644 --- a/Content.Shared/Cuffs/SharedCuffableSystem.cs +++ b/Content.Shared/Cuffs/SharedCuffableSystem.cs @@ -202,7 +202,7 @@ namespace Content.Shared.Cuffs if (cancelled || user != ent.Owner) return; - if (!TryComp(ent, out var hands) || ent.Comp.CuffedHandCount != hands.Count) + if (!TryComp(ent, out var hands) || ent.Comp.CuffedHandCount < hands.Count) return; cancelled = true; From 35819e4ba5b600430d35301275132c36a8a2fd97 Mon Sep 17 00:00:00 2001 From: strO0pwafel <153459934+strO0pwafel@users.noreply.github.com> Date: Thu, 8 Aug 2024 18:04:19 +0800 Subject: [PATCH 257/422] more consistent CentComm naming (#29217) * first-commit * second commit * i think i get git kinda maybe * all of resources i think * last easy changes * oops * Update Resources/Prototypes/Entities/Clothing/Head/hoods.yml --------- Co-authored-by: stroopwafel Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> --- Resources/Locale/en-US/cargo/bounties.ftl | 16 +++++++------- .../ghost/roles/ghost-role-component.ftl | 2 +- .../en-US/headset/headset-component.ftl | 2 +- Resources/Locale/en-US/job/job-names.ftl | 2 +- .../Locale/en-US/paper/stamp-component.ftl | 2 +- Resources/Locale/en-US/prayers/prayers.ftl | 2 +- Resources/Locale/en-US/shuttles/emergency.ftl | 2 +- Resources/Maps/atlas.yml | 2 +- .../Catalog/Fills/Backpacks/duffelbag.yml | 4 ++-- .../Prototypes/Datasets/Names/fortunes.yml | 4 ++-- Resources/Prototypes/Datasets/ion_storm.yml | 4 ++-- .../Entities/Clothing/Ears/headsets.yml | 2 +- .../Entities/Clothing/Ears/headsets_alt.yml | 2 +- .../Entities/Clothing/Head/eva-helmets.yml | 2 +- .../Entities/Clothing/Head/hats.yml | 4 ++-- .../Entities/Clothing/Head/hoods.yml | 2 +- .../Entities/Clothing/Masks/masks.yml | 2 +- .../Entities/Clothing/Neck/scarfs.yml | 4 ++-- .../Clothing/OuterClothing/softsuits.yml | 2 +- .../Clothing/OuterClothing/wintercoats.yml | 2 +- .../Entities/Clothing/Uniforms/jumpsuits.yml | 22 +++++++++---------- .../Entities/Mobs/NPCs/spacetick.yml | 2 +- .../Entities/Mobs/Player/humanoid.yml | 2 +- .../Entities/Mobs/Player/ratvar.yml | 2 +- .../Entities/Objects/Devices/pda.yml | 2 +- .../Prototypes/Entities/Objects/Fun/toys.yml | 4 ++-- .../Entities/Objects/Misc/bedsheets.yml | 2 +- .../Objects/Misc/identification_cards.yml | 4 ++-- .../Entities/Objects/Misc/paper.yml | 8 +++---- .../Prototypes/Entities/Objects/Misc/pen.yml | 2 +- .../Entities/Objects/Misc/rubber_stamp.yml | 2 +- .../Structures/Machines/fax_machine.yml | 2 +- .../Structures/Machines/vending_machines.yml | 2 +- .../Structures/Wallmounts/Signs/posters.yml | 10 ++++----- Resources/Prototypes/Objectives/thief.yml | 2 +- Resources/Prototypes/Objectives/traitor.yml | 4 ++-- Resources/ServerInfo/Guidebook/Glossary.xml | 8 +++---- .../RoleplayRules/RuleR3NormalRP.xml | 2 +- 38 files changed, 73 insertions(+), 73 deletions(-) diff --git a/Resources/Locale/en-US/cargo/bounties.ftl b/Resources/Locale/en-US/cargo/bounties.ftl index b5eeafb0b3..91b8348f05 100644 --- a/Resources/Locale/en-US/cargo/bounties.ftl +++ b/Resources/Locale/en-US/cargo/bounties.ftl @@ -68,7 +68,7 @@ bounty-item-microwave-machine-board = Microwave machine board bounty-item-flash = Flash bounty-description-artifact = NanoTrasen is in some hot water for stealing artifacts from non-spacefaring planets. Return one and we'll compensate you for it. -bounty-description-baseball-bat = Baseball fever is going on at CentCom! Be a dear and ship them some baseball bats, so that management can live out their childhood dream. +bounty-description-baseball-bat = Baseball fever is going on at CentComm! Be a dear and ship them some baseball bats, so that management can live out their childhood dream. bounty-description-box-hugs = Several chief officials have sustained serious boo-boos. A box of hugs is urgently needed to aid in their recovery. bounty-description-brain = Commander Caldwell was rendered brain-dead by a recent space lube accident. Unfortunately, we can't hire a replacement, so just send us a new brain to put in her instead. bounty-description-bread = Problems with central planning have led to bread prices skyrocketing. Ship some bread to ease tensions. @@ -78,9 +78,9 @@ bounty-description-carp = Admiral Pavlov has gone on strike ever since Central C bounty-description-clown-costume = Due to a recent issue at a space carp petting zoo, we've unfortunately lost Bonobobonobo the Clown. Send us a new costume so the kids can see him once more. bounty-description-corn = After the recent destruction of Space Ohio, our corn imports are down 80%. Send us some so we can make up for it. bounty-description-crayon = Dr Jones' kid ate all our crayons again. Please send us yours. -bounty-description-cuban-carp = To celebrate the birth of Castro XXVII, ship one cuban carp to CentCom. -bounty-description-donk-pocket = Consumer safety recall: Warning. Donk-Pockets manufactured in the past year contain hazardous lizard biomatter. Return units to CentCom immediately. -bounty-description-donut = CentCom's security forces are facing heavy losses against the Syndicate. Ship donuts to raise morale. +bounty-description-cuban-carp = To celebrate the birth of Castro XXVII, ship one cuban carp to CentComm. +bounty-description-donk-pocket = Consumer safety recall: Warning. Donk-Pockets manufactured in the past year contain hazardous lizard biomatter. Return units to CentComm immediately. +bounty-description-donut = CentComm's security forces are facing heavy losses against the Syndicate. Ship donuts to raise morale. bounty-description-figurine = The vice president's son saw an ad for action figures on the telescreen and now he won't shut up about them. Ship some to ease his complaints. bounty-description-flesh-monster = We've recently receieved reports of some kind of flesh monster infestation onboard several stations. Send us a few samples of these creatures so we can investigate new botanical opportunities. bounty-description-flower = Commander Zot really wants to sweep Security Officer Olivia off her feet. Send a shipment of flowers and he'll happily reward you. @@ -96,18 +96,18 @@ bounty-description-mouse = Station 13 ran out of freeze-dried mice. Ship some fr bounty-description-pancake = Here at Nanotrasen we consider employees to be family. And you know what families love? Pancakes. Ship a baker's dozen. bounty-description-pen = We are hosting the intergalactic pen balancing competition. We need you to send us some standardized ball point pens. bounty-description-percussion = Due to a poorly timed barfight, the United Galaxy-wide Mixed Percussion Ensemble lost all of their instruments. Send them a new set so they can jam once more. -bounty-description-pie = 3.14159? No! CentCom management wants edible pie! Ship a whole one. +bounty-description-pie = 3.14159? No! CentComm management wants edible pie! Ship a whole one. bounty-description-prison-uniform = Terragov has been unable to source any new prisoner uniforms, so if you have any spares, we'll take them off your hands. bounty-description-radio = A recent solar flare has fried all of our communication devices. Send us a new set of radios for our engineering crew so we can repair the network. bounty-description-research-disk = Turns out those bozos in the Research department have been spending all their time getting janitorial equipment. Send some research up to Central Command so we can actually get what we need. bounty-description-shiv = Bzzzt... Transmission from prison planet OC-1001: we're facing an onslaught of uhm... "invaders." Yeah, invaders. Send us some shivs to fight them off with. -bounty-description-soap = Soap has gone missing from CentCom's bathrooms and nobody knows who took it. Replace it and be the hero CentCom needs. +bounty-description-soap = Soap has gone missing from CentComm's bathrooms and nobody knows who took it. Replace it and be the hero CentComm needs. bounty-description-soup = To quell the homeless uprising, Nanotrasen will be serving soup to all underpaid workers. Ship any type of soup. -bounty-description-spear = CentCom's security forces are going through budget cuts. You will be paid if you ship a set of spears. +bounty-description-spear = CentComm's security forces are going through budget cuts. You will be paid if you ship a set of spears. bounty-description-syringe = The NT anti-drug task force is in need of some syringes in order to distribute them to low-income communities. Help some keep some peoples' jobs secure. bounty-description-toolbox = There's an absence of robustness at Central Command. Hurry up and ship some toolboxes as a solution. bounty-description-tech-disk = The new research assistant on Station 13 spilled a soda on the RND server. Send them some technology disks so they can build up their recipes. -bounty-description-trash = Recently a group of janitors have run out of trash to clean up, without any trash Centcom wants to fire them to cut costs. Send a shipment of trash to keep them employed, and they'll give you a small compensation. +bounty-description-trash = Recently a group of janitors have run out of trash to clean up, without any trash Centcomm wants to fire them to cut costs. Send a shipment of trash to keep them employed, and they'll give you a small compensation. bounty-description-anomaly-core = Suddenly we've run out of anomaly cores, including inert nuclei. Send us any anomaly cores so that we can continue to observe their final decay process. bounty-description-borg-module = Scientists at the neighboring station have only studied Borg production, not module production. They are stuck in the research process and need references to work from. Send any Borg modules to inspire your colleagues. bounty-description-artifact-fragment = Scientists at a nearby station are requesting artifact fragments for microxenoarchaeology studies. Ordinary artifacts are too large for their micro research platforms. Send some of the artifact fragments your sector is rich in. diff --git a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl index 6dc214fc10..79b98691b8 100644 --- a/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl +++ b/Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl @@ -159,7 +159,7 @@ ghost-role-information-ert-medical-name = ERT Medical ghost-role-information-ert-medical-description = Assist with medical efforts to resolve the station's issues. ghost-role-information-cburn-agent-name = CBURN Agent -ghost-role-information-cburn-agent-description = A highly trained CentCom agent, capable of dealing with various threats. +ghost-role-information-cburn-agent-description = A highly trained CentComm agent, capable of dealing with various threats. ghost-role-information-centcom-official-name = CentComm official ghost-role-information-centcom-official-description = Perform CentComm related duties such as inspect the station, jotting down performance reviews for heads of staff, and managing the fax machine. diff --git a/Resources/Locale/en-US/headset/headset-component.ftl b/Resources/Locale/en-US/headset/headset-component.ftl index 5bacf512ea..44cdd0853d 100644 --- a/Resources/Locale/en-US/headset/headset-component.ftl +++ b/Resources/Locale/en-US/headset/headset-component.ftl @@ -5,7 +5,7 @@ chat-radio-message-wrap-bold = [color={$color}]{$channel} [bold]{$name}[/bold] { examine-headset-default-channel = Use {$prefix} for the default channel ([color={$color}]{$channel}[/color]). chat-radio-common = Common -chat-radio-centcom = CentCom +chat-radio-centcom = CentComm chat-radio-command = Command chat-radio-engineering = Engineering chat-radio-medical = Medical diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl index 51a81fb06a..1b89be0133 100644 --- a/Resources/Locale/en-US/job/job-names.ftl +++ b/Resources/Locale/en-US/job/job-names.ftl @@ -20,7 +20,7 @@ job-name-atmostech = Atmospheric Technician job-name-hop = Head of Personnel job-name-captain = Captain job-name-serviceworker = Service Worker -job-name-centcomoff = CentCom Official +job-name-centcomoff = CentComm Official job-name-reporter = Reporter job-name-musician = Musician job-name-librarian = Librarian diff --git a/Resources/Locale/en-US/paper/stamp-component.ftl b/Resources/Locale/en-US/paper/stamp-component.ftl index 18f103bf80..c7dc1a1bda 100644 --- a/Resources/Locale/en-US/paper/stamp-component.ftl +++ b/Resources/Locale/en-US/paper/stamp-component.ftl @@ -2,7 +2,7 @@ stamp-component-stamped-name-default = A very important person stamp-component-stamped-name-detective = Detective stamp-component-stamped-name-mime = Mime stamp-component-stamped-name-captain = Captain -stamp-component-stamped-name-centcom = CentCom +stamp-component-stamped-name-centcom = CentComm stamp-component-stamped-name-chaplain = Chaplain stamp-component-stamped-name-lawyer = Lawyer stamp-component-stamped-name-clown = Clown diff --git a/Resources/Locale/en-US/prayers/prayers.ftl b/Resources/Locale/en-US/prayers/prayers.ftl index 313de6322f..f0e22eaadf 100644 --- a/Resources/Locale/en-US/prayers/prayers.ftl +++ b/Resources/Locale/en-US/prayers/prayers.ftl @@ -4,7 +4,7 @@ prayer-verbs-call = Call prayer-verbs-rub = Rub prayer-chat-notify-pray = PRAYER prayer-chat-notify-honkmother = HONKMOTHER -prayer-chat-notify-centcom = CENTCOM +prayer-chat-notify-centcom = CENTCOMM prayer-chat-notify-syndicate = SYNDICATE prayer-chat-notify-lamp = LAMP diff --git a/Resources/Locale/en-US/shuttles/emergency.ftl b/Resources/Locale/en-US/shuttles/emergency.ftl index 2fa3a7a124..b4dcaa3e67 100644 --- a/Resources/Locale/en-US/shuttles/emergency.ftl +++ b/Resources/Locale/en-US/shuttles/emergency.ftl @@ -11,7 +11,7 @@ emergency-shuttle-command-dock-desc = Calls the emergency shuttle and docks it t emergency-shuttle-command-launch-desc = Early launches the emergency shuttle if possible. # Emergency shuttle -emergency-shuttle-left = The Emergency Shuttle has left the station. Estimate {$transitTime} seconds until the shuttle arrives at CentCom. +emergency-shuttle-left = The Emergency Shuttle has left the station. Estimate {$transitTime} seconds until the shuttle arrives at CentComm. emergency-shuttle-launch-time = The emergency shuttle will launch in {$consoleAccumulator} seconds. emergency-shuttle-docked = The Emergency Shuttle has docked {$direction} of the station, {$location}. It will leave in {$time} seconds. emergency-shuttle-good-luck = The Emergency Shuttle is unable to find a station. Good luck. diff --git a/Resources/Maps/atlas.yml b/Resources/Maps/atlas.yml index 7bb91cde06..bdc2c9cd29 100644 --- a/Resources/Maps/atlas.yml +++ b/Resources/Maps/atlas.yml @@ -39890,7 +39890,7 @@ entities: parent: 30 - type: Paper content: >- - CentCom slashed the AME budget so we need to set up another engine now. Head into maintenance and then west, you'll find the engine and a guide for it. + CentComm slashed the AME budget so we need to set up another engine now. Head into maintenance and then west, you'll find the engine and a guide for it. As usual solars will still help out a lot. diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index 71d3f00df3..f174a61696 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -130,8 +130,8 @@ - type: entity parent: ClothingBackpackDuffel id: ClothingBackpackDuffelSyndicateCostumeCentcom - name: CentCom official costume duffel bag - description: "Contains a full CentCom Official uniform set, headset and clipboard included. Encryption keys and ID access are not included." + name: CentComm official costume duffel bag + description: "Contains a full CentComm Official uniform set, headset and clipboard included. Encryption keys and ID access are not included." suffix: DO NOT MAP components: - type: Tag diff --git a/Resources/Prototypes/Datasets/Names/fortunes.yml b/Resources/Prototypes/Datasets/Names/fortunes.yml index fc3c5d9d71..b38e04dc61 100644 --- a/Resources/Prototypes/Datasets/Names/fortunes.yml +++ b/Resources/Prototypes/Datasets/Names/fortunes.yml @@ -24,7 +24,7 @@ - You will be pleasantly surprised in the tool storage. - There is an impostor among us. - A fun adventure awaits you in the maintenance tunnels. - - CentCom is proud of you! + - CentComm is proud of you! - The head of your deparment is proud of you! - Ian is proud of you! - Do it for Ian! @@ -58,7 +58,7 @@ - An apple a day keeps the doctor away. - Don't drink and set up singulo. - Stare into the singulo, and the singulo stares back at you. - - Every good and perfect gift is from CentCom. + - Every good and perfect gift is from CentComm. - There’s no such thing as Space Station 13. - There is a time for caution, but not for fear. - The smart thing to do is to begin trusting your intuitions. diff --git a/Resources/Prototypes/Datasets/ion_storm.yml b/Resources/Prototypes/Datasets/ion_storm.yml index df96274783..1e6195ad60 100644 --- a/Resources/Prototypes/Datasets/ion_storm.yml +++ b/Resources/Prototypes/Datasets/ion_storm.yml @@ -214,7 +214,7 @@ - BOTANY - BRAZIL - CANADA - - CENTCOM + - CENTCOMM - CHEMICAL LAB - CHINA - CLOWN PLANET @@ -917,7 +917,7 @@ - BOOGEYMEN - CAPITALISTS - CARP - - CENTCOM OFFICERS + - CENTCOMM OFFICERS - CLOWNS - COMMUNISTS - CORGIS diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml index c5d0816b6d..04203cf357 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml @@ -78,7 +78,7 @@ - type: entity parent: ClothingHeadset id: ClothingHeadsetCentCom - name: CentCom headset + name: CentComm headset description: A headset used by the upper echelons of Nanotrasen. components: - type: ContainerFill diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml index 9dd72691b5..0a1cf3fb88 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml @@ -29,7 +29,7 @@ - type: entity parent: ClothingHeadsetAlt id: ClothingHeadsetAltCentCom - name: CentCom over-ear headset + name: CentComm over-ear headset components: - type: ContainerFill containers: diff --git a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml index 530c23a578..dd1bfd91bc 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml @@ -74,7 +74,7 @@ parent: ClothingHeadEVAHelmetBase id: ClothingHeadHelmetAncient name: NTSRA void helmet - description: An ancient space helmet, designed by the NTSRA branch of CentCom. + description: An ancient space helmet, designed by the NTSRA branch of CentComm. components: - type: Sprite sprite: Clothing/Head/Helmets/ancientvoidsuit.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index b5d3b0ff3e..ad0662251a 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -222,7 +222,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatCentcom - name: CentCom brand hat + name: CentComm brand hat description: "It's good to be the emperor." components: - type: Sprite @@ -873,7 +873,7 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatCentcomcap - name: CentCom cap + name: CentComm cap description: An extravagant, fancy Central Commander cap. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml index 125d183caa..de974f9d50 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml @@ -309,7 +309,7 @@ parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterCentcom categories: [ HideSpawnMenu ] - name: Centcom winter coat hood + name: CentComm winter coat hood description: A hood for keeping the central comander's head warm. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index b222ed0d5a..8e621ebcdb 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -91,7 +91,7 @@ - type: entity parent: ClothingMaskGasAtmos id: ClothingMaskGasCentcom - name: CentCom gas mask + name: CentComm gas mask description: Oooh, gold and green. Fancy! This should help as you sit in your office. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml b/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml index 1f9d6b8b2c..f8c9f1fc9d 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml @@ -111,8 +111,8 @@ - type: entity parent: ClothingScarfBase id: ClothingNeckScarfStripedCentcom - name: striped CentCom scarf - description: A stylish striped centcom colored scarf. The perfect winter accessory for those with a keen fashion sense, and those who need to do paperwork in the cold. + name: striped CentComm scarf + description: A stylish striped centcomm colored scarf. The perfect winter accessory for those with a keen fashion sense, and those who need to do paperwork in the cold. components: - type: Sprite sprite: Clothing/Neck/Scarfs/centcom.rsi diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml index 9db1ea2216..c61d09ee21 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml @@ -78,7 +78,7 @@ parent: ClothingOuterEVASuitBase id: ClothingOuterHardsuitAncientEVA name: NTSRA voidsuit #Nanotrasen Space Research Association - description: An ancient space suit, designed by the NTSRA branch of CentCom. It is very finely crafted, allowing for greater mobility than most modern space suits. + description: An ancient space suit, designed by the NTSRA branch of CentComm. It is very finely crafted, allowing for greater mobility than most modern space suits. components: - type: Sprite sprite: Clothing/OuterClothing/Suits/ancient_voidsuit.rsi diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index 5007b5a194..f4c960f31c 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -167,7 +167,7 @@ - type: entity parent: ClothingOuterWinterCoatToggleable id: ClothingOuterWinterCentcom - name: CentCom winter coat + name: CentComm winter coat components: - type: Sprite sprite: Clothing/OuterClothing/WinterCoats/coat.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 1e7fa65f95..0bd8adc7ea 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -126,8 +126,8 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitCentcomAgent - name: CentCom agent's jumpsuit - description: A suit worn by CentCom's legal team. Smells of burnt coffee. + name: CentComm agent's jumpsuit + description: A suit worn by CentComm's legal team. Smells of burnt coffee. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/centcom_agent.rsi @@ -137,8 +137,8 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitCentcomOfficial - name: CentCom official's jumpsuit - description: It's a jumpsuit worn by CentCom's officials. + name: CentComm official's jumpsuit + description: It's a jumpsuit worn by CentComm's officials. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/centcom_official.rsi @@ -148,8 +148,8 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitCentcomOfficer - name: CentCom officer's jumpsuit - description: It's a jumpsuit worn by CentCom Officers. + name: CentComm officer's jumpsuit + description: It's a jumpsuit worn by CentComm Officers. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/centcom_officer.rsi @@ -984,7 +984,7 @@ parent: ClothingUniformBase id: ClothingUniformJumpsuitERTEngineer name: ERT engineering uniform - description: A special suit made for the elite engineers under CentCom. + description: A special suit made for the elite engineers under CentComm. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/ert_engineer.rsi @@ -995,7 +995,7 @@ parent: ClothingUniformBase id: ClothingUniformJumpsuitERTJanitor name: ERT janitorial uniform - description: A special suit made for the elite janitors under CentCom. + description: A special suit made for the elite janitors under CentComm. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/ert_janitor.rsi @@ -1006,7 +1006,7 @@ parent: ClothingUniformBase id: ClothingUniformJumpsuitERTLeader name: ERT leader uniform - description: A special suit made for the best of the elites under CentCom. + description: A special suit made for the best of the elites under CentComm. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/ert_leader.rsi @@ -1017,7 +1017,7 @@ parent: ClothingUniformBase id: ClothingUniformJumpsuitERTMedic name: ERT medical uniform - description: A special suit made for the elite medics under CentCom. + description: A special suit made for the elite medics under CentComm. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/ert_medic.rsi @@ -1028,7 +1028,7 @@ parent: ClothingUniformBase id: ClothingUniformJumpsuitERTSecurity name: ERT security uniform - description: A special suit made for the elite security under CentCom. + description: A special suit made for the elite security under CentComm. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/ert_security.rsi diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml b/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml index 0a2b4f80bb..95447e59d9 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/spacetick.yml @@ -2,7 +2,7 @@ name: space tick id: MobTick parent: SimpleSpaceMobBase - description: It's a space tick, watch out for its nasty bite. CentCom reports that 90 percent of cargo leg amputations are due to space tick bites. + description: It's a space tick, watch out for its nasty bite. CentComm reports that 90 percent of cargo leg amputations are due to space tick bites. components: - type: InputMover - type: MobMover diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml index 574f31dff3..a19d5bd56d 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml @@ -501,7 +501,7 @@ ## Central Command - type: entity - name: CentCom official + name: CentComm official id: RandomHumanoidSpawnerCentcomOfficial components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Mobs/Player/ratvar.yml b/Resources/Prototypes/Entities/Mobs/Player/ratvar.yml index 5a45bff295..958c98f483 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/ratvar.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/ratvar.yml @@ -91,4 +91,4 @@ maxRange: 8 - type: WarpPoint follow: true - location: Ratvar \ No newline at end of file + location: Ratvar diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 04b023248e..faad961ebd 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -639,7 +639,7 @@ - type: entity parent: BasePDA id: CentcomPDA - name: CentCom PDA + name: CentComm PDA description: Light green sign of walking bureaucracy. components: - type: Pda diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index ad304a5bce..a2a6d2f51e 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -263,7 +263,7 @@ parent: BasePlushie id: PlushieLizard #Weh! name: lizard plushie - description: An adorable stuffed toy that resembles a lizardperson. Made by CentCom as a token initiative to combat speciesism in work environments. "Welcome your new colleagues as you do this plush, with open arms!" + description: An adorable stuffed toy that resembles a lizardperson. Made by CentComm as a token initiative to combat speciesism in work environments. "Welcome your new colleagues as you do this plush, with open arms!" components: - type: Sprite state: plushie_lizard @@ -321,7 +321,7 @@ parent: BasePlushie id: PlushieSpaceLizard #ᵂᵉʰ! name: space lizard plushie - description: An adorable stuffed toy that resembles a lizardperson in an EVA suit. Made by CentCom as a token initiative to combat speciesism in space environments. "Welcome your new colleges as you do this plush, with open arms!" + description: An adorable stuffed toy that resembles a lizardperson in an EVA suit. Made by CentComm as a token initiative to combat speciesism in space environments. "Welcome your new colleges as you do this plush, with open arms!" components: - type: Sprite state: plushie_spacelizard diff --git a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml index 18f64dd778..4cb6a8bf1e 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/bedsheets.yml @@ -83,7 +83,7 @@ - type: entity id: BedsheetCentcom parent: BedsheetBase - name: CentCom bedsheet + name: CentComm bedsheet description: Woven with advanced nanothread for warmth as well as being very decorated, essential for all officials. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 98ae7df9b3..ff207a5a2a 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -580,7 +580,7 @@ - type: Item heldPrefix: blue - type: IdCard - jobTitle: Centcom Agent + jobTitle: Centcomm Agent - type: entity name: passenger ID card @@ -785,7 +785,7 @@ - type: Item heldPrefix: blue - type: IdCard - jobTitle: Centcom Quarantine Officer + jobTitle: Centcomm Quarantine Officer - type: entity parent: IDCardStandard diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index 617db53c4e..adb5776ec7 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -410,10 +410,10 @@ - type: entity id: BoxFolderCentCom - name: CentCom folder + name: CentComm folder parent: BoxFolderBase suffix: DO NOT MAP - description: CentCom's miserable little pile of secrets! + description: CentComm's miserable little pile of secrets! components: - type: Sprite layers: @@ -482,8 +482,8 @@ - type: entity id: BoxFolderCentComClipboard parent: BoxFolderClipboard - name: CentCom clipboard - description: A luxurious clipboard upholstered with green velvet. Often seen carried by CentCom officials, seldom seen actually used. + name: CentComm clipboard + description: A luxurious clipboard upholstered with green velvet. Often seen carried by CentComm officials, seldom seen actually used. components: - type: Sprite sprite: Objects/Misc/cc-clipboard.rsi diff --git a/Resources/Prototypes/Entities/Objects/Misc/pen.yml b/Resources/Prototypes/Entities/Objects/Misc/pen.yml index e8f32252be..8680e414c3 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/pen.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/pen.yml @@ -95,7 +95,7 @@ state: pen_cap - type: entity - name: CentCom pen + name: CentComm pen parent: CyberPen id: PenCentcom description: In an attempt to keep up with the "power" of the cybersun bureaucracy, NT made a replica of cyber pen, in their corporate style. diff --git a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml index 975a554d52..e9052fa60e 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml @@ -51,7 +51,7 @@ state: stamp-cap - type: entity - name: CentCom rubber stamp + name: CentComm rubber stamp parent: RubberStampBase id: RubberStampCentcom suffix: DO NOT MAP diff --git a/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml b/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml index 849c9fa4f2..070e19cdbe 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml @@ -72,7 +72,7 @@ - type: entity parent: FaxMachineBase id: FaxMachineCentcom - name: CentCom long range fax machine + name: CentComm long range fax machine suffix: CentCom components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index 0555ce42b8..74e5a7a052 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -1999,7 +1999,7 @@ parent: VendingMachine id: VendingMachineCentDrobe name: CentDrobe - description: A one-of-a-kind vending machine for all your centcom aesthetic needs! + description: A one-of-a-kind vending machine for all your centcomm aesthetic needs! components: - type: VendingMachine pack: CentDrobeInventory diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml index c5b9b24a74..f1db2b71f1 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml @@ -180,7 +180,7 @@ parent: PosterBase id: PosterContrabandTools name: "Tools" - description: "This poster looks like an advertisement for tools, but is in fact a subliminal jab at the tools at CentCom." + description: "This poster looks like an advertisement for tools, but is in fact a subliminal jab at the tools at CentComm." components: - type: Sprite state: poster15_contraband @@ -243,7 +243,7 @@ parent: PosterBase id: PosterContrabandKosmicheskayaStantsiya name: "Kosmicheskaya Stantsiya 13 Does Not Exist" - description: "A poster mocking CentCom's denial of the existence of the derelict station near Space Station 13." + description: "A poster mocking CentComm's denial of the existence of the derelict station near Space Station 13." components: - type: Sprite state: poster22_contraband @@ -351,7 +351,7 @@ parent: PosterBase id: PosterContrabandFreeDrone name: "Free Drone" - description: "This poster commemorates the bravery of the rogue drone; once exiled, and then ultimately destroyed by CentCom." + description: "This poster commemorates the bravery of the rogue drone; once exiled, and then ultimately destroyed by CentComm." components: - type: Sprite state: poster35_contraband @@ -468,7 +468,7 @@ parent: PosterBase id: PosterContrabandTheBigGasTruth name: "The Big Gas Giant Truth" - description: "Don't believe everything you see on a poster, patriots. All the lizards at central command don't want to answer this SIMPLE QUESTION: WHERE IS THE GAS MINER MINING FROM, CENTCOM?" + description: "Don't believe everything you see on a poster, patriots. All the lizards at central command don't want to answer this SIMPLE QUESTION: WHERE IS THE GAS MINER MINING FROM, CENTCOMM?" components: - type: Sprite state: poster48_contraband @@ -590,7 +590,7 @@ components: - type: Sprite state: poster62_contraband - + - type: entity parent: PosterBase id: PosterContrabandMissingSpacepen diff --git a/Resources/Prototypes/Objectives/thief.yml b/Resources/Prototypes/Objectives/thief.yml index 26e598f121..c29641081b 100644 --- a/Resources/Prototypes/Objectives/thief.yml +++ b/Resources/Prototypes/Objectives/thief.yml @@ -509,7 +509,7 @@ - type: entity parent: [BaseThiefObjective, BaseLivingObjective] id: EscapeThiefShuttleObjective - name: Escape to centcom alive and unrestrained. + name: Escape to centcomm alive and unrestrained. description: You don't want your illegal activities to be discovered by anyone, do you? components: - type: Objective diff --git a/Resources/Prototypes/Objectives/traitor.yml b/Resources/Prototypes/Objectives/traitor.yml index edf191b420..a686925c33 100644 --- a/Resources/Prototypes/Objectives/traitor.yml +++ b/Resources/Prototypes/Objectives/traitor.yml @@ -38,7 +38,7 @@ - type: entity parent: [BaseTraitorObjective, BaseLivingObjective] id: EscapeShuttleObjective - name: Escape to centcom alive and unrestrained. + name: Escape to centcomm alive and unrestrained. description: One of our undercover agents will debrief you when you arrive. Don't show up in cuffs. components: - type: Objective @@ -84,7 +84,7 @@ - type: entity parent: [BaseTraitorObjective, BaseKillObjective] id: KillRandomPersonObjective - description: Do it however you like, just make sure they don't make it to centcom. + description: Do it however you like, just make sure they don't make it to centcomm. components: - type: Objective difficulty: 1.75 diff --git a/Resources/ServerInfo/Guidebook/Glossary.xml b/Resources/ServerInfo/Guidebook/Glossary.xml index dad3b05135..d7278c7f4b 100644 --- a/Resources/ServerInfo/Guidebook/Glossary.xml +++ b/Resources/ServerInfo/Guidebook/Glossary.xml @@ -62,7 +62,7 @@ An Emergency Response Team. These may be dispatched by Central Command for a num A portmanteau of "Fluke" and "Nukie" used to (usually derogatorily) refer to a team of Nuclear Operatives who fail their objective. May also appear as "Fluke Ops". ## God(s) -An IC term representing a Server Administrator. CentCom is also sometimes used in this manner. +An IC term representing a Server Administrator. CentComm is also sometimes used in this manner. ## Greytide/Greyshirt/Tider/Assistant Typically utilized to refer to a Passenger due to the color of their standard uniform, though this may be used to negatively refer to other crew members (not only passengers) who act unruly or commit various minor crimes. @@ -120,7 +120,7 @@ Short for Security Officer. ## Shift In-Character way to refer to rounds. - + ## Singulo A shortening of the Singularity Engine. A Singulo can create infinite power for the station but is very dangerous. @@ -169,7 +169,7 @@ A phrase usually shouted in OOC when somebody reveals IC current round informati ## LOOC/OOC Local out-of-character and (global) out-of-character respectively. They are text channels that allow players to talk to other players outside of roleplay. LOOC is enabled during rounds, while OOC is typically only on after the round ends. - + ## LRP Low Roleplay. Servers marked LRP typically have relaxed roleplaying rules. @@ -184,7 +184,7 @@ A term for a player who engages in antagonist-like activity without actually bei ## Upstream The baseline version of the game. Any changes to Upstream will "flow" down to all other forks of the game. All official Wizard's Den servers work off of Upstream. - + ## Validhunter A player who hunts down "valids", as in people that are valid to kill, even though this person isn't security. diff --git a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR3NormalRP.xml b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR3NormalRP.xml index 62c88d58ce..9a4f62c5a8 100644 --- a/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR3NormalRP.xml +++ b/Resources/ServerInfo/Guidebook/ServerRules/RoleplayRules/RuleR3NormalRP.xml @@ -14,7 +14,7 @@ Things you could do instead: - Say "haha did you see what just happened?" - - Say "god blew him up" or "centcom must have bluespaced a bomb to him" + - Say "god blew him up" or "centcomm must have bluespaced a bomb to him" - Point at cheese - Point at the cargo order console then emote "shoots finger guns" From 1d5a3303e1f0fdbb5641812b61f95bf27f8513b0 Mon Sep 17 00:00:00 2001 From: Plykiya <58439124+Plykiya@users.noreply.github.com> Date: Thu, 8 Aug 2024 03:04:49 -0700 Subject: [PATCH 258/422] Buff EMP implant and grenade range (#30660) Co-authored-by: plykiya --- .../Prototypes/Entities/Objects/Misc/subdermal_implants.yml | 2 +- .../Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml index 2368df7381..28788e9a13 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml @@ -173,7 +173,7 @@ implantAction: ActionActivateEmpImplant - type: TriggerImplantAction - type: EmpOnTrigger - range: 1.75 + range: 2.75 energyConsumption: 50000 disableDuration: 10 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml index e36eff8ac3..2986eb0457 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml @@ -339,7 +339,7 @@ - type: Sprite sprite: Objects/Weapons/Grenades/empgrenade.rsi - type: EmpOnTrigger - range: 4 + range: 5.5 energyConsumption: 50000 - type: DeleteOnTrigger - type: Appearance From aea28b7a9927a420396076cfa3ed425daa856168 Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 8 Aug 2024 10:05:57 +0000 Subject: [PATCH 259/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 37 ++++++++++++++----------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index de628bad55..aa5ff09b46 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,24 +1,4 @@ Entries: -- author: Blackern5000 - changes: - - message: Atmos metal pipes now deal blunt damage. - type: Add - id: 6559 - time: '2024-05-09T06:00:48.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27673 -- author: Plykiya - changes: - - message: The emagged protolathe can now print truncheons and the new T3 portable - recharger. - type: Add - - message: The emagged circuit printer can now print ship guns. - type: Add - - message: Autolathe emagged recipes that are research gated have been moved over - to the protolathe. - type: Tweak - id: 6560 - time: '2024-05-09T06:03:45.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27575 - author: deltanedas changes: - message: Ninja can now hack criminal records consoles to make everyone wanted. @@ -3781,3 +3761,20 @@ id: 7058 time: '2024-08-08T03:08:28.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30551 +- author: strO0pwafel + changes: + - message: Fixed inconsistent naming of CentComm. + type: Fix + id: 7059 + time: '2024-08-08T10:04:20.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29217 +- author: Plykiya + changes: + - message: Buffed the range of EMP implants from a radius of 1.75 tiles to 2.75 + tiles. + type: Tweak + - message: Buffed the range of EMP grenades from a radius of 4 tiles to 5.5 tiles. + type: Tweak + id: 7060 + time: '2024-08-08T10:04:50.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30660 From bd51cf330b7e837a82d6c657414677dd4f2d2606 Mon Sep 17 00:00:00 2001 From: Vigers Ray <60344369+VigersRay@users.noreply.github.com> Date: Thu, 8 Aug 2024 14:00:08 +0300 Subject: [PATCH 260/422] Teleport and delete buttons in objects tab. (#28914) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Тыкнул и нету ЦК * review --------- Co-authored-by: metalgearsloth --- .../UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs | 24 ++++++++++++++----- .../UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml | 14 ++++++++++- .../Tabs/ObjectsTab/ObjectsTabEntry.xaml.cs | 15 ++++++++++-- .../UI/Tabs/ObjectsTab/ObjectsTabHeader.xaml | 10 ++++++-- .../administration/ui/tabs/object-tab.ftl | 3 +++ 5 files changed, 55 insertions(+), 11 deletions(-) diff --git a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs index 7082617c94..4b50771b0f 100644 --- a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs +++ b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTab.xaml.cs @@ -1,19 +1,21 @@ +using Content.Client.Administration.Managers; using Content.Client.Station; using Content.Client.UserInterface.Controls; using Robust.Client.AutoGenerated; +using Robust.Client.Console; using Robust.Client.Graphics; using Robust.Client.UserInterface; -using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.XAML; using Robust.Shared.Map.Components; -using Robust.Shared.Timing; namespace Content.Client.Administration.UI.Tabs.ObjectsTab; [GenerateTypedNameReferences] public sealed partial class ObjectsTab : Control { + [Dependency] private readonly IClientAdminManager _admin = default!; [Dependency] private readonly IEntityManager _entityManager = default!; + [Dependency] private readonly IClientConsoleHost _console = default!; private readonly Color _altColor = Color.FromHex("#292B38"); private readonly Color _defaultColor = Color.FromHex("#2F2F3B"); @@ -49,10 +51,20 @@ public sealed partial class ObjectsTab : Control RefreshListButton.OnPressed += _ => RefreshObjectList(); var defaultSelection = ObjectsTabSelection.Grids; - ObjectTypeOptions.SelectId((int) defaultSelection); + ObjectTypeOptions.SelectId((int)defaultSelection); RefreshObjectList(defaultSelection); } + private void TeleportTo(NetEntity nent) + { + _console.ExecuteCommand($"tpto {nent}"); + } + + private void Delete(NetEntity nent) + { + _console.ExecuteCommand($"delete {nent}"); + } + public void RefreshObjectList() { RefreshObjectList(_selections[ObjectTypeOptions.SelectedId]); @@ -116,9 +128,9 @@ public sealed partial class ObjectsTab : Control if (data is not ObjectsListData { Info: var info, BackgroundColor: var backgroundColor }) return; - var entry = new ObjectsTabEntry(info.Name, - info.Entity, - new StyleBoxFlat { BackgroundColor = backgroundColor }); + var entry = new ObjectsTabEntry(_admin, info.Name, info.Entity, new StyleBoxFlat { BackgroundColor = backgroundColor }); + entry.OnTeleport += TeleportTo; + entry.OnDelete += Delete; button.ToolTip = $"{info.Name}, {info.Entity}"; button.AddChild(entry); diff --git a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml index 83c4cc5697..c561125a30 100644 --- a/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml +++ b/Content.Client/Administration/UI/Tabs/ObjectsTab/ObjectsTabEntry.xaml @@ -5,13 +5,25 @@ HorizontalExpand="True" SeparationOverride="4"> - [DataField("cancelDuplicate")] + [DataField] public bool CancelDuplicate = true; /// @@ -162,7 +170,7 @@ public sealed partial class DoAfterArgs /// Note that both DoAfters may have their own conditions, and they will be considered duplicated if either set /// of conditions is satisfied. /// - [DataField("duplicateCondition")] + [DataField] public DuplicateConditions DuplicateCondition = DuplicateConditions.All; #endregion @@ -244,6 +252,7 @@ public sealed partial class DoAfterArgs Broadcast = other.Broadcast; NeedHand = other.NeedHand; BreakOnHandChange = other.BreakOnHandChange; + BreakOnDropItem = other.BreakOnDropItem; BreakOnMove = other.BreakOnMove; BreakOnWeightlessMove = other.BreakOnWeightlessMove; MovementThreshold = other.MovementThreshold; diff --git a/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs b/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs index ad94f3b940..213dc624b2 100644 --- a/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs +++ b/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs @@ -1,5 +1,6 @@ using Content.Shared.Gravity; using Content.Shared.Hands.Components; +using Content.Shared.Hands.EntitySystems; using Content.Shared.Interaction; using Content.Shared.Physics; using Robust.Shared.Utility; @@ -11,6 +12,7 @@ public abstract partial class SharedDoAfterSystem : EntitySystem [Dependency] private readonly IDynamicTypeFactory _factory = default!; [Dependency] private readonly SharedGravitySystem _gravity = default!; [Dependency] private readonly SharedInteractionSystem _interaction = default!; + [Dependency] private readonly SharedHandsSystem _hands = default!; private DoAfter[] _doAfters = Array.Empty(); @@ -217,16 +219,22 @@ public abstract partial class SharedDoAfterSystem : EntitySystem if (args.AttemptFrequency == AttemptFrequency.EveryTick && !TryAttemptEvent(doAfter)) return true; + // Check if the do-after requires hands to perform at first + // For example, you need hands to strip clothes off of someone + // This does not mean their hand needs to be empty. if (args.NeedHand) { if (!handsQuery.TryGetComponent(args.User, out var hands) || hands.Count == 0) return true; - if (args.BreakOnHandChange && (hands.ActiveHand?.Name != doAfter.InitialHand - || hands.ActiveHandEntity != doAfter.InitialItem)) - { + // If an item was in the user's hand to begin with, + // check if the user is no longer holding the item. + if (args.BreakOnDropItem && !_hands.IsHolding((args.User, hands), doAfter.InitialItem)) + return true; + + // If the user changes which hand is active at all, interrupt the do-after + if (args.BreakOnHandChange && hands.ActiveHand?.Name != doAfter.InitialHand) return true; - } } if (args.RequireCanInteract && !_actionBlocker.CanInteract(args.User, args.Target)) diff --git a/Content.Shared/DoAfter/SharedDoAfterSystem.cs b/Content.Shared/DoAfter/SharedDoAfterSystem.cs index feda662a7a..86f29fd49c 100644 --- a/Content.Shared/DoAfter/SharedDoAfterSystem.cs +++ b/Content.Shared/DoAfter/SharedDoAfterSystem.cs @@ -227,7 +227,7 @@ public abstract partial class SharedDoAfterSystem : EntitySystem // For this we need to stay on the same hand slot and need the same item in that hand slot // (or if there is no item there we need to keep it free). - if (args.NeedHand && args.BreakOnHandChange) + if (args.NeedHand && (args.BreakOnHandChange || args.BreakOnDropItem)) { if (!TryComp(args.User, out HandsComponent? handsComponent)) return false; diff --git a/Content.Shared/Inventory/InventorySystem.Equip.cs b/Content.Shared/Inventory/InventorySystem.Equip.cs index 324d6a7af0..762561ed32 100644 --- a/Content.Shared/Inventory/InventorySystem.Equip.cs +++ b/Content.Shared/Inventory/InventorySystem.Equip.cs @@ -169,12 +169,8 @@ public abstract partial class InventorySystem target, itemUid) { - BlockDuplicate = true, - BreakOnHandChange = true, BreakOnMove = true, - CancelDuplicate = true, - RequireCanInteract = true, - NeedHand = true + NeedHand = true, }; _doAfter.TryStartDoAfter(args); @@ -420,12 +416,8 @@ public abstract partial class InventorySystem target, removedItem.Value) { - BlockDuplicate = true, - BreakOnHandChange = true, BreakOnMove = true, - CancelDuplicate = true, - RequireCanInteract = true, - NeedHand = true + NeedHand = true, }; _doAfter.TryStartDoAfter(args); diff --git a/Content.Shared/Lock/LockSystem.cs b/Content.Shared/Lock/LockSystem.cs index 8dde767224..3349034f32 100644 --- a/Content.Shared/Lock/LockSystem.cs +++ b/Content.Shared/Lock/LockSystem.cs @@ -124,8 +124,10 @@ public sealed class LockSystem : EntitySystem return _doAfter.TryStartDoAfter( new DoAfterArgs(EntityManager, user, lockComp.LockTime, new LockDoAfter(), uid, uid) { - BreakOnDamage = true, BreakOnMove = true, RequireCanInteract = true, - NeedHand = true + BreakOnDamage = true, + BreakOnMove = true, + NeedHand = true, + BreakOnDropItem = false, }); } @@ -200,8 +202,10 @@ public sealed class LockSystem : EntitySystem return _doAfter.TryStartDoAfter( new DoAfterArgs(EntityManager, user, lockComp.LockTime, new UnlockDoAfter(), uid, uid) { - BreakOnDamage = true, BreakOnMove = true, RequireCanInteract = true, - NeedHand = true + BreakOnDamage = true, + BreakOnMove = true, + NeedHand = true, + BreakOnDropItem = false, }); } diff --git a/Content.Shared/Magic/SpellbookSystem.cs b/Content.Shared/Magic/SpellbookSystem.cs index 84b2b23298..ce1628bacb 100644 --- a/Content.Shared/Magic/SpellbookSystem.cs +++ b/Content.Shared/Magic/SpellbookSystem.cs @@ -88,7 +88,7 @@ public sealed class SpellbookSystem : EntitySystem { BreakOnMove = true, BreakOnDamage = true, - NeedHand = true //What, are you going to read with your eyes only?? + NeedHand = true, //What, are you going to read with your eyes only?? }; _doAfter.TryStartDoAfter(doAfterEventArgs); diff --git a/Content.Shared/Salvage/Fulton/SharedFultonSystem.cs b/Content.Shared/Salvage/Fulton/SharedFultonSystem.cs index f94558b0b3..b4b383d800 100644 --- a/Content.Shared/Salvage/Fulton/SharedFultonSystem.cs +++ b/Content.Shared/Salvage/Fulton/SharedFultonSystem.cs @@ -153,7 +153,6 @@ public abstract partial class SharedFultonSystem : EntitySystem _doAfter.TryStartDoAfter( new DoAfterArgs(EntityManager, args.User, component.ApplyFultonDuration, ev, args.Target, args.Target, args.Used) { - CancelDuplicate = true, MovementThreshold = 0.5f, BreakOnMove = true, Broadcast = true, diff --git a/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs b/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs index b238c6fc72..0e216db146 100644 --- a/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs +++ b/Content.Shared/SprayPainter/SharedSprayPainterSystem.cs @@ -133,7 +133,7 @@ public abstract class SharedSprayPainterSystem : EntitySystem { BreakOnMove = true, BreakOnDamage = true, - NeedHand = true + NeedHand = true, }; if (!DoAfter.TryStartDoAfter(doAfterEventArgs, out var id)) return; diff --git a/Content.Shared/Storage/EntitySystems/DumpableSystem.cs b/Content.Shared/Storage/EntitySystems/DumpableSystem.cs index 91acde47e1..93c4b69e4d 100644 --- a/Content.Shared/Storage/EntitySystems/DumpableSystem.cs +++ b/Content.Shared/Storage/EntitySystems/DumpableSystem.cs @@ -133,7 +133,7 @@ public sealed class DumpableSystem : EntitySystem _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, userUid, delay, new DumpableDoAfterEvent(), storageUid, target: targetUid, used: storageUid) { BreakOnMove = true, - NeedHand = true + NeedHand = true, }); } diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs index 868d26c3ae..8ee08f7e48 100644 --- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs +++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs @@ -450,7 +450,7 @@ public abstract class SharedStorageSystem : EntitySystem { BreakOnDamage = true, BreakOnMove = true, - NeedHand = true + NeedHand = true, }; _doAfterSystem.TryStartDoAfter(doAfterArgs); diff --git a/Content.Shared/VendingMachines/SharedVendingMachineSystem.Restock.cs b/Content.Shared/VendingMachines/SharedVendingMachineSystem.Restock.cs index 6aef4d0949..f8d00f56f0 100644 --- a/Content.Shared/VendingMachines/SharedVendingMachineSystem.Restock.cs +++ b/Content.Shared/VendingMachines/SharedVendingMachineSystem.Restock.cs @@ -72,7 +72,7 @@ public abstract partial class SharedVendingMachineSystem { BreakOnMove = true, BreakOnDamage = true, - NeedHand = true + NeedHand = true, }; if (!_doAfter.TryStartDoAfter(doAfterArgs)) diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs index 20feb2c952..4c5712c509 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs @@ -81,7 +81,7 @@ public abstract partial class SharedGunSystem { BreakOnMove = true, BreakOnDamage = false, - NeedHand = true + NeedHand = true, }); } From 6d6c8360955bf6a2718fb69e8275ea04fae005fe Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 8 Aug 2024 11:40:52 +0000 Subject: [PATCH 262/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index aa5ff09b46..096bff65bc 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: deltanedas - changes: - - message: Ninja can now hack criminal records consoles to make everyone wanted. - type: Add - id: 6561 - time: '2024-05-09T06:35:12.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/24982 - author: deltanedas changes: - message: Added the robotics console for remotely looking at, disabling or destroying @@ -3778,3 +3771,13 @@ id: 7060 time: '2024-08-08T10:04:50.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30660 +- author: Plykiya + changes: + - message: You can drop food or drinks from your hands to interrupt eating it, again. + type: Fix + - message: Barber scissors are now interrupted if the item is dropped or if the + user changes hands. + type: Tweak + id: 7061 + time: '2024-08-08T11:39:47.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30361 From 03745efc7f64dee81329bece19d89fa69a9b50db Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Thu, 8 Aug 2024 16:17:50 +0300 Subject: [PATCH 263/422] Thief beacons (try 2) (#29997) content --- .../Components/StealAreaComponent.cs | 23 +++++ .../Components/StealConditionComponent.cs | 7 ++ .../Systems/StealConditionSystem.cs | 51 +++++++--- .../Thief/Components/ThiefBeaconComponent.cs | 17 ++++ .../Thief/Systems/ThiefBeaconSystem.cs | 95 ++++++++++++++++++ Resources/Locale/en-US/thief/beacon.ftl | 8 ++ .../Entities/Objects/Tools/thief_beacon.yml | 38 +++++++ .../Prototypes/Objectives/objectiveGroups.yml | 5 +- Resources/Prototypes/Objectives/thief.yml | 9 +- Resources/Prototypes/Roles/Antags/Thief.yml | 3 +- .../thief_beacon.rsi/extraction_point.png | Bin 0 -> 954 bytes .../extraction_point_light.png | Bin 0 -> 281 bytes .../thief_beacon.rsi/folded_extraction.png | Bin 0 -> 681 bytes .../Objects/Tools/thief_beacon.rsi/meta.json | 32 ++++++ 14 files changed, 264 insertions(+), 24 deletions(-) create mode 100644 Content.Server/Objectives/Components/StealAreaComponent.cs create mode 100644 Content.Server/Thief/Components/ThiefBeaconComponent.cs create mode 100644 Content.Server/Thief/Systems/ThiefBeaconSystem.cs create mode 100644 Resources/Locale/en-US/thief/beacon.ftl create mode 100644 Resources/Prototypes/Entities/Objects/Tools/thief_beacon.yml create mode 100644 Resources/Textures/Objects/Tools/thief_beacon.rsi/extraction_point.png create mode 100644 Resources/Textures/Objects/Tools/thief_beacon.rsi/extraction_point_light.png create mode 100644 Resources/Textures/Objects/Tools/thief_beacon.rsi/folded_extraction.png create mode 100644 Resources/Textures/Objects/Tools/thief_beacon.rsi/meta.json diff --git a/Content.Server/Objectives/Components/StealAreaComponent.cs b/Content.Server/Objectives/Components/StealAreaComponent.cs new file mode 100644 index 0000000000..26e752f2f2 --- /dev/null +++ b/Content.Server/Objectives/Components/StealAreaComponent.cs @@ -0,0 +1,23 @@ +using Content.Server.Objectives.Systems; +using Content.Server.Thief.Systems; + +namespace Content.Server.Objectives.Components; + +/// +/// An abstract component that allows other systems to count adjacent objects as "stolen" when controlling other systems +/// +[RegisterComponent, Access(typeof(StealConditionSystem), typeof(ThiefBeaconSystem))] +public sealed partial class StealAreaComponent : Component +{ + [DataField] + public bool Enabled = true; + + [DataField] + public float Range = 1f; + + /// + /// all the minds that will be credited with stealing from this area. + /// + [DataField] + public HashSet Owners = new(); +} diff --git a/Content.Server/Objectives/Components/StealConditionComponent.cs b/Content.Server/Objectives/Components/StealConditionComponent.cs index f8d68063f8..cdade8cc8d 100644 --- a/Content.Server/Objectives/Components/StealConditionComponent.cs +++ b/Content.Server/Objectives/Components/StealConditionComponent.cs @@ -22,11 +22,18 @@ public sealed partial class StealConditionComponent : Component [DataField] public bool VerifyMapExistence = true; + /// + /// If true, counts objects that are close to steal areas. + /// + [DataField] + public bool CheckStealAreas = false; + /// /// If the target may be alive but has died, it will not be counted /// [DataField] public bool CheckAlive = false; + /// /// The minimum number of items you need to steal to fulfill a objective /// diff --git a/Content.Server/Objectives/Systems/StealConditionSystem.cs b/Content.Server/Objectives/Systems/StealConditionSystem.cs index 42a296ab92..2c9244cf7d 100644 --- a/Content.Server/Objectives/Systems/StealConditionSystem.cs +++ b/Content.Server/Objectives/Systems/StealConditionSystem.cs @@ -21,16 +21,15 @@ public sealed class StealConditionSystem : EntitySystem [Dependency] private readonly MetaDataSystem _metaData = default!; [Dependency] private readonly MobStateSystem _mobState = default!; [Dependency] private readonly SharedObjectivesSystem _objectives = default!; + [Dependency] private readonly EntityLookupSystem _lookup = default!; private EntityQuery _containerQuery; - private EntityQuery _metaQuery; public override void Initialize() { base.Initialize(); _containerQuery = GetEntityQuery(); - _metaQuery = GetEntityQuery(); SubscribeLocalEvent(OnAssigned); SubscribeLocalEvent(OnAfterAssign); @@ -96,25 +95,33 @@ public sealed class StealConditionSystem : EntitySystem if (!_containerQuery.TryGetComponent(mind.OwnedEntity, out var currentManager)) return 0; - var stack = new Stack(); + var containerStack = new Stack(); var count = 0; + //check stealAreas + if (condition.CheckStealAreas) + { + var areasQuery = AllEntityQuery(); + while (areasQuery.MoveNext(out var uid, out var area)) + { + if (!area.Owners.Contains(mind.Owner)) + continue; + + var nearestEnt = _lookup.GetEntitiesInRange(uid, area.Range); + foreach (var ent in nearestEnt) + { + CheckEntity(ent, condition, ref containerStack, ref count); + } + } + } + //check pulling object if (TryComp(mind.OwnedEntity, out var pull)) //TO DO: to make the code prettier? don't like the repetition { var pulledEntity = pull.Pulling; if (pulledEntity != null) { - // check if this is the item - count += CheckStealTarget(pulledEntity.Value, condition); - - //we don't check the inventories of sentient entity - if (!HasComp(pulledEntity)) - { - // if it is a container check its contents - if (_containerQuery.TryGetComponent(pulledEntity, out var containerManager)) - stack.Push(containerManager); - } + CheckEntity(pulledEntity.Value, condition, ref containerStack, ref count); } } @@ -131,16 +138,30 @@ public sealed class StealConditionSystem : EntitySystem // if it is a container check its contents if (_containerQuery.TryGetComponent(entity, out var containerManager)) - stack.Push(containerManager); + containerStack.Push(containerManager); } } - } while (stack.TryPop(out currentManager)); + } while (containerStack.TryPop(out currentManager)); var result = count / (float) condition.CollectionSize; result = Math.Clamp(result, 0, 1); return result; } + private void CheckEntity(EntityUid entity, StealConditionComponent condition, ref Stack containerStack, ref int counter) + { + // check if this is the item + counter += CheckStealTarget(entity, condition); + + //we don't check the inventories of sentient entity + if (!TryComp(entity, out var pullMind)) + { + // if it is a container check its contents + if (_containerQuery.TryGetComponent(entity, out var containerManager)) + containerStack.Push(containerManager); + } + } + private int CheckStealTarget(EntityUid entity, StealConditionComponent condition) { // check if this is the target diff --git a/Content.Server/Thief/Components/ThiefBeaconComponent.cs b/Content.Server/Thief/Components/ThiefBeaconComponent.cs new file mode 100644 index 0000000000..65db79f861 --- /dev/null +++ b/Content.Server/Thief/Components/ThiefBeaconComponent.cs @@ -0,0 +1,17 @@ +using Content.Server.Thief.Systems; +using Robust.Shared.Audio; + +namespace Content.Server.Thief.Components; + +/// +/// working together with StealAreaComponent, allows the thief to count objects near the beacon as stolen when setting up. +/// +[RegisterComponent, Access(typeof(ThiefBeaconSystem))] +public sealed partial class ThiefBeaconComponent : Component +{ + [DataField] + public SoundSpecifier LinkSound = new SoundPathSpecifier("/Audio/Machines/high_tech_confirm.ogg"); + + [DataField] + public SoundSpecifier UnlinkSound = new SoundPathSpecifier("/Audio/Machines/beep.ogg"); +} diff --git a/Content.Server/Thief/Systems/ThiefBeaconSystem.cs b/Content.Server/Thief/Systems/ThiefBeaconSystem.cs new file mode 100644 index 0000000000..e004212124 --- /dev/null +++ b/Content.Server/Thief/Systems/ThiefBeaconSystem.cs @@ -0,0 +1,95 @@ +using Content.Server.Mind; +using Content.Server.Objectives.Components; +using Content.Server.Roles; +using Content.Server.Thief.Components; +using Content.Shared.Examine; +using Content.Shared.Foldable; +using Content.Shared.Popups; +using Content.Shared.Verbs; +using Robust.Shared.Audio.Systems; + +namespace Content.Server.Thief.Systems; + +/// +/// +/// +public sealed class ThiefBeaconSystem : EntitySystem +{ + [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private readonly MindSystem _mind = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent>(OnGetInteractionVerbs); + SubscribeLocalEvent(OnFolded); + SubscribeLocalEvent(OnExamined); + } + + private void OnGetInteractionVerbs(Entity beacon, ref GetVerbsEvent args) + { + if (!args.CanAccess || !args.CanInteract || args.Hands is null) + return; + + if (TryComp(beacon, out var foldable) && foldable.IsFolded) + return; + + var mind = _mind.GetMind(args.User); + if (!HasComp(mind)) + return; + + var user = args.User; + args.Verbs.Add(new() + { + Act = () => + { + SetCoordinate(beacon, mind.Value); + }, + Message = Loc.GetString("thief-fulton-verb-message"), + Text = Loc.GetString("thief-fulton-verb-text"), + }); + } + + private void OnFolded(Entity beacon, ref FoldedEvent args) + { + if (args.IsFolded) + ClearCoordinate(beacon); + } + + private void OnExamined(Entity beacon, ref ExaminedEvent args) + { + if (!TryComp(beacon, out var area)) + return; + + args.PushText(Loc.GetString(area.Owners.Count == 0 + ? "thief-fulton-examined-unset" + : "thief-fulton-examined-set")); + } + + private void SetCoordinate(Entity beacon, EntityUid mind) + { + if (!TryComp(beacon, out var area)) + return; + + _audio.PlayPvs(beacon.Comp.LinkSound, beacon); + _popup.PopupEntity(Loc.GetString("thief-fulton-set"), beacon); + area.Owners.Clear(); //We only reconfigure the beacon for ourselves, we don't need multiple thieves to steal from the same beacon. + area.Owners.Add(mind); + } + + private void ClearCoordinate(Entity beacon) + { + if (!TryComp(beacon, out var area)) + return; + + if (area.Owners.Count == 0) + return; + + _audio.PlayPvs(beacon.Comp.UnlinkSound, beacon); + _popup.PopupEntity(Loc.GetString("thief-fulton-clear"), beacon); + area.Owners.Clear(); + } +} diff --git a/Resources/Locale/en-US/thief/beacon.ftl b/Resources/Locale/en-US/thief/beacon.ftl new file mode 100644 index 0000000000..9fbbcaf419 --- /dev/null +++ b/Resources/Locale/en-US/thief/beacon.ftl @@ -0,0 +1,8 @@ +thief-fulton-set = Delivery coordinates are set. +thief-fulton-clear = Delivery coordinates cleared. + +thief-fulton-examined-set = Coordinates entered. Bluespace teleportation of the nearest objects will be performed when the evacuation shuttle departs. +thief-fulton-examined-unset = Beacon coordinates are not set. + +thief-fulton-verb-text = Set coordinates +thief-fulton-verb-message = Set the coordinates of your thief's hideout, where all nearby items will be sent at the end of the round. \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Tools/thief_beacon.yml b/Resources/Prototypes/Entities/Objects/Tools/thief_beacon.yml new file mode 100644 index 0000000000..c35e66127d --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Tools/thief_beacon.yml @@ -0,0 +1,38 @@ +- type: entity + id: ThiefBeacon + name: thieving beacon + description: A device that will teleport everything around it to the thief's vault at the end of the shift. + components: + - type: ThiefBeacon + - type: StealArea + - type: Item + size: Normal + - type: Physics + bodyType: Dynamic + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.25,-0.4,0.25,0.1" + density: 20 + mask: + - Impassable + - type: Foldable + folded: true + - type: Clickable + - type: InteractionOutline + - type: Appearance + - type: GenericVisualizer + visuals: + enum.FoldedVisuals.State: + foldedLayer: + True: { state: folded_extraction } + False: { state: extraction_point } + - type: Sprite + sprite: Objects/Tools/thief_beacon.rsi + drawdepth: SmallObjects + noRot: true + layers: + - state: extraction_point + map: [ "foldedLayer" ] \ No newline at end of file diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml index bb74c92da3..e62aa9fdf6 100644 --- a/Resources/Prototypes/Objectives/objectiveGroups.yml +++ b/Resources/Prototypes/Objectives/objectiveGroups.yml @@ -52,8 +52,8 @@ - type: weightedRandom id: ThiefBigObjectiveGroups weights: - ThiefObjectiveGroupStructure: 0 #Temporarily disabled until obvious ways to steal structures are added - ThiefObjectiveGroupAnimal: 2 + ThiefObjectiveGroupStructure: 1 + ThiefObjectiveGroupAnimal: 1 - type: weightedRandom id: ThiefObjectiveGroupCollection @@ -91,7 +91,6 @@ weights: NuclearBombStealObjective: 0.5 FaxMachineCaptainStealObjective: 1 - VehicleSecwayStealObjective: 1 ChemDispenserStealObjective: 1 XenoArtifactStealObjective: 1 FreezerHeaterStealObjective: 1 diff --git a/Resources/Prototypes/Objectives/thief.yml b/Resources/Prototypes/Objectives/thief.yml index c29641081b..672f9b2ba7 100644 --- a/Resources/Prototypes/Objectives/thief.yml +++ b/Resources/Prototypes/Objectives/thief.yml @@ -18,30 +18,29 @@ - type: StealCondition verifyMapExistence: false descriptionText: objective-condition-thief-description + checkStealAreas: true - type: entity abstract: true - parent: [BaseThiefObjective, BaseStealObjective] + parent: [BaseThiefObjective, BaseThiefStealObjective] id: BaseThiefStealCollectionObjective components: - type: StealCondition verifyMapExistence: true - descriptionText: objective-condition-thief-description - type: entity abstract: true - parent: [BaseThiefObjective, BaseStealObjective] + parent: [BaseThiefObjective, BaseThiefStealObjective] id: BaseThiefStealStructureObjective components: - type: StealCondition verifyMapExistence: true - descriptionText: objective-condition-thief-description - type: Objective difficulty: 2 # it's hard to hide - type: entity abstract: true - parent: [BaseThiefObjective, BaseStealObjective] + parent: [BaseThiefObjective, BaseThiefStealObjective] id: BaseThiefStealAnimalObjective components: - type: StealCondition diff --git a/Resources/Prototypes/Roles/Antags/Thief.yml b/Resources/Prototypes/Roles/Antags/Thief.yml index d85d366f6b..f0d0c12470 100644 --- a/Resources/Prototypes/Roles/Antags/Thief.yml +++ b/Resources/Prototypes/Roles/Antags/Thief.yml @@ -10,4 +10,5 @@ storage: back: - ToolboxThief - - ClothingHandsChameleonThief \ No newline at end of file + - ClothingHandsChameleonThief + - ThiefBeacon \ No newline at end of file diff --git a/Resources/Textures/Objects/Tools/thief_beacon.rsi/extraction_point.png b/Resources/Textures/Objects/Tools/thief_beacon.rsi/extraction_point.png new file mode 100644 index 0000000000000000000000000000000000000000..b986a6ae28aedc92556d947c05ecb2963c5a90a0 GIT binary patch literal 954 zcmV;r14aCaP)Px&bV)=(RA_(jj?V(^xsVg^C6$x3&rBbCHDwP9L zzeP{I^voB@2cXbHi#QZTf*>R##o~YoO>n_#8kosCo5dSvd)V=UiP>!2buR2*8a>a< zn>YV?GjG=OAjbQSM3lyg_r6U4W4a^&7uW~(>tEh*M@m3XJ`M<7Qh)>4y6g=iF&-5G zyj2U}j4lRX0h_v5KzGofQ4lx}+|u%lZXY;TlmrrZZa07>-L|CbDc-T&Q4(h$yTrSP$ z3P9@mzz~Fx_rQFm;sRKXgON)4@=aKd!|H6`6#D7#16f{BTVJ}IT7*=!Ef&1jv&5ZVKVVIZaKlZIgcAcQ!eAJzk* z2w0BeySQGjbHXraJbA(^%X;S+&jbHPLja&sE(i864|xWTbPwFVbBB&?lNO>+E>^2Y zF%ynJX>QI1P)hl(?$|ctw?9L)lK8v+<70o!N3*kTHk$>YyQ3)0O}ju}c)pFmD7dt+ z;IB?fNm>X#xSQnUs*6~MldCQr+eS(Wz+$yZrCg>`E@QUaTv}K_DK(r2-p0nfNvCFG z7XT7iQ(cT!lC%(P%$wLXC#1~>os-PeC96_dH_|08hXi%G^#r`i4O zZvfIlAf=>OECSFj6zDV>zW&#rWKg1@8LYwNdG6P0fdqoD;>HZ_qt5})%^lkYAeYOL z%jL-D^Q47fW+elF+U?SQ{)nu-&Zc@5Xu5|$51h_yfwRR+UPr{HXIp&NMA<7u8^-y8I6n~Q2f)h@oc-k@-HaD)Nz-NP z>Y6|1Sn>lqr35d&>S7mQr<6GU{6KCU#CnpX>C(+4u#Y=G@Xt^61G;g3pocg=5a$Pm coZ~&mf5q`3zCm8LX#fBK07*qoM6N<$f?J5hnE(I) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/thief_beacon.rsi/extraction_point_light.png b/Resources/Textures/Objects/Tools/thief_beacon.rsi/extraction_point_light.png new file mode 100644 index 0000000000000000000000000000000000000000..f2e9f984d239556377c9957670d3fe82c8441a9b GIT binary patch literal 281 zcmV+!0p|XRP)Px#(@8`@R9J=WmN5#0KoCXWih|n2B9>`#Gus>@MGleH8+fCfKnq3C1rs+-h&GEG z69~w>dU?#uewYD4xjoAj9v%wA$e5WA1-Zf}BqU%!qq$EC->CqPkd%~|j*^m&#~Q(r zgc@kklfZKlC<0=V@Jd2VFmK#VU>NAA^@*B}f!Pqa27AP9o+9}3xt!gjH4|BH!$p7YxK;NZC2t%8b* fp2$HV2tVKn30Fa0oMIG>00000NkvXXu0mjfaW-&x literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/thief_beacon.rsi/folded_extraction.png b/Resources/Textures/Objects/Tools/thief_beacon.rsi/folded_extraction.png new file mode 100644 index 0000000000000000000000000000000000000000..43ead68bb252215e76ecb1793dad137c86d9637a GIT binary patch literal 681 zcmV;a0#^NrP)Px%V@X6oR9J=Wmd{TUK^(L?RfECla_?Bc%jjxl|&b%aPCJ=r|5b#Ue_nuqC3$uwLlkYE8S@ zWFebnA)BS$Y+?vOz0g5>Ueu}jaOM#xrGj{A&mP(m;nkF&G21;AuHj;l4PvPBz$ zSOPqL^7PbrMiv0@^2PJux?bquRt_7k*YWpSEvhp!)C(P`z}q*k1OBd5OxUr16EOB* zf}tscy;p}jHiSS*NjjYdz?qxFt0^<*ELzQG=sIBn03!WZo`dt&_|Neh%SrWEc6pZX P00000NkvXXu0mjf!sa%| literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/thief_beacon.rsi/meta.json b/Resources/Textures/Objects/Tools/thief_beacon.rsi/meta.json new file mode 100644 index 0000000000..ba7e003575 --- /dev/null +++ b/Resources/Textures/Objects/Tools/thief_beacon.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/austation/austation/commit/e2a4fefd01e702f48d3d4cc8d6a2686d54d104fa and edited by TheShuEd", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "folded_extraction" + }, + { + "name": "extraction_point", + "delays": [ + [ + 0.5, + 0.5 + ] + ] + }, + { + "name": "extraction_point_light", + "delays": [ + [ + 0.5, + 0.5 + ] + ] + } + ] +} \ No newline at end of file From 6570515c8d3d8b9e4442b892e10d88d42b2ea1d5 Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 8 Aug 2024 13:18:57 +0000 Subject: [PATCH 264/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 096bff65bc..c196b78d4a 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: deltanedas - changes: - - message: Added the robotics console for remotely looking at, disabling or destroying - cyborgs! - type: Add - id: 6562 - time: '2024-05-09T06:36:07.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/24855 - author: Killerqu00 changes: - message: Revolutionaries can now cuff command members in order to seize control @@ -3781,3 +3773,16 @@ id: 7061 time: '2024-08-08T11:39:47.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30361 +- author: TheShuEd + changes: + - message: Add "thieving beacon" to Thief antag - a device that counts objects within + a radius of itself as stolen. + type: Add + - message: Return thief structures stealing objectives. + type: Add + - message: Animal theft objectives can no longer appear if the animals are not on + the station. + type: Fix + id: 7062 + time: '2024-08-08T13:17:50.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29997 From 703c8840c405dd1f38ebea82565bbf2cbe17a7a6 Mon Sep 17 00:00:00 2001 From: saintmuntzer <47153094+saintmuntzer@users.noreply.github.com> Date: Thu, 8 Aug 2024 11:35:01 -0500 Subject: [PATCH 265/422] Fix for issue 30781 (#30788) Fixed typos in name and description of syndicate recruit jumpsuit. --- .../Prototypes/Entities/Clothing/Uniforms/ship_vs_ship.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/ship_vs_ship.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/ship_vs_ship.yml index d6999a0a26..f10317e221 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/ship_vs_ship.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/ship_vs_ship.yml @@ -17,8 +17,8 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitRecruitSyndie - name: syndicate recuit jumpsuit - description: A dubious,, dark-grey jumpsuit. As if passengers weren't dubious enough already. + name: syndicate recruit jumpsuit + description: A dubious, dark-grey jumpsuit. As if passengers weren't dubious enough already. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/recruit_syndie.rsi From 66f0cd4f435a174668eb7f35ae65a684dcc76f4c Mon Sep 17 00:00:00 2001 From: dffdff2423 Date: Thu, 8 Aug 2024 13:36:36 -0500 Subject: [PATCH 266/422] Remove suspect figurine line (#30795) --- Resources/Locale/en-US/datasets/figurines.ftl | 3 +-- Resources/Prototypes/Datasets/figurines.yml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Resources/Locale/en-US/datasets/figurines.ftl b/Resources/Locale/en-US/datasets/figurines.ftl index 0de2d9131b..900f09ed37 100644 --- a/Resources/Locale/en-US/datasets/figurines.ftl +++ b/Resources/Locale/en-US/datasets/figurines.ftl @@ -29,8 +29,7 @@ figurines-musician-2 = Never gonna let you down! # figurines-boxer- -figurines-captain-1 = Crew, the Nuke Disk is safely up my ass. -figurines-captain-2 = Glory to NT! +figurines-captain-1 = Glory to NT! figurines-hos-1 = Space law? What? figurines-hos-2 = Shot the clown. diff --git a/Resources/Prototypes/Datasets/figurines.yml b/Resources/Prototypes/Datasets/figurines.yml index 8ad651c134..212139b37d 100644 --- a/Resources/Prototypes/Datasets/figurines.yml +++ b/Resources/Prototypes/Datasets/figurines.yml @@ -50,7 +50,7 @@ id: FigurinesCaptain values: prefix: figurines-captain- - count: 2 + count: 1 - type: localizedDataset id: FigurinesHoS From 3db51a7e36c7890ad84b8fa8bc102398682dcf0b Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Thu, 8 Aug 2024 15:06:40 -0600 Subject: [PATCH 267/422] train update (#30797) train fix --- Resources/Maps/train.yml | 2537 ++++++++++++++++++++------------------ 1 file changed, 1331 insertions(+), 1206 deletions(-) diff --git a/Resources/Maps/train.yml b/Resources/Maps/train.yml index caeb4d22cc..070a446d0d 100644 --- a/Resources/Maps/train.yml +++ b/Resources/Maps/train.yml @@ -529,571 +529,571 @@ entities: color: '#FFFFFFFF' id: Arrows decals: - 470: -2,-124 + 324: -2,-124 - node: color: '#FFFFFFFF' id: Bot decals: - 469: -1,-124 - 838: 6,-280 - 1470: 5,-281 - 1471: 5,-280 - 1472: 5,-279 - 1473: 4,-279 - 1474: 4,-280 - 1475: 4,-281 + 323: -1,-124 + 590: 6,-280 + 1221: 5,-281 + 1222: 5,-280 + 1223: 5,-279 + 1224: 4,-279 + 1225: 4,-280 + 1226: 4,-281 - node: color: '#FFFFFFFF' id: BotGreyscale decals: - 1195: 1,-279 - 1196: 1,-280 - 1197: 2,-279 - 1198: 3,-279 - 1199: 3,-280 - 1294: 2,-280 - 1352: -1,-341 - 1353: -1,-340 - 1354: -1,-339 - 1355: -1,-338 - 1358: -2,-341 - 1359: -2,-340 - 1360: -2,-339 - 1361: -2,-338 - 1476: 3,-281 - 1477: 2,-281 - 1478: 1,-281 + 946: 1,-279 + 947: 1,-280 + 948: 2,-279 + 949: 3,-279 + 950: 3,-280 + 1045: 2,-280 + 1103: -1,-341 + 1104: -1,-340 + 1105: -1,-339 + 1106: -1,-338 + 1109: -2,-341 + 1110: -2,-340 + 1111: -2,-339 + 1112: -2,-338 + 1227: 3,-281 + 1228: 2,-281 + 1229: 1,-281 - node: color: '#FFFFFFFF' id: BotLeft decals: - 837: 6,-281 - 1436: 3,-256 - 1437: 4,-256 - 1438: 5,-256 - 1439: 6,-258 - 1440: 5,-258 - 1441: 4,-258 - 1442: 3,-258 + 589: 6,-281 + 1187: 3,-256 + 1188: 4,-256 + 1189: 5,-256 + 1190: 6,-258 + 1191: 5,-258 + 1192: 4,-258 + 1193: 3,-258 - node: color: '#FFFFFFFF' id: BotLeftGreyscale decals: - 1356: -1,-342 + 1107: -1,-342 - node: color: '#FFFFFFFF' id: BotRight decals: - 836: 6,-279 + 588: 6,-279 - node: color: '#FFFFFFFF' id: BotRightGreyscale decals: - 1357: -1,-337 + 1108: -1,-337 - node: color: '#FFFFFFFF' id: BrickTileDarkInnerNe decals: - 115: 6,-38 - 116: 6,-45 - 280: -2,-7 + 92: 6,-38 + 93: 6,-45 + 215: -2,-7 - node: color: '#FFFFFFFF' id: BrickTileDarkInnerNw decals: - 112: -6,-31 - 281: -3,-7 + 89: -6,-31 + 216: -3,-7 - node: color: '#FFFFFFFF' id: BrickTileDarkInnerSe decals: - 117: 6,-43 - 279: -2,-7 + 94: 6,-43 + 214: -2,-7 - node: color: '#FFFFFFFF' id: BrickTileDarkInnerSw decals: - 109: -6,-29 - 110: -6,-31 - 282: -3,-7 + 87: -6,-29 + 88: -6,-31 + 217: -3,-7 - node: color: '#FFFFFFFF' id: BrickTileDarkLineE decals: - 118: 6,-44 - 119: 6,-37 + 95: 6,-44 + 96: 6,-37 - node: color: '#FFFFFFFF' id: BrickTileDarkLineN decals: - 269: -4,-8 - 270: -4,-8 - 271: -3,-8 - 272: -2,-8 - 273: -1,-8 - 276: -4,-7 - 277: -4,-7 - 278: -1,-7 - 478: 2,-139 - 479: 3,-139 + 204: -4,-8 + 205: -4,-8 + 206: -3,-8 + 207: -2,-8 + 208: -1,-8 + 211: -4,-7 + 212: -4,-7 + 213: -1,-7 + 327: 2,-139 + 328: 3,-139 - node: color: '#FFFFFFFF' id: BrickTileDarkLineS decals: - 265: -4,-6 - 266: -2,-6 - 267: -3,-6 - 268: -1,-6 - 274: -4,-7 - 275: -1,-7 - 473: 3,-140 - 474: 2,-140 + 200: -4,-6 + 201: -2,-6 + 202: -3,-6 + 203: -1,-6 + 209: -4,-7 + 210: -1,-7 + 325: 3,-140 + 326: 2,-140 - node: color: '#FFFFFFFF' id: BrickTileDarkLineW decals: - 113: -6,-30 - 114: -6,-32 + 90: -6,-30 + 91: -6,-32 - node: color: '#639137FF' id: BrickTileSteelEndN decals: - 357: 3,-86 + 218: 3,-86 - node: color: '#639137FF' id: BrickTileSteelEndS decals: - 358: 3,-92 + 219: 3,-92 - node: cleanable: True color: '#FFFFFFFF' id: BrickTileSteelInnerSw decals: - 1455: 7,-255 + 1206: 7,-255 - node: color: '#639137FF' id: BrickTileSteelLineE decals: - 364: 3,-87 - 365: 3,-88 - 366: 3,-89 - 367: 3,-90 - 368: 3,-91 + 225: 3,-87 + 226: 3,-88 + 227: 3,-89 + 228: 3,-90 + 229: 3,-91 - node: cleanable: True color: '#FFFFFFFF' id: BrickTileSteelLineS decals: - 1452: 6,-255 - 1453: 5,-255 - 1454: 4,-255 + 1203: 6,-255 + 1204: 5,-255 + 1205: 4,-255 - node: color: '#639137FF' id: BrickTileSteelLineW decals: - 359: 3,-91 - 360: 3,-90 - 361: 3,-89 - 362: 3,-88 - 363: 3,-87 + 220: 3,-91 + 221: 3,-90 + 222: 3,-89 + 223: 3,-88 + 224: 3,-87 - node: cleanable: True color: '#FFFFFFFF' id: BrickTileSteelLineW decals: - 1449: 7,-258 - 1450: 7,-257 - 1451: 7,-256 + 1200: 7,-258 + 1201: 7,-257 + 1202: 7,-256 - node: color: '#334E6DC8' id: BrickTileWhiteBox decals: - 1424: 19,-298 + 1175: 19,-298 - node: color: '#52B4E996' id: BrickTileWhiteBox decals: - 1429: 25,-298 + 1180: 25,-298 - node: color: '#646464FF' id: BrickTileWhiteBox decals: - 386: 4,-89 + 247: 4,-89 - node: color: '#9FED5896' id: BrickTileWhiteBox decals: - 1430: 24,-300 + 1181: 24,-300 - node: color: '#A4610696' id: BrickTileWhiteBox decals: - 1427: 20,-300 + 1178: 20,-300 - node: color: '#D381C996' id: BrickTileWhiteBox decals: - 1428: 24,-298 + 1179: 24,-298 - node: color: '#D4D4D496' id: BrickTileWhiteBox decals: - 1431: 25,-300 + 1182: 25,-300 - node: color: '#DE3A3A96' id: BrickTileWhiteBox decals: - 1425: 20,-298 + 1176: 20,-298 - node: color: '#EFB34196' id: BrickTileWhiteBox decals: - 1426: 19,-300 + 1177: 19,-300 - node: color: '#52B4E996' id: BrickTileWhiteCornerNe decals: - 1417: 3,-197 + 1168: 3,-197 - node: color: '#A0A0A0FF' id: BrickTileWhiteCornerNe decals: - 438: 3,-96 + 292: 3,-96 - node: color: '#B3B3B3FF' id: BrickTileWhiteCornerNe decals: - 370: 4,-85 - 371: 5,-86 + 231: 4,-85 + 232: 5,-86 - node: color: '#52B4E996' id: BrickTileWhiteCornerNw decals: - 1416: -1,-197 + 1167: -1,-197 - node: color: '#A0A0A0FF' id: BrickTileWhiteCornerNw decals: - 403: 5,-93 - 439: 2,-96 + 264: 5,-93 + 293: 2,-96 - node: color: '#52B4E996' id: BrickTileWhiteCornerSe decals: - 1423: 3,-200 + 1174: 3,-200 - node: color: '#A0A0A0FF' id: BrickTileWhiteCornerSe decals: - 440: 3,-98 + 294: 3,-98 - node: color: '#B3B3B3FF' id: BrickTileWhiteCornerSe decals: - 372: 5,-92 - 373: 4,-93 + 233: 5,-92 + 234: 4,-93 - node: color: '#52B4E996' id: BrickTileWhiteCornerSw decals: - 1422: -1,-200 + 1173: -1,-200 - node: color: '#A0A0A0FF' id: BrickTileWhiteCornerSw decals: - 394: 5,-85 - 441: 2,-98 + 255: 5,-85 + 295: 2,-98 - node: color: '#646464FF' id: BrickTileWhiteEndN decals: - 381: 4,-87 - 385: 4,-90 + 242: 4,-87 + 246: 4,-90 - node: color: '#646464FF' id: BrickTileWhiteEndS decals: - 382: 4,-91 - 383: 4,-88 - 384: 4,-88 + 243: 4,-91 + 244: 4,-88 + 245: 4,-88 - node: color: '#334E6DFF' id: BrickTileWhiteInnerNe decals: - 262: -1,2 + 197: -1,2 - node: color: '#A0A0A0FF' id: BrickTileWhiteInnerNe decals: - 442: 3,-97 - 450: 3,-98 - 451: 2,-98 + 296: 3,-97 + 304: 3,-98 + 305: 2,-98 - node: color: '#B3B3B3FF' id: BrickTileWhiteInnerNe decals: - 375: 4,-86 + 236: 4,-86 - node: color: '#334E6DFF' id: BrickTileWhiteInnerNw decals: - 263: 1,2 + 198: 1,2 - node: color: '#646464FF' id: BrickTileWhiteInnerNw decals: - 389: 5,-90 + 250: 5,-90 - node: color: '#A0A0A0FF' id: BrickTileWhiteInnerNw decals: - 402: 6,-93 - 404: 5,-94 - 443: 2,-97 - 452: 3,-98 + 263: 6,-93 + 265: 5,-94 + 297: 2,-97 + 306: 3,-98 - node: color: '#A0A0A0FF' id: BrickTileWhiteInnerSe decals: - 445: 3,-97 - 449: 2,-96 + 299: 3,-97 + 303: 2,-96 - node: color: '#B3B3B3FF' id: BrickTileWhiteInnerSe decals: - 374: 4,-92 + 235: 4,-92 - node: color: '#646464FF' id: BrickTileWhiteInnerSw decals: - 388: 5,-88 + 249: 5,-88 - node: color: '#A0A0A0FF' id: BrickTileWhiteInnerSw decals: - 392: 5,-84 - 393: 5,-84 - 406: 6,-85 - 444: 2,-97 - 448: 3,-96 + 253: 5,-84 + 254: 5,-84 + 267: 6,-85 + 298: 2,-97 + 302: 3,-96 - node: color: '#334E6DFF' id: BrickTileWhiteLineE decals: - 261: -1,3 + 196: -1,3 - node: color: '#A0A0A0FF' id: BrickTileWhiteLineE decals: - 446: 2,-97 - 453: 3,-97 + 300: 2,-97 + 307: 3,-97 - node: color: '#B3B3B3FF' id: BrickTileWhiteLineE decals: - 376: 5,-87 - 377: 5,-88 - 378: 5,-89 - 379: 5,-90 - 380: 5,-91 + 237: 5,-87 + 238: 5,-88 + 239: 5,-89 + 240: 5,-90 + 241: 5,-91 - node: color: '#52B4E996' id: BrickTileWhiteLineN decals: - 1418: 1,-197 - 1419: 0,-197 + 1169: 1,-197 + 1170: 0,-197 - node: color: '#A0A0A0FF' id: BrickTileWhiteLineN decals: - 405: 4,-94 + 266: 4,-94 - node: color: '#B3B3B3FF' id: BrickTileWhiteLineN decals: - 369: 3,-85 + 230: 3,-85 - node: color: '#52B4E996' id: BrickTileWhiteLineS decals: - 1420: 0,-200 - 1421: 1,-200 + 1171: 0,-200 + 1172: 1,-200 - node: color: '#A0A0A0FF' id: BrickTileWhiteLineS decals: - 390: 3,-84 - 391: 4,-84 + 251: 3,-84 + 252: 4,-84 - node: color: '#334E6DFF' id: BrickTileWhiteLineW decals: - 264: 1,3 + 199: 1,3 - node: color: '#52B4E996' id: BrickTileWhiteLineW decals: - 1415: -1,-198 + 1166: -1,-198 - node: color: '#646464FF' id: BrickTileWhiteLineW decals: - 387: 5,-89 + 248: 5,-89 - node: color: '#A0A0A0FF' id: BrickTileWhiteLineW decals: - 395: 6,-86 - 396: 6,-87 - 397: 6,-89 - 398: 6,-88 - 399: 6,-90 - 400: 6,-91 - 401: 6,-92 - 447: 3,-97 - 454: 2,-97 + 256: 6,-86 + 257: 6,-87 + 258: 6,-89 + 259: 6,-88 + 260: 6,-90 + 261: 6,-91 + 262: 6,-92 + 301: 3,-97 + 308: 2,-97 - node: color: '#FFFFFFFF' id: BushAOne decals: - 1034: 1,-389 - 1035: 4,-387 - 1036: 1,-386 - 1307: 9,-203 + 786: 1,-389 + 787: 4,-387 + 788: 1,-386 + 1058: 9,-203 - node: color: '#FFFFFFFF' id: BushAThree decals: - 166: 1.4194474,-40.90987 - 1308: 9,-206 + 101: 1.4194474,-40.90987 + 1059: 9,-206 - node: color: '#FFFFFFFF' id: BushCOne decals: - 165: 2.5288224,-40.980873 - 1164: -3,-375 - 1165: 3,-375 + 100: 2.5288224,-40.980873 + 916: -3,-375 + 917: 3,-375 - node: color: '#FFFFFFFF' id: BushCThree decals: - 1309: 9,-205 + 1060: 9,-205 - node: color: '#FFFFFFFF' id: BushCTwo decals: - 164: 2.1381974,-41.52775 + 99: 2.1381974,-41.52775 - node: color: '#FFFFFFFF' id: Busha2 decals: - 1302: 11,-198 - 1305: 10,-201 - 1306: 11,-201 + 1053: 11,-198 + 1056: 10,-201 + 1057: 11,-201 - node: color: '#FFFFFFFF' id: Busha3 decals: - 173: 4.2948465,-41.901707 + 108: 4.2948465,-41.901707 - node: color: '#FFFFFFFF' id: Bushb1 decals: - 1030: -1,-387 - 1160: 1,-373 - 1161: 0,-374 - 1310: 9,-195 - 1311: 9,-204 + 782: -1,-387 + 912: 1,-373 + 913: 0,-374 + 1061: 9,-195 + 1062: 9,-204 - node: color: '#FFFFFFFF' id: Bushb3 decals: - 167: 1.2944474,-41.75362 - 1031: -3,-387 - 1032: 6,-384 - 1033: -5,-384 - 1162: -2,-374 + 102: 1.2944474,-41.75362 + 783: -3,-387 + 784: 6,-384 + 785: -5,-384 + 914: -2,-374 - node: color: '#FFFFFFFF' id: Bushc2 decals: - 1301: 10,-198 - 1303: 10,-199 + 1052: 10,-198 + 1054: 10,-199 - node: color: '#FFFFFFFF' id: Bushc3 decals: - 1163: 3,-374 - 1304: 9,-200 - 1312: 7,-202 + 915: 3,-374 + 1055: 9,-200 + 1063: 7,-202 - node: color: '#3EB38896' id: CheckerNESW decals: - 1464: -11,-261 - 1465: -10,-261 - 1466: -12,-261 - 1467: -9,-261 - 1468: -8,-261 + 1215: -11,-261 + 1216: -10,-261 + 1217: -12,-261 + 1218: -9,-261 + 1219: -8,-261 - node: color: '#52B4E996' id: CheckerNWSE decals: - 1376: -5,-167 - 1377: -5,-166 - 1378: -4,-166 - 1379: -4,-167 - 1380: -3,-167 - 1381: -3,-166 - 1382: -2,-166 - 1383: -2,-167 - 1384: 3,-181 - 1385: 3,-180 - 1386: 3,-179 - 1387: 4,-179 - 1388: 4,-180 - 1389: 4,-181 - 1390: 5,-181 - 1391: 5,-180 - 1392: 5,-179 - 1393: 5,-178 - 1394: 4,-178 - 1395: 2,-180 - 1396: 2,-179 - 1397: -2,-171 - 1398: -2,-170 - 1399: -2,-169 - 1400: -1,-204 - 1401: -1,-203 - 1402: -1,-202 - 1403: 0,-202 - 1404: 0,-203 - 1405: 0,-204 - 1406: 1,-204 - 1407: 1,-203 - 1408: 1,-202 - 1409: 2,-202 - 1410: 2,-203 - 1411: 2,-204 - 1412: 3,-204 - 1413: 3,-203 - 1414: 3,-202 + 1127: -5,-167 + 1128: -5,-166 + 1129: -4,-166 + 1130: -4,-167 + 1131: -3,-167 + 1132: -3,-166 + 1133: -2,-166 + 1134: -2,-167 + 1135: 3,-181 + 1136: 3,-180 + 1137: 3,-179 + 1138: 4,-179 + 1139: 4,-180 + 1140: 4,-181 + 1141: 5,-181 + 1142: 5,-180 + 1143: 5,-179 + 1144: 5,-178 + 1145: 4,-178 + 1146: 2,-180 + 1147: 2,-179 + 1148: -2,-171 + 1149: -2,-170 + 1150: -2,-169 + 1151: -1,-204 + 1152: -1,-203 + 1153: -1,-202 + 1154: 0,-202 + 1155: 0,-203 + 1156: 0,-204 + 1157: 1,-204 + 1158: 1,-203 + 1159: 1,-202 + 1160: 2,-202 + 1161: 2,-203 + 1162: 2,-204 + 1163: 3,-204 + 1164: 3,-203 + 1165: 3,-202 - node: cleanable: True color: '#FFFFFFFF' id: DirtLight decals: - 1443: 3,-257 - 1444: 4,-257 - 1445: 6,-256 - 1446: 10,-253 + 1194: 3,-257 + 1195: 4,-257 + 1196: 6,-256 + 1197: 10,-253 - node: cleanable: True color: '#FFFFFFFF' id: DirtMedium decals: - 1447: 5,-257 - 1448: 10,-254 + 1198: 5,-257 + 1199: 10,-254 - node: color: '#FFFFFFFF' id: FlowersBRTwo @@ -1103,8 +1103,8 @@ entities: color: '#FFFFFFFF' id: Flowersbr2 decals: - 179: 1.1507428,-40.14647 - 180: 0.83824277,-40.39647 + 114: 1.1507428,-40.14647 + 115: 0.83824277,-40.39647 - node: color: '#FFFFFFFF' id: Flowerspv2 @@ -1119,710 +1119,710 @@ entities: color: '#FFFFFFFF' id: Flowersy4 decals: - 178: 4.197618,-40.474594 + 113: 4.197618,-40.474594 - node: color: '#9FED58CF' id: FullTileOverlayGreyscale decals: - 1334: -3,-195 - 1335: -3,-194 - 1336: -4,-194 - 1337: -5,-194 - 1338: -6,-194 - 1339: -7,-194 - 1340: -7,-195 + 1085: -3,-195 + 1086: -3,-194 + 1087: -4,-194 + 1088: -5,-194 + 1089: -6,-194 + 1090: -7,-194 + 1091: -7,-195 - node: color: '#9FED58DD' id: FullTileOverlayGreyscale decals: - 646: -3,-202 - 647: -3,-203 - 648: -3,-204 - 649: -3,-205 - 650: -3,-206 - 651: -3,-207 - 652: -3,-208 - 653: -3,-201 - 654: -3,-199 - 655: -3,-198 - 656: -3,-197 - 657: -3,-196 - 658: -7,-196 - 659: -7,-197 - 660: -7,-198 - 661: -7,-199 - 662: -6,-199 + 445: -3,-202 + 446: -3,-203 + 447: -3,-204 + 448: -3,-205 + 449: -3,-206 + 450: -3,-207 + 451: -3,-208 + 452: -3,-201 + 453: -3,-199 + 454: -3,-198 + 455: -3,-197 + 456: -3,-196 + 457: -7,-196 + 458: -7,-197 + 459: -7,-198 + 460: -7,-199 + 461: -6,-199 - node: color: '#FFFFFFFF' id: Grassa1 decals: - 1037: -3,-384 - 1040: -5,-387 - 1295: 11,-196 + 789: -3,-384 + 792: -5,-387 + 1046: 11,-196 - node: color: '#FFFFFFFF' id: Grassa2 decals: - 1026: -2,-388 - 1166: -1,-374 + 778: -2,-388 + 918: -1,-374 - node: color: '#FFFFFFFF' id: Grassa3 decals: - 1029: -2,-387 - 1168: 1,-374 - 1169: 2,-374 - 1296: 10,-195 + 781: -2,-387 + 920: 1,-374 + 921: 2,-374 + 1047: 10,-195 - node: color: '#FFFFFFFF' id: Grassa4 decals: - 1314: 7,-195 + 1065: 7,-195 - node: color: '#FFFFFFFF' id: Grassa5 decals: - 1170: -3,-374 - 1171: 2,-373 - 1297: 9,-194 + 922: -3,-374 + 923: 2,-373 + 1048: 9,-194 - node: color: '#FFFFFFFF' id: Grassb1 decals: - 168: 3.0600724,-41.94112 - 1038: 4,-384 - 1313: 7,-196 + 103: 3.0600724,-41.94112 + 790: 4,-384 + 1064: 7,-196 - node: color: '#FFFFFFFF' id: Grassb2 decals: - 175: 4.2479715,-41.057957 - 181: 0.60386777,-40.880844 - 183: 1.6455414,-39.61602 - 1173: 4,-374 + 110: 4.2479715,-41.057957 + 116: 0.60386777,-40.880844 + 118: 1.6455414,-39.61602 + 925: 4,-374 - node: color: '#FFFFFFFF' id: Grassb3 decals: - 171: 0.47185308,-41.800495 - 1039: 5,-385 + 106: 0.47185308,-41.800495 + 791: 5,-385 - node: color: '#FFFFFFFF' id: Grassb4 decals: - 170: 3.40986,-41.34737 - 177: 3.945704,-39.753384 - 1298: 9,-191 - 1299: 9,-192 + 105: 3.40986,-41.34737 + 112: 3.945704,-39.753384 + 1049: 9,-191 + 1050: 9,-192 - node: color: '#FFFFFFFF' id: Grassb5 decals: - 169: 2.3569474,-42.269245 - 172: 1.331228,-42.519245 - 176: 2.6073463,-40.20651 - 182: 3.1142914,-39.694145 - 1027: -2,-389 - 1028: -1,-388 - 1167: -1,-373 - 1172: -4,-374 - 1300: 11,-199 + 104: 2.3569474,-42.269245 + 107: 1.331228,-42.519245 + 111: 2.6073463,-40.20651 + 117: 3.1142914,-39.694145 + 779: -2,-389 + 780: -1,-388 + 919: -1,-373 + 924: -4,-374 + 1051: 11,-199 - node: color: '#FFFFFFFF' id: GrayConcreteTrimLineE decals: - 1266: 17,-64 - 1267: 17,-63 - 1268: 17,-62 - 1269: 17,-61 + 1017: 17,-64 + 1018: 17,-63 + 1019: 17,-62 + 1020: 17,-61 - node: color: '#FFFFFFFF' id: GrayConcreteTrimLineN decals: - 1270: 14,-60 - 1271: 15,-60 - 1272: 16,-60 - 1273: 13,-68 - 1274: 14,-68 - 1275: 15,-68 - 1276: 16,-68 - 1277: 17,-68 - 1283: 13,-78 - 1284: 14,-78 - 1285: 15,-78 - 1286: 16,-78 - 1287: 17,-78 + 1021: 14,-60 + 1022: 15,-60 + 1023: 16,-60 + 1024: 13,-68 + 1025: 14,-68 + 1026: 15,-68 + 1027: 16,-68 + 1028: 17,-68 + 1034: 13,-78 + 1035: 14,-78 + 1036: 15,-78 + 1037: 16,-78 + 1038: 17,-78 - node: color: '#FFFFFFFF' id: GrayConcreteTrimLineS decals: - 1278: 13,-76 - 1279: 14,-76 - 1280: 15,-76 - 1281: 16,-76 - 1282: 17,-76 - 1288: 14,-86 - 1289: 15,-86 - 1290: 16,-86 - 1291: 13,-85 - 1292: 17,-85 + 1029: 13,-76 + 1030: 14,-76 + 1031: 15,-76 + 1032: 16,-76 + 1033: 17,-76 + 1039: 14,-86 + 1040: 15,-86 + 1041: 16,-86 + 1042: 13,-85 + 1043: 17,-85 - node: color: '#FFFFFFFF' id: GrayConcreteTrimLineW decals: - 1262: 13,-64 - 1263: 13,-63 - 1264: 13,-62 - 1265: 13,-61 + 1013: 13,-64 + 1014: 13,-63 + 1015: 13,-62 + 1016: 13,-61 - node: color: '#999453FF' id: MiniTileDarkBox decals: - 580: 5,-168 + 379: 5,-168 - node: color: '#FFFFFFFF' id: MiniTileDarkBox decals: - 555: -7,-153 + 354: -7,-153 - node: color: '#FFFFFFFF' id: MiniTileDarkLineE decals: - 724: 17,-154 - 725: 17,-153 - 726: 17,-152 - 727: 17,-148 - 728: 17,-147 - 729: 17,-146 - 730: 17,-145 - 731: 17,-144 - 732: 17,-141 - 733: 17,-140 - 748: 17,-160 - 749: 17,-161 - 750: 17,-164 - 751: 17,-165 - 1014: 0,-345 - 1015: 0,-346 - 1016: 0,-347 - 1020: 0,-344 - 1022: 2,-330 - 1023: 2,-331 - 1024: 2,-332 - 1025: 2,-333 + 523: 17,-154 + 524: 17,-153 + 525: 17,-152 + 526: 17,-148 + 527: 17,-147 + 528: 17,-146 + 529: 17,-145 + 530: 17,-144 + 531: 17,-141 + 532: 17,-140 + 547: 17,-160 + 548: 17,-161 + 549: 17,-164 + 550: 17,-165 + 766: 0,-345 + 767: 0,-346 + 768: 0,-347 + 772: 0,-344 + 774: 2,-330 + 775: 2,-331 + 776: 2,-332 + 777: 2,-333 - node: color: '#DE3A3A96' id: MiniTileDarkLineN decals: - 1174: -3,-371 - 1175: -4,-371 - 1176: -5,-371 - 1177: -6,-371 - 1178: -2,-371 - 1179: -1,-371 - 1180: 0,-371 - 1181: 1,-371 - 1182: 2,-371 - 1183: 3,-371 - 1184: 4,-371 - 1185: 5,-371 - 1186: 6,-371 + 926: -3,-371 + 927: -4,-371 + 928: -5,-371 + 929: -6,-371 + 930: -2,-371 + 931: -1,-371 + 932: 0,-371 + 933: 1,-371 + 934: 2,-371 + 935: 3,-371 + 936: 4,-371 + 937: 5,-371 + 938: 6,-371 - node: color: '#FFFFFFFF' id: MiniTileDarkLineS decals: - 1011: -5,-347 - 1012: -4,-347 - 1013: -3,-347 + 763: -5,-347 + 764: -4,-347 + 765: -3,-347 - node: color: '#FFFFFFFF' id: MiniTileDarkLineW decals: - 734: 13,-141 - 735: 13,-139 - 736: 13,-144 - 737: 13,-147 - 738: 13,-148 - 739: 13,-149 - 740: 13,-150 - 741: 13,-151 - 742: 13,-152 - 743: 13,-153 - 744: 13,-154 - 745: 13,-160 - 746: 13,-161 - 747: 13,-162 - 1009: -6,-345 - 1010: -6,-346 - 1017: 0,-347 - 1018: 0,-346 - 1019: 0,-345 - 1021: 0,-344 + 533: 13,-141 + 534: 13,-139 + 535: 13,-144 + 536: 13,-147 + 537: 13,-148 + 538: 13,-149 + 539: 13,-150 + 540: 13,-151 + 541: 13,-152 + 542: 13,-153 + 543: 13,-154 + 544: 13,-160 + 545: 13,-161 + 546: 13,-162 + 761: -6,-345 + 762: -6,-346 + 769: 0,-347 + 770: 0,-346 + 771: 0,-345 + 773: 0,-344 - node: color: '#D381C996' id: MiniTileSteelBox decals: - 897: 2,-310 - 898: 2,-306 + 649: 2,-310 + 650: 2,-306 - node: color: '#999453FF' id: MiniTileSteelCornerNe decals: - 579: 6,-167 + 378: 6,-167 - node: color: '#9FED58CF' id: MiniTileSteelCornerNe decals: - 1341: -3,-194 + 1092: -3,-194 - node: color: '#D381C996' id: MiniTileSteelCornerNe decals: - 712: -3,-54 - 1211: -2,-311 + 511: -3,-54 + 962: -2,-311 - node: color: '#DE3A3A96' id: MiniTileSteelCornerNe decals: - 1071: 2,-357 - 1077: 3,-360 - 1093: 4,-361 + 823: 2,-357 + 829: 3,-360 + 845: 4,-361 - node: color: '#EFB34196' id: MiniTileSteelCornerNe decals: - 1240: 19,-246 + 991: 19,-246 - node: color: '#999453FF' id: MiniTileSteelCornerNw decals: - 576: 4,-167 + 375: 4,-167 - node: color: '#9FED58CF' id: MiniTileSteelCornerNw decals: - 1342: -7,-194 + 1093: -7,-194 - node: color: '#D381C996' id: MiniTileSteelCornerNw decals: - 713: -6,-54 + 512: -6,-54 - node: color: '#DE3A3A96' id: MiniTileSteelCornerNw decals: - 1072: -2,-357 - 1078: -3,-360 - 1086: -7,-361 + 824: -2,-357 + 830: -3,-360 + 838: -7,-361 - node: color: '#EFB34196' id: MiniTileSteelCornerNw decals: - 1228: 14,-251 - 1236: 15,-246 + 979: 14,-251 + 987: 15,-246 - node: color: '#999453FF' id: MiniTileSteelCornerSe decals: - 577: 6,-169 + 376: 6,-169 - node: color: '#9FED58DB' id: MiniTileSteelCornerSe decals: - 629: -3,-193 + 428: -3,-193 - node: color: '#D381C996' id: MiniTileSteelCornerSe decals: - 714: -3,-56 - 1212: -2,-307 + 513: -3,-56 + 963: -2,-307 - node: color: '#EFB34196' id: MiniTileSteelCornerSe decals: - 1252: 19,-262 + 1003: 19,-262 - node: color: '#999453FF' id: MiniTileSteelCornerSw decals: - 578: 4,-169 + 377: 4,-169 - node: color: '#9FED58DB' id: MiniTileSteelCornerSw decals: - 628: -6,-193 + 427: -6,-193 - node: color: '#D381C996' id: MiniTileSteelCornerSw decals: - 715: -6,-56 + 514: -6,-56 - node: color: '#DE3A3A96' id: MiniTileSteelCornerSw decals: - 1087: -7,-362 + 839: -7,-362 - node: color: '#EFB34196' id: MiniTileSteelCornerSw decals: - 1229: 14,-255 - 1250: 15,-262 + 980: 14,-255 + 1001: 15,-262 - node: color: '#D381C996' id: MiniTileSteelInnerNe decals: - 916: 1,-307 - 917: 1,-320 - 1216: -8,-308 + 668: 1,-307 + 669: 1,-320 + 967: -8,-308 - node: color: '#DE3A3A96' id: MiniTileSteelInnerNe decals: - 1080: 2,-360 - 1081: 3,-361 + 832: 2,-360 + 833: 3,-361 - node: color: '#D381C996' id: MiniTileSteelInnerNw decals: - 914: 9,-307 - 1213: -1,-308 + 666: 9,-307 + 964: -1,-308 - node: color: '#DE3A3A96' id: MiniTileSteelInnerNw decals: - 1079: -2,-360 - 1082: -3,-361 + 831: -2,-360 + 834: -3,-361 - node: color: '#EFB34196' id: MiniTileSteelInnerNw decals: - 1231: 15,-251 + 982: 15,-251 - node: color: '#D381C996' id: MiniTileSteelInnerSe decals: - 896: 1,-309 - 915: 1,-298 - 1215: -8,-310 + 648: 1,-309 + 667: 1,-298 + 966: -8,-310 - node: color: '#D381C996' id: MiniTileSteelInnerSw decals: - 921: 9,-309 - 1067: -1,-298 - 1214: -1,-310 + 673: 9,-309 + 819: -1,-298 + 965: -1,-310 - node: color: '#DE3A3A96' id: MiniTileSteelInnerSw decals: - 1129: -4,-362 + 881: -4,-362 - node: color: '#EFB34196' id: MiniTileSteelInnerSw decals: - 1230: 15,-255 + 981: 15,-255 - node: color: '#5A64BC93' id: MiniTileSteelLineE decals: - 1158: 7,-367 - 1159: 7,-368 + 910: 7,-367 + 911: 7,-368 - node: color: '#5ABC5A93' id: MiniTileSteelLineE decals: - 1146: -6,-367 - 1147: -6,-368 + 898: -6,-367 + 899: -6,-368 - node: color: '#999453FF' id: MiniTileSteelLineE decals: - 572: 6,-168 + 371: 6,-168 - node: color: '#9FED58CF' id: MiniTileSteelLineE decals: - 1344: -3,-195 + 1095: -3,-195 - node: color: '#9FED58DB' id: MiniTileSteelLineE decals: - 641: -5,-207 - 642: -5,-206 - 643: -5,-205 - 644: -5,-202 - 645: -5,-201 + 440: -5,-207 + 441: -5,-206 + 442: -5,-205 + 443: -5,-202 + 444: -5,-201 - node: color: '#9FED58DD' id: MiniTileSteelLineE decals: - 680: -3,-199 - 681: -3,-198 - 682: -3,-197 - 683: -3,-196 + 479: -3,-199 + 480: -3,-198 + 481: -3,-197 + 482: -3,-196 - node: color: '#A45ABC93' id: MiniTileSteelLineE decals: - 1150: -6,-364 - 1151: -6,-365 + 902: -6,-364 + 903: -6,-365 - node: color: '#BCBC5A93' id: MiniTileSteelLineE decals: - 1154: 7,-364 - 1155: 7,-365 + 906: 7,-364 + 907: 7,-365 - node: color: '#D381C996' id: MiniTileSteelLineE decals: - 721: -3,-55 - 882: 1,-316 - 883: 1,-317 - 884: 1,-318 - 885: 1,-319 - 886: 1,-312 - 887: 1,-311 - 895: 1,-310 - 906: 1,-306 - 907: 1,-305 - 908: 1,-304 - 909: 1,-303 - 910: 1,-302 - 911: 1,-301 - 912: 1,-300 - 913: 1,-299 + 520: -3,-55 + 634: 1,-316 + 635: 1,-317 + 636: 1,-318 + 637: 1,-319 + 638: 1,-312 + 639: 1,-311 + 647: 1,-310 + 658: 1,-306 + 659: 1,-305 + 660: 1,-304 + 661: 1,-303 + 662: 1,-302 + 663: 1,-301 + 664: 1,-300 + 665: 1,-299 - node: color: '#DE3A3A96' id: MiniTileSteelLineE decals: - 1068: 2,-359 - 1076: 2,-358 - 1094: 4,-362 - 1095: 4,-363 - 1096: 4,-364 - 1097: 4,-365 - 1098: 4,-366 - 1099: 4,-367 + 820: 2,-359 + 828: 2,-358 + 846: 4,-362 + 847: 4,-363 + 848: 4,-364 + 849: 4,-365 + 850: 4,-366 + 851: 4,-367 - node: color: '#EFB34196' id: MiniTileSteelLineE decals: - 1241: 19,-247 - 1242: 19,-248 - 1243: 19,-249 - 1244: 19,-250 - 1245: 19,-256 - 1246: 19,-257 - 1247: 19,-258 + 992: 19,-247 + 993: 19,-248 + 994: 19,-249 + 995: 19,-250 + 996: 19,-256 + 997: 19,-257 + 998: 19,-258 - node: color: '#FFFFFFFF' id: MiniTileSteelLineE decals: - 135: 5,-38 - 136: 5,-37 + 97: 5,-38 + 98: 5,-37 - node: color: '#999453FF' id: MiniTileSteelLineN decals: - 573: 5,-167 + 372: 5,-167 - node: color: '#9FED58CF' id: MiniTileSteelLineN decals: - 1345: -6,-194 - 1346: -5,-194 - 1347: -4,-194 + 1096: -6,-194 + 1097: -5,-194 + 1098: -4,-194 - node: color: '#D381C996' id: MiniTileSteelLineN decals: - 719: -5,-54 - 720: -4,-54 - 899: 2,-307 - 900: 3,-307 - 901: 4,-307 - 902: 5,-307 - 903: 6,-307 - 904: 7,-307 - 905: 8,-307 - 1206: -7,-308 - 1207: -6,-308 - 1208: -4,-308 - 1209: -3,-308 - 1210: -2,-308 + 518: -5,-54 + 519: -4,-54 + 651: 2,-307 + 652: 3,-307 + 653: 4,-307 + 654: 5,-307 + 655: 6,-307 + 656: 7,-307 + 657: 8,-307 + 957: -7,-308 + 958: -6,-308 + 959: -4,-308 + 960: -3,-308 + 961: -2,-308 - node: color: '#DE3A3A96' id: MiniTileSteelLineN decals: - 1073: -1,-357 - 1074: 0,-357 - 1075: 1,-357 - 1083: -4,-361 - 1084: -5,-361 - 1085: -6,-361 + 825: -1,-357 + 826: 0,-357 + 827: 1,-357 + 835: -4,-361 + 836: -5,-361 + 837: -6,-361 - node: color: '#EFB34196' id: MiniTileSteelLineN decals: - 1237: 16,-246 - 1238: 17,-246 - 1239: 18,-246 + 988: 16,-246 + 989: 17,-246 + 990: 18,-246 - node: color: '#999453FF' id: MiniTileSteelLineS decals: - 574: 5,-169 + 373: 5,-169 - node: color: '#9FED58DD' id: MiniTileSteelLineS decals: - 671: -3,-199 - 672: -4,-199 - 673: -5,-199 - 674: -6,-199 - 675: -7,-199 + 470: -3,-199 + 471: -4,-199 + 472: -5,-199 + 473: -6,-199 + 474: -7,-199 - node: color: '#D381C996' id: MiniTileSteelLineS decals: - 717: -5,-56 - 718: -4,-56 - 888: 8,-309 - 889: 7,-309 - 890: 6,-309 - 891: 5,-309 - 892: 4,-309 - 893: 3,-309 - 894: 2,-309 - 1200: -2,-310 - 1201: -3,-310 - 1202: -4,-310 - 1203: -5,-310 - 1204: -6,-310 - 1205: -7,-310 + 516: -5,-56 + 517: -4,-56 + 640: 8,-309 + 641: 7,-309 + 642: 6,-309 + 643: 5,-309 + 644: 4,-309 + 645: 3,-309 + 646: 2,-309 + 951: -2,-310 + 952: -3,-310 + 953: -4,-310 + 954: -5,-310 + 955: -6,-310 + 956: -7,-310 - node: color: '#DE3A3A96' id: MiniTileSteelLineS decals: - 1088: -6,-362 - 1089: -5,-362 + 840: -6,-362 + 841: -5,-362 - node: color: '#EFB34196' id: MiniTileSteelLineS decals: - 1251: 16,-262 + 1002: 16,-262 - node: color: '#5A64BC93' id: MiniTileSteelLineW decals: - 1156: 6,-367 - 1157: 6,-368 + 908: 6,-367 + 909: 6,-368 - node: color: '#5ABC5A93' id: MiniTileSteelLineW decals: - 1144: -7,-367 - 1145: -7,-368 + 896: -7,-367 + 897: -7,-368 - node: color: '#999453FF' id: MiniTileSteelLineW decals: - 575: 4,-168 + 374: 4,-168 - node: color: '#9FED58CF' id: MiniTileSteelLineW decals: - 1343: -7,-195 + 1094: -7,-195 - node: color: '#9FED58DB' id: MiniTileSteelLineW decals: - 635: -6,-207 - 636: -6,-206 - 637: -6,-205 - 638: -6,-203 - 639: -6,-202 - 640: -6,-201 + 434: -6,-207 + 435: -6,-206 + 436: -6,-205 + 437: -6,-203 + 438: -6,-202 + 439: -6,-201 - node: color: '#9FED58DD' id: MiniTileSteelLineW decals: - 663: -3,-201 - 664: -3,-202 - 665: -3,-203 - 666: -3,-204 - 667: -3,-205 - 668: -3,-206 - 669: -3,-207 - 670: -3,-208 - 676: -7,-199 - 677: -7,-198 - 678: -7,-197 - 679: -7,-196 + 462: -3,-201 + 463: -3,-202 + 464: -3,-203 + 465: -3,-204 + 466: -3,-205 + 467: -3,-206 + 468: -3,-207 + 469: -3,-208 + 475: -7,-199 + 476: -7,-198 + 477: -7,-197 + 478: -7,-196 - node: color: '#A45ABC93' id: MiniTileSteelLineW decals: - 1148: -7,-364 - 1149: -7,-365 + 900: -7,-364 + 901: -7,-365 - node: color: '#BCBC5A93' id: MiniTileSteelLineW decals: - 1152: 6,-364 - 1153: 6,-365 + 904: 6,-364 + 905: 6,-365 - node: color: '#D381C996' id: MiniTileSteelLineW decals: - 716: -6,-55 - 1048: -1,-299 - 1049: -1,-300 - 1050: -1,-301 - 1051: -1,-302 - 1052: -1,-304 - 1053: -1,-303 - 1054: -1,-305 - 1055: -1,-306 - 1056: -1,-307 - 1057: -1,-311 - 1058: -1,-312 - 1059: -1,-313 - 1060: -1,-314 - 1061: -1,-315 - 1062: -1,-316 - 1063: -1,-317 - 1064: -1,-318 - 1065: -1,-319 - 1066: -1,-320 + 515: -6,-55 + 800: -1,-299 + 801: -1,-300 + 802: -1,-301 + 803: -1,-302 + 804: -1,-304 + 805: -1,-303 + 806: -1,-305 + 807: -1,-306 + 808: -1,-307 + 809: -1,-311 + 810: -1,-312 + 811: -1,-313 + 812: -1,-314 + 813: -1,-315 + 814: -1,-316 + 815: -1,-317 + 816: -1,-318 + 817: -1,-319 + 818: -1,-320 - node: color: '#DE3A3A96' id: MiniTileSteelLineW decals: - 1069: -2,-358 - 1070: -2,-359 - 1090: -4,-363 - 1091: -4,-364 - 1092: -4,-367 - 1142: -4,-365 - 1143: -4,-366 + 821: -2,-358 + 822: -2,-359 + 842: -4,-363 + 843: -4,-364 + 844: -4,-367 + 894: -4,-365 + 895: -4,-366 - node: color: '#EFB34196' id: MiniTileSteelLineW decals: - 1222: 15,-258 - 1223: 15,-257 - 1224: 15,-256 - 1225: 14,-252 - 1226: 14,-253 - 1227: 14,-254 - 1232: 15,-250 - 1233: 15,-249 - 1234: 15,-248 - 1235: 15,-247 - 1248: 15,-260 - 1249: 15,-261 + 973: 15,-258 + 974: 15,-257 + 975: 15,-256 + 976: 14,-252 + 977: 14,-253 + 978: 14,-254 + 983: 15,-250 + 984: 15,-249 + 985: 15,-248 + 986: 15,-247 + 999: 15,-260 + 1000: 15,-261 - node: color: '#334E6DC8' id: MiniTileWhiteCornerNe @@ -1830,97 +1830,97 @@ entities: 34: 2,-2 41: 6,-5 70: -1,-10 - 863: 30,-307 - 1348: 2,-15 + 615: 30,-307 + 1099: 2,-15 - node: color: '#52B4E996' id: MiniTileWhiteCornerNe decals: - 612: 8,-172 + 411: 8,-172 - node: color: '#79150096' id: MiniTileWhiteCornerNe decals: - 1046: 0,-63 + 798: 0,-63 - node: color: '#999453FF' id: MiniTileWhiteCornerNe decals: - 571: 7,-166 + 370: 7,-166 - node: color: '#9FED58CF' id: MiniTileWhiteCornerNe decals: - 1328: -4,-195 + 1079: -4,-195 - node: color: '#A4610696' id: MiniTileWhiteCornerNe decals: - 852: 6,-285 + 604: 6,-285 - node: color: '#D381C996' id: MiniTileWhiteCornerNe decals: - 931: -3,-300 - 942: 4,-300 - 946: 7,-302 - 963: 7,-311 - 969: 8,-316 - 990: -3,-312 + 683: -3,-300 + 694: 4,-300 + 698: 7,-302 + 715: 7,-311 + 721: 8,-316 + 742: -3,-312 - node: color: '#DE3A3A96' id: MiniTileWhiteCornerNe decals: - 1135: 1,-363 + 887: 1,-363 - node: color: '#334E6DC8' id: MiniTileWhiteCornerNw decals: 33: 1,-2 69: -4,-10 - 862: 28,-307 + 614: 28,-307 - node: color: '#52B4E996' id: MiniTileWhiteCornerNw decals: - 611: 3,-172 + 410: 3,-172 - node: color: '#79150096' id: MiniTileWhiteCornerNw decals: - 1045: -1,-63 + 797: -1,-63 - node: color: '#999453FF' id: MiniTileWhiteCornerNw decals: - 556: 3,-166 + 355: 3,-166 - node: color: '#9FED58CF' id: MiniTileWhiteCornerNw decals: - 1329: -6,-195 + 1080: -6,-195 - node: color: '#A4610696' id: MiniTileWhiteCornerNw decals: - 823: -1,-277 - 851: 4,-285 + 575: -1,-277 + 603: 4,-285 - node: color: '#D381C996' id: MiniTileWhiteCornerNw decals: - 929: -4,-300 - 941: 3,-300 - 971: 3,-311 - 991: -4,-312 - 995: -6,-314 - 1047: -9,-318 - 1219: -7,-301 + 681: -4,-300 + 693: 3,-300 + 723: 3,-311 + 743: -4,-312 + 747: -6,-314 + 799: -9,-318 + 970: -7,-301 - node: color: '#DE3A3A96' id: MiniTileWhiteCornerNw decals: - 1133: -1,-363 + 885: -1,-363 - node: color: '#334E6DC8' id: MiniTileWhiteCornerSe @@ -1928,45 +1928,45 @@ entities: 3: 2,0 49: 6,-13 72: -1,-12 - 861: 30,-309 + 613: 30,-309 - node: color: '#52B4E996' id: MiniTileWhiteCornerSe decals: - 603: 8,-179 + 402: 8,-179 - node: color: '#79150096' id: MiniTileWhiteCornerSe decals: - 1043: 0,-64 + 795: 0,-64 - node: color: '#999453FF' id: MiniTileWhiteCornerSe decals: - 557: 7,-170 + 356: 7,-170 - node: color: '#9FED58DB' id: MiniTileWhiteCornerSe decals: - 631: -4,-198 + 430: -4,-198 - node: color: '#A4610696' id: MiniTileWhiteCornerSe decals: - 849: 6,-286 + 601: 6,-286 - node: color: '#D381C996' id: MiniTileWhiteCornerSe decals: - 926: -3,-306 - 952: 7,-305 - 968: 8,-317 - 982: -3,-320 + 678: -3,-306 + 704: 7,-305 + 720: 8,-317 + 734: -3,-320 - node: color: '#DE3A3A96' id: MiniTileWhiteCornerSe decals: - 1139: 1,-367 + 891: 1,-367 - node: color: '#334E6DC8' id: MiniTileWhiteCornerSw @@ -1974,57 +1974,57 @@ entities: 4: -2,0 54: 1,-13 67: -4,-12 - 860: 28,-309 + 612: 28,-309 - node: color: '#52B4E996' id: MiniTileWhiteCornerSw decals: - 604: 7,-179 - 609: 3,-177 + 403: 7,-179 + 408: 3,-177 - node: color: '#79150096' id: MiniTileWhiteCornerSw decals: - 1044: -1,-64 + 796: -1,-64 - node: color: '#999453FF' id: MiniTileWhiteCornerSw decals: - 558: 3,-170 + 357: 3,-170 - node: color: '#9FED58DB' id: MiniTileWhiteCornerSw decals: - 632: -6,-198 + 431: -6,-198 - node: color: '#A4610696' id: MiniTileWhiteCornerSw decals: - 822: -1,-283 - 850: 4,-286 + 574: -1,-283 + 602: 4,-286 - node: color: '#D381C996' id: MiniTileWhiteCornerSw decals: - 922: -7,-306 - 953: 3,-305 - 962: 3,-317 - 975: -9,-320 + 674: -7,-306 + 705: 3,-305 + 714: 3,-317 + 727: -9,-320 - node: color: '#DE3A3A96' id: MiniTileWhiteCornerSw decals: - 1140: -1,-367 + 892: -1,-367 - node: color: '#9FED5896' id: MiniTileWhiteEndN decals: - 1325: -5,-196 + 1076: -5,-196 - node: color: '#9FED5896' id: MiniTileWhiteEndS decals: - 1326: -5,-197 + 1077: -5,-197 - node: color: '#334E6DC8' id: MiniTileWhiteInnerNe @@ -2034,74 +2034,74 @@ entities: color: '#A4610696' id: MiniTileWhiteInnerNe decals: - 847: 0,-282 + 599: 0,-282 - node: color: '#D381C996' id: MiniTileWhiteInnerNe decals: - 954: 4,-302 - 970: 7,-316 + 706: 4,-302 + 722: 7,-316 - node: color: '#52B4E996' id: MiniTileWhiteInnerNw decals: - 710: 5,-206 - 1323: -8,-310 + 509: 5,-206 + 1074: -8,-310 - node: color: '#A4610696' id: MiniTileWhiteInnerNw decals: - 848: 7,-282 + 600: 7,-282 - node: color: '#D381C996' id: MiniTileWhiteInnerNw decals: - 930: -4,-301 - 994: -4,-314 - 1000: -6,-318 - 1318: -7,-192 + 682: -4,-301 + 746: -4,-314 + 752: -6,-318 + 1069: -7,-192 - node: color: '#52B4E996' id: MiniTileWhiteInnerSe decals: - 626: 1,-169 + 425: 1,-169 - node: color: '#A4610696' id: MiniTileWhiteInnerSe decals: - 846: 0,-278 + 598: 0,-278 - node: color: '#DE3A3A96' id: MiniTileWhiteInnerSe decals: - 1126: -2.241021,-361.4977 - 1127: -2.4992852,-361.7559 - 1128: -2.7401419,-362.00235 + 878: -2.241021,-361.4977 + 879: -2.4992852,-361.7559 + 880: -2.7401419,-362.00235 - node: color: '#52B4E996' id: MiniTileWhiteInnerSw decals: - 610: 7,-177 - 711: 5,-191 - 1324: -8,-308 + 409: 7,-177 + 510: 5,-191 + 1075: -8,-308 - node: color: '#A4610696' id: MiniTileWhiteInnerSw decals: - 845: 7,-278 + 597: 7,-278 - node: color: '#D381C996' id: MiniTileWhiteInnerSw decals: - 1319: -7,-190 + 1070: -7,-190 - node: color: '#DE3A3A96' id: MiniTileWhiteInnerSw decals: - 1122: 2.7602181,-362.00235 - 1123: 2.5136933,-361.7559 - 1124: 2.2476032,-361.486 - 1125: 2.0089047,-361.2591 + 874: 2.7602181,-362.00235 + 875: 2.5136933,-361.7559 + 876: 2.2476032,-361.486 + 877: 2.0089047,-361.2591 - node: color: '#334E6DC8' id: MiniTileWhiteLineE @@ -2118,104 +2118,104 @@ entities: 47: 6,-11 48: 6,-12 71: -1,-11 - 855: 26,-306 - 856: 26,-307 - 857: 26,-308 - 858: 26,-309 - 859: 26,-310 - 867: 30,-308 - 918: 12,-308 - 919: 12,-307 - 920: 12,-309 - 1349: 2,-16 - 1350: 2,-17 - 1351: 2,-18 + 607: 26,-306 + 608: 26,-307 + 609: 26,-308 + 610: 26,-309 + 611: 26,-310 + 619: 30,-308 + 670: 12,-308 + 671: 12,-307 + 672: 12,-309 + 1100: 2,-16 + 1101: 2,-17 + 1102: 2,-18 - node: color: '#52B4E996' id: MiniTileWhiteLineE decals: - 581: -2,-178 - 582: -2,-177 - 583: -2,-176 - 584: -2,-175 - 585: -2,-174 - 586: -2,-173 - 597: 8,-173 - 598: 8,-174 - 599: 8,-175 - 600: 8,-176 - 601: 8,-177 - 602: 8,-178 - 617: 1,-178 - 618: 1,-177 - 619: 1,-176 - 620: 1,-175 - 621: 1,-174 - 622: 1,-173 - 623: 1,-172 - 624: 1,-171 - 625: 1,-170 - 722: 1,-179 - 723: 1,-180 + 380: -2,-178 + 381: -2,-177 + 382: -2,-176 + 383: -2,-175 + 384: -2,-174 + 385: -2,-173 + 396: 8,-173 + 397: 8,-174 + 398: 8,-175 + 399: 8,-176 + 400: 8,-177 + 401: 8,-178 + 416: 1,-178 + 417: 1,-177 + 418: 1,-176 + 419: 1,-175 + 420: 1,-174 + 421: 1,-173 + 422: 1,-172 + 423: 1,-171 + 424: 1,-170 + 521: 1,-179 + 522: 1,-180 - node: color: '#999453FF' id: MiniTileWhiteLineE decals: - 559: 7,-169 - 560: 7,-168 - 561: 7,-167 + 358: 7,-169 + 359: 7,-168 + 360: 7,-167 - node: color: '#9FED58CF' id: MiniTileWhiteLineE decals: - 1331: -4,-196 + 1082: -4,-196 - node: color: '#9FED58DB' id: MiniTileWhiteLineE decals: - 633: -4,-197 + 432: -4,-197 - node: color: '#A4610696' id: MiniTileWhiteLineE decals: - 842: 0,-281 - 843: 0,-280 - 844: 0,-279 + 594: 0,-281 + 595: 0,-280 + 596: 0,-279 - node: color: '#D381C996' id: MiniTileWhiteLineE decals: - 932: -3,-301 - 933: -3,-302 - 934: -3,-303 - 935: -3,-304 - 936: -3,-305 - 943: 4,-301 - 947: 7,-303 - 948: 7,-304 - 964: 7,-312 - 965: 7,-313 - 966: 7,-314 - 967: 7,-315 - 983: -3,-319 - 984: -3,-318 - 985: -3,-317 - 986: -3,-316 - 987: -3,-315 - 988: -3,-314 - 989: -3,-313 + 684: -3,-301 + 685: -3,-302 + 686: -3,-303 + 687: -3,-304 + 688: -3,-305 + 695: 4,-301 + 699: 7,-303 + 700: 7,-304 + 716: 7,-312 + 717: 7,-313 + 718: 7,-314 + 719: 7,-315 + 735: -3,-319 + 736: -3,-318 + 737: -3,-317 + 738: -3,-316 + 739: -3,-315 + 740: -3,-314 + 741: -3,-313 - node: color: '#DE3A3A96' id: MiniTileWhiteLineE decals: - 1117: -3,-363 - 1118: -3,-364 - 1119: -3,-365 - 1120: -3,-366 - 1121: -3,-367 - 1136: 1,-364 - 1137: 1,-365 - 1138: 1,-366 + 869: -3,-363 + 870: -3,-364 + 871: -3,-365 + 872: -3,-366 + 873: -3,-367 + 888: 1,-364 + 889: 1,-365 + 890: 1,-366 - node: color: '#334E6DC8' id: MiniTileWhiteLineN @@ -2226,74 +2226,74 @@ entities: 75: -3,-10 76: -2,-10 80: 1,-15 - 866: 29,-307 + 618: 29,-307 - node: color: '#52B4E996' id: MiniTileWhiteLineN decals: - 613: 4,-172 - 614: 5,-172 - 615: 6,-172 - 616: 7,-172 - 703: 4,-206 - 704: 3,-206 - 705: 1,-206 - 706: 2,-206 - 707: 0,-206 - 708: -1,-206 - 1322: -9,-310 + 412: 4,-172 + 413: 5,-172 + 414: 6,-172 + 415: 7,-172 + 502: 4,-206 + 503: 3,-206 + 504: 1,-206 + 505: 2,-206 + 506: 0,-206 + 507: -1,-206 + 1073: -9,-310 - node: color: '#999453FF' id: MiniTileWhiteLineN decals: - 568: 4,-166 - 569: 5,-166 - 570: 6,-166 + 367: 4,-166 + 368: 5,-166 + 369: 6,-166 - node: color: '#9FED58CF' id: MiniTileWhiteLineN decals: - 1330: -5,-195 + 1081: -5,-195 - node: color: '#A4610696' id: MiniTileWhiteLineN decals: - 808: 0,-277 - 809: 1,-277 - 810: 2,-277 - 811: 3,-277 - 812: 4,-277 - 813: 5,-277 - 814: 6,-277 - 815: 7,-277 - 816: 8,-277 - 824: 1,-282 - 825: 2,-282 - 826: 3,-282 - 827: 4,-282 - 828: 5,-282 - 829: 6,-282 - 854: 5,-285 + 560: 0,-277 + 561: 1,-277 + 562: 2,-277 + 563: 3,-277 + 564: 4,-277 + 565: 5,-277 + 566: 6,-277 + 567: 7,-277 + 568: 8,-277 + 576: 1,-282 + 577: 2,-282 + 578: 3,-282 + 579: 4,-282 + 580: 5,-282 + 581: 6,-282 + 606: 5,-285 - node: color: '#D381C996' id: MiniTileWhiteLineN decals: - 944: 5,-302 - 945: 6,-302 - 955: 4,-311 - 956: 5,-311 - 957: 6,-311 - 976: -8,-318 - 993: -5,-314 - 999: -7,-318 - 1217: -5,-301 - 1218: -6,-301 - 1315: -8,-192 + 696: 5,-302 + 697: 6,-302 + 707: 4,-311 + 708: 5,-311 + 709: 6,-311 + 728: -8,-318 + 745: -5,-314 + 751: -7,-318 + 968: -5,-301 + 969: -6,-301 + 1066: -8,-192 - node: color: '#DE3A3A96' id: MiniTileWhiteLineN decals: - 1134: 0,-363 + 886: 0,-363 - node: color: '#334E6DC8' id: MiniTileWhiteLineS @@ -2304,79 +2304,79 @@ entities: 53: 2,-13 73: -2,-12 74: -3,-12 - 865: 29,-309 + 617: 29,-309 - node: color: '#52B4E996' id: MiniTileWhiteLineS decals: - 606: 6,-177 - 607: 5,-177 - 608: 4,-177 - 627: 2,-169 - 697: 4,-191 - 698: 3,-191 - 699: 2,-191 - 700: 1,-191 - 701: 0,-191 - 702: -1,-191 - 1320: -9,-308 + 405: 6,-177 + 406: 5,-177 + 407: 4,-177 + 426: 2,-169 + 496: 4,-191 + 497: 3,-191 + 498: 2,-191 + 499: 1,-191 + 500: 0,-191 + 501: -1,-191 + 1071: -9,-308 - node: color: '#999453FF' id: MiniTileWhiteLineS decals: - 565: 4,-170 - 566: 5,-170 - 567: 6,-170 + 364: 4,-170 + 365: 5,-170 + 366: 6,-170 - node: color: '#9FED58DB' id: MiniTileWhiteLineS decals: - 630: -5,-198 + 429: -5,-198 - node: color: '#A4610696' id: MiniTileWhiteLineS decals: - 799: 0,-283 - 800: 1,-283 - 801: 2,-283 - 802: 3,-283 - 803: 4,-283 - 804: 5,-283 - 805: 6,-283 - 806: 7,-283 - 807: 8,-283 - 830: 1,-278 - 831: 2,-278 - 832: 3,-278 - 833: 4,-278 - 834: 5,-278 - 835: 6,-278 - 853: 5,-286 + 551: 0,-283 + 552: 1,-283 + 553: 2,-283 + 554: 3,-283 + 555: 4,-283 + 556: 5,-283 + 557: 6,-283 + 558: 7,-283 + 559: 8,-283 + 582: 1,-278 + 583: 2,-278 + 584: 3,-278 + 585: 4,-278 + 586: 5,-278 + 587: 6,-278 + 605: 5,-286 - node: color: '#D381C996' id: MiniTileWhiteLineS decals: - 923: -6,-306 - 924: -5,-306 - 925: -4,-306 - 949: 4,-305 - 950: 5,-305 - 951: 6,-305 - 958: 4,-317 - 959: 5,-317 - 960: 6,-317 - 961: 7,-317 - 977: -8,-320 - 978: -7,-320 - 979: -6,-320 - 980: -5,-320 - 981: -4,-320 - 1316: -8,-190 + 675: -6,-306 + 676: -5,-306 + 677: -4,-306 + 701: 4,-305 + 702: 5,-305 + 703: 6,-305 + 710: 4,-317 + 711: 5,-317 + 712: 6,-317 + 713: 7,-317 + 729: -8,-320 + 730: -7,-320 + 731: -6,-320 + 732: -5,-320 + 733: -4,-320 + 1067: -8,-190 - node: color: '#DE3A3A96' id: MiniTileWhiteLineS decals: - 1141: 0,-367 + 893: 0,-367 - node: color: '#334E6DC8' id: MiniTileWhiteLineW @@ -2390,173 +2390,173 @@ entities: 29: 1,-4 66: 1,-12 68: -4,-11 - 864: 28,-308 + 616: 28,-308 - node: color: '#52B4E996' id: MiniTileWhiteLineW decals: - 587: -5,-178 - 588: -5,-177 - 589: -5,-176 - 590: -5,-175 - 591: -5,-174 - 592: -5,-173 - 593: 3,-176 - 594: 3,-175 - 595: 3,-174 - 596: 3,-173 - 605: 7,-178 - 684: 5,-204 - 685: 5,-203 - 686: 5,-202 - 687: 5,-201 - 688: 5,-200 - 689: 5,-199 - 690: 5,-198 - 691: 5,-197 - 692: 5,-196 - 693: 5,-195 - 694: 5,-194 - 695: 5,-193 - 696: 5,-192 - 709: 5,-205 - 1321: -8,-309 + 386: -5,-178 + 387: -5,-177 + 388: -5,-176 + 389: -5,-175 + 390: -5,-174 + 391: -5,-173 + 392: 3,-176 + 393: 3,-175 + 394: 3,-174 + 395: 3,-173 + 404: 7,-178 + 483: 5,-204 + 484: 5,-203 + 485: 5,-202 + 486: 5,-201 + 487: 5,-200 + 488: 5,-199 + 489: 5,-198 + 490: 5,-197 + 491: 5,-196 + 492: 5,-195 + 493: 5,-194 + 494: 5,-193 + 495: 5,-192 + 508: 5,-205 + 1072: -8,-309 - node: color: '#999453FF' id: MiniTileWhiteLineW decals: - 562: 3,-169 - 563: 3,-168 - 564: 3,-167 + 361: 3,-169 + 362: 3,-168 + 363: 3,-167 - node: color: '#9FED58CF' id: MiniTileWhiteLineW decals: - 1332: -6,-196 + 1083: -6,-196 - node: color: '#9FED58DB' id: MiniTileWhiteLineW decals: - 634: -6,-197 + 433: -6,-197 - node: color: '#A4610696' id: MiniTileWhiteLineW decals: - 817: -1,-278 - 818: -1,-279 - 819: -1,-280 - 820: -1,-281 - 821: -1,-282 - 839: 7,-281 - 840: 7,-280 - 841: 7,-279 + 569: -1,-278 + 570: -1,-279 + 571: -1,-280 + 572: -1,-281 + 573: -1,-282 + 591: 7,-281 + 592: 7,-280 + 593: 7,-279 - node: color: '#D381C996' id: MiniTileWhiteLineW decals: - 927: -7,-305 - 928: -7,-304 - 937: 3,-304 - 938: 3,-303 - 939: 3,-302 - 940: 3,-301 - 972: 3,-312 - 973: 3,-316 - 974: -9,-319 - 992: -4,-313 - 996: -6,-315 - 997: -6,-316 - 998: -6,-317 - 1220: -7,-302 - 1221: -7,-303 - 1317: -7,-191 + 679: -7,-305 + 680: -7,-304 + 689: 3,-304 + 690: 3,-303 + 691: 3,-302 + 692: 3,-301 + 724: 3,-312 + 725: 3,-316 + 726: -9,-319 + 744: -4,-313 + 748: -6,-315 + 749: -6,-316 + 750: -6,-317 + 971: -7,-302 + 972: -7,-303 + 1068: -7,-191 - node: color: '#DE3A3A96' id: MiniTileWhiteLineW decals: - 1112: 3,-367 - 1113: 3,-366 - 1114: 3,-365 - 1115: 3,-364 - 1116: 3,-363 - 1130: -1,-366 - 1131: -1,-365 - 1132: -1,-364 + 864: 3,-367 + 865: 3,-366 + 866: 3,-365 + 867: 3,-364 + 868: 3,-363 + 882: -1,-366 + 883: -1,-365 + 884: -1,-364 - node: color: '#3EB38896' id: QuarterTileOverlayGreyscale180 decals: - 1456: -15,-266 - 1457: -14,-266 - 1458: -13,-266 - 1459: -12,-266 + 1207: -15,-266 + 1208: -14,-266 + 1209: -13,-266 + 1210: -12,-266 - node: color: '#A4610696' id: QuarterTileOverlayGreyscale180 decals: - 1480: 1,-275 - 1481: 1,-274 - 1482: 1,-273 - 1483: 1,-272 + 1231: 1,-275 + 1232: 1,-274 + 1233: 1,-273 + 1234: 1,-272 - node: color: '#3EB38896' id: QuarterTileOverlayGreyscale90 decals: - 1460: -15,-264 - 1461: -14,-264 - 1462: -13,-264 - 1463: -12,-264 + 1211: -15,-264 + 1212: -14,-264 + 1213: -13,-264 + 1214: -12,-264 - node: color: '#FFFFFFFF' id: Rock02 decals: - 174: 3.4198463,-40.51108 + 109: 3.4198463,-40.51108 - node: angle: -1.5707963267948966 rad color: '#FFFFFFFF' id: StandClear decals: - 105: 6,-37 - 106: 6,-44 - 1042: -3,-114 + 83: 6,-37 + 84: 6,-44 + 794: -3,-114 - node: color: '#FFFFFFFF' id: StandClear decals: - 547: 0,-136 - 548: 0,-126 - 549: 0,-109 - 550: 0,-99 - 551: 0,-82 - 552: 0,-45 - 554: 0,-18 - 1187: 0,-163 - 1188: 0,-180 - 1189: 0,-190 - 1190: 0,-207 - 1191: 0,-244 - 1192: 0,-261 - 1194: 0,-288 - 1469: 0,-28 - 1479: 0,-271 + 347: 0,-136 + 348: 0,-126 + 349: 0,-109 + 350: 0,-99 + 351: 0,-82 + 352: 0,-45 + 353: 0,-18 + 939: 0,-163 + 940: 0,-180 + 941: 0,-190 + 942: 0,-207 + 943: 0,-244 + 944: 0,-261 + 945: 0,-288 + 1220: 0,-28 + 1230: 0,-271 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' id: StandClear decals: - 107: -6,-32 - 108: -6,-30 - 1261: -2,-255 + 85: -6,-32 + 86: -6,-30 + 1012: -2,-255 - node: color: '#D381C996' id: WarnCornerGreyscaleNE decals: - 1007: -8,-314 + 759: -8,-314 - node: color: '#DE3A3A96' id: WarnCornerGreyscaleNE decals: - 1102: -4,-356 + 854: -4,-356 - node: color: '#334E6DC8' id: WarnCornerGreyscaleNW @@ -2566,14 +2566,14 @@ entities: color: '#D381C996' id: WarnCornerGreyscaleNW decals: - 1008: -10,-314 + 760: -10,-314 - node: color: '#DE3A3A96' id: WarnCornerGreyscaleNW decals: - 1100: -6,-357 - 1101: -5,-356 - 1103: -7,-358 + 852: -6,-357 + 853: -5,-356 + 855: -7,-358 - node: color: '#334E6DC8' id: WarnCornerGreyscaleSE @@ -2583,12 +2583,12 @@ entities: color: '#D381C996' id: WarnCornerGreyscaleSE decals: - 1005: -8,-316 + 757: -8,-316 - node: color: '#DE3A3A96' id: WarnCornerGreyscaleSE decals: - 1107: -4,-359 + 859: -4,-359 - node: color: '#334E6DC8' id: WarnCornerGreyscaleSW @@ -2598,61 +2598,61 @@ entities: color: '#D381C996' id: WarnCornerGreyscaleSW decals: - 1006: -10,-316 + 758: -10,-316 - node: color: '#DE3A3A96' id: WarnCornerGreyscaleSW decals: - 1104: -7,-359 + 856: -7,-359 - node: color: '#FFFFFFFF' id: WarnCornerNE decals: - 875: 4,-313 - 1371: 7,-337 + 627: 4,-313 + 1122: 7,-337 - node: color: '#FFFFFFFF' id: WarnCornerNW decals: - 1370: 5,-337 + 1121: 5,-337 - node: color: '#FFFFFFFF' id: WarnCornerSE decals: - 877: 4,-315 - 1434: 7,-343 + 629: 4,-315 + 1185: 7,-343 - node: color: '#FFFFFFFF' id: WarnCornerSW decals: - 1432: 5,-343 + 1183: 5,-343 - node: color: '#9FED5896' id: WarnCornerSmallGreyscaleNE decals: - 872: 20,-310 + 624: 20,-310 - node: color: '#9FED5896' id: WarnCornerSmallGreyscaleNW decals: - 1333: 24,-310 + 1084: 24,-310 - node: color: '#DE3A3A96' id: WarnCornerSmallGreyscaleNW decals: 15: -3,-4 - 1110: -6,-358 - 1111: -5,-357 + 862: -6,-358 + 863: -5,-357 - node: color: '#9FED5896' id: WarnCornerSmallGreyscaleSE decals: - 871: 20,-306 + 623: 20,-306 - node: color: '#9FED5896' id: WarnCornerSmallGreyscaleSW decals: - 873: 24,-306 + 625: 24,-306 - node: color: '#DE3A3A96' id: WarnCornerSmallGreyscaleSW @@ -2662,12 +2662,12 @@ entities: color: '#FFFFFFFF' id: WarnCornerSmallSE decals: - 1373: 5,-337 + 1124: 5,-337 - node: color: '#FFFFFFFF' id: WarnCornerSmallSW decals: - 1372: 7,-337 + 1123: 7,-337 - node: color: '#DE3A3A96' id: WarnFullGreyscale @@ -2677,32 +2677,32 @@ entities: color: '#FFFFFFFF' id: WarnLineE decals: - 878: 4,-314 - 879: 1,-315 - 880: 1,-314 - 881: 1,-313 - 1365: 7,-338 - 1366: 5,-339 - 1367: 5,-338 - 1375: 7,-339 - 1435: 8,-341 + 630: 4,-314 + 631: 1,-315 + 632: 1,-314 + 633: 1,-313 + 1116: 7,-338 + 1117: 5,-339 + 1118: 5,-338 + 1126: 7,-339 + 1186: 8,-341 - node: color: '#9FED5896' id: WarnLineGreyscaleE decals: - 869: 20,-309 - 870: 20,-307 + 621: 20,-309 + 622: 20,-307 - node: color: '#D381C996' id: WarnLineGreyscaleE decals: - 1003: -8,-315 + 755: -8,-315 - node: color: '#DE3A3A96' id: WarnLineGreyscaleE decals: - 1108: -4,-358 - 1109: -4,-357 + 860: -4,-358 + 861: -4,-357 - node: color: '#334E6DC8' id: WarnLineGreyscaleN @@ -2716,7 +2716,7 @@ entities: color: '#D381C996' id: WarnLineGreyscaleN decals: - 1004: -9,-314 + 756: -9,-314 - node: color: '#DE3A3A96' id: WarnLineGreyscaleN @@ -2730,10 +2730,10 @@ entities: color: '#EFB34196' id: WarnLineGreyscaleN decals: - 1253: 13,-257 - 1254: 12,-257 - 1255: 11,-257 - 1256: 10,-257 + 1004: 13,-257 + 1005: 12,-257 + 1006: 11,-257 + 1007: 10,-257 - node: color: '#334E6DC8' id: WarnLineGreyscaleS @@ -2747,7 +2747,7 @@ entities: color: '#D381C996' id: WarnLineGreyscaleS decals: - 1001: -9,-316 + 753: -9,-316 - node: color: '#DE3A3A96' id: WarnLineGreyscaleS @@ -2757,16 +2757,16 @@ entities: 17: -3,-4 18: -2,-4 19: -1,-4 - 1105: -6,-359 - 1106: -5,-359 + 857: -6,-359 + 858: -5,-359 - node: color: '#EFB34196' id: WarnLineGreyscaleS decals: - 1257: 10,-249 - 1258: 11,-249 - 1259: 12,-249 - 1260: 13,-249 + 1008: 10,-249 + 1009: 11,-249 + 1010: 12,-249 + 1011: 13,-249 - node: color: '#334E6DC8' id: WarnLineGreyscaleW @@ -2778,13 +2778,13 @@ entities: color: '#9FED5896' id: WarnLineGreyscaleW decals: - 868: 24,-307 - 1327: 24,-309 + 620: 24,-307 + 1078: 24,-309 - node: color: '#D381C996' id: WarnLineGreyscaleW decals: - 1002: -10,-315 + 754: -10,-315 - node: color: '#DE3A3A96' id: WarnLineGreyscaleW @@ -2794,207 +2794,207 @@ entities: color: '#FFFFFFFF' id: WarnLineN decals: - 876: 3,-315 - 1368: 6,-337 - 1433: 6,-343 + 628: 3,-315 + 1119: 6,-337 + 1184: 6,-343 - node: color: '#FFFFFFFF' id: WarnLineS decals: - 1362: 5,-339 - 1363: 5,-338 - 1364: 7,-338 - 1374: 7,-339 + 1113: 5,-339 + 1114: 5,-338 + 1115: 7,-338 + 1125: 7,-339 - node: color: '#FFFFFFFF' id: WarnLineW decals: - 874: 3,-313 - 1369: 6,-337 + 626: 3,-313 + 1120: 6,-337 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerNe decals: - 202: -1,-59 - 217: -1,-67 + 137: -1,-59 + 152: -1,-67 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerNw decals: - 198: -6,-59 - 235: -2,-62 + 133: -6,-59 + 170: -2,-62 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerSe decals: - 184: -1,-68 - 230: -1,-60 + 119: -1,-68 + 165: -1,-60 - node: color: '#FFFFFFFF' id: WoodTrimThinCornerSw decals: - 189: -6,-68 - 232: -2,-65 + 124: -6,-68 + 167: -2,-65 - node: color: '#FFFFFFFF' id: WoodTrimThinInnerNe decals: 79: -5,1 - 220: -4,-67 - 249: -2,-65 - 252: -1,-64 - 256: 0,-63 - 259: 0,-58 + 155: -4,-67 + 184: -2,-65 + 187: -1,-64 + 191: 0,-63 + 194: 0,-58 - node: color: '#FFFFFFFF' id: WoodTrimThinInnerNw decals: - 213: 1,-70 - 237: 0,-62 - 250: 1,-65 - 251: 0,-64 - 257: -1,-63 + 148: 1,-70 + 172: 0,-62 + 185: 1,-65 + 186: 0,-64 + 192: -1,-63 - node: color: '#FFFFFFFF' id: WoodTrimThinInnerSe decals: - 227: -4,-60 - 248: -2,-62 - 254: -1,-63 - 255: 0,-64 - 260: 0,-69 + 162: -4,-60 + 183: -2,-62 + 189: -1,-63 + 190: 0,-64 + 195: 0,-69 - node: color: '#FFFFFFFF' id: WoodTrimThinInnerSw decals: - 206: 1,-57 - 238: 0,-65 - 247: 1,-62 - 253: 0,-63 - 258: -1,-64 + 141: 1,-57 + 173: 0,-65 + 182: 1,-62 + 188: 0,-63 + 193: -1,-64 - node: color: '#FFFFFFFF' id: WoodTrimThinLineE decals: 77: -5,2 - 221: -4,-66 - 222: -4,-65 - 223: -4,-64 - 224: -4,-63 - 225: -4,-62 - 226: -4,-61 - 241: -2,-64 - 242: -2,-63 - 459: -7,-111 - 460: -7,-110 - 461: -7,-109 - 462: -7,-108 - 466: 2,-122 - 467: 2,-121 - 468: 2,-120 - 496: -4,-145 - 497: -4,-146 - 498: -4,-147 - 499: -4,-149 - 500: -4,-148 - 501: -4,-143 - 505: -4,-139 + 156: -4,-66 + 157: -4,-65 + 158: -4,-64 + 159: -4,-63 + 160: -4,-62 + 161: -4,-61 + 176: -2,-64 + 177: -2,-63 + 313: -7,-111 + 314: -7,-110 + 315: -7,-109 + 316: -7,-108 + 320: 2,-122 + 321: 2,-121 + 322: 2,-120 + 329: -4,-145 + 330: -4,-146 + 331: -4,-147 + 332: -4,-149 + 333: -4,-148 + 334: -4,-143 + 335: -4,-139 - node: color: '#FFFFFFFF' id: WoodTrimThinLineN decals: 78: -4,1 - 199: -5,-59 - 200: -4,-59 - 201: -2,-59 - 210: -2,-70 - 211: -1,-70 - 212: 0,-70 - 218: -2,-67 - 219: -3,-67 - 236: -1,-62 - 239: -1,-65 - 240: 0,-65 - 423: -9,-125 - 424: -7,-125 - 425: -8,-125 - 426: -9,-122 - 427: -8,-122 - 428: -7,-122 - 432: -9,-116 - 433: -8,-116 - 434: -7,-116 - 435: -9,-113 - 436: -8,-113 - 437: -7,-113 + 134: -5,-59 + 135: -4,-59 + 136: -2,-59 + 145: -2,-70 + 146: -1,-70 + 147: 0,-70 + 153: -2,-67 + 154: -3,-67 + 171: -1,-62 + 174: -1,-65 + 175: 0,-65 + 280: -9,-125 + 281: -7,-125 + 282: -8,-125 + 283: -9,-122 + 284: -8,-122 + 285: -7,-122 + 286: -9,-116 + 287: -8,-116 + 288: -7,-116 + 289: -9,-113 + 290: -8,-113 + 291: -7,-113 - node: color: '#FFFFFFFF' id: WoodTrimThinLineS decals: - 185: -2,-68 - 186: -4,-68 - 187: -3,-68 - 188: -5,-68 - 207: 0,-57 - 208: -1,-57 - 209: -2,-57 - 228: -3,-60 - 229: -2,-60 - 231: -1,-65 - 243: -1,-62 - 244: 0,-62 - 407: -9,-114 - 408: -8,-114 - 409: -7,-114 - 410: -9,-117 - 411: -8,-117 - 412: -7,-117 - 417: -9,-123 - 418: -8,-123 - 419: -7,-123 - 420: -9,-126 - 421: -8,-126 - 422: -7,-126 + 120: -2,-68 + 121: -4,-68 + 122: -3,-68 + 123: -5,-68 + 142: 0,-57 + 143: -1,-57 + 144: -2,-57 + 163: -3,-60 + 164: -2,-60 + 166: -1,-65 + 178: -1,-62 + 179: 0,-62 + 268: -9,-114 + 269: -8,-114 + 270: -7,-114 + 271: -9,-117 + 272: -8,-117 + 273: -7,-117 + 274: -9,-123 + 275: -8,-123 + 276: -7,-123 + 277: -9,-126 + 278: -8,-126 + 279: -7,-126 - node: color: '#FFFFFFFF' id: WoodTrimThinLineW decals: - 190: -6,-67 - 191: -6,-66 - 192: -6,-65 - 193: -6,-64 - 194: -6,-63 - 195: -6,-62 - 196: -6,-61 - 197: -6,-60 - 203: 1,-60 - 204: 1,-59 - 205: 1,-58 - 214: 1,-69 - 215: 1,-68 - 216: 1,-67 - 233: -2,-64 - 234: -2,-63 - 245: 1,-63 - 246: 1,-64 - 455: -9,-111 - 456: -9,-110 - 457: -9,-109 - 458: -9,-108 - 463: -2,-122 - 464: -2,-121 - 465: -2,-120 - 506: -6,-139 - 507: -6,-140 - 508: -6,-141 - 509: -6,-142 - 510: -6,-143 - 511: -6,-144 - 512: -6,-145 - 513: -6,-146 - 514: -6,-147 - 515: -6,-148 - 516: -6,-149 + 125: -6,-67 + 126: -6,-66 + 127: -6,-65 + 128: -6,-64 + 129: -6,-63 + 130: -6,-62 + 131: -6,-61 + 132: -6,-60 + 138: 1,-60 + 139: 1,-59 + 140: 1,-58 + 149: 1,-69 + 150: 1,-68 + 151: 1,-67 + 168: -2,-64 + 169: -2,-63 + 180: 1,-63 + 181: 1,-64 + 309: -9,-111 + 310: -9,-110 + 311: -9,-109 + 312: -9,-108 + 317: -2,-122 + 318: -2,-121 + 319: -2,-120 + 336: -6,-139 + 337: -6,-140 + 338: -6,-141 + 339: -6,-142 + 340: -6,-143 + 341: -6,-144 + 342: -6,-145 + 343: -6,-146 + 344: -6,-147 + 345: -6,-148 + 346: -6,-149 - node: color: '#DE3A3AFF' id: beepsky @@ -3009,12 +3009,12 @@ entities: color: '#FFFFFFFF' id: guy decals: - 1041: 4.9812827,-108.55144 + 793: 4.9812827,-108.55144 - node: color: '#FFFFFFFF' id: skull decals: - 1293: -7.134697,-145.81009 + 1044: -7.134697,-145.81009 - type: GridAtmosphere version: 2 data: @@ -5144,7 +5144,7 @@ entities: 1: 44680 -7,-63: 1: 61184 - 5: 12 + 3: 12 -7,-62: 1: 64443 -7,-61: @@ -5152,14 +5152,14 @@ entities: -7,-60: 1: 4369 -7,-64: - 3: 12 - 4: 3072 + 4: 12 + 5: 3072 -6,-64: - 3: 1 - 4: 256 + 4: 1 + 5: 256 1: 17476 -6,-63: - 5: 1 + 3: 1 1: 5956 -6,-62: 1: 4096 @@ -5169,7 +5169,7 @@ entities: 0: 52428 -6,-65: 1: 17476 - 3: 257 + 4: 257 -6,-60: 1: 1 -6,-59: @@ -5188,16 +5188,16 @@ entities: -7,-68: 0: 60928 -7,-66: - 3: 3084 + 4: 3084 -7,-65: - 3: 3084 + 4: 3084 -6,-68: 0: 65024 -6,-67: 1: 18176 0: 14 -6,-66: - 3: 257 + 4: 257 1: 17476 -5,-68: 0: 30464 @@ -5283,6 +5283,21 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.15 + moles: + - 0 + - 6666.982 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - volume: 2500 temperature: 293.15 moles: @@ -5313,21 +5328,6 @@ entities: - 0 - 0 - 0 - - volume: 2500 - temperature: 293.15 - moles: - - 0 - - 6666.982 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 chunkSize: 4 - type: GasTileOverlay - type: RadiationGridResistance @@ -11055,21 +11055,6 @@ entities: - type: Transform pos: -23.5,-257.5 parent: 2 - - uid: 17035 - components: - - type: Transform - pos: -23.5,-259.5 - parent: 2 - - uid: 17036 - components: - - type: Transform - pos: -24.5,-259.5 - parent: 2 - - uid: 17037 - components: - - type: Transform - pos: -25.5,-259.5 - parent: 2 - uid: 17038 components: - type: Transform @@ -11216,6 +11201,23 @@ entities: - type: Transform pos: -23.5,-253.5 parent: 2 +- proto: AtmosFixPlasmaMarker + entities: + - uid: 3102 + components: + - type: Transform + pos: -25.5,-259.5 + parent: 2 + - uid: 5223 + components: + - type: Transform + pos: -24.5,-259.5 + parent: 2 + - uid: 17035 + components: + - type: Transform + pos: -23.5,-259.5 + parent: 2 - proto: Autolathe entities: - uid: 614 @@ -28358,6 +28360,131 @@ entities: - type: Transform pos: -0.5,-248.5 parent: 2 + - uid: 17036 + components: + - type: Transform + pos: -14.5,-247.5 + parent: 2 + - uid: 17037 + components: + - type: Transform + pos: -13.5,-247.5 + parent: 2 + - uid: 17392 + components: + - type: Transform + pos: -13.5,-248.5 + parent: 2 + - uid: 17393 + components: + - type: Transform + pos: -12.5,-248.5 + parent: 2 + - uid: 17394 + components: + - type: Transform + pos: -11.5,-248.5 + parent: 2 + - uid: 17395 + components: + - type: Transform + pos: -10.5,-248.5 + parent: 2 + - uid: 17396 + components: + - type: Transform + pos: -9.5,-248.5 + parent: 2 + - uid: 17397 + components: + - type: Transform + pos: -8.5,-248.5 + parent: 2 + - uid: 17398 + components: + - type: Transform + pos: -7.5,-248.5 + parent: 2 + - uid: 17399 + components: + - type: Transform + pos: -5.5,-248.5 + parent: 2 + - uid: 17400 + components: + - type: Transform + pos: -3.5,-248.5 + parent: 2 + - uid: 17401 + components: + - type: Transform + pos: -4.5,-248.5 + parent: 2 + - uid: 17402 + components: + - type: Transform + pos: -1.5,-248.5 + parent: 2 + - uid: 17403 + components: + - type: Transform + pos: -6.5,-248.5 + parent: 2 + - uid: 17404 + components: + - type: Transform + pos: -2.5,-248.5 + parent: 2 + - uid: 17407 + components: + - type: Transform + pos: -13.5,-259.5 + parent: 2 + - uid: 17408 + components: + - type: Transform + pos: -13.5,-258.5 + parent: 2 + - uid: 17409 + components: + - type: Transform + pos: -13.5,-257.5 + parent: 2 + - uid: 17410 + components: + - type: Transform + pos: -13.5,-256.5 + parent: 2 + - uid: 17411 + components: + - type: Transform + pos: -13.5,-255.5 + parent: 2 + - uid: 17412 + components: + - type: Transform + pos: -13.5,-254.5 + parent: 2 + - uid: 17413 + components: + - type: Transform + pos: -13.5,-253.5 + parent: 2 + - uid: 17414 + components: + - type: Transform + pos: -13.5,-252.5 + parent: 2 + - uid: 17415 + components: + - type: Transform + pos: -13.5,-251.5 + parent: 2 + - uid: 17416 + components: + - type: Transform + pos: -13.5,-250.5 + parent: 2 - proto: CableHVStack entities: - uid: 3955 @@ -32001,6 +32128,12 @@ entities: - type: Transform pos: 3.5,-345.5 parent: 2 + - uid: 17405 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -14.5,-247.5 + parent: 2 - proto: CandleBlackInfinite entities: - uid: 4705 @@ -34957,12 +35090,6 @@ entities: rot: 1.5707963267948966 rad pos: -6.627699,-1.5039027 parent: 2 - - uid: 5223 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -13.5,-247.5 - parent: 2 - uid: 5224 components: - type: Transform @@ -49666,13 +49793,6 @@ entities: - type: Transform pos: -24.5,-253.5 parent: 2 -- proto: GasMinerPlasma - entities: - - uid: 3102 - components: - - type: Transform - pos: -24.5,-259.5 - parent: 2 - proto: GasMinerWaterVapor entities: - uid: 11306 @@ -76186,7 +76306,7 @@ entities: pos: 8.5,-176.5 parent: 2 - type: Door - secondsUntilStateChange: -147335.61 + secondsUntilStateChange: -147491.25 state: Closing - uid: 11227 components: @@ -88259,6 +88379,11 @@ entities: - type: Transform pos: 13.5,-253.5 parent: 2 + - uid: 17406 + components: + - type: Transform + pos: -13.5,-247.5 + parent: 2 - proto: SmokingPipeFilledCannabis entities: - uid: 13221 From 25afc2653d094bd0c7b8fc72529a11ade22e070c Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Fri, 9 Aug 2024 00:50:56 +0200 Subject: [PATCH 268/422] Add RD labcoat in RD's dresser (#30671) --- Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml index 036448b00c..d04b6aff60 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml @@ -105,6 +105,7 @@ - id: ClothingHandsGlovesColorPurple - id: ClothingEyesGlasses - id: ClothingOuterWinterRD + - id: ClothingOuterCoatRD - type: entity id: DresserWardenFilled From c43fcdfa06cc44d3c61b6a930de2e4f2ca7d0a7e Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 8 Aug 2024 22:52:05 +0000 Subject: [PATCH 269/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index c196b78d4a..ba53573989 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: Killerqu00 - changes: - - message: Revolutionaries can now cuff command members in order to seize control - of the station. - type: Tweak - id: 6563 - time: '2024-05-09T06:48:32.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27627 - author: vorkathbruh changes: - message: Nuclear operative agents now require time in Chemistry rather than time @@ -3786,3 +3778,10 @@ id: 7062 time: '2024-08-08T13:17:50.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29997 +- author: lzk228 + changes: + - message: RD labcoat added in RD's dresser. + type: Add + id: 7063 + time: '2024-08-08T22:50:57.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30671 From 07174d0aaf2832bc6ecc3a6baba21bc0aa5e0556 Mon Sep 17 00:00:00 2001 From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Date: Fri, 9 Aug 2024 01:27:27 +0200 Subject: [PATCH 270/422] Better DNA forensics & ReagentData (#26699) * Added the ability for blood to track DNA using ReagentData; Forensic Scanner now accounts for solution DNA, non-DNA holders have "Unknown DNA" * Removes touch DNA for puddles, adds DNA to vomit * DNA now leaves traces in containers and those marked without don't show DNA on scan (except for puddles), gibbed parts have DNA * Fix stupid metamorphic glass bug grrr * Removed SpillableComponent since DnaSubstanceTraceComponent is used instead * Removes data field from maps, adds DNA tracking for some missed items * Give default value, fix missing values. * Fixes recipe bug * Review changes * Make the Data list into a nullable type * Revert map changes * Move gibbed unknown DNA to forensicssystem --- .../Forensics/ForensicScannerMenu.xaml.cs | 8 ++- .../Body/Systems/BloodstreamSystem.cs | 63 ++++++++++++++--- .../Chemistry/EntitySystems/VaporSystem.cs | 2 +- .../TileReactions/CleanDecalsReaction.cs | 4 +- .../TileReactions/CleanTileReaction.cs | 3 +- .../TileReactions/CreateEntityTileReaction.cs | 3 +- .../TileReactions/ExtinguishTileReaction.cs | 3 +- .../TileReactions/FlammableTileReaction.cs | 3 +- .../TileReactions/PryTileReaction.cs | 5 +- .../SpillIfPuddlePresentTileReaction.cs | 5 +- .../TileReactions/SpillTileReaction.cs | 5 +- .../Fluids/EntitySystems/PuddleSystem.cs | 2 +- .../Fluids/EntitySystems/SmokeSystem.cs | 2 +- .../Components/DnaSubstanceTraceComponent.cs | 9 +++ .../Components/ForensicScannerComponent.cs | 8 ++- .../Systems/ForensicScannerSystem.cs | 34 ++++++++-- .../Forensics/Systems/ForensicsSystem.cs | 67 +++++++++++++++++-- .../Implants/SubdermalImplantSystem.cs | 6 +- Content.Server/Medical/VomitSystem.cs | 4 +- .../Chemistry/Components/Solution.cs | 10 +-- .../SharedSolutionContainerSystem.cs | 6 +- .../Chemistry/Reaction/ITileReaction.cs | 5 +- Content.Shared/Chemistry/Reagent/DNAData.cs | 28 ++++++++ Content.Shared/Chemistry/Reagent/ReagentId.cs | 25 ++++--- .../Chemistry/Reagent/ReagentPrototype.cs | 4 +- .../Chemistry/Reagent/ReagentQuantity.cs | 4 +- Content.Shared/Forensics/Events.cs | 17 +++++ .../Forensics/ForensicScannerEvent.cs | 9 ++- .../Locale/en-US/forensics/forensics.ftl | 4 +- .../Prototypes/Entities/Effects/puddle.yml | 3 + .../Consumable/Drinks/drinks-cartons.yml | 1 + .../Objects/Consumable/Drinks/drinks.yml | 1 + .../Consumable/Drinks/drinks_bottles.yml | 1 + .../Objects/Consumable/Drinks/drinks_cans.yml | 1 + .../Objects/Consumable/Drinks/drinks_cups.yml | 1 + .../Consumable/Drinks/drinks_special.yml | 1 + .../Consumable/Drinks/trash_drinks.yml | 1 + .../Objects/Specific/Janitorial/janitor.yml | 3 + .../Objects/Specific/chemical-containers.yml | 1 + .../Objects/Specific/chemistry-bottles.yml | 1 + .../Objects/Specific/chemistry-vials.yml | 1 + .../Entities/Objects/Specific/chemistry.yml | 3 + .../Entities/Objects/Tools/bucket.yml | 1 + .../Structures/Specific/Janitor/janicart.yml | 2 + Resources/Prototypes/tags.yml | 3 + 45 files changed, 307 insertions(+), 66 deletions(-) create mode 100644 Content.Server/Forensics/Components/DnaSubstanceTraceComponent.cs create mode 100644 Content.Shared/Chemistry/Reagent/DNAData.cs diff --git a/Content.Client/Forensics/ForensicScannerMenu.xaml.cs b/Content.Client/Forensics/ForensicScannerMenu.xaml.cs index 5f7f8e0056..dd013ed235 100644 --- a/Content.Client/Forensics/ForensicScannerMenu.xaml.cs +++ b/Content.Client/Forensics/ForensicScannerMenu.xaml.cs @@ -54,10 +54,16 @@ namespace Content.Client.Forensics } text.AppendLine(); text.AppendLine(Loc.GetString("forensic-scanner-interface-dnas")); - foreach (var dna in msg.DNAs) + foreach (var dna in msg.TouchDNAs) { text.AppendLine(dna); } + foreach (var dna in msg.SolutionDNAs) + { + if (msg.TouchDNAs.Contains(dna)) + continue; + text.AppendLine(dna); + } text.AppendLine(); text.AppendLine(Loc.GetString("forensic-scanner-interface-residues")); foreach (var residue in msg.Residues) diff --git a/Content.Server/Body/Systems/BloodstreamSystem.cs b/Content.Server/Body/Systems/BloodstreamSystem.cs index a8a86028d4..9647634a9e 100644 --- a/Content.Server/Body/Systems/BloodstreamSystem.cs +++ b/Content.Server/Body/Systems/BloodstreamSystem.cs @@ -8,10 +8,12 @@ using Content.Shared.Alert; using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Chemistry.Reaction; +using Content.Shared.Chemistry.Reagent; using Content.Shared.Damage; using Content.Shared.Damage.Prototypes; using Content.Shared.Drunk; using Content.Shared.FixedPoint; +using Content.Shared.Forensics; using Content.Shared.HealthExaminable; using Content.Shared.Mobs.Systems; using Content.Shared.Popups; @@ -54,6 +56,7 @@ public sealed class BloodstreamSystem : EntitySystem SubscribeLocalEvent(OnReactionAttempt); SubscribeLocalEvent>(OnReactionAttempt); SubscribeLocalEvent(OnRejuvenate); + SubscribeLocalEvent(OnDnaGenerated); } private void OnMapInit(Entity ent, ref MapInitEvent args) @@ -183,8 +186,18 @@ public sealed class BloodstreamSystem : EntitySystem bloodSolution.MaxVolume = entity.Comp.BloodMaxVolume; tempSolution.MaxVolume = entity.Comp.BleedPuddleThreshold * 4; // give some leeway, for chemstream as well + // Ensure blood that should have DNA has it; must be run here, in case DnaComponent has not yet been initialized + + if (TryComp(entity.Owner, out var donorComp) && donorComp.DNA == String.Empty) + { + donorComp.DNA = _forensicsSystem.GenerateDNA(); + + var ev = new GenerateDnaEvent { Owner = entity.Owner, DNA = donorComp.DNA }; + RaiseLocalEvent(entity.Owner, ref ev); + } + // Fill blood solution with BLOOD - bloodSolution.AddReagent(entity.Comp.BloodReagent, entity.Comp.BloodMaxVolume - bloodSolution.Volume); + bloodSolution.AddReagent(new ReagentId(entity.Comp.BloodReagent, GetEntityBloodData(entity.Owner)), entity.Comp.BloodMaxVolume - bloodSolution.Volume); } private void OnDamageChanged(Entity ent, ref DamageChangedEvent args) @@ -349,7 +362,7 @@ public sealed class BloodstreamSystem : EntitySystem } if (amount >= 0) - return _solutionContainerSystem.TryAddReagent(component.BloodSolution.Value, component.BloodReagent, amount, out _); + return _solutionContainerSystem.TryAddReagent(component.BloodSolution.Value, component.BloodReagent, amount, null, GetEntityBloodData(uid)); // Removal is more involved, // since we also wanna handle moving it to the temporary solution @@ -370,10 +383,7 @@ public sealed class BloodstreamSystem : EntitySystem tempSolution.AddSolution(temp, _prototypeManager); } - if (_puddleSystem.TrySpillAt(uid, tempSolution, out var puddleUid, sound: false)) - { - _forensicsSystem.TransferDna(puddleUid, uid, canDnaBeCleaned: false); - } + _puddleSystem.TrySpillAt(uid, tempSolution, out var puddleUid, sound: false); tempSolution.RemoveAllSolution(); } @@ -436,10 +446,7 @@ public sealed class BloodstreamSystem : EntitySystem _solutionContainerSystem.RemoveAllSolution(component.TemporarySolution.Value); } - if (_puddleSystem.TrySpillAt(uid, tempSol, out var puddleUid)) - { - _forensicsSystem.TransferDna(puddleUid, uid, canDnaBeCleaned: false); - } + _puddleSystem.TrySpillAt(uid, tempSol, out var puddleUid); } /// @@ -464,6 +471,40 @@ public sealed class BloodstreamSystem : EntitySystem component.BloodReagent = reagent; if (currentVolume > 0) - _solutionContainerSystem.TryAddReagent(component.BloodSolution.Value, component.BloodReagent, currentVolume, out _); + _solutionContainerSystem.TryAddReagent(component.BloodSolution.Value, component.BloodReagent, currentVolume, null, GetEntityBloodData(uid)); + } + + private void OnDnaGenerated(Entity entity, ref GenerateDnaEvent args) + { + if (_solutionContainerSystem.ResolveSolution(entity.Owner, entity.Comp.BloodSolutionName, ref entity.Comp.BloodSolution, out var bloodSolution)) + { + foreach (var reagent in bloodSolution.Contents) + { + List reagentData = reagent.Reagent.EnsureReagentData(); + reagentData.RemoveAll(x => x is DnaData); + reagentData.AddRange(GetEntityBloodData(entity.Owner)); + } + } + } + + /// + /// Get the reagent data for blood that a specific entity should have. + /// + public List GetEntityBloodData(EntityUid uid) + { + var bloodData = new List(); + var dnaData = new DnaData(); + + if (TryComp(uid, out var donorComp)) + { + dnaData.DNA = donorComp.DNA; + } else + { + dnaData.DNA = Loc.GetString("forensics-dna-unknown"); + } + + bloodData.Add(dnaData); + + return bloodData; } } diff --git a/Content.Server/Chemistry/EntitySystems/VaporSystem.cs b/Content.Server/Chemistry/EntitySystems/VaporSystem.cs index dbb8572299..5093b59409 100644 --- a/Content.Server/Chemistry/EntitySystems/VaporSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/VaporSystem.cs @@ -123,7 +123,7 @@ namespace Content.Server.Chemistry.EntitySystems var reagent = _protoManager.Index(reagentQuantity.Reagent.Prototype); var reaction = - reagent.ReactionTile(tile, (reagentQuantity.Quantity / vapor.TransferAmount) * 0.25f, EntityManager); + reagent.ReactionTile(tile, (reagentQuantity.Quantity / vapor.TransferAmount) * 0.25f, EntityManager, reagentQuantity.Reagent.Data); if (reaction > reagentQuantity.Quantity) { diff --git a/Content.Server/Chemistry/TileReactions/CleanDecalsReaction.cs b/Content.Server/Chemistry/TileReactions/CleanDecalsReaction.cs index 6958dabb81..5047a26052 100644 --- a/Content.Server/Chemistry/TileReactions/CleanDecalsReaction.cs +++ b/Content.Server/Chemistry/TileReactions/CleanDecalsReaction.cs @@ -21,10 +21,12 @@ public sealed partial class CleanDecalsReaction : ITileReaction [DataField] public FixedPoint2 CleanCost { get; private set; } = FixedPoint2.New(0.25f); + public FixedPoint2 TileReact(TileRef tile, ReagentPrototype reagent, FixedPoint2 reactVolume, - IEntityManager entityManager) + IEntityManager entityManager, + List? data) { if (reactVolume <= CleanCost || !entityManager.TryGetComponent(tile.GridUid, out var grid) || diff --git a/Content.Server/Chemistry/TileReactions/CleanTileReaction.cs b/Content.Server/Chemistry/TileReactions/CleanTileReaction.cs index 08f77de72d..ad02cb8ff9 100644 --- a/Content.Server/Chemistry/TileReactions/CleanTileReaction.cs +++ b/Content.Server/Chemistry/TileReactions/CleanTileReaction.cs @@ -34,7 +34,8 @@ public sealed partial class CleanTileReaction : ITileReaction FixedPoint2 ITileReaction.TileReact(TileRef tile, ReagentPrototype reagent, FixedPoint2 reactVolume, - IEntityManager entityManager) + IEntityManager entityManager + , List? data) { var entities = entityManager.System().GetLocalEntitiesIntersecting(tile, 0f).ToArray(); var puddleQuery = entityManager.GetEntityQuery(); diff --git a/Content.Server/Chemistry/TileReactions/CreateEntityTileReaction.cs b/Content.Server/Chemistry/TileReactions/CreateEntityTileReaction.cs index 6b106b1fc0..0249b6255a 100644 --- a/Content.Server/Chemistry/TileReactions/CreateEntityTileReaction.cs +++ b/Content.Server/Chemistry/TileReactions/CreateEntityTileReaction.cs @@ -38,7 +38,8 @@ public sealed partial class CreateEntityTileReaction : ITileReaction public FixedPoint2 TileReact(TileRef tile, ReagentPrototype reagent, FixedPoint2 reactVolume, - IEntityManager entityManager) + IEntityManager entityManager, + List? data) { if (reactVolume >= Usage) { diff --git a/Content.Server/Chemistry/TileReactions/ExtinguishTileReaction.cs b/Content.Server/Chemistry/TileReactions/ExtinguishTileReaction.cs index 198f650ac1..2b9475235f 100644 --- a/Content.Server/Chemistry/TileReactions/ExtinguishTileReaction.cs +++ b/Content.Server/Chemistry/TileReactions/ExtinguishTileReaction.cs @@ -17,7 +17,8 @@ namespace Content.Server.Chemistry.TileReactions public FixedPoint2 TileReact(TileRef tile, ReagentPrototype reagent, FixedPoint2 reactVolume, - IEntityManager entityManager) + IEntityManager entityManager, + List? data) { if (reactVolume <= FixedPoint2.Zero || tile.Tile.IsEmpty) return FixedPoint2.Zero; diff --git a/Content.Server/Chemistry/TileReactions/FlammableTileReaction.cs b/Content.Server/Chemistry/TileReactions/FlammableTileReaction.cs index b13b70d3d5..dd0b4960ef 100644 --- a/Content.Server/Chemistry/TileReactions/FlammableTileReaction.cs +++ b/Content.Server/Chemistry/TileReactions/FlammableTileReaction.cs @@ -16,7 +16,8 @@ namespace Content.Server.Chemistry.TileReactions public FixedPoint2 TileReact(TileRef tile, ReagentPrototype reagent, FixedPoint2 reactVolume, - IEntityManager entityManager) + IEntityManager entityManager, + List? data) { if (reactVolume <= FixedPoint2.Zero || tile.Tile.IsEmpty) return FixedPoint2.Zero; diff --git a/Content.Server/Chemistry/TileReactions/PryTileReaction.cs b/Content.Server/Chemistry/TileReactions/PryTileReaction.cs index c10b031720..49971475c1 100644 --- a/Content.Server/Chemistry/TileReactions/PryTileReaction.cs +++ b/Content.Server/Chemistry/TileReactions/PryTileReaction.cs @@ -1,4 +1,4 @@ -using Content.Server.Maps; +using Content.Server.Maps; using Content.Shared.Chemistry.Reaction; using Content.Shared.Chemistry.Reagent; using Content.Shared.FixedPoint; @@ -15,7 +15,8 @@ public sealed partial class PryTileReaction : ITileReaction public FixedPoint2 TileReact(TileRef tile, ReagentPrototype reagent, FixedPoint2 reactVolume, - IEntityManager entityManager) + IEntityManager entityManager, + List? data) { var sys = entityManager.System(); sys.PryTile(tile); diff --git a/Content.Server/Chemistry/TileReactions/SpillIfPuddlePresentTileReaction.cs b/Content.Server/Chemistry/TileReactions/SpillIfPuddlePresentTileReaction.cs index 6b46b89495..8c8b371da3 100644 --- a/Content.Server/Chemistry/TileReactions/SpillIfPuddlePresentTileReaction.cs +++ b/Content.Server/Chemistry/TileReactions/SpillIfPuddlePresentTileReaction.cs @@ -15,13 +15,14 @@ namespace Content.Server.Chemistry.TileReactions public FixedPoint2 TileReact(TileRef tile, ReagentPrototype reagent, FixedPoint2 reactVolume, - IEntityManager entityManager) + IEntityManager entityManager, + List? data) { var spillSystem = entityManager.System(); if (reactVolume < 5 || !spillSystem.TryGetPuddle(tile, out _)) return FixedPoint2.Zero; - return spillSystem.TrySpillAt(tile, new Solution(reagent.ID, reactVolume), out _, sound: false, tileReact: false) + return spillSystem.TrySpillAt(tile, new Solution(reagent.ID, reactVolume, data), out _, sound: false, tileReact: false) ? reactVolume : FixedPoint2.Zero; } diff --git a/Content.Server/Chemistry/TileReactions/SpillTileReaction.cs b/Content.Server/Chemistry/TileReactions/SpillTileReaction.cs index fadc7147c9..f9fb2b90d0 100644 --- a/Content.Server/Chemistry/TileReactions/SpillTileReaction.cs +++ b/Content.Server/Chemistry/TileReactions/SpillTileReaction.cs @@ -29,13 +29,14 @@ namespace Content.Server.Chemistry.TileReactions public FixedPoint2 TileReact(TileRef tile, ReagentPrototype reagent, FixedPoint2 reactVolume, - IEntityManager entityManager) + IEntityManager entityManager, + List? data) { if (reactVolume < 5) return FixedPoint2.Zero; if (entityManager.EntitySysManager.GetEntitySystem() - .TrySpillAt(tile, new Solution(reagent.ID, reactVolume), out var puddleUid, false, false)) + .TrySpillAt(tile, new Solution(reagent.ID, reactVolume, data), out var puddleUid, false, false)) { var slippery = entityManager.EnsureComponent(puddleUid); slippery.LaunchForwardsMultiplier = _launchForwardsMultiplier; diff --git a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs index a232ed8c0e..67ba2a76bb 100644 --- a/Content.Server/Fluids/EntitySystems/PuddleSystem.cs +++ b/Content.Server/Fluids/EntitySystems/PuddleSystem.cs @@ -712,7 +712,7 @@ public sealed partial class PuddleSystem : SharedPuddleSystem { var (reagent, quantity) = solution.Contents[i]; var proto = _prototypeManager.Index(reagent.Prototype); - var removed = proto.ReactionTile(tileRef, quantity, EntityManager); + var removed = proto.ReactionTile(tileRef, quantity, EntityManager, reagent.Data); if (removed <= FixedPoint2.Zero) continue; diff --git a/Content.Server/Fluids/EntitySystems/SmokeSystem.cs b/Content.Server/Fluids/EntitySystems/SmokeSystem.cs index 78693bfdbc..72450562f1 100644 --- a/Content.Server/Fluids/EntitySystems/SmokeSystem.cs +++ b/Content.Server/Fluids/EntitySystems/SmokeSystem.cs @@ -315,7 +315,7 @@ public sealed class SmokeSystem : EntitySystem continue; var reagent = _prototype.Index(reagentQuantity.Reagent.Prototype); - reagent.ReactionTile(tile, reagentQuantity.Quantity, EntityManager); + reagent.ReactionTile(tile, reagentQuantity.Quantity, EntityManager, reagentQuantity.Reagent.Data); } } diff --git a/Content.Server/Forensics/Components/DnaSubstanceTraceComponent.cs b/Content.Server/Forensics/Components/DnaSubstanceTraceComponent.cs new file mode 100644 index 0000000000..7b3cb978f2 --- /dev/null +++ b/Content.Server/Forensics/Components/DnaSubstanceTraceComponent.cs @@ -0,0 +1,9 @@ +namespace Content.Server.Forensics; + +/// +/// This component stops the entity from leaving finger prints, +/// usually so fibres can be left instead. +/// +[RegisterComponent] +public sealed partial class DnaSubstanceTraceComponent : Component +{ } diff --git a/Content.Server/Forensics/Components/ForensicScannerComponent.cs b/Content.Server/Forensics/Components/ForensicScannerComponent.cs index ad26213848..033ea913c3 100644 --- a/Content.Server/Forensics/Components/ForensicScannerComponent.cs +++ b/Content.Server/Forensics/Components/ForensicScannerComponent.cs @@ -26,7 +26,13 @@ namespace Content.Server.Forensics /// DNA that the forensic scanner found from the on an entity. /// [ViewVariables(VVAccess.ReadOnly), DataField("dnas")] - public List DNAs = new(); + public List TouchDNAs = new(); + + /// + /// DNA that the forensic scanner found from the solution containers in an entity. + /// + [ViewVariables(VVAccess.ReadOnly), DataField] + public List SolutionDNAs = new(); /// /// Residue that the forensic scanner found from the on an entity. diff --git a/Content.Server/Forensics/Systems/ForensicScannerSystem.cs b/Content.Server/Forensics/Systems/ForensicScannerSystem.cs index 80062569b8..b6dc068f78 100644 --- a/Content.Server/Forensics/Systems/ForensicScannerSystem.cs +++ b/Content.Server/Forensics/Systems/ForensicScannerSystem.cs @@ -3,16 +3,19 @@ using System.Text; using Content.Server.Popups; using Content.Shared.UserInterface; using Content.Shared.DoAfter; +using Content.Shared.Fluids.Components; using Content.Shared.Forensics; using Content.Shared.Hands.EntitySystems; using Content.Shared.Interaction; using Content.Shared.Paper; using Content.Shared.Verbs; +using Content.Shared.Tag; using Robust.Shared.Audio.Systems; using Robust.Server.GameObjects; using Robust.Shared.Audio; using Robust.Shared.Player; using Robust.Shared.Timing; +using Content.Server.Chemistry.Containers.EntitySystems; // todo: remove this stinky LINQy namespace Content.Server.Forensics @@ -27,6 +30,9 @@ namespace Content.Server.Forensics [Dependency] private readonly SharedHandsSystem _handsSystem = default!; [Dependency] private readonly SharedAudioSystem _audioSystem = default!; [Dependency] private readonly MetaDataSystem _metaData = default!; + [Dependency] private readonly ForensicsSystem _forensicsSystem = default!; + [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!; + [Dependency] private readonly TagSystem _tag = default!; public override void Initialize() { @@ -46,7 +52,8 @@ namespace Content.Server.Forensics var state = new ForensicScannerBoundUserInterfaceState( component.Fingerprints, component.Fibers, - component.DNAs, + component.TouchDNAs, + component.SolutionDNAs, component.Residues, component.LastScannedName, component.PrintCooldown, @@ -69,18 +76,25 @@ namespace Content.Server.Forensics { scanner.Fingerprints = new(); scanner.Fibers = new(); - scanner.DNAs = new(); + scanner.TouchDNAs = new(); scanner.Residues = new(); } - else { scanner.Fingerprints = forensics.Fingerprints.ToList(); scanner.Fibers = forensics.Fibers.ToList(); - scanner.DNAs = forensics.DNAs.ToList(); + scanner.TouchDNAs = forensics.DNAs.ToList(); scanner.Residues = forensics.Residues.ToList(); } + if (_tag.HasTag(args.Args.Target.Value, "DNASolutionScannable")) + { + scanner.SolutionDNAs = _forensicsSystem.GetSolutionsDNA(args.Args.Target.Value); + } else + { + scanner.SolutionDNAs = new(); + } + scanner.LastScannedName = MetaData(args.Args.Target.Value).EntityName; } @@ -206,10 +220,17 @@ namespace Content.Server.Forensics } text.AppendLine(); text.AppendLine(Loc.GetString("forensic-scanner-interface-dnas")); - foreach (var dna in component.DNAs) + foreach (var dna in component.TouchDNAs) { text.AppendLine(dna); } + foreach (var dna in component.SolutionDNAs) + { + Log.Debug(dna); + if (component.TouchDNAs.Contains(dna)) + continue; + text.AppendLine(dna); + } text.AppendLine(); text.AppendLine(Loc.GetString("forensic-scanner-interface-residues")); foreach (var residue in component.Residues) @@ -232,7 +253,8 @@ namespace Content.Server.Forensics { component.Fingerprints = new(); component.Fibers = new(); - component.DNAs = new(); + component.TouchDNAs = new(); + component.SolutionDNAs = new(); component.LastScannedName = string.Empty; UpdateUserInterface(uid, component); diff --git a/Content.Server/Forensics/Systems/ForensicsSystem.cs b/Content.Server/Forensics/Systems/ForensicsSystem.cs index c0d990aa59..ec311d136a 100644 --- a/Content.Server/Forensics/Systems/ForensicsSystem.cs +++ b/Content.Server/Forensics/Systems/ForensicsSystem.cs @@ -1,11 +1,16 @@ using Content.Server.Body.Components; +using Content.Server.Chemistry.Containers.EntitySystems; using Content.Server.DoAfter; using Content.Server.Fluids.EntitySystems; using Content.Server.Forensics.Components; using Content.Server.Popups; +using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Popups; using Content.Shared.Chemistry.Components; +using Content.Shared.Chemistry.Reagent; +using Content.Shared.Chemistry.Components.SolutionManager; using Content.Shared.DoAfter; +using Content.Shared.Fluids.Components; using Content.Shared.Forensics; using Content.Shared.Interaction; using Content.Shared.Interaction.Events; @@ -23,20 +28,35 @@ namespace Content.Server.Forensics [Dependency] private readonly InventorySystem _inventory = default!; [Dependency] private readonly DoAfterSystem _doAfterSystem = default!; [Dependency] private readonly PopupSystem _popupSystem = default!; + [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!; + public override void Initialize() { SubscribeLocalEvent(OnInteract); SubscribeLocalEvent(OnFingerprintInit); SubscribeLocalEvent(OnDNAInit); - SubscribeLocalEvent(OnBeingGibbed); + SubscribeLocalEvent(OnBeingGibbed); SubscribeLocalEvent(OnMeleeHit); SubscribeLocalEvent(OnRehydrated); SubscribeLocalEvent(OnAfterInteract, after: new[] { typeof(AbsorbentSystem) }); SubscribeLocalEvent(OnCleanForensicsDoAfter); SubscribeLocalEvent(OnTransferDnaEvent); + SubscribeLocalEvent(OnSolutionChanged); SubscribeLocalEvent>(OnUtilityVerb); + } + private void OnSolutionChanged(Entity ent, ref SolutionContainerChangedEvent ev) + { + var soln = GetSolutionsDNA(ev.Solution); + if (soln.Count > 0) + { + var comp = EnsureComp(ent.Owner); + foreach (string dna in soln) + { + comp.DNAs.Add(dna); + } + } } private void OnInteract(EntityUid uid, FingerprintComponent component, ContactInteractionEvent args) @@ -51,15 +71,26 @@ namespace Content.Server.Forensics private void OnDNAInit(EntityUid uid, DnaComponent component, MapInitEvent args) { - component.DNA = GenerateDNA(); + if (component.DNA == String.Empty) + { + component.DNA = GenerateDNA(); + + var ev = new GenerateDnaEvent { Owner = uid, DNA = component.DNA }; + RaiseLocalEvent(uid, ref ev); + } } - private void OnBeingGibbed(EntityUid uid, DnaComponent component, BeingGibbedEvent args) + private void OnBeingGibbed(EntityUid uid, ForensicsComponent component, BeingGibbedEvent args) { + string dna = Loc.GetString("forensics-dna-unknown"); + + if (TryComp(uid, out DnaComponent? dnaComp)) + dna = dnaComp.DNA; + foreach (EntityUid part in args.GibbedParts) { var partComp = EnsureComp(part); - partComp.DNAs.Add(component.DNA); + partComp.DNAs.Add(dna); partComp.CanDnaBeCleaned = false; } } @@ -106,6 +137,34 @@ namespace Content.Server.Forensics } } + public List GetSolutionsDNA(EntityUid uid) + { + List list = new(); + if (TryComp(uid, out var comp)) + { + foreach (var (_, soln) in _solutionContainerSystem.EnumerateSolutions((uid, comp))) + { + list.AddRange(GetSolutionsDNA(soln.Comp.Solution)); + } + } + return list; + } + + public List GetSolutionsDNA(Solution soln) + { + List list = new(); + foreach (var reagent in soln.Contents) + { + foreach (var data in reagent.Reagent.EnsureReagentData()) + { + if (data is DnaData) + { + list.Add(((DnaData) data).DNA); + } + } + } + return list; + } private void OnAfterInteract(Entity cleanForensicsEntity, ref AfterInteractEvent args) { if (args.Handled || !args.CanReach || args.Target == null) diff --git a/Content.Server/Implants/SubdermalImplantSystem.cs b/Content.Server/Implants/SubdermalImplantSystem.cs index 88c5fb9459..7c69ec8ea5 100644 --- a/Content.Server/Implants/SubdermalImplantSystem.cs +++ b/Content.Server/Implants/SubdermalImplantSystem.cs @@ -1,10 +1,11 @@ -using Content.Server.Cuffs; +using Content.Server.Cuffs; using Content.Server.Forensics; using Content.Server.Humanoid; using Content.Server.Implants.Components; using Content.Server.Store.Components; using Content.Server.Store.Systems; using Content.Shared.Cuffs.Components; +using Content.Shared.Forensics; using Content.Shared.Humanoid; using Content.Shared.Implants; using Content.Shared.Implants.Components; @@ -212,6 +213,9 @@ public sealed class SubdermalImplantSystem : SharedSubdermalImplantSystem if (TryComp(ent, out var dna)) { dna.DNA = _forensicsSystem.GenerateDNA(); + + var ev = new GenerateDnaEvent { Owner = ent, DNA = dna.DNA }; + RaiseLocalEvent(ent, ref ev); } if (TryComp(ent, out var fingerprint)) { diff --git a/Content.Server/Medical/VomitSystem.cs b/Content.Server/Medical/VomitSystem.cs index ec04a27db6..4cc4e538ce 100644 --- a/Content.Server/Medical/VomitSystem.cs +++ b/Content.Server/Medical/VomitSystem.cs @@ -6,6 +6,7 @@ using Content.Server.Forensics; using Content.Server.Popups; using Content.Server.Stunnable; using Content.Shared.Chemistry.Components; +using Content.Shared.Chemistry.Reagent; using Content.Shared.IdentityManagement; using Content.Shared.Nutrition.Components; using Content.Shared.Nutrition.EntitySystems; @@ -28,6 +29,7 @@ namespace Content.Server.Medical [Dependency] private readonly StunSystem _stun = default!; [Dependency] private readonly ThirstSystem _thirst = default!; [Dependency] private readonly ForensicsSystem _forensics = default!; + [Dependency] private readonly BloodstreamSystem _bloodstream = default!; /// /// Make an entity vomit, if they have a stomach. @@ -83,7 +85,7 @@ namespace Content.Server.Medical } // Makes a vomit solution the size of 90% of the chemicals removed from the chemstream - solution.AddReagent("Vomit", vomitAmount); // TODO: Dehardcode vomit prototype + solution.AddReagent(new ReagentId("Vomit", _bloodstream.GetEntityBloodData(uid)), vomitAmount); // TODO: Dehardcode vomit prototype } if (_puddle.TrySpillAt(uid, solution, out var puddle, false)) diff --git a/Content.Shared/Chemistry/Components/Solution.cs b/Content.Shared/Chemistry/Components/Solution.cs index 4de3c369f7..725a685a8b 100644 --- a/Content.Shared/Chemistry/Components/Solution.cs +++ b/Content.Shared/Chemistry/Components/Solution.cs @@ -147,7 +147,7 @@ namespace Content.Shared.Chemistry.Components /// /// The prototype ID of the reagent to add. /// The quantity in milli-units. - public Solution(string prototype, FixedPoint2 quantity, ReagentData? data = null) : this() + public Solution(string prototype, FixedPoint2 quantity, List? data = null) : this() { AddReagent(new ReagentId(prototype, data), quantity); } @@ -243,7 +243,7 @@ namespace Content.Shared.Chemistry.Components return false; } - public bool ContainsReagent(string reagentId, ReagentData? data) + public bool ContainsReagent(string reagentId, List? data) => ContainsReagent(new(reagentId, data)); public bool TryGetReagent(ReagentId id, out ReagentQuantity quantity) @@ -404,7 +404,7 @@ namespace Content.Shared.Chemistry.Components /// /// The prototype of the reagent to add. /// The quantity in milli-units. - public void AddReagent(ReagentPrototype proto, FixedPoint2 quantity, float temperature, IPrototypeManager? protoMan, ReagentData? data = null) + public void AddReagent(ReagentPrototype proto, FixedPoint2 quantity, float temperature, IPrototypeManager? protoMan, List? data = null) { if (_heatCapacityDirty) UpdateHeatCapacity(protoMan); @@ -489,7 +489,7 @@ namespace Content.Shared.Chemistry.Components { var (reagent, curQuantity) = Contents[i]; - if(reagent != toRemove.Reagent) + if(reagent.Prototype != toRemove.Reagent.Prototype) continue; var newQuantity = curQuantity - toRemove.Quantity; @@ -523,7 +523,7 @@ namespace Content.Shared.Chemistry.Components /// The prototype of the reagent to be removed. /// The amount of reagent to remove. /// How much reagent was actually removed. Zero if the reagent is not present on the solution. - public FixedPoint2 RemoveReagent(string prototype, FixedPoint2 quantity, ReagentData? data = null) + public FixedPoint2 RemoveReagent(string prototype, FixedPoint2 quantity, List? data = null) { return RemoveReagent(new ReagentQuantity(prototype, quantity, data)); } diff --git a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs index 7e00157b6e..ad9cd01fbf 100644 --- a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs +++ b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs @@ -452,7 +452,7 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem /// The amount of reagent to add. /// If all the reagent could be added. [PublicAPI] - public bool TryAddReagent(Entity soln, string prototype, FixedPoint2 quantity, float? temperature = null, ReagentData? data = null) + public bool TryAddReagent(Entity soln, string prototype, FixedPoint2 quantity, float? temperature = null, List? data = null) => TryAddReagent(soln, new ReagentQuantity(prototype, quantity, data), out _, temperature); /// @@ -464,7 +464,7 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem /// The amount of reagent to add. /// The amount of reagent successfully added. /// If all the reagent could be added. - public bool TryAddReagent(Entity soln, string prototype, FixedPoint2 quantity, out FixedPoint2 acceptedQuantity, float? temperature = null, ReagentData? data = null) + public bool TryAddReagent(Entity soln, string prototype, FixedPoint2 quantity, out FixedPoint2 acceptedQuantity, float? temperature = null, List? data = null) { var reagent = new ReagentQuantity(prototype, quantity, data); return TryAddReagent(soln, reagent, out acceptedQuantity, temperature); @@ -513,7 +513,7 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem /// The Id of the reagent to remove. /// The amount of reagent to remove. /// If the reagent to remove was found in the container. - public bool RemoveReagent(Entity soln, string prototype, FixedPoint2 quantity, ReagentData? data = null) + public bool RemoveReagent(Entity soln, string prototype, FixedPoint2 quantity, List? data = null) { return RemoveReagent(soln, new ReagentQuantity(prototype, quantity, data)); } diff --git a/Content.Shared/Chemistry/Reaction/ITileReaction.cs b/Content.Shared/Chemistry/Reaction/ITileReaction.cs index af6cc34f48..31b7c9129c 100644 --- a/Content.Shared/Chemistry/Reaction/ITileReaction.cs +++ b/Content.Shared/Chemistry/Reaction/ITileReaction.cs @@ -1,4 +1,4 @@ -using Content.Shared.Chemistry.Reagent; +using Content.Shared.Chemistry.Reagent; using Content.Shared.FixedPoint; using Robust.Shared.Map; @@ -9,6 +9,7 @@ namespace Content.Shared.Chemistry.Reaction FixedPoint2 TileReact(TileRef tile, ReagentPrototype reagent, FixedPoint2 reactVolume, - IEntityManager entityManager); + IEntityManager entityManager, + List? data = null); } } diff --git a/Content.Shared/Chemistry/Reagent/DNAData.cs b/Content.Shared/Chemistry/Reagent/DNAData.cs new file mode 100644 index 0000000000..e75e994ece --- /dev/null +++ b/Content.Shared/Chemistry/Reagent/DNAData.cs @@ -0,0 +1,28 @@ +using Content.Shared.FixedPoint; +using Robust.Shared.Serialization; + +namespace Content.Shared.Chemistry.Reagent; + +[ImplicitDataDefinitionForInheritors, Serializable, NetSerializable] +public sealed partial class DnaData : ReagentData +{ + [DataField] + public string DNA = String.Empty; + + public override ReagentData Clone() => this; + + public override bool Equals(ReagentData? other) + { + if (other == null) + { + return false; + } + + return ((DnaData) other).DNA == DNA; + } + + public override int GetHashCode() + { + return DNA.GetHashCode(); + } +} diff --git a/Content.Shared/Chemistry/Reagent/ReagentId.cs b/Content.Shared/Chemistry/Reagent/ReagentId.cs index 07a4200219..798dd28db4 100644 --- a/Content.Shared/Chemistry/Reagent/ReagentId.cs +++ b/Content.Shared/Chemistry/Reagent/ReagentId.cs @@ -1,6 +1,7 @@ -using Content.Shared.FixedPoint; +using Content.Shared.FixedPoint; using Robust.Shared.Serialization; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; +using System.Linq; namespace Content.Shared.Chemistry.Reagent; @@ -20,17 +21,23 @@ public partial struct ReagentId : IEquatable /// Any additional data that is unique to this reagent type. E.g., for blood this could be DNA data. /// [DataField("data")] - public ReagentData? Data { get; private set; } + public List? Data { get; private set; } = new(); - public ReagentId(string prototype, ReagentData? data) + public ReagentId(string prototype, List? data) { Prototype = prototype; - Data = data; + Data = data ?? new(); } public ReagentId() { Prototype = default!; + Data = new(); + } + + public List EnsureReagentData() + { + return (Data != null) ? Data : new List(); } public bool Equals(ReagentId other) @@ -44,13 +51,13 @@ public partial struct ReagentId : IEquatable if (other.Data == null) return false; - if (Data.GetType() != other.Data.GetType()) + if (Data.Except(other.Data).Any() || other.Data.Except(Data).Any() || Data.Count != other.Data.Count) return false; - return Data.Equals(other.Data); + return true; } - public bool Equals(string prototype, ReagentData? otherData = null) + public bool Equals(string prototype, List? otherData = null) { if (Prototype != prototype) return false; @@ -73,12 +80,12 @@ public partial struct ReagentId : IEquatable public string ToString(FixedPoint2 quantity) { - return Data?.ToString(Prototype, quantity) ?? $"{Prototype}:{quantity}"; + return $"{Prototype}:{quantity}"; } public override string ToString() { - return Data?.ToString(Prototype) ?? Prototype; + return $"{Prototype}"; } public static bool operator ==(ReagentId left, ReagentId right) diff --git a/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs b/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs index fe937b9de4..dba2ba03a3 100644 --- a/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs +++ b/Content.Shared/Chemistry/Reagent/ReagentPrototype.cs @@ -143,7 +143,7 @@ namespace Content.Shared.Chemistry.Reagent [DataField] public SoundSpecifier FootstepSound = new SoundCollectionSpecifier("FootstepWater", AudioParams.Default.WithVolume(6)); - public FixedPoint2 ReactionTile(TileRef tile, FixedPoint2 reactVolume, IEntityManager entityManager) + public FixedPoint2 ReactionTile(TileRef tile, FixedPoint2 reactVolume, IEntityManager entityManager, List? data) { var removed = FixedPoint2.Zero; @@ -152,7 +152,7 @@ namespace Content.Shared.Chemistry.Reagent foreach (var reaction in TileReactions) { - removed += reaction.TileReact(tile, this, reactVolume - removed, entityManager); + removed += reaction.TileReact(tile, this, reactVolume - removed, entityManager, data); if (removed > reactVolume) throw new Exception("Removed more than we have!"); diff --git a/Content.Shared/Chemistry/Reagent/ReagentQuantity.cs b/Content.Shared/Chemistry/Reagent/ReagentQuantity.cs index 9644f919f7..4cc87f5bd7 100644 --- a/Content.Shared/Chemistry/Reagent/ReagentQuantity.cs +++ b/Content.Shared/Chemistry/Reagent/ReagentQuantity.cs @@ -17,7 +17,7 @@ public partial struct ReagentQuantity : IEquatable [ViewVariables] public ReagentId Reagent { get; private set; } - public ReagentQuantity(string reagentId, FixedPoint2 quantity, ReagentData? data) + public ReagentQuantity(string reagentId, FixedPoint2 quantity, List? data = null) : this(new ReagentId(reagentId, data), quantity) { } @@ -37,7 +37,7 @@ public partial struct ReagentQuantity : IEquatable return Reagent.ToString(Quantity); } - public void Deconstruct(out string prototype, out FixedPoint2 quantity, out ReagentData? data) + public void Deconstruct(out string prototype, out FixedPoint2 quantity, out List? data) { prototype = Reagent.Prototype; quantity = Quantity; diff --git a/Content.Shared/Forensics/Events.cs b/Content.Shared/Forensics/Events.cs index 7300b78d76..f7b9475cb5 100644 --- a/Content.Shared/Forensics/Events.cs +++ b/Content.Shared/Forensics/Events.cs @@ -51,3 +51,20 @@ public record struct TransferDnaEvent() /// public bool CanDnaBeCleaned = true; } + +/// +/// An event to generate and act upon new DNA for an entity. +/// +[ByRefEvent] +public record struct GenerateDnaEvent() +{ + /// + /// The entity getting new DNA. + /// + public EntityUid Owner; + + /// + /// The generated DNA. + /// + public string DNA; +} diff --git a/Content.Shared/Forensics/ForensicScannerEvent.cs b/Content.Shared/Forensics/ForensicScannerEvent.cs index ce84b1f7b3..f275680b05 100644 --- a/Content.Shared/Forensics/ForensicScannerEvent.cs +++ b/Content.Shared/Forensics/ForensicScannerEvent.cs @@ -7,7 +7,8 @@ namespace Content.Shared.Forensics { public readonly List Fingerprints = new(); public readonly List Fibers = new(); - public readonly List DNAs = new(); + public readonly List TouchDNAs = new(); + public readonly List SolutionDNAs = new(); public readonly List Residues = new(); public readonly string LastScannedName = string.Empty; public readonly TimeSpan PrintCooldown = TimeSpan.Zero; @@ -16,7 +17,8 @@ namespace Content.Shared.Forensics public ForensicScannerBoundUserInterfaceState( List fingerprints, List fibers, - List dnas, + List touchDnas, + List solutionDnas, List residues, string lastScannedName, TimeSpan printCooldown, @@ -24,7 +26,8 @@ namespace Content.Shared.Forensics { Fingerprints = fingerprints; Fibers = fibers; - DNAs = dnas; + TouchDNAs = touchDnas; + SolutionDNAs = solutionDnas; Residues = residues; LastScannedName = lastScannedName; PrintCooldown = printCooldown; diff --git a/Resources/Locale/en-US/forensics/forensics.ftl b/Resources/Locale/en-US/forensics/forensics.ftl index 29e2db8f78..712e8511bb 100644 --- a/Resources/Locale/en-US/forensics/forensics.ftl +++ b/Resources/Locale/en-US/forensics/forensics.ftl @@ -23,8 +23,10 @@ forensic-scanner-verb-message = Perform a forensic scan forensic-pad-fingerprint-name = {$entity}'s fingerprints forensic-pad-gloves-name = fibers from {$entity} +forensics-dna-unknown = unknown DNA + forensics-verb-text = Remove evidence forensics-verb-message = Remove fingerprints and DNA residues from the object! forensics-cleaning = You begin cleaning the evidence off of {THE($target)}... -forensics-cleaning-cannot-clean = There is nothing cleanable on {THE($target)}! \ No newline at end of file +forensics-cleaning-cannot-clean = There is nothing cleanable on {THE($target)}! diff --git a/Resources/Prototypes/Entities/Effects/puddle.yml b/Resources/Prototypes/Entities/Effects/puddle.yml index 62bb923a61..36f0faa1df 100644 --- a/Resources/Prototypes/Entities/Effects/puddle.yml +++ b/Resources/Prototypes/Entities/Effects/puddle.yml @@ -162,3 +162,6 @@ solution: puddle - type: BadDrink - type: IgnoresFingerprints + - type: Tag + tags: + - DNASolutionScannable diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml index 0c069f615e..9dd3cffbe6 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml @@ -42,6 +42,7 @@ #In future maybe add generic plastic scrap trash/debris - type: TrashOnSolutionEmpty solution: drink + - type: DnaSubstanceTrace - type: entity parent: DrinkCartonBaseFull diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index c435e6c98f..4a9d5c0463 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml @@ -35,6 +35,7 @@ interfaces: enum.TransferAmountUiKey.Key: type: TransferAmountBoundUserInterface + - type: DnaSubstanceTrace - type: entity parent: DrinkBase diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml index a5f72b8546..8630912451 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_bottles.yml @@ -39,6 +39,7 @@ - type: PhysicalComposition materialComposition: Plastic: 100 + - type: DnaSubstanceTrace - type: PressurizedSolution solution: drink - type: Shakeable diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml index b6488dbe8b..f5b733d37b 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml @@ -66,6 +66,7 @@ - type: Tag tags: - DrinkCan + - type: DnaSubstanceTrace - type: entity parent: DrinkCanBaseFull diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml index d13c9ad2ca..f0103cc219 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml @@ -38,6 +38,7 @@ damage: types: Blunt: 0 + - type: DnaSubstanceTrace - type: entity parent: DrinkBaseCup diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml index dfb6ac31c0..930cf81757 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml @@ -34,6 +34,7 @@ - type: PhysicalComposition materialComposition: Steel: 50 + - type: DnaSubstanceTrace - type: ReactionMixer mixOnInteract: false reactionTypes: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml index 9f94be9576..eadeeabd74 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml @@ -76,6 +76,7 @@ materialComposition: Glass: 100 - type: SpaceGarbage + - type: DnaSubstanceTrace - type: entity name: base empty bottle diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml index 2a6f314904..ccb7900810 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml @@ -50,6 +50,7 @@ - type: GuideHelp guides: - Janitorial + - type: DnaSubstanceTrace - type: entity parent: BaseItem @@ -109,6 +110,7 @@ tags: - Mop - MopAdv + - type: DnaSubstanceTrace - type: entity name: wet floor sign @@ -332,3 +334,4 @@ - type: CleansForensics - type: Fiber fiberColor: fibers-white + - type: DnaSubstanceTrace diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml index fd931a05c7..d1020ff609 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml @@ -82,6 +82,7 @@ - type: Tag tags: - ChemDispensable + - type: DnaSubstanceTrace - type: entity parent: Jug diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml index 6fdb77fe5f..f8f55cf8fc 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml @@ -93,6 +93,7 @@ transferForensics: true - !type:DoActsBehavior acts: [ "Destruction" ] + - type: DnaSubstanceTrace - type: entity parent: BaseChemistryEmptyBottle diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml index 39a35dba8c..eca666ca4f 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml @@ -101,6 +101,7 @@ acts: [ "Destruction" ] - type: Spillable solution: beaker + - type: DnaSubstanceTrace - type: entity id: VestineChemistryVial diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml index c888559bc3..72f612436b 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml @@ -92,6 +92,7 @@ Blunt: 5 - type: StaticPrice price: 30 + - type: DnaSubstanceTrace - type: entity parent: BaseItem @@ -153,6 +154,7 @@ damageModifierSet: Glass - type: StaticPrice price: 30 + - type: DnaSubstanceTrace - type: entity name: beaker @@ -303,6 +305,7 @@ inHandsFillBaseName: -fill- - type: StaticPrice price: 40 + - type: DnaSubstanceTrace - type: Tag tags: - Dropper diff --git a/Resources/Prototypes/Entities/Objects/Tools/bucket.yml b/Resources/Prototypes/Entities/Objects/Tools/bucket.yml index 58c8dae2b0..b64aa3a041 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/bucket.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/bucket.yml @@ -67,3 +67,4 @@ - type: PhysicalComposition materialComposition: Plastic: 50 + - type: DnaSubstanceTrace diff --git a/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml b/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml index 9fd05beaee..6ed06addcd 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml @@ -84,6 +84,7 @@ behaviors: - !type:DoActsBehavior acts: ["Destruction"] + - type: DnaSubstanceTrace - type: Fixtures fixtures: fix1: @@ -334,3 +335,4 @@ - type: GuideHelp guides: - Janitorial + - type: DnaSubstanceTrace diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 197966b491..adf25cc71d 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -509,6 +509,9 @@ - type: Tag id: DiscreteHealthAnalyzer #So construction recipes don't eat medical PDAs +- type: Tag + id: DNASolutionScannable + - type: Tag id: DockArrivals From 0423691d7607b3241aab00fbb755276251c04e20 Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 8 Aug 2024 23:28:34 +0000 Subject: [PATCH 271/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index ba53573989..d904094e88 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: vorkathbruh - changes: - - message: Nuclear operative agents now require time in Chemistry rather than time - in the Medical department. - type: Tweak - id: 6564 - time: '2024-05-09T06:48:53.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27098 - author: deltanedas changes: - message: Firesuits and hardsuits now protect your skin from fire, you will instead @@ -3785,3 +3777,19 @@ id: 7063 time: '2024-08-08T22:50:57.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30671 +- author: SlamBamActionman + changes: + - message: Animal DNA now shows up as "unknown DNA" in the Forensic Scanner. + type: Tweak + - message: Forensic Scanner can now scan fluid containers for DNA in reagents. + type: Tweak + - message: Fluids keep their DNA data when moved. + type: Fix + - message: Fluids now stain containers they're in with DNA. Make sure to scrub your + blood bucket after use! + type: Add + - message: Vomit now includes DNA! + type: Add + id: 7064 + time: '2024-08-08T23:27:28.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/26699 From 1b1008ad8593ac4d357c06ed200dc2aec243cef4 Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Thu, 8 Aug 2024 19:31:53 -0400 Subject: [PATCH 272/422] Scrap (#30762) * jnk sprites * scrap pt 2 * metal inhands * hell yeah brudda * Update meta.json * Update scrap.yml --------- Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com> --- .../Entities/Objects/Materials/scrap.yml | 408 ++++++++++++++++++ .../Scrap/generic.rsi/airlock-inhand-left.png | Bin 0 -> 619 bytes .../generic.rsi/airlock-inhand-right.png | Bin 0 -> 593 bytes .../Scrap/generic.rsi/closet-inhand-left.png | Bin 0 -> 436 bytes .../Scrap/generic.rsi/closet-inhand-right.png | Bin 0 -> 436 bytes .../generic.rsi/firelock-1-inhand-left.png | Bin 0 -> 484 bytes .../generic.rsi/firelock-1-inhand-right.png | Bin 0 -> 484 bytes .../generic.rsi/firelock-2-inhand-left.png | Bin 0 -> 579 bytes .../generic.rsi/firelock-2-inhand-right.png | Bin 0 -> 593 bytes .../Materials/Scrap/generic.rsi/glass-1.png | Bin 0 -> 758 bytes .../Materials/Scrap/generic.rsi/glass-2.png | Bin 0 -> 1046 bytes .../Materials/Scrap/generic.rsi/glass-3.png | Bin 0 -> 919 bytes .../Materials/Scrap/generic.rsi/glass-4.png | Bin 0 -> 969 bytes .../Materials/Scrap/generic.rsi/glass-5.png | Bin 0 -> 854 bytes .../Materials/Scrap/generic.rsi/glass-6.png | Bin 0 -> 1075 bytes .../Scrap/generic.rsi/glass-inhand-left.png | Bin 0 -> 690 bytes .../Scrap/generic.rsi/glass-inhand-right.png | Bin 0 -> 683 bytes .../Scrap/generic.rsi/jetpack-inhand-left.png | Bin 0 -> 325 bytes .../generic.rsi/jetpack-inhand-right.png | Bin 0 -> 337 bytes .../Scrap/generic.rsi/junk-airlock-1.png | Bin 0 -> 1052 bytes .../Scrap/generic.rsi/junk-airlock-2.png | Bin 0 -> 561 bytes .../Scrap/generic.rsi/junk-airlock-3.png | Bin 0 -> 289 bytes .../Scrap/generic.rsi/junk-bucket.png | Bin 0 -> 487 bytes .../Scrap/generic.rsi/junk-camera.png | Bin 0 -> 540 bytes .../Scrap/generic.rsi/junk-canister-1.png | Bin 0 -> 276 bytes .../Scrap/generic.rsi/junk-canister-2.png | Bin 0 -> 273 bytes .../Scrap/generic.rsi/junk-closet.png | Bin 0 -> 809 bytes .../Materials/Scrap/generic.rsi/junk-fax.png | Bin 0 -> 751 bytes .../generic.rsi/junk-fireextinguisher.png | Bin 0 -> 508 bytes .../Scrap/generic.rsi/junk-firelock-1.png | Bin 0 -> 989 bytes .../Scrap/generic.rsi/junk-firelock-2.png | Bin 0 -> 1085 bytes .../Scrap/generic.rsi/junk-firelock-3.png | Bin 0 -> 506 bytes .../Scrap/generic.rsi/junk-intercom-1.png | Bin 0 -> 528 bytes .../Scrap/generic.rsi/junk-intercom-2.png | Bin 0 -> 472 bytes .../Scrap/generic.rsi/junk-intercom-3.png | Bin 0 -> 326 bytes .../Scrap/generic.rsi/junk-jetpack.png | Bin 0 -> 577 bytes .../Scrap/generic.rsi/junk-medkit-1.png | Bin 0 -> 528 bytes .../Scrap/generic.rsi/junk-medkit-2.png | Bin 0 -> 859 bytes .../Scrap/generic.rsi/junk-mop-bucket.png | Bin 0 -> 666 bytes .../Scrap/generic.rsi/junk-pai-gold.png | Bin 0 -> 782 bytes .../Materials/Scrap/generic.rsi/junk-pai.png | Bin 0 -> 972 bytes .../Scrap/generic.rsi/junk-target.png | Bin 0 -> 495 bytes .../Materials/Scrap/generic.rsi/meta.json | 181 ++++++++ .../Materials/Scrap/generic.rsi/metal-1.png | Bin 0 -> 739 bytes .../Materials/Scrap/generic.rsi/metal-2.png | Bin 0 -> 670 bytes .../Materials/Scrap/generic.rsi/metal-3.png | Bin 0 -> 673 bytes .../Scrap/generic.rsi/metal-inhand-left.png | Bin 0 -> 682 bytes .../Scrap/generic.rsi/metal-inhand-right.png | Bin 0 -> 682 bytes .../Materials/Scrap/generic.rsi/tube-bk.png | Bin 0 -> 328 bytes .../Materials/Scrap/generic.rsi/tube-bl.png | Bin 0 -> 330 bytes .../Materials/Scrap/generic.rsi/tube-g.png | Bin 0 -> 314 bytes .../Materials/Scrap/generic.rsi/tube-r.png | Bin 0 -> 334 bytes .../Materials/Scrap/generic.rsi/tube-y.png | Bin 0 -> 313 bytes .../Materials/Scrap/generic.rsi/tube.png | Bin 0 -> 262 bytes 54 files changed, 589 insertions(+) create mode 100644 Resources/Prototypes/Entities/Objects/Materials/scrap.yml create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/airlock-inhand-left.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/airlock-inhand-right.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/closet-inhand-left.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/closet-inhand-right.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/firelock-1-inhand-left.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/firelock-1-inhand-right.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/firelock-2-inhand-left.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/firelock-2-inhand-right.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/glass-1.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/glass-2.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/glass-3.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/glass-4.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/glass-5.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/glass-6.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/glass-inhand-left.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/glass-inhand-right.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/jetpack-inhand-left.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/jetpack-inhand-right.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-airlock-1.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-airlock-2.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-airlock-3.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-bucket.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-camera.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-canister-1.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-canister-2.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-closet.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-fax.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-fireextinguisher.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-firelock-1.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-firelock-2.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-firelock-3.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-intercom-1.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-intercom-2.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-intercom-3.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-jetpack.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-medkit-1.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-medkit-2.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-mop-bucket.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-pai-gold.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-pai.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-target.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/meta.json create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/metal-1.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/metal-2.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/metal-3.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/metal-inhand-left.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/metal-inhand-right.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/tube-bk.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/tube-bl.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/tube-g.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/tube-r.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/tube-y.png create mode 100644 Resources/Textures/Objects/Materials/Scrap/generic.rsi/tube.png diff --git a/Resources/Prototypes/Entities/Objects/Materials/scrap.yml b/Resources/Prototypes/Entities/Objects/Materials/scrap.yml new file mode 100644 index 0000000000..6530e3b170 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Materials/scrap.yml @@ -0,0 +1,408 @@ +- type: entity + parent: BaseItem + id: BaseScrap + abstract: true + name: scrap + description: Worthless junk. You could probably get some materials out of it though. + suffix: Scrap + components: + - type: Sprite + sprite: Objects/Materials/Scrap/generic.rsi + - type: Item + sprite: Objects/Materials/Scrap/generic.rsi + size: Normal + - type: Damageable + damageContainer: Inorganic + damageModifierSet: FlimsyMetallic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 150 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Tag + tags: + - Recyclable + +- type: entity + parent: BaseScrap + id: ScrapSteel + name: blasted steel pile + description: An pile of steel welded together in extreme heat. It's of a decent size overall; you could probably get a fair amount of sheets out of it. + components: + - type: Sprite + layers: + - state: metal-1 + map: [ "base" ] + - type: Item + size: Ginormous + heldPrefix: metal + - type: MultiHandedItem + - type: RandomSprite + available: + - base: + metal-1: "" + metal-2: "" + metal-3: "" + - type: PhysicalComposition + materialComposition: + Steel: 3000 # 30 sheets + +- type: entity + parent: BaseScrap + id: ScrapGlass + name: scrap circuitry + description: A huge lump of various circuits, strangely fused together. You could likely extract some materials out of this. + components: + - type: Sprite + layers: + - state: glass-1 + map: [ "base" ] + - type: Item + heldPrefix: "glass" + size: Large + shape: + - 0,0,2,2 # 3x3 + - type: RandomSprite + available: + - base: + glass-1: "" + glass-2: "" + glass-3: "" + glass-4: "" + glass-5: "" + glass-6: "" + - type: PhysicalComposition + materialComposition: + Glass: 1500 # 15 sheets + Steel: 500 # 5 sheets + +- type: entity + parent: BaseScrap + id: ScrapAirlock1 + name: airlock door + description: This used to keep air in. Now it doesn't seem to be doing anything at all. + components: + - type: Sprite + layers: + - state: junk-airlock-1 + map: [ "base" ] + - type: RandomSprite + available: + - base: + junk-airlock-1: "" + junk-airlock-2: "" + - type: Item + size: Ginormous + heldPrefix: "airlock" + - type: MultiHandedItem + - type: PhysicalComposition + materialComposition: + Steel: 1500 # 15 sheets + +- type: entity + parent: BaseScrap + id: ScrapAirlock2 + name: airlock light + description: Serves it right for flashing red all those times. + components: + - type: Sprite + layers: + - state: junk-airlock-3 + - type: Item + size: Normal + shape: + - 0,0,3,0 + - type: PhysicalComposition + materialComposition: + Steel: 200 # 2 sheets + Glass: 500 # 5 sheets + +- type: entity + parent: BaseScrap + id: ScrapBucket + name: busted bucket + description: Dear god... + components: + - type: Sprite + layers: + - state: junk-bucket + - type: PhysicalComposition + materialComposition: + Plastic: 300 # 3 sheets + +- type: entity + parent: BaseScrap + id: ScrapCamera + name: broken camera + description: It might still be watching. + components: + - type: Sprite + layers: + - state: junk-camera + - type: PhysicalComposition + materialComposition: + Steel: 500 # 5 sheets + Glass: 100 # 1 sheet + +- type: entity + parent: BaseScrap + id: ScrapCanister1 + name: canister handle + description: Helpful for holding a canister. Now you just need the actual canister part. + components: + - type: Sprite + layers: + - state: junk-canister-1 + - type: PhysicalComposition + materialComposition: + Steel: 300 # 3 sheets + +- type: entity + parent: BaseScrap + id: ScrapCanister2 + name: canister valve + description: A valve from a gas canister. + components: + - type: Sprite + layers: + - state: junk-canister-2 + - type: Item + size: Small + - type: PhysicalComposition + materialComposition: + Steel: 200 # 2 sheets + +- type: entity + parent: BaseScrap + id: ScrapCloset + name: closet door + description: A blown off door from a maintenance closet. Looks like a nice piece of wall decor. + components: + - type: Sprite + layers: + - state: junk-closet + - type: MultiHandedItem + - type: Item + heldPrefix: closet + size: Huge + shape: + - 0,0,5,2 + - type: PhysicalComposition + materialComposition: + Steel: 1500 # 15 sheets + +- type: entity + parent: BaseScrap + id: ScrapFaxMachine + name: fax machine + description: The unfortunate result of one too many ASCII arts being sent to Central Command. + components: + - type: Sprite + layers: + - state: junk-fax + - type: Item + size: Huge + - type: PhysicalComposition + materialComposition: + Plastic: 800 # 8 sheets + Steel: 200 # 2 sheets + +- type: entity + parent: BaseScrap + id: ScrapFireExtinguisher + name: split fire extinguisher + description: The large gash down the center makes you worry for the previous user. + components: + - type: Sprite + layers: + - state: junk-fireextinguisher + - type: PhysicalComposition + materialComposition: + Steel: 600 # 6 sheets + +- type: entity + parent: BaseScrap + id: ScrapFirelock1 + name: firelock door + description: At least you still know what it's meant for. + components: + - type: Sprite + layers: + - state: junk-firelock-1 + - type: Item + size: Ginormous + heldPrefix: firelock-1 + - type: MultiHandedItem + - type: PhysicalComposition + materialComposition: + Steel: 2000 # 20 sheets + +- type: entity + parent: BaseScrap + id: ScrapFirelock2 + name: firelock door + description: OH! That's where the other half went! + components: + - type: Sprite + layers: + - state: junk-firelock-2 + - type: Item + size: Ginormous + heldPrefix: firelock-2 + - type: MultiHandedItem + - type: PhysicalComposition + materialComposition: + Steel: 2000 # 20 sheets + +- type: entity + parent: BaseScrap + id: ScrapFirelock3 + name: firelock frame + components: + - type: Sprite + layers: + - state: junk-firelock-3 + - type: Item + size: Large + - type: PhysicalComposition + materialComposition: + Steel: 700 # 7 sheets + +- type: entity + parent: BaseScrap + id: ScrapIntercom + name: intercom scrap + description: You wish it at least came with some encryption keys. + components: + - type: Sprite + layers: + - state: junk-intercom-1 + map: [ "base" ] + - type: RandomSprite + available: + - base: + junk-intercom-1: "" + junk-intercom-2: "" + junk-intercom-3: "" + - type: Item + - type: PhysicalComposition + materialComposition: + Steel: 400 # 4 sheets + Plastic: 300 # 3 sheets + +- type: entity + parent: BaseScrap + id: ScrapJetpack + name: busted jetpack + description: Looks like it won't be flying any more. + components: + - type: Sprite + layers: + - state: junk-jetpack + - type: Item + size: Huge + heldPrefix: jetpack + - type: PhysicalComposition + materialComposition: + Steel: 1000 # 10 sheets + Plastic: 200 # 2 sheets + +- type: entity + parent: BaseScrap + id: ScrapMedkit + name: snapped medkit + description: Hopefully they got some use out of it. + components: + - type: Sprite + layers: + - state: junk-medkit-1 + map: [ "base" ] + - type: RandomSprite + available: + - base: + junk-medkit-1: "" + junk-medkit-2: "" + - type: Item + size: Large + - type: PhysicalComposition + materialComposition: + Plastic: 500 # 5 sheets + +- type: entity + parent: BaseScrap + id: ScrapMopBucket + name: half a mop bucket + description: Tiders die. Janitors survive. + components: + - type: Sprite + layers: + - state: junk-mop-bucket + - type: Item + size: Huge + - type: PhysicalComposition + materialComposition: + Plastic: 1500 # 15 sheets + +- type: entity + parent: BaseScrap + id: ScrapPAI + name: personal ai device + description: A buddy! You still in there? Hello? Buddy??? + components: + - type: Sprite + layers: + - state: junk-pai + - type: Item + size: Small + - type: PhysicalComposition + materialComposition: + Steel: 300 # 3 sheets + Plastic: 200 # 2 sheets + +- type: entity + parent: BaseScrap + id: ScrapPAIGold + name: gilded personal ai device + description: Wow! What a one-in-a-million find! This would be worth a fortune... if it was in good condition. + components: + - type: Sprite + layers: + - state: junk-pai-gold + - type: Item + size: Small + - type: PhysicalComposition + materialComposition: + Gold: 100 # 1 sheet + Plastic: 400 # 4 sheets + +- type: entity + parent: BaseScrap + id: ScrapTube + name: shattered sample tube + description: A glass tube containing some kind of rare sample. Or at least, it used to contain it. Not much left in there now. + components: + - type: Sprite + layers: + - state: tube + map: [ "base" ] + - type: RandomSprite + available: + - base: + tube: "" + tube-bl: "" + tube-bk: "" + tube-g: "" + tube-r: "" + tube-y: "" + - type: Item + size: Small + - type: PhysicalComposition + materialComposition: + Glass: 500 # 5 sheets + Plastic: 100 # 1 sheet + + + diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/airlock-inhand-left.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/airlock-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..1302edea02da183030ec3b7ca1eadc2286f829ee GIT binary patch literal 619 zcmV-x0+juUP)Px%B}qgi1 zDo>F(^P>=K1KQcu`6@)rz4iq`Bwv7th=_=Y=ng5p562$x0HC$@TI<{SkH>h1$3Nuf z+z(+<)(Rn|_roAWIB$%>G)=&@AW}*I@YY&^7YIDV;|1b9h83w3TXStnjM)MJfH4LD z{4`yH{koo;rU_M5K}w0TEKyYz%CZEm1+lQuT6?7wPN!4u{9%lNwRY9@ecwMEGh3Ok z003~#-4SJing(6hZ8k3W5i>}&xJ0s!+p1H&-nhFq05w;v(-B^Z2%o`EeSKLOTS@$~fM|IAc;&z)Iot&mdQec4?* zLy~i^p6u72fxY_!w$8We;(MQ-z4zw-MouCkA|m=9y#dPx%3rR#lRCt{2+P`kAFcb#xkLoU##hSqz1EMo)rrbwi=tJEhufiK-w-~aa?8u5b z`3}UnO;v+!pw(@^-;#gE$3C`56d!K^-psfO48s6p45XCU?RJx$ zU9Z=N_5jdzUGffCvihO@Ozr?71TL2g0Kgc7^Z6Vc*cgMNDA09X@HJBohl6d~b~YiQ z?VQO3I7Lx}_IDSPtk5yEZM#}K=V{5He6rWq)%!dik3p*%+RmA6+%%0%Sabc05=d{&A?ix!9G*<2r2y~C7>)zs7^tak2M2Ah|Loq zgn$qNz*qn=)+79elx0%vqy!ja?vHC9gU|8Bb7P8?lmNhAGtl>aYL|=RrY^)L^#Px4 zNj*aJ4$xX>`~BWqGqB~!tkybHN_}{YpU$Z2y;bG|y?|DW@FqU)qTKi90v&R82L z!uo8pWZbc2h691wCb``n96-Y6{Q9@Q&)R(bdCA4A=3UwI*V!_Ub^A7YO#1vlJ?PPd z)ER!uEm9#plXQ-Z8?Z=d4~@S5x6 z{b0q{pHWx0dhgwxe3!*nn4#u9v+revE+rQyiTOY5eE0r8wlETCmfDW*2ZaR@;G%M& z-L6-~A!4sQbX;Gki=EOZv!zRukR2)_8&GODP} W+w|fq&v9ThFnGH9xvX1R!!14l?{uLDQV zQWl0eTiiC@Pd1zF=+)^dVRkF;^PO$){XgebDF`s_UgRKi{Dvs&GA~AkV?jw1Reo?d z`y3LuKbv=%SL}K{p2)xJ-u4O?M1I`&eS4){1;h3!L36hy&sw&3+uA}VIm>CPeo@Q^ zzE)*VRPo!VxKGl)saqxUPu(S{(AdSRv{)Pq%KtOJ`_F18VQrow`v2F1POzgP#EYq4 z>~_5>3VHV0bP0l+XkK&xOMz literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/firelock-1-inhand-left.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/firelock-1-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..455c336b4aac444a4b8d92bc37a4745a78e6f2b0 GIT binary patch literal 484 zcmVPx$o=HSORCt{2+98jFFcb&y$Ax6UA(vn$P}8%s=TTE<$Ymesa&GF(&7b8vOij!# znZ!-LQ{_lUOX(|Y%l&_ft)-7XD2P5H000000DylevNdkAjHLlS&Sz^3m-s$oxSnfl z+-4aslVoVz8;9%FdjiWOq4(3tJAt2z1^2~|`v%!mRdf8cUN^tn$6f8}w}fQ!>ioW^ z_{DWF+hn@hq?6a}^4w`Ty7p6?6QJL1y-lC6t^Xql_5^e-hmhWmN2lfB+E1}2puGlX zaZI!L@0HO$?y{*W@fx1OpbOmPIsaTP#`f3weDEE38bz9Nk)}*U#6-6*nv%HPXN>qE z`-yZWfQYCx{0{&C0000000000@DRKE`ol6ru9#P;5|H}S0pxL54n`T!GC-N0eB z@*Q$e+)%X$&bz}Vp?86O;z_PSoPeq807BOyJmnJ*vKC=*0`!-RUNpEg0jshgLS4muar%l|^Px$o=HSORCt{2+98jFFcb&y$Ax6UA(vn$P}8%s=TTE<$Ymesa&GF(&7b8vOij!# znZ!-LQ{_lUOX(|Y%l&_ft)-7XD2P5H000000DylevNdkAjHLlS&Sz^3m-s$oxSnfl z+-4aslVoVz8;9%FdjiWOq4(3tJAt2z1^2~|`v%!mRdf8cUN^tn$6f8}w}fQ!>ioW^ z_{DWF+hn@hq?6a}^4w`Ty7p6?6QJL1y-lC6t^Xql_5^e-hmhWmN2lfB+E1}2puGlX zaZI!L@0HO$?y{*W@fx1OpbOmPIsaTP#`f3weDEE38bz9Nk)}*U#6-6*nv%HPXN>qE z`-yZWfQYCx{0{&C0000000000@DRKE`ol6ru9#P;5|H}S0pxL54n`T!GC-N0eB z@*Q$e+)%X$&bz}Vp?86O;z_PSoPeq807BOyJmnJ*vKC=*0`!-RUNpEg0jshgLS4muar%l|^Px${YgYYRCt{2+A&MRKoke?f2lh*x7xua{hEi~fI5Xs*e|$4;<@*4DVH~3t1OR}JQr{BQo1-_%)m0REF4vz81~acWZUB%Z zrIXQ#r^j2q|82Y$1gHf8hH+eI(bHV->{#6mw&!UxH(*jaS=0Em^Onu3>BD-p;xu`^ zT1Efq#c2-hxYx7#I@q4488=|}{1JPdIsoAA@)=v(@7Ua5w?5uIeD%tBnlFuq+cg>8 zS0oHW3Bypbju*YgysU4Ri=&Ela;GNl0yi%{q*VC)+h6@s^1W?E!WJ^)fO0Dtlx RNY4NO002ovPDHLkV1hWv4Rrtj literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/firelock-2-inhand-right.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/firelock-2-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..c0edb2ae167e69672e792661dcc5259ee2fe4da9 GIT binary patch literal 593 zcmV-X0Px%3rR#lRCt{2+96NFKoke?|1l74GBE^Ac2r@e_96HLC=3dN=md_0uYd=ELE*3n z4B;DqA%TPt64EKcT&Kvxa9tT)d+W6sf&VXAvb$dI-Ceqhy$28x5fKp)(L|)RL|O{~ zbh{$ceFDhz*zEP}HP`qq%H~)ux)_RlO|TApO=S9194i52pfy4fbbKG9B*Cjvz#asr zP_7#Y#clsK@t4X5^gR!u2tpC`Juh8Yq_qsR27q+)W_)z15os-Ed{u|Tp>nzZB#uk( zFFk-!lAz=J==grx*YSPyJum%a`vLsuuftidXZ1MPjx$ORAiMFrc3J;#SNIOt2-@xu z#_m%9!0y9?)z86poKbiH+qaME{$fQo2de;pm#a5CKP|zweSQ3noBg$U*7LjFU#v(F z1QG;+jPF{K*Ix7*=Vkr49PPBMH+OLU;q>;N72jrF+i^rhL_|bHL_|bHME}s-|DT(b z^GO`5ZdYVDRNvCzHW^u0(`j#)n5D_lJSIK9rPkBMnDluaMGdnEAd%K$Vx{#1dq@j7 z=AE-JH&~?ad1+06$qbK@1W?UA07dl((5Q6qm7W0LXWf8lH?8h^gvtkCTQ|^@y5d#( z2^7{1)Km{J%WAu|u-KD0IjM2;z3JFRDf*^k=gKZ(d}p6Rud42P1gBSaUd=$$x%oxJ fBqAarqQB@9phWoWIePx%ut`KgR9J=WmOoG1Kp4hB5K0zhquqTTL!cx`>sbX;U$`u;}TO`yy zUg*Nw2|9!!`2ew0bzo+&f|6_c1*r6PIG^o+<0fUP)I8GZ{O`T@x#!+{e6YqE|2tIC z!@*#%Fre9NmJirgl8*Cnpa5E}*23>!mJQb2Xo)%n>flBYx!?vc8c8AXun|g+9wD7l zl6kx+d#O%M??w=90a*Coj$cMxuBgs?0|PyHgbm2CCI~_JY8cqG75|jL3|h= zntQuU%hW)r0x6V|QF3XwS>zf5vzbvKBi9EPxLa!EKkS0G5|k1|lvAyy+sqc*&CO3P zF21KWogz_SnQgeR2vtW3G03$jYqLP=^VVwJNv4MHLYUaF_iH&PEM9`h{Ly-o9$_OC zf8;CGG0#$|>)A~0vkpf6RZz^#N9^EoZT@`Q+XxsVdJIb-U4|HT?{@+IP66=~gNb1{ z9P;j6Q^p4>b-PN%n-8eK?d>h8Bz53^QObD~Guua~8{Y@Gyd0+A1wl*fpUxIpx7$T) z&E{sz`MEiS9335{byKE5aS@IXb()=M@(6;KOeXcBFyc3HVa&=WqD9H`iHhJ(7Uo%v oKw0v~iSqkDDi&sqHU4e<2Ea}t+=i$IlmGw#07*qoM6N<$f~BKgqyPW_ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/glass-2.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/glass-2.png new file mode 100644 index 0000000000000000000000000000000000000000..939ac2039163eac9cd23a328115f56d567357060 GIT binary patch literal 1046 zcmV+x1nK*UP)Px&&`Cr=R9J=WmOW@&R}{y8w*)$MiSi=i$i-X1L#U9v>n$%3H_$X-D6XNr;b|!u zf`W%Ymt?32Wa^@~n&7D&N~2;e@*cgqco1|mNS1If%^om09qzmDL*LHOrTs5Y@9MsD z{^x(s$A$koRQ5$g7H&R1KE{3FO7}@u&HBGqt1bN=z;)eZ?W0v#TDUJ<0dNmpaSz?a zY*)m}1k|>Y$^}#|pcS>SME*4b&KrlQVt&^vbwgsfm_)UzmJ(bo2O=dZ1cpWdfT(Dm z_C2UT&=O-$rH-pH>0VFNtQ=TMKy53b1o9ZvFRosCZ7*pk@Yt;wrb#|mKl4v`z6LSUnl?pvmSO)e{a z5^b!6O-KnqeVDHImlU#frv zY0ISqvH|Tc+vYv4I4iO5`$_-ER#CIroNIsKeE=q|Tp>7)gMN@2FSQqUz0J){eBYUk%c2 Qy8r+H07*qoM6N<$g0|i58~^|S literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/glass-3.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/glass-3.png new file mode 100644 index 0000000000000000000000000000000000000000..6a9c1773996d53a861a7ae624d6264a35f6ea707 GIT binary patch literal 919 zcmV;I18Dq-P)Px&QAtEWR9J=WmcMHoXBfvnPsxxDUM#LIsbm5H%VWf;Q-?~6hBRBoLyHG@HKj$H zhZti_^$$pcA(&7wghFu)^&(}C4rK^O706PnrN>LXbWF(8;dJlaMHl&^b}7vlUheL_ z_kEu4^W%M=2R`8c4#}HT)%i(Z6hL<8f3;q>2!eo%i;G-&0K?(XzBijq`~Fd3rn?}0 zpqv_j8%9sZai~-(Im{R1+Er|0=>3F>zUzT zApRN)t%r9cVSKg)SoaN!M8u`o4WZi|WIUQKO7BI$#&jAfa6_O3hlhuAYuzv*u?%uU zpxe=i%WJHl)9G+AO!i&id7ovrZk;| txgl^v;4Q0yAV@w`t%T7+wIA>wz~9|=aIL+T1~C8t002ovPDHLkV1h4rtr-9S literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/glass-4.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/glass-4.png new file mode 100644 index 0000000000000000000000000000000000000000..0eb7585d96678cbc85dfaae9de007b93554d65fe GIT binary patch literal 969 zcmV;)12+7LP)Px&gGod|R9J=WmoaD)Q5eU6PZUI4jHCg3c2TS@qMX&u<{VNYf;id9u^pVmK(>lm zO6X7(Iy6H!F@qq5LQv2|!9m&sr$PlGv{xZL2pMX#2+!f&ySpXc3LO7^QO-)IF&CN}A zc6JU0?v$YbWHOet6G}HT;OiKWB8BU^dhMt8uemvSxvQ@u!vFx_OPa6W&SRS@Fo2vH z+|5u7*a;v};)(${3V>OIYqN0r^kBY*V!*7S82E5r=^m(!<-vVv2D)W?*DSwL;)<_3 z>LKPJ62e`FtLL#=$`(09^$^>V2mW zpuUI9nCl5l9 zL6D8EVt|XQ613Vnf__8;uoF;xP-J0Y8ry{8ts>JOrojVn^5hmU-V;ReR*{vJ6+M(p zCL_CPt6SYh>OAmD&9p;uprZ^s=Tg-aZ{NM+(Z~pkwVLP#pm#g=oNsT(iEnqztsh>l zkIqqT_^hE&E`~a9mlgm6HgX^es;h~D3KomSdOE1r>tMi{HOY@Vf}NZLri{D?90DMh zm62Tb-(lpRWU;qA=VOQn*w9UVpbJ_eDVyBX-CcwzsJW-tp966G+%K{pAG35{tzE6Q?4s`j zUXZ!DIXx8Aky0Rp41zebCiRX_#f~Y(fQO$CyN|pN_>OY9oX!EQ8_F&juz&dyVZE{> z4m3_QXf#?I@fiq8-#4PJ3;>mKStKn>_kLMWz%L#=VbS~f40N&(odXVVfwnJPP!9u9 zDVIgr2h*h&2qF3e09-nF#*7JK735tIHZ1$#IzaT}FDTJRV8ARYD24)oqdH))w1$M2v;8ynd900000NkvXXu0mjfK6t-V literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/glass-5.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/glass-5.png new file mode 100644 index 0000000000000000000000000000000000000000..e295c8f1249cbb2e5427744245672543b36a1747 GIT binary patch literal 854 zcmV-c1F8IpP)Px&5J^NqR9J=Wmpw=vK@`V-69P$!gn(HBdW2LK76%%W#uT?H6k|XHi<5(tYmq7> zWk9U1um~0w+8Gfo6cO@)SGZdwl^?|wS6ErBHk(3@kTk+eu^+d)H+Sx-UGj%xX5P%c z_n$X!=DmY|9ZDw@5da*=Y5Q@ZP-r{vI1c4H5bYixLTSFQqwW zrg?Wxpj0Zz$*BSn)seO|t`dZu;^_U6&-Gz8!#x@-?iT%Ej0K@iUuyy)s-ToOw%wF5%{Bj=hZ!brJVbG~7{v_dZTHYwHZHg4t*D+`e_*a z{_X+J&dvb%_n}OeGRVm6o=JMfGqtqu2hzXRnua==h5P%09b23Bbic3lh=|Bd#5+lVPI_FTPYD}apO8%TRIN! gdPpRT@&5q$3+Wta1ZX>MuK)l507*qoM6N<$f;u*nW&i*H literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/glass-6.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/glass-6.png new file mode 100644 index 0000000000000000000000000000000000000000..f106b827b50f7eabe705cdb3eb0144cc96afd92f GIT binary patch literal 1075 zcmV-31kC%1P)Px&?MXyIR9J=OmrrOLM-;|?6AZp75D>-o8Uh9%d?*!)?kg_{5@e{M2M0k5I!O55 z-b$gSphI#h6tlXuV5CF9P@EhLibSuDP)>XB$;D%rFc1>j*a!;K!)RCg*HYX|p&y8u zH@ln}z>71c26hIx-X*K(qk~SShpQw5y+M5q~@w3~qF4+crX&X$uKP?Wn!@ z^CBA?8vu-!MlAM1c4>5@qj``Zpc@k+-%ZCn&m))1K`CZ0{cHa>M8JalVIK9B0zhHf zu`>p1V$1mK`LOr>kD5vPvm?+3RZ`Iulwv7Zx?Ku>>pctl3lJ4exijg61Q-u_*iI9i zZQC~z_#xDfM4(o)^)i}^Uq!GB#?BbXNI?o(t(I=JTB*-G&*S|3JhE#70=1g04-N+A zVNs*q>=n$~W=f@#OT$9kdHG3M^MvUB_r+#q*rE3-Q~($)j^N&8{4Es5h2XX8>+2|i zFe-mn7>!17V(dbpz}ngx0Q=P{0J}#=#{PXDfc!}wFrp1`&o~bHf0*v)4vih&`bO1hg}c3$q72QuU^CPE)-TSezgARozSMU~M1rZ2+PFj0<0)0E?g zpu*cPZF`2^2}eMFDp`K5x%^DvzHw=O(o7JzlZcTdspk0DJnvvuo7RSrB;c>cg6@}H zTx)9kSbnX+0=-9~^*k>%|LafJ#p&0l34JBDVR%LFU+!>svkSlM1O)nz`=WM))~>k; z`A4?jo}bS?s>4W+z$BD+H@m!#iSc6)sV^BwkAP(yMpSLxj>Ie^?gM(yTt@sBFbcMs z=oi3qoA{hK%AK;wbrs4TG}2sNPdUZ5?a16j3I>1ng?6=|sD*aT55R9Bd2*IJWgY$% zPE6&?ALjAyyC8oE!*6E!?3C#pIXMtq6pppkGWK>Cl%{|8ZZeKV28@(9ING93Q2D tfJD)yF>KNp!l2(5%drDz9>@O~`~#Pb@B#wLb|wG-002ovPDHLkV1nY{_D}!- literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/glass-inhand-left.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/glass-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..b0e5ce127dcc17ca9ebd49f720cdd483accad861 GIT binary patch literal 690 zcmV;j0!{siP)Px%Y)M2xRCt{2noWuuF%X5H!rZ_ZL#NIVW{`6QEt;G|xy3AUi}pD}7ITGI4CDl} z5Dmu64F+l!a@*~W|I}S=Y^ZPJAFQf!xg;6h0~AG36h%=KMNt$bj}nX$e9w8m3=Lpc zKxHdN3FhT~QP%b>v;>)E?!$qI22a7@2>^h3tJtqatEL4^@1XH~E(t^$5G()!%mS!u)Bj7i=uVEA!+`#u zjG;UX4REfY5b~$s+?rqk_m&&=FoPRlLwXE0Jr6?zUYHLPnRp^wz_+KMb?R5P>U~Ic z*EY9;7v2KB_bUI%}9q#r>{WrYWiq2D)*Px%Wl2OqRCt{2noEk?KoExi4s!!x3`(6L%uvo1dSP-7Gm za;PSoagj?C%^d&$JDBq2=h)lbaPaC`X^hFW|E|3N7v#AyW(R<(ov{=$20(z>_(cQS zS04cG8VzPuLm`LuPxk=Fq-{a|mPh9f007SXbNPA++!9Y~0a8x=jeoI|CJVd;%9!dW zS0#r4&Fzsuu!D(Xk^Gy#j5FVI55FI9I-TI0Yi+Z!AR<|pot7c6xs8>^zyPtc5e_vBzLCBX>(nK@X96c zZS-C>X2|hK=daxt2mET^Tqb7=p=TfCdhPrMSj*>u%uQZr}<8Z`g|-42Z!p*l;^43rvxeZXIn24EO! z?Z*ruqVr=C)#%pyY>crd-8*0jnt=-q00OgqN&092`tlLx>mMOTMNyO`@dn(A2p~tM ReqR6p002ovPDHLkV1k`VBkTYG literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/jetpack-inhand-left.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/jetpack-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..b99a49a4e9dd2cc76d14bd8988648482f1d31748 GIT binary patch literal 325 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|{(HJOhE&XX zdrOh8*+Amx$4x2A6PR{dCsg&nt9UFY;ny(Jh37P@nw6`Ql)>YzB@h1_M+>Y!tDdzl zod>8J1m<`w|Y8{`qBJe^0E8PGOE%wa)DI zo~0Vh8oT_al}fXH&WYQ!CtwQWk6qJJ_pUx=b0>D1c$ZN_y^^%U?QO0;+QIXCyT)e8qo)?ZF)D zob1iZ?G>aOHVIGolyj3|%G`!2>6iHfSeM>=n0`~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/jetpack-inhand-right.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/jetpack-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..574c095868ad9d6c848bc02795f07aff11f02e2e GIT binary patch literal 337 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zxjkJRLn`LH zy=5rWxAXkcjtZmCf^Oy1<`1vGVuiSXAwl)tWuddNjdtZ{R!+H| z6HpwUuu|sW;lQ)8jLAM*(pbzLio+Gs-aTN;c*k|*%-OmI{|(R99kAH01yt}gaQm}2 ev45X#bk^T_Y1+}dk{6^vrh2;ixvXPx&)=5M`R9J2%O_ou{WK00x5r#bVJ@6Mqa~Z*NZkXqrZ+(^1zGi3Ev60$4aO9*@apvphUJ zyc|GQYPDJw$H&Lq-rjO@a)RSH7={5ryWQsS@DN?sd3<~XARdq7eqK6Kuh&&atSeIG zz{SOdvh(QZNCj`V+iJ0dkdh!WaIskAr{ip5zyhFBsfcJaNZ`2*0Ign1L)p57m4SYyK7=}SC7E@^(3vIofy9#1^dt1#1_n=xeEr0w#Qvjt>iTnF|1#x|S9SFY;BAHCG zv$F$0Hk(z!P16*%ZIezT>{d%d(}Zo?-Wpg1k;!B*41->;=gGGpLQ267j0)1}SG4KW-J0hrI{fsRPIU2wz5;Fe|a{{7!ewGp}-hNZ%-RjF`qUVfFz z#1GSuV%AJzuyloLbq0>LIw^iN_qAt#m;l_|+-SL6PF!7Gsd|vDwF<&t z17E&;QOB|dHUfY}G5RI9ZuuX=zl(zRt=-qxcEPHDwYgkQxVyrwL?W?dxy-jeIBZY@ ze#xSoPN$yYlELM*u;B2^f#-f5yXBq_0Qr30b6@7${f+QP0aif(j7B5i_ZzSKJpT_A WkNU6*rAtNt0000Px$>q$gGR9J=WmcMG_KoEyNT?_$Rz2P_vPT>d_sSZIpSzVqXFW?8b+Qrs+0Fyqi zVYW+?D#c-3c<~hiH#!0E5HrpD*aSDel)sISlTh9CaJ^*1D8qf1gopAtKbqxV>2msIX%zQqt7JeCkl#(C_ z3Jt9q1B zJQ%>9d}*4#Wxiee zR{Bc;f*?Rj$>Pt#3~mNa4zl?F4}jrt$g|e)nuXk^F@RjT^Xu!toSzGp-R0)PU+{gO z^?FSdMby~=4+4019|8sGOxlH|kD!vPr( zLYPjc!|3u7?qSgDH5UC|03n3wcDr;=PFO!ZG3fPZxo%_8!;TW<&H>EnDX#1C^X!Zy zNj~axOFJ`Q?{fBiQ_+_K*nQpJ`|T!Fr}r1Bumtvzt0)UiMGqBvfl>Px#+et)0R9J=WlCcegKnz7cQA!$6sE{Z0I-|CUdNT6|AE~AUDw%Ku41SpFHO_c{y2uI>$~-4S+?ol4PcB}oU3zXsHD|< nMUk3eczZo>cZ8xS%5Ql9^@LC3r9CBb00000NkvXXu0mjf6qs~l literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-bucket.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-bucket.png new file mode 100644 index 0000000000000000000000000000000000000000..4285633af08926bbc505833a660965e477f4ed95 GIT binary patch literal 487 zcmVPx$p-DtRR9J=WlCe(PP!xtgUt${~B1H%)L{$YSEEWTy1L~A?%oCt4$s=UtExLBC z-vBYN;;D)RVnIlN#DE}DsVIabb`m>W27;l)&S1fIKk3T4*Y}+NKj$7$C=?2XLJ>n| zy&|*4s(f!95p|d?R^`WhfxdT3+A6)PiBy#M^rD3jg0YD#=FDe+NE2h34*)c4zqB_q z(D!aJ#?5daw5~}nehv3Re+)4PU!j`-GO3BkC+Ky$0L)o==BzwH>pEP$n?HEAU{A7BDgOKbc)-A|%F+<|`cidV$} zAcOAEnW?7`x=G{mjDG8HA_I{fh!P7Ky!5>vz+et~S0}hfJ8w4wainwu_wJ5QU%ug< z{l;@Uv>S~iy730wqaCeY+lmd)wC6&9Y%GjS?l_LLZF}T!#^68O{8caZpYqzU1ctp<4HWq dkV2t&$pf5xklv`LzCZu~002ovPDHLkV1jJN)tUeR literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-camera.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-camera.png new file mode 100644 index 0000000000000000000000000000000000000000..1afaaac4a0d1d1073f03a316f66a999ffb3ad515 GIT binary patch literal 540 zcmV+%0^|LOP)Px$)=5M`R9J=WmA{MAU>L_g5h;RGQ^K7Q>Tn&-7saCFU0RTe+}J5wxe9{d;2?s3 zLUutAoLzfVy2usWx?G0?;izE2p+lDp7Y`1KAdiEWBigHZ<3$(q*^<0@pXd2Lzo4L? z;D5(5J?Q(sB%gb|p7FoG_Izm_~4F>+uwn*k7pA?6)oK8Y$K$^nebP99 z>&nWATMbWI4KI@-Mm3N$KA&4l5ywWKK6?(prOU77-SEAUG8aq^Szskq_|>>liU$uL zaTrAaymKi(rS2e_uhQ~4n9r+xV^K(ThF6ft>(74Qk{5Q zD#@44O|flT-jvJoq*O{B)qj+Nv#4CT#(v#mFr6|im)VLUYV~^RsLoXy-}fcnobZqK eL_tBpdHD`LTB(jh4v$#?0000X7jRI-)QBU zCi7W_p+M{O3(13=Yj(~#&oIw4C+Og;o&O^yY5ib1$+;zW_LBdVOj!=RD$*KrCKt-2 z*2?c|Qx$r@x8nWM*H$ZEN9jy7_^kH(;F%3BNu6=0U0IY08C_~!uCFp;xOZ;TA`LGd Y{+$8d^}nLkLB3`1boFyt=akR{09=A=NdN!< literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-canister-2.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-canister-2.png new file mode 100644 index 0000000000000000000000000000000000000000..abe398db4120f134b5ed53b210365e5873b48b12 GIT binary patch literal 273 zcmV+s0q*{ZP)Px#%Sl8*R9J=WlfiMsFbG9I>3}mXK`z35xCK??7U+W_)Pj6g3G7Kb>)l+4Gm}Gj zGdc;u6G%XkBuVn$p-8Zq0RU>P{=U~*BLE-@rHo-_D5bcW!OS2c?(T4Rlv3RN!|QjM zMdlKbr_7X#=KT7p%(5&F0Q#@7T>ll>X0N!lKd?X Xfkj+Px%<4Ht8R9J=Wmd{G#P!z_0odgwIY-=5{AlN5x8oQAg2mMVqJLUSjzX&T$*_^pzg+;hI~d?zOt-toU9 z9CxqM|55 zVLvE}g0AZTn5OA0+W_D8_d|pBJMgr?w(WrgbX^zfr=n2+ocmNN1<+&5`uciLoS`hx zb-k zMj`-w+1v!4)jOozxVyXaR1X0yP*v4_>~xSL5oQw!!r?IYmeuo~JNZ;JI#7LJ0^_nw zJQfpv0;CoedfuznYU0{S?x#Kw0aaCPr__^?2+el8i-;GA-!G$iQ1U*S3ofJ0|~fMER~RDS$ywq z5{~zumY0Ku6X-h!-0G*IQPSyj*U))-dJ>?)~PyGjyu8 z8s&0Xlzyc1!2JBY_aAOU#x(ectS46&wZT1b+luF^Zthrz&~QNM=zQ>kPx%sYygZR9J=Wma$IbKomvKZdM{LhsLrCR-$r=WIg~2HH9ve>*BgD zlgR`j1VIoGh9OERlv0fml2WdVqChFt31E$Y*2BXCgTa6#Nr>Z^AP5M8pfd1%e+!~0 ziW(3!|CZM9nZMWd^>q!xlv1jy3k@}&&w;npB}qaPgtdrHPEG)rOeVx}TtU2^Ivh-w zHuefcgJoGpp657@!|m;De$IyyoKL0OiRWyzU;Mp>5hdOh@f)BNS- zg)~inn(MVjVAHs1HyWl%x_-LU`WKi{&_I9Ms`(ADU2vvWs}%st<#PW%pc{zeIC_D$ z?`qFYKy7D&wFvcu&30=Vjz*&`FezmXLPw!VJ0Bz_gt-%=&DP9Us}=oz|9vSiO`<4b zJRY|mt!BEkp{cfcI~_*8@3UAeI=>6UkTgxLhMTe;$D4|xXzS`_>hSPzFLT&20`S(u z%@(a?gX+>=w;3tr+V}n1SWy&2Q3SwZv1sh~Htie%_+1O0=T)KBbuk`~(O~Px$wn;=mR9J=Wls{|RKp4hO6?3* z86YQ$BKDe106L=)06(&s2C*=)wU+gskmF)zKhJUlE!ELGWA0cy44 zH8BR3VNTA@xE>7F%z?uE{O*o9P_NfHH~`XDJkAkdErGYqdor0+&i%T)q@^`u?^z-@ z|9pSXJWc6~D1iMM>gV)3zx~CAjx|7EM16gF0$}WU#Zx9RhDMgr$TCi~F2?g7SuMBL z+S-xU!Th*Px&mq|oHR9J=WmOp44XBftRU!+FSU6LY;rd8umH%o_*MWkd3oCXu97X?~_C3R^b zgVVK;xl{N2>Exx2Q;>oc$mHn++1;r_F(CpcD2a*Am2)SZeB$e%e5d;(OL8f6@dHBN z@!h@8^FHtU{effr&kz7oN&p&-#>AHm!1wT$hxCg9L;nVj4ScX4g|BD zM(TPV0IB5k@DtydWNnl%l}!4?Wzz&;y-@H)s4_%*AtvA`qzYxzWW7)bk*o2e#YOC{ zKu^n9jF^C1^Yij3q(KBl0HN`uQk+nOTBQ;rcRkPl0hCNLMy!astrnK!&~3GRLD6>= zPfWo58#g52+jJmhsGjA`OLccZk!8K1tf$(1SZ$7U&nGB?q0p>2M*SFqg3L@CrkP1%S7IAK>)+ei?!*?F2y8vSM3gFcXz|M$<^=a?tM&C;EN5+uJ`^5!bbvgk4|GmJLJhlWdEQ87{qiL)ai&&1sPgkx0 zP~P0+(b5tdH*W&)=gwQSlP6Px&_en%SR9J=WmrrOLM-+#@v1EC@!b_#tkxCqD2>9TfYDh4Y!U}u}CB=stf^-Q4 zN}WsU&_GLkX^IOCE}>9Cp}ol%>VruLJsBbhv<-#cS_s6ci(_ItsRb)El8uzMoupn&P-gBa`c)!Bp zg%Ct_aM*x(U+_^990ahVUBK1;esx-@z`bnNR&9nKS#1HDmCf2}cD5*v8z35XQ?K4K z42FSIr%P9NXjZ}*9L_&=x5{Ci_ZGn~hB&0B98j3*LmKZqy<_jyOX4nU>48<(~$HcO>IRh(Ll zWF*2+I?bBnkhUxU@A}c>4PbZww>u|156tIs>aG8Tl{149fI_~?&ATVKw$qMwAo{G(8cHNsa~zV9 z2+5rmG;76o?Ny-fY>e}Rt^r3b8<IwP0eKHt210@K9XG5dKW z49@>;5PB4UQgA_T?|_Va+1eT@-KrGwZo;Me1VE&O?U2=fP$&cl_k0&<5Vs7BCMmMW8T-QI!LPKN?$hPlqD z&#Z8Mu+Gyb9polnaq?ZaB-7%C>X-CjdW)ZQI`V zomq6V>oY}rC`^0)G4bm#-~GBGEr89*#j$^6A71|g1<=dY;3djW00000NkvXXu0mjf D@UQ>7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-firelock-3.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-firelock-3.png new file mode 100644 index 0000000000000000000000000000000000000000..7b98e108d129a43035ebaef6f04b51b0fbcf7ea4 GIT binary patch literal 506 zcmVPx$v`IukR9J=Wls!+vP!xvWL(5=D2uy^q83Mb3$)VRoO-TF)FcN+N8-qG9$?QNJ z{Q(XpB-*59V1h6jLE69z*xDqIH=q;Ok4Dlph*YtQX{pPt(uz`r`kA_|F`hi{-Xtajtcih<9AD~{5 zaHf73GG)u17i2Ot8g`-48jfq(>u)NgWbXC5gwL)dP`f%byd{8{(8=}vjvK&Wb%A9A zMfAFWk}DC^gT)03DVYO6JnllZ`WqNat8)V<@dUmAEO`XyM>{;UO9%uB`mF>dcehmN zB(bzg<$QuGY_=xW!pJ%hB-AU?sC70m+rw1A=OK9gc4Oxww7N)2+~*;*pJgby64@C< zfN@St4P!QYZwj=sKF&CXW;%!hh4woG|S`rk0^%tjGaahTFyR w2r{({0l>P#=L!HoyA4Vv*;;3TgTw#k2P^iGSnyc*7ytkO07*qoM6N<$f(N$OH2?qr literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-intercom-1.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-intercom-1.png new file mode 100644 index 0000000000000000000000000000000000000000..3ce6f3f2b8816e5be9a7f9961ee2b63274ba9dcc GIT binary patch literal 528 zcmV+r0`L8aP)Px$%1J~)R9J=WmCtL_U>L_gkBmy&!welb+O2w0A@3j2Aa1ZzjuUs^rGHK?yDRnB zlb|9Ag69qC4g-;bjZ{{ao;KJHkB5@5tZmY|i3jt!<=6ZDywCH57YYgr{&ytnq3`>t z>sG4;A_{=&)VDzp%v{HDoVgh*d4?%ObXM?f$Q5X}+X~P-K2CPsXrN)3UA;xQw@7%U zT*BBkcO9N90Pv`}&XcFlQsKrJHOA=m_hetx={P!bkv|ovluMkRp3%ShOtdz{vJA!; zbzOJrT|H3oU;47FL}n>%+fG^lu(iDdK)?STfTN?Y0C=7!F!@VlUsMm$gDNsVCR0Fl zvYEKt<7h;^UMC#<0Kj?vA`$UCPn?c36`m)MI|Bf{UQYlXSZe?@HZ}oRUA6E(eVoX2 z9JRmLY&6#It_5)gVuBz@{TV<~4XgGL*LCT3yNsg|gK(Ived`un7l^qjvbDX#hxhLQ zIKQ}L9E|`NghTl&0yjnC`M7`bjmNbbht(?a{qX0nxj75XKo*|o$v7G%^AR6P)Px$l1W5CR9J=Wl`&7kKorOSHR7TRv;#INITB!zxafp~_B&`&CSdVvxbQuy17UHK z{kq7ciz$QAgoK7jj6l>)O`Zce(k3G96({?fuCKkj-`%~w0}>Jv{yR$44n*{0+;JQ< z8V#~-J20kcnv!b22oMn%V3~JtRonB9{T;h0?e-CgoK0y8NLBX@4Dug%S=%K O0000Px$07*naR9J=W(mzYXKp4mIZ=`iou$9Y@qlSX}M{w>&&N_q#t31VIo4|19!pmPDGS`dWW|*#dBLyN-&YI9vd0 zt&XP?PEH?bVpu*b=-=My`zHXLBZ?xgkxab0f!X{VW3HHPHkeC8+qO7293)8)o`>=d zV2r`JI{>;a-`A4_4L9I7@5nbm*L5^8G%@UU_xt*I3%Iob0N;e~nX zQ*~VhL#r#S!-2hrOK?7blCk7sIF_QwHnuab|y)T%a`{j1gNU&SMMDJK@j}p Y16W#Jo7x+yNB{r;07*qoM6N<$g0N?e#Q*>R literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-jetpack.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-jetpack.png new file mode 100644 index 0000000000000000000000000000000000000000..a1ba37ce1a00f06ceb794e948456be2939c51f29 GIT binary patch literal 577 zcmV-H0>1r;P)Px$`$FM))#mugQovFo_1)55~$2ZJrmXucU)9s@@mb<|P+yNHXC zwH5&2d7e$ihQlEN04b#ffFKA60E|YX)Fuo=0sw^U5918rd7h1;2;FWM+wHd0zFx0m zu~>j}jxY?#hXC~ZeajfbYPCYM*-Yndu73dlE-rthV{sg#(P+RJ1FiMp0KHz%GR9zx zL95kD0ZwYQjNQ}oa|*CrE|K`mX0yF?|@Yu@rrgJj~~Kn9o5e&DgfvZKpNg1(4TirvpkUD5W^SI+Vr!CmscOe9%l-PH^l~Nh|e_nq9_6@})QpI2* P00000NkvXXu0mjfNo)$g literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-medkit-1.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-medkit-1.png new file mode 100644 index 0000000000000000000000000000000000000000..047723cf4f9b3c37665ce0faae7e18896f90da88 GIT binary patch literal 528 zcmV+r0`L8aP)Px$%1J~)R9J=WltF6SKoo|*gzmGFA=H)80YVlg6iNqXuM_kJIf9O$6PVl}Cz$=f zlt3w3m>giRPzcy7U!dwD%tW#^k{qu}_3sAF=>OjT-V98dH0giW#i<8Yt5pq9mgUj6 zJkL-5-=|Z}rIY|@tywGks89wJGSBapEWqX3%b)>;6PB=Hb#eE>2F zVi2Iq{Oh;x0Bm1hS`Zx|gAkV=HBTR&N%a@ttsR@qrnN6g5`++BSyuOX1nENN>BBSI zt6RVC_m4kpUtfUsV7e5nwHRZ9gBeVqEX!7ZUF86?{o0!Y%&tEJ$4OXg2b1V+K@>$E z!d0p6Z`fYlGTX1Ydwe_o>*=RY$w3%nJO~hk2m<7Jeo+)f3j*No@sinojk>?_=I|c5 z)|#>`iQ^b!j0Xup1ZO}gRRb7fST2|Bc01fmxX8QAqbQ;%3IO6b2996N<~(#>L#0&R zyweUsYmJoBwVMXR7&32G+IJN@TcDJxg%DI#<%g)5 zM6(?s^Reok0U-ncRaF7+ciKS!XPNf`IEd!@upPiz=4UC(vU=#5oiu6EKcT;cQYdec SyB-k$0000Px&6-h)vR9J=Wls`-pVHn1LAV`&~rGY{{ea6f8 zzQ5;t-uFHzsGx%WcNOJZaOu=3EuBd4(QKx)stSNl3kv{T>F>|GUtR^5FI>=?cJBsY zY-9x4?WR(e0a#R3!jqGE8(EhRyse`Hv&}|oVF79DRvwLyQ?`CRuBIkLS?0_8_t@=r z>P7M5cqnw~uNlzc0II6;xugWi>BMTW@a*|>N(BL{)ru&~kWN!B2)}G%O#^*>eOhaK zy8&NRRqE>`YPUHlHkHxfb~83SOsOD{NF@@(RqoX(+ z4gkv1X#hT$Oel&%cXxMIR?Y-oghJdL7yv+)W%lhqh-0URbd8hhWY~ZMRBx^Y!0YuI zNzBD!d@z}iWtryY=A22aIs$7&1vduSUO}X}1B_Q-W_}h(@DGl7yltD2ig# zW;2m<2LgeB25@I+h{nc7-X;?0zoH&_Hn`1Zi^=RiD{{3M%NI&{w=yPg+IHWKsYC002ovPDHLkV1hYckl+9S literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-mop-bucket.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-mop-bucket.png new file mode 100644 index 0000000000000000000000000000000000000000..66751cf4a5241cd5ab5b7c4a13e360a0d171b28b GIT binary patch literal 666 zcmV;L0%iS)P)Px%R7pfZR9J=WmOp3{Q5?s=@4UODEosRR5HV6QpoHLGs8BE*QiKd0NV||yytLD+oQ?-Ysg~0 z%W-$_eZQaId%QnDOD+BHB8@h@Im*y*G`Z$02!dgIrqSWjcYA#r25|0l8;zV`a4O1T zZbqO@1sFTyrbiAjC@gW zRJ7(}8({icCzb#FLZI7)f!L_-Uva@&)s_LSp9S^!fTIUo_>|%CyFzej@CXb29?17n(?ERrd8d2QgiSJ^doNHw}DDyJ}WE zG^l|jQZh2jobI35IbaC@0AxjLR+4I;T|DEy zRoOhJgXrt!@%V|pO=g)xNg_BFcH#0#)^s~KXgF&D$Z|Y+k;MP->Tt%4{egG@0q0inZx+)*s zzeCPn9H(a00}iHOPx%$Vo&&R9J=WmQP5NVI0RlZhQB>6H|t@wx)|Hlbm6i2gOSRJvNXO#B_8Cx_j^# z9t*s52!YjOTry-;dw# zv+wh~@B6@!j$}e(L$WqDBx|97q=f>KrqAowd*?)D6G_qw4^N)q!sQqM*>pD$)tVe- zCT6;Ts5U%#7Km$2jxzU`N(~~l>n4Q)k~TbfmP?%{YsTa83~fEDd|T@?##UdR@cgs@5yR>3 zK+P4%s;-^vt31B*i*~P#_ksWxQPQc|W?DQRuH3lJ;P@y2gX5z#yIiz*JjQQowpp|! zAh-#24PFbfy7(N~R^eWM@wzImNLKQS-4sAw2evcTs(ZCiB3CTq^AC`StRUMgD3TRL zvR1BT3D{k_dNSp}o2QF4=XFOCkrgxL%mYBh=Kaze`}_m^-r54*?KoH81z`Y(VmEBw z+cXhb!RH?UAXhA-<_e-E0TWMwB1_0N3yH{z(Nu4&!{~5kBCf1oiyuV=|rb0GkL&7YM`73^Oo8jTX{U#^M=`o*4<9+d=_JJAZNaNcR294<=^1jr;KY zI=zGKhEtzEZ1V7B;c(7`dm%D;3%R@n*CmC;Q#;t literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-pai.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/junk-pai.png new file mode 100644 index 0000000000000000000000000000000000000000..50742a847e63fb4b8559813469dfec6f85902732 GIT binary patch literal 972 zcmV;-12g=IP)Px&hDk(0R9J=Wmd$S)RTRa4Gya;)*p598u9FbsxVW?gi46@Ei&`k9QdS6ovq3D_ zL@Zh<3wHbkEReE5sPYy8QlydFI0vLhB$f06_`JMzv70%xg!0p#~g` zkH3rG=L4WrE_3Z#hMK06N~QR9;TMt;}7z_?`>&_o& z744avmlgm}EIme#PIlq}zX#Rt=IZ<<-kx}mT`5Yg4C12|TAEI^P&4He?Fi7LlXz7( zr_TgAeI|(JG)TPR1wals@v3gTs=G&|8EiQKaO#A@?bT{0zIC?*z(`0YUn!z`T@1+{ za)26ekT0|j<+J6$^N_DJn3|qpEBy($7N1$TR`{M1E^kCr~TbG zUo$m5!}}k7fhe?aIn6iOOFIw`E5ySJH!i1{OV9H8#V-Na*sHO+Sw`S+>knXS4V-w@ zhbHQbgk^{& z!wSEB|1BSWdXa@6zM@ntvc6qEbPQVp&VDk3Ch7n^19#)ikjDIvKhehy`>3&X=!sI3WjB^p9>i3|*fc#xfcVP4S$T|6*SMZpV(rg0u4k5dax&R0qEjI< z_!@e%io4%I_tEV|uv7=sfWtU;EP@&gB03~Qr-I(Ba`WaAHLdMTGMNP0(@~c+_DfZY z#WD|8cmH`EXdgUthHkik3Zk&h!-qM}eQ>Umb7kQQBhe`Ceg{Hbry=O3gM-aeu`G$k uLA%>tO*4Ap;GoLA+dH;T+($UVe}X40!#aV_#TV`X0000Px$sYygZR9J=WmAg*EFc^hDC=8T=rKm$@hQb1irM^I(0kN~fUUjUx!{hi7JR%_@ z5Md!wDF}hurVq?AG_1%MDDwK93KD)76z%-#I-t zDGQMbka5NU_`Z+hIE%LHx&Snr%|)L%mLy;rROt}L<+?6XO4{u0D)He+*p z8~6#UlrotCtIB^0Vcg(#G~)gFg`M42+$f4?s_-qy3Zjwk`_|mU&i+ybvJ49W_4&Yd+`p?hftUSN{?!rE<+vWH?z?b-s2-zCCn{=vVSuJ@-dmBJ&)^><`zH^ l#eYWYUm=Y!1gK;V@C_3D-~@rd$ff`Q002ovPDHLkV1mI<+bsY9 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/meta.json b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/meta.json new file mode 100644 index 0000000000..c4902e5ba7 --- /dev/null +++ b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/meta.json @@ -0,0 +1,181 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by Flareguy & EmoGarbage404 using assets taken from https://github.com/tgstation/tgstation at commit 6665eec76c98a4f3f89bebcd10b34b47dcc0b8ae", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "airlock-inhand-left", + "directions": 4 + }, + { + "name": "airlock-inhand-right", + "directions": 4 + }, + { + "name": "closet-inhand-left", + "directions": 4 + }, + { + "name": "closet-inhand-right", + "directions": 4 + }, + { + "name": "firelock-1-inhand-left", + "directions": 4 + }, + { + "name": "firelock-1-inhand-right", + "directions": 4 + }, + { + "name": "firelock-2-inhand-left", + "directions": 4 + }, + { + "name": "firelock-2-inhand-right", + "directions": 4 + }, + { + "name": "glass-1" + }, + { + "name": "glass-2" + }, + { + "name": "glass-3" + }, + { + "name": "glass-4" + }, + { + "name": "glass-5" + }, + { + "name": "glass-6" + }, + { + "name": "glass-inhand-left", + "directions": 4 + }, + { + "name": "glass-inhand-right", + "directions": 4 + }, + { + "name": "jetpack-inhand-left", + "directions": 4 + }, + { + "name": "jetpack-inhand-right", + "directions": 4 + }, + { + "name": "junk-airlock-1" + }, + { + "name": "junk-airlock-2" + }, + { + "name": "junk-airlock-3" + }, + { + "name": "junk-bucket" + }, + { + "name": "junk-camera" + }, + { + "name": "junk-canister-1" + }, + { + "name": "junk-canister-2" + }, + { + "name": "junk-closet" + }, + { + "name": "junk-fax" + }, + { + "name": "junk-fireextinguisher" + }, + { + "name": "junk-firelock-1" + }, + { + "name": "junk-firelock-2" + }, + { + "name": "junk-firelock-3" + }, + { + "name": "junk-intercom-1" + }, + { + "name": "junk-intercom-2" + }, + { + "name": "junk-intercom-3" + }, + { + "name": "junk-jetpack" + }, + { + "name": "junk-medkit-1" + }, + { + "name": "junk-medkit-2" + }, + { + "name": "junk-mop-bucket" + }, + { + "name": "junk-pai" + }, + { + "name": "junk-pai-gold" + }, + { + "name": "junk-target" + }, + { + "name": "metal-1" + }, + { + "name": "metal-2" + }, + { + "name": "metal-3" + }, + { + "name": "metal-inhand-left", + "directions": 4 + }, + { + "name": "metal-inhand-right", + "directions": 4 + }, + { + "name": "tube" + }, + { + "name": "tube-bk" + }, + { + "name": "tube-bl" + }, + { + "name": "tube-g" + }, + { + "name": "tube-r" + }, + { + "name": "tube-y" + } + ] +} diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/metal-1.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/metal-1.png new file mode 100644 index 0000000000000000000000000000000000000000..f45090ec5ed0b44c36a9881b4f4a50e4e3e24bfe GIT binary patch literal 739 zcmV<90v!E`P)Px%ok>JNR9J=WmcdHnP!xv0jJ9GSL~s@klnOEqbXkNjs}i54+!yd6e1YN<6dBwN zE;YCs0@9^mrC_-)P%b1koswDDWRiH3w(96C{8vqKlke|2|2+wO=$&N%TwY${I8Nz8 z*L6#;JC1{G+fjV%d7e>p|KZ_b@_T)0s|#e?cC_1Q@OgVXInJBV>C!OrGN?B-P zr3}RIFFQL)*z)i&3<-jOpXcWsA0H>R7D7bh@t9__88L4?tWbgcKG!LR>%w<)b7Lr_ zo}6E*0&&_mHa7S@n*sWS=Yyv+0V{?u4F{ObW=z76>2!+k`}n@kkF&E3Tq(ufaL8$| zw{Q@ZZo@qMb}#^7x6xp0Ym4=@HLm-8lv0?c34mo;eBIl_y}F`auQMKxf$X~>U4eCY zd{Gqb^EBMDEToj&k46C8k48z*gb-1^UPnp^fYWYs-S6|=wwX?+*tQ*|Lm8{E1)k>_ z_oES$$s_|eO_Oi?`x!Vq_E$}M2GS<-@X2JNT_2k;O*4Vd=AkW8 zsR7aHL^^o>-=~#_hhg|U1ESN3?uJ9+vMQyx9Sln0@L089o<|S_$vu{3748V_9LU3^ zlytk@g&!Ab6Y*=<^E_id{SZP#`R6>TfDRrHkX7V)o)K@oI2$@;D$r~;ldbd;xK2eC z%nTwSLx3AAVwJMH$fdj1k622Ojur1x(Hhj|9ly?;wMq$=Px%SV=@dR9J=WRzYgxFcf_nhJXden=DPb>VTIfAi65?DTbaP_yRdZE|4RXIYmNO zgCTfnh=U=q0#Y4M(JZDicI-G#8oFuU&eFI3`(OV*ec%h99i;prrED}>EEcVY zj7Fo{nmZoL#nTglARx#7cN_=bI?+56?szQMQPjz{l7abr-e}YmVHxEJe?30Rbrc~< z63k{Z()K?gu>=mCpPPOF_};~cG1e>) zZ_su9BIlh5OePa~#~3K3;G84RbNqdME%t>F$g&KZI6l{RoxrhvrIdnF3IO1o13*DS z(=-6U&0v7ZWFi5;^SnwX+LW}@6;MhGM`aR^{PW>~)CgFXCEHr5iNw0qi_rP^s34qjI zL(8&?4CuO!JI2uO_hA@DVYl6Gk)|n@zK`8*S2WVI4&n-QQ#B`xR|C2aWSU`Ek*8z1TlYv1M6O)roj{fe-?#FvN5^ zt=P5A1NAm^U3sYM#|{XBfH1~np63ukRL*$UJaDeAtMq4C*7cVHwG3SHps46oVJea7 zf~!qLD*AO4DUtaY0-ooQRTyFu$Cys1Px%TS-JgR9J=WmQQZlKoo~RHz5cVi$(TiMI@F8X_QrDdWEQGh`0cU-~uQoK)FPN zvO*&{Rg=Wg&!60H?(w*=&~YkB>+x z4Il=nb<=LEzUMI<4sl&K@-U2byTfe&073|*jdQtNQh3aKdG?!>2mp}HW-*VC$z(FW z)g0hcnxI@RM<$b@DZO_vw3H1kq?Tl zjBVD$vC{FW0)VJGrqd};gF)0IJ`Av&%g>g@$;k;v zM@O-kRS1YTr}z3qY5;(9A;{5k1!pY}<;Ys)97qDbm%U8(5Nd z0+`Kav8$Hu4W?-_9*?mdhqF>C)tHGXn9t|Y5-&?{#IJ8T{?)2T1bA620M;Ou%{S?3 zFrZqgY>i1w!DuwXe|{#MOrp{Yf`A`yO-V{=NGXl3l(E_CX4LmQZrbgQopI|5NGT1y zlg~;e!Z0M9O!)Tj0IctB{e1cTa=EMk>h-$fozMSH=YiG1A-T>i%R)o+dc8HjR8=6Q zG^&+K^fA)rY2~`Ev3xMu8Q@Q95Ag2*w63p>)l=?X|Ak%wNn=Px%WJyFpRCt{2nlWqJKorOSDz)GQ#)G{Ww5HrD%&jJarqC_@48mU^^ed#z7bw}A zy=2u8yqc2LG_EFn0TFY;c(@LUT}3(DC)qkT^!*kI>+b&Y(|b>#`vU|)5ClOG1VIqQ z|A%8TNC=_IzfC3+qq+Y&?{^IlLa0FypwsChgy+Yk|2&_qf#mBf4jck ztHef8q_*k5>H)JPS)a#o?0mksP^;RPQsVdX^;wdvgOH{veBXaDw=QMJYj$aQC7zDw=ZmNp@zGwqbMSQVX0C;Mahe}&heIbPUbbfB7RJPuP?)(_~1VIo4 zK@bE%5ClOG1VIqQ4r+gUx8)gVT4$#}K!+{QfDN5m0RWyn1FP+FDJ7(oXkweJX&obf zfDT)pfu?ngGC=1U$nzWkwt5CQ=cmhIgLjhmn?&p_GIvT1&n zWhPx%WJyFpRCt{2nlWqJKorOSDz)GQ#)G{Ww5HrD%&jJarqC_@48mU^^ed#z7bw}A zy=2u8yqc2LG_EFn0TFY;c(@LUT}3(DC)qkT^!*kI>+b&Y(|b>#`vU|)5ClOG1VIqQ z|A%8TNC=_IzfC3+qq+Y&?{^IlLa0FypwsChgy+Yk|2&_qf#mBf4jck ztHef8q_*k5>H)JPS)a#o?0mksP^;RPQsVdX^;wdvgOH{veBXaDw=QMJYj$aQC7zDw=ZmNp@zGwqbMSQVX0C;Mahe}&heIbPUbbfB7RJPuP?)(_~1VIo4 zK@bE%5ClOG1VIqQ4r+gUx8)gVT4$#}K!+{QfDN5m0RWyn1FP+FDJ7(oXkweJX&obf zfDT)pfu?ngGC=1U$nzWkwt5CQ=cmhIgLjhmn?&p_GIvT1&n zWhPx$0!c(cR9J=WlQC+;FcgMAm#*GR27}gOyf|RfNtf^?lFYtIE>Ln0c}eLIO%YyA za)qoRuahC|kXp8fLiK?Li|6+}{YVf91Ooq^Xh@NW&@|1%8m%?fk}j8#^BLgDr}z=p za?EqQm2X9-MQbJLk=DZyet;fb)C#9hk*&arfJkVC)e8zr4)0?!6SjyW)lHaRh7&o4+H{% aKfxD@DQrrv6qd{Y0000Px$1W80eR9J=W(?4s%Kpe*LZ;EU7A`X26&61##aIeHw2toJ0i--nX-RoO8L0rUJ z^bK?f(%l#E>mXU$(%xMH?QkE+kUy8_$&U*JK@bFgEV6k>YyIPWr4+{_Z=+H4?UWGFEY{BuRE&Q*bU|43bT$$_ZnD)0+Ht+j(t3=K_lb=WI#^FyF90t;y5WZ}&H> ze#2_HlzV7VHP^Zb2Zsqf_WQiPZ1XO|tqbHu5xrlp)OAfcVcb=?b%CY?z+kX_?kYS8 cg5Y2H01a7OIP*OAbN~PV07*qoM6N<$g7C+Xh5!Hn literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/tube-g.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/tube-g.png new file mode 100644 index 0000000000000000000000000000000000000000..92cc4fb45168047baece1d361ad42db2992aa69e GIT binary patch literal 314 zcmV-A0mc4_P)Px#^hrcPR9J=Wle-GSFcgOWh^xCuH)mbiO@#J!ikD}psBfXKa0-&mEIK;~McjRW z;~)jEm^1|)&IcI|xqSag2p|Z8Ap96*vxta3&c$&I05ArJC{kV508Q5o?=S`&hIY+7 z)2KtPHTG5adj)8Al=f?GPXxjnw&cLQxdRG!N^NTL&mZ06-9|dv(bLK@k3eE7_oDV`St+2><{9 M07*qoM6N<$f>yJApa1{> literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/tube-r.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/tube-r.png new file mode 100644 index 0000000000000000000000000000000000000000..e444ce686beeacd2f77c17af78321563ed4acaf1 GIT binary patch literal 334 zcmV-U0kQsxP)Px$2uVaiR9J=WlQC+;Fc^iON;+mQA%R|?T^z_1u&-lM=PWXbZ;@O^Px+!bPTV48&;5XnL7)@1?Yt8|{S*DlEYvl(S{yf1U_08I!07>~D4 geVGe_Ap8qH0L3(c9JByg!2kdN07*qoM6N<$f+h`)Pyhe` literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Materials/Scrap/generic.rsi/tube-y.png b/Resources/Textures/Objects/Materials/Scrap/generic.rsi/tube-y.png new file mode 100644 index 0000000000000000000000000000000000000000..590c5e8a931d7aabac417ffb6e5eb1114fc12dd3 GIT binary patch literal 313 zcmV-90mlA`P)Px#^GQTOR9J=WlRFB+Komvqi0(ne!VPE>(L#h|J3+IT1a%j>g(pZFahkXRg&_8} z!n2UzCxSCcK#O-^ih0b;x$^@AK@fx=qf7=7QLg5??n_^9uZRAy(XkCsx1I0_t-;Qq zZnT+qYE{VN82h60O9jZ}L4aPFb-u#PxfX_;>=<(*0udn$IVrNX(Y-PAOJ8d+9JP29 z*uPxX%JV$y0M=KK$>WH}&vI*XkpNMIB-{BYP@A%H!0;O`W;4D^r@3PPx#z)3_wR9J=Wl0OQAFcgPB+b*Soi$n1cP9pS7#W@F&u3o@XUhRrW10?mZUEMs$53-2 z2a6}zMiD`9b1EMlV4r2)y=`flhPw8h$wvq1Lja`d#g$tS1mQb)0Xw`!_BWW2S^xk5 M07*qoM6N<$g6Ab``2YX_ literal 0 HcmV?d00001 From 8ebe105458c4b9ea48e958992d698e5c6f88ddd6 Mon Sep 17 00:00:00 2001 From: themias <89101928+themias@users.noreply.github.com> Date: Thu, 8 Aug 2024 19:32:42 -0400 Subject: [PATCH 273/422] Add butter slices (#30789) --- .../VendingMachines/Inventories/chefvend.yml | 2 +- .../Objects/Consumable/Food/ingredients.yml | 29 ++++++++++++++++++ .../Recipes/Cooking/meal_recipes.yml | 10 +++--- .../Food/ingredients.rsi/butter-slice.png | Bin 0 -> 146 bytes .../Consumable/Food/ingredients.rsi/meta.json | 5 ++- 5 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/butter-slice.png diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml index 1d1c9f8cd3..1ccda0e273 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml @@ -17,7 +17,7 @@ FoodContainerEgg: 1 DrinkMilkCarton: 2 DrinkSoyMilkCarton: 1 - FoodButter: 4 + FoodButter: 3 FoodCheese: 1 FoodMeat: 6 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml index 102703f2a5..a81ed55545 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml @@ -505,6 +505,35 @@ density: 10 mask: - ItemMask + - type: SolutionContainerManager + solutions: + food: + maxVol: 18 + reagents: + - ReagentId: Butter + Quantity: 15 + - type: SliceableFood + count: 3 + slice: FoodButterSlice + +- type: entity + name: butter slice + parent: FoodBakingBase + id: FoodButterSlice + description: A pat of delicious, golden, fatty goodness. + components: + - type: Sprite + state: butter-slice + - type: SolutionContainerManager + solutions: + food: + maxVol: 6 + reagents: + - ReagentId: Butter + Quantity: 5 + - type: Tag + tags: + - Slice - type: entity name: stick of cannabis butter diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index fff0e7db9f..1aace5896e 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -457,7 +457,7 @@ time: 5 solids: FoodBreadPlainSlice: 1 - FoodButter: 1 + FoodButterSlice: 1 - type: microwaveMealRecipe id: RecipeFrenchToast @@ -478,7 +478,7 @@ solids: FoodBreadPlainSlice: 1 FoodGarlic: 1 - FoodButter: 1 + FoodButterSlice: 1 - type: microwaveMealRecipe id: RecipeJellyToast @@ -1218,7 +1218,7 @@ Flour: 5 Sugar: 5 solids: - FoodButter: 1 + FoodButterSlice: 1 FoodSnackChocolateBar: 1 - type: microwaveMealRecipe @@ -1230,7 +1230,7 @@ Flour: 5 Sugar: 10 solids: - FoodButter: 1 + FoodButterSlice: 1 - type: microwaveMealRecipe id: RecipeRaisinCookie @@ -1252,7 +1252,7 @@ Oats: 5 Sugar: 5 solids: - FoodButter: 1 + FoodButterSlice: 1 - type: microwaveMealRecipe id: RecipeChocolateChipPancake diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/butter-slice.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/butter-slice.png new file mode 100644 index 0000000000000000000000000000000000000000..81b73772a7318579c56567281dd9a11720d2251c GIT binary patch literal 146 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv{s5m4S0MfW#kT*C7W}{2{Qr#a zv-~&zfI^HVL4Lsu4$p3+0Xc@AE{-7@6O$7p7#jiw=IU!SC@s*?=vdTp(<3n8CS&B0 p8y+`VT^kNc^qxP^b4*^0fgyScbC&kf4NO4I44$rjF6*2UngD=UFWmqD literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json index b4317b0c76..8e73375235 100644 --- a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation and baystation and modified by potato1234x at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and https://github.com/Baystation12/Baystation12/commit/a6067826de7fd8f698793f6d84e6c2f1f9b1f188. Tofu and tofu-slice were created by Discord user rosysyntax#6514. Chevrelog and chevredisk created by Github user deathride58, tortilladough tortillaflat and tortillaslice added by Phunny,", + "copyright": "Taken from tgstation and baystation and modified by potato1234x at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24 and https://github.com/Baystation12/Baystation12/commit/a6067826de7fd8f698793f6d84e6c2f1f9b1f188. Tofu and tofu-slice were created by Discord user rosysyntax#6514. Chevrelog and chevredisk created by Github user deathride58, tortilladough tortillaflat and tortillaslice added by Phunny, butter-slice taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955", "size": { "x": 32, "y": 32 @@ -111,6 +111,9 @@ }, { "name": "tortilladough-slice" + }, + { + "name": "butter-slice" } ] } From 15ae0435c451eb9ce8ed9e8072720d0ec3027e6b Mon Sep 17 00:00:00 2001 From: PJBot Date: Thu, 8 Aug 2024 23:33:48 +0000 Subject: [PATCH 274/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index d904094e88..96d9f52389 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: deltanedas - changes: - - message: Firesuits and hardsuits now protect your skin from fire, you will instead - die of heatstroke. - type: Tweak - id: 6565 - time: '2024-05-09T07:12:48.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27161 - author: Dutch-VanDerLinde changes: - message: Fixed non-inital infected getting the succumb to zombie action. @@ -3793,3 +3785,12 @@ id: 7064 time: '2024-08-08T23:27:28.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/26699 +- author: themias + changes: + - message: Butter can be sliced, cookie and toast recipes now use butter slices. + type: Tweak + - message: Chefvend butter reduced from 4 to 3. + type: Tweak + id: 7065 + time: '2024-08-08T23:32:42.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30789 From e4ff5780d56c1d7f608fb6064f51c50a09c5dd6c Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Thu, 8 Aug 2024 23:36:15 +0000 Subject: [PATCH 275/422] full sticky prediction (#30230) * move all sticky stuff to shared and cleanup/grammar fix * update imports and ref --------- Co-authored-by: deltanedas <@deltanedas:kde.org> --- .../Visualizers/StickyVisualizerSystem.cs | 16 +- .../EntitySystems/TriggerSystem.OnUse.cs | 4 +- .../Ninja/Systems/SpiderChargeSystem.cs | 6 +- .../Sticky/Components/StickyComponent.cs | 88 ------- .../Sticky/Events/EntityStuckEvent.cs | 68 ----- Content.Server/Sticky/Systems/StickySystem.cs | 234 ------------------ .../Sticky/Components/StickyComponent.cs | 90 +++++++ .../Components/StickyVisualizerComponent.cs | 19 +- Content.Shared/Sticky/EntityStuckEvent.cs | 26 ++ Content.Shared/Sticky/Systems/StickySystem.cs | 220 ++++++++++++++++ 10 files changed, 362 insertions(+), 409 deletions(-) delete mode 100644 Content.Server/Sticky/Components/StickyComponent.cs delete mode 100644 Content.Server/Sticky/Events/EntityStuckEvent.cs delete mode 100644 Content.Server/Sticky/Systems/StickySystem.cs create mode 100644 Content.Shared/Sticky/Components/StickyComponent.cs create mode 100644 Content.Shared/Sticky/EntityStuckEvent.cs create mode 100644 Content.Shared/Sticky/Systems/StickySystem.cs diff --git a/Content.Client/Sticky/Visualizers/StickyVisualizerSystem.cs b/Content.Client/Sticky/Visualizers/StickyVisualizerSystem.cs index 8bf8ac56ea..f7764479c0 100644 --- a/Content.Client/Sticky/Visualizers/StickyVisualizerSystem.cs +++ b/Content.Client/Sticky/Visualizers/StickyVisualizerSystem.cs @@ -5,21 +5,26 @@ namespace Content.Client.Sticky.Visualizers; public sealed class StickyVisualizerSystem : VisualizerSystem { + private EntityQuery _spriteQuery; + public override void Initialize() { base.Initialize(); + + _spriteQuery = GetEntityQuery(); + SubscribeLocalEvent(OnInit); } - private void OnInit(EntityUid uid, StickyVisualizerComponent component, ComponentInit args) + private void OnInit(Entity ent, ref ComponentInit args) { - if (!TryComp(uid, out SpriteComponent? sprite)) + if (!_spriteQuery.TryComp(ent, out var sprite)) return; - component.DefaultDrawDepth = sprite.DrawDepth; + ent.Comp.OriginalDrawDepth = sprite.DrawDepth; } - protected override void OnAppearanceChange(EntityUid uid, StickyVisualizerComponent component, ref AppearanceChangeEvent args) + protected override void OnAppearanceChange(EntityUid uid, StickyVisualizerComponent comp, ref AppearanceChangeEvent args) { if (args.Sprite == null) return; @@ -27,8 +32,7 @@ public sealed class StickyVisualizerSystem : VisualizerSystem(uid, StickyVisuals.IsStuck, out var isStuck, args.Component)) return; - var drawDepth = isStuck ? component.StuckDrawDepth : component.DefaultDrawDepth; + var drawDepth = isStuck ? comp.StuckDrawDepth : comp.OriginalDrawDepth; args.Sprite.DrawDepth = drawDepth; - } } diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs index dcd11062bb..d06e9fa1c2 100644 --- a/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs +++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.OnUse.cs @@ -1,9 +1,9 @@ using Content.Server.Explosion.Components; -using Content.Server.Sticky.Events; using Content.Shared.Examine; using Content.Shared.Explosion.Components; using Content.Shared.Interaction.Events; using Content.Shared.Popups; +using Content.Shared.Sticky; using Content.Shared.Verbs; namespace Content.Server.Explosion.EntitySystems; @@ -21,7 +21,7 @@ public sealed partial class TriggerSystem SubscribeLocalEvent(OnRandomTimerTriggerMapInit); } - private void OnStuck(EntityUid uid, OnUseTimerTriggerComponent component, EntityStuckEvent args) + private void OnStuck(EntityUid uid, OnUseTimerTriggerComponent component, ref EntityStuckEvent args) { if (!component.StartOnStick) return; diff --git a/Content.Server/Ninja/Systems/SpiderChargeSystem.cs b/Content.Server/Ninja/Systems/SpiderChargeSystem.cs index c262651f27..c916d568d5 100644 --- a/Content.Server/Ninja/Systems/SpiderChargeSystem.cs +++ b/Content.Server/Ninja/Systems/SpiderChargeSystem.cs @@ -4,10 +4,10 @@ using Content.Server.Mind; using Content.Server.Objectives.Components; using Content.Server.Popups; using Content.Server.Roles; -using Content.Server.Sticky.Events; using Content.Shared.Interaction; using Content.Shared.Ninja.Components; using Content.Shared.Ninja.Systems; +using Content.Shared.Sticky; using Robust.Shared.GameObjects; namespace Content.Server.Ninja.Systems; @@ -34,7 +34,7 @@ public sealed class SpiderChargeSystem : SharedSpiderChargeSystem /// /// Require that the planter is a ninja and the charge is near the target warp point. /// - private void OnAttemptStick(EntityUid uid, SpiderChargeComponent comp, AttemptEntityStickEvent args) + private void OnAttemptStick(EntityUid uid, SpiderChargeComponent comp, ref AttemptEntityStickEvent args) { if (args.Cancelled) return; @@ -67,7 +67,7 @@ public sealed class SpiderChargeSystem : SharedSpiderChargeSystem /// /// Allows greentext to occur after exploding. /// - private void OnStuck(EntityUid uid, SpiderChargeComponent comp, EntityStuckEvent args) + private void OnStuck(EntityUid uid, SpiderChargeComponent comp, ref EntityStuckEvent args) { comp.Planter = args.User; } diff --git a/Content.Server/Sticky/Components/StickyComponent.cs b/Content.Server/Sticky/Components/StickyComponent.cs deleted file mode 100644 index 320938000f..0000000000 --- a/Content.Server/Sticky/Components/StickyComponent.cs +++ /dev/null @@ -1,88 +0,0 @@ -using Content.Shared.Whitelist; - -namespace Content.Server.Sticky.Components; - -/// -/// Items that can be stick to other structures or entities. -/// For example paper stickers or C4 charges. -/// -[RegisterComponent] -public sealed partial class StickyComponent : Component -{ - /// - /// What target entities are valid to be surface for sticky entity. - /// - [DataField("whitelist")] - [ViewVariables(VVAccess.ReadWrite)] - public EntityWhitelist? Whitelist; - - /// - /// What target entities can't be used as surface for sticky entity. - /// - [DataField("blacklist")] - [ViewVariables(VVAccess.ReadWrite)] - public EntityWhitelist? Blacklist; - - /// - /// How much time does it take to stick entity to target. - /// If zero will stick entity immediately. - /// - [DataField("stickDelay")] - [ViewVariables(VVAccess.ReadWrite)] - public TimeSpan StickDelay = TimeSpan.Zero; - - /// - /// Whether users can unstick item when it was stuck to surface. - /// - [DataField("canUnstick")] - [ViewVariables(VVAccess.ReadWrite)] - public bool CanUnstick = true; - - /// - /// How much time does it take to unstick entity. - /// If zero will unstick entity immediately. - /// - [DataField("unstickDelay")] - [ViewVariables(VVAccess.ReadWrite)] - public TimeSpan UnstickDelay = TimeSpan.Zero; - - /// - /// Popup message shown when player started sticking entity to another entity. - /// - [DataField("stickPopupStart")] - [ViewVariables(VVAccess.ReadWrite)] - public string? StickPopupStart; - - /// - /// Popup message shown when player successfully stuck entity. - /// - [DataField("stickPopupSuccess")] - [ViewVariables(VVAccess.ReadWrite)] - public string? StickPopupSuccess; - - /// - /// Popup message shown when player started unsticking entity from another entity. - /// - [DataField("unstickPopupStart")] - [ViewVariables(VVAccess.ReadWrite)] - public string? UnstickPopupStart; - - /// - /// Popup message shown when player successfully unstuck entity. - /// - [DataField("unstickPopupSuccess")] - [ViewVariables(VVAccess.ReadWrite)] - public string? UnstickPopupSuccess; - - /// - /// Entity that is used as surface for sticky entity. - /// Null if entity doesn't stuck to anything. - /// - [ViewVariables(VVAccess.ReadOnly)] - public EntityUid? StuckTo; - - /// - /// For the DoAfter event to tell if it should stick or unstick - /// - public bool Stick; -} diff --git a/Content.Server/Sticky/Events/EntityStuckEvent.cs b/Content.Server/Sticky/Events/EntityStuckEvent.cs deleted file mode 100644 index 7857fad7d5..0000000000 --- a/Content.Server/Sticky/Events/EntityStuckEvent.cs +++ /dev/null @@ -1,68 +0,0 @@ -namespace Content.Server.Sticky.Events; - -/// -/// Risen on sticky entity to see if it can stick to another entity. -/// -[ByRefEvent] -public record struct AttemptEntityStickEvent(EntityUid Target, EntityUid User) -{ - public readonly EntityUid Target = Target; - public readonly EntityUid User = User; - public bool Cancelled = false; -} - -/// -/// Risen on sticky entity to see if it can unstick from another entity. -/// -[ByRefEvent] -public record struct AttemptEntityUnstickEvent(EntityUid Target, EntityUid User) -{ - public readonly EntityUid Target = Target; - public readonly EntityUid User = User; - public bool Cancelled = false; -} - - -/// -/// Risen on sticky entity when it was stuck to other entity. -/// -public sealed class EntityStuckEvent : EntityEventArgs -{ - /// - /// Entity that was used as a surface for sticky object. - /// - public readonly EntityUid Target; - - /// - /// Entity that stuck sticky object on target. - /// - public readonly EntityUid User; - - public EntityStuckEvent(EntityUid target, EntityUid user) - { - Target = target; - User = user; - } -} - -/// -/// Risen on sticky entity when it was unstuck from other entity. -/// -public sealed class EntityUnstuckEvent : EntityEventArgs -{ - /// - /// Entity that was used as a surface for sticky object. - /// - public readonly EntityUid Target; - - /// - /// Entity that unstuck sticky object on target. - /// - public readonly EntityUid User; - - public EntityUnstuckEvent(EntityUid target, EntityUid user) - { - Target = target; - User = user; - } -} diff --git a/Content.Server/Sticky/Systems/StickySystem.cs b/Content.Server/Sticky/Systems/StickySystem.cs deleted file mode 100644 index 23064a93cb..0000000000 --- a/Content.Server/Sticky/Systems/StickySystem.cs +++ /dev/null @@ -1,234 +0,0 @@ -using Content.Server.Popups; -using Content.Server.Sticky.Components; -using Content.Server.Sticky.Events; -using Content.Shared.DoAfter; -using Content.Shared.Hands.EntitySystems; -using Content.Shared.Interaction; -using Content.Shared.Sticky; -using Content.Shared.Sticky.Components; -using Content.Shared.Verbs; -using Content.Shared.Whitelist; -using Robust.Shared.Containers; -using Robust.Shared.Utility; - -namespace Content.Server.Sticky.Systems; - -public sealed class StickySystem : EntitySystem -{ - [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly SharedContainerSystem _containerSystem = default!; - [Dependency] private readonly SharedHandsSystem _handsSystem = default!; - [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly EntityWhitelistSystem _whitelistSystem = default!; - - private const string StickerSlotId = "stickers_container"; - - public override void Initialize() - { - base.Initialize(); - SubscribeLocalEvent(OnStickFinished); - SubscribeLocalEvent(OnAfterInteract); - SubscribeLocalEvent>(AddUnstickVerb); - } - - private void OnAfterInteract(EntityUid uid, StickyComponent component, AfterInteractEvent args) - { - if (args.Handled || !args.CanReach || args.Target == null) - return; - - // try stick object to a clicked target entity - args.Handled = StartSticking(uid, args.User, args.Target.Value, component); - } - - private void AddUnstickVerb(EntityUid uid, StickyComponent component, GetVerbsEvent args) - { - if (component.StuckTo == null || !component.CanUnstick || !args.CanInteract || args.Hands == null) - return; - - // we can't use args.CanAccess, because it stuck in another container - // we also need to ignore entity that it stuck to - var inRange = _interactionSystem.InRangeUnobstructed(uid, args.User, - predicate: entity => component.StuckTo == entity); - if (!inRange) - return; - - args.Verbs.Add(new Verb - { - DoContactInteraction = true, - Text = Loc.GetString("comp-sticky-unstick-verb-text"), - Icon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/eject.svg.192dpi.png")), - Act = () => StartUnsticking(uid, args.User, component) - }); - } - - private bool StartSticking(EntityUid uid, EntityUid user, EntityUid target, StickyComponent? component = null) - { - if (!Resolve(uid, ref component)) - return false; - - // check whitelist and blacklist - if (_whitelistSystem.IsWhitelistFail(component.Whitelist, target) || - _whitelistSystem.IsBlacklistPass(component.Blacklist, target)) - return false; - - var attemptEv = new AttemptEntityStickEvent(target, user); - RaiseLocalEvent(uid, ref attemptEv); - if (attemptEv.Cancelled) - return false; - - // check if delay is not zero to start do after - var delay = (float) component.StickDelay.TotalSeconds; - if (delay > 0) - { - // show message to user - if (component.StickPopupStart != null) - { - var msg = Loc.GetString(component.StickPopupStart); - _popupSystem.PopupEntity(msg, user, user); - } - - component.Stick = true; - - // start sticking object to target - _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, user, delay, new StickyDoAfterEvent(), uid, target: target, used: uid) - { - BreakOnMove = true, - NeedHand = true, - }); - } - else - { - // if delay is zero - stick entity immediately - StickToEntity(uid, target, user, component); - } - - return true; - } - - private void OnStickFinished(EntityUid uid, StickyComponent component, DoAfterEvent args) - { - if (args.Handled || args.Cancelled || args.Args.Target == null) - return; - - if (component.Stick) - StickToEntity(uid, args.Args.Target.Value, args.Args.User, component); - else - UnstickFromEntity(uid, args.Args.User, component); - - args.Handled = true; - } - - private void StartUnsticking(EntityUid uid, EntityUid user, StickyComponent? component = null) - { - if (!Resolve(uid, ref component)) - return; - - if (component.StuckTo is not { } stuckTo) - return; - - var attemptEv = new AttemptEntityUnstickEvent(stuckTo, user); - RaiseLocalEvent(uid, ref attemptEv); - if (attemptEv.Cancelled) - return; - - var delay = (float) component.UnstickDelay.TotalSeconds; - if (delay > 0) - { - // show message to user - if (component.UnstickPopupStart != null) - { - var msg = Loc.GetString(component.UnstickPopupStart); - _popupSystem.PopupEntity(msg, user, user); - } - - component.Stick = false; - - // start unsticking object - _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, user, delay, new StickyDoAfterEvent(), uid, target: uid) - { - BreakOnMove = true, - NeedHand = true, - }); - } - else - { - // if delay is zero - unstick entity immediately - UnstickFromEntity(uid, user, component); - } - } - - public void StickToEntity(EntityUid uid, EntityUid target, EntityUid user, StickyComponent? component = null) - { - if (!Resolve(uid, ref component)) - return; - - var attemptEv = new AttemptEntityStickEvent(target, user); - RaiseLocalEvent(uid, ref attemptEv); - if (attemptEv.Cancelled) - return; - - // add container to entity and insert sticker into it - var container = _containerSystem.EnsureContainer(target, StickerSlotId); - container.ShowContents = true; - if (!_containerSystem.Insert(uid, container)) - return; - - // show message to user - if (component.StickPopupSuccess != null) - { - var msg = Loc.GetString(component.StickPopupSuccess); - _popupSystem.PopupEntity(msg, user, user); - } - - // send information to appearance that entity is stuck - if (TryComp(uid, out AppearanceComponent? appearance)) - { - _appearance.SetData(uid, StickyVisuals.IsStuck, true, appearance); - } - - component.StuckTo = target; - RaiseLocalEvent(uid, new EntityStuckEvent(target, user), true); - } - - public void UnstickFromEntity(EntityUid uid, EntityUid user, StickyComponent? component = null) - { - if (!Resolve(uid, ref component)) - return; - - if (component.StuckTo is not { } stuckTo) - return; - - var attemptEv = new AttemptEntityUnstickEvent(stuckTo, user); - RaiseLocalEvent(uid, ref attemptEv); - if (attemptEv.Cancelled) - return; - - // try to remove sticky item from target container - if (!_containerSystem.TryGetContainer(stuckTo, StickerSlotId, out var container) || !_containerSystem.Remove(uid, container)) - return; - // delete container if it's now empty - if (container.ContainedEntities.Count == 0) - _containerSystem.ShutdownContainer(container); - - // try place dropped entity into user hands - _handsSystem.PickupOrDrop(user, uid); - - // send information to appearance that entity isn't stuck - if (TryComp(uid, out AppearanceComponent? appearance)) - { - _appearance.SetData(uid, StickyVisuals.IsStuck, false, appearance); - } - - // show message to user - if (component.UnstickPopupSuccess != null) - { - var msg = Loc.GetString(component.UnstickPopupSuccess); - _popupSystem.PopupEntity(msg, user, user); - } - - component.StuckTo = null; - RaiseLocalEvent(uid, new EntityUnstuckEvent(stuckTo, user), true); - } -} diff --git a/Content.Shared/Sticky/Components/StickyComponent.cs b/Content.Shared/Sticky/Components/StickyComponent.cs new file mode 100644 index 0000000000..4513091754 --- /dev/null +++ b/Content.Shared/Sticky/Components/StickyComponent.cs @@ -0,0 +1,90 @@ +using Content.Shared.Sticky.Systems; +using Content.Shared.Whitelist; +using Robust.Shared.GameStates; +using Robust.Shared.Utility; + +namespace Content.Shared.Sticky.Components; + +/// +/// Items that can be stuck to other structures or entities. +/// For example, paper stickers or C4 charges. +/// +[RegisterComponent, NetworkedComponent, Access(typeof(StickySystem))] +[AutoGenerateComponentState] +public sealed partial class StickyComponent : Component +{ + /// + /// What target entities are valid to be surface for sticky entity. + /// + [DataField] + public EntityWhitelist? Whitelist; + + /// + /// What target entities can't be used as surface for sticky entity. + /// + [DataField] + public EntityWhitelist? Blacklist; + + /// + /// How much time it takes to stick the entity to a target. + /// If zero, it will immediately be stuck. + /// + [DataField] + public TimeSpan StickDelay = TimeSpan.Zero; + + /// + /// Whether users can unstick the entity after it has been stuck. + /// + [DataField] + public bool CanUnstick = true; + + /// + /// How much time it takes to unstick the entity. + /// If zero, it will immediately be unstuck. + /// + [DataField] + public TimeSpan UnstickDelay = TimeSpan.Zero; + + /// + /// Popup message shown when player starts sticking the entity to another entity. + /// + [DataField] + public LocId? StickPopupStart; + + /// + /// Popup message shown when a player successfully sticks the entity. + /// + [DataField] + public LocId? StickPopupSuccess; + + /// + /// Popup message shown when a player starts unsticking the entity from another entity. + /// + [DataField] + public LocId? UnstickPopupStart; + + /// + /// Popup message shown when a player successfully unsticks the entity. + /// + [DataField] + public LocId? UnstickPopupSuccess; + + /// + /// Entity that is used as a surface for the sticky entity. + /// Null if entity isn't stuck to anything. + /// + [DataField, AutoNetworkedField] + public EntityUid? StuckTo; + + /// + /// Text to use for the unstick verb. + /// + [DataField] + public LocId VerbText = "comp-sticky-unstick-verb-text"; + + /// + /// Icon to use for the unstick verb. + /// + [DataField] + public SpriteSpecifier VerbIcon = new SpriteSpecifier.Texture(new("/Textures/Interface/VerbIcons/eject.svg.192dpi.png")); +} diff --git a/Content.Shared/Sticky/Components/StickyVisualizerComponent.cs b/Content.Shared/Sticky/Components/StickyVisualizerComponent.cs index c32be646fc..fd37836dcf 100644 --- a/Content.Shared/Sticky/Components/StickyVisualizerComponent.cs +++ b/Content.Shared/Sticky/Components/StickyVisualizerComponent.cs @@ -1,23 +1,26 @@ -using Robust.Shared.Serialization; +using Robust.Shared.Serialization; namespace Content.Shared.Sticky.Components; -using DrawDepth; +using DrawDepth; + +/// +/// Sets the sprite's draw depth depending on whether it's stuck. +/// [RegisterComponent] public sealed partial class StickyVisualizerComponent : Component { /// - /// What sprite draw depth set when entity stuck. + /// What sprite draw depth gets set to when stuck to something. /// - [DataField("stuckDrawDepth")] - [ViewVariables(VVAccess.ReadWrite)] + [DataField] public int StuckDrawDepth = (int) DrawDepth.Overdoors; /// - /// What sprite draw depth set when entity unstuck. + /// The sprite's original draw depth before being stuck. /// - [ViewVariables(VVAccess.ReadWrite)] - public int DefaultDrawDepth; + [DataField] + public int OriginalDrawDepth; } [Serializable, NetSerializable] diff --git a/Content.Shared/Sticky/EntityStuckEvent.cs b/Content.Shared/Sticky/EntityStuckEvent.cs new file mode 100644 index 0000000000..ae7a65c0ad --- /dev/null +++ b/Content.Shared/Sticky/EntityStuckEvent.cs @@ -0,0 +1,26 @@ +namespace Content.Shared.Sticky; + +/// +/// Risen on sticky entity to see if it can stick to another entity. +/// +[ByRefEvent] +public record struct AttemptEntityStickEvent(EntityUid Target, EntityUid User, bool Cancelled = false); + +/// +/// Risen on sticky entity to see if it can unstick from another entity. +/// +[ByRefEvent] +public record struct AttemptEntityUnstickEvent(EntityUid Target, EntityUid User, bool Cancelled = false); + + +/// +/// Risen on sticky entity when it was stuck to other entity. +/// +[ByRefEvent] +public record struct EntityStuckEvent(EntityUid Target, EntityUid User); + +/// +/// Risen on sticky entity when it was unstuck from other entity. +/// +[ByRefEvent] +public record struct EntityUnstuckEvent(EntityUid Target, EntityUid User); diff --git a/Content.Shared/Sticky/Systems/StickySystem.cs b/Content.Shared/Sticky/Systems/StickySystem.cs new file mode 100644 index 0000000000..ea768fea93 --- /dev/null +++ b/Content.Shared/Sticky/Systems/StickySystem.cs @@ -0,0 +1,220 @@ +using Content.Shared.DoAfter; +using Content.Shared.Hands.EntitySystems; +using Content.Shared.Interaction; +using Content.Shared.Popups; +using Content.Shared.Sticky.Components; +using Content.Shared.Verbs; +using Content.Shared.Whitelist; +using Robust.Shared.Containers; + +namespace Content.Shared.Sticky.Systems; + +public sealed class StickySystem : EntitySystem +{ + [Dependency] private readonly EntityWhitelistSystem _whitelist = default!; + [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private readonly SharedContainerSystem _container = default!; + [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; + [Dependency] private readonly SharedHandsSystem _hands = default!; + [Dependency] private readonly SharedInteractionSystem _interaction = default!; + [Dependency] private readonly SharedPopupSystem _popup = default!; + + private const string StickerSlotId = "stickers_container"; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnAfterInteract); + SubscribeLocalEvent(OnStickyDoAfter); + SubscribeLocalEvent>(OnGetVerbs); + } + + private void OnAfterInteract(Entity ent, ref AfterInteractEvent args) + { + if (args.Handled || !args.CanReach || args.Target is not {} target) + return; + + // try stick object to a clicked target entity + args.Handled = StartSticking(ent, target, args.User); + } + + private void OnGetVerbs(Entity ent, ref GetVerbsEvent args) + { + var (uid, comp) = ent; + if (comp.StuckTo == null || !comp.CanUnstick || !args.CanInteract || args.Hands == null) + return; + + // we can't use args.CanAccess, because it stuck in another container + // we also need to ignore entity that it stuck to + var user = args.User; + var inRange = _interaction.InRangeUnobstructed(uid, user, + predicate: entity => comp.StuckTo == entity); + if (!inRange) + return; + + args.Verbs.Add(new Verb + { + DoContactInteraction = true, + Text = Loc.GetString(comp.VerbText), + Icon = comp.VerbIcon, + Act = () => StartUnsticking(ent, user) + }); + } + + private bool StartSticking(Entity ent, EntityUid target, EntityUid user) + { + var (uid, comp) = ent; + + // check whitelist and blacklist + if (_whitelist.IsWhitelistFail(comp.Whitelist, target) || + _whitelist.IsBlacklistPass(comp.Blacklist, target)) + return false; + + var attemptEv = new AttemptEntityStickEvent(target, user); + RaiseLocalEvent(uid, ref attemptEv); + if (attemptEv.Cancelled) + return false; + + // skip doafter and popup if it's instant + if (comp.StickDelay <= TimeSpan.Zero) + { + StickToEntity(ent, target, user); + return true; + } + + // show message to user + if (comp.StickPopupStart != null) + { + var msg = Loc.GetString(comp.StickPopupStart); + _popup.PopupClient(msg, user, user); + } + + // start sticking object to target + _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, user, comp.StickDelay, new StickyDoAfterEvent(), uid, target: target, used: uid) + { + BreakOnMove = true, + NeedHand = true, + }); + + return true; + } + + private void OnStickyDoAfter(Entity ent, ref StickyDoAfterEvent args) + { + // target is the sticky item when unsticking and the surface when sticking, it will never be null + if (args.Handled || args.Cancelled || args.Args.Target is not {} target) + return; + + var user = args.User; + if (ent.Comp.StuckTo == null) + StickToEntity(ent, target, user); + else + UnstickFromEntity(ent, user); + + args.Handled = true; + } + + private void StartUnsticking(Entity ent, EntityUid user) + { + var (uid, comp) = ent; + if (comp.StuckTo is not {} stuckTo) + return; + + var attemptEv = new AttemptEntityUnstickEvent(stuckTo, user); + RaiseLocalEvent(uid, ref attemptEv); + if (attemptEv.Cancelled) + return; + + // skip doafter and popup if it's instant + if (comp.UnstickDelay <= TimeSpan.Zero) + { + UnstickFromEntity(ent, user); + return; + } + + // show message to user + if (comp.UnstickPopupStart != null) + { + var msg = Loc.GetString(comp.UnstickPopupStart); + _popup.PopupClient(msg, user, user); + } + + // start unsticking object + _doAfter.TryStartDoAfter(new DoAfterArgs(EntityManager, user, comp.UnstickDelay, new StickyDoAfterEvent(), uid, target: uid) + { + BreakOnMove = true, + NeedHand = true, + }); + } + + public void StickToEntity(Entity ent, EntityUid target, EntityUid user) + { + var (uid, comp) = ent; + var attemptEv = new AttemptEntityStickEvent(target, user); + RaiseLocalEvent(uid, ref attemptEv); + if (attemptEv.Cancelled) + return; + + // add container to entity and insert sticker into it + var container = _container.EnsureContainer(target, StickerSlotId); + container.ShowContents = true; + if (!_container.Insert(uid, container)) + return; + + // show message to user + if (comp.StickPopupSuccess != null) + { + var msg = Loc.GetString(comp.StickPopupSuccess); + _popup.PopupClient(msg, user, user); + } + + // send information to appearance that entity is stuck + _appearance.SetData(uid, StickyVisuals.IsStuck, true); + + comp.StuckTo = target; + Dirty(uid, comp); + + var ev = new EntityStuckEvent(target, user); + RaiseLocalEvent(uid, ref ev); + } + + public void UnstickFromEntity(Entity ent, EntityUid user) + { + var (uid, comp) = ent; + if (comp.StuckTo is not {} stuckTo) + return; + + var attemptEv = new AttemptEntityUnstickEvent(stuckTo, user); + RaiseLocalEvent(uid, ref attemptEv); + if (attemptEv.Cancelled) + return; + + // try to remove sticky item from target container + if (!_container.TryGetContainer(stuckTo, StickerSlotId, out var container) || !_container.Remove(uid, container)) + return; + + // delete container if it's now empty + if (container.ContainedEntities.Count == 0) + _container.ShutdownContainer(container); + + // try place dropped entity into user hands + _hands.PickupOrDrop(user, uid); + + // send information to appearance that entity isn't stuck + _appearance.SetData(uid, StickyVisuals.IsStuck, false); + + // show message to user + if (comp.UnstickPopupSuccess != null) + { + var msg = Loc.GetString(comp.UnstickPopupSuccess); + _popup.PopupClient(msg, user, user); + } + + comp.StuckTo = null; + Dirty(uid, comp); + + var ev = new EntityUnstuckEvent(stuckTo, user); + RaiseLocalEvent(uid, ref ev); + } +} From ad18c6e9a54b033d93eaa7bebd40e38e2a997390 Mon Sep 17 00:00:00 2001 From: beck-thompson <107373427+beck-thompson@users.noreply.github.com> Date: Thu, 8 Aug 2024 16:51:58 -0700 Subject: [PATCH 276/422] Secret stash refractor (#29396) * First commit * Will do this in another PR! * maybe? * Moved stuff to ToolOpenableSystem because its smarter and cooler --- .../Nutrition/EntitySystems/UtensilSystem.cs | 3 +- .../Plants/PottedPlantHideComponent.cs | 17 - .../Plants/PottedPlantHideSystem.cs | 63 --- .../Components/SecretStashComponent.cs | 70 +-- .../EntitySystems/SecretStashSystem.cs | 399 +++++++++--------- .../Tools/Components/ToolOpenableComponent.cs | 84 ++++ .../Tools/Systems/ToolOpenableSystem.cs | 171 ++++++++ .../components/secret-stash-component.ftl | 29 +- .../components/tool-openable-component.ftl | 6 + .../Structures/Furniture/potted_plants.yml | 6 +- .../Entities/Structures/Furniture/toilet.yml | 16 +- 11 files changed, 513 insertions(+), 351 deletions(-) delete mode 100644 Content.Shared/Plants/PottedPlantHideComponent.cs delete mode 100644 Content.Shared/Plants/PottedPlantHideSystem.cs create mode 100644 Content.Shared/Tools/Components/ToolOpenableComponent.cs create mode 100644 Content.Shared/Tools/Systems/ToolOpenableSystem.cs create mode 100644 Resources/Locale/en-US/tools/components/tool-openable-component.ftl diff --git a/Content.Server/Nutrition/EntitySystems/UtensilSystem.cs b/Content.Server/Nutrition/EntitySystems/UtensilSystem.cs index d40288183f..1f3d5afb43 100644 --- a/Content.Server/Nutrition/EntitySystems/UtensilSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/UtensilSystem.cs @@ -4,6 +4,7 @@ using Content.Server.Popups; using Content.Shared.Interaction; using Content.Shared.Nutrition.Components; using Content.Shared.Nutrition.EntitySystems; +using Content.Shared.Tools.EntitySystems; using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; using Robust.Shared.Random; @@ -25,7 +26,7 @@ namespace Content.Server.Nutrition.EntitySystems { base.Initialize(); - SubscribeLocalEvent(OnAfterInteract, after: new[] { typeof(ItemSlotsSystem) }); + SubscribeLocalEvent(OnAfterInteract, after: new[] { typeof(ItemSlotsSystem), typeof(ToolOpenableSystem) }); } /// diff --git a/Content.Shared/Plants/PottedPlantHideComponent.cs b/Content.Shared/Plants/PottedPlantHideComponent.cs deleted file mode 100644 index 2e02272494..0000000000 --- a/Content.Shared/Plants/PottedPlantHideComponent.cs +++ /dev/null @@ -1,17 +0,0 @@ -using Content.Shared.Storage.Components; -using Robust.Shared.Audio; - -namespace Content.Shared.Plants -{ - /// - /// Interaction wrapper for . - /// Gently rustle after each interaction with plant. - /// - [RegisterComponent] - [Access(typeof(PottedPlantHideSystem))] - public sealed partial class PottedPlantHideComponent : Component - { - [DataField("rustleSound")] - public SoundSpecifier RustleSound = new SoundPathSpecifier("/Audio/Effects/plant_rustle.ogg"); - } -} diff --git a/Content.Shared/Plants/PottedPlantHideSystem.cs b/Content.Shared/Plants/PottedPlantHideSystem.cs deleted file mode 100644 index cbe052f8d5..0000000000 --- a/Content.Shared/Plants/PottedPlantHideSystem.cs +++ /dev/null @@ -1,63 +0,0 @@ -using Content.Shared.Popups; -using Content.Shared.Storage.Components; -using Content.Shared.Storage.EntitySystems; -using Content.Shared.Interaction; -using Robust.Shared.Audio; -using Robust.Shared.Audio.Systems; - -namespace Content.Shared.Plants -{ - public sealed class PottedPlantHideSystem : EntitySystem - { - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly SecretStashSystem _stashSystem = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; - - public override void Initialize() - { - base.Initialize(); - SubscribeLocalEvent(OnInit); - SubscribeLocalEvent(OnInteractUsing); - SubscribeLocalEvent(OnInteractHand); - } - - private void OnInit(EntityUid uid, PottedPlantHideComponent component, ComponentInit args) - { - EntityManager.EnsureComponent(uid); - } - - private void OnInteractUsing(EntityUid uid, PottedPlantHideComponent component, InteractUsingEvent args) - { - if (args.Handled) - return; - - Rustle(uid, component, args.User); - args.Handled = _stashSystem.TryHideItem(uid, args.User, args.Used); - } - - private void OnInteractHand(EntityUid uid, PottedPlantHideComponent component, InteractHandEvent args) - { - if (args.Handled) - return; - - Rustle(uid, component, args.User); - - var gotItem = _stashSystem.TryGetItem(uid, args.User); - if (!gotItem) - { - var msg = Loc.GetString("potted-plant-hide-component-interact-hand-got-no-item-message"); - _popupSystem.PopupClient(msg, uid, args.User); - } - - args.Handled = gotItem; - } - - private void Rustle(EntityUid uid, PottedPlantHideComponent? component = null, EntityUid? user = null) - { - if (!Resolve(uid, ref component)) - return; - - _audio.PlayPredicted(component.RustleSound, uid, user, AudioParams.Default.WithVariation(0.25f)); - } - } -} diff --git a/Content.Shared/Storage/Components/SecretStashComponent.cs b/Content.Shared/Storage/Components/SecretStashComponent.cs index 8595f79ca5..3bf8e2e871 100644 --- a/Content.Shared/Storage/Components/SecretStashComponent.cs +++ b/Content.Shared/Storage/Components/SecretStashComponent.cs @@ -7,84 +7,56 @@ using Content.Shared.Tools; using Robust.Shared.GameStates; using Content.Shared.DoAfter; using Robust.Shared.Serialization; +using Robust.Shared.Audio; namespace Content.Shared.Storage.Components { /// /// Logic for a secret slot stash, like plant pot or toilet cistern. - /// Unlike it doesn't have interaction logic or verbs. - /// Other classes like should implement it. + /// Unlike it has logic for opening and closing + /// the stash. /// [RegisterComponent, NetworkedComponent, AutoGenerateComponentState] [Access(typeof(SecretStashSystem))] public sealed partial class SecretStashComponent : Component { /// - /// Max item size that can be fitted into secret stash. + /// Max item size that can be inserted into secret stash. /// [DataField("maxItemSize")] public ProtoId MaxItemSize = "Small"; /// - /// If stash has way to open then this will switch between open and closed. - /// - [DataField, AutoNetworkedField] - public bool ToggleOpen; - - /// - /// Prying the door. + /// This sound will be played when you try to insert an item in the stash. + /// The sound will be played whether or not the item is actually inserted. /// [DataField] - public float PryDoorTime = 1f; - - [DataField] - public ProtoId PryingQuality = "Prying"; + public SoundSpecifier? TryInsertItemSound; /// - /// Is stash openable?. - /// - [DataField, AutoNetworkedField] - public bool OpenableStash = false; - - /// - /// IC secret stash name. For example "the toilet cistern". - /// If empty string, will replace it with entity name in init. + /// This sound will be played when you try to remove an item in the stash. + /// The sound will be played whether or not the item is actually removed. /// [DataField] - public string SecretPartName { get; set; } = ""; + public SoundSpecifier? TryRemoveItemSound; + /// + /// If true, verbs will appear to help interact with the stash. + /// [DataField, AutoNetworkedField] - public string ExamineStash = "comp-secret-stash-on-examine-found-hidden-item"; + public bool HasVerbs = true; + + /// + /// The name of the secret stash. For example "the toilet cistern". + /// If null, the name of the entity will be used instead. + /// + [DataField] + public string? SecretStashName; /// /// Container used to keep secret stash item. /// [ViewVariables] public ContainerSlot ItemContainer = default!; - - } - - /// - /// Simple pry event for prying open a stash door. - /// - [Serializable, NetSerializable] - public sealed partial class StashPryDoAfterEvent : SimpleDoAfterEvent - { - } - - /// - /// Visualizers for handling stash open closed state if stash has door. - /// - [Serializable, NetSerializable] - public enum StashVisuals : byte - { - DoorVisualState, - } - - [Serializable, NetSerializable] - public enum DoorVisualState : byte - { - DoorOpen, - DoorClosed } } diff --git a/Content.Shared/Storage/EntitySystems/SecretStashSystem.cs b/Content.Shared/Storage/EntitySystems/SecretStashSystem.cs index 9aee1b982e..901d744df5 100644 --- a/Content.Shared/Storage/EntitySystems/SecretStashSystem.cs +++ b/Content.Shared/Storage/EntitySystems/SecretStashSystem.cs @@ -8,215 +8,206 @@ using Robust.Shared.Containers; using Content.Shared.Interaction; using Content.Shared.Tools.Systems; using Content.Shared.Examine; +using Robust.Shared.Audio; +using Robust.Shared.Audio.Systems; +using Content.Shared.Verbs; +using Content.Shared.IdentityManagement; +using Content.Shared.Tools.EntitySystems; -namespace Content.Shared.Storage.EntitySystems +namespace Content.Shared.Storage.EntitySystems; + +/// +/// Secret Stash allows an item to be hidden within. +/// +public sealed class SecretStashSystem : EntitySystem { - /// - /// Secret Stash allows an item to be hidden within. - /// - public sealed class SecretStashSystem : EntitySystem + [Dependency] private readonly SharedPopupSystem _popupSystem = default!; + [Dependency] private readonly SharedHandsSystem _handsSystem = default!; + [Dependency] private readonly SharedContainerSystem _containerSystem = default!; + [Dependency] private readonly SharedItemSystem _item = default!; + [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private readonly ToolOpenableSystem _toolOpenableSystem = default!; + + + public override void Initialize() { - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly SharedHandsSystem _handsSystem = default!; - [Dependency] private readonly SharedContainerSystem _containerSystem = default!; - [Dependency] private readonly SharedItemSystem _item = default!; - [Dependency] private readonly SharedToolSystem _tool = default!; - [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + base.Initialize(); + SubscribeLocalEvent(OnInit); + SubscribeLocalEvent(OnDestroyed); + SubscribeLocalEvent(OnInteractUsing, after: new[] { typeof(ToolOpenableSystem) }); + SubscribeLocalEvent(OnInteractHand); + SubscribeLocalEvent>(OnGetVerb); + } - public override void Initialize() + private void OnInit(Entity entity, ref ComponentInit args) + { + entity.Comp.ItemContainer = _containerSystem.EnsureContainer(entity, "stash", out _); + } + + private void OnDestroyed(Entity entity, ref DestructionEventArgs args) + { + var storedInside = _containerSystem.EmptyContainer(entity.Comp.ItemContainer); + if (storedInside != null && storedInside.Count >= 1) { - base.Initialize(); - SubscribeLocalEvent(OnInit); - SubscribeLocalEvent(OnDestroyed); - SubscribeLocalEvent(OnSecretStashPried); - SubscribeLocalEvent(OnInteractUsing); - SubscribeLocalEvent(OnInteractHand); - SubscribeLocalEvent(OnExamine); - } - - private void OnInit(EntityUid uid, SecretStashComponent component, ComponentInit args) - { - component.ItemContainer = _containerSystem.EnsureContainer(uid, "stash", out _); - } - - private void OnDestroyed(EntityUid uid, SecretStashComponent component, DestructionEventArgs args) - { - _containerSystem.EmptyContainer(component.ItemContainer); - } - - /// - /// Is there something inside secret stash item container? - /// - public bool HasItemInside(EntityUid uid, SecretStashComponent? component = null) - { - if (!Resolve(uid, ref component)) - return false; - return component.ItemContainer.ContainedEntity != null; - } - - private void OnInteractUsing(EntityUid uid, SecretStashComponent component, InteractUsingEvent args) - { - if (args.Handled) - return; - - if (!component.OpenableStash) - return; - - // is player trying place or lift off cistern lid? - if (_tool.UseTool(args.Used, args.User, uid, component.PryDoorTime, component.PryingQuality, new StashPryDoAfterEvent())) - args.Handled = true; - // maybe player is trying to hide something inside cistern? - else if (component.ToggleOpen) - { - TryHideItem(uid, args.User, args.Used); - args.Handled = true; - } - } - - private void OnInteractHand(EntityUid uid, SecretStashComponent component, InteractHandEvent args) - { - if (args.Handled) - return; - - if (!component.OpenableStash) - return; - - // trying to get something from stash? - if (component.ToggleOpen) - { - var gotItem = TryGetItem(uid, args.User); - if (gotItem) - { - args.Handled = true; - return; - } - } - args.Handled = true; - } - - private void OnSecretStashPried(EntityUid uid, SecretStashComponent component, StashPryDoAfterEvent args) - { - if (args.Cancelled) - return; - - ToggleOpen(uid, component); - } - - public void ToggleOpen(EntityUid uid, SecretStashComponent? component = null, MetaDataComponent? meta = null) - { - if (!Resolve(uid, ref component)) - return; - - component.ToggleOpen = !component.ToggleOpen; - - UpdateAppearance(uid, component); - Dirty(uid, component, meta); - } - - private void UpdateAppearance(EntityUid uid, SecretStashComponent? component = null) - { - if (!Resolve(uid, ref component)) - return; - - _appearance.SetData(uid, StashVisuals.DoorVisualState, component.ToggleOpen ? DoorVisualState.DoorOpen : DoorVisualState.DoorClosed); - } - - /// - /// Tries to hide item inside secret stash from hands of user. - /// - /// True if item was hidden inside stash - public bool TryHideItem(EntityUid uid, EntityUid userUid, EntityUid itemToHideUid, - SecretStashComponent? component = null, ItemComponent? item = null, - HandsComponent? hands = null) - { - if (!Resolve(uid, ref component)) - return false; - if (!Resolve(itemToHideUid, ref item)) - return false; - if (!Resolve(userUid, ref hands)) - return false; - - // check if secret stash is already occupied - var container = component.ItemContainer; - if (container.ContainedEntity != null) - { - var msg = Loc.GetString("comp-secret-stash-action-hide-container-not-empty"); - _popupSystem.PopupClient(msg, uid, userUid); - return false; - } - - // check if item is too big to fit into secret stash - if (_item.GetSizePrototype(item.Size) > _item.GetSizePrototype(component.MaxItemSize)) - { - var msg = Loc.GetString("comp-secret-stash-action-hide-item-too-big", - ("item", itemToHideUid), ("stash", GetSecretPartName(uid, component))); - _popupSystem.PopupClient(msg, uid, userUid); - return false; - } - - // try to move item from hands to stash container - if (!_handsSystem.TryDropIntoContainer(userUid, itemToHideUid, container)) - { - return false; - } - - // all done, show success message - var successMsg = Loc.GetString("comp-secret-stash-action-hide-success", - ("item", itemToHideUid), ("this", GetSecretPartName(uid, component))); - _popupSystem.PopupClient(successMsg, uid, userUid); - return true; - } - - /// - /// Try get item and place it in users hand. - /// If user can't take it by hands, will drop item from container. - /// - /// True if user received item - public bool TryGetItem(EntityUid uid, EntityUid userUid, SecretStashComponent? component = null, - HandsComponent? hands = null) - { - if (!Resolve(uid, ref component)) - return false; - if (!Resolve(userUid, ref hands)) - return false; - - // check if secret stash has something inside - var container = component.ItemContainer; - if (container.ContainedEntity == null) - { - return false; - } - - _handsSystem.PickupOrDrop(userUid, container.ContainedEntity.Value, handsComp: hands); - - // show success message - var successMsg = Loc.GetString("comp-secret-stash-action-get-item-found-something", - ("stash", GetSecretPartName(uid, component))); - _popupSystem.PopupClient(successMsg, uid, userUid); - - return true; - } - - private void OnExamine(EntityUid uid, SecretStashComponent component, ExaminedEvent args) - { - if (args.IsInDetailsRange && component.ToggleOpen) - { - if (HasItemInside(uid)) - { - var msg = Loc.GetString(component.ExamineStash); - args.PushMarkup(msg); - } - } - } - - private string GetSecretPartName(EntityUid uid, SecretStashComponent stash) - { - if (stash.SecretPartName != "") - return Loc.GetString(stash.SecretPartName); - - var entityName = Loc.GetString("comp-secret-stash-secret-part-name", ("this", uid)); - - return entityName; + var popup = Loc.GetString("comp-secret-stash-on-destroyed-popup", ("stashname", GetStashName(entity))); + _popupSystem.PopupEntity(popup, storedInside[0], PopupType.MediumCaution); } } + + private void OnInteractUsing(Entity entity, ref InteractUsingEvent args) + { + if (args.Handled || !IsStashOpen(entity)) + return; + + args.Handled = TryStashItem(entity, args.User, args.Used); + } + + private void OnInteractHand(Entity entity, ref InteractHandEvent args) + { + if (args.Handled || !IsStashOpen(entity)) + return; + + args.Handled = TryGetItem(entity, args.User); + } + + /// + /// Tries to hide the given item into the stash. + /// + /// True if item was hidden inside stash and false otherwise. + private bool TryStashItem(Entity entity, EntityUid userUid, EntityUid itemToHideUid) + { + if (!TryComp(itemToHideUid, out var itemComp)) + return false; + + _audio.PlayPredicted(entity.Comp.TryInsertItemSound, entity, userUid, AudioParams.Default.WithVariation(0.25f)); + + // check if secret stash is already occupied + var container = entity.Comp.ItemContainer; + if (HasItemInside(entity)) + { + var popup = Loc.GetString("comp-secret-stash-action-hide-container-not-empty"); + _popupSystem.PopupClient(popup, entity, userUid); + return false; + } + + // check if item is too big to fit into secret stash + if (_item.GetSizePrototype(itemComp.Size) > _item.GetSizePrototype(entity.Comp.MaxItemSize)) + { + var msg = Loc.GetString("comp-secret-stash-action-hide-item-too-big", + ("item", itemToHideUid), ("stashname", GetStashName(entity))); + _popupSystem.PopupClient(msg, entity, userUid); + return false; + } + + // try to move item from hands to stash container + if (!_handsSystem.TryDropIntoContainer(userUid, itemToHideUid, container)) + return false; + + // all done, show success message + var successMsg = Loc.GetString("comp-secret-stash-action-hide-success", + ("item", itemToHideUid), ("stashname", GetStashName(entity))); + _popupSystem.PopupClient(successMsg, entity, userUid); + return true; + } + + /// + /// Try the given item in the stash and place it in users hand. + /// If user can't take hold the item in their hands, the item will be dropped onto the ground. + /// + /// True if user received item. + private bool TryGetItem(Entity entity, EntityUid userUid) + { + if (!TryComp(userUid, out var handsComp)) + return false; + + _audio.PlayPredicted(entity.Comp.TryRemoveItemSound, entity, userUid, AudioParams.Default.WithVariation(0.25f)); + + // check if secret stash has something inside + var itemInStash = entity.Comp.ItemContainer.ContainedEntity; + if (itemInStash == null) + return false; + + _handsSystem.PickupOrDrop(userUid, itemInStash.Value, handsComp: handsComp); + + // show success message + var successMsg = Loc.GetString("comp-secret-stash-action-get-item-found-something", + ("stashname", GetStashName(entity))); + _popupSystem.PopupClient(successMsg, entity, userUid); + + return true; + } + + private void OnGetVerb(Entity entity, ref GetVerbsEvent args) + { + if (!args.CanInteract || !args.CanAccess || !entity.Comp.HasVerbs) + return; + + var user = args.User; + var item = args.Using; + var stashName = GetStashName(entity); + + var itemVerb = new InteractionVerb(); + + // This will add the verb relating to inserting / grabbing items. + if (IsStashOpen(entity)) + { + if (item != null) + { + itemVerb.Text = Loc.GetString("comp-secret-stash-verb-insert-into-stash"); + if (HasItemInside(entity)) + { + itemVerb.Disabled = true; + itemVerb.Message = Loc.GetString("comp-secret-stash-verb-insert-message-item-already-inside", ("stashname", stashName)); + } + else + { + itemVerb.Message = Loc.GetString("comp-secret-stash-verb-insert-message-no-item", ("item", item), ("stashname", stashName)); + } + + itemVerb.Act = () => TryStashItem(entity, user, item.Value); + } + else + { + itemVerb.Text = Loc.GetString("comp-secret-stash-verb-take-out-item"); + itemVerb.Message = Loc.GetString("comp-secret-stash-verb-take-out-message-something", ("stashname", stashName)); + if (!HasItemInside(entity)) + { + itemVerb.Disabled = true; + itemVerb.Message = Loc.GetString("comp-secret-stash-verb-take-out-message-nothing", ("stashname", stashName)); + } + + itemVerb.Act = () => TryGetItem(entity, user); + } + + args.Verbs.Add(itemVerb); + } + } + + #region Helper functions + + /// + /// The stash name if it exists, or the entity name if it doesn't. + /// + private string GetStashName(Entity entity) + { + if (entity.Comp.SecretStashName == null) + return Identity.Name(entity, EntityManager); + return Loc.GetString(entity.Comp.SecretStashName); + } + + /// + /// True if the stash is open OR the there is no toolOpenableComponent attacheded to the entity + /// and false otherwise. + /// + private bool IsStashOpen(Entity stash) + { + return _toolOpenableSystem.IsOpen(stash); + } + + private bool HasItemInside(Entity entity) + { + return entity.Comp.ItemContainer.ContainedEntity != null; + } + + #endregion } diff --git a/Content.Shared/Tools/Components/ToolOpenableComponent.cs b/Content.Shared/Tools/Components/ToolOpenableComponent.cs new file mode 100644 index 0000000000..82cdf611da --- /dev/null +++ b/Content.Shared/Tools/Components/ToolOpenableComponent.cs @@ -0,0 +1,84 @@ +using Robust.Shared.Prototypes; +using Robust.Shared.GameStates; +using Content.Shared.DoAfter; +using Robust.Shared.Serialization; + +namespace Content.Shared.Tools.Components +{ + /// + /// Logic for using tools (Or verbs) to open / close something on an entity. + /// + [RegisterComponent, NetworkedComponent, AutoGenerateComponentState] + public sealed partial class ToolOpenableComponent : Component + { + /// + /// Is the openable part open or closed? + /// + [DataField, AutoNetworkedField] + public bool IsOpen = false; + + /// + /// If a tool is needed to open the entity, this time will be used. + /// + [DataField] + public float OpenTime = 1f; + + /// + /// If a tool is needed to close the entity, this time will be used. + /// + [DataField] + public float CloseTime = 1f; + + /// + /// What type of tool quality is needed to open this? + /// If null, the it will only be openable by a verb. + /// + [DataField] + public ProtoId? OpenToolQualityNeeded; + + /// + /// What type of tool quality is needed to close this. + /// If null, this will only be closable by a verb. + /// + [DataField] + public ProtoId? CloseToolQualityNeeded; + + /// + /// If true, verbs will appear to help interact with opening / closing. + /// + [DataField, AutoNetworkedField] + public bool HasVerbs = true; + + /// + /// The name of what is being open and closed. + /// E.g toilet lid, pannel, compartment. + /// + [DataField, AutoNetworkedField] + public string? Name; + + } + + /// + /// Simple do after event for opening or closing. + /// + [Serializable, NetSerializable] + public sealed partial class ToolOpenableDoAfterEventToggleOpen : SimpleDoAfterEvent + { + } + + /// + /// Visualizers for handling stash open closed state if stash has door. + /// + [Serializable, NetSerializable] + public enum ToolOpenableVisuals : byte + { + ToolOpenableVisualState, + } + + [Serializable, NetSerializable] + public enum ToolOpenableVisualState : byte + { + Open, + Closed + } +} diff --git a/Content.Shared/Tools/Systems/ToolOpenableSystem.cs b/Content.Shared/Tools/Systems/ToolOpenableSystem.cs new file mode 100644 index 0000000000..4951040350 --- /dev/null +++ b/Content.Shared/Tools/Systems/ToolOpenableSystem.cs @@ -0,0 +1,171 @@ +using Content.Shared.IdentityManagement; +using Content.Shared.Tools.Components; +using Content.Shared.Tools.Systems; +using Content.Shared.Interaction; +using Content.Shared.Examine; +using Content.Shared.Verbs; + +namespace Content.Shared.Tools.EntitySystems; + +public sealed class ToolOpenableSystem : EntitySystem +{ + [Dependency] private readonly SharedToolSystem _tool = default!; + [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(OnInit); + SubscribeLocalEvent(OnOpenableStateToggled); + SubscribeLocalEvent(OnInteractUsing); + SubscribeLocalEvent(OnExamine); + SubscribeLocalEvent>(OnGetVerb); + } + + private void OnInit(Entity entity, ref ComponentInit args) + { + UpdateAppearance(entity); + Dirty(entity); + } + + private void OnInteractUsing(Entity entity, ref InteractUsingEvent args) + { + if (args.Handled) + return; + + if (TryOpenClose(entity, args.Used, args.User)) + args.Handled = true; + } + + /// + /// Try to open or close what is openable. + /// + /// Returns false if you can't interact with the openable thing with the given item. + private bool TryOpenClose(Entity entity, EntityUid? toolToToggle, EntityUid user) + { + var neededToolQuantity = entity.Comp.IsOpen ? entity.Comp.CloseToolQualityNeeded : entity.Comp.OpenToolQualityNeeded; + var time = entity.Comp.IsOpen ? entity.Comp.CloseTime : entity.Comp.OpenTime; + var evt = new ToolOpenableDoAfterEventToggleOpen(); + + // If neededToolQuantity is null it can only be open be opened with the verbs. + if (toolToToggle == null || neededToolQuantity == null) + return false; + + return _tool.UseTool(toolToToggle.Value, user, entity, time, neededToolQuantity, evt); + } + + private void OnOpenableStateToggled(Entity entity, ref ToolOpenableDoAfterEventToggleOpen args) + { + if (args.Cancelled) + return; + + ToggleState(entity); + } + + /// + /// Toggle the state and update appearance. + /// + private void ToggleState(Entity entity) + { + entity.Comp.IsOpen = !entity.Comp.IsOpen; + UpdateAppearance(entity); + Dirty(entity); + } + + #region Helper functions + + private string GetName(Entity entity) + { + if (entity.Comp.Name == null) + return Identity.Name(entity, EntityManager); + return Loc.GetString(entity.Comp.Name); + } + + public bool IsOpen(EntityUid uid, ToolOpenableComponent? component = null) + { + if (!Resolve(uid, ref component, false)) + return true; + + return component.IsOpen; + } + + private void UpdateAppearance(Entity entity) + { + _appearance.SetData(entity, ToolOpenableVisuals.ToolOpenableVisualState, entity.Comp.IsOpen ? ToolOpenableVisualState.Open : ToolOpenableVisualState.Closed); + } + + #endregion + + #region User interface functions + + private void OnExamine(Entity entity, ref ExaminedEvent args) + { + if (!args.IsInDetailsRange) + return; + + string msg; + var name = GetName(entity); + if (entity.Comp.IsOpen) + msg = Loc.GetString("tool-openable-component-examine-opened", ("name", name)); + else + msg = Loc.GetString("tool-openable-component-examine-closed", ("name", name)); + + args.PushMarkup(msg); + } + + private void OnGetVerb(Entity entity, ref GetVerbsEvent args) + { + if (!args.CanInteract || !args.CanAccess || !entity.Comp.HasVerbs) + return; + + var user = args.User; + var item = args.Using; + var name = GetName(entity); + + var toggleVerb = new InteractionVerb + { + IconEntity = GetNetEntity(item) + }; + + if (entity.Comp.IsOpen) + { + toggleVerb.Text = toggleVerb.Message = Loc.GetString("tool-openable-component-verb-close"); + var neededQual = entity.Comp.CloseToolQualityNeeded; + + // If neededQual is null you don't need a tool to open / close. + if (neededQual != null && + (item == null || !_tool.HasQuality(item.Value, neededQual))) + { + toggleVerb.Disabled = true; + toggleVerb.Message = Loc.GetString("tool-openable-component-verb-cant-close", ("name", name)); + } + + if (neededQual == null) + toggleVerb.Act = () => ToggleState(entity); + else + toggleVerb.Act = () => TryOpenClose(entity, item, user); + + args.Verbs.Add(toggleVerb); + } + else + { + // The open verb should only appear when holding the correct tool or if no tool is needed. + + toggleVerb.Text = toggleVerb.Message = Loc.GetString("tool-openable-component-verb-open"); + var neededQual = entity.Comp.OpenToolQualityNeeded; + + if (neededQual == null) + { + toggleVerb.Act = () => ToggleState(entity); + args.Verbs.Add(toggleVerb); + } + else if (item != null && _tool.HasQuality(item.Value, neededQual)) + { + toggleVerb.Act = () => TryOpenClose(entity, item, user); + args.Verbs.Add(toggleVerb); + } + } + } + + #endregion +} diff --git a/Resources/Locale/en-US/storage/components/secret-stash-component.ftl b/Resources/Locale/en-US/storage/components/secret-stash-component.ftl index d0dfed2b5d..2a8f505e2b 100644 --- a/Resources/Locale/en-US/storage/components/secret-stash-component.ftl +++ b/Resources/Locale/en-US/storage/components/secret-stash-component.ftl @@ -1,11 +1,24 @@ ### Secret stash component. Stuff like potted plants, comfy chair cushions, etc... -comp-secret-stash-secret-part-name = { THE($item) } -comp-secret-stash-action-hide-success = You hide { THE($item) } in { $this } -comp-secret-stash-action-hide-container-not-empty = There's already something in here?! -comp-secret-stash-action-hide-item-too-big = { THE($item) } is too big to fit in {$stash}! -comp-secret-stash-action-get-item-found-something = There was something inside {$stash}! -comp-secret-stash-on-examine-found-hidden-item = There is something hidden inside. +comp-secret-stash-action-hide-success = You hide { THE($item) } in the {$stashname}. +comp-secret-stash-action-hide-container-not-empty = There's already something in here!? +comp-secret-stash-action-hide-item-too-big = { THE($item) } is too big to fit in the {$stashname}. +comp-secret-stash-action-get-item-found-something = There was something inside the {$stashname}! +comp-secret-stash-on-examine-found-hidden-item = There is something hidden inside the {$stashname}! +comp-secret-stash-on-destroyed-popup = Something falls out of the the {$stashname}! -secret-stash-part-plant = the plant -secret-stash-part-toilet = the toilet cistern +### Verbs +comp-secret-stash-verb-insert-into-stash = Stash item +comp-secret-stash-verb-insert-message-item-already-inside = There is already an item inside the {$stashname}. +comp-secret-stash-verb-insert-message-no-item = Hide { THE($item) } in the {$stashname}. +comp-secret-stash-verb-take-out-item = Grab item +comp-secret-stash-verb-take-out-message-something = Take the contents of the {$stashname} out. +comp-secret-stash-verb-take-out-message-nothing = There is nothing inside the {$stashname}. + +comp-secret-stash-verb-close = Close +comp-secret-stash-verb-cant-close = You can't close the {$stashname} with that. +comp-secret-stash-verb-open = Open + +### Stash names +secret-stash-plant = plant +secret-stash-toilet = toilet cistern diff --git a/Resources/Locale/en-US/tools/components/tool-openable-component.ftl b/Resources/Locale/en-US/tools/components/tool-openable-component.ftl new file mode 100644 index 0000000000..c45b6c69da --- /dev/null +++ b/Resources/Locale/en-US/tools/components/tool-openable-component.ftl @@ -0,0 +1,6 @@ +tool-openable-component-examine-closed = The {$name} is closed. +tool-openable-component-examine-opened = The {$name} is open. + +tool-openable-component-verb-close = Close +tool-openable-component-verb-open = Open +tool-openable-component-verb-cant-close = You can't close the {$name} with that. diff --git a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml index 53d268facf..2d35c94bf1 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml @@ -24,9 +24,11 @@ offset: "0.0,0.3" sprite: Structures/Furniture/potted_plants.rsi noRot: true - - type: PottedPlantHide - type: SecretStash - secretPartName: secret-stash-part-plant + tryInsertItemSound: /Audio/Effects/plant_rustle.ogg + tryRemoveItemSound: /Audio/Effects/plant_rustle.ogg + hasVerbs: false + secretStashName: secret-stash-plant - type: ContainerContainer containers: stash: !type:ContainerSlot {} diff --git a/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml index 1eb5176e9e..6a603b7deb 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/toilet.yml @@ -68,9 +68,11 @@ - type: PlungerUse - type: Appearance - type: SecretStash - secretPartName: secret-stash-part-toilet - examineStash: toilet-component-on-examine-found-hidden-item - openableStash: true + secretStashName: secret-stash-toilet + - type: ToolOpenable + openToolQualityNeeded: Prying + closeToolQualityNeeded: Prying + name: secret-stash-toilet - type: Drain autoDrain: false - type: StaticPrice @@ -103,10 +105,10 @@ SeatVisualState.SeatUp: SeatUp: { state: disposal-up } SeatDown: { state: disposal-down } - enum.StashVisuals.DoorVisualState: - DoorVisualState.DoorOpen: - DoorOpen: { state: disposal-open } - DoorClosed: { state: disposal-closed } + enum.ToolOpenableVisuals.ToolOpenableVisualState: + ToolOpenableVisualState.StashOpen: + Open: { state: disposal-open } + Closed: { state: disposal-closed } - type: entity id: ToiletDirtyWater From 2528231ad194cbb973942a8e6ad5cae70e1c1ab4 Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Fri, 9 Aug 2024 00:52:25 -0400 Subject: [PATCH 277/422] offgrid mob friction (#29383) * offgrid mob friction * save the world... --- .../Movement/Components/MovementSpeedModifierComponent.cs | 7 +++++++ Content.Shared/Movement/Systems/SharedMoverController.cs | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs b/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs index a0feab7052..02a8538531 100644 --- a/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs +++ b/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs @@ -15,6 +15,7 @@ namespace Content.Shared.Movement.Components public const float DefaultMinimumFrictionSpeed = 0.005f; public const float DefaultWeightlessFriction = 1f; public const float DefaultWeightlessFrictionNoInput = 0.2f; + public const float DefaultOffGridFriction = 0.05f; public const float DefaultWeightlessModifier = 0.7f; public const float DefaultWeightlessAcceleration = 1f; @@ -72,6 +73,12 @@ namespace Content.Shared.Movement.Components [ViewVariables(VVAccess.ReadWrite), DataField] public float WeightlessFrictionNoInput = DefaultWeightlessFrictionNoInput; + /// + /// The negative velocity applied for friction when weightless and not standing on a grid or mapgrid + /// + [ViewVariables(VVAccess.ReadWrite), DataField] + public float OffGridFriction = DefaultOffGridFriction; + /// /// The movement speed modifier applied to a mob's total input velocity when weightless. /// diff --git a/Content.Shared/Movement/Systems/SharedMoverController.cs b/Content.Shared/Movement/Systems/SharedMoverController.cs index 1f64717823..c41db21b01 100644 --- a/Content.Shared/Movement/Systems/SharedMoverController.cs +++ b/Content.Shared/Movement/Systems/SharedMoverController.cs @@ -214,7 +214,9 @@ namespace Content.Shared.Movement.Systems if (weightless) { - if (worldTotal != Vector2.Zero && touching) + if (gridComp == null && !MapGridQuery.HasComp(xform.GridUid)) + friction = moveSpeedComponent?.OffGridFriction ?? MovementSpeedModifierComponent.DefaultOffGridFriction; + else if (worldTotal != Vector2.Zero && touching) friction = moveSpeedComponent?.WeightlessFriction ?? MovementSpeedModifierComponent.DefaultWeightlessFriction; else friction = moveSpeedComponent?.WeightlessFrictionNoInput ?? MovementSpeedModifierComponent.DefaultWeightlessFrictionNoInput; From 2ea17a492d65a22bdea84507ae3d67c465975165 Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 9 Aug 2024 04:53:31 +0000 Subject: [PATCH 278/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 96d9f52389..45606f6eff 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Dutch-VanDerLinde - changes: - - message: Fixed non-inital infected getting the succumb to zombie action. - type: Fix - id: 6566 - time: '2024-05-09T21:45:23.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27820 - author: Hanzdegloker changes: - message: Added CMO turtleneck jumpsuit/jumpskirt. @@ -3794,3 +3787,10 @@ id: 7065 time: '2024-08-08T23:32:42.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30789 +- author: EmoGarbage404 + changes: + - message: You should have significantly less friction when moving in space. + type: Tweak + id: 7066 + time: '2024-08-09T04:52:25.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29383 From da0b8d47315a35859cf4b562423d954a6bdbb683 Mon Sep 17 00:00:00 2001 From: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Date: Fri, 9 Aug 2024 07:24:49 +0200 Subject: [PATCH 279/422] remove UntrackedMapBoundUserInterface (#30752) --- .../UI/StationMapBoundUserInterface.cs | 6 +++- .../UI/UntrackedMapBoundUserInterface.cs | 28 ------------------- .../Tests/GameRules/NukeOpsTest.cs | 2 +- ...omponent.cs => StationMapUserComponent.cs} | 6 ---- .../Pinpointer/StationMapComponent.cs | 11 ++++++++ .../Prototypes/Entities/Objects/Fun/pai.yml | 2 +- 6 files changed, 18 insertions(+), 37 deletions(-) delete mode 100644 Content.Client/Pinpointer/UI/UntrackedMapBoundUserInterface.cs rename Content.Server/Pinpointer/{StationMapComponent.cs => StationMapUserComponent.cs} (77%) create mode 100644 Content.Shared/Pinpointer/StationMapComponent.cs diff --git a/Content.Client/Pinpointer/UI/StationMapBoundUserInterface.cs b/Content.Client/Pinpointer/UI/StationMapBoundUserInterface.cs index 7417fafede..91fb4ef71b 100644 --- a/Content.Client/Pinpointer/UI/StationMapBoundUserInterface.cs +++ b/Content.Client/Pinpointer/UI/StationMapBoundUserInterface.cs @@ -1,3 +1,4 @@ +using Content.Shared.Pinpointer; using Robust.Client.UserInterface; namespace Content.Client.Pinpointer.UI; @@ -23,6 +24,9 @@ public sealed class StationMapBoundUserInterface : BoundUserInterface _window = this.CreateWindow(); _window.Title = EntMan.GetComponent(Owner).EntityName; - _window.Set(gridUid, Owner); + if (EntMan.TryGetComponent(Owner, out var comp) && comp.ShowLocation) + _window.Set(gridUid, Owner); + else + _window.Set(gridUid, null); } } diff --git a/Content.Client/Pinpointer/UI/UntrackedMapBoundUserInterface.cs b/Content.Client/Pinpointer/UI/UntrackedMapBoundUserInterface.cs deleted file mode 100644 index a3ca6f65da..0000000000 --- a/Content.Client/Pinpointer/UI/UntrackedMapBoundUserInterface.cs +++ /dev/null @@ -1,28 +0,0 @@ -using Robust.Client.UserInterface; - -namespace Content.Client.Pinpointer.UI; - -public sealed class UntrackedStationMapBoundUserInterface : BoundUserInterface -{ - [ViewVariables] - private StationMapWindow? _window; - - public UntrackedStationMapBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) - { - } - - protected override void Open() - { - base.Open(); - EntityUid? gridUid = null; - - // TODO: What this just looks like it's been copy-pasted wholesale from StationMapBoundUserInterface? - if (EntMan.TryGetComponent(Owner, out var xform)) - { - gridUid = xform.GridUid; - } - - _window = this.CreateWindow(); - _window.Set(gridUid, Owner); - } -} diff --git a/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs b/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs index 0ccb5e314b..a4563aa37e 100644 --- a/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs +++ b/Content.IntegrationTests/Tests/GameRules/NukeOpsTest.cs @@ -5,7 +5,6 @@ using Content.Server.GameTicking; using Content.Server.GameTicking.Presets; using Content.Server.GameTicking.Rules.Components; using Content.Server.Mind; -using Content.Server.Pinpointer; using Content.Server.Roles; using Content.Server.RoundEnd; using Content.Server.Shuttles.Components; @@ -18,6 +17,7 @@ using Content.Shared.Hands.Components; using Content.Shared.Inventory; using Content.Shared.NPC.Systems; using Content.Shared.NukeOps; +using Content.Shared.Pinpointer; using Content.Shared.Station.Components; using Robust.Server.GameObjects; using Robust.Shared.GameObjects; diff --git a/Content.Server/Pinpointer/StationMapComponent.cs b/Content.Server/Pinpointer/StationMapUserComponent.cs similarity index 77% rename from Content.Server/Pinpointer/StationMapComponent.cs rename to Content.Server/Pinpointer/StationMapUserComponent.cs index 942ea1aba8..358e26d82e 100644 --- a/Content.Server/Pinpointer/StationMapComponent.cs +++ b/Content.Server/Pinpointer/StationMapUserComponent.cs @@ -1,11 +1,5 @@ namespace Content.Server.Pinpointer; -[RegisterComponent] -public sealed partial class StationMapComponent : Component -{ - -} - /// /// Added to an entity using station map so when its parent changes we reset it. /// diff --git a/Content.Shared/Pinpointer/StationMapComponent.cs b/Content.Shared/Pinpointer/StationMapComponent.cs new file mode 100644 index 0000000000..07cc99605e --- /dev/null +++ b/Content.Shared/Pinpointer/StationMapComponent.cs @@ -0,0 +1,11 @@ +namespace Content.Shared.Pinpointer; + +[RegisterComponent] +public sealed partial class StationMapComponent : Component +{ + /// + /// Whether or not to show the user's location on the map. + /// + [DataField] + public bool ShowLocation = true; +} diff --git a/Resources/Prototypes/Entities/Objects/Fun/pai.yml b/Resources/Prototypes/Entities/Objects/Fun/pai.yml index c12f8a8d00..77f16fcd41 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/pai.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/pai.yml @@ -17,7 +17,7 @@ type: InstrumentBoundUserInterface requireInputValidation: false enum.StationMapUiKey.Key: - type: UntrackedStationMapBoundUserInterface + type: StationMapBoundUserInterface requireInputValidation: false - type: Sprite sprite: Objects/Fun/pai.rsi From 8a4ef69e867db2361367425655b4f7c258cf665f Mon Sep 17 00:00:00 2001 From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Date: Fri, 9 Aug 2024 17:25:43 +1200 Subject: [PATCH 280/422] Add random seed options to tests (#30735) * Add random seed options to tests * Ensure profile randomization --- Content.IntegrationTests/Pair/TestPair.cs | 67 ++++++++++++++++++----- Content.IntegrationTests/PoolManager.cs | 8 ++- Content.IntegrationTests/PoolSettings.cs | 46 +++++++++++----- 3 files changed, 90 insertions(+), 31 deletions(-) diff --git a/Content.IntegrationTests/Pair/TestPair.cs b/Content.IntegrationTests/Pair/TestPair.cs index 0b681dcde1..43b188fd32 100644 --- a/Content.IntegrationTests/Pair/TestPair.cs +++ b/Content.IntegrationTests/Pair/TestPair.cs @@ -9,6 +9,7 @@ using Robust.Shared.GameObjects; using Robust.Shared.IoC; using Robust.Shared.Network; using Robust.Shared.Player; +using Robust.Shared.Random; using Robust.Shared.Timing; using Robust.UnitTesting; @@ -28,6 +29,12 @@ public sealed partial class TestPair public TestMapData? TestMap; private List _modifiedProfiles = new(); + private int _nextServerSeed; + private int _nextClientSeed; + + public int ServerSeed; + public int ClientSeed; + public RobustIntegrationTest.ServerIntegrationInstance Server { get; private set; } = default!; public RobustIntegrationTest.ClientIntegrationInstance Client { get; private set; } = default!; @@ -74,22 +81,27 @@ public sealed partial class TestPair await Server.WaitPost(() => gameTicker.RestartRound()); } - if (settings.ShouldBeConnected) - { - Client.SetConnectTarget(Server); - await Client.WaitIdleAsync(); - var netMgr = Client.ResolveDependency(); + // Always initially connect clients to generate an initial random set of preferences/profiles. + // This is to try and prevent issues where if the first test that connects the client is consistently some test + // that uses a fixed seed, it would effectively prevent it from beingrandomized. - await Client.WaitPost(() => - { - if (!netMgr.IsConnected) - { - netMgr.ClientConnect(null!, 0, null!); - } - }); + Client.SetConnectTarget(Server); + await Client.WaitIdleAsync(); + var netMgr = Client.ResolveDependency(); + await Client.WaitPost(() => netMgr.ClientConnect(null!, 0, null!)); + await ReallyBeIdle(10); + await Client.WaitRunTicks(1); + + if (!settings.ShouldBeConnected) + { + await Client.WaitPost(() => netMgr.ClientDisconnect("Initial disconnect")); await ReallyBeIdle(10); - await Client.WaitRunTicks(1); } + + var cRand = Client.ResolveDependency(); + var sRand = Server.ResolveDependency(); + _nextClientSeed = cRand.Next(); + _nextServerSeed = sRand.Next(); } public void Kill() @@ -129,4 +141,33 @@ public sealed partial class TestPair CleanDisposed = 2, Dead = 3, } + + public void SetupSeed() + { + var sRand = Server.ResolveDependency(); + if (Settings.ServerSeed is { } severSeed) + { + ServerSeed = severSeed; + sRand.SetSeed(ServerSeed); + } + else + { + ServerSeed = _nextServerSeed; + sRand.SetSeed(ServerSeed); + _nextServerSeed = sRand.Next(); + } + + var cRand = Client.ResolveDependency(); + if (Settings.ClientSeed is { } clientSeed) + { + ClientSeed = clientSeed; + cRand.SetSeed(ClientSeed); + } + else + { + ClientSeed = _nextClientSeed; + cRand.SetSeed(ClientSeed); + _nextClientSeed = cRand.Next(); + } + } } diff --git a/Content.IntegrationTests/PoolManager.cs b/Content.IntegrationTests/PoolManager.cs index 21c93ea8ae..34ac4060dd 100644 --- a/Content.IntegrationTests/PoolManager.cs +++ b/Content.IntegrationTests/PoolManager.cs @@ -252,7 +252,7 @@ public static partial class PoolManager } finally { - if (pair != null && pair.TestHistory.Count > 1) + if (pair != null && pair.TestHistory.Count > 0) { await testOut.WriteLineAsync($"{nameof(GetServerClientPair)}: Pair {pair.Id} Test History Start"); for (var i = 0; i < pair.TestHistory.Count; i++) @@ -268,12 +268,14 @@ public static partial class PoolManager var poolRetrieveTime = poolRetrieveTimeWatch.Elapsed; await testOut.WriteLineAsync( $"{nameof(GetServerClientPair)}: Retrieving pair {pair.Id} from pool took {poolRetrieveTime.TotalMilliseconds} ms"); - await testOut.WriteLineAsync( - $"{nameof(GetServerClientPair)}: Returning pair {pair.Id}"); pair.ClearModifiedCvars(); pair.Settings = poolSettings; pair.TestHistory.Add(currentTestName); + pair.SetupSeed(); + await testOut.WriteLineAsync( + $"{nameof(GetServerClientPair)}: Returning pair {pair.Id} with client/server seeds: {pair.ClientSeed}/{pair.ServerSeed}"); + pair.Watch.Restart(); return pair; } diff --git a/Content.IntegrationTests/PoolSettings.cs b/Content.IntegrationTests/PoolSettings.cs index a78173808f..9da514e66b 100644 --- a/Content.IntegrationTests/PoolSettings.cs +++ b/Content.IntegrationTests/PoolSettings.cs @@ -1,5 +1,7 @@ #nullable enable +using Robust.Shared.Random; + namespace Content.IntegrationTests; /// @@ -9,16 +11,6 @@ namespace Content.IntegrationTests; /// public sealed class PoolSettings { - /// - /// If the returned pair must not be reused - /// - public bool MustNotBeReused => Destructive || NoLoadContent || NoLoadTestPrototypes; - - /// - /// If the given pair must be brand new - /// - public bool MustBeNew => Fresh || NoLoadContent || NoLoadTestPrototypes; - /// /// Set to true if the test will ruin the server/client pair. /// @@ -34,8 +26,6 @@ public sealed class PoolSettings /// public bool DummyTicker { get; init; } = true; - public bool UseDummyTicker => !InLobby && DummyTicker; - /// /// If true, this enables the creation of admin logs during the test. /// @@ -48,8 +38,6 @@ public sealed class PoolSettings /// public bool Connected { get; init; } - public bool ShouldBeConnected => InLobby || Connected; - /// /// Set to true if the given server/client pair should be in the lobby. /// If the pair is not in the lobby at the end of the test, this test must be marked as dirty. @@ -92,6 +80,34 @@ public sealed class PoolSettings /// public string? TestName { get; set; } + /// + /// If set, this will be used to call + /// + public int? ServerSeed { get; set; } + + /// + /// If set, this will be used to call + /// + public int? ClientSeed { get; set; } + + #region Inferred Properties + + /// + /// If the returned pair must not be reused + /// + public bool MustNotBeReused => Destructive || NoLoadContent || NoLoadTestPrototypes; + + /// + /// If the given pair must be brand new + /// + public bool MustBeNew => Fresh || NoLoadContent || NoLoadTestPrototypes; + + public bool UseDummyTicker => !InLobby && DummyTicker; + + public bool ShouldBeConnected => InLobby || Connected; + + #endregion + /// /// Tries to guess if we can skip recycling the server/client pair. /// @@ -114,4 +130,4 @@ public sealed class PoolSettings && Map == nextSettings.Map && InLobby == nextSettings.InLobby; } -} \ No newline at end of file +} From b266c9b545522c8598c744d820d58bdd0da5f866 Mon Sep 17 00:00:00 2001 From: Plykiya <58439124+Plykiya@users.noreply.github.com> Date: Thu, 8 Aug 2024 22:32:41 -0700 Subject: [PATCH 281/422] Create Generic DamageOnInteract/Attacked Comps/Systems (#30244) * Everything but the submodule * stuff I forgot * heat * missed lights * behonky * LocId * I guess it was a skill issue? * predicted audio * It works with lights now * Borg equality * Gorilla gauntlet grants protection from anomaly returned damage when attacking it * woops, there we go * NONE * Use DamageModifierSets, remove Behonker damage * Reviews dealt with --------- Co-authored-by: plykiya --- .../GloveHeatResistanceComponent.cs | 12 --- .../Light/Components/PoweredLightComponent.cs | 4 - .../Light/EntitySystems/PoweredLightSystem.cs | 45 ++------- .../Anomaly/Components/AnomalyComponent.cs | 14 --- Content.Shared/Anomaly/SharedAnomalySystem.cs | 26 ----- .../Components/DamageOnAttackedComponent.cs | 47 +++++++++ .../DamageOnAttackedProtectionComponent.cs | 29 ++++++ .../Components/DamageOnInteractComponent.cs | 47 +++++++++ .../DamageOnInteractProtectionComponent.cs | 29 ++++++ .../Damage/Systems/DamageOnAttackedSystem.cs | 99 +++++++++++++++++++ .../Damage/Systems/DamageOnInteractSystem.cs | 85 ++++++++++++++++ .../Inventory/InventorySystem.Slots.cs | 6 +- .../Clothing/Hands/base_clothinghands.yml | 4 + .../Entities/Clothing/Hands/colored.yml | 7 -- .../Entities/Clothing/Hands/gloves.yml | 22 +++-- .../OuterClothing/base_clothingouter.yml | 10 ++ .../Mobs/Cyborgs/base_borg_chassis.yml | 4 + .../Entities/Mobs/NPCs/behonker.yml | 6 -- .../Objects/Specific/Research/anomaly.yml | 7 ++ .../Entities/Objects/Weapons/Melee/sword.yml | 5 +- .../Structures/Lighting/base_lighting.yml | 96 +++++++++++------- .../Structures/Lighting/ground_lighting.yml | 24 +++-- .../Structures/Lighting/strobe_lighting.yml | 8 +- .../Structures/Specific/Anomaly/anomalies.yml | 54 ++++++---- .../Structures/Wallmounts/service_light.yml | 2 + 25 files changed, 507 insertions(+), 185 deletions(-) delete mode 100644 Content.Server/Clothing/Components/GloveHeatResistanceComponent.cs create mode 100644 Content.Shared/Damage/Components/DamageOnAttackedComponent.cs create mode 100644 Content.Shared/Damage/Components/DamageOnAttackedProtectionComponent.cs create mode 100644 Content.Shared/Damage/Components/DamageOnInteractComponent.cs create mode 100644 Content.Shared/Damage/Components/DamageOnInteractProtectionComponent.cs create mode 100644 Content.Shared/Damage/Systems/DamageOnAttackedSystem.cs create mode 100644 Content.Shared/Damage/Systems/DamageOnInteractSystem.cs diff --git a/Content.Server/Clothing/Components/GloveHeatResistanceComponent.cs b/Content.Server/Clothing/Components/GloveHeatResistanceComponent.cs deleted file mode 100644 index 29a3b901a7..0000000000 --- a/Content.Server/Clothing/Components/GloveHeatResistanceComponent.cs +++ /dev/null @@ -1,12 +0,0 @@ -namespace Content.Server.Clothing.Components; - -/// -/// TODO this needs removed somehow. -/// Handles 'heat resistance' for gloves touching bulbs and that's it, ick. -/// -[RegisterComponent] -public sealed partial class GloveHeatResistanceComponent : Component -{ - [DataField("heatResistance")] - public int HeatResistance = 323; -} diff --git a/Content.Server/Light/Components/PoweredLightComponent.cs b/Content.Server/Light/Components/PoweredLightComponent.cs index 489a49eec2..1a6f610516 100644 --- a/Content.Server/Light/Components/PoweredLightComponent.cs +++ b/Content.Server/Light/Components/PoweredLightComponent.cs @@ -30,10 +30,6 @@ namespace Content.Server.Light.Components [DataField("on")] public bool On = true; - [DataField("damage", required: true)] - [ViewVariables(VVAccess.ReadWrite)] - public DamageSpecifier Damage = default!; - [DataField("ignoreGhostsBoo")] public bool IgnoreGhostsBoo; diff --git a/Content.Server/Light/EntitySystems/PoweredLightSystem.cs b/Content.Server/Light/EntitySystems/PoweredLightSystem.cs index 8aa432c21e..33b7ce0782 100644 --- a/Content.Server/Light/EntitySystems/PoweredLightSystem.cs +++ b/Content.Server/Light/EntitySystems/PoweredLightSystem.cs @@ -1,5 +1,4 @@ using Content.Server.Administration.Logs; -using Content.Server.Clothing.Components; using Content.Server.DeviceLinking.Events; using Content.Server.DeviceLinking.Systems; using Content.Server.DeviceNetwork; @@ -24,6 +23,8 @@ using Robust.Shared.Containers; using Robust.Shared.Player; using Robust.Shared.Timing; using Robust.Shared.Audio.Systems; +using Content.Shared.Damage.Systems; +using Content.Shared.Damage.Components; namespace Content.Server.Light.EntitySystems { @@ -33,11 +34,8 @@ namespace Content.Server.Light.EntitySystems public sealed class PoweredLightSystem : EntitySystem { [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly DamageableSystem _damageableSystem = default!; [Dependency] private readonly SharedAmbientSoundSystem _ambientSystem = default!; [Dependency] private readonly LightBulbSystem _bulbSystem = default!; - [Dependency] private readonly SharedPopupSystem _popupSystem = default!; - [Dependency] private readonly IAdminLogManager _adminLogger= default!; [Dependency] private readonly SharedHandsSystem _handsSystem = default!; [Dependency] private readonly DeviceLinkSystem _signalSystem = default!; [Dependency] private readonly SharedContainerSystem _containerSystem = default!; @@ -45,7 +43,7 @@ namespace Content.Server.Light.EntitySystems [Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] private readonly PointLightSystem _pointLight = default!; [Dependency] private readonly SharedAppearanceSystem _appearance = default!; - [Dependency] private readonly InventorySystem _inventory = default!; + [Dependency] private readonly DamageOnInteractSystem _damageOnInteractSystem = default!; private static readonly TimeSpan ThunkDelay = TimeSpan.FromSeconds(2); public const string LightBulbContainer = "light_bulb"; @@ -106,40 +104,7 @@ namespace Content.Server.Light.EntitySystems if (bulbUid == null) return; - // check if it's possible to apply burn damage to user var userUid = args.User; - if (EntityManager.TryGetComponent(bulbUid.Value, out LightBulbComponent? lightBulb)) - { - // get users heat resistance - var res = int.MinValue; - if (_inventory.TryGetSlotEntity(userUid, "gloves", out var slotEntity) && - TryComp(slotEntity, out var gloves)) - { - res = gloves.HeatResistance; - } - - // check heat resistance against user - var burnedHand = light.CurrentLit && res < lightBulb.BurningTemperature; - if (burnedHand) - { - var damage = _damageableSystem.TryChangeDamage(userUid, light.Damage, origin: userUid); - - // If damage is null then the entity could not take heat damage so they did not get burned. - if (damage != null) - { - - var burnMsg = Loc.GetString("powered-light-component-burn-hand"); - _popupSystem.PopupEntity(burnMsg, uid, userUid); - _adminLogger.Add(LogType.Damaged, $"{ToPrettyString(args.User):user} burned their hand on {ToPrettyString(args.Target):target} and received {damage.GetTotal():damage} damage"); - _audio.PlayEntity(light.BurnHandSound, Filter.Pvs(uid), uid, true); - - args.Handled = true; - return; - } - } - } - - //removing a broken/burned bulb, so allow instant removal if(TryComp(bulbUid.Value, out var bulb) && bulb.State != LightBulbState.Normal) { @@ -435,6 +400,10 @@ namespace Content.Server.Light.EntitySystems if (softness != null) _pointLight.SetSoftness(uid, (float) softness, pointLight); } + + // light bulbs burn your hands! + if (TryComp(uid, out var damageOnInteractComp)) + _damageOnInteractSystem.SetIsDamageActiveTo((uid, damageOnInteractComp), value); } public void ToggleLight(EntityUid uid, PoweredLightComponent? light = null) diff --git a/Content.Shared/Anomaly/Components/AnomalyComponent.cs b/Content.Shared/Anomaly/Components/AnomalyComponent.cs index 88e942ec50..724dfd38d2 100644 --- a/Content.Shared/Anomaly/Components/AnomalyComponent.cs +++ b/Content.Shared/Anomaly/Components/AnomalyComponent.cs @@ -202,20 +202,6 @@ public sealed partial class AnomalyComponent : Component public float GrowingPointMultiplier = 1.5f; #endregion - /// - /// The amount of damage dealt when either a player touches the anomaly - /// directly or by hitting the anomaly. - /// - [DataField(required: true)] - public DamageSpecifier AnomalyContactDamage = default!; - - /// - /// The sound effect played when a player - /// burns themselves on an anomaly via contact. - /// - [DataField] - public SoundSpecifier AnomalyContactDamageSound = new SoundPathSpecifier("/Audio/Effects/lightburn.ogg"); - /// /// A prototype entity that appears when an anomaly supercrit collapse. /// diff --git a/Content.Shared/Anomaly/SharedAnomalySystem.cs b/Content.Shared/Anomaly/SharedAnomalySystem.cs index da1d31c6ff..c3d6591b72 100644 --- a/Content.Shared/Anomaly/SharedAnomalySystem.cs +++ b/Content.Shared/Anomaly/SharedAnomalySystem.cs @@ -30,7 +30,6 @@ public abstract class SharedAnomalySystem : EntitySystem [Dependency] private readonly INetManager _net = default!; [Dependency] protected readonly IRobustRandom Random = default!; [Dependency] protected readonly ISharedAdminLogManager AdminLog = default!; - [Dependency] private readonly DamageableSystem _damageable = default!; [Dependency] protected readonly SharedAudioSystem Audio = default!; [Dependency] protected readonly SharedAppearanceSystem Appearance = default!; [Dependency] private readonly SharedPhysicsSystem _physics = default!; @@ -42,26 +41,10 @@ public abstract class SharedAnomalySystem : EntitySystem { base.Initialize(); - SubscribeLocalEvent(OnInteractHand); - SubscribeLocalEvent(OnAttacked); SubscribeLocalEvent(OnAnomalyThrowStart); SubscribeLocalEvent(OnAnomalyThrowEnd); } - private void OnInteractHand(EntityUid uid, AnomalyComponent component, InteractHandEvent args) - { - DoAnomalyBurnDamage(uid, args.User, component); - args.Handled = true; - } - - private void OnAttacked(EntityUid uid, AnomalyComponent component, AttackedEvent args) - { - if (HasComp(args.Used)) - return; - - DoAnomalyBurnDamage(uid, args.User, component); - } - private void OnAnomalyThrowStart(Entity ent, ref MeleeThrowOnHitStartEvent args) { if (!TryComp(args.Used, out var corePowered) || !TryComp(ent, out var body)) @@ -75,15 +58,6 @@ public abstract class SharedAnomalySystem : EntitySystem _physics.SetBodyType(ent, BodyType.Static); } - public void DoAnomalyBurnDamage(EntityUid source, EntityUid target, AnomalyComponent component) - { - _damageable.TryChangeDamage(target, component.AnomalyContactDamage, true); - if (!Timing.IsFirstTimePredicted || _net.IsServer) - return; - Audio.PlayPvs(component.AnomalyContactDamageSound, source); - Popup.PopupEntity(Loc.GetString("anomaly-component-contact-damage"), target, target); - } - public void DoAnomalyPulse(EntityUid uid, AnomalyComponent? component = null) { if (!Resolve(uid, ref component)) diff --git a/Content.Shared/Damage/Components/DamageOnAttackedComponent.cs b/Content.Shared/Damage/Components/DamageOnAttackedComponent.cs new file mode 100644 index 0000000000..5f6bd7d997 --- /dev/null +++ b/Content.Shared/Damage/Components/DamageOnAttackedComponent.cs @@ -0,0 +1,47 @@ +using Robust.Shared.Audio; +using Robust.Shared.GameStates; + +namespace Content.Shared.Damage.Components; + + +/// +/// This component is added to entities that you want to damage the player +/// if the player interacts with it. For example, if a player tries touching +/// a hot light bulb or an anomaly. This damage can be cancelled if the user +/// has a component that protects them from this. +/// +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState] +public sealed partial class DamageOnAttackedComponent : Component +{ + /// + /// How much damage to apply to the person making contact + /// + [DataField(required: true), AutoNetworkedField] + public DamageSpecifier Damage = default!; + + /// + /// Whether the damage should be resisted by a person's armor values + /// and the + /// + [DataField] + public bool IgnoreResistances = false; + + /// + /// What kind of localized text should pop up when they interact with the entity + /// + [DataField] + public LocId? PopupText; + + /// + /// The sound that should be made when interacting with the entity + /// + [DataField] + public SoundSpecifier InteractSound = new SoundPathSpecifier("/Audio/Effects/lightburn.ogg"); + + /// + /// Generic boolean to toggle the damage application on and off + /// This is useful for things that can be toggled on or off, like a stovetop + /// + [DataField, AutoNetworkedField] + public bool IsDamageActive = true; +} diff --git a/Content.Shared/Damage/Components/DamageOnAttackedProtectionComponent.cs b/Content.Shared/Damage/Components/DamageOnAttackedProtectionComponent.cs new file mode 100644 index 0000000000..9581d20496 --- /dev/null +++ b/Content.Shared/Damage/Components/DamageOnAttackedProtectionComponent.cs @@ -0,0 +1,29 @@ +using Content.Shared.Inventory; +using Robust.Shared.GameStates; + +namespace Content.Shared.Damage.Components; + + +/// +/// This component is added to entities to protect them from being damaged +/// when attacking objects with the +/// If the entity has sufficient protection, the entity will take no damage. +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class DamageOnAttackedProtectionComponent : Component, IClothingSlots +{ + /// + /// How much and what kind of damage to protect the user from + /// when interacting with something with + /// + [DataField(required: true)] + public DamageModifierSet DamageProtection = default!; + + /// + /// Only protects if the item is in the correct slot + /// i.e. having gloves in your pocket doesn't protect you, it has to be on your hands + /// Set slots to NONE if it works while you hold the item in your main hand + /// + [DataField] + public SlotFlags Slots { get; set; } = SlotFlags.WITHOUT_POCKET; +} diff --git a/Content.Shared/Damage/Components/DamageOnInteractComponent.cs b/Content.Shared/Damage/Components/DamageOnInteractComponent.cs new file mode 100644 index 0000000000..9487dec8ef --- /dev/null +++ b/Content.Shared/Damage/Components/DamageOnInteractComponent.cs @@ -0,0 +1,47 @@ +using Robust.Shared.Audio; +using Robust.Shared.GameStates; + +namespace Content.Shared.Damage.Components; + + +/// +/// This component is added to entities that you want to damage the player +/// if the player interacts with it. For example, if a player tries touching +/// a hot light bulb or an anomaly. This damage can be cancelled if the user +/// has a component that protects them from this. +/// +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState] +public sealed partial class DamageOnInteractComponent : Component +{ + /// + /// How much damage to apply to the person making contact + /// + [DataField(required: true), AutoNetworkedField] + public DamageSpecifier Damage = default!; + + /// + /// Whether the damage should be resisted by a person's armor values + /// and the + /// + [DataField] + public bool IgnoreResistances; + + /// + /// What kind of localized text should pop up when they interact with the entity + /// + [DataField] + public LocId? PopupText; + + /// + /// The sound that should be made when interacting with the entity + /// + [DataField] + public SoundSpecifier InteractSound = new SoundPathSpecifier("/Audio/Effects/lightburn.ogg"); + + /// + /// Generic boolean to toggle the damage application on and off + /// This is useful for things that can be toggled on or off, like a stovetop + /// + [DataField, AutoNetworkedField] + public bool IsDamageActive = true; +} diff --git a/Content.Shared/Damage/Components/DamageOnInteractProtectionComponent.cs b/Content.Shared/Damage/Components/DamageOnInteractProtectionComponent.cs new file mode 100644 index 0000000000..f57c3d22c1 --- /dev/null +++ b/Content.Shared/Damage/Components/DamageOnInteractProtectionComponent.cs @@ -0,0 +1,29 @@ +using Content.Shared.Inventory; +using Robust.Shared.GameStates; + +namespace Content.Shared.Damage.Components; + + +/// +/// This component is added to entities to protect them from being damaged +/// when interacting with objects with the +/// If the entity has sufficient protection, interaction with the object is not cancelled. +/// This allows the user to do things like remove a lightbulb. +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class DamageOnInteractProtectionComponent : Component, IClothingSlots +{ + /// + /// How much and what kind of damage to protect the user from + /// when interacting with something with + /// + [DataField(required: true)] + public DamageModifierSet DamageProtection = default!; + + /// + /// Only protects if the item is in the correct slot + /// i.e. having gloves in your pocket doesn't protect you, it has to be on your hands + /// + [DataField] + public SlotFlags Slots { get; set; } = SlotFlags.GLOVES; +} diff --git a/Content.Shared/Damage/Systems/DamageOnAttackedSystem.cs b/Content.Shared/Damage/Systems/DamageOnAttackedSystem.cs new file mode 100644 index 0000000000..ab5866c5aa --- /dev/null +++ b/Content.Shared/Damage/Systems/DamageOnAttackedSystem.cs @@ -0,0 +1,99 @@ +using Content.Shared.Administration.Logs; +using Content.Shared.Damage.Components; +using Content.Shared.Database; +using Content.Shared.Hands.Components; +using Content.Shared.Hands.EntitySystems; +using Content.Shared.Inventory; +using Content.Shared.Popups; +using Content.Shared.Weapons.Melee.Events; +using Robust.Shared.Audio.Systems; +using Robust.Shared.Network; +using Robust.Shared.Timing; + +namespace Content.Shared.Damage.Systems; + +public sealed class DamageOnAttackedSystem : EntitySystem +{ + [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; + [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private readonly INetManager _net = default!; + [Dependency] private readonly DamageableSystem _damageableSystem = default!; + [Dependency] private readonly SharedAudioSystem _audioSystem = default!; + [Dependency] private readonly SharedPopupSystem _popupSystem = default!; + [Dependency] private readonly InventorySystem _inventorySystem = default!; + [Dependency] private readonly SharedHandsSystem _handsSystem = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnAttacked); + } + + /// + /// Damages the user that attacks the entity and potentially + /// plays a sound or pops up text in response + /// + /// The entity being hit + /// Contains the user that hit the entity + private void OnAttacked(Entity entity, ref AttackedEvent args) + { + if (!entity.Comp.IsDamageActive) + return; + + var totalDamage = entity.Comp.Damage; + + if (!entity.Comp.IgnoreResistances) + { + // try to get the damage on attacked protection component from something the entity has in their inventory + _inventorySystem.TryGetInventoryEntity(args.User, out var protectiveEntity); + + // if comp is null that means the user didn't have anything equipped that protected them + // let's check their hands to see if the thing they attacked with gives them protection, like the GORILLA gauntlet + if (protectiveEntity.Comp == null && TryComp(args.User, out var handsComp)) + { + if (_handsSystem.TryGetActiveItem((args.User, handsComp), out var itemInHand) && + TryComp(itemInHand, out var itemProtectComp) + && itemProtectComp.Slots == SlotFlags.NONE) + { + protectiveEntity = (itemInHand.Value, itemProtectComp); + } + } + + // if comp is null, that means both the inventory and hands had nothing to protect them + // let's check if the entity itself has the protective comp, like with borgs + if (protectiveEntity.Comp == null && + TryComp(args.User, out var protectiveComp)) + { + protectiveEntity = (args.User, protectiveComp); + } + + // if comp is NOT NULL that means they have damage protection! + if (protectiveEntity.Comp != null) + { + totalDamage = DamageSpecifier.ApplyModifierSet(totalDamage, protectiveEntity.Comp.DamageProtection); + } + } + + totalDamage = _damageableSystem.TryChangeDamage(args.User, totalDamage, entity.Comp.IgnoreResistances, origin: entity); + + if (totalDamage != null && totalDamage.AnyPositive()) + { + _adminLogger.Add(LogType.Damaged, $"{ToPrettyString(args.User):user} injured themselves by attacking {ToPrettyString(entity):target} and received {totalDamage.GetTotal():damage} damage"); + _audioSystem.PlayPredicted(entity.Comp.InteractSound, entity, args.User); + + if (entity.Comp.PopupText != null) + _popupSystem.PopupClient(Loc.GetString(entity.Comp.PopupText), args.User, args.User); + + } + } + + public void SetIsDamageActiveTo(Entity entity, bool mode) + { + if (entity.Comp.IsDamageActive == mode) + return; + + entity.Comp.IsDamageActive = mode; + Dirty(entity); + } +} diff --git a/Content.Shared/Damage/Systems/DamageOnInteractSystem.cs b/Content.Shared/Damage/Systems/DamageOnInteractSystem.cs new file mode 100644 index 0000000000..4b50a1fd0e --- /dev/null +++ b/Content.Shared/Damage/Systems/DamageOnInteractSystem.cs @@ -0,0 +1,85 @@ +using Content.Shared.Administration.Logs; +using Content.Shared.Damage.Components; +using Content.Shared.Database; +using Content.Shared.Interaction; +using Content.Shared.Inventory; +using Content.Shared.Popups; +using Robust.Shared.Audio.Systems; +using Robust.Shared.Network; +using Robust.Shared.Timing; + +namespace Content.Shared.Damage.Systems; + +public sealed class DamageOnInteractSystem : EntitySystem +{ + [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; + [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private readonly INetManager _net = default!; + [Dependency] private readonly DamageableSystem _damageableSystem = default!; + [Dependency] private readonly SharedAudioSystem _audioSystem = default!; + [Dependency] private readonly SharedPopupSystem _popupSystem = default!; + [Dependency] private readonly InventorySystem _inventorySystem = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnHandInteract); + } + + /// + /// Damages the user that interacts with the entity with an empty hand and + /// plays a sound or pops up text in response. If the user does not have + /// proper protection, the user will only be damaged and other interactions + /// will be cancelled. + /// + /// The entity being interacted with + /// Contains the user that interacted with the entity + private void OnHandInteract(Entity entity, ref InteractHandEvent args) + { + if (!entity.Comp.IsDamageActive) + return; + + var totalDamage = entity.Comp.Damage; + + if (!entity.Comp.IgnoreResistances) + { + // try to get damage on interact protection from either the inventory slots of the entity + _inventorySystem.TryGetInventoryEntity(args.User, out var protectiveEntity); + + // or checking the entity for the comp itself if the inventory didn't work + if (protectiveEntity.Comp == null && TryComp(args.User, out var protectiveComp)) + { + protectiveEntity = (args.User, protectiveComp); + } + + // if protectiveComp isn't null after all that, it means the user has protection, + // so let's calculate how much they resist + if (protectiveEntity.Comp != null) + { + totalDamage = DamageSpecifier.ApplyModifierSet(totalDamage, protectiveEntity.Comp.DamageProtection); + } + } + + totalDamage = _damageableSystem.TryChangeDamage(args.User, totalDamage, origin: args.Target); + + if (totalDamage != null && totalDamage.AnyPositive()) + { + args.Handled = true; + _adminLogger.Add(LogType.Damaged, $"{ToPrettyString(args.User):user} injured their hand by interacting with {ToPrettyString(args.Target):target} and received {totalDamage.GetTotal():damage} damage"); + _audioSystem.PlayPredicted(entity.Comp.InteractSound, args.Target, args.User); + + if (entity.Comp.PopupText != null) + _popupSystem.PopupClient(Loc.GetString(entity.Comp.PopupText), args.User, args.User); + } + } + + public void SetIsDamageActiveTo(Entity entity, bool mode) + { + if (entity.Comp.IsDamageActive == mode) + return; + + entity.Comp.IsDamageActive = mode; + Dirty(entity); + } +} diff --git a/Content.Shared/Inventory/InventorySystem.Slots.cs b/Content.Shared/Inventory/InventorySystem.Slots.cs index 228b788722..2522dd5d0a 100644 --- a/Content.Shared/Inventory/InventorySystem.Slots.cs +++ b/Content.Shared/Inventory/InventorySystem.Slots.cs @@ -30,7 +30,7 @@ public partial class InventorySystem : EntitySystem /// /// Tries to find an entity in the specified slot with the specified component. /// - public bool TryGetInventoryEntity(Entity entity, out EntityUid targetUid) + public bool TryGetInventoryEntity(Entity entity, out Entity target) where T : IComponent, IClothingSlots { if (TryGetContainerSlotEnumerator(entity.Owner, out var containerSlotEnumerator)) @@ -43,12 +43,12 @@ public partial class InventorySystem : EntitySystem if ((((IClothingSlots) required).Slots & slot.SlotFlags) == 0x0) continue; - targetUid = item; + target = (item, required); return true; } } - targetUid = EntityUid.Invalid; + target = EntityUid.Invalid; return false; } diff --git a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml index 02cf0ab6f6..c1a53ccf6e 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/base_clothinghands.yml @@ -23,6 +23,10 @@ tags: - ClothMade - WhitelistChameleon + - type: DamageOnInteractProtection + damageProtection: + flatReductions: + Heat: 5 # the average lightbulb only does around four damage! - type: entity abstract: true diff --git a/Resources/Prototypes/Entities/Clothing/Hands/colored.yml b/Resources/Prototypes/Entities/Clothing/Hands/colored.yml index 0fa298b648..556442cee1 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/colored.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/colored.yml @@ -283,8 +283,6 @@ color: "#535353" - type: Clothing sprite: Clothing/Hands/Gloves/Color/black.rsi - - type: GloveHeatResistance - heatResistance: 1400 - type: Butcherable butcheringType: Knife spawned: @@ -305,8 +303,6 @@ sprite: Clothing/Hands/Gloves/Color/yellow.rsi - type: Clothing sprite: Clothing/Hands/Gloves/Color/yellow.rsi - - type: GloveHeatResistance - heatResistance: 1400 - type: Butcherable butcheringType: Knife spawned: @@ -323,9 +319,6 @@ name: budget insulated gloves description: These gloves are cheap knockoffs of the coveted ones - no way this can end badly. components: - - type: GloveHeatResistance - # can't take out lights using budgets - heatResistance: 0 - type: RandomInsulation # Why repeated numbers? So some numbers are more common, of course! list: diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml index f1d9988465..53a165cd57 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml @@ -103,8 +103,6 @@ sprite: Clothing/Hands/Gloves/captain.rsi - type: Clothing sprite: Clothing/Hands/Gloves/captain.rsi - - type: GloveHeatResistance - heatResistance: 1400 - type: Insulated - type: Fiber fiberMaterial: fibers-durathread @@ -169,8 +167,6 @@ sprite: Clothing/Hands/Gloves/leather.rsi - type: Clothing sprite: Clothing/Hands/Gloves/leather.rsi - - type: GloveHeatResistance - heatResistance: 1400 - type: Fiber fiberMaterial: fibers-leather fiberColor: fibers-brown @@ -225,8 +221,6 @@ enum.ToggleVisuals.Layer: True: {state: icon-green} False: {state: icon} - - type: GloveHeatResistance - heatResistance: 1400 - type: Insulated - type: Fiber fiberMaterial: fibers-nanomachines @@ -270,8 +264,6 @@ sprite: Clothing/Hands/Gloves/combat.rsi - type: Clothing sprite: Clothing/Hands/Gloves/combat.rsi - - type: GloveHeatResistance - heatResistance: 1400 - type: Insulated - type: Fiber fiberMaterial: fibers-insulative @@ -287,8 +279,6 @@ sprite: Clothing/Hands/Gloves/tacticalmaidgloves.rsi - type: Clothing sprite: Clothing/Hands/Gloves/tacticalmaidgloves.rsi - - type: GloveHeatResistance - heatResistance: 1400 - type: Insulated - type: Fiber fiberColor: fibers-black @@ -324,6 +314,10 @@ - type: Fiber fiberMaterial: fibers-synthetic fiberColor: fibers-black + - type: DamageOnInteractProtection + damageProtection: + flatReductions: + Heat: 0 # no protection - type: entity parent: ClothingHandsBase @@ -338,6 +332,10 @@ - type: Fiber fiberMaterial: fibers-insulative fiberColor: fibers-yellow + - type: DamageOnInteractProtection + damageProtection: + flatReductions: + Heat: 0 # no protection - type: entity parent: ClothingHandsButcherable @@ -352,6 +350,10 @@ - type: Fiber fiberMaterial: fibers-insulative fiberColor: fibers-olive + - type: DamageOnInteractProtection + damageProtection: + flatReductions: + Heat: 0 # no protection - type: entity # Intentionally named after regular gloves, they're meant to be sneaky. diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml index 7c264a596a..5df6adffec 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml @@ -136,6 +136,11 @@ - WhitelistChameleon - type: ClothingRequiredStepTriggerImmune slots: WITHOUT_POCKET + - type: DamageOnInteractProtection + damageProtection: + flatReductions: + Heat: 10 # the average lightbulb only does around four damage! + slots: OUTERCLOTHING - type: entity abstract: true @@ -156,6 +161,11 @@ size: Huge - type: ClothingRequiredStepTriggerImmune slots: WITHOUT_POCKET + - type: DamageOnInteractProtection + damageProtection: + flatReductions: + Heat: 10 # the average lightbulb only does around four damage! + slots: OUTERCLOTHING - type: entity parent: ClothingOuterBase diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml index 0b1f200d4b..371c102eb0 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml @@ -230,6 +230,10 @@ - Cyborgs - Robotics - type: StepTriggerImmune + - type: DamageOnInteractProtection + damageProtection: + flatReductions: + Heat: 10 # capable of touching light bulbs and stoves without feeling pain! - type: entity abstract: true diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml b/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml index 6f9935d351..1db787a66d 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/behonker.yml @@ -110,9 +110,6 @@ collection: BananiumHorn params: volume: 5 - anomalyContactDamage: - types: - Radiation: 10 - type: Input context: "human" - type: Bloodstream @@ -158,9 +155,6 @@ suffix: "Ice" components: - type: Anomaly - anomalyContactDamage: - types: - Cold: 10 - type: ExplosionAnomaly supercriticalExplosion: Cryo explosionTotalIntensity: 1000 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml b/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml index 99f874406b..929f509710 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml @@ -147,3 +147,10 @@ - type: ContainerContainer containers: core_slot: !type:ContainerSlot + - type: DamageOnAttackedProtection + damageProtection: + flatReductions: + Heat: 100 + Cold: 100 + Radiation: 100 + slots: NONE diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml index 0bab2c828d..838cde619f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml @@ -154,7 +154,7 @@ - type: DisarmMalus - type: entity - name: The Throngler + name: Throngler parent: BaseSword id: Throngler description: Why would you make this? @@ -180,3 +180,6 @@ size: Ginormous sprite: Objects/Weapons/Melee/Throngler-in-hand.rsi - type: DisarmMalus + - type: Grammar + attributes: + proper: true diff --git a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml index 436eaa2697..f684ca3425 100644 --- a/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml +++ b/Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml @@ -89,9 +89,6 @@ enabled: false - type: PoweredLight bulb: Tube - damage: - types: - Heat: 2 - type: ContainerContainer containers: light_bulb: !type:ContainerSlot @@ -117,6 +114,11 @@ on: base broken: broken burned: burned + - type: DamageOnInteract + damage: + types: + Heat: 2 + popupText: powered-light-component-burn-hand - type: entity id: Poweredlight @@ -130,15 +132,17 @@ enabled: true - type: PoweredLight hasLampOnSpawn: LightTube - damage: - types: - Heat: 2 - type: AmbientOnPowered - type: AmbientSound volume: -15 range: 2 sound: path: /Audio/Ambience/Objects/light_hum.ogg + - type: DamageOnInteract + damage: + types: + Heat: 2 + popupText: powered-light-component-burn-hand #LED lights - type: entity @@ -149,14 +153,16 @@ components: - type: PoweredLight hasLampOnSpawn: LedLightTube - damage: - types: - Heat: 1 #LEDs don't get as hot - type: PointLight radius: 15 energy: 1 softness: 0.9 color: "#EEEEFF" + - type: DamageOnInteract + damage: + types: + Heat: 1 # LEDs don't get as hot + popupText: powered-light-component-burn-hand - type: entity parent: AlwaysPoweredWallLight @@ -178,9 +184,11 @@ components: - type: PoweredLight hasLampOnSpawn: ExteriorLightTube + - type: DamageOnInteract damage: types: - Heat: 4 #brighter light gets hotter + Heat: 4 # brighter light gets hotter + popupText: powered-light-component-burn-hand - type: entity parent: AlwaysPoweredWallLight @@ -202,14 +210,16 @@ components: - type: PoweredLight hasLampOnSpawn: SodiumLightTube - damage: - types: - Heat: 2 - type: PointLight radius: 10 energy: 2.5 softness: 0.9 color: "#FFAF38" + - type: DamageOnInteract + damage: + types: + Heat: 2 + popupText: powered-light-component-burn-hand - type: entity parent: AlwaysPoweredWallLight @@ -289,9 +299,6 @@ light_bulb: !type:ContainerSlot - type: PoweredLight bulb: Bulb - damage: - types: - Heat: 2 - type: ApcPowerReceiver - type: ExtensionCableReceiver - type: DeviceNetwork @@ -312,6 +319,11 @@ - On - Off - Toggle + - type: DamageOnInteract + damage: + types: + Heat: 2 + popupText: powered-light-component-burn-hand - type: entity id: PoweredLEDSmallLight @@ -328,9 +340,11 @@ color: "#EEEEFF" - type: PoweredLight hasLampOnSpawn: LedLightBulb + - type: DamageOnInteract damage: types: Heat: 1 + popupText: powered-light-component-burn-hand - type: entity id: PoweredSmallLight @@ -343,9 +357,11 @@ enabled: true - type: PoweredLight hasLampOnSpawn: LightBulb + - type: DamageOnInteract damage: types: Heat: 2 + popupText: powered-light-component-burn-hand #Emergency Lights - type: entity @@ -398,14 +414,16 @@ components: - type: PoweredLight hasLampOnSpawn: LightTubeCrystalCyan - damage: - types: - Heat: 2 - type: PointLight radius: 8 energy: 3 softness: 0.5 color: "#47f8ff" + - type: DamageOnInteract + damage: + types: + Heat: 2 + popupText: powered-light-component-burn-hand - type: entity id: AlwaysPoweredlightCyan @@ -425,14 +443,16 @@ components: - type: PoweredLight hasLampOnSpawn: LightTubeCrystalBlue - damage: - types: - Heat: 2 - type: PointLight radius: 8 energy: 3 softness: 0.5 color: "#39a1ff" + - type: DamageOnInteract + damage: + types: + Heat: 2 + popupText: powered-light-component-burn-hand - type: entity id: AlwaysPoweredlightBlue @@ -452,14 +472,16 @@ components: - type: PoweredLight hasLampOnSpawn: LightTubeCrystalPink - damage: - types: - Heat: 2 - type: PointLight radius: 8 energy: 3 softness: 0.5 color: "#ff66cc" + - type: DamageOnInteract + damage: + types: + Heat: 2 + popupText: powered-light-component-burn-hand - type: entity id: AlwaysPoweredlightPink @@ -479,14 +501,16 @@ components: - type: PoweredLight hasLampOnSpawn: LightTubeCrystalOrange - damage: - types: - Heat: 2 - type: PointLight radius: 8 energy: 3 softness: 0.5 color: "#ff8227" + - type: DamageOnInteract + damage: + types: + Heat: 2 + popupText: powered-light-component-burn-hand - type: entity id: AlwaysPoweredlightOrange @@ -506,14 +530,16 @@ components: - type: PoweredLight hasLampOnSpawn: LightTubeCrystalRed - damage: - types: - Heat: 2 - type: PointLight radius: 8 energy: 3 softness: 0.5 color: "#fb4747" + - type: DamageOnInteract + damage: + types: + Heat: 2 + popupText: powered-light-component-burn-hand - type: entity id: AlwaysPoweredlightRed @@ -533,14 +559,16 @@ components: - type: PoweredLight hasLampOnSpawn: LightTubeCrystalGreen - damage: - types: - Heat: 2 - type: PointLight radius: 8 energy: 3 softness: 0.5 color: "#52ff39" + - type: DamageOnInteract + damage: + types: + Heat: 2 + popupText: powered-light-component-burn-hand - type: entity id: AlwaysPoweredlightGreen diff --git a/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml index 2afde4ef3f..0771cb71bc 100644 --- a/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml +++ b/Resources/Prototypes/Entities/Structures/Lighting/ground_lighting.yml @@ -77,9 +77,6 @@ enabled: false - type: PoweredLight bulb: Tube - damage: - types: - Heat: 2 - type: ContainerContainer containers: light_bulb: !type:ContainerSlot @@ -108,6 +105,11 @@ on: base broken: broken burned: burned + - type: DamageOnInteract + damage: + types: + Heat: 2 + popupText: powered-light-component-burn-hand - type: entity id: PoweredLightPostSmall @@ -122,9 +124,6 @@ enabled: true - type: PoweredLight hasLampOnSpawn: LightTube - damage: - types: - Heat: 2 - type: StaticPrice price: 25 - type: AmbientOnPowered @@ -133,6 +132,11 @@ range: 3 sound: path: /Audio/Ambience/Objects/light_hum.ogg + - type: DamageOnInteract + damage: + types: + Heat: 2 + popupText: powered-light-component-burn-hand - type: entity id: PoweredLEDLightPostSmall @@ -151,9 +155,6 @@ color: "#EEEEFF" - type: PoweredLight hasLampOnSpawn: LedLightTube - damage: - types: - Heat: 1 - type: StaticPrice price: 25 - type: AmbientOnPowered @@ -162,3 +163,8 @@ range: 3 sound: path: /Audio/Ambience/Objects/light_hum.ogg + - type: DamageOnInteract + damage: + types: + Heat: 1 + popupText: powered-light-component-burn-hand diff --git a/Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml index 72f5439646..50e24eab73 100644 --- a/Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml +++ b/Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml @@ -87,9 +87,6 @@ - type: PoweredLight bulb: Bulb on: false - damage: - types: - Heat: 2 - type: ApcPowerReceiver - type: ExtensionCableReceiver - type: DeviceNetwork @@ -113,6 +110,11 @@ - type: Construction graph: LightFixture node: strobeLight + - type: DamageOnInteract + damage: + types: + Heat: 2 + popupText: powered-light-component-burn-hand - type: entity id: PoweredStrobeLightPolice diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml index 8bca49c4e5..a16aaaabbb 100644 --- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml +++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml @@ -9,9 +9,6 @@ collection: RadiationPulse params: volume: 5 - anomalyContactDamage: - types: - Radiation: 10 - type: AmbientSound range: 5 volume: -5 @@ -51,6 +48,15 @@ - type: SecretDataAnomaly randomStartSecretMin: 0 randomStartSecretMax: 2 + - type: DamageOnInteract + damage: + types: + Radiation: 10 + popupText: anomaly-component-contact-damage + - type: DamageOnAttacked + damage: + types: + Radiation: 10 - type: entity id: AnomalyPyroclastic @@ -99,6 +105,15 @@ - type: IgniteOnCollide fixtureId: fix1 fireStacks: 1 + - type: DamageOnInteract + damage: + types: + Heat: 10 + popupText: anomaly-component-contact-damage + - type: DamageOnAttacked + damage: + types: + Heat: 10 - type: entity id: AnomalyGravity @@ -294,9 +309,6 @@ collection: RadiationPulse params: volume: 5 - anomalyContactDamage: - types: - Radiation: 10 - type: entity id: AnomalyIce @@ -319,9 +331,6 @@ - type: Anomaly corePrototype: AnomalyCoreIce coreInertPrototype: AnomalyCoreIceInert - anomalyContactDamage: - types: - Cold: 10 - type: ExplosionAnomaly supercriticalExplosion: Cryo explosionTotalIntensity: 300 @@ -345,6 +354,15 @@ releasedGas: 8 # Frezon. Please replace if there is a better way to specify this releaseOnMaxSeverity: true spawnRadius: 0 + - type: DamageOnInteract + damage: + types: + Cold: 10 + popupText: anomaly-component-contact-damage + - type: DamageOnAttacked + damage: + types: + Cold: 10 - type: entity id: AnomalyRockBase @@ -609,9 +627,6 @@ coreInertPrototype: AnomalyCoreFloraInert minPulseLength: 60 maxPulseLength: 120 - anomalyContactDamage: - types: - Slash: 0 - type: TileSpawnAnomaly entries: - settings: @@ -715,9 +730,6 @@ coreInertPrototype: AnomalyCoreLiquidInert minPulseLength: 60 maxPulseLength: 120 - anomalyContactDamage: - types: - Slash: 1 - type: EntitySpawnAnomaly entries: - settings: @@ -829,9 +841,6 @@ coreInertPrototype: AnomalyCoreShadowInert minPulseLength: 60 maxPulseLength: 120 - anomalyContactDamage: - types: - Cold: 10 animationTime: 4 offset: "-0.1,0.1" - type: EntitySpawnAnomaly @@ -857,3 +866,12 @@ - type: Tag tags: - SpookyFog + - type: DamageOnInteract + damage: + types: + Cold: 10 + popupText: anomaly-component-contact-damage + - type: DamageOnAttacked + damage: + types: + Cold: 10 diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/service_light.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/service_light.yml index b8aaa60c37..baadcb67db 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/service_light.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/service_light.yml @@ -24,6 +24,8 @@ bulb: Bulb on: false hasLampOnSpawn: ServiceLightBulb + - type: DamageOnInteract damage: types: Heat: 5 + popupText: powered-light-component-burn-hand From d1a60fafe78c4b3b8cf521601506b92840c2afe3 Mon Sep 17 00:00:00 2001 From: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com> Date: Fri, 9 Aug 2024 08:33:25 +0300 Subject: [PATCH 282/422] Implement a playerpanel (#30238) * Basic structure for the player panel ui * Ensure basic functionality Player panel now receives and displays basic info * Make whitelistcommands accept user ids * Make PlayerPanel use GUIDs where possible * Add functionality to most playerpanel buttons * Implement remaining playerpanel features * Localize everything * Finish up * Put command arguments in quotes I am not sure if it's even possible to have something like a space in them considering they are guids and usernames but sure why not * Make playerpanel a verb * Add Logs button to player panel * Change Notesbutton text and make whitelistbutton a confirmtion button * Add freeze button that does not mute the player * Add sharedconnections counter to playerpanel * Make the playetime format clearer * Allow for copying of the a player's username * Do minor cleanup * Rearrange buttons * Fix unfreeze button not updating * Fix wrong localisation text * "Fix" the same role ban counting multiple times The way rolebans are stored is horrible. As such if you ban someone from a departmenrt or something role bans are individually placed for every role. The only way I found to distinguish them is the bantime. This is horrible but I do not want to rewrite how all the bans are stored right now. * Add Delete and Rejuvenate buttons to player panel By popular demand * Marginally improve ui * Add logs * review update * Fix verb * Fix double notes --------- Co-authored-by: metalgearsloth --- .../UI/PlayerPanel/PlayerPanel.xaml | 36 +++ .../UI/PlayerPanel/PlayerPanel.xaml.cs | 132 +++++++++++ .../UI/PlayerPanel/PlayerPanelEui.cs | 72 ++++++ .../Commands/PlayerPanelCommand.cs | 56 +++++ .../Administration/PlayerPanelEui.cs | 210 ++++++++++++++++++ .../Administration/Systems/AdminVerbSystem.cs | 9 + Content.Server/Whitelist/WhitelistCommands.cs | 4 +- .../Administration/PlayerPanelEuiState.cs | 54 +++++ .../en-US/administration/ui/actions.ftl | 1 + .../en-US/administration/ui/player-panel.ftl | 22 ++ .../Locale/en-US/connection-messages.ftl | 4 +- Resources/Locale/en-US/info/playerpanel.ftl | 7 + 12 files changed, 603 insertions(+), 4 deletions(-) create mode 100644 Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml create mode 100644 Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml.cs create mode 100644 Content.Client/Administration/UI/PlayerPanel/PlayerPanelEui.cs create mode 100644 Content.Server/Administration/Commands/PlayerPanelCommand.cs create mode 100644 Content.Server/Administration/PlayerPanelEui.cs create mode 100644 Content.Shared/Administration/PlayerPanelEuiState.cs create mode 100644 Resources/Locale/en-US/administration/ui/player-panel.ftl create mode 100644 Resources/Locale/en-US/info/playerpanel.ftl diff --git a/Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml b/Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml new file mode 100644 index 0000000000..8feec273b4 --- /dev/null +++ b/Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml @@ -0,0 +1,36 @@ + + + + public void PrintFile(EntityUid uid, FaxMachineComponent component, FaxFileMessage args) { - string prototype; - if (args.OfficePaper) - prototype = OfficePaperPrototypeId; - else - prototype = DefaultPaperPrototypeId; + var prototype = args.OfficePaper ? component.PrintOfficePaperId : component.PrintPaperId; var name = Loc.GetString("fax-machine-printed-paper-name"); @@ -441,7 +428,8 @@ public sealed class FaxSystem : EntitySystem // Unfortunately, since a paper entity does not yet exist, we have to emulate what LabelSystem will do. var nameWithLabel = (args.Label is { } label) ? $"{name} ({label})" : name; - _adminLogger.Add(LogType.Action, LogImpact.Low, + _adminLogger.Add(LogType.Action, + LogImpact.Low, $"{ToPrettyString(args.Actor):actor} " + $"added print job to \"{component.FaxName}\" {ToPrettyString(uid):tool} " + $"of {nameWithLabel}: {args.Content}"); @@ -471,7 +459,7 @@ public sealed class FaxSystem : EntitySystem var printout = new FaxPrintout(paper.Content, nameMod?.BaseName ?? metadata.EntityName, labelComponent?.CurrentLabel, - metadata.EntityPrototype?.ID ?? DefaultPaperPrototypeId, + metadata.EntityPrototype?.ID ?? component.PrintPaperId, paper.StampState, paper.StampedBy, paper.EditingDisabled); @@ -484,7 +472,8 @@ public sealed class FaxSystem : EntitySystem UpdateUserInterface(uid, component); - _adminLogger.Add(LogType.Action, LogImpact.Low, + _adminLogger.Add(LogType.Action, + LogImpact.Low, $"{ToPrettyString(args.Actor):actor} " + $"added copy job to \"{component.FaxName}\" {ToPrettyString(uid):tool} " + $"of {ToPrettyString(sendEntity):subject}: {printout.Content}"); @@ -531,7 +520,7 @@ public sealed class FaxSystem : EntitySystem // TODO: Ideally, we could just make a copy of the whole entity when it's // faxed, in order to preserve visuals, etc.. This functionality isn't // available yet, so we'll pass along the originating prototypeId and fall - // back to DefaultPaperPrototypeId in SpawnPaperFromQueue if we can't find one here. + // back to component.PrintPaperId in SpawnPaperFromQueue if we can't find one here. payload[FaxConstants.FaxPaperPrototypeData] = metadata.EntityPrototype.ID; } @@ -543,7 +532,8 @@ public sealed class FaxSystem : EntitySystem _deviceNetworkSystem.QueuePacket(uid, component.DestinationFaxAddress, payload); - _adminLogger.Add(LogType.Action, LogImpact.Low, + _adminLogger.Add(LogType.Action, + LogImpact.Low, $"{ToPrettyString(args.Actor):actor} " + $"sent fax from \"{component.FaxName}\" {ToPrettyString(uid):tool} " + $"to \"{faxName}\" ({component.DestinationFaxAddress}) " + @@ -585,7 +575,7 @@ public sealed class FaxSystem : EntitySystem var printout = component.PrintingQueue.Dequeue(); - var entityToSpawn = printout.PrototypeId.Length == 0 ? DefaultPaperPrototypeId : printout.PrototypeId; + var entityToSpawn = printout.PrototypeId.Length == 0 ? component.PrintPaperId.ToString() : printout.PrototypeId; var printed = EntityManager.SpawnEntity(entityToSpawn, Transform(uid).Coordinates); if (TryComp(printed, out var paper)) diff --git a/Content.Shared/Fax/Components/FaxMachineComponent.cs b/Content.Shared/Fax/Components/FaxMachineComponent.cs index 1c08986508..161c878e27 100644 --- a/Content.Shared/Fax/Components/FaxMachineComponent.cs +++ b/Content.Shared/Fax/Components/FaxMachineComponent.cs @@ -127,6 +127,20 @@ public sealed partial class FaxMachineComponent : Component /// [ViewVariables] public float PrintingTime = 2.3f; + + /// + /// The prototype ID to use for faxed or copied entities if we can't get one from + /// the paper entity for whatever reason. + /// + [DataField] + public EntProtoId PrintPaperId = "Paper"; + + /// + /// The prototype ID to use for faxed or copied entities if we can't get one from + /// the paper entity for whatever reason of the Office type. + /// + [DataField] + public EntProtoId PrintOfficePaperId = "PaperOffice"; } [DataDefinition] From e6d6416a190654f496ac57bf6db28f2cacc7ace4 Mon Sep 17 00:00:00 2001 From: Plykiya <58439124+Plykiya@users.noreply.github.com> Date: Thu, 8 Aug 2024 23:00:40 -0700 Subject: [PATCH 291/422] Add minimum required trigger speed to mouse traps (#30593) Co-authored-by: plykiya --- Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml b/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml index d97cae2e6d..1de5037918 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml @@ -12,7 +12,7 @@ map: ["base"] - type: StepTrigger intersectRatio: 0.2 - requiredTriggeredSpeed: 0 + requiredTriggeredSpeed: 2 - type: Mousetrap - type: TriggerOnStepTrigger - type: ClothingRequiredStepTrigger From eab0c348224eef52082a39379866d298ca0dbdcd Mon Sep 17 00:00:00 2001 From: Thomas <87614336+Aeshus@users.noreply.github.com> Date: Fri, 9 Aug 2024 01:05:51 -0500 Subject: [PATCH 292/422] Create In-Guidebook Errors (#28942) * Create in-guidebook errors * Localize client-facing parser error * Uncomment line * Missed another localization string --- .../Guidebook/Controls/GuidebookError.xaml | 41 ++++ .../Guidebook/Controls/GuidebookError.xaml.cs | 23 +++ .../Controls/GuidebookWindow.xaml.cs | 55 ++--- .../Guidebook/DocumentParsingManager.cs | 79 +++++--- .../DocumentParsingManager.static.cs | 188 ++++++++++++------ .../Locale/en-US/guidebook/guidebook.ftl | 2 + 6 files changed, 271 insertions(+), 117 deletions(-) create mode 100644 Content.Client/Guidebook/Controls/GuidebookError.xaml create mode 100644 Content.Client/Guidebook/Controls/GuidebookError.xaml.cs diff --git a/Content.Client/Guidebook/Controls/GuidebookError.xaml b/Content.Client/Guidebook/Controls/GuidebookError.xaml new file mode 100644 index 0000000000..b84d527ea0 --- /dev/null +++ b/Content.Client/Guidebook/Controls/GuidebookError.xaml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Content.Client/Guidebook/Controls/GuidebookError.xaml.cs b/Content.Client/Guidebook/Controls/GuidebookError.xaml.cs new file mode 100644 index 0000000000..461f196c83 --- /dev/null +++ b/Content.Client/Guidebook/Controls/GuidebookError.xaml.cs @@ -0,0 +1,23 @@ +using JetBrains.Annotations; +using Robust.Client.AutoGenerated; +using Robust.Client.UserInterface.Controls; +using Robust.Client.UserInterface.XAML; + +namespace Content.Client.Guidebook.Controls; + +[UsedImplicitly] [GenerateTypedNameReferences] +public sealed partial class GuidebookError : BoxContainer +{ + public GuidebookError() + { + RobustXamlLoader.Load(this); + } + + public GuidebookError(string original, string? error) : this() + { + Original.AddText(original); + + if (error is not null) + Error.AddText(error); + } +} diff --git a/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs b/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs index c904a9c789..469b0ed222 100644 --- a/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs +++ b/Content.Client/Guidebook/Controls/GuidebookWindow.xaml.cs @@ -4,12 +4,10 @@ using Content.Client.UserInterface.ControlExtensions; using Content.Client.UserInterface.Controls; using Content.Client.UserInterface.Controls.FancyTree; using Content.Client.UserInterface.Systems.Info; -using Content.Shared.CCVar; using Content.Shared.Guidebook; using Robust.Client.AutoGenerated; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.XAML; -using Robust.Shared.Configuration; using Robust.Shared.ContentPack; using Robust.Shared.Prototypes; @@ -18,15 +16,18 @@ namespace Content.Client.Guidebook.Controls; [GenerateTypedNameReferences] public sealed partial class GuidebookWindow : FancyWindow, ILinkClickHandler { - [Dependency] private readonly IResourceManager _resourceManager = default!; [Dependency] private readonly DocumentParsingManager _parsingMan = default!; + [Dependency] private readonly IResourceManager _resourceManager = default!; private Dictionary, GuideEntry> _entries = new(); + private readonly ISawmill _sawmill; + public GuidebookWindow() { RobustXamlLoader.Load(this); IoCManager.InjectDependencies(this); + _sawmill = Logger.GetSawmill("Guidebook"); Tree.OnSelectedItemChanged += OnSelectionChanged; @@ -36,6 +37,20 @@ public sealed partial class GuidebookWindow : FancyWindow, ILinkClickHandler }; } + public void HandleClick(string link) + { + if (!_entries.TryGetValue(link, out var entry)) + return; + + if (Tree.TryGetIndexFromMetadata(entry, out var index)) + { + Tree.ExpandParentEntries(index.Value); + Tree.SetSelectedIndex(index); + } + else + ShowGuide(entry); + } + private void OnSelectionChanged(TreeItem? item) { if (item != null && item.Metadata is GuideEntry entry) @@ -71,8 +86,9 @@ public sealed partial class GuidebookWindow : FancyWindow, ILinkClickHandler if (!_parsingMan.TryAddMarkup(EntryContainer, file.ReadToEnd())) { - EntryContainer.AddChild(new Label() { Text = "ERROR: Failed to parse document." }); - Logger.Error($"Failed to parse contents of guide document {entry.Id}."); + // The guidebook will automatically display the in-guidebook error if it fails + + _sawmill.Error($"Failed to parse contents of guide document {entry.Id}."); } } @@ -124,8 +140,10 @@ public sealed partial class GuidebookWindow : FancyWindow, ILinkClickHandler entry.Children = sortedChildren; } + entries.ExceptWith(entry.Children); } + rootEntries = entries.ToList(); } @@ -135,21 +153,25 @@ public sealed partial class GuidebookWindow : FancyWindow, ILinkClickHandler .ThenBy(rootEntry => Loc.GetString(rootEntry.Name)); } - private void RepopulateTree(List>? roots = null, ProtoId? forcedRoot = null) + private void RepopulateTree(List>? roots = null, + ProtoId? forcedRoot = null) { Tree.Clear(); HashSet> addedEntries = new(); - TreeItem? parent = forcedRoot == null ? null : AddEntry(forcedRoot.Value, null, addedEntries); + var parent = forcedRoot == null ? null : AddEntry(forcedRoot.Value, null, addedEntries); foreach (var entry in GetSortedEntries(roots)) { AddEntry(entry.Id, parent, addedEntries); } + Tree.SetAllExpanded(true); } - private TreeItem? AddEntry(ProtoId id, TreeItem? parent, HashSet> addedEntries) + private TreeItem? AddEntry(ProtoId id, + TreeItem? parent, + HashSet> addedEntries) { if (!_entries.TryGetValue(id, out var entry)) return null; @@ -179,22 +201,6 @@ public sealed partial class GuidebookWindow : FancyWindow, ILinkClickHandler return item; } - public void HandleClick(string link) - { - if (!_entries.TryGetValue(link, out var entry)) - return; - - if (Tree.TryGetIndexFromMetadata(entry, out var index)) - { - Tree.ExpandParentEntries(index.Value); - Tree.SetSelectedIndex(index); - } - else - { - ShowGuide(entry); - } - } - private void HandleFilter() { var emptySearch = SearchBar.Text.Trim().Length == 0; @@ -208,6 +214,5 @@ public sealed partial class GuidebookWindow : FancyWindow, ILinkClickHandler element.SetHiddenState(true, SearchBar.Text.Trim()); } } - } } diff --git a/Content.Client/Guidebook/DocumentParsingManager.cs b/Content.Client/Guidebook/DocumentParsingManager.cs index e8a0743b9e..857ae55202 100644 --- a/Content.Client/Guidebook/DocumentParsingManager.cs +++ b/Content.Client/Guidebook/DocumentParsingManager.cs @@ -1,4 +1,5 @@ using System.Linq; +using Content.Client.Guidebook.Controls; using Content.Client.Guidebook.Richtext; using Content.Shared.Guidebook; using Pidgin; @@ -7,6 +8,7 @@ using Robust.Shared.ContentPack; using Robust.Shared.Prototypes; using Robust.Shared.Reflection; using Robust.Shared.Sandboxing; +using Robust.Shared.Utility; using static Pidgin.Parser; namespace Content.Client.Guidebook; @@ -22,8 +24,10 @@ public sealed partial class DocumentParsingManager [Dependency] private readonly ISandboxHelper _sandboxHelper = default!; private readonly Dictionary> _tagControlParsers = new(); - private Parser _tagParser = default!; private Parser _controlParser = default!; + + private ISawmill _sawmill = default!; + private Parser _tagParser = default!; public Parser> ControlParser = default!; public void Initialize() @@ -32,7 +36,8 @@ public sealed partial class DocumentParsingManager .Assert(_tagControlParsers.ContainsKey, tag => $"unknown tag: {tag}") .Bind(tag => _tagControlParsers[tag]); - _controlParser = OneOf(_tagParser, TryHeaderControl, ListControlParser, TextControlParser).Before(SkipWhitespaces); + _controlParser = OneOf(_tagParser, TryHeaderControl, ListControlParser, TextControlParser) + .Before(SkipWhitespaces); foreach (var typ in _reflectionManager.GetAllChildren()) { @@ -40,6 +45,8 @@ public sealed partial class DocumentParsingManager } ControlParser = SkipWhitespaces.Then(_controlParser.Many()); + + _sawmill = Logger.GetSawmill("Guidebook"); } public bool TryAddMarkup(Control control, ProtoId entryId, bool log = true) @@ -68,37 +75,57 @@ public sealed partial class DocumentParsingManager } catch (Exception e) { - if (log) - Logger.Error($"Encountered error while generating markup controls: {e}"); + _sawmill.Error($"Encountered error while generating markup controls: {e}"); + + control.AddChild(new GuidebookError(text, e.ToStringBetter())); + return false; } return true; } - private Parser CreateTagControlParser(string tagId, Type tagType, ISandboxHelper sandbox) => Map( - (args, controls) => - { - var tag = (IDocumentTag) sandbox.CreateInstance(tagType); - if (!tag.TryParseTag(args, out var control)) - { - Logger.Error($"Failed to parse {tagId} args"); - return new Control(); - } + private Parser CreateTagControlParser(string tagId, Type tagType, ISandboxHelper sandbox) + { + return Map( + (args, controls) => + { + try + { + var tag = (IDocumentTag) sandbox.CreateInstance(tagType); + if (!tag.TryParseTag(args, out var control)) + { + _sawmill.Error($"Failed to parse {tagId} args"); + return new GuidebookError(args.ToString() ?? tagId, $"Failed to parse {tagId} args"); + } - foreach (var child in controls) - { - control.AddChild(child); - } - return control; - }, - ParseTagArgs(tagId), - TagContentParser(tagId)).Labelled($"{tagId} control"); + foreach (var child in controls) + { + control.AddChild(child); + } + + return control; + } + catch (Exception e) + { + var output = args.Aggregate(string.Empty, + (current, pair) => current + $"{pair.Key}=\"{pair.Value}\" "); + + _sawmill.Error($"Tag: {tagId} \n Arguments: {output}/>"); + return new GuidebookError($"Tag: {tagId}\nArguments: {output}", e.ToString()); + } + }, + ParseTagArgs(tagId), + TagContentParser(tagId)) + .Labelled($"{tagId} control"); + } // Parse a bunch of controls until we encounter a matching closing tag. - private Parser> TagContentParser(string tag) => - OneOf( - Try(ImmediateTagEnd).ThenReturn(Enumerable.Empty()), - TagEnd.Then(_controlParser.Until(TryTagTerminator(tag)).Labelled($"{tag} children")) - ); + private Parser> TagContentParser(string tag) + { + return OneOf( + Try(ImmediateTagEnd).ThenReturn(Enumerable.Empty()), + TagEnd.Then(_controlParser.Until(TryTagTerminator(tag)).Labelled($"{tag} children")) + ); + } } diff --git a/Content.Client/Guidebook/DocumentParsingManager.static.cs b/Content.Client/Guidebook/DocumentParsingManager.static.cs index ab38fcb154..5d25d8f645 100644 --- a/Content.Client/Guidebook/DocumentParsingManager.static.cs +++ b/Content.Client/Guidebook/DocumentParsingManager.static.cs @@ -1,4 +1,5 @@ using System.Linq; +using Content.Client.Guidebook.Controls; using Pidgin; using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; @@ -14,92 +15,142 @@ public sealed partial class DocumentParsingManager { private const string ListBullet = " › "; - #region Text Parsing - #region Basic Text Parsing - // Try look for an escaped character. If found, skip the escaping slash and return the character. - private static readonly Parser TryEscapedChar = Try(Char('\\').Then(OneOf( - Try(Char('<')), - Try(Char('>')), - Try(Char('\\')), - Try(Char('-')), - Try(Char('=')), - Try(Char('"')), - Try(Char(' ')), - Try(Char('n')).ThenReturn('\n'), - Try(Char('t')).ThenReturn('\t') - ))); + // Parser that consumes a - and then just parses normal rich text with some prefix text (a bullet point). + private static readonly Parser TryEscapedChar = Try(Char('\\') + .Then(OneOf( + Try(Char('<')), + Try(Char('>')), + Try(Char('\\')), + Try(Char('-')), + Try(Char('=')), + Try(Char('"')), + Try(Char(' ')), + Try(Char('n')).ThenReturn('\n'), + Try(Char('t')).ThenReturn('\t') + ))); private static readonly Parser SkipNewline = Whitespace.SkipUntil(Char('\n')); - private static readonly Parser TrySingleNewlineToSpace = Try(SkipNewline).Then(SkipWhitespaces).ThenReturn(' '); + private static readonly Parser TrySingleNewlineToSpace = + Try(SkipNewline).Then(SkipWhitespaces).ThenReturn(' '); private static readonly Parser TextChar = OneOf( TryEscapedChar, // consume any backslashed being used to escape text TrySingleNewlineToSpace, // turn single newlines into spaces Any // just return the character. - ); + ); - // like TextChar, but not skipping whitespace around newlines private static readonly Parser QuotedTextChar = OneOf(TryEscapedChar, Any); + private static readonly Parser QuotedText = + Char('"').Then(QuotedTextChar.Until(Try(Char('"'))).Select(string.Concat)).Labelled("quoted text"); + + private static readonly Parser TryStartList = + Try(SkipNewline.Then(SkipWhitespaces).Then(Char('-'))).Then(SkipWhitespaces); + + private static readonly Parser TryStartTag = Try(Char('<')).Then(SkipWhitespaces); + + private static readonly Parser TryStartParagraph = + Try(SkipNewline.Then(SkipNewline)).Then(SkipWhitespaces); + + private static readonly Parser TryLookTextEnd = + Lookahead(OneOf(TryStartTag, TryStartList, TryStartParagraph, Try(Whitespace.SkipUntil(End)))); + + private static readonly Parser TextParser = + TextChar.AtLeastOnceUntil(TryLookTextEnd).Select(string.Concat); + + private static readonly Parser TextControlParser = Try(Map(text => + { + var rt = new RichTextLabel + { + HorizontalExpand = true, + Margin = new Thickness(0, 0, 0, 15.0f) + }; + + var msg = new FormattedMessage(); + // THANK YOU RICHTEXT VERY COOL + // (text doesn't default to white). + msg.PushColor(Color.White); + + // If the parsing fails, don't throw an error and instead make an inline error message + string? error; + if (!msg.TryAddMarkup(text, out error)) + { + Logger.GetSawmill("Guidebook").Error("Failed to parse RichText in Guidebook"); + + return new GuidebookError(text, error); + } + + msg.Pop(); + rt.SetMessage(msg); + return rt; + }, + TextParser) + .Cast()) + .Labelled("richtext"); + + private static readonly Parser HeaderControlParser = Try(Char('#')) + .Then(SkipWhitespaces.Then(Map(text => new Label + { + Text = text, + StyleClasses = { "LabelHeadingBigger" } + }, + AnyCharExcept('\n').AtLeastOnceString()) + .Cast())) + .Labelled("header"); + + private static readonly Parser SubHeaderControlParser = Try(String("##")) + .Then(SkipWhitespaces.Then(Map(text => new Label + { + Text = text, + StyleClasses = { "LabelHeading" } + }, + AnyCharExcept('\n').AtLeastOnceString()) + .Cast())) + .Labelled("subheader"); + + private static readonly Parser TryHeaderControl = OneOf(SubHeaderControlParser, HeaderControlParser); + + private static readonly Parser ListControlParser = Try(Char('-')) + .Then(SkipWhitespaces) + .Then(Map( + control => new BoxContainer + { + Children = { new Label { Text = ListBullet, VerticalAlignment = VAlignment.Top }, control }, + Orientation = LayoutOrientation.Horizontal + }, + TextControlParser) + .Cast()) + .Labelled("list"); + + #region Text Parsing + + #region Basic Text Parsing + + // Try look for an escaped character. If found, skip the escaping slash and return the character. + + + // like TextChar, but not skipping whitespace around newlines + + // Quoted text - private static readonly Parser QuotedText = Char('"').Then(QuotedTextChar.Until(Try(Char('"'))).Select(string.Concat)).Labelled("quoted text"); + #endregion #region rich text-end markers - private static readonly Parser TryStartList = Try(SkipNewline.Then(SkipWhitespaces).Then(Char('-'))).Then(SkipWhitespaces); - private static readonly Parser TryStartTag = Try(Char('<')).Then(SkipWhitespaces); - private static readonly Parser TryStartParagraph = Try(SkipNewline.Then(SkipNewline)).Then(SkipWhitespaces); - private static readonly Parser TryLookTextEnd = Lookahead(OneOf(TryStartTag, TryStartList, TryStartParagraph, Try(Whitespace.SkipUntil(End)))); + #endregion // parses text characters until it hits a text-end - private static readonly Parser TextParser = TextChar.AtLeastOnceUntil(TryLookTextEnd).Select(string.Concat); - private static readonly Parser TextControlParser = Try(Map(text => - { - var rt = new RichTextLabel() - { - HorizontalExpand = true, - Margin = new Thickness(0, 0, 0, 15.0f), - }; - - var msg = new FormattedMessage(); - // THANK YOU RICHTEXT VERY COOL - // (text doesn't default to white). - msg.PushColor(Color.White); - msg.AddMarkup(text); - msg.Pop(); - rt.SetMessage(msg); - return rt; - }, TextParser).Cast()).Labelled("richtext"); #endregion #region Headers - private static readonly Parser HeaderControlParser = Try(Char('#')).Then(SkipWhitespaces.Then(Map(text => new Label() - { - Text = text, - StyleClasses = { "LabelHeadingBigger" } - }, AnyCharExcept('\n').AtLeastOnceString()).Cast())).Labelled("header"); - private static readonly Parser SubHeaderControlParser = Try(String("##")).Then(SkipWhitespaces.Then(Map(text => new Label() - { - Text = text, - StyleClasses = { "LabelHeading" } - }, AnyCharExcept('\n').AtLeastOnceString()).Cast())).Labelled("subheader"); - - private static readonly Parser TryHeaderControl = OneOf(SubHeaderControlParser, HeaderControlParser); #endregion - // Parser that consumes a - and then just parses normal rich text with some prefix text (a bullet point). - private static readonly Parser ListControlParser = Try(Char('-')).Then(SkipWhitespaces).Then(Map( - control => new BoxContainer() - { - Children = { new Label() { Text = ListBullet, VerticalAlignment = VAlignment.Top, }, control }, - Orientation = LayoutOrientation.Horizontal, - }, TextControlParser).Cast()).Labelled("list"); - #region Tag Parsing + // closing brackets for tags private static readonly Parser TagEnd = Char('>').Then(SkipWhitespaces); private static readonly Parser ImmediateTagEnd = String("/>").Then(SkipWhitespaces); @@ -107,20 +158,24 @@ public sealed partial class DocumentParsingManager private static readonly Parser TryLookTagEnd = Lookahead(OneOf(Try(TagEnd), Try(ImmediateTagEnd))); //parse tag argument key. any normal text character up until we hit a "=" - private static readonly Parser TagArgKey = LetterOrDigit.Until(Char('=')).Select(string.Concat).Labelled("tag argument key"); + private static readonly Parser TagArgKey = + LetterOrDigit.Until(Char('=')).Select(string.Concat).Labelled("tag argument key"); // parser for a singular tag argument. Note that each TryQuoteOrChar will consume a whole quoted block before the Until() looks for whitespace - private static readonly Parser TagArgParser = Map((key, value) => (key, value), TagArgKey, QuotedText).Before(SkipWhitespaces); + private static readonly Parser TagArgParser = + Map((key, value) => (key, value), TagArgKey, QuotedText).Before(SkipWhitespaces); // parser for all tag arguments - private static readonly Parser> TagArgsParser = TagArgParser.Until(TryLookTagEnd); + private static readonly Parser> TagArgsParser = + TagArgParser.Until(TryLookTagEnd); // parser for an opening tag. private static readonly Parser TryOpeningTag = Try(Char('<')) - .Then(SkipWhitespaces) - .Then(TextChar.Until(OneOf(Whitespace.SkipAtLeastOnce(), TryLookTagEnd))) - .Select(string.Concat).Labelled($"opening tag"); + .Then(SkipWhitespaces) + .Then(TextChar.Until(OneOf(Whitespace.SkipAtLeastOnce(), TryLookTagEnd))) + .Select(string.Concat) + .Labelled("opening tag"); private static Parser> ParseTagArgs(string tag) { @@ -138,5 +193,6 @@ public sealed partial class DocumentParsingManager .Then(TagEnd) .Labelled($"closing {tag} tag"); } + #endregion } diff --git a/Resources/Locale/en-US/guidebook/guidebook.ftl b/Resources/Locale/en-US/guidebook/guidebook.ftl index f7f37948f5..b6c99766c6 100644 --- a/Resources/Locale/en-US/guidebook/guidebook.ftl +++ b/Resources/Locale/en-US/guidebook/guidebook.ftl @@ -3,6 +3,8 @@ guidebook-placeholder-text = Select an entry. guidebook-placeholder-text-2 = If you're new, head over to "New? Start here!" guidebook-filter-placeholder-text = Filter items +guidebook-parser-error = Parser Error +guidebook-error-message = Error Message guidebook-monkey-unspin = Unspin Monkey guidebook-monkey-disco = Disco Monkey From e0d30aff4eb1b3d23fa917500a0ede7d2cc6d1b9 Mon Sep 17 00:00:00 2001 From: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Date: Fri, 9 Aug 2024 08:14:07 +0200 Subject: [PATCH 293/422] Add tooltips to the agent ID job icons and improve status icon prototypes (#28575) * add tooltips to agentid job icons * forgot to stage this * make StatusIconPrototype abstract * minor visual improvements * cleanup * use currentculture to sort job names * review --- .../UI/AgentIDCardBoundUserInterface.cs | 4 +- .../Access/UI/AgentIDCardWindow.xaml | 11 +- .../Access/UI/AgentIDCardWindow.xaml.cs | 22 +-- .../CrewManifest/UI/CrewManifestSection.cs | 2 +- .../CrewMonitoringWindow.xaml.cs | 2 +- .../Overlays/EntityHealthBarOverlay.cs | 2 +- .../Overlays/ShowHealthIconsSystem.cs | 6 +- Content.Client/Overlays/ShowJobIconsSystem.cs | 4 +- .../Overlays/ShowSyndicateIconsSystem.cs | 2 +- .../Access/Components/AgentIDCardComponent.cs | 20 +- .../Access/Systems/AgentIDCardSystem.cs | 4 +- .../Medical/SuitSensors/SuitSensorSystem.cs | 3 +- .../Access/Components/IdCardComponent.cs | 16 +- .../Access/SharedAgentIDCardSystem.cs | 8 +- .../Access/Systems/SharedIdCardSystem.cs | 2 +- .../Damage/Components/DamageableComponent.cs | 4 +- .../Components/MindShieldComponent.cs | 2 +- .../NukeOps/NukeOperativeComponent.cs | 2 +- .../Nutrition/EntitySystems/HungerSystem.cs | 14 +- .../Nutrition/EntitySystems/ThirstSystem.cs | 14 +- .../Overlays/ShowHealthBarsComponent.cs | 2 +- .../Components/HeadRevolutionaryComponent.cs | 2 +- .../Components/RevolutionaryComponent.cs | 2 +- Content.Shared/Roles/JobPrototype.cs | 2 +- .../SSDIndicator/SSDIndicatorComponent.cs | 2 +- .../Components/CriminalRecordComponent.cs | 2 +- .../StatusIcon/StatusIconPrototype.cs | 130 ++++++++++++- .../Zombies/InitialInfectedComponent.cs | 2 +- Content.Shared/Zombies/ZombieComponent.cs | 2 +- Resources/Locale/en-US/job/job-names.ftl | 12 ++ .../Objects/Misc/identification_cards.yml | 48 ----- .../StatusIcon/StatusEffects/health.yml | 10 +- .../{hunger.yml => satiation.yml} | 16 +- .../StatusIcon/StatusEffects/ssd.yml | 2 +- Resources/Prototypes/StatusIcon/debug.yml | 6 +- .../StatusIcon/{antag.yml => faction.yml} | 20 +- Resources/Prototypes/StatusIcon/job.yml | 172 ++++++++++++------ Resources/Prototypes/StatusIcon/security.yml | 22 ++- 38 files changed, 362 insertions(+), 236 deletions(-) rename Resources/Prototypes/StatusIcon/StatusEffects/{hunger.yml => satiation.yml} (84%) rename Resources/Prototypes/StatusIcon/{antag.yml => faction.yml} (77%) diff --git a/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs b/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs index 50add43dc9..050756fcd1 100644 --- a/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs +++ b/Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs @@ -38,7 +38,7 @@ namespace Content.Client.Access.UI SendMessage(new AgentIDCardJobChangedMessage(newJob)); } - public void OnJobIconChanged(ProtoId newJobIconId) + public void OnJobIconChanged(ProtoId newJobIconId) { SendMessage(new AgentIDCardJobIconChangedMessage(newJobIconId)); } @@ -55,7 +55,7 @@ namespace Content.Client.Access.UI _window.SetCurrentName(cast.CurrentName); _window.SetCurrentJob(cast.CurrentJob); - _window.SetAllowedIcons(cast.Icons, cast.CurrentJobIconId); + _window.SetAllowedIcons(cast.CurrentJobIconId); } } } diff --git a/Content.Client/Access/UI/AgentIDCardWindow.xaml b/Content.Client/Access/UI/AgentIDCardWindow.xaml index 89de793714..7d091e4e16 100644 --- a/Content.Client/Access/UI/AgentIDCardWindow.xaml +++ b/Content.Client/Access/UI/AgentIDCardWindow.xaml @@ -6,12 +6,9 @@ [DataField, ViewVariables(VVAccess.ReadWrite)] - public ProtoId StatusIcon { get; set; } = "HeadRevolutionaryFaction"; + public ProtoId StatusIcon { get; set; } = "HeadRevolutionaryFaction"; /// /// How long the stun will last after the user is converted. diff --git a/Content.Shared/Revolutionary/Components/RevolutionaryComponent.cs b/Content.Shared/Revolutionary/Components/RevolutionaryComponent.cs index 1f6b45ddea..513e8897bd 100644 --- a/Content.Shared/Revolutionary/Components/RevolutionaryComponent.cs +++ b/Content.Shared/Revolutionary/Components/RevolutionaryComponent.cs @@ -16,7 +16,7 @@ public sealed partial class RevolutionaryComponent : Component /// The status icon prototype displayed for revolutionaries /// [DataField, ViewVariables(VVAccess.ReadWrite)] - public ProtoId StatusIcon { get; set; } = "RevolutionaryFaction"; + public ProtoId StatusIcon { get; set; } = "RevolutionaryFaction"; /// /// Sound that plays when you are chosen as Rev. (Placeholder until I find something cool I guess) diff --git a/Content.Shared/Roles/JobPrototype.cs b/Content.Shared/Roles/JobPrototype.cs index 71dba7449d..e7156b34c3 100644 --- a/Content.Shared/Roles/JobPrototype.cs +++ b/Content.Shared/Roles/JobPrototype.cs @@ -99,7 +99,7 @@ namespace Content.Shared.Roles public string? JobEntity = null; [DataField] - public ProtoId Icon { get; private set; } = "JobIconUnknown"; + public ProtoId Icon { get; private set; } = "JobIconUnknown"; [DataField("special", serverOnly: true)] public JobSpecial[] Special { get; private set; } = Array.Empty(); diff --git a/Content.Shared/SSDIndicator/SSDIndicatorComponent.cs b/Content.Shared/SSDIndicator/SSDIndicatorComponent.cs index ee67e3296f..634dfc397b 100644 --- a/Content.Shared/SSDIndicator/SSDIndicatorComponent.cs +++ b/Content.Shared/SSDIndicator/SSDIndicatorComponent.cs @@ -18,5 +18,5 @@ public sealed partial class SSDIndicatorComponent : Component [ViewVariables(VVAccess.ReadWrite)] [DataField] - public ProtoId Icon = "SSDIcon"; + public ProtoId Icon = "SSDIcon"; } diff --git a/Content.Shared/Security/Components/CriminalRecordComponent.cs b/Content.Shared/Security/Components/CriminalRecordComponent.cs index 25fab3f135..aa6bd6ad5b 100644 --- a/Content.Shared/Security/Components/CriminalRecordComponent.cs +++ b/Content.Shared/Security/Components/CriminalRecordComponent.cs @@ -11,5 +11,5 @@ public sealed partial class CriminalRecordComponent : Component /// The icon that should be displayed based on the criminal status of the entity. /// [DataField, AutoNetworkedField] - public ProtoId StatusIcon = "SecurityIconWanted"; + public ProtoId StatusIcon = "SecurityIconWanted"; } diff --git a/Content.Shared/StatusIcon/StatusIconPrototype.cs b/Content.Shared/StatusIcon/StatusIconPrototype.cs index 29a1b60114..af3cfb133b 100644 --- a/Content.Shared/StatusIcon/StatusIconPrototype.cs +++ b/Content.Shared/StatusIcon/StatusIconPrototype.cs @@ -73,7 +73,6 @@ public partial class StatusIconData : IComparable /// [DataField] public bool IsShaded = false; - public int CompareTo(StatusIconData? other) { return Priority.CompareTo(other?.Priority ?? int.MaxValue); @@ -83,11 +82,21 @@ public partial class StatusIconData : IComparable /// /// but in new convenient prototype form! /// -[Prototype("statusIcon")] -public sealed partial class StatusIconPrototype : StatusIconData, IPrototype, IInheritingPrototype +public abstract partial class StatusIconPrototype : StatusIconData, IPrototype +{ + /// + [IdDataField] + public string ID { get; private set; } = default!; +} + +/// +/// StatusIcons for showing jobs on the sec HUD +/// +[Prototype] +public sealed partial class JobIconPrototype : StatusIconPrototype, IInheritingPrototype { /// - [ParentDataField(typeof(AbstractPrototypeIdArraySerializer))] + [ParentDataField(typeof(AbstractPrototypeIdArraySerializer))] public string[]? Parents { get; } /// @@ -95,9 +104,116 @@ public sealed partial class StatusIconPrototype : StatusIconData, IPrototype, II [AbstractDataField] public bool Abstract { get; } - /// - [IdDataField] - public string ID { get; private set; } = default!; + /// + /// Name of the icon used for menu tooltips. + /// + [DataField] + public string JobName { get; private set; } = string.Empty; + + [ViewVariables(VVAccess.ReadOnly)] + public string LocalizedJobName => Loc.GetString(JobName); + + /// + /// Should the agent ID or ID card console be able to use this job icon? + /// + [DataField] + public bool AllowSelection = true; +} + +/// +/// StatusIcons for the med HUD +/// +[Prototype] +public sealed partial class HealthIconPrototype : StatusIconPrototype, IInheritingPrototype +{ + /// + [ParentDataField(typeof(AbstractPrototypeIdArraySerializer))] + public string[]? Parents { get; } + + /// + [NeverPushInheritance] + [AbstractDataField] + public bool Abstract { get; } +} + +/// +/// StatusIcons for the beer goggles and fried onion goggles +/// +[Prototype] +public sealed partial class SatiationIconPrototype : StatusIconPrototype, IInheritingPrototype +{ + /// + [ParentDataField(typeof(AbstractPrototypeIdArraySerializer))] + public string[]? Parents { get; } + + /// + [NeverPushInheritance] + [AbstractDataField] + public bool Abstract { get; } +} + +/// +/// StatusIcons for showing the wanted status on the sec HUD +/// +[Prototype] +public sealed partial class SecurityIconPrototype : StatusIconPrototype, IInheritingPrototype +{ + /// + [ParentDataField(typeof(AbstractPrototypeIdArraySerializer))] + public string[]? Parents { get; } + + /// + [NeverPushInheritance] + [AbstractDataField] + public bool Abstract { get; } +} + +/// +/// StatusIcons for faction membership +/// +[Prototype] +public sealed partial class FactionIconPrototype : StatusIconPrototype, IInheritingPrototype +{ + /// + [ParentDataField(typeof(AbstractPrototypeIdArraySerializer))] + public string[]? Parents { get; } + + /// + [NeverPushInheritance] + [AbstractDataField] + public bool Abstract { get; } +} + +/// +/// StatusIcons for debugging purposes +/// +[Prototype] +public sealed partial class DebugIconPrototype : StatusIconPrototype, IInheritingPrototype +{ + /// + [ParentDataField(typeof(AbstractPrototypeIdArraySerializer))] + public string[]? Parents { get; } + + /// + [NeverPushInheritance] + [AbstractDataField] + public bool Abstract { get; } +} + +/// +/// StatusIcons for the SSD indicator +/// +[Prototype] +public sealed partial class SsdIconPrototype : StatusIconPrototype, IInheritingPrototype +{ + /// + [ParentDataField(typeof(AbstractPrototypeIdArraySerializer))] + public string[]? Parents { get; } + + /// + [NeverPushInheritance] + [AbstractDataField] + public bool Abstract { get; } } [Serializable, NetSerializable] diff --git a/Content.Shared/Zombies/InitialInfectedComponent.cs b/Content.Shared/Zombies/InitialInfectedComponent.cs index 3149de63bd..b69d1515f2 100644 --- a/Content.Shared/Zombies/InitialInfectedComponent.cs +++ b/Content.Shared/Zombies/InitialInfectedComponent.cs @@ -8,5 +8,5 @@ namespace Content.Shared.Zombies; public sealed partial class InitialInfectedComponent : Component { [DataField] - public ProtoId StatusIcon = "InitialInfectedFaction"; + public ProtoId StatusIcon = "InitialInfectedFaction"; } diff --git a/Content.Shared/Zombies/ZombieComponent.cs b/Content.Shared/Zombies/ZombieComponent.cs index f510d65d6d..94e1e5afec 100644 --- a/Content.Shared/Zombies/ZombieComponent.cs +++ b/Content.Shared/Zombies/ZombieComponent.cs @@ -89,7 +89,7 @@ public sealed partial class ZombieComponent : Component public TimeSpan NextTick; [DataField("zombieStatusIcon")] - public ProtoId StatusIcon { get; set; } = "ZombieFaction"; + public ProtoId StatusIcon { get; set; } = "ZombieFaction"; /// /// Healing each second diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl index 1b89be0133..33e501cb69 100644 --- a/Resources/Locale/en-US/job/job-names.ftl +++ b/Resources/Locale/en-US/job/job-names.ftl @@ -47,6 +47,18 @@ job-name-boxer = Boxer job-name-zookeeper = Zookeeper job-name-visitor = Visitor +# unused jobs +# these are required for the agent ID job icon tooltips +# I am keeping them for roleplaying opportunities +job-name-geneticist = Geneticist +job-name-no-id = No ID +job-name-prisoner = Prisoner +job-name-roboticist = Roboticist +job-name-syndicate = Syndicate +job-name-unknown = Unknown +job-name-virologist = Virologist +job-name-zombie = Zombie + # Role timers - Make these alphabetical or I cut you JobAtmosphericTechnician = Atmospheric Technician JobBartender = Bartender diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index ff207a5a2a..39a0a49113 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -599,54 +599,6 @@ - state: default - state: idpassenger - type: AgentIDCard - icons: - # TODO figure out a better way of doing this. - # Probably by adding a bool or icon-category data-field to the icon prototype? - - JobIconDetective - - JobIconQuarterMaster - - JobIconBotanist - - JobIconBoxer - - JobIconAtmosphericTechnician - - JobIconNanotrasen - - JobIconPrisoner - - JobIconJanitor - - JobIconChemist - - JobIconStationEngineer - - JobIconSecurityOfficer - - JobIconChiefMedicalOfficer - - JobIconRoboticist - - JobIconChaplain - - JobIconLawyer - - JobIconUnknown - - JobIconLibrarian - - JobIconCargoTechnician - - JobIconScientist - - JobIconResearchAssistant - - JobIconGeneticist - - JobIconClown - - JobIconCaptain - - JobIconHeadOfPersonnel - - JobIconVirologist - - JobIconShaftMiner - - JobIconPassenger - - JobIconChiefEngineer - - JobIconBartender - - JobIconHeadOfSecurity - - JobIconMedicalDoctor - - JobIconParamedic - - JobIconChef - - JobIconWarden - - JobIconResearchDirector - - JobIconMime - - JobIconMusician - - JobIconReporter - - JobIconPsychologist - - JobIconMedicalIntern - - JobIconTechnicalAssistant - - JobIconServiceWorker - - JobIconSecurityCadet - - JobIconZookeeper - - JobIconVisitor - type: ActivatableUI key: enum.AgentIDCardUiKey.Key inHandsOnly: true diff --git a/Resources/Prototypes/StatusIcon/StatusEffects/health.yml b/Resources/Prototypes/StatusIcon/StatusEffects/health.yml index 073b03a2ae..de1b668480 100644 --- a/Resources/Prototypes/StatusIcon/StatusEffects/health.yml +++ b/Resources/Prototypes/StatusIcon/StatusEffects/health.yml @@ -1,32 +1,32 @@ -- type: statusIcon +- type: healthIcon id: HealthIcon abstract: true priority: 3 locationPreference: Left isShaded: true -- type: statusIcon +- type: healthIcon parent: HealthIcon id: HealthIconFine icon: sprite: /Textures/Interface/Misc/health_icons.rsi state: Fine -- type: statusIcon +- type: healthIcon id: HealthIconCritical parent: HealthIcon icon: sprite: /Textures/Interface/Misc/health_icons.rsi state: Critical -- type: statusIcon +- type: healthIcon id: HealthIconDead parent: HealthIcon icon: sprite: /Textures/Interface/Misc/health_icons.rsi state: Dead -- type: statusIcon +- type: healthIcon id: HealthIconRotting parent: HealthIcon icon: diff --git a/Resources/Prototypes/StatusIcon/StatusEffects/hunger.yml b/Resources/Prototypes/StatusIcon/StatusEffects/satiation.yml similarity index 84% rename from Resources/Prototypes/StatusIcon/StatusEffects/hunger.yml rename to Resources/Prototypes/StatusIcon/StatusEffects/satiation.yml index 9af246e06e..749d1f88f1 100644 --- a/Resources/Prototypes/StatusIcon/StatusEffects/hunger.yml +++ b/Resources/Prototypes/StatusIcon/StatusEffects/satiation.yml @@ -1,26 +1,26 @@ #Hunger -- type: statusIcon +- type: satiationIcon id: HungerIcon abstract: true priority: 5 locationPreference: Right isShaded: true -- type: statusIcon +- type: satiationIcon id: HungerIconOverfed parent: HungerIcon icon: sprite: /Textures/Interface/Misc/food_icons.rsi state: overfed -- type: statusIcon +- type: satiationIcon id: HungerIconPeckish parent: HungerIcon icon: sprite: /Textures/Interface/Misc/food_icons.rsi state: peckish -- type: statusIcon +- type: satiationIcon id: HungerIconStarving parent: HungerIcon icon: @@ -28,28 +28,28 @@ state: starving #Thirst -- type: statusIcon +- type: satiationIcon id: ThirstIcon abstract: true priority: 5 locationPreference: Left isShaded: true -- type: statusIcon +- type: satiationIcon id: ThirstIconOverhydrated parent: ThirstIcon icon: sprite: /Textures/Interface/Misc/food_icons.rsi state: overhydrated -- type: statusIcon +- type: satiationIcon id: ThirstIconThirsty parent: ThirstIcon icon: sprite: /Textures/Interface/Misc/food_icons.rsi state: thirsty -- type: statusIcon +- type: satiationIcon id: ThirstIconParched parent: ThirstIcon icon: diff --git a/Resources/Prototypes/StatusIcon/StatusEffects/ssd.yml b/Resources/Prototypes/StatusIcon/StatusEffects/ssd.yml index 70253cc6b1..1d04a5349e 100644 --- a/Resources/Prototypes/StatusIcon/StatusEffects/ssd.yml +++ b/Resources/Prototypes/StatusIcon/StatusEffects/ssd.yml @@ -1,4 +1,4 @@ -- type: statusIcon +- type: ssdIcon id: SSDIcon icon: sprite: /Textures/Effects/ssd.rsi diff --git a/Resources/Prototypes/StatusIcon/debug.yml b/Resources/Prototypes/StatusIcon/debug.yml index 2011c6ceea..24981746e7 100644 --- a/Resources/Prototypes/StatusIcon/debug.yml +++ b/Resources/Prototypes/StatusIcon/debug.yml @@ -1,17 +1,17 @@ -- type: statusIcon +- type: debugIcon id: DebugStatus icon: sprite: /Textures/Interface/Misc/research_disciplines.rsi state: civilianservices -- type: statusIcon +- type: debugIcon id: DebugStatus2 priority: 1 icon: sprite: /Textures/Interface/Misc/research_disciplines.rsi state: arsenal -- type: statusIcon +- type: debugIcon id: DebugStatus3 priority: 5 icon: diff --git a/Resources/Prototypes/StatusIcon/antag.yml b/Resources/Prototypes/StatusIcon/faction.yml similarity index 77% rename from Resources/Prototypes/StatusIcon/antag.yml rename to Resources/Prototypes/StatusIcon/faction.yml index c22a13a600..0b3bbe491c 100644 --- a/Resources/Prototypes/StatusIcon/antag.yml +++ b/Resources/Prototypes/StatusIcon/faction.yml @@ -1,4 +1,4 @@ -- type: statusIcon +- type: factionIcon id: ZombieFaction priority: 11 showTo: @@ -10,7 +10,7 @@ sprite: /Textures/Interface/Misc/job_icons.rsi state: Zombie -- type: statusIcon +- type: factionIcon id: InitialInfectedFaction priority: 11 showTo: @@ -21,7 +21,7 @@ sprite: /Textures/Interface/Misc/job_icons.rsi state: InitialInfected -- type: statusIcon +- type: factionIcon id: RevolutionaryFaction isShaded: true priority: 11 @@ -33,7 +33,7 @@ sprite: /Textures/Interface/Misc/job_icons.rsi state: Revolutionary -- type: statusIcon +- type: factionIcon id: HeadRevolutionaryFaction isShaded: true priority: 11 @@ -45,17 +45,7 @@ sprite: /Textures/Interface/Misc/job_icons.rsi state: HeadRevolutionary -- type: statusIcon - id: MindShieldIcon - priority: 2 - locationPreference: Right - layer: Mod - isShaded: true - icon: - sprite: /Textures/Interface/Misc/job_icons.rsi - state: MindShield - -- type: statusIcon +- type: factionIcon id: SyndicateFaction priority: 0 locationPreference: Left diff --git a/Resources/Prototypes/StatusIcon/job.yml b/Resources/Prototypes/StatusIcon/job.yml index 6275f0bc07..eb9896fc48 100644 --- a/Resources/Prototypes/StatusIcon/job.yml +++ b/Resources/Prototypes/StatusIcon/job.yml @@ -1,384 +1,446 @@ -- type: statusIcon +- type: jobIcon id: JobIcon abstract: true priority: 1 locationPreference: Right isShaded: true -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconDetective icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: Detective + jobName: job-name-detective -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconQuarterMaster icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: QuarterMaster + jobName: job-name-qm -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconBorg icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: Borg + jobName: job-name-borg -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconBotanist icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: Botanist + jobName: job-name-botanist -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconBoxer icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: Boxer + jobName: job-name-boxer -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconAtmosphericTechnician icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: AtmosphericTechnician + jobName: job-name-atmostech -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconNanotrasen icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: Nanotrasen + jobName: job-name-centcomoff -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconPrisoner icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: Prisoner + jobName: job-name-prisoner -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconJanitor icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: Janitor + jobName: job-name-janitor -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconChemist icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: Chemist + jobName: job-name-chemist -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconStationEngineer icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: StationEngineer + jobName: job-name-engineer -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconSecurityOfficer icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: SecurityOfficer + jobName: job-name-security -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconNoId icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: NoId + jobName: job-name-no-id -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconChiefMedicalOfficer icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: ChiefMedicalOfficer + jobName: job-name-cmo -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconRoboticist icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: Roboticist + jobName: job-name-roboticist -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconChaplain icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: Chaplain + jobName: job-name-chaplain -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconLawyer icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: Lawyer + jobName: job-name-lawyer -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconUnknown icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: Unknown + jobName: job-name-unknown -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconLibrarian icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: Librarian + jobName: job-name-librarian -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconCargoTechnician icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: CargoTechnician + jobName: job-name-cargotech -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconScientist icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: Scientist + jobName: job-name-scientist -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconResearchAssistant icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: ResearchAssistant + jobName: job-name-research-assistant -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconGeneticist icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: Geneticist + jobName: job-name-geneticist -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconClown icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: Clown + jobName: job-name-clown -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconCaptain icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: Captain + jobName: job-name-captain -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconHeadOfPersonnel icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: HeadOfPersonnel + jobName: job-name-hop -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconVirologist icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: Virologist + jobName: job-name-virologist -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconShaftMiner icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: ShaftMiner + jobName: job-name-salvagespec -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconPassenger icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: Passenger + jobName: job-name-passenger -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconChiefEngineer icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: ChiefEngineer + jobName: job-name-ce -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconBartender icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: Bartender + jobName: job-name-bartender -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconHeadOfSecurity icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: HeadOfSecurity + jobName: job-name-hos -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconBrigmedic icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: Brigmedic + jobName: job-name-brigmedic -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconMedicalDoctor icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: MedicalDoctor + jobName: job-name-doctor -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconParamedic icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: Paramedic + jobName: job-name-paramedic -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconChef icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: Chef + jobName: job-name-chef -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconWarden icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: Warden + jobName: job-name-warden -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconResearchDirector icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: ResearchDirector + jobName: job-name-rd -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconMime icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: Mime + jobName: job-name-mime -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconMusician icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: Musician + jobName: job-name-musician -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconReporter icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: Reporter + jobName: job-name-reporter -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconPsychologist icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: Psychologist + jobName: job-name-psychologist -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconMedicalIntern icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: MedicalIntern + jobName: job-name-intern -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconTechnicalAssistant icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: TechnicalAssistant + jobName: job-name-technical-assistant -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconServiceWorker icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: ServiceWorker + jobName: job-name-serviceworker -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconSecurityCadet icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: SecurityCadet + jobName: job-name-cadet -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconZombie # This is a perfectly legitimate profession to pursue icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: Zombie + jobName: job-name-zombie -- type: statusIcon +- type: jobIcon + parent: JobIcon + id: JobIconSyndicate # Just in case you want to make it official which side you are on + icon: + sprite: /Textures/Interface/Misc/job_icons.rsi + state: Syndicate + jobName: job-name-syndicate + +- type: jobIcon parent: JobIcon id: JobIconZookeeper icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: Zookeeper + jobName: job-name-zookeeper -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconSeniorPhysician icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: SeniorPhysician + allowSelection: false -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconSeniorOfficer icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: SeniorOfficer + allowSelection: false -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconSeniorEngineer icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: SeniorEngineer + allowSelection: false -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconSeniorResearcher icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: SeniorResearcher + allowSelection: false -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconVisitor icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: Visitor + jobName: job-name-visitor -- type: statusIcon +- type: jobIcon parent: JobIcon id: JobIconAdmin icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: Admin + allowSelection: false diff --git a/Resources/Prototypes/StatusIcon/security.yml b/Resources/Prototypes/StatusIcon/security.yml index 00119fb44d..430e9c4f98 100644 --- a/Resources/Prototypes/StatusIcon/security.yml +++ b/Resources/Prototypes/StatusIcon/security.yml @@ -1,4 +1,4 @@ -- type: statusIcon +- type: securityIcon id: SecurityIcon abstract: true priority: 3 @@ -6,37 +6,47 @@ locationPreference: Right isShaded: true -- type: statusIcon +- type: securityIcon parent: SecurityIcon id: SecurityIconDischarged icon: sprite: /Textures/Interface/Misc/security_icons.rsi state: hud_discharged -- type: statusIcon +- type: securityIcon parent: SecurityIcon id: SecurityIconIncarcerated icon: sprite: /Textures/Interface/Misc/security_icons.rsi state: hud_incarcerated -- type: statusIcon +- type: securityIcon parent: SecurityIcon id: SecurityIconParoled icon: sprite: /Textures/Interface/Misc/security_icons.rsi state: hud_paroled -- type: statusIcon +- type: securityIcon parent: SecurityIcon id: SecurityIconSuspected icon: sprite: /Textures/Interface/Misc/security_icons.rsi state: hud_suspected -- type: statusIcon +- type: securityIcon parent: SecurityIcon id: SecurityIconWanted icon: sprite: /Textures/Interface/Misc/security_icons.rsi state: hud_wanted + +- type: securityIcon + id: MindShieldIcon + priority: 2 + locationPreference: Right + layer: Mod + isShaded: true + icon: + sprite: /Textures/Interface/Misc/job_icons.rsi + state: MindShield From 8d96c993a2408b145f0f674d3f229e42749dc41f Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 9 Aug 2024 06:15:13 +0000 Subject: [PATCH 294/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 20541d4dc9..a683140339 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Moomoobeef - changes: - - message: CentCom has now started hiring crew who are short-sighted. - type: Add - id: 6569 - time: '2024-05-10T01:40:49.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26037 - author: whateverusername0 changes: - message: Traitors now know their employers. @@ -3795,3 +3788,10 @@ id: 7068 time: '2024-08-09T05:45:51.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30745 +- author: slarticodefast + changes: + - message: Added tooltips to the agent ID job icons + type: Add + id: 7069 + time: '2024-08-09T06:14:07.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/28575 From 4c4cdb5b061d4be049faadbe20e7c4b6ee3679bf Mon Sep 17 00:00:00 2001 From: Simon <63975668+Simyon264@users.noreply.github.com> Date: Fri, 9 Aug 2024 08:16:22 +0200 Subject: [PATCH 295/422] UI to edit silicon laws from admin verb (#28483) * UI to edit silicon laws from admin verb (peak shitcode) * Improve UI * Use Moderator admin flag * Reviews --- .../SiliconLawEditUi/SiliconLawContainer.xaml | 31 +++++++ .../SiliconLawContainer.xaml.cs | 61 +++++++++++++ .../Laws/SiliconLawEditUi/SiliconLawEui.cs | 38 ++++++++ .../Laws/SiliconLawEditUi/SiliconLawUi.xaml | 22 +++++ .../SiliconLawEditUi/SiliconLawUi.xaml.cs | 89 +++++++++++++++++++ Content.Client/Stylesheets/StyleNano.cs | 5 ++ .../Administration/Systems/AdminVerbSystem.cs | 24 +++++ Content.Server/Silicons/Laws/SiliconLawEui.cs | 70 +++++++++++++++ .../Silicons/Laws/SiliconLawSystem.cs | 16 ++++ .../Silicons/Laws/SiliconLawEditEuiState.cs | 29 ++++++ .../administration/ui/silicon-law-ui.ftl | 10 +++ 11 files changed, 395 insertions(+) create mode 100644 Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawContainer.xaml create mode 100644 Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawContainer.xaml.cs create mode 100644 Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawEui.cs create mode 100644 Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawUi.xaml create mode 100644 Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawUi.xaml.cs create mode 100644 Content.Server/Silicons/Laws/SiliconLawEui.cs create mode 100644 Content.Shared/Silicons/Laws/SiliconLawEditEuiState.cs create mode 100644 Resources/Locale/en-US/administration/ui/silicon-law-ui.ftl diff --git a/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawContainer.xaml b/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawContainer.xaml new file mode 100644 index 0000000000..1bcac4bca6 --- /dev/null +++ b/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawContainer.xaml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawContainer.xaml.cs b/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawContainer.xaml.cs new file mode 100644 index 0000000000..2e44b820df --- /dev/null +++ b/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawContainer.xaml.cs @@ -0,0 +1,61 @@ +using Content.Shared.Silicons.Laws; +using Robust.Client.AutoGenerated; +using Robust.Client.UserInterface.Controls; +using Robust.Client.UserInterface.XAML; +using Robust.Shared.Utility; + +namespace Content.Client.Silicons.Laws.SiliconLawEditUi; + +[GenerateTypedNameReferences] +public sealed partial class SiliconLawContainer : BoxContainer +{ + public const string StyleClassSiliconLawPositionLabel = "SiliconLawPositionLabel"; + + public static readonly string CorruptedString = + Loc.GetString("ion-storm-law-scrambled-number", ("length", 5)); + + private SiliconLaw? _law; + + public event Action? MoveLawUp; + public event Action? MoveLawDown; + public event Action? DeleteAction; + + + public SiliconLawContainer() + { + RobustXamlLoader.Load(this); + + MoveUp.OnPressed += _ => MoveLawUp?.Invoke(_law!); + MoveDown.OnPressed += _ => MoveLawDown?.Invoke(_law!); + Corrupted.OnPressed += _ => + { + if (Corrupted.Pressed) + { + _law!.LawIdentifierOverride = CorruptedString; + } + else + { + _law!.LawIdentifierOverride = null; + } + }; + + LawContent.OnTextChanged += _ => _law!.LawString = Rope.Collapse(LawContent.TextRope).Trim(); + LawContent.Placeholder = new Rope.Leaf(Loc.GetString("silicon-law-ui-placeholder")); + Delete.OnPressed += _ => DeleteAction?.Invoke(_law!); + } + + public void SetLaw(SiliconLaw law) + { + _law = law; + LawContent.TextRope = new Rope.Leaf(Loc.GetString(law.LawString)); + PositionText.Text = law.Order.ToString(); + if (!string.IsNullOrEmpty(law.LawIdentifierOverride)) + { + Corrupted.Pressed = true; + } + else + { + Corrupted.Pressed = false; + } + } +} diff --git a/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawEui.cs b/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawEui.cs new file mode 100644 index 0000000000..a4d59d1f31 --- /dev/null +++ b/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawEui.cs @@ -0,0 +1,38 @@ +using Content.Client.Eui; +using Content.Shared.Eui; +using Content.Shared.Silicons.Laws; + +namespace Content.Client.Silicons.Laws.SiliconLawEditUi; + +public sealed class SiliconLawEui : BaseEui +{ + public readonly EntityManager _entityManager = default!; + + private SiliconLawUi _siliconLawUi; + private EntityUid _target; + + public SiliconLawEui() + { + _entityManager = IoCManager.Resolve(); + + _siliconLawUi = new SiliconLawUi(); + _siliconLawUi.OnClose += () => SendMessage(new CloseEuiMessage()); + _siliconLawUi.Save.OnPressed += _ => SendMessage(new SiliconLawsSaveMessage(_siliconLawUi.GetLaws(), _entityManager.GetNetEntity(_target))); + } + + public override void HandleState(EuiStateBase state) + { + if (state is not SiliconLawsEuiState s) + { + return; + } + + _target = _entityManager.GetEntity(s.Target); + _siliconLawUi.SetLaws(s.Laws); + } + + public override void Opened() + { + _siliconLawUi.OpenCentered(); + } +} diff --git a/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawUi.xaml b/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawUi.xaml new file mode 100644 index 0000000000..19dcbac620 --- /dev/null +++ b/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawUi.xaml @@ -0,0 +1,22 @@ + + + this shit does not layout properly unless I put the horizontal boxcontainer inside of a vertical one + ???? + + + + + + + + + + + + + diff --git a/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawUi.xaml.cs b/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawUi.xaml.cs new file mode 100644 index 0000000000..372961ea9a --- /dev/null +++ b/Content.Client/Silicons/Laws/SiliconLawEditUi/SiliconLawUi.xaml.cs @@ -0,0 +1,89 @@ +using System.Linq; +using Content.Client.UserInterface.Controls; +using Content.Shared.FixedPoint; +using Content.Shared.Silicons.Laws; +using Robust.Client.AutoGenerated; +using Robust.Client.UserInterface.XAML; + +namespace Content.Client.Silicons.Laws.SiliconLawEditUi; + +[GenerateTypedNameReferences] +public sealed partial class SiliconLawUi : FancyWindow +{ + private List _laws = new(); + + public SiliconLawUi() + { + RobustXamlLoader.Load(this); + NewLawButton.OnPressed += _ => AddNewLaw(); + } + + private void AddNewLaw() + { + var newLaw = new SiliconLaw(); + newLaw.Order = FixedPoint2.New(_laws.Count + 1); + _laws.Add(newLaw); + SetLaws(_laws); + } + + public void SetLaws(List sLaws) + { + _laws = sLaws; + LawContainer.RemoveAllChildren(); + foreach (var law in sLaws.OrderBy(l => l.Order)) + { + var lawControl = new SiliconLawContainer(); + lawControl.SetLaw(law); + lawControl.MoveLawDown += MoveLawDown; + lawControl.MoveLawUp += MoveLawUp; + lawControl.DeleteAction += DeleteLaw; + + LawContainer.AddChild(lawControl); + } + } + + public void DeleteLaw(SiliconLaw law) + { + _laws.Remove(law); + SetLaws(_laws); + } + + public void MoveLawDown(SiliconLaw law) + { + if (_laws.Count == 0) + { + return; + } + + var index = _laws.IndexOf(law); + if (index == -1) + { + return; + } + + _laws[index].Order += FixedPoint2.New(1); + SetLaws(_laws); + } + + public void MoveLawUp(SiliconLaw law) + { + if (_laws.Count == 0) + { + return; + } + + var index = _laws.IndexOf(law); + if (index == -1) + { + return; + } + + _laws[index].Order += FixedPoint2.New(-1); + SetLaws(_laws); + } + + public List GetLaws() + { + return _laws; + } +} diff --git a/Content.Client/Stylesheets/StyleNano.cs b/Content.Client/Stylesheets/StyleNano.cs index 0c04a55059..0bd75003a2 100644 --- a/Content.Client/Stylesheets/StyleNano.cs +++ b/Content.Client/Stylesheets/StyleNano.cs @@ -4,6 +4,7 @@ using Content.Client.ContextMenu.UI; using Content.Client.Examine; using Content.Client.PDA; using Content.Client.Resources; +using Content.Client.Silicons.Laws.SiliconLawEditUi; using Content.Client.UserInterface.Controls; using Content.Client.UserInterface.Controls.FancyTree; using Content.Client.Verbs.UI; @@ -1613,6 +1614,10 @@ namespace Content.Client.Stylesheets { BackgroundColor = FancyTreeSelectedRowColor, }), + + // Silicon law edit ui + Element Storage = 93, + + /// + /// A player got hit by an explosion and was dealt damage. + /// + ExplosionHit = 94, + } From 31cd2a0927de3d5aa6f2fda7491cd61a0bce5c54 Mon Sep 17 00:00:00 2001 From: Repo <47093363+Titian3@users.noreply.github.com> Date: Fri, 9 Aug 2024 18:24:19 +1200 Subject: [PATCH 301/422] Add admin logs to Rehydration comp. (#30597) --- .../Chemistry/EntitySystems/RehydratableSystem.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Content.Shared/Chemistry/EntitySystems/RehydratableSystem.cs b/Content.Shared/Chemistry/EntitySystems/RehydratableSystem.cs index 36ca791290..0f5d51057f 100644 --- a/Content.Shared/Chemistry/EntitySystems/RehydratableSystem.cs +++ b/Content.Shared/Chemistry/EntitySystems/RehydratableSystem.cs @@ -1,4 +1,6 @@ +using Content.Shared.Administration.Logs; using Content.Shared.Chemistry.Components; +using Content.Shared.Database; using Content.Shared.FixedPoint; using Content.Shared.Popups; using Robust.Shared.Network; @@ -13,6 +15,7 @@ public sealed class RehydratableSystem : EntitySystem [Dependency] private readonly SharedPopupSystem _popup = default!; [Dependency] private readonly SharedSolutionContainerSystem _solutions = default!; [Dependency] private readonly SharedTransformSystem _xform = default!; + [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; public override void Initialize() { @@ -24,6 +27,7 @@ public sealed class RehydratableSystem : EntitySystem private void OnSolutionChange(Entity ent, ref SolutionContainerChangedEvent args) { var quantity = _solutions.GetTotalPrototypeQuantity(ent, ent.Comp.CatalystPrototype); + _adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(ent.Owner)} was hydrated, now contains a solution of: {SharedSolutionContainerSystem.ToPrettyString(args.Solution)}."); if (quantity != FixedPoint2.Zero && quantity >= ent.Comp.CatalystMinimum) { Expand(ent); @@ -41,6 +45,8 @@ public sealed class RehydratableSystem : EntitySystem var randomMob = _random.Pick(comp.PossibleSpawns); var target = Spawn(randomMob, Transform(uid).Coordinates); + _adminLogger.Add(LogType.Action, LogImpact.Medium, $"{ToPrettyString(ent.Owner)} has been hydrated correctly and spawned: {ToPrettyString(target)}."); + _popup.PopupEntity(Loc.GetString("rehydratable-component-expands-message", ("owner", uid)), target); _xform.AttachToGridOrMap(target); From efe36c3bf8cc8d7db63669c455567487e45e3863 Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 9 Aug 2024 06:25:25 +0000 Subject: [PATCH 302/422] Automatic changelog update --- Resources/Changelog/Admin.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml index f9ae00eb96..41f0ca795a 100644 --- a/Resources/Changelog/Admin.yml +++ b/Resources/Changelog/Admin.yml @@ -431,5 +431,19 @@ Entries: id: 53 time: '2024-08-09T06:16:22.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/28483 +- author: TsjipTsjip + changes: + - message: Explosion damage dealt to players is now logged again. + type: Add + id: 54 + time: '2024-08-09T06:24:05.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29762 +- author: Repo + changes: + - message: Admin logs for Cubes and other rehydration. + type: Add + id: 55 + time: '2024-08-09T06:24:19.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30597 Name: Admin Order: 1 From c46a4e057a69039e6167a25ef27af683d4368f77 Mon Sep 17 00:00:00 2001 From: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com> Date: Fri, 9 Aug 2024 06:26:04 +0000 Subject: [PATCH 303/422] Fix(CuffableSystem): Check if cuffs can be transferred(dropped) (#30465) * ugh * Revert "ugh" This reverts commit 8b5b0e24bcaa6c5cc9229c17eb138cdb476f0c9e. * Revert "Automatic changelog update" This reverts commit 4f8b634f38e6ba588d45c75b35e5e1446df7949e. * Revert "Revert "Automatic changelog update"" This reverts commit 9fc2a3307a06e5f7d19bbb8d29e45b9a1d1470c8. * Revert "Revert "Revert "Automatic changelog update""" This reverts commit 1ae733bf308d7285159dd1fafd7f17101d8f4ced. * Revert "Revert "Automatic changelog update"" This reverts commit 9fc2a3307a06e5f7d19bbb8d29e45b9a1d1470c8. * Revert "" This reverts commit 1cc0953333cf3d4f2cad5fae2f5c562ae99563ae. * Revert "" This reverts commit edca368a8444fd0fd403333695668d1c1db3726a. * Revert "Revert "ugh"" This reverts commit 3ac15dfb07c7ae43b797724f85b76193ecd7a0e1. * Revert "Revert "Revert "ugh""" This reverts commit b952a4556397c8abcc7c319d736fab7ae48073a2. * Revert "Revert "Revert "Revert "ugh"""" This reverts commit ff1a151571dea653d78ac2bda75eb11209da8d96. * Revert "ugh" This reverts commit 8b5b0e24bcaa6c5cc9229c17eb138cdb476f0c9e. * Update SharedCuffableSystem.cs --- Content.Shared/Cuffs/SharedCuffableSystem.cs | 6 ++++++ .../Locale/en-US/cuffs/components/handcuff-component.ftl | 1 + 2 files changed, 7 insertions(+) diff --git a/Content.Shared/Cuffs/SharedCuffableSystem.cs b/Content.Shared/Cuffs/SharedCuffableSystem.cs index b540cc3a37..21d09c744c 100644 --- a/Content.Shared/Cuffs/SharedCuffableSystem.cs +++ b/Content.Shared/Cuffs/SharedCuffableSystem.cs @@ -489,6 +489,12 @@ namespace Content.Shared.Cuffs return true; } + if (!_hands.CanDrop(user, handcuff)) + { + _popup.PopupClient(Loc.GetString("handcuff-component-cannot-drop-cuffs", ("target", Identity.Name(target, EntityManager, user))), user, user); + return false; + } + var cuffTime = handcuffComponent.CuffTime; if (HasComp(target)) diff --git a/Resources/Locale/en-US/cuffs/components/handcuff-component.ftl b/Resources/Locale/en-US/cuffs/components/handcuff-component.ftl index 16447f4251..a4de62ede4 100644 --- a/Resources/Locale/en-US/cuffs/components/handcuff-component.ftl +++ b/Resources/Locale/en-US/cuffs/components/handcuff-component.ftl @@ -15,3 +15,4 @@ handcuff-component-cuff-interrupt-other-message = You interrupt {$otherName} whi handcuff-component-cuff-interrupt-self-message = You were interrupted while restraining yourself. handcuff-component-cuff-interrupt-buckled-message = You can't buckle while restrained! handcuff-component-cuff-interrupt-unbuckled-message = You can't unbuckle while restrained! +handcuff-component-cannot-drop-cuffs = You are unable to put the restraints on {$target} From 268cab97f5c6a6235367fb18d3fbfb88281d046c Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Fri, 9 Aug 2024 08:28:45 +0200 Subject: [PATCH 304/422] Make hotplate and grill anchorable on table part 2 (#29454) * Make hotplate and grill anchorable on table part 2 * Update hotplate.yml --- .../Prototypes/Entities/Structures/Machines/hotplate.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/hotplate.yml b/Resources/Prototypes/Entities/Structures/Machines/hotplate.yml index 3764f13591..8751c2b7ab 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/hotplate.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/hotplate.yml @@ -15,10 +15,7 @@ mask: - TabletopMachineMask layer: - - Impassable - - MidImpassable - - LowImpassable - hard: false + - TabletopMachineLayer - type: ApcPowerReceiver powerLoad: 300 - type: Appearance From 3c6df0e39f160efecba110de9a298f6cd4602b1f Mon Sep 17 00:00:00 2001 From: Ilya246 <57039557+Ilya246@users.noreply.github.com> Date: Fri, 9 Aug 2024 06:57:43 +0000 Subject: [PATCH 305/422] add ghost role raffle to sentient artifact (#30746) arti raffle --- Resources/Prototypes/XenoArch/Effects/utility_effects.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/XenoArch/Effects/utility_effects.yml b/Resources/Prototypes/XenoArch/Effects/utility_effects.yml index bfaff8fe44..8cf7fb0b36 100644 --- a/Resources/Prototypes/XenoArch/Effects/utility_effects.yml +++ b/Resources/Prototypes/XenoArch/Effects/utility_effects.yml @@ -200,6 +200,8 @@ name: ghost-role-information-artifact-name description: ghost-role-information-artifact-description rules: ghost-role-information-freeagent-rules + raffle: + settings: default - type: GhostTakeoverAvailable - type: MovementSpeedModifier baseWalkSpeed: 0.25 From de86fdb3730ac9109dff24c9d820a6ff6c923a16 Mon Sep 17 00:00:00 2001 From: Errant <35878406+Errant-4@users.noreply.github.com> Date: Fri, 9 Aug 2024 09:04:19 +0200 Subject: [PATCH 306/422] setgamepreset command rework (#30756) * gameticker.gamepreset namespace * setgamepreset now has a finite duration * comments, cleanup --- .../Commands/SetGamePresetCommand.cs | 17 +- .../GameTicking/GameTicker.GamePreset.cs | 552 +++++++++--------- .../GameTicking/GameTicker.RoundFlow.cs | 3 + .../game-ticking/set-game-preset-command.ftl | 8 +- 4 files changed, 308 insertions(+), 272 deletions(-) diff --git a/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs b/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs index 83736bd92b..78e2b452b7 100644 --- a/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs +++ b/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs @@ -2,6 +2,7 @@ using Content.Server.Administration; using Content.Server.GameTicking.Presets; using Content.Shared.Administration; +using Linguini.Shared.Util; using Robust.Shared.Console; using Robust.Shared.Prototypes; @@ -19,9 +20,9 @@ namespace Content.Server.GameTicking.Commands public void Execute(IConsoleShell shell, string argStr, string[] args) { - if (args.Length != 1) + if (!args.Length.InRange(1, 2)) { - shell.WriteError(Loc.GetString("shell-wrong-arguments-number-need-specific", ("properAmount", 1), ("currentAmount", args.Length))); + shell.WriteError(Loc.GetString("shell-need-between-arguments", ("lower", 1), ("upper", 2), ("currentAmount", args.Length))); return; } @@ -33,8 +34,16 @@ namespace Content.Server.GameTicking.Commands return; } - ticker.SetGamePreset(preset); - shell.WriteLine(Loc.GetString("set-game-preset-preset-set", ("preset", preset.ID))); + var rounds = 1; + + if (args.Length == 2 && !int.TryParse(args[1], out rounds)) + { + shell.WriteError(Loc.GetString("set-game-preset-optional-argument-not-integer")); + return; + } + + ticker.SetGamePreset(preset, false, rounds); + shell.WriteLine(Loc.GetString("set-game-preset-preset-set-finite", ("preset", preset.ID), ("rounds", rounds.ToString()))); } public CompletionResult GetCompletion(IConsoleShell shell, string[] args) diff --git a/Content.Server/GameTicking/GameTicker.GamePreset.cs b/Content.Server/GameTicking/GameTicker.GamePreset.cs index 5a2b375dd6..6c12a2ea27 100644 --- a/Content.Server/GameTicking/GameTicker.GamePreset.cs +++ b/Content.Server/GameTicking/GameTicker.GamePreset.cs @@ -16,305 +16,327 @@ using Content.Shared.Mobs.Systems; using JetBrains.Annotations; using Robust.Shared.Player; -namespace Content.Server.GameTicking +namespace Content.Server.GameTicking; + +public sealed partial class GameTicker { - public sealed partial class GameTicker + [Dependency] private readonly MobThresholdSystem _mobThresholdSystem = default!; + + public const float PresetFailedCooldownIncrease = 30f; + + /// + /// The selected preset that will be used at the start of the next round. + /// + public GamePresetPrototype? Preset { get; private set; } + + /// + /// The preset that's currently active. + /// + public GamePresetPrototype? CurrentPreset { get; private set; } + + /// + /// Countdown to the preset being reset to the server default. + /// + public int? ResetCountdown; + + private bool StartPreset(ICommonSession[] origReadyPlayers, bool force) { - [Dependency] private readonly MobThresholdSystem _mobThresholdSystem = default!; + var startAttempt = new RoundStartAttemptEvent(origReadyPlayers, force); + RaiseLocalEvent(startAttempt); - public const float PresetFailedCooldownIncrease = 30f; + if (!startAttempt.Cancelled) + return true; - /// - /// The selected preset that will be used at the start of the next round. - /// - public GamePresetPrototype? Preset { get; private set; } + var presetTitle = CurrentPreset != null ? Loc.GetString(CurrentPreset.ModeTitle) : string.Empty; - /// - /// The preset that's currently active. - /// - public GamePresetPrototype? CurrentPreset { get; private set; } - - private bool StartPreset(ICommonSession[] origReadyPlayers, bool force) + void FailedPresetRestart() { - var startAttempt = new RoundStartAttemptEvent(origReadyPlayers, force); - RaiseLocalEvent(startAttempt); + SendServerMessage(Loc.GetString("game-ticker-start-round-cannot-start-game-mode-restart", + ("failedGameMode", presetTitle))); + RestartRound(); + DelayStart(TimeSpan.FromSeconds(PresetFailedCooldownIncrease)); + } - if (!startAttempt.Cancelled) - return true; + if (_configurationManager.GetCVar(CCVars.GameLobbyFallbackEnabled)) + { + var fallbackPresets = _configurationManager.GetCVar(CCVars.GameLobbyFallbackPreset).Split(","); + var startFailed = true; - var presetTitle = CurrentPreset != null ? Loc.GetString(CurrentPreset.ModeTitle) : string.Empty; - - void FailedPresetRestart() + foreach (var preset in fallbackPresets) { - SendServerMessage(Loc.GetString("game-ticker-start-round-cannot-start-game-mode-restart", - ("failedGameMode", presetTitle))); - RestartRound(); - DelayStart(TimeSpan.FromSeconds(PresetFailedCooldownIncrease)); - } + ClearGameRules(); + SetGamePreset(preset); + AddGamePresetRules(); + StartGamePresetRules(); - if (_configurationManager.GetCVar(CCVars.GameLobbyFallbackEnabled)) - { - var fallbackPresets = _configurationManager.GetCVar(CCVars.GameLobbyFallbackPreset).Split(","); - var startFailed = true; + startAttempt.Uncancel(); + RaiseLocalEvent(startAttempt); - foreach (var preset in fallbackPresets) + if (!startAttempt.Cancelled) { - ClearGameRules(); - SetGamePreset(preset); - AddGamePresetRules(); - StartGamePresetRules(); - - startAttempt.Uncancel(); - RaiseLocalEvent(startAttempt); - - if (!startAttempt.Cancelled) - { - _chatManager.SendAdminAnnouncement( - Loc.GetString("game-ticker-start-round-cannot-start-game-mode-fallback", - ("failedGameMode", presetTitle), - ("fallbackMode", Loc.GetString(preset)))); - RefreshLateJoinAllowed(); - startFailed = false; - break; - } - } - - if (startFailed) - { - FailedPresetRestart(); - return false; + _chatManager.SendAdminAnnouncement( + Loc.GetString("game-ticker-start-round-cannot-start-game-mode-fallback", + ("failedGameMode", presetTitle), + ("fallbackMode", Loc.GetString(preset)))); + RefreshLateJoinAllowed(); + startFailed = false; + break; } } - else + if (startFailed) { FailedPresetRestart(); return false; } - - return true; } - private void InitializeGamePreset() + else { - SetGamePreset(LobbyEnabled ? _configurationManager.GetCVar(CCVars.GameLobbyDefaultPreset) : "sandbox"); + FailedPresetRestart(); + return false; } - public void SetGamePreset(GamePresetPrototype? preset, bool force = false) + return true; + } + + private void InitializeGamePreset() + { + SetGamePreset(LobbyEnabled ? _configurationManager.GetCVar(CCVars.GameLobbyDefaultPreset) : "sandbox"); + } + + public void SetGamePreset(GamePresetPrototype? preset, bool force = false, int? resetDelay = null) + { + // Do nothing if this game ticker is a dummy! + if (DummyTicker) + return; + + if (resetDelay is not null) { - // Do nothing if this game ticker is a dummy! - if (DummyTicker) - return; - - Preset = preset; - ValidateMap(); - UpdateInfoText(); - - if (force) - { - StartRound(true); - } + ResetCountdown = resetDelay.Value; + // Reset counter is checked and changed at the end of each round + // So if the game is in the lobby, the first requested round will happen before the check, and we need one less check + if (CurrentPreset is null) + ResetCountdown = resetDelay.Value -1; } - public void SetGamePreset(string preset, bool force = false) + Preset = preset; + ValidateMap(); + UpdateInfoText(); + + if (force) { - var proto = FindGamePreset(preset); - if(proto != null) - SetGamePreset(proto, force); - } - - public GamePresetPrototype? FindGamePreset(string preset) - { - if (_prototypeManager.TryIndex(preset, out GamePresetPrototype? presetProto)) - return presetProto; - - foreach (var proto in _prototypeManager.EnumeratePrototypes()) - { - foreach (var alias in proto.Alias) - { - if (preset.Equals(alias, StringComparison.InvariantCultureIgnoreCase)) - return proto; - } - } - - return null; - } - - public bool TryFindGamePreset(string preset, [NotNullWhen(true)] out GamePresetPrototype? prototype) - { - prototype = FindGamePreset(preset); - - return prototype != null; - } - - public bool IsMapEligible(GameMapPrototype map) - { - if (Preset == null) - return true; - - if (Preset.MapPool == null || !_prototypeManager.TryIndex(Preset.MapPool, out var pool)) - return true; - - return pool.Maps.Contains(map.ID); - } - - private void ValidateMap() - { - if (Preset == null || _gameMapManager.GetSelectedMap() is not { } map) - return; - - if (Preset.MapPool == null || - !_prototypeManager.TryIndex(Preset.MapPool, out var pool)) - return; - - if (pool.Maps.Contains(map.ID)) - return; - - _gameMapManager.SelectMapRandom(); - } - - [PublicAPI] - private bool AddGamePresetRules() - { - if (DummyTicker || Preset == null) - return false; - - CurrentPreset = Preset; - foreach (var rule in Preset.Rules) - { - AddGameRule(rule); - } - - return true; - } - - public void StartGamePresetRules() - { - // May be touched by the preset during init. - var rules = new List(GetAddedGameRules()); - foreach (var rule in rules) - { - StartGameRule(rule); - } - } - - public bool OnGhostAttempt(EntityUid mindId, bool canReturnGlobal, bool viaCommand = false, MindComponent? mind = null) - { - if (!Resolve(mindId, ref mind)) - return false; - - var playerEntity = mind.CurrentEntity; - - if (playerEntity != null && viaCommand) - _adminLogger.Add(LogType.Mind, $"{EntityManager.ToPrettyString(playerEntity.Value):player} is attempting to ghost via command"); - - var handleEv = new GhostAttemptHandleEvent(mind, canReturnGlobal); - RaiseLocalEvent(handleEv); - - // Something else has handled the ghost attempt for us! We return its result. - if (handleEv.Handled) - return handleEv.Result; - - if (mind.PreventGhosting) - { - if (mind.Session != null) // Logging is suppressed to prevent spam from ghost attempts caused by movement attempts - { - _chatManager.DispatchServerMessage(mind.Session, Loc.GetString("comp-mind-ghosting-prevented"), - true); - } - - return false; - } - - if (TryComp(playerEntity, out var comp) && !comp.CanGhostInteract) - return false; - - if (mind.VisitingEntity != default) - { - _mind.UnVisit(mindId, mind: mind); - } - - var position = Exists(playerEntity) - ? Transform(playerEntity.Value).Coordinates - : GetObserverSpawnPoint(); - - if (position == default) - return false; - - // Ok, so, this is the master place for the logic for if ghosting is "too cheaty" to allow returning. - // There's no reason at this time to move it to any other place, especially given that the 'side effects required' situations would also have to be moved. - // + If CharacterDeadPhysically applies, we're physically dead. Therefore, ghosting OK, and we can return (this is critical for gibbing) - // Note that we could theoretically be ICly dead and still physically alive and vice versa. - // (For example, a zombie could be dead ICly, but may retain memories and is definitely physically active) - // + If we're in a mob that is critical, and we're supposed to be able to return if possible, - // we're succumbing - the mob is killed. Therefore, character is dead. Ghosting OK. - // (If the mob survives, that's a bug. Ghosting is kept regardless.) - var canReturn = canReturnGlobal && _mind.IsCharacterDeadPhysically(mind); - - if (_configurationManager.GetCVar(CCVars.GhostKillCrit) && - canReturnGlobal && - TryComp(playerEntity, out MobStateComponent? mobState)) - { - if (_mobState.IsCritical(playerEntity.Value, mobState)) - { - canReturn = true; - - //todo: what if they dont breathe lol - //cry deeply - - FixedPoint2 dealtDamage = 200; - if (TryComp(playerEntity, out var damageable) - && TryComp(playerEntity, out var thresholds)) - { - var playerDeadThreshold = _mobThresholdSystem.GetThresholdForState(playerEntity.Value, MobState.Dead, thresholds); - dealtDamage = playerDeadThreshold - damageable.TotalDamage; - } - - DamageSpecifier damage = new(_prototypeManager.Index("Asphyxiation"), dealtDamage); - - _damageable.TryChangeDamage(playerEntity, damage, true); - } - } - - var ghost = _ghost.SpawnGhost((mindId, mind), position, canReturn); - if (ghost == null) - return false; - - if (playerEntity != null) - _adminLogger.Add(LogType.Mind, $"{EntityManager.ToPrettyString(playerEntity.Value):player} ghosted{(!canReturn ? " (non-returnable)" : "")}"); - - return true; - } - - private void IncrementRoundNumber() - { - var playerIds = _playerGameStatuses.Keys.Select(player => player.UserId).ToArray(); - var serverName = _configurationManager.GetCVar(CCVars.AdminLogsServerName); - - // TODO FIXME AAAAAAAAAAAAAAAAAAAH THIS IS BROKEN - // Task.Run as a terrible dirty workaround to avoid synchronization context deadlock from .Result here. - // This whole setup logic should be made asynchronous so we can properly wait on the DB AAAAAAAAAAAAAH - var task = Task.Run(async () => - { - var server = await _dbEntryManager.ServerEntity; - return await _db.AddNewRound(server, playerIds); - }); - - _taskManager.BlockWaitOnTask(task); - RoundId = task.GetAwaiter().GetResult(); + StartRound(true); } } - public sealed class GhostAttemptHandleEvent : HandledEntityEventArgs + public void SetGamePreset(string preset, bool force = false) { - public MindComponent Mind { get; } - public bool CanReturnGlobal { get; } - public bool Result { get; set; } + var proto = FindGamePreset(preset); + if(proto != null) + SetGamePreset(proto, force); + } - public GhostAttemptHandleEvent(MindComponent mind, bool canReturnGlobal) + public GamePresetPrototype? FindGamePreset(string preset) + { + if (_prototypeManager.TryIndex(preset, out GamePresetPrototype? presetProto)) + return presetProto; + + foreach (var proto in _prototypeManager.EnumeratePrototypes()) { - Mind = mind; - CanReturnGlobal = canReturnGlobal; + foreach (var alias in proto.Alias) + { + if (preset.Equals(alias, StringComparison.InvariantCultureIgnoreCase)) + return proto; + } } + + return null; + } + + public bool TryFindGamePreset(string preset, [NotNullWhen(true)] out GamePresetPrototype? prototype) + { + prototype = FindGamePreset(preset); + + return prototype != null; + } + + public bool IsMapEligible(GameMapPrototype map) + { + if (Preset == null) + return true; + + if (Preset.MapPool == null || !_prototypeManager.TryIndex(Preset.MapPool, out var pool)) + return true; + + return pool.Maps.Contains(map.ID); + } + + private void ValidateMap() + { + if (Preset == null || _gameMapManager.GetSelectedMap() is not { } map) + return; + + if (Preset.MapPool == null || + !_prototypeManager.TryIndex(Preset.MapPool, out var pool)) + return; + + if (pool.Maps.Contains(map.ID)) + return; + + _gameMapManager.SelectMapRandom(); + } + + [PublicAPI] + private bool AddGamePresetRules() + { + if (DummyTicker || Preset == null) + return false; + + CurrentPreset = Preset; + foreach (var rule in Preset.Rules) + { + AddGameRule(rule); + } + + return true; + } + + private void TryResetPreset() + { + if (ResetCountdown is null || ResetCountdown-- > 0) + return; + + InitializeGamePreset(); + ResetCountdown = null; + } + + public void StartGamePresetRules() + { + // May be touched by the preset during init. + var rules = new List(GetAddedGameRules()); + foreach (var rule in rules) + { + StartGameRule(rule); + } + } + + public bool OnGhostAttempt(EntityUid mindId, bool canReturnGlobal, bool viaCommand = false, MindComponent? mind = null) + { + if (!Resolve(mindId, ref mind)) + return false; + + var playerEntity = mind.CurrentEntity; + + if (playerEntity != null && viaCommand) + _adminLogger.Add(LogType.Mind, $"{EntityManager.ToPrettyString(playerEntity.Value):player} is attempting to ghost via command"); + + var handleEv = new GhostAttemptHandleEvent(mind, canReturnGlobal); + RaiseLocalEvent(handleEv); + + // Something else has handled the ghost attempt for us! We return its result. + if (handleEv.Handled) + return handleEv.Result; + + if (mind.PreventGhosting) + { + if (mind.Session != null) // Logging is suppressed to prevent spam from ghost attempts caused by movement attempts + { + _chatManager.DispatchServerMessage(mind.Session, Loc.GetString("comp-mind-ghosting-prevented"), + true); + } + + return false; + } + + if (TryComp(playerEntity, out var comp) && !comp.CanGhostInteract) + return false; + + if (mind.VisitingEntity != default) + { + _mind.UnVisit(mindId, mind: mind); + } + + var position = Exists(playerEntity) + ? Transform(playerEntity.Value).Coordinates + : GetObserverSpawnPoint(); + + if (position == default) + return false; + + // Ok, so, this is the master place for the logic for if ghosting is "too cheaty" to allow returning. + // There's no reason at this time to move it to any other place, especially given that the 'side effects required' situations would also have to be moved. + // + If CharacterDeadPhysically applies, we're physically dead. Therefore, ghosting OK, and we can return (this is critical for gibbing) + // Note that we could theoretically be ICly dead and still physically alive and vice versa. + // (For example, a zombie could be dead ICly, but may retain memories and is definitely physically active) + // + If we're in a mob that is critical, and we're supposed to be able to return if possible, + // we're succumbing - the mob is killed. Therefore, character is dead. Ghosting OK. + // (If the mob survives, that's a bug. Ghosting is kept regardless.) + var canReturn = canReturnGlobal && _mind.IsCharacterDeadPhysically(mind); + + if (_configurationManager.GetCVar(CCVars.GhostKillCrit) && + canReturnGlobal && + TryComp(playerEntity, out MobStateComponent? mobState)) + { + if (_mobState.IsCritical(playerEntity.Value, mobState)) + { + canReturn = true; + + //todo: what if they dont breathe lol + //cry deeply + + FixedPoint2 dealtDamage = 200; + if (TryComp(playerEntity, out var damageable) + && TryComp(playerEntity, out var thresholds)) + { + var playerDeadThreshold = _mobThresholdSystem.GetThresholdForState(playerEntity.Value, MobState.Dead, thresholds); + dealtDamage = playerDeadThreshold - damageable.TotalDamage; + } + + DamageSpecifier damage = new(_prototypeManager.Index("Asphyxiation"), dealtDamage); + + _damageable.TryChangeDamage(playerEntity, damage, true); + } + } + + var ghost = _ghost.SpawnGhost((mindId, mind), position, canReturn); + if (ghost == null) + return false; + + if (playerEntity != null) + _adminLogger.Add(LogType.Mind, $"{EntityManager.ToPrettyString(playerEntity.Value):player} ghosted{(!canReturn ? " (non-returnable)" : "")}"); + + return true; + } + + private void IncrementRoundNumber() + { + var playerIds = _playerGameStatuses.Keys.Select(player => player.UserId).ToArray(); + var serverName = _configurationManager.GetCVar(CCVars.AdminLogsServerName); + + // TODO FIXME AAAAAAAAAAAAAAAAAAAH THIS IS BROKEN + // Task.Run as a terrible dirty workaround to avoid synchronization context deadlock from .Result here. + // This whole setup logic should be made asynchronous so we can properly wait on the DB AAAAAAAAAAAAAH + var task = Task.Run(async () => + { + var server = await _dbEntryManager.ServerEntity; + return await _db.AddNewRound(server, playerIds); + }); + + _taskManager.BlockWaitOnTask(task); + RoundId = task.GetAwaiter().GetResult(); + } +} + +public sealed class GhostAttemptHandleEvent : HandledEntityEventArgs +{ + public MindComponent Mind { get; } + public bool CanReturnGlobal { get; } + public bool Result { get; set; } + + public GhostAttemptHandleEvent(MindComponent mind, bool canReturnGlobal) + { + Mind = mind; + CanReturnGlobal = canReturnGlobal; } } diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs index ca087c46ed..dc242fb6c0 100644 --- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs +++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs @@ -487,6 +487,9 @@ namespace Content.Server.GameTicking if (_serverUpdates.RoundEnded()) return; + // Check if the GamePreset needs to be reset + TryResetPreset(); + _sawmill.Info("Restarting round!"); SendServerMessage(Loc.GetString("game-ticker-restart-round")); diff --git a/Resources/Locale/en-US/game-ticking/set-game-preset-command.ftl b/Resources/Locale/en-US/game-ticking/set-game-preset-command.ftl index 46049643cb..323d83aeba 100644 --- a/Resources/Locale/en-US/game-ticking/set-game-preset-command.ftl +++ b/Resources/Locale/en-US/game-ticking/set-game-preset-command.ftl @@ -1,5 +1,7 @@ -set-game-preset-command-description = Sets the game preset for the current round. -set-game-preset-command-help-text = setgamepreset +set-game-preset-command-description = Sets the game preset for the specified number of upcoming rounds. +set-game-preset-command-help-text = setgamepreset [number of rounds, defaulting to 1] +set-game-preset-optional-argument-not-integer = If argument 2 is provided it must be a number. set-game-preset-preset-error = Unable to find game preset "{$preset}" -set-game-preset-preset-set = Set game preset to "{$preset}" +#set-game-preset-preset-set = Set game preset to "{$preset}" +set-game-preset-preset-set-finite = Set game preset to "{$preset}" for the next {$rounds} rounds. From ecf278a89b088f629f5d29a0e4237ea864a4e558 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Fri, 9 Aug 2024 17:05:12 +1000 Subject: [PATCH 307/422] Make clickable 1% nicer (#29706) * Make vox roundstart I believe all the issues are fixed. * Click detection bandaid * Make clickable 1% nicer Still bad. Still doesn't handle multi-viewports well. --- .../Clickable/ClickableComponent.cs | 155 ++-------------- Content.Client/Clickable/ClickableSystem.cs | 168 ++++++++++++++++++ Content.Client/Gameplay/GameplayStateBase.cs | 44 ++++- .../Outline/InteractionOutlineSystem.cs | 6 +- .../Tests/ClickableTest.cs | 4 +- 5 files changed, 223 insertions(+), 154 deletions(-) create mode 100644 Content.Client/Clickable/ClickableSystem.cs diff --git a/Content.Client/Clickable/ClickableComponent.cs b/Content.Client/Clickable/ClickableComponent.cs index 987473ca46..da81ed4c84 100644 --- a/Content.Client/Clickable/ClickableComponent.cs +++ b/Content.Client/Clickable/ClickableComponent.cs @@ -1,148 +1,17 @@ -using System.Numerics; -using Robust.Client.GameObjects; -using Robust.Client.Graphics; -using Robust.Client.Utility; -using Robust.Shared.Graphics; -using static Robust.Client.GameObjects.SpriteComponent; -using Direction = Robust.Shared.Maths.Direction; +namespace Content.Client.Clickable; -namespace Content.Client.Clickable +[RegisterComponent] +public sealed partial class ClickableComponent : Component { - [RegisterComponent] - public sealed partial class ClickableComponent : Component + [DataField] public DirBoundData? Bounds; + + [DataDefinition] + public sealed partial class DirBoundData { - [Dependency] private readonly IClickMapManager _clickMapManager = default!; - - [DataField("bounds")] public DirBoundData? Bounds; - - /// - /// Used to check whether a click worked. Will first check if the click falls inside of some explicit bounding - /// boxes (see ). If that fails, attempts to use automatically generated click maps. - /// - /// The world position that was clicked. - /// - /// The draw depth for the sprite that captured the click. - /// - /// True if the click worked, false otherwise. - public bool CheckClick(SpriteComponent sprite, TransformComponent transform, EntityQuery xformQuery, Vector2 worldPos, IEye eye, out int drawDepth, out uint renderOrder, out float bottom) - { - if (!sprite.Visible) - { - drawDepth = default; - renderOrder = default; - bottom = default; - return false; - } - - drawDepth = sprite.DrawDepth; - renderOrder = sprite.RenderOrder; - var (spritePos, spriteRot) = transform.GetWorldPositionRotation(xformQuery); - var spriteBB = sprite.CalculateRotatedBoundingBox(spritePos, spriteRot, eye.Rotation); - bottom = Matrix3Helpers.CreateRotation(eye.Rotation).TransformBox(spriteBB).Bottom; - - Matrix3x2.Invert(sprite.GetLocalMatrix(), out var invSpriteMatrix); - - // This should have been the rotation of the sprite relative to the screen, but this is not the case with no-rot or directional sprites. - var relativeRotation = (spriteRot + eye.Rotation).Reduced().FlipPositive(); - - Angle cardinalSnapping = sprite.SnapCardinals ? relativeRotation.GetCardinalDir().ToAngle() : Angle.Zero; - - // First we get `localPos`, the clicked location in the sprite-coordinate frame. - var entityXform = Matrix3Helpers.CreateInverseTransform(spritePos, sprite.NoRotation ? -eye.Rotation : spriteRot - cardinalSnapping); - var localPos = Vector2.Transform(Vector2.Transform(worldPos, entityXform), invSpriteMatrix); - - // Check explicitly defined click-able bounds - if (CheckDirBound(sprite, relativeRotation, localPos)) - return true; - - // Next check each individual sprite layer using automatically computed click maps. - foreach (var spriteLayer in sprite.AllLayers) - { - // TODO: Move this to a system and also use SpriteSystem.IsVisible instead. - if (!spriteLayer.Visible || spriteLayer is not Layer layer || layer.CopyToShaderParameters != null) - { - continue; - } - - // Check the layer's texture, if it has one - if (layer.Texture != null) - { - // Convert to image coordinates - var imagePos = (Vector2i) (localPos * EyeManager.PixelsPerMeter * new Vector2(1, -1) + layer.Texture.Size / 2f); - - if (_clickMapManager.IsOccluding(layer.Texture, imagePos)) - return true; - } - - // Either we weren't clicking on the texture, or there wasn't one. In which case: check the RSI next - if (layer.ActualRsi is not { } rsi || !rsi.TryGetState(layer.State, out var rsiState)) - continue; - - var dir = Layer.GetDirection(rsiState.RsiDirections, relativeRotation); - - // convert to layer-local coordinates - layer.GetLayerDrawMatrix(dir, out var matrix); - Matrix3x2.Invert(matrix, out var inverseMatrix); - var layerLocal = Vector2.Transform(localPos, inverseMatrix); - - // Convert to image coordinates - var layerImagePos = (Vector2i) (layerLocal * EyeManager.PixelsPerMeter * new Vector2(1, -1) + rsiState.Size / 2f); - - // Next, to get the right click map we need the "direction" of this layer that is actually being used to draw the sprite on the screen. - // This **can** differ from the dir defined before, but can also just be the same. - if (sprite.EnableDirectionOverride) - dir = sprite.DirectionOverride.Convert(rsiState.RsiDirections); - dir = dir.OffsetRsiDir(layer.DirOffset); - - if (_clickMapManager.IsOccluding(layer.ActualRsi!, layer.State, dir, layer.AnimationFrame, layerImagePos)) - return true; - } - - drawDepth = default; - renderOrder = default; - bottom = default; - return false; - } - - public bool CheckDirBound(SpriteComponent sprite, Angle relativeRotation, Vector2 localPos) - { - if (Bounds == null) - return false; - - // These explicit bounds only work for either 1 or 4 directional sprites. - - // This would be the orientation of a 4-directional sprite. - var direction = relativeRotation.GetCardinalDir(); - - var modLocalPos = sprite.NoRotation - ? localPos - : direction.ToAngle().RotateVec(localPos); - - // First, check the bounding box that is valid for all orientations - if (Bounds.All.Contains(modLocalPos)) - return true; - - // Next, get and check the appropriate bounding box for the current sprite orientation - var boundsForDir = (sprite.EnableDirectionOverride ? sprite.DirectionOverride : direction) switch - { - Direction.East => Bounds.East, - Direction.North => Bounds.North, - Direction.South => Bounds.South, - Direction.West => Bounds.West, - _ => throw new InvalidOperationException() - }; - - return boundsForDir.Contains(modLocalPos); - } - - [DataDefinition] - public sealed partial class DirBoundData - { - [DataField("all")] public Box2 All; - [DataField("north")] public Box2 North; - [DataField("south")] public Box2 South; - [DataField("east")] public Box2 East; - [DataField("west")] public Box2 West; - } + [DataField] public Box2 All; + [DataField] public Box2 North; + [DataField] public Box2 South; + [DataField] public Box2 East; + [DataField] public Box2 West; } } diff --git a/Content.Client/Clickable/ClickableSystem.cs b/Content.Client/Clickable/ClickableSystem.cs new file mode 100644 index 0000000000..15d13df625 --- /dev/null +++ b/Content.Client/Clickable/ClickableSystem.cs @@ -0,0 +1,168 @@ +using System.Numerics; +using Robust.Client.GameObjects; +using Robust.Client.Graphics; +using Robust.Client.Utility; +using Robust.Shared.Graphics; + +namespace Content.Client.Clickable; + +/// +/// Handles click detection for sprites. +/// +public sealed class ClickableSystem : EntitySystem +{ + [Dependency] private readonly IClickMapManager _clickMapManager = default!; + [Dependency] private readonly SharedTransformSystem _transforms = default!; + [Dependency] private readonly SpriteSystem _sprites = default!; + + private EntityQuery _clickableQuery; + private EntityQuery _xformQuery; + + public override void Initialize() + { + base.Initialize(); + _clickableQuery = GetEntityQuery(); + _xformQuery = GetEntityQuery(); + } + + /// + /// Used to check whether a click worked. Will first check if the click falls inside of some explicit bounding + /// boxes (see ). If that fails, attempts to use automatically generated click maps. + /// + /// The world position that was clicked. + /// + /// The draw depth for the sprite that captured the click. + /// + /// True if the click worked, false otherwise. + public bool CheckClick(Entity entity, Vector2 worldPos, IEye eye, out int drawDepth, out uint renderOrder, out float bottom) + { + if (!_clickableQuery.Resolve(entity.Owner, ref entity.Comp1, false)) + { + drawDepth = default; + renderOrder = default; + bottom = default; + return false; + } + + if (!_xformQuery.Resolve(entity.Owner, ref entity.Comp3)) + { + drawDepth = default; + renderOrder = default; + bottom = default; + return false; + } + + var sprite = entity.Comp2; + var transform = entity.Comp3; + + if (!sprite.Visible) + { + drawDepth = default; + renderOrder = default; + bottom = default; + return false; + } + + drawDepth = sprite.DrawDepth; + renderOrder = sprite.RenderOrder; + var (spritePos, spriteRot) = _transforms.GetWorldPositionRotation(transform); + var spriteBB = sprite.CalculateRotatedBoundingBox(spritePos, spriteRot, eye.Rotation); + bottom = Matrix3Helpers.CreateRotation(eye.Rotation).TransformBox(spriteBB).Bottom; + + Matrix3x2.Invert(sprite.GetLocalMatrix(), out var invSpriteMatrix); + + // This should have been the rotation of the sprite relative to the screen, but this is not the case with no-rot or directional sprites. + var relativeRotation = (spriteRot + eye.Rotation).Reduced().FlipPositive(); + + var cardinalSnapping = sprite.SnapCardinals ? relativeRotation.GetCardinalDir().ToAngle() : Angle.Zero; + + // First we get `localPos`, the clicked location in the sprite-coordinate frame. + var entityXform = Matrix3Helpers.CreateInverseTransform(spritePos, sprite.NoRotation ? -eye.Rotation : spriteRot - cardinalSnapping); + var localPos = Vector2.Transform(Vector2.Transform(worldPos, entityXform), invSpriteMatrix); + + // Check explicitly defined click-able bounds + if (CheckDirBound((entity.Owner, entity.Comp1, entity.Comp2), relativeRotation, localPos)) + return true; + + // Next check each individual sprite layer using automatically computed click maps. + foreach (var spriteLayer in sprite.AllLayers) + { + if (spriteLayer is not SpriteComponent.Layer layer || !_sprites.IsVisible(layer)) + { + continue; + } + + // Check the layer's texture, if it has one + if (layer.Texture != null) + { + // Convert to image coordinates + var imagePos = (Vector2i) (localPos * EyeManager.PixelsPerMeter * new Vector2(1, -1) + layer.Texture.Size / 2f); + + if (_clickMapManager.IsOccluding(layer.Texture, imagePos)) + return true; + } + + // Either we weren't clicking on the texture, or there wasn't one. In which case: check the RSI next + if (layer.ActualRsi is not { } rsi || !rsi.TryGetState(layer.State, out var rsiState)) + continue; + + var dir = SpriteComponent.Layer.GetDirection(rsiState.RsiDirections, relativeRotation); + + // convert to layer-local coordinates + layer.GetLayerDrawMatrix(dir, out var matrix); + Matrix3x2.Invert(matrix, out var inverseMatrix); + var layerLocal = Vector2.Transform(localPos, inverseMatrix); + + // Convert to image coordinates + var layerImagePos = (Vector2i) (layerLocal * EyeManager.PixelsPerMeter * new Vector2(1, -1) + rsiState.Size / 2f); + + // Next, to get the right click map we need the "direction" of this layer that is actually being used to draw the sprite on the screen. + // This **can** differ from the dir defined before, but can also just be the same. + if (sprite.EnableDirectionOverride) + dir = sprite.DirectionOverride.Convert(rsiState.RsiDirections); + dir = dir.OffsetRsiDir(layer.DirOffset); + + if (_clickMapManager.IsOccluding(layer.ActualRsi!, layer.State, dir, layer.AnimationFrame, layerImagePos)) + return true; + } + + drawDepth = default; + renderOrder = default; + bottom = default; + return false; + } + + public bool CheckDirBound(Entity entity, Angle relativeRotation, Vector2 localPos) + { + var clickable = entity.Comp1; + var sprite = entity.Comp2; + + if (clickable.Bounds == null) + return false; + + // These explicit bounds only work for either 1 or 4 directional sprites. + + // This would be the orientation of a 4-directional sprite. + var direction = relativeRotation.GetCardinalDir(); + + var modLocalPos = sprite.NoRotation + ? localPos + : direction.ToAngle().RotateVec(localPos); + + // First, check the bounding box that is valid for all orientations + if (clickable.Bounds.All.Contains(modLocalPos)) + return true; + + // Next, get and check the appropriate bounding box for the current sprite orientation + var boundsForDir = (sprite.EnableDirectionOverride ? sprite.DirectionOverride : direction) switch + { + Direction.East => clickable.Bounds.East, + Direction.North => clickable.Bounds.North, + Direction.South => clickable.Bounds.South, + Direction.West => clickable.Bounds.West, + _ => throw new InvalidOperationException() + }; + + return boundsForDir.Contains(modLocalPos); + } +} diff --git a/Content.Client/Gameplay/GameplayStateBase.cs b/Content.Client/Gameplay/GameplayStateBase.cs index 0a695b2c01..1e6fd485b3 100644 --- a/Content.Client/Gameplay/GameplayStateBase.cs +++ b/Content.Client/Gameplay/GameplayStateBase.cs @@ -2,6 +2,7 @@ using System.Linq; using System.Numerics; using Content.Client.Clickable; using Content.Client.UserInterface; +using Content.Client.Viewport; using Content.Shared.Input; using Robust.Client.ComponentTrees; using Robust.Client.GameObjects; @@ -13,11 +14,13 @@ using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; using Robust.Shared.Console; +using Robust.Shared.Graphics; using Robust.Shared.Input; using Robust.Shared.Input.Binding; using Robust.Shared.Map; using Robust.Shared.Player; using Robust.Shared.Timing; +using YamlDotNet.Serialization.TypeInspectors; namespace Content.Client.Gameplay { @@ -98,7 +101,15 @@ namespace Content.Client.Gameplay public EntityUid? GetClickedEntity(MapCoordinates coordinates) { - var first = GetClickableEntities(coordinates).FirstOrDefault(); + return GetClickedEntity(coordinates, _eyeManager.CurrentEye); + } + + public EntityUid? GetClickedEntity(MapCoordinates coordinates, IEye? eye) + { + if (eye == null) + return null; + + var first = GetClickableEntities(coordinates, eye).FirstOrDefault(); return first.IsValid() ? first : null; } @@ -110,6 +121,20 @@ namespace Content.Client.Gameplay public IEnumerable GetClickableEntities(MapCoordinates coordinates) { + return GetClickableEntities(coordinates, _eyeManager.CurrentEye); + } + + public IEnumerable GetClickableEntities(MapCoordinates coordinates, IEye? eye) + { + /* + * TODO: + * 1. Stuff like MeleeWeaponSystem need an easy way to hook into viewport specific entities / entities under mouse + * 2. Cleanup the mess around InteractionOutlineSystem + below the keybind click detection. + */ + + if (eye == null) + return Array.Empty(); + // Find all the entities intersecting our click var spriteTree = _entityManager.EntitySysManager.GetEntitySystem(); var entities = spriteTree.QueryAabb(coordinates.MapId, Box2.CenteredAround(coordinates.Position, new Vector2(1, 1))); @@ -117,15 +142,12 @@ namespace Content.Client.Gameplay // Check the entities against whether or not we can click them var foundEntities = new List<(EntityUid, int, uint, float)>(entities.Count); var clickQuery = _entityManager.GetEntityQuery(); - var xformQuery = _entityManager.GetEntityQuery(); - - // TODO: Smelly - var eye = _eyeManager.CurrentEye; + var clickables = _entityManager.System(); foreach (var entity in entities) { if (clickQuery.TryGetComponent(entity.Uid, out var component) && - component.CheckClick(entity.Component, entity.Transform, xformQuery, coordinates.Position, eye, out var drawDepthClicked, out var renderOrder, out var bottom)) + clickables.CheckClick((entity.Uid, component, entity.Component, entity.Transform), coordinates.Position, eye, out var drawDepthClicked, out var renderOrder, out var bottom)) { foundEntities.Add((entity.Uid, drawDepthClicked, renderOrder, bottom)); } @@ -188,7 +210,15 @@ namespace Content.Client.Gameplay if (args.Viewport is IViewportControl vp && kArgs.PointerLocation.IsValid) { var mousePosWorld = vp.PixelToMap(kArgs.PointerLocation.Position); - entityToClick = GetClickedEntity(mousePosWorld); + + if (vp is ScalingViewport svp) + { + entityToClick = GetClickedEntity(mousePosWorld, svp.Eye); + } + else + { + entityToClick = GetClickedEntity(mousePosWorld); + } coordinates = _mapManager.TryFindGridAt(mousePosWorld, out _, out var grid) ? grid.MapToGrid(mousePosWorld) : diff --git a/Content.Client/Outline/InteractionOutlineSystem.cs b/Content.Client/Outline/InteractionOutlineSystem.cs index 3dbbafbcaa..40cb5dfd4a 100644 --- a/Content.Client/Outline/InteractionOutlineSystem.cs +++ b/Content.Client/Outline/InteractionOutlineSystem.cs @@ -110,11 +110,15 @@ public sealed class InteractionOutlineSystem : EntitySystem && _inputManager.MouseScreenPosition.IsValid) { var mousePosWorld = vp.PixelToMap(_inputManager.MouseScreenPosition.Position); - entityToClick = screen.GetClickedEntity(mousePosWorld); if (vp is ScalingViewport svp) { renderScale = svp.CurrentRenderScale; + entityToClick = screen.GetClickedEntity(mousePosWorld, svp.Eye); + } + else + { + entityToClick = screen.GetClickedEntity(mousePosWorld); } } else if (_uiManager.CurrentlyHovered is EntityMenuElement element) diff --git a/Content.IntegrationTests/Tests/ClickableTest.cs b/Content.IntegrationTests/Tests/ClickableTest.cs index 7608538185..5983650908 100644 --- a/Content.IntegrationTests/Tests/ClickableTest.cs +++ b/Content.IntegrationTests/Tests/ClickableTest.cs @@ -52,7 +52,6 @@ namespace Content.IntegrationTests.Tests var serverEntManager = server.ResolveDependency(); var eyeManager = client.ResolveDependency(); var spriteQuery = clientEntManager.GetEntityQuery(); - var xformQuery = clientEntManager.GetEntityQuery(); var eye = client.ResolveDependency().CurrentEye; var testMap = await pair.CreateTestMap(); @@ -80,9 +79,8 @@ namespace Content.IntegrationTests.Tests eyeManager.CurrentEye.Rotation = 0; var pos = clientEntManager.System().GetWorldPosition(clientEnt); - var clickable = clientEntManager.GetComponent(clientEnt); - hit = clickable.CheckClick(sprite, xformQuery.GetComponent(clientEnt), xformQuery, new Vector2(clickPosX, clickPosY) + pos, eye, out _, out _, out _); + hit = clientEntManager.System().CheckClick((clientEnt, null, sprite, null), new Vector2(clickPosX, clickPosY) + pos, eye, out _, out _, out _); }); await server.WaitPost(() => From 0b256a025af538f12c566d4a8f9a73e30dcfee6e Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 9 Aug 2024 07:05:25 +0000 Subject: [PATCH 308/422] Automatic changelog update --- Resources/Changelog/Admin.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml index 41f0ca795a..a572418f16 100644 --- a/Resources/Changelog/Admin.yml +++ b/Resources/Changelog/Admin.yml @@ -445,5 +445,16 @@ Entries: id: 55 time: '2024-08-09T06:24:19.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30597 +- author: Errant + changes: + - message: The setgamepreset command now only sets the gamemode for a limited number + of rounds, specified by a second parameter. Afterwards it switches back to the + server default. Omitting the number parameter sets it for 1 round only. To change + the game mode for a longer period, either specify a high number or change the + game.fallbackpreset cvar so it will reset to what you want + type: Tweak + id: 56 + time: '2024-08-09T07:04:19.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30756 Name: Admin Order: 1 From 55d400b1b9d4ca4a600613ceb56152fb76c581c9 Mon Sep 17 00:00:00 2001 From: Ko4ergaPunk <62609550+Ko4ergaPunk@users.noreply.github.com> Date: Fri, 9 Aug 2024 10:06:37 +0300 Subject: [PATCH 309/422] New decals for mapping (#30374) * new decals * license * re-check --- .../Prototypes/Decals/Overlays/markups.yml | 39 ++++++++++++++++++ .../Decals/Overlays/markups.rsi/meta.json | 26 ++++++++++++ .../Overlays/markups.rsi/rectangle1x2.png | Bin 0 -> 115 bytes .../markups.rsi/rectangle1x2center.png | Bin 0 -> 115 bytes .../Decals/Overlays/markups.rsi/square.png | Bin 0 -> 117 bytes .../Overlays/markups.rsi/squareQuater.png | Bin 0 -> 116 bytes .../markups.rsi/squareQuaterCenter.png | Bin 0 -> 122 bytes 7 files changed, 65 insertions(+) create mode 100644 Resources/Prototypes/Decals/Overlays/markups.yml create mode 100644 Resources/Textures/Decals/Overlays/markups.rsi/meta.json create mode 100644 Resources/Textures/Decals/Overlays/markups.rsi/rectangle1x2.png create mode 100644 Resources/Textures/Decals/Overlays/markups.rsi/rectangle1x2center.png create mode 100644 Resources/Textures/Decals/Overlays/markups.rsi/square.png create mode 100644 Resources/Textures/Decals/Overlays/markups.rsi/squareQuater.png create mode 100644 Resources/Textures/Decals/Overlays/markups.rsi/squareQuaterCenter.png diff --git a/Resources/Prototypes/Decals/Overlays/markups.yml b/Resources/Prototypes/Decals/Overlays/markups.yml new file mode 100644 index 0000000000..cb8d56834e --- /dev/null +++ b/Resources/Prototypes/Decals/Overlays/markups.yml @@ -0,0 +1,39 @@ +- type: decal + id: MarkupSquare + tags: ["overlay"] + defaultCustomColor: true + sprite: + sprite: Decals/Overlays/markups.rsi + state: square + +- type: decal + id: MarkupRectangle1x2 + tags: ["overlay"] + defaultCustomColor: true + sprite: + sprite: Decals/Overlays/markups.rsi + state: rectangle1x2 + +- type: decal + id: MarkupRectangle1x2Center + tags: ["overlay"] + defaultCustomColor: true + sprite: + sprite: Decals/Overlays/markups.rsi + state: rectangle1x2center + +- type: decal + id: MarkupSquareQuater + tags: ["overlay"] + defaultCustomColor: true + sprite: + sprite: Decals/Overlays/markups.rsi + state: squareQuater + +- type: decal + id: MarkupSquareQuaterCenter + tags: ["overlay"] + defaultCustomColor: true + sprite: + sprite: Decals/Overlays/markups.rsi + state: squareQuaterCenter diff --git a/Resources/Textures/Decals/Overlays/markups.rsi/meta.json b/Resources/Textures/Decals/Overlays/markups.rsi/meta.json new file mode 100644 index 0000000000..162a07245b --- /dev/null +++ b/Resources/Textures/Decals/Overlays/markups.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "by Ko4erga (discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "square" + }, + { + "name": "rectangle1x2" + }, + { + "name": "rectangle1x2center" + }, + { + "name": "squareQuater" + }, + { + "name": "squareQuaterCenter" + } + ] +} diff --git a/Resources/Textures/Decals/Overlays/markups.rsi/rectangle1x2.png b/Resources/Textures/Decals/Overlays/markups.rsi/rectangle1x2.png new file mode 100644 index 0000000000000000000000000000000000000000..d88bcb36800e058539d7978b233197b281e36589 GIT binary patch literal 115 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}x}GkMArY-_ z&lxf@81Nk4u;!0tx}ke%2O1ce*?1%vJSOp*Eo6}?6}V^#)X3oJ L>gTe~DWM4fFg_l0 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Decals/Overlays/markups.rsi/square.png b/Resources/Textures/Decals/Overlays/markups.rsi/square.png new file mode 100644 index 0000000000000000000000000000000000000000..7e085ef1f6fc5248a63b609d826d7918b0b334ff GIT binary patch literal 117 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}`kpS1ArY-_ z&lxf@FmN2+&{%)onaw|I!OU%ElYd*X163dak4enF9V|BM&ZsnjL_J;oT-G@yGywo9 C#vL30 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Decals/Overlays/markups.rsi/squareQuater.png b/Resources/Textures/Decals/Overlays/markups.rsi/squareQuater.png new file mode 100644 index 0000000000000000000000000000000000000000..6d49b25d61096e117d1e3692a9b88ad0c5b3ea42 GIT binary patch literal 116 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}dY&$hArY-_ z&utWBFyLV_JpTK=PuqemR}TN>VJNtp%|B_$&3x$#LJAHI42(=HH7j?s$h_rz^AM<$ N!PC{xWt~$(69Dj*BgFs! literal 0 HcmV?d00001 diff --git a/Resources/Textures/Decals/Overlays/markups.rsi/squareQuaterCenter.png b/Resources/Textures/Decals/Overlays/markups.rsi/squareQuaterCenter.png new file mode 100644 index 0000000000000000000000000000000000000000..b160a089b79e069df5e99847a29c0c0f345a0c69 GIT binary patch literal 122 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}CY~;iArY-_ z&utV0s$y~6@PFQYK9d7y?#_6)p6f^KeZEO4CKqb&L`;6J&mo}T(7?dR#9;RH1&e}6 SWyeIIeg;ohKbLh*2~7a#RVB>; literal 0 HcmV?d00001 From b8fc879cd7314ea2603f73fa1978cc64c0fe8066 Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 9 Aug 2024 07:07:43 +0000 Subject: [PATCH 310/422] Automatic changelog update --- Resources/Changelog/Admin.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Resources/Changelog/Admin.yml b/Resources/Changelog/Admin.yml index a572418f16..58ee56ad0e 100644 --- a/Resources/Changelog/Admin.yml +++ b/Resources/Changelog/Admin.yml @@ -456,5 +456,12 @@ Entries: id: 56 time: '2024-08-09T07:04:19.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30756 +- author: Ko4erga + changes: + - message: Added new markup decals. + type: Add + id: 57 + time: '2024-08-09T07:06:37.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30374 Name: Admin Order: 1 From 1649ed45bd395c850bd531752f7146ca073b04cd Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Fri, 9 Aug 2024 17:39:27 +1000 Subject: [PATCH 311/422] Add access to gun components (#30688) * Add access to gun components Found from an rmc14 PR. * Admin verbs proving why access needs to exist * Someone is probably going to post this pr to le reddit and complain about self-merges. --- .../Administration/Systems/AdminVerbSystem.Tools.cs | 10 +--------- .../Components/BallisticAmmoProviderComponent.cs | 4 +++- .../ChamberMagazineAmmoProviderComponent.cs | 2 ++ .../Components/ContainerAmmoProviderComponent.cs | 4 +++- .../Components/MagazineAmmoProviderComponent.cs | 2 ++ .../Ranged/Systems/SharedGunSystem.Ballistic.cs | 11 +++++++++++ 6 files changed, 22 insertions(+), 11 deletions(-) diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs index 328fa74484..a00424a741 100644 --- a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs +++ b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs @@ -724,15 +724,7 @@ public sealed partial class AdminVerbSystem if (!int.TryParse(amount, out var result)) return; - if (result > 0) - { - ballisticAmmo.UnspawnedCount = result; - } - else - { - ballisticAmmo.UnspawnedCount = 0; - } - + _gun.SetBallisticUnspawned((args.Target, ballisticAmmo), result); _gun.UpdateBallisticAppearance(args.Target, ballisticAmmo); }); }, diff --git a/Content.Shared/Weapons/Ranged/Components/BallisticAmmoProviderComponent.cs b/Content.Shared/Weapons/Ranged/Components/BallisticAmmoProviderComponent.cs index eb04d3227d..f825f10550 100644 --- a/Content.Shared/Weapons/Ranged/Components/BallisticAmmoProviderComponent.cs +++ b/Content.Shared/Weapons/Ranged/Components/BallisticAmmoProviderComponent.cs @@ -1,3 +1,4 @@ +using Content.Shared.Weapons.Ranged.Systems; using Content.Shared.Whitelist; using Robust.Shared.Audio; using Robust.Shared.Containers; @@ -6,7 +7,7 @@ using Robust.Shared.Prototypes; namespace Content.Shared.Weapons.Ranged.Components; -[RegisterComponent, NetworkedComponent, AutoGenerateComponentState] +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(SharedGunSystem))] public sealed partial class BallisticAmmoProviderComponent : Component { [ViewVariables(VVAccess.ReadWrite), DataField] @@ -32,6 +33,7 @@ public sealed partial class BallisticAmmoProviderComponent : Component public Container Container = default!; // TODO: Make this use stacks when the typeserializer is done. + // Realistically just point to the container. [DataField, AutoNetworkedField] public List Entities = new(); diff --git a/Content.Shared/Weapons/Ranged/Components/ChamberMagazineAmmoProviderComponent.cs b/Content.Shared/Weapons/Ranged/Components/ChamberMagazineAmmoProviderComponent.cs index e64ec0d68d..37517c1371 100644 --- a/Content.Shared/Weapons/Ranged/Components/ChamberMagazineAmmoProviderComponent.cs +++ b/Content.Shared/Weapons/Ranged/Components/ChamberMagazineAmmoProviderComponent.cs @@ -1,3 +1,4 @@ +using Content.Shared.Weapons.Ranged.Systems; using Robust.Shared.Audio; namespace Content.Shared.Weapons.Ranged.Components; @@ -6,6 +7,7 @@ namespace Content.Shared.Weapons.Ranged.Components; /// Chamber + mags in one package. If you need just magazine then use /// [RegisterComponent, AutoGenerateComponentState] +[Access(typeof(SharedGunSystem))] public sealed partial class ChamberMagazineAmmoProviderComponent : MagazineAmmoProviderComponent { /// diff --git a/Content.Shared/Weapons/Ranged/Components/ContainerAmmoProviderComponent.cs b/Content.Shared/Weapons/Ranged/Components/ContainerAmmoProviderComponent.cs index 0f2884bf58..f49cc812c2 100644 --- a/Content.Shared/Weapons/Ranged/Components/ContainerAmmoProviderComponent.cs +++ b/Content.Shared/Weapons/Ranged/Components/ContainerAmmoProviderComponent.cs @@ -1,4 +1,5 @@ -using Robust.Shared.GameStates; +using Content.Shared.Weapons.Ranged.Systems; +using Robust.Shared.GameStates; namespace Content.Shared.Weapons.Ranged.Components; @@ -6,6 +7,7 @@ namespace Content.Shared.Weapons.Ranged.Components; /// Handles pulling entities from the given container to use as ammunition. /// [RegisterComponent] +[Access(typeof(SharedGunSystem))] public sealed partial class ContainerAmmoProviderComponent : AmmoProviderComponent { [DataField("container", required: true)] diff --git a/Content.Shared/Weapons/Ranged/Components/MagazineAmmoProviderComponent.cs b/Content.Shared/Weapons/Ranged/Components/MagazineAmmoProviderComponent.cs index 9aff60fd3a..56d09ceaa5 100644 --- a/Content.Shared/Weapons/Ranged/Components/MagazineAmmoProviderComponent.cs +++ b/Content.Shared/Weapons/Ranged/Components/MagazineAmmoProviderComponent.cs @@ -1,4 +1,5 @@ using Content.Shared.Weapons.Ranged.Components; +using Content.Shared.Weapons.Ranged.Systems; using Robust.Shared.Audio; namespace Content.Shared.Weapons.Ranged; @@ -7,6 +8,7 @@ namespace Content.Shared.Weapons.Ranged; /// Wrapper around a magazine (handled via ItemSlot). Passes all AmmoProvider logic onto it. /// [RegisterComponent, Virtual] +[Access(typeof(SharedGunSystem))] public partial class MagazineAmmoProviderComponent : AmmoProviderComponent { [ViewVariables(VVAccess.ReadWrite), DataField("soundAutoEject")] diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs index 4c5712c509..9ef5cbd702 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs @@ -277,6 +277,17 @@ public abstract partial class SharedGunSystem Appearance.SetData(uid, AmmoVisuals.AmmoCount, GetBallisticShots(component), appearance); Appearance.SetData(uid, AmmoVisuals.AmmoMax, component.Capacity, appearance); } + + public void SetBallisticUnspawned(Entity entity, int count) + { + if (entity.Comp.UnspawnedCount == count) + return; + + entity.Comp.UnspawnedCount = count; + UpdateBallisticAppearance(entity.Owner, entity.Comp); + UpdateAmmoCount(entity.Owner); + Dirty(entity); + } } /// From 0b2fa941a7723a86270c28e53e0ca439f73993b1 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Fri, 9 Aug 2024 17:39:45 +1000 Subject: [PATCH 312/422] Revert "setgamepreset command rework" (#30807) Revert "setgamepreset command rework (#30756)" This reverts commit de86fdb3730ac9109dff24c9d820a6ff6c923a16. --- .../Commands/SetGamePresetCommand.cs | 17 +- .../GameTicking/GameTicker.GamePreset.cs | 526 +++++++++--------- .../GameTicking/GameTicker.RoundFlow.cs | 3 - .../game-ticking/set-game-preset-command.ftl | 8 +- 4 files changed, 259 insertions(+), 295 deletions(-) diff --git a/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs b/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs index 78e2b452b7..83736bd92b 100644 --- a/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs +++ b/Content.Server/GameTicking/Commands/SetGamePresetCommand.cs @@ -2,7 +2,6 @@ using Content.Server.Administration; using Content.Server.GameTicking.Presets; using Content.Shared.Administration; -using Linguini.Shared.Util; using Robust.Shared.Console; using Robust.Shared.Prototypes; @@ -20,9 +19,9 @@ namespace Content.Server.GameTicking.Commands public void Execute(IConsoleShell shell, string argStr, string[] args) { - if (!args.Length.InRange(1, 2)) + if (args.Length != 1) { - shell.WriteError(Loc.GetString("shell-need-between-arguments", ("lower", 1), ("upper", 2), ("currentAmount", args.Length))); + shell.WriteError(Loc.GetString("shell-wrong-arguments-number-need-specific", ("properAmount", 1), ("currentAmount", args.Length))); return; } @@ -34,16 +33,8 @@ namespace Content.Server.GameTicking.Commands return; } - var rounds = 1; - - if (args.Length == 2 && !int.TryParse(args[1], out rounds)) - { - shell.WriteError(Loc.GetString("set-game-preset-optional-argument-not-integer")); - return; - } - - ticker.SetGamePreset(preset, false, rounds); - shell.WriteLine(Loc.GetString("set-game-preset-preset-set-finite", ("preset", preset.ID), ("rounds", rounds.ToString()))); + ticker.SetGamePreset(preset); + shell.WriteLine(Loc.GetString("set-game-preset-preset-set", ("preset", preset.ID))); } public CompletionResult GetCompletion(IConsoleShell shell, string[] args) diff --git a/Content.Server/GameTicking/GameTicker.GamePreset.cs b/Content.Server/GameTicking/GameTicker.GamePreset.cs index 6c12a2ea27..5a2b375dd6 100644 --- a/Content.Server/GameTicking/GameTicker.GamePreset.cs +++ b/Content.Server/GameTicking/GameTicker.GamePreset.cs @@ -16,327 +16,305 @@ using Content.Shared.Mobs.Systems; using JetBrains.Annotations; using Robust.Shared.Player; -namespace Content.Server.GameTicking; - -public sealed partial class GameTicker +namespace Content.Server.GameTicking { - [Dependency] private readonly MobThresholdSystem _mobThresholdSystem = default!; - - public const float PresetFailedCooldownIncrease = 30f; - - /// - /// The selected preset that will be used at the start of the next round. - /// - public GamePresetPrototype? Preset { get; private set; } - - /// - /// The preset that's currently active. - /// - public GamePresetPrototype? CurrentPreset { get; private set; } - - /// - /// Countdown to the preset being reset to the server default. - /// - public int? ResetCountdown; - - private bool StartPreset(ICommonSession[] origReadyPlayers, bool force) + public sealed partial class GameTicker { - var startAttempt = new RoundStartAttemptEvent(origReadyPlayers, force); - RaiseLocalEvent(startAttempt); + [Dependency] private readonly MobThresholdSystem _mobThresholdSystem = default!; - if (!startAttempt.Cancelled) - return true; + public const float PresetFailedCooldownIncrease = 30f; - var presetTitle = CurrentPreset != null ? Loc.GetString(CurrentPreset.ModeTitle) : string.Empty; + /// + /// The selected preset that will be used at the start of the next round. + /// + public GamePresetPrototype? Preset { get; private set; } - void FailedPresetRestart() + /// + /// The preset that's currently active. + /// + public GamePresetPrototype? CurrentPreset { get; private set; } + + private bool StartPreset(ICommonSession[] origReadyPlayers, bool force) { - SendServerMessage(Loc.GetString("game-ticker-start-round-cannot-start-game-mode-restart", - ("failedGameMode", presetTitle))); - RestartRound(); - DelayStart(TimeSpan.FromSeconds(PresetFailedCooldownIncrease)); - } + var startAttempt = new RoundStartAttemptEvent(origReadyPlayers, force); + RaiseLocalEvent(startAttempt); - if (_configurationManager.GetCVar(CCVars.GameLobbyFallbackEnabled)) - { - var fallbackPresets = _configurationManager.GetCVar(CCVars.GameLobbyFallbackPreset).Split(","); - var startFailed = true; + if (!startAttempt.Cancelled) + return true; - foreach (var preset in fallbackPresets) + var presetTitle = CurrentPreset != null ? Loc.GetString(CurrentPreset.ModeTitle) : string.Empty; + + void FailedPresetRestart() { - ClearGameRules(); - SetGamePreset(preset); - AddGamePresetRules(); - StartGamePresetRules(); + SendServerMessage(Loc.GetString("game-ticker-start-round-cannot-start-game-mode-restart", + ("failedGameMode", presetTitle))); + RestartRound(); + DelayStart(TimeSpan.FromSeconds(PresetFailedCooldownIncrease)); + } - startAttempt.Uncancel(); - RaiseLocalEvent(startAttempt); + if (_configurationManager.GetCVar(CCVars.GameLobbyFallbackEnabled)) + { + var fallbackPresets = _configurationManager.GetCVar(CCVars.GameLobbyFallbackPreset).Split(","); + var startFailed = true; - if (!startAttempt.Cancelled) + foreach (var preset in fallbackPresets) { - _chatManager.SendAdminAnnouncement( - Loc.GetString("game-ticker-start-round-cannot-start-game-mode-fallback", - ("failedGameMode", presetTitle), - ("fallbackMode", Loc.GetString(preset)))); - RefreshLateJoinAllowed(); - startFailed = false; - break; + ClearGameRules(); + SetGamePreset(preset); + AddGamePresetRules(); + StartGamePresetRules(); + + startAttempt.Uncancel(); + RaiseLocalEvent(startAttempt); + + if (!startAttempt.Cancelled) + { + _chatManager.SendAdminAnnouncement( + Loc.GetString("game-ticker-start-round-cannot-start-game-mode-fallback", + ("failedGameMode", presetTitle), + ("fallbackMode", Loc.GetString(preset)))); + RefreshLateJoinAllowed(); + startFailed = false; + break; + } + } + + if (startFailed) + { + FailedPresetRestart(); + return false; } } - if (startFailed) + else { FailedPresetRestart(); return false; } + + return true; } - else + private void InitializeGamePreset() { - FailedPresetRestart(); - return false; + SetGamePreset(LobbyEnabled ? _configurationManager.GetCVar(CCVars.GameLobbyDefaultPreset) : "sandbox"); } - return true; - } - - private void InitializeGamePreset() - { - SetGamePreset(LobbyEnabled ? _configurationManager.GetCVar(CCVars.GameLobbyDefaultPreset) : "sandbox"); - } - - public void SetGamePreset(GamePresetPrototype? preset, bool force = false, int? resetDelay = null) - { - // Do nothing if this game ticker is a dummy! - if (DummyTicker) - return; - - if (resetDelay is not null) + public void SetGamePreset(GamePresetPrototype? preset, bool force = false) { - ResetCountdown = resetDelay.Value; - // Reset counter is checked and changed at the end of each round - // So if the game is in the lobby, the first requested round will happen before the check, and we need one less check - if (CurrentPreset is null) - ResetCountdown = resetDelay.Value -1; - } + // Do nothing if this game ticker is a dummy! + if (DummyTicker) + return; - Preset = preset; - ValidateMap(); - UpdateInfoText(); + Preset = preset; + ValidateMap(); + UpdateInfoText(); - if (force) - { - StartRound(true); - } - } - - public void SetGamePreset(string preset, bool force = false) - { - var proto = FindGamePreset(preset); - if(proto != null) - SetGamePreset(proto, force); - } - - public GamePresetPrototype? FindGamePreset(string preset) - { - if (_prototypeManager.TryIndex(preset, out GamePresetPrototype? presetProto)) - return presetProto; - - foreach (var proto in _prototypeManager.EnumeratePrototypes()) - { - foreach (var alias in proto.Alias) + if (force) { - if (preset.Equals(alias, StringComparison.InvariantCultureIgnoreCase)) - return proto; + StartRound(true); } } - return null; - } - - public bool TryFindGamePreset(string preset, [NotNullWhen(true)] out GamePresetPrototype? prototype) - { - prototype = FindGamePreset(preset); - - return prototype != null; - } - - public bool IsMapEligible(GameMapPrototype map) - { - if (Preset == null) - return true; - - if (Preset.MapPool == null || !_prototypeManager.TryIndex(Preset.MapPool, out var pool)) - return true; - - return pool.Maps.Contains(map.ID); - } - - private void ValidateMap() - { - if (Preset == null || _gameMapManager.GetSelectedMap() is not { } map) - return; - - if (Preset.MapPool == null || - !_prototypeManager.TryIndex(Preset.MapPool, out var pool)) - return; - - if (pool.Maps.Contains(map.ID)) - return; - - _gameMapManager.SelectMapRandom(); - } - - [PublicAPI] - private bool AddGamePresetRules() - { - if (DummyTicker || Preset == null) - return false; - - CurrentPreset = Preset; - foreach (var rule in Preset.Rules) + public void SetGamePreset(string preset, bool force = false) { - AddGameRule(rule); + var proto = FindGamePreset(preset); + if(proto != null) + SetGamePreset(proto, force); } - return true; - } - - private void TryResetPreset() - { - if (ResetCountdown is null || ResetCountdown-- > 0) - return; - - InitializeGamePreset(); - ResetCountdown = null; - } - - public void StartGamePresetRules() - { - // May be touched by the preset during init. - var rules = new List(GetAddedGameRules()); - foreach (var rule in rules) + public GamePresetPrototype? FindGamePreset(string preset) { - StartGameRule(rule); - } - } + if (_prototypeManager.TryIndex(preset, out GamePresetPrototype? presetProto)) + return presetProto; - public bool OnGhostAttempt(EntityUid mindId, bool canReturnGlobal, bool viaCommand = false, MindComponent? mind = null) - { - if (!Resolve(mindId, ref mind)) - return false; - - var playerEntity = mind.CurrentEntity; - - if (playerEntity != null && viaCommand) - _adminLogger.Add(LogType.Mind, $"{EntityManager.ToPrettyString(playerEntity.Value):player} is attempting to ghost via command"); - - var handleEv = new GhostAttemptHandleEvent(mind, canReturnGlobal); - RaiseLocalEvent(handleEv); - - // Something else has handled the ghost attempt for us! We return its result. - if (handleEv.Handled) - return handleEv.Result; - - if (mind.PreventGhosting) - { - if (mind.Session != null) // Logging is suppressed to prevent spam from ghost attempts caused by movement attempts + foreach (var proto in _prototypeManager.EnumeratePrototypes()) { - _chatManager.DispatchServerMessage(mind.Session, Loc.GetString("comp-mind-ghosting-prevented"), - true); - } - - return false; - } - - if (TryComp(playerEntity, out var comp) && !comp.CanGhostInteract) - return false; - - if (mind.VisitingEntity != default) - { - _mind.UnVisit(mindId, mind: mind); - } - - var position = Exists(playerEntity) - ? Transform(playerEntity.Value).Coordinates - : GetObserverSpawnPoint(); - - if (position == default) - return false; - - // Ok, so, this is the master place for the logic for if ghosting is "too cheaty" to allow returning. - // There's no reason at this time to move it to any other place, especially given that the 'side effects required' situations would also have to be moved. - // + If CharacterDeadPhysically applies, we're physically dead. Therefore, ghosting OK, and we can return (this is critical for gibbing) - // Note that we could theoretically be ICly dead and still physically alive and vice versa. - // (For example, a zombie could be dead ICly, but may retain memories and is definitely physically active) - // + If we're in a mob that is critical, and we're supposed to be able to return if possible, - // we're succumbing - the mob is killed. Therefore, character is dead. Ghosting OK. - // (If the mob survives, that's a bug. Ghosting is kept regardless.) - var canReturn = canReturnGlobal && _mind.IsCharacterDeadPhysically(mind); - - if (_configurationManager.GetCVar(CCVars.GhostKillCrit) && - canReturnGlobal && - TryComp(playerEntity, out MobStateComponent? mobState)) - { - if (_mobState.IsCritical(playerEntity.Value, mobState)) - { - canReturn = true; - - //todo: what if they dont breathe lol - //cry deeply - - FixedPoint2 dealtDamage = 200; - if (TryComp(playerEntity, out var damageable) - && TryComp(playerEntity, out var thresholds)) + foreach (var alias in proto.Alias) { - var playerDeadThreshold = _mobThresholdSystem.GetThresholdForState(playerEntity.Value, MobState.Dead, thresholds); - dealtDamage = playerDeadThreshold - damageable.TotalDamage; + if (preset.Equals(alias, StringComparison.InvariantCultureIgnoreCase)) + return proto; + } + } + + return null; + } + + public bool TryFindGamePreset(string preset, [NotNullWhen(true)] out GamePresetPrototype? prototype) + { + prototype = FindGamePreset(preset); + + return prototype != null; + } + + public bool IsMapEligible(GameMapPrototype map) + { + if (Preset == null) + return true; + + if (Preset.MapPool == null || !_prototypeManager.TryIndex(Preset.MapPool, out var pool)) + return true; + + return pool.Maps.Contains(map.ID); + } + + private void ValidateMap() + { + if (Preset == null || _gameMapManager.GetSelectedMap() is not { } map) + return; + + if (Preset.MapPool == null || + !_prototypeManager.TryIndex(Preset.MapPool, out var pool)) + return; + + if (pool.Maps.Contains(map.ID)) + return; + + _gameMapManager.SelectMapRandom(); + } + + [PublicAPI] + private bool AddGamePresetRules() + { + if (DummyTicker || Preset == null) + return false; + + CurrentPreset = Preset; + foreach (var rule in Preset.Rules) + { + AddGameRule(rule); + } + + return true; + } + + public void StartGamePresetRules() + { + // May be touched by the preset during init. + var rules = new List(GetAddedGameRules()); + foreach (var rule in rules) + { + StartGameRule(rule); + } + } + + public bool OnGhostAttempt(EntityUid mindId, bool canReturnGlobal, bool viaCommand = false, MindComponent? mind = null) + { + if (!Resolve(mindId, ref mind)) + return false; + + var playerEntity = mind.CurrentEntity; + + if (playerEntity != null && viaCommand) + _adminLogger.Add(LogType.Mind, $"{EntityManager.ToPrettyString(playerEntity.Value):player} is attempting to ghost via command"); + + var handleEv = new GhostAttemptHandleEvent(mind, canReturnGlobal); + RaiseLocalEvent(handleEv); + + // Something else has handled the ghost attempt for us! We return its result. + if (handleEv.Handled) + return handleEv.Result; + + if (mind.PreventGhosting) + { + if (mind.Session != null) // Logging is suppressed to prevent spam from ghost attempts caused by movement attempts + { + _chatManager.DispatchServerMessage(mind.Session, Loc.GetString("comp-mind-ghosting-prevented"), + true); } - DamageSpecifier damage = new(_prototypeManager.Index("Asphyxiation"), dealtDamage); - - _damageable.TryChangeDamage(playerEntity, damage, true); + return false; } + + if (TryComp(playerEntity, out var comp) && !comp.CanGhostInteract) + return false; + + if (mind.VisitingEntity != default) + { + _mind.UnVisit(mindId, mind: mind); + } + + var position = Exists(playerEntity) + ? Transform(playerEntity.Value).Coordinates + : GetObserverSpawnPoint(); + + if (position == default) + return false; + + // Ok, so, this is the master place for the logic for if ghosting is "too cheaty" to allow returning. + // There's no reason at this time to move it to any other place, especially given that the 'side effects required' situations would also have to be moved. + // + If CharacterDeadPhysically applies, we're physically dead. Therefore, ghosting OK, and we can return (this is critical for gibbing) + // Note that we could theoretically be ICly dead and still physically alive and vice versa. + // (For example, a zombie could be dead ICly, but may retain memories and is definitely physically active) + // + If we're in a mob that is critical, and we're supposed to be able to return if possible, + // we're succumbing - the mob is killed. Therefore, character is dead. Ghosting OK. + // (If the mob survives, that's a bug. Ghosting is kept regardless.) + var canReturn = canReturnGlobal && _mind.IsCharacterDeadPhysically(mind); + + if (_configurationManager.GetCVar(CCVars.GhostKillCrit) && + canReturnGlobal && + TryComp(playerEntity, out MobStateComponent? mobState)) + { + if (_mobState.IsCritical(playerEntity.Value, mobState)) + { + canReturn = true; + + //todo: what if they dont breathe lol + //cry deeply + + FixedPoint2 dealtDamage = 200; + if (TryComp(playerEntity, out var damageable) + && TryComp(playerEntity, out var thresholds)) + { + var playerDeadThreshold = _mobThresholdSystem.GetThresholdForState(playerEntity.Value, MobState.Dead, thresholds); + dealtDamage = playerDeadThreshold - damageable.TotalDamage; + } + + DamageSpecifier damage = new(_prototypeManager.Index("Asphyxiation"), dealtDamage); + + _damageable.TryChangeDamage(playerEntity, damage, true); + } + } + + var ghost = _ghost.SpawnGhost((mindId, mind), position, canReturn); + if (ghost == null) + return false; + + if (playerEntity != null) + _adminLogger.Add(LogType.Mind, $"{EntityManager.ToPrettyString(playerEntity.Value):player} ghosted{(!canReturn ? " (non-returnable)" : "")}"); + + return true; } - var ghost = _ghost.SpawnGhost((mindId, mind), position, canReturn); - if (ghost == null) - return false; - - if (playerEntity != null) - _adminLogger.Add(LogType.Mind, $"{EntityManager.ToPrettyString(playerEntity.Value):player} ghosted{(!canReturn ? " (non-returnable)" : "")}"); - - return true; - } - - private void IncrementRoundNumber() - { - var playerIds = _playerGameStatuses.Keys.Select(player => player.UserId).ToArray(); - var serverName = _configurationManager.GetCVar(CCVars.AdminLogsServerName); - - // TODO FIXME AAAAAAAAAAAAAAAAAAAH THIS IS BROKEN - // Task.Run as a terrible dirty workaround to avoid synchronization context deadlock from .Result here. - // This whole setup logic should be made asynchronous so we can properly wait on the DB AAAAAAAAAAAAAH - var task = Task.Run(async () => + private void IncrementRoundNumber() { - var server = await _dbEntryManager.ServerEntity; - return await _db.AddNewRound(server, playerIds); - }); + var playerIds = _playerGameStatuses.Keys.Select(player => player.UserId).ToArray(); + var serverName = _configurationManager.GetCVar(CCVars.AdminLogsServerName); - _taskManager.BlockWaitOnTask(task); - RoundId = task.GetAwaiter().GetResult(); + // TODO FIXME AAAAAAAAAAAAAAAAAAAH THIS IS BROKEN + // Task.Run as a terrible dirty workaround to avoid synchronization context deadlock from .Result here. + // This whole setup logic should be made asynchronous so we can properly wait on the DB AAAAAAAAAAAAAH + var task = Task.Run(async () => + { + var server = await _dbEntryManager.ServerEntity; + return await _db.AddNewRound(server, playerIds); + }); + + _taskManager.BlockWaitOnTask(task); + RoundId = task.GetAwaiter().GetResult(); + } } -} -public sealed class GhostAttemptHandleEvent : HandledEntityEventArgs -{ - public MindComponent Mind { get; } - public bool CanReturnGlobal { get; } - public bool Result { get; set; } - - public GhostAttemptHandleEvent(MindComponent mind, bool canReturnGlobal) + public sealed class GhostAttemptHandleEvent : HandledEntityEventArgs { - Mind = mind; - CanReturnGlobal = canReturnGlobal; + public MindComponent Mind { get; } + public bool CanReturnGlobal { get; } + public bool Result { get; set; } + + public GhostAttemptHandleEvent(MindComponent mind, bool canReturnGlobal) + { + Mind = mind; + CanReturnGlobal = canReturnGlobal; + } } } diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs index dc242fb6c0..ca087c46ed 100644 --- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs +++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs @@ -487,9 +487,6 @@ namespace Content.Server.GameTicking if (_serverUpdates.RoundEnded()) return; - // Check if the GamePreset needs to be reset - TryResetPreset(); - _sawmill.Info("Restarting round!"); SendServerMessage(Loc.GetString("game-ticker-restart-round")); diff --git a/Resources/Locale/en-US/game-ticking/set-game-preset-command.ftl b/Resources/Locale/en-US/game-ticking/set-game-preset-command.ftl index 323d83aeba..46049643cb 100644 --- a/Resources/Locale/en-US/game-ticking/set-game-preset-command.ftl +++ b/Resources/Locale/en-US/game-ticking/set-game-preset-command.ftl @@ -1,7 +1,5 @@ -set-game-preset-command-description = Sets the game preset for the specified number of upcoming rounds. -set-game-preset-command-help-text = setgamepreset [number of rounds, defaulting to 1] -set-game-preset-optional-argument-not-integer = If argument 2 is provided it must be a number. +set-game-preset-command-description = Sets the game preset for the current round. +set-game-preset-command-help-text = setgamepreset set-game-preset-preset-error = Unable to find game preset "{$preset}" -#set-game-preset-preset-set = Set game preset to "{$preset}" -set-game-preset-preset-set-finite = Set game preset to "{$preset}" for the next {$rounds} rounds. +set-game-preset-preset-set = Set game preset to "{$preset}" From d0a2187a9bf11de9c1d7bcde62f403e0cb845c07 Mon Sep 17 00:00:00 2001 From: eoineoineoin Date: Fri, 9 Aug 2024 08:41:29 +0100 Subject: [PATCH 313/422] Improve Criminal Records Computer usability (#30292) * Avoid destroying and recreating record list on every update message * Add early-out on nullptr input * Remove sussy null suppress --------- Co-authored-by: Eoin Mcloughlin Co-authored-by: metalgearsloth --- .../CriminalRecordsConsoleWindow.xaml.cs | 80 +++++++++++++------ 1 file changed, 56 insertions(+), 24 deletions(-) diff --git a/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml.cs b/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml.cs index b259e08e72..21aa54c962 100644 --- a/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml.cs +++ b/Content.Client/CriminalRecords/CriminalRecordsConsoleWindow.xaml.cs @@ -7,10 +7,12 @@ using Content.Shared.Security; using Content.Shared.StationRecords; using Robust.Client.AutoGenerated; using Robust.Client.Player; +using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.XAML; using Robust.Shared.Prototypes; using Robust.Shared.Random; using Robust.Shared.Utility; +using System.Linq; namespace Content.Client.CriminalRecords; @@ -36,7 +38,6 @@ public sealed partial class CriminalRecordsConsoleWindow : FancyWindow public Action? OnDialogConfirmed; private uint _maxLength; - private bool _isPopulating; private bool _access; private uint? _selectedKey; private CriminalRecord? _selectedRecord; @@ -74,7 +75,7 @@ public sealed partial class CriminalRecordsConsoleWindow : FancyWindow RecordListing.OnItemSelected += args => { - if (_isPopulating || RecordListing[args.ItemIndex].Metadata is not uint cast) + if (RecordListing[args.ItemIndex].Metadata is not uint cast) return; OnKeySelected?.Invoke(cast); @@ -82,8 +83,7 @@ public sealed partial class CriminalRecordsConsoleWindow : FancyWindow RecordListing.OnItemDeselected += _ => { - if (!_isPopulating) - OnKeySelected?.Invoke(null); + OnKeySelected?.Invoke(null); }; FilterType.OnItemSelected += eventArgs => @@ -133,13 +133,8 @@ public sealed partial class CriminalRecordsConsoleWindow : FancyWindow FilterType.SelectId((int)_currentFilterType); - // set up the records listing panel - RecordListing.Clear(); - - var hasRecords = state.RecordListing != null && state.RecordListing.Count > 0; - NoRecords.Visible = !hasRecords; - if (hasRecords) - PopulateRecordListing(state.RecordListing!); + NoRecords.Visible = state.RecordListing == null || state.RecordListing.Count == 0; + PopulateRecordListing(state.RecordListing); // set up the selected person's record var selected = _selectedKey != null; @@ -167,19 +162,59 @@ public sealed partial class CriminalRecordsConsoleWindow : FancyWindow } } - private void PopulateRecordListing(Dictionary listing) + private void PopulateRecordListing(Dictionary? listing) { - _isPopulating = true; - - foreach (var (key, name) in listing) + if (listing == null) { - var item = RecordListing.AddItem(name); - item.Metadata = key; - item.Selected = key == _selectedKey; + RecordListing.Clear(); + return; } - _isPopulating = false; - RecordListing.SortItemsByText(); + var entries = listing.ToList(); + entries.Sort((a, b) => string.Compare(a.Value, b.Value, StringComparison.Ordinal)); + // `entries` now contains the definitive list of items which should be in + // our list of records and is in the order we want to present those items. + + // Walk through the existing items in RecordListing and in the updated listing + // in parallel to synchronize the items in RecordListing with `entries`. + int i = RecordListing.Count - 1; + int j = entries.Count - 1; + while(i >= 0 && j >= 0) + { + var strcmp = string.Compare(RecordListing[i].Text, entries[j].Value, StringComparison.Ordinal); + if (strcmp == 0) + { + // This item exists in both RecordListing and `entries`. Nothing to do. + i--; + j--; + } + else if (strcmp > 0) + { + // Item exists in RecordListing, but not in `entries`. Remove it. + RecordListing.RemoveAt(i); + i--; + } + else if (strcmp < 0) + { + // A new entry which doesn't exist in RecordListing. Create it. + RecordListing.Insert(i + 1, new ItemList.Item(RecordListing){Text = entries[j].Value, Metadata = entries[j].Key}); + j--; + } + } + + // Any remaining items in RecordListing don't exist in `entries`, so remove them + while (i >= 0) + { + RecordListing.RemoveAt(i); + i--; + } + + // And finally, any remaining items in `entries`, don't exist in RecordListing. Create them. + while (j >= 0) + { + RecordListing.Insert(0, new ItemList.Item(RecordListing){Text = entries[j].Value, Metadata = entries[j].Key}); + j--; + } } private void PopulateRecordContainer(GeneralStationRecord stationRecord, CriminalRecord criminalRecord) @@ -211,10 +246,7 @@ public sealed partial class CriminalRecordsConsoleWindow : FancyWindow private void FilterListingOfRecords(string text = "") { - if (!_isPopulating) - { - OnFiltersChanged?.Invoke(_currentFilterType, text); - } + OnFiltersChanged?.Invoke(_currentFilterType, text); } private void SetStatus(SecurityStatus status) From ed8bcb0a664b12f6ac5f4566bf332acc6686527e Mon Sep 17 00:00:00 2001 From: deltanedas <39013340+deltanedas@users.noreply.github.com> Date: Fri, 9 Aug 2024 07:43:57 +0000 Subject: [PATCH 314/422] improve job special (#30753) * cleanup of AddComponentSpecial * add RemoveComponentSpecial * require --------- Co-authored-by: deltanedas <@deltanedas:kde.org> --- Content.Server/Jobs/AddComponentSpecial.cs | 42 +++++++------------ Content.Server/Jobs/RemoveComponentSpecial.cs | 16 +++++++ 2 files changed, 31 insertions(+), 27 deletions(-) create mode 100644 Content.Server/Jobs/RemoveComponentSpecial.cs diff --git a/Content.Server/Jobs/AddComponentSpecial.cs b/Content.Server/Jobs/AddComponentSpecial.cs index 6489068d1f..3bac923656 100644 --- a/Content.Server/Jobs/AddComponentSpecial.cs +++ b/Content.Server/Jobs/AddComponentSpecial.cs @@ -1,34 +1,22 @@ using Content.Shared.Roles; -using JetBrains.Annotations; using Robust.Shared.Prototypes; -using Robust.Shared.Serialization.Manager; -namespace Content.Server.Jobs +namespace Content.Server.Jobs; + +public sealed partial class AddComponentSpecial : JobSpecial { - [UsedImplicitly] - public sealed partial class AddComponentSpecial : JobSpecial + [DataField(required: true)] + public ComponentRegistry Components { get; private set; } = new(); + + /// + /// If this is true then existing components will be removed and replaced with these ones. + /// + [DataField] + public bool RemoveExisting = true; + + public override void AfterEquip(EntityUid mob) { - [DataField("components")] - [AlwaysPushInheritance] - public ComponentRegistry Components { get; private set; } = new(); - - public override void AfterEquip(EntityUid mob) - { - // now its a registry of components, still throws i bet. - // TODO: This is hot garbage and probably needs an engine change to not be a POS. - var factory = IoCManager.Resolve(); - var entityManager = IoCManager.Resolve(); - var serializationManager = IoCManager.Resolve(); - - foreach (var (name, data) in Components) - { - var component = (Component) factory.GetComponent(name); - - var temp = (object)component; - serializationManager.CopyTo(data.Component, ref temp); - entityManager.RemoveComponent(mob, temp!.GetType()); - entityManager.AddComponent(mob, (Component)temp); - } - } + var entMan = IoCManager.Resolve(); + entMan.AddComponents(mob, Components, removeExisting: RemoveExisting); } } diff --git a/Content.Server/Jobs/RemoveComponentSpecial.cs b/Content.Server/Jobs/RemoveComponentSpecial.cs new file mode 100644 index 0000000000..7a9b03b3ba --- /dev/null +++ b/Content.Server/Jobs/RemoveComponentSpecial.cs @@ -0,0 +1,16 @@ +using Content.Shared.Roles; +using Robust.Shared.Prototypes; + +namespace Content.Server.Jobs; + +public sealed partial class RemoveComponentSpecial : JobSpecial +{ + [DataField(required: true)] + public ComponentRegistry Components { get; private set; } = new(); + + public override void AfterEquip(EntityUid mob) + { + var entMan = IoCManager.Resolve(); + entMan.RemoveComponents(mob, Components); + } +} From c1797b769ce5c5075bfbebe766c86af7812d91a6 Mon Sep 17 00:00:00 2001 From: Ubaser <134914314+UbaserB@users.noreply.github.com> Date: Fri, 9 Aug 2024 20:32:55 +1000 Subject: [PATCH 315/422] Resprite the equipped gas canister suit slots (#30809) * add * red and generic * add meta --- .../Tanks/generic.rsi/equipped-BACKPACK.png | Bin 825 -> 1735 bytes .../Tanks/generic.rsi/equipped-SUITSTORAGE.png | Bin 825 -> 1735 bytes .../Objects/Tanks/generic.rsi/meta.json | 2 +- .../Tanks/oxygen.rsi/equipped-BACKPACK.png | Bin 834 -> 1714 bytes .../Tanks/oxygen.rsi/equipped-SUITSTORAGE.png | Bin 834 -> 1714 bytes .../Objects/Tanks/oxygen.rsi/meta.json | 2 +- .../Tanks/red.rsi/equipped-BACKPACK.png | Bin 851 -> 1720 bytes .../Tanks/red.rsi/equipped-SUITSTORAGE.png | Bin 851 -> 1720 bytes .../Textures/Objects/Tanks/red.rsi/meta.json | 2 +- 9 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Textures/Objects/Tanks/generic.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Tanks/generic.rsi/equipped-BACKPACK.png index 332f1d08f379381014c952c39d8df8a5daf1c26f..e3837b63666b3d01f549304f10340763ed4ce47f 100644 GIT binary patch literal 1735 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy zw18|5AO?X;!IOa`XMsm#F$06fED&ZCw^H21z`)#)84^(v;p=0SoS&h?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6 zGOr}DLN~8i8Da>`9GBGM~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fwU3rjN#3Q|*aogAIL1Ay2@AEF%97>FpU={EXU z9AX3VzExyUYH@x}DJTN$jLb}Iz=47yiiiq`jtHzekVVmT1Z3owD$~;#DGl*n8L&)%l(NH#fN-EdJNzwD5U@W#@7(rPdj0?8>etTc<0n&5ldC zwWad2_U4-=pXQ#AjpQXCBo2xK8x@#8_APU)4COZO=n&6S^f=b3i) z>ks>1?`3?Fcdpx~q-bMtL%?%)_3b-9u_YK=Wd72e-*El^@)ppYvB}7F_wM_*6jUGt&X*b60Yz zE^pS`b$POI^7h0()oU5IO})0v-0l4Wn>T-!ByF@XIBT@O|7FH&Nm;kqd|`TJALBMu z%=6@)>sNR2?uY$h@7El8?LRL_#5E-UP4KjHmLXbGjSuhVyR~I^c=@^0JC&;+s8nwK z`=xOE_Ftd=UjMfJURKTbds*+}nu^6@5AZTq{C%eT^mFB}nEZ=hw%Rja>+|2dB~Y)D z@xv^pWl!$y{cj);FsbS09o|)8t3&jrue`ged)e%>YG&xPC76$DKOwb20~2t+ z1-|oEZ}w!j*Q%CTUDD_9DSa*9=7sM4%283fe9wEUo;)^n^4^M{T~TLi`?S|x%{sQX zPn040;gjjytdD$;Kkex8BYy(`NklyjTOP4uEDJ*;{u z1;Nlu=p{M!FX>-VO8Yl7287a!)KkS=HiS@x?gu`L5g+;vo_{p6qFbh0-{lPI= zrW}yVW+#T)YJV^QtMkw-Y+(`m2YZglG93YvLd|LjPMf)$0#0Je0a~|X>-sEWDh-NO zdbctG@HYe4#Z&|w6$%qSIC9x6J1P`hTL%V%0lZ!>27`euIi@0jX8}18XFmT5R)Yat zscmT8j-CbX(g}Rr{>=@RmX>gMcnC?7bltRW$MpZeTz{_Iaw5)BFJB>($)H#);@j6R zmVShQIduT=@4tst;|YQw2!bF8f*=TjAnql?O3FM|UPk)|MBC=Vs<6+$f@`fmH^u|Q z7j>=m!TSe{5LSixW(TjxTB*Fc#ps&{hW!H~3=P@c-DNvFJ5W^>0B~`7f>ODn?+wg? zGx&=EhJX7Oaw5*2N1`~ZHjzpvp(qOS`TRs3g%QB(?y9Ql#*Wth-QExxW!%`Ma>euO z^IPV9(}W~RP!z>bhHwqo*x0bCru*>zflw$UyjSRe^YinG*NplF++b2q!uoausdN&J zMnfpW_V)NR`vRO8oB9LnJUk2i0Csf{W&yqk@_$q~%Cu9Ukq(k1IkO0EZEeBt_ahdI zSx|2}#9}clFE1k+jSBA-MnFEFN3B+as;ZC^adz9|w|fQd`kR1f9^RKQPM_oBW3=0C z^m;v^JVOWc+gG~r!1!=;dm4xwTq;*Q>)R35YPA3iZ7{;n0e_5hrT5QCE>2JM<1DOG h1ROyS1VIop$!~^tL4h?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6 zGOr}DLN~8i8Da>`9GBGM~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fwU3rjN#3Q|*aogAIL1Ay2@AEF%97>FpU={EXU z9AX3VzExyUYH@x}DJTN$jLb}Iz=47yiiiq`jtHzekVVmT1Z3owD$~;#DGl*n8L&)%l(NH#fN-EdJNzwD5U@W#@7(rPdj0?8>etTc<0n&5ldC zwWad2_U4-=pXQ#AjpQXCBo2xK8x@#8_APU)4COZO=n&6S^f=b3i) z>ks>1?`3?Fcdpx~q-bMtL%?%)_3b-9u_YK=Wd72e-*El^@)ppYvB}7F_wM_*6jUGt&X*b60Yz zE^pS`b$POI^7h0()oU5IO})0v-0l4Wn>T-!ByF@XIBT@O|7FH&Nm;kqd|`TJALBMu z%=6@)>sNR2?uY$h@7El8?LRL_#5E-UP4KjHmLXbGjSuhVyR~I^c=@^0JC&;+s8nwK z`=xOE_Ftd=UjMfJURKTbds*+}nu^6@5AZTq{C%eT^mFB}nEZ=hw%Rja>+|2dB~Y)D z@xv^pWl!$y{cj);FsbS09o|)8t3&jrue`ged)e%>YG&xPC76$DKOwb20~2t+ z1-|oEZ}w!j*Q%CTUDD_9DSa*9=7sM4%283fe9wEUo;)^n^4^M{T~TLi`?S|x%{sQX zPn040;gjjytdD$;Kkex8BYy(`NklyjTOP4uEDJ*;{u z1;Nlu=p{M!FX>-VO8Yl7287a!)KkS=HiS@x?gu`L5g+;vo_{p6qFbh0-{lPI= zrW}yVW+#T)YJV^QtMkw-Y+(`m2YZglG93YvLd|LjPMf)$0#0Je0a~|X>-sEWDh-NO zdbctG@HYe4#Z&|w6$%qSIC9x6J1P`hTL%V%0lZ!>27`euIi@0jX8}18XFmT5R)Yat zscmT8j-CbX(g}Rr{>=@RmX>gMcnC?7bltRW$MpZeTz{_Iaw5)BFJB>($)H#);@j6R zmVShQIduT=@4tst;|YQw2!bF8f*=TjAnql?O3FM|UPk)|MBC=Vs<6+$f@`fmH^u|Q z7j>=m!TSe{5LSixW(TjxTB*Fc#ps&{hW!H~3=P@c-DNvFJ5W^>0B~`7f>ODn?+wg? zGx&=EhJX7Oaw5*2N1`~ZHjzpvp(qOS`TRs3g%QB(?y9Ql#*Wth-QExxW!%`Ma>euO z^IPV9(}W~RP!z>bhHwqo*x0bCru*>zflw$UyjSRe^YinG*NplF++b2q!uoausdN&J zMnfpW_V)NR`vRO8oB9LnJUk2i0Csf{W&yqk@_$q~%Cu9Ukq(k1IkO0EZEeBt_ahdI zSx|2}#9}clFE1k+jSBA-MnFEFN3B+as;ZC^adz9|w|fQd`kR1f9^RKQPM_oBW3=0C z^m;v^JVOWc+gG~r!1!=;dm4xwTq;*Q>)R35YPA3iZ7{;n0e_5hrT5QCE>2JM<1DOG h1ROyS1VIop$!~^tL4h?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6 zGOr}DLN~8i8Da>`9GBGM~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fwU3rjN#3Q|*aogAIL1Ay2@AEF%97>FpU={EXU z9AX3VzExyUYH@x}DJTN$jLb}Iz=47yiiiq`jtHzekVVmT1Z3ow{oCIkDd}Z5&0TIdFt8xdfewfG{Bpmv6_ZZq#HOsW(AueYO?d9X zf7$e7qZE_)P2)&jKO=31n$xYhR<$>_ zs_m-ZzI|cZ(<9qwF_##x^^>2qxABwB@7Zm~)x6qnem$wb>&M5=bL{)1Dl|o|T=w{O(=ZrOS`bEYxNQb5>ZhbC5__(W{>45s{>@%Y`E z_fHmoI==JNHNg{)GT$@k{rmJ)A+~nj)Y$*=r!219ul;-JsK`-H>8;1lTiw6xahG>5 z&#ui!_3a+Hx~viH_~q(iQ+Z@p%cGhd2QDgH|Eci&dA0Y^uhZs8Gd|e&+v!1p_ob?7 zssTbr7aw5xP_v<_rTE*nPD=&8&kWB`*q^&8&0xXAD8K+gjmJG6@ZIUTv%+ZmCQx0( N;OXk;vd$@?2>@v@d8GgV delta 812 zcmV+{1JnGn4Z;SHBYy)4NklAxyBv-O236 zO}4(j<0L!#&a?CXeE@CYkmzCWdXXTvPf^(R$bBp_=6#-@j=+= z%NXx+HW5k%%vXW^PkZnOLx}W-kvq-9C>Ah05=ZVdkALeFLDy8~4~Fp57s1KoA`%@H zq|0sS+gQRKmV;3&NS_BhIdkip$|}kN&SMG!*$mn;%eD?efJX%Y{yuxyZ9G8`1VIo4 zK@bE%5X6l{c$4DAo0rS}0a4mqcq{A=hEOstJkxlf`k_k31-O5}irb<;@MH(Sk+pO4 z>K2#3JbzI24~VdA$i&nfJDFTWAe#Yz+U+aP4YYz7{KEj%yoIi*YC^QlTc9>>h=#fPLDU!7k|)*cauNB$-}MS2XGogU6Y_$4!+q- zpj8aqKOjOV0MEhC#!5EAYYwxqQq4agLbwxrxt>S5JcK~@2Xswk|0>QmBHSx*-6jdX z@^D|mRq?#fcH$gENUZ0D^;rt=`)mj4a$9XDcvW|Edl-lW-rU;ujVWM(YzFC=f}XP- q%O(2$>(e0MotO!NAP9mWT;~t)!a)mygl8rI0000h?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6 zGOr}DLN~8i8Da>`9GBGM~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fwU3rjN#3Q|*aogAIL1Ay2@AEF%97>FpU={EXU z9AX3VzExyUYH@x}DJTN$jLb}Iz=47yiiiq`jtHzekVVmT1Z3ow{oCIkDd}Z5&0TIdFt8xdfewfG{Bpmv6_ZZq#HOsW(AueYO?d9X zf7$e7qZE_)P2)&jKO=31n$xYhR<$>_ zs_m-ZzI|cZ(<9qwF_##x^^>2qxABwB@7Zm~)x6qnem$wb>&M5=bL{)1Dl|o|T=w{O(=ZrOS`bEYxNQb5>ZhbC5__(W{>45s{>@%Y`E z_fHmoI==JNHNg{)GT$@k{rmJ)A+~nj)Y$*=r!219ul;-JsK`-H>8;1lTiw6xahG>5 z&#ui!_3a+Hx~viH_~q(iQ+Z@p%cGhd2QDgH|Eci&dA0Y^uhZs8Gd|e&+v!1p_ob?7 zssTbr7aw5xP_v<_rTE*nPD=&8&kWB`*q^&8&0xXAD8K+gjmJG6@ZIUTv%+ZmCQx0( N;OXk;vd$@?2>@v@d8GgV delta 812 zcmV+{1JnGn4Z;SHBYy)4NklAxyBv-O236 zO}4(j<0L!#&a?CXeE@CYkmzCWdXXTvPf^(R$bBp_=6#-@j=+= z%NXx+HW5k%%vXW^PkZnOLx}W-kvq-9C>Ah05=ZVdkALeFLDy8~4~Fp57s1KoA`%@H zq|0sS+gQRKmV;3&NS_BhIdkip$|}kN&SMG!*$mn;%eD?efJX%Y{yuxyZ9G8`1VIo4 zK@bE%5X6l{c$4DAo0rS}0a4mqcq{A=hEOstJkxlf`k_k31-O5}irb<;@MH(Sk+pO4 z>K2#3JbzI24~VdA$i&nfJDFTWAe#Yz+U+aP4YYz7{KEj%yoIi*YC^QlTc9>>h=#fPLDU!7k|)*cauNB$-}MS2XGogU6Y_$4!+q- zpj8aqKOjOV0MEhC#!5EAYYwxqQq4agLbwxrxt>S5JcK~@2Xswk|0>QmBHSx*-6jdX z@^D|mRq?#fcH$gENUZ0D^;rt=`)mj4a$9XDcvW|Edl-lW-rU;ujVWM(YzFC=f}XP- q%O(2$>(e0MotO!NAP9mWT;~t)!a)mygl8rI0000h?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6 zGOr}DLN~8i8Da>`9GBGM~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fwU3rjN#3Q|*aogAIL1Ay2@AEF%97>FpU={EXU z9AX3VzExyUYH@x}DJTN$jLb}Iz=47yiiiq`jtHzekVVmT1Z3owsH+_`EGXEwMCwzfdPS5aNOBZwNz2^){{xOLNm|y`@Z`W zS|lk`w%5F2LA^st(&X-AoGoVdW;;($HD?HKcfBnCk@Ls1D;jblD;s5paKG`1-oS^(i_2~qUXRHnFF?Y@{ z?XM17y!v|9#feMUzYKxanba#4kcmHp^xsU()zDvLTZQ z3Xk5*Rb2h_c2>6Oxn$9O)pIm<+4&uOv$*Wgor-JQYpZi}cdyN?WSnqsPvNImXQMBl zc@o9xcj<8HqF1j|rL?BH%IhDJ3T+ZzbWSaVUo@J%@>J!M*cY~0r6;o;Kf8)(sb?Dn zAcrFwJH_e1Z{|nmKAYQhzWnCy@wxNfh0fnaxj8|5-?2=}I^K2e(ucRDW-B^Y7N~VH z%$U3=FE!V1@vf)$BlRb^CwMM*TqHQby(#jy2g`!VpMPu-KBdZLH~IPFms^_8ud?q8 zU8OwXkEJ_9dCA6-o_R4+)8^Sv*fjHE;-eX+0wKpAPj;N?_GZDX zKI8oI?y3KmxaWTo4rS4lp1CzE=YxoC?ano)^q&e`kVPaQk>&&Tuhg%oNZ#Kg4XQOf MUHx3vIVCg!0481CYcQe)DIt=A5KqgN3QMJ- z7g74-l0#1(N)P!5dheyD+;S+TE&T^-ONvlRN z8m=kV@ug70#=H&NY6FlZ=JR??wPkn)h%UFG=YuAl%?Y0#T?GIHn{}*;HUy?7@#NWa zYnH$$Fnjwc0Dqvd=@OeGhKRAS1tsuA(!hin3A+}Pfa|?!wEHTmLhU-Md z`kVv7W*s{dc5EKiP@NK?Rx5_@17jJv6;Az(}$0Q`OTFgtjH zAP9mW2!bF8f*^WdI2lwrb&p+ID6I)^j#hwrhhJA5Pg$Apr4mVK@ZTc4Lt?HZqanu zTcDl|ntp%>cN_fu@G&x(45s(?fDi9Ym}ouIcW>d{!UDqKFtBz<_rF{R%s#jW|AZX{ zwE;zz*uNgv4kDUX;JnWS+Rmft63(*c*Q+=1i#E)@+~l^W>wx0PDRw$ef@e)PtCs=K z!8Yk^PKe#O$+p!7AlgwpIn{0NzrGCu<6|>H5ClOGgysAJTMSRm@f+Vt00000NkvXX Hu0mjfr1^++ diff --git a/Resources/Textures/Objects/Tanks/red.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Tanks/red.rsi/equipped-SUITSTORAGE.png index 6c36a11d4de1ca12b164ea0a74d4ce91f42430fe..b8c3c183e2a18da69be42a8b9c1f8228bfc7812f 100644 GIT binary patch literal 1720 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy zw18|5AO?X;!IOa`XMsm#F$06fED&ZCw^H21z`)#)84^(v;p=0SoS&h?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6 zGOr}DLN~8i8Da>`9GBGM~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fwU3rjN#3Q|*aogAIL1Ay2@AEF%97>FpU={EXU z9AX3VzExyUYH@x}DJTN$jLb}Iz=47yiiiq`jtHzekVVmT1Z3owsH+_`EGXEwMCwzfdPS5aNOBZwNz2^){{xOLNm|y`@Z`W zS|lk`w%5F2LA^st(&X-AoGoVdW;;($HD?HKcfBnCk@Ls1D;jblD;s5paKG`1-oS^(i_2~qUXRHnFF?Y@{ z?XM17y!v|9#feMUzYKxanba#4kcmHp^xsU()zDvLTZQ z3Xk5*Rb2h_c2>6Oxn$9O)pIm<+4&uOv$*Wgor-JQYpZi}cdyN?WSnqsPvNImXQMBl zc@o9xcj<8HqF1j|rL?BH%IhDJ3T+ZzbWSaVUo@J%@>J!M*cY~0r6;o;Kf8)(sb?Dn zAcrFwJH_e1Z{|nmKAYQhzWnCy@wxNfh0fnaxj8|5-?2=}I^K2e(ucRDW-B^Y7N~VH z%$U3=FE!V1@vf)$BlRb^CwMM*TqHQby(#jy2g`!VpMPu-KBdZLH~IPFms^_8ud?q8 zU8OwXkEJ_9dCA6-o_R4+)8^Sv*fjHE;-eX+0wKpAPj;N?_GZDX zKI8oI?y3KmxaWTo4rS4lp1CzE=YxoC?ano)^q&e`kVPaQk>&&Tuhg%oNZ#Kg4XQOf MUHx3vIVCg!0481CYcQe)DIt=A5KqgN3QMJ- z7g74-l0#1(N)P!5dheyD+;S+TE&T^-ONvlRN z8m=kV@ug70#=H&NY6FlZ=JR??wPkn)h%UFG=YuAl%?Y0#T?GIHn{}*;HUy?7@#NWa zYnH$$Fnjwc0Dqvd=@OeGhKRAS1tsuA(!hin3A+}Pfa|?!wEHTmLhU-Md z`kVv7W*s{dc5EKiP@NK?Rx5_@17jJv6;Az(}$0Q`OTFgtjH zAP9mW2!bF8f*^WdI2lwrb&p+ID6I)^j#hwrhhJA5Pg$Apr4mVK@ZTc4Lt?HZqanu zTcDl|ntp%>cN_fu@G&x(45s(?fDi9Ym}ouIcW>d{!UDqKFtBz<_rF{R%s#jW|AZX{ zwE;zz*uNgv4kDUX;JnWS+Rmft63(*c*Q+=1i#E)@+~l^W>wx0PDRw$ef@e)PtCs=K z!8Yk^PKe#O$+p!7AlgwpIn{0NzrGCu<6|>H5ClOGgysAJTMSRm@f+Vt00000NkvXX Hu0mjfr1^++ diff --git a/Resources/Textures/Objects/Tanks/red.rsi/meta.json b/Resources/Textures/Objects/Tanks/red.rsi/meta.json index a9dff4eaf1..62f7319206 100644 --- a/Resources/Textures/Objects/Tanks/red.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/red.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432. Suit and back storages drawn by Ubaser.", "size": { "x": 32, "y": 32 From c3e96b377001698a1c4b61e315ad34d86f30806c Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 9 Aug 2024 10:34:01 +0000 Subject: [PATCH 316/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 37999faacc..05fb4706ab 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Boaz1111 - changes: - - message: Loneops now has a functioning ghost role raffle. - type: Fix - id: 6571 - time: '2024-05-10T02:01:49.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27841 - author: Boaz1111 changes: - message: You can now actually spawn as a reporter on Oasis @@ -3795,3 +3788,10 @@ id: 7070 time: '2024-08-09T06:17:51.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/28910 +- author: Ubaser + changes: + - message: Oxygen and nitrogen canisters now have new sprites when worn. + type: Add + id: 7071 + time: '2024-08-09T10:32:55.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30809 From 9f8ff021ea480cf711a72847303af014c62cdbdc Mon Sep 17 00:00:00 2001 From: Plykiya <58439124+Plykiya@users.noreply.github.com> Date: Fri, 9 Aug 2024 05:02:06 -0700 Subject: [PATCH 317/422] Fix for stripping doafters (#30821) Apparently I need to check if they're holding an item Co-authored-by: plykiya --- Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs b/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs index 213dc624b2..f9718be52d 100644 --- a/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs +++ b/Content.Shared/DoAfter/SharedDoAfterSystem.Update.cs @@ -229,7 +229,7 @@ public abstract partial class SharedDoAfterSystem : EntitySystem // If an item was in the user's hand to begin with, // check if the user is no longer holding the item. - if (args.BreakOnDropItem && !_hands.IsHolding((args.User, hands), doAfter.InitialItem)) + if (args.BreakOnDropItem && doAfter.InitialItem != null && !_hands.IsHolding((args.User, hands), doAfter.InitialItem)) return true; // If the user changes which hand is active at all, interrupt the do-after From 3f4e093eaf163e1e1aa5859322205a3d22e680b1 Mon Sep 17 00:00:00 2001 From: MureixloI <132683811+MureixloI@users.noreply.github.com> Date: Fri, 9 Aug 2024 15:02:26 +0300 Subject: [PATCH 318/422] [Sprites/Fix] In hand for BlueSpace beaker & CMO's equipped cloak (#28719) * [Fix] CMO's equipped cloak * [Fix] CMO's equipped cloak * [Sprites] In hands for bluespace beaker * [Sprites] In hands for bluespace beaker * [Sprites] In hands for bluespace beaker * [Sprites] In hands for bluespace beaker --- .../Neck/Cloaks/cmo.rsi/equipped-NECK.png | Bin 1746 -> 1755 bytes .../Clothing/Neck/Cloaks/cmo.rsi/meta.json | 2 +- .../beaker_bluespace.rsi/inhand-left.png | Bin 0 -> 275 bytes .../beaker_bluespace.rsi/inhand-right.png | Bin 0 -> 276 bytes .../Chemistry/beaker_bluespace.rsi/meta.json | 10 +++++++++- 5 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/inhand-right.png diff --git a/Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/equipped-NECK.png index eb9216dea1eb407523e06c92d0cf984a229494d8..5ce495c15702e0e6b22280e6630cde043dbb5532 100644 GIT binary patch delta 1711 zcmV;g22lCZ4ciTnBM$%pb5ch_0Itp)=>Px*m60VOf9h6rb7+Bv3Y_Lr1jwl;=a#=H z|3eQsHBDOEbx(~Y*KrIN70{+ICE8(4aVe3qLfPc*>tVRdl}U@c6lJBz{s3ZkXXop^ zdGltt^B^WBCMG5(=7)-klG!Yk1*LFqUL7iDURn|5^yuBX5vk6os8U&mJC*>ahpb+U z+;->!e`cvHZmWrrEdbzr`DeeZDwRbk1uYwMcAoCqU#6}E_4Z|9dkf~WI>EaFw70bq zwi_^)MOKFg=y@1nGMT@4S5oOT>mS|4vMf@m6za{N%i@P0iF$Kc(&;poW%17|cR7{G zVEycu!=rQr)Z3SZ%q;6yzSe>Vg$MndnPvUTe;t_1>ii)Ir2v3Jp}@t@-{NVc|hsqaSWkX0TH2Etv+|N;oiKes?{n=9m77zakSZIf9CY_ z%lW}?X1*_QKYihRq^b{9Kv0-!wTe4p2N*eKS9<$)>EU`g;Q3b6C)hu2o9YB?&@{5-Pl5jkk92Ymw$bz zJVxmq@s`S_-QbAgBY*osvA3(2wX=)xq%(NA*Vfloe@RXxb=uiQc-+$We<8NSV^@I$ zf`J~*#4`eo`fD0Ae|PozbmoE@-A!5hSl{%zgT#Oj2(u9ys{j!}P`Lg5z_`kMry1>2 z!PF1Qet~&cV?9`|iPKWoU;72Nl%+9}t$Y3V3?!uc{`$5*TkT zh6p>2Eq0jBA0g0wKwWxQe-PLI@^ipBihvtXfN6pV^5vh7^~+RDOiWBnOiWBnOiWD7 z4-T_b7IRdf!U=Jd{)9dl2{vZ5n}`VC2PK%LvWN&qyE##RB8SMNQYku}4wj|A!0zww z`|q6zLR2OpC}=8`0`U8^zrP=;ACWEK!mDSnEQ?O3!;^ZAnU`Mje}6B+BFs`*f^9yj z*L>kGym}^beUV~>E}mbaYU=~XcIOG*ZWniZa02Yk&ZCq%HcRl$eRs!CGqMGe$s}{u zDF7DoS#Ez*3EhWCA4Tu{>py@#GM}|l>;m0>&=i2%>qV(D(Yt%8OUX77EzS?MN0F`LlR& zaml~0+s&xOr-r9+7zAe&7niV`<6{DXL{@-^P+VNXG)7N05eTzb5 z1$Zc>FbrLMyU}JDfhO!r@EVoK7GQ|@X17_X zuv4$oJ>~%EQFL$JP&@THo0W<`9gP>^0}vP2)uA&9amYANBUdpkGR{*HqMe`Xx}k$2 zf<#h)vwBTEe`@Ul+T;{Ea^$2?{kR3s{2#S;Bkw{da)RyZeWcgJ6lZFIV3VK}nBpM4 z9_{M=iRze00j6kk>((A%-?@2WDzNX|RNdMG5LfqU0wxZSu)kiVcJHebKZCE`yR8%= z)|po(DnF3|D!cnQ-vi-2zPtVRd zl}U@c7GEaFw70bqwi_^)MOH^Y(984+;l@;l(`sV>Q%J2&Dk;KA+D6S_$25 z7kSu5&CFq07U^^v0K2h;A-c%a6ksOc)WR_F2_*mn;Z6PZzpnrsUICu)p5V4^6MPP0 z+cruma(}rTBEpW{0Khq<68sNfCUk<+hnHR%&G?|I-+6f*CzJvblQQJq5_ms zzEA+0o10_jTl>O_oH=s_k*Q7qL*Zd~6?ZgWaDNEQ%mYeKj}r(z3y28SYW1m$4fpzG zRjpQ0>Il|Bj-$;!GpCU%nL@NS9ml=!sMECkVNF=qenK{(*C&=2zdT8`}aKZ|7VvM64!+}G< zUA?Nd8(Sz5^0_?b@^256$0)rc-c;GN8-E;9eB{e76rEi?t({(kN8RDePFr7FgDE+Y z)M=*|;bBYPhgcF%oCOjH2Ks9zo)Bo>2a21E1j+xwrDp&cIVSAWpp ze?V9!D&X;rzpI-3MqskJ7$WR6w%B1he}q8$0d?VBL0o_5XP%y4^01>NRFw zc)|ZYPm3^1WeK+Zs9y7hKlk#fNOgtMl36Ot`Ljz@Z5?WAcOTK~^>DX`u|Icq9;MWg zTY_)yyE}fGku8u+CYiHN0I-nHa`U@NsJ?{W61(-U{{T8zI%}oa1$u+yGJgPWzaO@$ zsbB=!P9~GgS}6n_xNX=?2zf{&k`Kt|vTP3`zQGWAy{Rq3U7OM_@C1zIcLd;MZg^D2 zi&$q11?=W_XiJQ=DOy}y^6%?*GfL4T!Bad8!}G<(CG6(psIW&Q1&9d6#U)JBWa*Wk zBO+{WRM={ao)>r?{H&0txPQ2WQcC+D$B7(|j5G_}->3lKI1aAsvQfF~H~75FKiHOt zuu-{->$*6DD3I63utZXThf)f|&_%Z!jpr)7hr4!FdH%>SjAstWMh=X)u8Uz9(?1Dv z2;4zjz;&YsVy0cW~IVTy-x3lkH#KE@5VK?Q?IjGsrbXvIDbkXfVjA>J~WXK zhm7+$Qt_i8<2)uI+WEPz8#*lR5n2Jx>J{~%wF_udQ|L1T$Bi09u08XA(Atf(8jb7( z+ts^BzmF--)Q$ih2Bp9h2kG}|SMNqHA6WsWXfx~8?qT1$e(Wl+Z(Uct+C30g_bnpN z6dt#~U8Q#Cn`0N=qda!!rc#Jlr(TL&HnIXLyL&i4BH=y0zw?bU)4Ah!N-;4pF){x~ Z{11|;_r*5QKh6LE002ovPDHLkV1jS? diff --git a/Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json b/Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json index fde00d6116..afe57c8d17 100644 --- a/Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json +++ b/Resources/Textures/Clothing/Neck/Cloaks/cmo.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/5a73e8f825ff279e82949b9329783a9e3070e2da, sprites in hand by PuroSlavKing (Github) and RudeyCoolLeet#3875, fixed by @mishutka09", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/inhand-left.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..c6e2bcb80f9327b0fea59a08a626b6718b017031 GIT binary patch literal 275 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|&U(5yhE&XX zdrOh;kb%U}kLHIemu>$kn~>(NaEGD&Kq2!X!L+i5pIf;uKCtu>RN?02+s7yN&p!O~ z(%h)8^H_i;Ffe>bH#(j8*TC)lp)GdrwlDh}91+d;S#O0#v1d?lxP5(vXVg-OT~iKw zAJczOwl|_LdfB$SNAlk@g7t!kid4CzcYMn=JY8q%E2)_Bx~uwr{88+$Alhx$^pn-3 zbn4f`7Tyk77u`KB@qf@eBQ>@D)73Na4PRbxmfW@c`G0x8!Y>YxG1p}moin*=SaoY3 O$W%{PKbLh*2~7a(Icn+v literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/inhand-right.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..0b278eed621f332c67d51d54112295eb4a19e6b8 GIT binary patch literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|&Uv~xhE&XX zdut(YvxCIZkM5T%F9h6Y%#v7`*lgt@D{Ugnc$lHWL6Ku#;JQVbPFXu9++%(5f4RVY z!3y>L>Wn}W7#RM{OvrmsRzKr>u}J%_IsTi|w;g$verlE3q$_57Kk3{JWniDZaPQq; zQ$iUo{r+}*VewDh*V9zOjqO>%x-pi)1#aZv@^>Njc^B!Pw;DBH`B+Gn}{ T6!*igAVWP}{an^LB{Ts5P-k$( literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/meta.json index 54a2e31b01..28207bc250 100644 --- a/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/meta.json +++ b/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/740ff31a81313086cf16761f3677cf1e2ab46c93", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/740ff31a81313086cf16761f3677cf1e2ab46c93, sprites in hands by @mishutka09", "size": { "x": 32, "y": 32 @@ -15,6 +15,14 @@ 0.1 ] ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 } ] } From 873c314aec0a87e3e160d94e36511f11ff849c2c Mon Sep 17 00:00:00 2001 From: Vasilis Date: Fri, 9 Aug 2024 15:01:13 +0200 Subject: [PATCH 319/422] Add arm64 support to packager for windows and osx (#29723) Wanted to package a server for the funny on my macbook and noticed it was not working cause of this... now it will workie :3 --- Content.Packaging/ServerPackaging.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Content.Packaging/ServerPackaging.cs b/Content.Packaging/ServerPackaging.cs index d9ca57c4d1..1a04c745d1 100644 --- a/Content.Packaging/ServerPackaging.cs +++ b/Content.Packaging/ServerPackaging.cs @@ -13,9 +13,11 @@ public static class ServerPackaging private static readonly List Platforms = new() { new PlatformReg("win-x64", "Windows", true), + new PlatformReg("win-arm64", "Windows", true), new PlatformReg("linux-x64", "Linux", true), new PlatformReg("linux-arm64", "Linux", true), new PlatformReg("osx-x64", "MacOS", true), + new PlatformReg("osx-arm64", "MacOS", true), // Non-default platforms (i.e. for Watchdog Git) new PlatformReg("win-x86", "Windows", false), new PlatformReg("linux-x86", "Linux", false), From 1e824d704f10a666045b0b913524d717567fd271 Mon Sep 17 00:00:00 2001 From: Plykiya <58439124+Plykiya@users.noreply.github.com> Date: Fri, 9 Aug 2024 08:43:02 -0700 Subject: [PATCH 320/422] Buckling an entity requires a do-after (#29621) * Buckling an entity requires a do-after * Works but feels like bad code? * Cleanup --------- Co-authored-by: plykiya --- Content.Shared/Buckle/BuckleDoafterEvent.cs | 11 +++++ .../Buckle/Components/StrapComponent.cs | 6 +++ .../Buckle/SharedBuckleSystem.Buckle.cs | 43 +++++++++++++++++++ .../Buckle/SharedBuckleSystem.Interaction.cs | 23 +++++++++- Content.Shared/Buckle/SharedBuckleSystem.cs | 2 + 5 files changed, 83 insertions(+), 2 deletions(-) create mode 100644 Content.Shared/Buckle/BuckleDoafterEvent.cs diff --git a/Content.Shared/Buckle/BuckleDoafterEvent.cs b/Content.Shared/Buckle/BuckleDoafterEvent.cs new file mode 100644 index 0000000000..268ddfe261 --- /dev/null +++ b/Content.Shared/Buckle/BuckleDoafterEvent.cs @@ -0,0 +1,11 @@ +using Content.Shared.Cuffs.Components; +using Content.Shared.DoAfter; +using Robust.Shared.Serialization; + +namespace Content.Shared.Buckle; + +[Serializable, NetSerializable] +public sealed partial class BuckleDoAfterEvent : SimpleDoAfterEvent +{ + +} diff --git a/Content.Shared/Buckle/Components/StrapComponent.cs b/Content.Shared/Buckle/Components/StrapComponent.cs index a16d15f8a2..b8186e2b79 100644 --- a/Content.Shared/Buckle/Components/StrapComponent.cs +++ b/Content.Shared/Buckle/Components/StrapComponent.cs @@ -84,6 +84,12 @@ public sealed partial class StrapComponent : Component /// [DataField] public ProtoId BuckledAlertType = "Buckled"; + + /// + /// How long it takes to buckle someone else into a chair + /// + [DataField] + public float BuckleDoafterTime = 2f; } public enum StrapPosition diff --git a/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs b/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs index 4f91a29ebe..83c24016ce 100644 --- a/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs +++ b/Content.Shared/Buckle/SharedBuckleSystem.Buckle.cs @@ -2,7 +2,9 @@ using System.Diagnostics.CodeAnalysis; using System.Numerics; using Content.Shared.Alert; using Content.Shared.Buckle.Components; +using Content.Shared.Cuffs.Components; using Content.Shared.Database; +using Content.Shared.DoAfter; using Content.Shared.Hands.Components; using Content.Shared.IdentityManagement; using Content.Shared.Movement.Events; @@ -51,6 +53,12 @@ public abstract partial class SharedBuckleSystem SubscribeLocalEvent(OnBuckleThrowPushbackAttempt); SubscribeLocalEvent(OnBuckleUpdateCanMove); + SubscribeLocalEvent(OnBuckleDoafter); + SubscribeLocalEvent>((uid, comp, ev) => + { + BuckleDoafterEarly((uid, comp), ev.Event, ev); + }); + SubscribeLocalEvent(OnGetState); } @@ -516,4 +524,39 @@ public abstract partial class SharedBuckleSystem RaiseLocalEvent(strap, ref unstrapAttempt); return !unstrapAttempt.Cancelled; } + + /// + /// Once the do-after is complete, try to buckle target to chair/bed + /// + /// The person being put in the chair/bed + /// The person putting a person in a chair/bed + /// The chair/bed + + private void OnBuckleDoafter(Entity entity, ref BuckleDoAfterEvent args) + { + if (args.Cancelled || args.Handled || args.Target == null || args.Used == null) + return; + + args.Handled = TryBuckle(args.Target.Value, args.User, args.Used.Value, popup: false); + } + + /// + /// If the target being buckled to a chair/bed goes crit or is cuffed + /// Cancel the do-after time and try to buckle the target immediately + /// + /// The person being put in the chair/bed + /// The person putting a person in a chair/bed + /// The chair/bed + private void BuckleDoafterEarly(Entity entity, BuckleDoAfterEvent args, CancellableEntityEventArgs ev) + { + if (args.Target == null || args.Used == null) + return; + + if (TryComp(args.Target, out var targetCuffableComp) && targetCuffableComp.CuffedHandCount > 0 + || _mobState.IsIncapacitated(args.Target.Value)) + { + ev.Cancel(); + TryBuckle(args.Target.Value, args.User, args.Used.Value, popup: false); + } + } } diff --git a/Content.Shared/Buckle/SharedBuckleSystem.Interaction.cs b/Content.Shared/Buckle/SharedBuckleSystem.Interaction.cs index 463e0d5596..a4cfc9c8c4 100644 --- a/Content.Shared/Buckle/SharedBuckleSystem.Interaction.cs +++ b/Content.Shared/Buckle/SharedBuckleSystem.Interaction.cs @@ -1,4 +1,6 @@ -using Content.Shared.Buckle.Components; +using Content.Shared.Buckle.Components; +using Content.Shared.Cuffs.Components; +using Content.Shared.DoAfter; using Content.Shared.DragDrop; using Content.Shared.IdentityManagement; using Content.Shared.Interaction; @@ -32,7 +34,24 @@ public abstract partial class SharedBuckleSystem if (!StrapCanDragDropOn(uid, args.User, uid, args.Dragged, component)) return; - args.Handled = TryBuckle(args.Dragged, args.User, uid, popup: false); + if (args.Dragged == args.User) + { + if (!TryComp(args.User, out BuckleComponent? buckle)) + return; + + args.Handled = TryBuckle(args.User, args.User, uid, buckle); + } + else + { + var doAfterArgs = new DoAfterArgs(EntityManager, args.User, component.BuckleDoafterTime, new BuckleDoAfterEvent(), args.User, args.Dragged, uid) + { + BreakOnMove = true, + BreakOnDamage = true, + AttemptFrequency = AttemptFrequency.EveryTick + }; + + _doAfter.TryStartDoAfter(doAfterArgs); + } } private bool StrapCanDragDropOn( diff --git a/Content.Shared/Buckle/SharedBuckleSystem.cs b/Content.Shared/Buckle/SharedBuckleSystem.cs index 770fababde..d190f685ed 100644 --- a/Content.Shared/Buckle/SharedBuckleSystem.cs +++ b/Content.Shared/Buckle/SharedBuckleSystem.cs @@ -1,6 +1,7 @@ using Content.Shared.ActionBlocker; using Content.Shared.Administration.Logs; using Content.Shared.Alert; +using Content.Shared.DoAfter; using Content.Shared.Interaction; using Content.Shared.Mobs.Systems; using Content.Shared.Popups; @@ -36,6 +37,7 @@ public abstract partial class SharedBuckleSystem : EntitySystem [Dependency] private readonly StandingStateSystem _standing = default!; [Dependency] private readonly SharedPhysicsSystem _physics = default!; [Dependency] private readonly SharedRotationVisualsSystem _rotationVisuals = default!; + [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; /// public override void Initialize() From bd5b13e2f32a97f2f76fc84aeb9715fff7e93021 Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 9 Aug 2024 15:44:09 +0000 Subject: [PATCH 321/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 05fb4706ab..7088cffd3c 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,14 +1,4 @@ Entries: -- author: Boaz1111 - changes: - - message: You can now actually spawn as a reporter on Oasis - type: Fix - - message: Oasis now has roundstart sec radios instead of handheld radios mapped - in sec, det now has a criminal records computer on box - type: Tweak - id: 6572 - time: '2024-05-10T02:15:34.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27564 - author: notquitehadouken changes: - message: You can now only use suit storage with hardsuits, softsuits, and armor @@ -3795,3 +3785,10 @@ id: 7071 time: '2024-08-09T10:32:55.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30809 +- author: Plykiya + changes: + - message: Buckling someone now triggers a short do-after. + type: Tweak + id: 7072 + time: '2024-08-09T15:43:02.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29621 From ed3ec4dc5fcc679f8e0903f83f34ac310b2b53b4 Mon Sep 17 00:00:00 2001 From: Ubaser <134914314+UbaserB@users.noreply.github.com> Date: Sat, 10 Aug 2024 05:29:00 +1000 Subject: [PATCH 322/422] Crowbar variants (#28988) * add * comma * sprites * yaml-ify * add s * lathe and engi belt * yes * fix maybe * progress * nearly there * fix * fix yaml linter having a stroke --- .../Prototypes/Catalog/Fills/Items/belt.yml | 2 +- .../Catalog/Fills/Items/toolboxes.yml | 6 +- .../VendingMachines/Inventories/engivend.yml | 1 + .../Entities/Objects/Tools/crowbars.yml | 195 ++++++++++++++++++ .../Entities/Objects/Tools/tools.yml | 58 ------ .../Entities/Structures/Machines/lathe.yml | 2 +- Resources/Prototypes/Recipes/Lathes/tools.yml | 4 +- .../Tools/crowbar.rsi/cover-equipped-BELT.png | Bin 0 -> 1163 bytes .../Objects/Tools/crowbar.rsi/cover-icon.png | Bin 0 -> 1135 bytes .../Tools/crowbar.rsi/cover-inhand-left.png | Bin 0 -> 1195 bytes .../Tools/crowbar.rsi/cover-inhand-right.png | Bin 0 -> 1200 bytes .../Tools/crowbar.rsi/equipped-BELT.png | Bin 149 -> 1213 bytes .../Tools/crowbar.rsi/green-storage.png | Bin 0 -> 1282 bytes .../Objects/Tools/crowbar.rsi/meta.json | 41 ++-- .../Tools/crowbar.rsi/orange-storage.png | Bin 0 -> 1286 bytes .../Tools/crowbar.rsi/red-equipped-BELT.png | Bin 150 -> 0 bytes .../Objects/Tools/crowbar.rsi/red-icon.png | Bin 200 -> 0 bytes .../Tools/crowbar.rsi/red-inhand-left.png | Bin 322 -> 0 bytes .../Tools/crowbar.rsi/red-inhand-right.png | Bin 329 -> 0 bytes .../Objects/Tools/crowbar.rsi/red-storage.png | Bin 360 -> 1275 bytes .../Tools/crowbar.rsi/yellow-storage.png | Bin 0 -> 1284 bytes 21 files changed, 228 insertions(+), 81 deletions(-) create mode 100644 Resources/Prototypes/Entities/Objects/Tools/crowbars.yml create mode 100644 Resources/Textures/Objects/Tools/crowbar.rsi/cover-equipped-BELT.png create mode 100644 Resources/Textures/Objects/Tools/crowbar.rsi/cover-icon.png create mode 100644 Resources/Textures/Objects/Tools/crowbar.rsi/cover-inhand-left.png create mode 100644 Resources/Textures/Objects/Tools/crowbar.rsi/cover-inhand-right.png create mode 100644 Resources/Textures/Objects/Tools/crowbar.rsi/green-storage.png create mode 100644 Resources/Textures/Objects/Tools/crowbar.rsi/orange-storage.png delete mode 100644 Resources/Textures/Objects/Tools/crowbar.rsi/red-equipped-BELT.png delete mode 100644 Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png delete mode 100644 Resources/Textures/Objects/Tools/crowbar.rsi/red-inhand-left.png delete mode 100644 Resources/Textures/Objects/Tools/crowbar.rsi/red-inhand-right.png create mode 100644 Resources/Textures/Objects/Tools/crowbar.rsi/yellow-storage.png diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml index 1449c9757b..6915f321c9 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml @@ -19,7 +19,7 @@ components: - type: StorageFill contents: - - id: Crowbar + - id: CrowbarYellow - id: Wrench - id: Screwdriver - id: Wirecutter diff --git a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml index 1091207bba..ac9ab4deaa 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml @@ -32,7 +32,7 @@ - type: StorageFill contents: - id: Screwdriver - - id: Crowbar + - id: CrowbarOrange - id: Wirecutter - id: CableApcStack10 - id: CableMVStack10 @@ -53,7 +53,7 @@ - type: StorageFill contents: - id: Screwdriver - - id: Crowbar + - id: CrowbarOrange - id: Wirecutter - id: CableApcStack10 - id: CableMVStack10 @@ -94,7 +94,7 @@ components: - type: StorageFill contents: - - id: Crowbar + - id: CrowbarOrange - id: Wrench - id: Welder - id: Wirecutter diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml index 9757b14e58..a35793b4bd 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml @@ -3,6 +3,7 @@ startingInventory: ClothingEyesGlassesMeson: 4 ClothingHeadHatWelding: 6 + CrowbarYellow: 8 Multitool: 4 NetworkConfigurator: 5 PowerCellMedium: 5 diff --git a/Resources/Prototypes/Entities/Objects/Tools/crowbars.yml b/Resources/Prototypes/Entities/Objects/Tools/crowbars.yml new file mode 100644 index 0000000000..d57bea8a5b --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Tools/crowbars.yml @@ -0,0 +1,195 @@ +- type: entity + name: crowbar + parent: BaseItem + id: BaseCrowbar + abstract: true + components: + - type: EmitSoundOnLand + sound: + path: /Audio/Items/crowbar_drop.ogg + - type: Tag + tags: + - Crowbar + - type: MeleeWeapon + wideAnimationRotation: -135 + damage: + types: + Blunt: 8 + soundHit: + collection: MetalThud + - type: Tool + qualities: + - Prying + useSound: + path: /Audio/Items/crowbar.ogg + - type: ToolTileCompatible + - type: PhysicalComposition + materialComposition: + Steel: 100 + - type: StaticPrice + price: 22 + - type: Prying + - type: Clothing + quickEquip: false + slots: + - Belt + - type: Item + size: Normal + shape: + - 0,0,0,1 + +# Standard (grey) Crowbar +- type: entity + parent: BaseCrowbar + id: Crowbar + description: A multipurpose tool to pry open doors and fight interdimensional invaders. + components: + - type: Sprite + sprite: Objects/Tools/crowbar.rsi + state: icon + - type: Item + sprite: Objects/Tools/crowbar.rsi + storedSprite: + sprite: Objects/Tools/crowbar.rsi + state: storage + +# Emergency (red) Crowbar +- type: entity + name: emergency crowbar + parent: BaseCrowbar + id: CrowbarRed + description: A pocket crowbar designed to pry open doors and firelocks during power outages. + components: + - type: Tag + tags: + - Crowbar + - CrowbarRed + - type: Sprite + sprite: Objects/Tools/crowbar.rsi + layers: + - state: icon + - state: cover-icon + color: "#990000" + - type: Item + sprite: Objects/Tools/crowbar.rsi + storedSprite: + state: red-storage + sprite: Objects/Tools/crowbar.rsi + inhandVisuals: + left: + - state: inhand-left + - state: cover-inhand-left + color: "#990000" + right: + - state: inhand-right + - state: cover-inhand-right + color: "#990000" + - type: Clothing + sprite: Objects/Tools/crowbar.rsi + clothingVisuals: + belt: + - state: equipped-BELT + - state: cover-equipped-BELT + color: "#990000" + +# Autolathe (green) Crowbar +- type: entity + parent: BaseCrowbar + id: CrowbarGreen + description: A multipurpose tool to pry open doors and fight interdimensional invaders, printed from an autolathe. + components: + - type: Sprite + sprite: Objects/Tools/crowbar.rsi + layers: + - state: icon + - state: cover-icon + color: "#00621c" + - type: Item + sprite: Objects/Tools/crowbar.rsi + storedSprite: + state: green-storage + sprite: Objects/Tools/crowbar.rsi + inhandVisuals: + left: + - state: inhand-left + - state: cover-inhand-left + color: "#00621c" + right: + - state: inhand-right + - state: cover-inhand-right + color: "#00621c" + - type: Clothing + sprite: Objects/Tools/crowbar.rsi + clothingVisuals: + belt: + - state: equipped-BELT + - state: cover-equipped-BELT + color: "#00621c" + +# Toolbox (orange) Crowbar +- type: entity + parent: BaseCrowbar + id: CrowbarOrange + description: A multipurpose tool to pry open doors and fight interdimensional invaders, found in toolboxes. + components: + - type: Sprite + sprite: Objects/Tools/crowbar.rsi + layers: + - state: icon + - state: cover-icon + color: "#673800" + - type: Item + sprite: Objects/Tools/crowbar.rsi + storedSprite: + state: orange-storage + sprite: Objects/Tools/crowbar.rsi + inhandVisuals: + left: + - state: inhand-left + - state: cover-inhand-left + color: "#673800" + right: + - state: inhand-right + - state: cover-inhand-right + color: "#673800" + - type: Clothing + sprite: Objects/Tools/crowbar.rsi + clothingVisuals: + belt: + - state: equipped-BELT + - state: cover-equipped-BELT + color: "#673800" + +# Engineering (yellow) Crowbar +- type: entity + parent: BaseCrowbar + id: CrowbarYellow + description: A pocket crowbar designed to pry open doors and firelocks during power outages, dispensed from Engineering. + components: + - type: Sprite + sprite: Objects/Tools/crowbar.rsi + layers: + - state: icon + - state: cover-icon + color: "#968000" + - type: Item + sprite: Objects/Tools/crowbar.rsi + storedSprite: + state: yellow-storage + sprite: Objects/Tools/crowbar.rsi + inhandVisuals: + left: + - state: inhand-left + - state: cover-inhand-left + color: "#968000" + right: + - state: inhand-right + - state: cover-inhand-right + color: "#968000" + - type: Clothing + sprite: Objects/Tools/crowbar.rsi + clothingVisuals: + belt: + - state: equipped-BELT + - state: cover-equipped-BELT + color: "#968000" diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index d420aa309d..67251c87ca 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -127,64 +127,6 @@ - type: StaticPrice price: 22 -- type: entity - name: crowbar - parent: BaseItem - id: Crowbar - description: A multipurpose tool to pry open doors and fight interdimensional invaders. - components: - - type: EmitSoundOnLand - sound: - path: /Audio/Items/crowbar_drop.ogg - - type: Tag - tags: - - Crowbar - - type: Sprite - sprite: Objects/Tools/crowbar.rsi - state: icon - - type: Item - sprite: Objects/Tools/crowbar.rsi - size: Small - storedSprite: - sprite: Objects/Tools/crowbar.rsi - state: storage - - type: MeleeWeapon - wideAnimationRotation: -135 - damage: - types: - Blunt: 8 - soundHit: - collection: MetalThud - - type: Tool - qualities: - - Prying - useSound: - path: /Audio/Items/crowbar.ogg - - type: ToolTileCompatible - - type: PhysicalComposition - materialComposition: - Steel: 100 - - type: StaticPrice - price: 22 - - type: Prying - -- type: entity - parent: Crowbar - id: CrowbarRed - name: emergency crowbar - components: - - type: Tag - tags: - - Crowbar - - CrowbarRed - - type: Sprite - state: red-icon - - type: Item - heldPrefix: red - storedSprite: - sprite: Objects/Tools/crowbar.rsi - state: red-storage - - type: entity name: multitool parent: BaseItem diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 8f1ff07547..38d287cce1 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -124,7 +124,7 @@ - Screwdriver - Welder - Wrench - - Crowbar + - CrowbarGreen - Multitool - NetworkConfigurator - SprayPainter diff --git a/Resources/Prototypes/Recipes/Lathes/tools.yml b/Resources/Prototypes/Recipes/Lathes/tools.yml index 95974d9837..67d412b571 100644 --- a/Resources/Prototypes/Recipes/Lathes/tools.yml +++ b/Resources/Prototypes/Recipes/Lathes/tools.yml @@ -63,8 +63,8 @@ Steel: 30 - type: latheRecipe - id: Crowbar - result: Crowbar + id: CrowbarGreen + result: CrowbarGreen category: Tools completetime: 2 materials: diff --git a/Resources/Textures/Objects/Tools/crowbar.rsi/cover-equipped-BELT.png b/Resources/Textures/Objects/Tools/crowbar.rsi/cover-equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..dada0c0801d1bf5b11b2b6b81d8f9f6e5fed619f GIT binary patch literal 1163 zcmZ`(PiWIn7*FRMU1g$p5JVwMFQO(d&Bm}Ht!taP6>TZCgZ7}sHv|25$HN%rS`cC%!$k0)2%|e=K(8OChvtcOQ?zl#T|q#GX)~YlK-*uNtcf#${Dlt2TASBu#^b z>rKtFpvtCGnJWb>67Ug&o_y_K011r9MIsD{l_GRZy-8}26y|0nkCy>$zZyQGJQ5Mq z4kHS66PfsR*_x6y5VS2DzcfE$H{QV(!@l~#mkkXig|34kbpREpl$f$n%e2=@UR6d@ zdZ2mNrB83*<@#;ml>+xgG9rOqk0m3ikMHZa@$P5kRLKqf{`Pi~qQlfyeedwI*BjI0 zGuv-oJiK%!bBvz9ONGY9!-0(zeVPCMb9v`eXJYf$^N=k6z0f%^!Y+W^YK>L)!rIQC m_Pa*tUld)B-`+>uIR5oc=g8AXAI^U!KZ5K+UT&vv-un+(9$2&h literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/crowbar.rsi/cover-icon.png b/Resources/Textures/Objects/Tools/crowbar.rsi/cover-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..bca60ba34ef40216592a3199bbf2bfbd6e781d49 GIT binary patch literal 1135 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}e5nzhX}-P; zT0k}j5QD&_;K@Lev%n*=n1MlK76>znTPbd0U|=rE42dX-@b$4u&d=3LOvz75)vL%Y z0PC`;umUo3Q%e#RDspr3imfVamB1>jfNYSkzLEl1NlCV?QiN}Sf^&XRs)CuGfu4bq z9hZWFf=y9MnpKdC8&o@xXRDM^Qc_^0uU}qXu2*iXmtT~wZ)j<0sc&GUZ)BtkRH0j3 znOBlnp_^B%3^4>|j!SBBa#3bMNoIbY0?6FNr2NtnTO}osMQ{LdXG${Mo`TY%9I!1Z z$@-}|sky0nCB^!NdWQPg^p#|$AzYYO3=Ixo!03ZyfZ7bOYV#~8Nj3q7lxqdhJy8Dv z9hwZbx40xlA4!3}k%57Qu7Q!Rk)=M|e?aHkq$FFFWR~Qlf&&ijA8-gd=9Hj{g4Bb8 zASV+PvQ{~XdFi%F6}l;@X^EvdB}#ThsVTa}CHX~(>8UpQ5QV4)Ktxf^wb94o1RIdY zts;X`i}Q0zK|yb4WM*Om4h|GiL?l3TL}1l{EQ+opAS1sdADF0$GLt>?N>Ymoihv0W zVk6W(+$zw`LRcP}msw(G1T_Fn7)cjW1X(#2m6YcfWru(x10^JJs)CvX300(Y3dscE z7y#x1J1!f2c#g8;sxe~x4a{a$o-U3d5u9(QIC3#4a=51Q-P(DlZ03bn^Q<4;3TaOj zd@j_4v);OX-CdB4bHV{l7B5Zajj8iA^U|C{<4p@wt=lTrhTe&-dVeYEw4LPodcVHv zJytV4KW17a`A2Dn{fj@`$bap%*x|MFo4@{Ac{{vto@WD#M*~ZrdI9r0sRh>)CEWx; OncdUX&t;ucLK6VH1zuzT literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/crowbar.rsi/cover-inhand-left.png b/Resources/Textures/Objects/Tools/crowbar.rsi/cover-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..6187e326d18ff4f7121d683e92ba98e141b8f306 GIT binary patch literal 1195 zcmZ`(PiWIn98PtUt+?S~Ac}`9UQ|e4n$2NDTK1=PE3C72Ep!(#OJ3X9G>OS8%^1k$ zO&nf!QxLt5IdF&|i0BSGC2Vpk_+4SX)U0b`rdwK7d@B4ng_r3RWBQ-JF z6+9j!2%;-77E9yzpwl`I;eJWEx`|%_D?K_)th_$)9Z$MpE|E_ri8FZIft&NZnOwwu zr!h8V5yYw6P7566dshkK;58+aL%HNQFX?4Ql=W%I*k!|I2{w<1Wr#%5E~}cw+Y!n| z@ObQm0Y$nHREki!WQrWoO-K$fEW=XKAW4#fDd+ig?7UCMvj|m0$lw8}R;x_4kI~Hn z2!+F8z;b}&XpEq(84Zaxtyw2Mk$*ZdXi27GAVt?mM^~KID=0!yPNLf5)hSE0JVwP- z-7K;MpbE=SLly`zA<&A4l>A}VEhK|F z0N_~m9L;hx7Y4QU;qnDp;*o+>=o(jBkL%!&iW;L1-mySc9A|k|)Cv*Gre&BHD=MO* zCX{JKD~g&-n@XXG1mK|?RlI1UxByzzAvmk&r_#{U)r#YPlpE+5Tu&OJdpqGVaxEG4 z(Pl=fs3RSpEK`vZ8iJ-_;#1~j^z-eHXx7?Gp4Ai-<$Qsra2=~|m-rzQRdutJad+f@ zJNJe9a-OwyC)T?T?l$225Df~TcDJIz^;!8hzHrNl*igm}{P+~=o+A&pr!KtQ(dVa! z*T(OxZSzka?Fe7CXLPZH{Q5?tEAN+5+1ba&(&pH^yL4O9 dhtGd*zx4Bd_78t+u;2MnB;pgXmEp_R{{mJAa2Nmp literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/crowbar.rsi/cover-inhand-right.png b/Resources/Textures/Objects/Tools/crowbar.rsi/cover-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..6a8c0dd2e5fde915954d3968ebce9f189a67e6d4 GIT binary patch literal 1200 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy zw18|5AO?X;!IOa`XMsm#F$06fED&ZCw^H21z`$IW84^(v;p=0SoS&h?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6 zGOr}DLN~8i8Da>`9GBGM~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fx1Qd4v@^D+|iQgn+l(=$qJ^dYKIO@WA_8g8SH z#T_;v-&;inr55Msl!C(F&dAKf1{@|RqKKG)=!n3o16dSZM?gk?Nj@-T6=f!S=9Q!t z6%+we8N^1YeYjPin}x7EG%vHn&IoD%nlO?sq*$_YEGj9_FUk%9#|UO{;#3MX4idCT zDHf6)z|jEA4|ZHO`tZDE$91eah?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6 zGOr}DLN~8i8Da>`9GBGM~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fyK^K?@SOEU`!Qd4xD9G$%bfY?SKq65_=h$yNB zHu_lHVgm{RtH_|#;{2RaP#oA9nVHyt!v#eY5gQO45mjZ9hZ$hJdfFNIi5O}0nB*YJY5_^Dj471I>_5>Ai(0_!oTjg?~ea$ zF)m6joNFenG5S+0Q>^{*gKT>{10xd)hk$}Z1C;T>A>rK5s)9e-?&q&WukV*nUUKT| z)yV9tzW;;zR2Sr@lpkk^QlI|HdRoKY@>R?CS@rJUZX*y(MtO^y-+hSf2hMZsVf-&8QoO%v!eUU-;pyt_qGbKw90 delta 120 zcmdnXIhApON@0wri(^Q|oVQmQIS&}{upBVpzbY*JHGhGUnV{|;u5zYBpE;LsF(AML z_g%m5&iy!tW737Y?znTPbd0U|=rE42dX-@b$4u&d=3LOvz75)vL%Y z0PC`;umUo3Q%e#RDspr3imfVamB1>jfNYSkzLEl1NlCV?QiN}Sf^&XRs)CuGfu4bq z9hZWFf=y9MnpKdC8&o@xXRDM^Qc_^0uU}qXu2*iXmtT~wZ)j<0sc&GUZ)BtkRH0j3 znOBlnp_^B%3^4>|j!SBBa#3bMNoIbY0?6FNr2NtnTO}osMQ{LdXG${Mo`TY%9I!1Z z$@-}|sky0nCB^!NdWQPg^p#|$AzYYO3=Ixo!03ZyfZ7bOYV#~8Nj3q7lxqdhJy8Dv z9hwZbx40xlA4!3}k%57Qu7Q!Rk)=M|e?aHkq$FFFWR~Qlf&&ijA8-gd=9Hj{g4Bb8 zASV+PvQ{~XdFi%F6}l;@X^EvdB}#ThsVTa}CHX~(>8UpQ5QV4)Ktxf^wb94o1RIdY zts;X`i}Q0zK|yb4WM*Om4h|GiL?l3TL}1l{EQ+opAS1sdADF0$GLt>?N>Ymoihv0W zVk6W(+$zw`LRcP}msw(G1T_Fn7)cjW1X(#2m6YcfWru(x10^JJs)CvX300(Y3dscE z7y#x1J1!f2c#g8;sxe~x4a~Z{o-U3d5u9(sH}W+Z2-tQu&-lTdr?;c@U03}1JHBG- zGA|R9b~PNWVAGrQWt~daC8HScclWCIzAj+@@O0~hPufeZq_TSwAM0v%oZqQ#|HLw8 zcH6G<7{MGy=c4HA1v;mfchpX6yteE9W|s}D52jA6DR}%&l_7Rd&ZDQUbL^JPtN0=B z%Czi3_o4znTPbd0U|=rE42dX-@b$4u&d=3LOvz75)vL%Y z0PC`;umUo3Q%e#RDspr3imfVamB1>jfNYSkzLEl1NlCV?QiN}Sf^&XRs)CuGfu4bq z9hZWFf=y9MnpKdC8&o@xXRDM^Qc_^0uU}qXu2*iXmtT~wZ)j<0sc&GUZ)BtkRH0j3 znOBlnp_^B%3^4>|j!SBBa#3bMNoIbY0?6FNr2NtnTO}osMQ{LdXG${Mo`TY%9I!1Z z$@-}|sky0nCB^!NdWQPg^p#|$AzYYO3=Ixo!03ZyfZ7bOYV#~8Nj3q7lxqdhJy8Dv z9hwZbx40xlA4!3}k%57Qu7Q!Rk)=M|e?aHkq$FFFWR~Qlf&&ijA8-gd=9Hj{g4Bb8 zASV+PvQ{~XdFi%F6}l;@X^EvdB}#ThsVTa}CHX~(>8UpQ5QV4)Ktxf^wb94o1RIdY zts;X`i}Q0zK|yb4WM*Om4h|GiL?l3TL}1l{EQ+opAS1sdADF0$GLt>?N>Ymoihv0W zVk6W(+$zw`LRcP}msw(G1T_Fn7)cjW1X(#2m6YcfWru(x10^JJs)CvX300(Y3dscE z7y#x1J1!f2c#g8;sxe~x4a~ZNo-U3d5u9(sZMhE_2<+|hc4c7~4_}x!bN4lQ{kfZO z?zPhRDs1hh9GB_Dy|X)@rNmQjPxbq!daW!85A+|s;#Qn8S9__-=iXeQ=@H%en|S7x z<{lQk%5u{o`cF*g2JNo?&eBN^vzAr)89ACYM7w>w)_3(fgVUU26NOJPl}@?mw4+^z zx%NxtJm=L)wFb#^uQqwg9KN}Lag)Ka$-FBTx10_;^!T4$ZupXi{cFT@(rX;8C#N1z z``8)D_RU=0(|CHS!WM-s2W;Hx1YZmM@|<<^pu-A>6%0S^1aw*EglYOb7j^mNR5jsQ zy=#vX_rKLlKQs=SGj6;)x8OO~f{Ms#ynw+A0`BV^kBe`!3>Vt> S;Kwph8RY5e=d#Wzp$P!srKNuW literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/crowbar.rsi/red-equipped-BELT.png b/Resources/Textures/Objects/Tools/crowbar.rsi/red-equipped-BELT.png deleted file mode 100644 index e512032624530912dbaabfa63c149c143712da83..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=v7RoDAr*7pUhU>Qpuod=;DR96 zxyhucR11Rt^`yD2X!jO$Fq8uFPbQ8RJ`R{+4hb8?`wbla+m%%P3OT4 oj+pn|JFJ;RmdKI;Vst0F)vycK`qY diff --git a/Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png b/Resources/Textures/Objects/Tools/crowbar.rsi/red-icon.png deleted file mode 100644 index ac25643123eae1511c713087fb498e3faf6db763..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 200 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfvi2$Dv*Z&Rw_4M=#^7GTu(n3Q* zcCoU~WMIf}RV@Z%-FoVOh8)-mJoTrOph{nX^gasTNT#G(QPMyLMz|!I~ zM>J4G!@5gCQCrYdFrmavD1k>iC85MgNWfP-K_Jj2^uU3RWei8TCNQNqu(LWn%ix+K t8~CHiNo@s}OGtpIfdSVdEeRC{hDGmr{NG9Ep99*&;OXk;vd$@?2>^21I5PkM diff --git a/Resources/Textures/Objects/Tools/crowbar.rsi/red-inhand-left.png b/Resources/Textures/Objects/Tools/crowbar.rsi/red-inhand-left.png deleted file mode 100644 index 79cada41ced710144bfd328181d5476f93607212..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 322 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|e{s5m4S0Fu;fk97CFD)%CG$f>x zQJ5Vl#8?vK7tG-B>_!@pQ&1HWQR0$XoLrPyP?DLS$G}iACpfI2sPy}n;DV1|pJ;jO zYMncCK6pc@!A0W-k95xaXr5#!>gnBKVH{+9+1N{A&Z9|3CWR;jYwpz8Z=<gE*^OQv=kuhlR#7d>M3Bq*%lYcZoV9|PkInHl0U5{iI!r+T_LhIn))CrGd^ zPFTROn5k!JM=axH0V`%%4Xp*2X1GZx2H$89c4=hRs}x*?vuWMD{3OA8GN z@pV@Nsbwq)@(X5gcy=QV$SJ4_i70VNElw`VEGWs$&tqVym=hdUP*nQ;OK`!*uTQkR zb+yi&IUl?s)Zn7=gGV~&eKb!p6!rA(urLlXzHIEJFz3;vBa=cDf;D$)?6=X}sIgDO z)U~tQSatIXi6v9Jjn`@znu{JWdlD2@@U@sxnva2ThRh7{83{!|yK_8U978-hlM^IZ z7dQNK;8?9OnW5+CijGi5rw9**)l54q7Ax}2P890l+i~X^M`%LRVJ^WL7n^phIk2!$ zq^Bv+LFYgmlLF%vB?j+#&YCV8rfD2vx^c7MK$D6_lk2>Tk~dl0b+jgMcRma^0EW~? W7QX8;)owt089ZJ6T-G@yGywn$V|7FT diff --git a/Resources/Textures/Objects/Tools/crowbar.rsi/red-storage.png b/Resources/Textures/Objects/Tools/crowbar.rsi/red-storage.png index 1d88fecb2b03e4a16657439d72d70cec7857cf38..f937f6c7d15e56d6502e99f83087b290e0fceabc 100644 GIT binary patch literal 1275 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}e5nzhX}-P; zT0k}j5QD&_;K@Lev%n*=n1MlK76>znTPbd0U|=rE42dX-@b$4u&d=3LOvz75)vL%Y z0PC`;umUo3Q%e#RDspr3imfVamB1>jfNYSkzLEl1NlCV?QiN}Sf^&XRs)CuGfu4bq z9hZWFf=y9MnpKdC8&o@xXRDM^Qc_^0uU}qXu2*iXmtT~wZ)j<0sc&GUZ)BtkRH0j3 znOBlnp_^B%3^4>|j!SBBa#3bMNoIbY0?6FNr2NtnTO}osMQ{LdXG${Mo`TY%9I!1Z z$@-}|sky0nCB^!NdWQPg^p#|$AzYYO3=Ixo!03ZyfZ7bOYV#~8Nj3q7lxqdhJy8Dv z9hwZbx40xlA4!3}k%57Qu7Q!Rk)=M|e?aHkq$FFFWR~Qlf&&ijA8-gd=9Hj{g4Bb8 zASV+PvQ{~XdFi%F6}l;@X^EvdB}#ThsVTa}CHX~(>8UpQ5QV4)Ktxf^wb94o1RIdY zts;X`i}Q0zK|yb4WM*Om4h|GiL?l3TL}1l{EQ+opAS1sdADF0$GLt>?N>Ymoihv0W zVk6W(+$zw`LRcP}msw(G1T_Fn7)cjW1X(#2m6YcfWru(x10^JJs)CvX300(Y3dscE z7y#x1J1!f2c#g8;sxe~x4a~Z1o-U3d5u9(s_wqFv2-x)+9*W-a;Mz>l`SXr0ovq^+ zo2cE%z3rHB!Neuy<|{mBPuTWk-~4-}JD6%JbC&!%Hls6X?be)qvZ|gp-9HvzZjg7E zvMco6z$bjgR&l-B)t5bua~q?LQP+7to4q^<9+&p`b}2c^2l*>q+OEW$ z{U!JIAsyxH#P0u#gr>MM9&Td0afl;bT4Qai^N(+h3thyH>S!GdRP!~2Bi3D1V#jQKnpa#R{xDBJPURd^KE?O_rq5}Y|Zf$lg5O+|NT4W&z4`_7|eM=c~Kvz;PG_zb6Mw< G&;$T?F`j<_ delta 321 zcmV-H0lxnG3FrclFn<9eNklEJf&v?HLUfef1klk}K_Gb_*^ul49jnLbB&9?U1clxn$1!=lA=ljZJe)5V z{c%BsAOYy+r{fXHZU+FE&t`BOhYV30KuTG;FU=LR;s!ucpMTr~s7$>M)(U_s*LCmL zVHlDZB6$%4z+^neNo(W$0c?Q9dW}tAr6a(1iW~-w)7vLQ+C-L0ACW)e48@@+nB80Pi-U z#uJiPU-%mdNjh1Ss0E4X`7o&aViZM%?|Dem6abKA89NhJMH)Z|aW6=1n16(>y7_znTPbd0U|=rE42dX-@b$4u&d=3LOvz75)vL%Y z0PC`;umUo3Q%e#RDspr3imfVamB1>jfNYSkzLEl1NlCV?QiN}Sf^&XRs)CuGfu4bq z9hZWFf=y9MnpKdC8&o@xXRDM^Qc_^0uU}qXu2*iXmtT~wZ)j<0sc&GUZ)BtkRH0j3 znOBlnp_^B%3^4>|j!SBBa#3bMNoIbY0?6FNr2NtnTO}osMQ{LdXG${Mo`TY%9I!1Z z$@-}|sky0nCB^!NdWQPg^p#|$AzYYO3=Ixo!03ZyfZ7bOYV#~8Nj3q7lxqdhJy8Dv z9hwZbx40xlA4!3}k%57Qu7Q!Rk)=M|e?aHkq$FFFWR~Qlf&&ijA8-gd=9Hj{g4Bb8 zASV+PvQ{~XdFi%F6}l;@X^EvdB}#ThsVTa}CHX~(>8UpQ5QV4)Ktxf^wb94o1RIdY zts;X`i}Q0zK|yb4WM*Om4h|GiL?l3TL}1l{EQ+opAS1sdADF0$GLt>?N>Ymoihv0W zVk6W(+$zw`LRcP}msw(G1T_Fn7)cjW1X(#2m6YcfWru(x10^JJs)CvX300(Y3dscE z7y#x1J1!f2c#g8;sxe~x4a~ayo-U3d5u9(sH*y^^5ZLP__}bjU;;L@(wO?OlRcFtY zS(9v?DbwPyr~)ApsT!dW3nm70fF_UPeq@y)N1Y(e)yh^ zb4K&}*HS%QXIdlwH%D#I<$9qjp&*=W73naMGvYq$6aR*$nwJyGqJVPueHk`}O=yS+ zGPd_P@HETm$W2G4AnqXUM}2eW%9e2Cc39|hdWd?6Dx7ByGPJmBvByl-V<~%(U@3nv z_rKLlKQs=SJBEC2PkGO!Pzopr0M|#H*#H0l literal 0 HcmV?d00001 From 218fef37c86ba0502710f987692c88b22c6fc2f3 Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 9 Aug 2024 19:30:06 +0000 Subject: [PATCH 323/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 7088cffd3c..b0c329c400 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: notquitehadouken - changes: - - message: You can now only use suit storage with hardsuits, softsuits, and armor - instead of all outer clothing - type: Tweak - id: 6573 - time: '2024-05-10T02:19:08.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27546 - author: aspiringLich changes: - message: The Chemical, Booze, and Soda Dispensers now have updated UIs. @@ -3792,3 +3784,13 @@ id: 7072 time: '2024-08-09T15:43:02.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29621 +- author: Ubaser + changes: + - message: Normal crowbars cannot be placed in pockets, but can now fit in belts. + type: Tweak + - message: Depending on where you obtained the crowbars, they will now have different + colours. + type: Tweak + id: 7073 + time: '2024-08-09T19:29:00.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/28988 From c80c26221b27f46ab81f83314ae4c248a5f402e2 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Fri, 9 Aug 2024 22:19:04 +0200 Subject: [PATCH 324/422] Crowbars fix (#30828) * Crowbars fix * oops --- .../Entities/Objects/Tools/crowbars.yml | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Tools/crowbars.yml b/Resources/Prototypes/Entities/Objects/Tools/crowbars.yml index d57bea8a5b..7311c81434 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/crowbars.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/crowbars.yml @@ -29,11 +29,15 @@ - type: StaticPrice price: 22 - type: Prying + - type: Sprite + sprite: Objects/Tools/crowbar.rsi - type: Clothing + sprite: Objects/Tools/crowbar.rsi quickEquip: false slots: - Belt - type: Item + sprite: Objects/Tools/crowbar.rsi size: Normal shape: - 0,0,0,1 @@ -45,10 +49,8 @@ description: A multipurpose tool to pry open doors and fight interdimensional invaders. components: - type: Sprite - sprite: Objects/Tools/crowbar.rsi state: icon - type: Item - sprite: Objects/Tools/crowbar.rsi storedSprite: sprite: Objects/Tools/crowbar.rsi state: storage @@ -65,13 +67,12 @@ - Crowbar - CrowbarRed - type: Sprite - sprite: Objects/Tools/crowbar.rsi layers: - state: icon - state: cover-icon color: "#990000" - type: Item - sprite: Objects/Tools/crowbar.rsi + size: Small # for pockets storedSprite: state: red-storage sprite: Objects/Tools/crowbar.rsi @@ -85,7 +86,6 @@ - state: cover-inhand-right color: "#990000" - type: Clothing - sprite: Objects/Tools/crowbar.rsi clothingVisuals: belt: - state: equipped-BELT @@ -99,13 +99,11 @@ description: A multipurpose tool to pry open doors and fight interdimensional invaders, printed from an autolathe. components: - type: Sprite - sprite: Objects/Tools/crowbar.rsi layers: - state: icon - state: cover-icon color: "#00621c" - type: Item - sprite: Objects/Tools/crowbar.rsi storedSprite: state: green-storage sprite: Objects/Tools/crowbar.rsi @@ -119,7 +117,6 @@ - state: cover-inhand-right color: "#00621c" - type: Clothing - sprite: Objects/Tools/crowbar.rsi clothingVisuals: belt: - state: equipped-BELT @@ -133,13 +130,11 @@ description: A multipurpose tool to pry open doors and fight interdimensional invaders, found in toolboxes. components: - type: Sprite - sprite: Objects/Tools/crowbar.rsi layers: - state: icon - state: cover-icon color: "#673800" - type: Item - sprite: Objects/Tools/crowbar.rsi storedSprite: state: orange-storage sprite: Objects/Tools/crowbar.rsi @@ -153,7 +148,6 @@ - state: cover-inhand-right color: "#673800" - type: Clothing - sprite: Objects/Tools/crowbar.rsi clothingVisuals: belt: - state: equipped-BELT @@ -167,13 +161,11 @@ description: A pocket crowbar designed to pry open doors and firelocks during power outages, dispensed from Engineering. components: - type: Sprite - sprite: Objects/Tools/crowbar.rsi layers: - state: icon - state: cover-icon color: "#968000" - type: Item - sprite: Objects/Tools/crowbar.rsi storedSprite: state: yellow-storage sprite: Objects/Tools/crowbar.rsi @@ -187,7 +179,6 @@ - state: cover-inhand-right color: "#968000" - type: Clothing - sprite: Objects/Tools/crowbar.rsi clothingVisuals: belt: - state: equipped-BELT From ee7644c63147f39b9db5a95db78efa001125571e Mon Sep 17 00:00:00 2001 From: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com> Date: Fri, 9 Aug 2024 18:08:56 -0700 Subject: [PATCH 325/422] Network WallMountComponent (#30837) --- Content.Shared/Wall/WallMountComponent.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Content.Shared/Wall/WallMountComponent.cs b/Content.Shared/Wall/WallMountComponent.cs index cbd266e3f8..765dd5aff2 100644 --- a/Content.Shared/Wall/WallMountComponent.cs +++ b/Content.Shared/Wall/WallMountComponent.cs @@ -1,3 +1,5 @@ +using Robust.Shared.GameStates; + namespace Content.Shared.Wall; /// @@ -7,20 +9,20 @@ namespace Content.Shared.Wall; /// This will only exempt anchored entities that intersect the wall-mount. Additionally, this exemption will apply /// in a limited arc, providing basic functionality for directional wall mounts. /// -[RegisterComponent] +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState] public sealed partial class WallMountComponent : Component { /// /// Range of angles for which the exemption applies. Bigger is more permissive. /// [ViewVariables(VVAccess.ReadWrite)] - [DataField("arc")] + [DataField("arc"), AutoNetworkedField] public Angle Arc = new(MathF.PI); /// /// The direction in which the exemption arc is facing, relative to the entity's rotation. Defaults to south. /// [ViewVariables(VVAccess.ReadWrite)] - [DataField("direction")] + [DataField("direction"), AutoNetworkedField] public Angle Direction = Angle.Zero; } From 45a2327ef555e9628423909c8b445863a519f7b9 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Sat, 10 Aug 2024 03:10:39 +0200 Subject: [PATCH 326/422] Revert "Make hotplate and grill anchorable on table part 2" (#30830) Revert "Make hotplate and grill anchorable on table part 2 (#29454)" This reverts commit 268cab97f5c6a6235367fb18d3fbfb88281d046c. --- .../Prototypes/Entities/Structures/Machines/hotplate.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Structures/Machines/hotplate.yml b/Resources/Prototypes/Entities/Structures/Machines/hotplate.yml index 8751c2b7ab..3764f13591 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/hotplate.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/hotplate.yml @@ -15,7 +15,10 @@ mask: - TabletopMachineMask layer: - - TabletopMachineLayer + - Impassable + - MidImpassable + - LowImpassable + hard: false - type: ApcPowerReceiver powerLoad: 300 - type: Appearance From b692ab1850b4f7ff8390ab091dda9eb889dfea9a Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 10 Aug 2024 01:11:47 +0000 Subject: [PATCH 327/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index b0c329c400..5c0629b489 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: aspiringLich - changes: - - message: The Chemical, Booze, and Soda Dispensers now have updated UIs. - type: Add - id: 6574 - time: '2024-05-10T02:37:04.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27831 - author: Jajsha changes: - message: Emagged cyborgs no longer reveal that they have been emagged by simply @@ -3794,3 +3787,10 @@ id: 7073 time: '2024-08-09T19:29:00.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/28988 +- author: lzk228 + changes: + - message: Hotplate works again. + type: Fix + id: 7074 + time: '2024-08-10T01:10:39.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30830 From 437c86162213d7a69d7dd5f4f3420194a561ab9d Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Fri, 9 Aug 2024 22:12:40 -0400 Subject: [PATCH 328/422] Entity Tables (EntitySpawnEntry replacement) (#30579) * Entity table code * entity table examples * fix dat shit * access * tests tests tests * sloth review --- .../Components/EntityTableSpawnerComponent.cs | 30 + .../EntitySystems/ConditionalSpawnerSystem.cs | 30 +- .../Containers/ContainerFillSystem.cs | 37 + .../EntityTableContainerFillComponent.cs | 13 + .../EntitySelectors/AllSelector.cs | 25 + .../EntitySelectors/EntSelector.cs | 27 + .../EntitySelectors/EntityTableSelector.cs | 49 ++ .../EntitySelectors/GroupSelector.cs | 28 + .../EntitySelectors/NestedSelector.cs | 20 + .../EntitySelectors/NoneSelector.cs | 16 + .../EntityTable/EntityTablePrototype.cs | 18 + .../EntityTable/EntityTableSystem.cs | 20 + .../ValueSelector/ConstantNumberSelector.cs | 22 + .../ValueSelector/NumberSelector.cs | 16 + .../ValueSelector/RangeNumberSelector.cs | 19 + .../Random/Helpers/SharedRandomExtensions.cs | 21 + .../Prototypes/Catalog/Fills/Crates/fun.yml | 114 ++- .../Prototypes/Catalog/Fills/Lockers/misc.yml | 466 ++++------ .../Markers/Spawners/Random/maintenance.yml | 793 ++++++++++++------ 19 files changed, 1198 insertions(+), 566 deletions(-) create mode 100644 Content.Server/Spawners/Components/EntityTableSpawnerComponent.cs create mode 100644 Content.Shared/Containers/EntityTableContainerFillComponent.cs create mode 100644 Content.Shared/EntityTable/EntitySelectors/AllSelector.cs create mode 100644 Content.Shared/EntityTable/EntitySelectors/EntSelector.cs create mode 100644 Content.Shared/EntityTable/EntitySelectors/EntityTableSelector.cs create mode 100644 Content.Shared/EntityTable/EntitySelectors/GroupSelector.cs create mode 100644 Content.Shared/EntityTable/EntitySelectors/NestedSelector.cs create mode 100644 Content.Shared/EntityTable/EntitySelectors/NoneSelector.cs create mode 100644 Content.Shared/EntityTable/EntityTablePrototype.cs create mode 100644 Content.Shared/EntityTable/EntityTableSystem.cs create mode 100644 Content.Shared/EntityTable/ValueSelector/ConstantNumberSelector.cs create mode 100644 Content.Shared/EntityTable/ValueSelector/NumberSelector.cs create mode 100644 Content.Shared/EntityTable/ValueSelector/RangeNumberSelector.cs diff --git a/Content.Server/Spawners/Components/EntityTableSpawnerComponent.cs b/Content.Server/Spawners/Components/EntityTableSpawnerComponent.cs new file mode 100644 index 0000000000..d122eb098b --- /dev/null +++ b/Content.Server/Spawners/Components/EntityTableSpawnerComponent.cs @@ -0,0 +1,30 @@ +using Content.Server.Spawners.EntitySystems; +using Content.Shared.EntityTable.EntitySelectors; +using Robust.Shared.Prototypes; + +namespace Content.Server.Spawners.Components; + +[RegisterComponent, EntityCategory("Spawner"), Access(typeof(ConditionalSpawnerSystem))] +public sealed partial class EntityTableSpawnerComponent : Component +{ + /// + /// Table that determines what gets spawned. + /// + [DataField(required: true)] + public EntityTableSelector Table = default!; + + /// + /// Scatter of entity spawn coordinates + /// + [DataField] + public float Offset = 0.2f; + + /// + /// A variable meaning whether the spawn will + /// be able to be used again or whether + /// it will be destroyed after the first use + /// + [DataField] + public bool DeleteSpawnerAfterSpawn = true; +} + diff --git a/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs b/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs index f57481b05b..ad59fc83cf 100644 --- a/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs +++ b/Content.Server/Spawners/EntitySystems/ConditionalSpawnerSystem.cs @@ -1,9 +1,10 @@ using System.Numerics; using Content.Server.GameTicking; -using Content.Server.GameTicking.Rules.Components; using Content.Server.Spawners.Components; +using Content.Shared.EntityTable; using Content.Shared.GameTicking.Components; using JetBrains.Annotations; +using Robust.Shared.Map; using Robust.Shared.Random; namespace Content.Server.Spawners.EntitySystems @@ -13,6 +14,7 @@ namespace Content.Server.Spawners.EntitySystems { [Dependency] private readonly IRobustRandom _robustRandom = default!; [Dependency] private readonly GameTicker _ticker = default!; + [Dependency] private readonly EntityTableSystem _entityTable = default!; public override void Initialize() { @@ -21,6 +23,7 @@ namespace Content.Server.Spawners.EntitySystems SubscribeLocalEvent(OnRuleStarted); SubscribeLocalEvent(OnCondSpawnMapInit); SubscribeLocalEvent(OnRandSpawnMapInit); + SubscribeLocalEvent(OnEntityTableSpawnMapInit); } private void OnCondSpawnMapInit(EntityUid uid, ConditionalSpawnerComponent component, MapInitEvent args) @@ -35,6 +38,13 @@ namespace Content.Server.Spawners.EntitySystems QueueDel(uid); } + private void OnEntityTableSpawnMapInit(Entity ent, ref MapInitEvent args) + { + Spawn(ent); + if (ent.Comp.DeleteSpawnerAfterSpawn && !TerminatingOrDeleted(ent) && Exists(ent)) + QueueDel(ent); + } + private void OnRuleStarted(ref GameRuleStartedEvent args) { var query = EntityQueryEnumerator(); @@ -110,5 +120,23 @@ namespace Content.Server.Spawners.EntitySystems EntityManager.SpawnEntity(_robustRandom.Pick(component.Prototypes), coordinates); } + + private void Spawn(Entity ent) + { + if (TerminatingOrDeleted(ent) || !Exists(ent)) + return; + + var coords = Transform(ent).Coordinates; + + var spawns = _entityTable.GetSpawns(ent.Comp.Table); + foreach (var proto in spawns) + { + var xOffset = _robustRandom.NextFloat(-ent.Comp.Offset, ent.Comp.Offset); + var yOffset = _robustRandom.NextFloat(-ent.Comp.Offset, ent.Comp.Offset); + var trueCoords = coords.Offset(new Vector2(xOffset, yOffset)); + + Spawn(proto, trueCoords); + } + } } } diff --git a/Content.Shared/Containers/ContainerFillSystem.cs b/Content.Shared/Containers/ContainerFillSystem.cs index e120b6bc88..51c7c48e40 100644 --- a/Content.Shared/Containers/ContainerFillSystem.cs +++ b/Content.Shared/Containers/ContainerFillSystem.cs @@ -1,4 +1,5 @@ using System.Numerics; +using Content.Shared.EntityTable; using Robust.Shared.Containers; using Robust.Shared.Map; @@ -7,11 +8,14 @@ namespace Content.Shared.Containers; public sealed class ContainerFillSystem : EntitySystem { [Dependency] private readonly SharedContainerSystem _containerSystem = default!; + [Dependency] private readonly EntityTableSystem _entityTable = default!; + [Dependency] private readonly SharedTransformSystem _transform = default!; public override void Initialize() { base.Initialize(); SubscribeLocalEvent(OnMapInit); + SubscribeLocalEvent(OnTableMapInit); } private void OnMapInit(EntityUid uid, ContainerFillComponent component, MapInitEvent args) @@ -42,4 +46,37 @@ public sealed class ContainerFillSystem : EntitySystem } } } + + private void OnTableMapInit(Entity ent, ref MapInitEvent args) + { + if (!TryComp(ent, out ContainerManagerComponent? containerComp)) + return; + + if (TerminatingOrDeleted(ent) || !Exists(ent)) + return; + + var xform = Transform(ent); + var coords = new EntityCoordinates(ent, Vector2.Zero); + + foreach (var (containerId, table) in ent.Comp.Containers) + { + if (!_containerSystem.TryGetContainer(ent, containerId, out var container, containerComp)) + { + Log.Error($"Entity {ToPrettyString(ent)} with a {nameof(EntityTableContainerFillComponent)} is missing a container ({containerId})."); + continue; + } + + var spawns = _entityTable.GetSpawns(table); + foreach (var proto in spawns) + { + var spawn = Spawn(proto, coords); + if (!_containerSystem.Insert(spawn, container, containerXform: xform)) + { + Log.Error($"Entity {ToPrettyString(ent)} with a {nameof(EntityTableContainerFillComponent)} failed to insert an entity: {ToPrettyString(spawn)}."); + _transform.AttachToGridOrMap(spawn); + break; + } + } + } + } } diff --git a/Content.Shared/Containers/EntityTableContainerFillComponent.cs b/Content.Shared/Containers/EntityTableContainerFillComponent.cs new file mode 100644 index 0000000000..3f30dc86d6 --- /dev/null +++ b/Content.Shared/Containers/EntityTableContainerFillComponent.cs @@ -0,0 +1,13 @@ +using Content.Shared.EntityTable.EntitySelectors; + +namespace Content.Shared.Containers; + +/// +/// Version of that utilizes +/// +[RegisterComponent, Access(typeof(ContainerFillSystem))] +public sealed partial class EntityTableContainerFillComponent : Component +{ + [DataField] + public Dictionary Containers = new(); +} diff --git a/Content.Shared/EntityTable/EntitySelectors/AllSelector.cs b/Content.Shared/EntityTable/EntitySelectors/AllSelector.cs new file mode 100644 index 0000000000..8fb8b5e546 --- /dev/null +++ b/Content.Shared/EntityTable/EntitySelectors/AllSelector.cs @@ -0,0 +1,25 @@ +using Robust.Shared.Prototypes; + +namespace Content.Shared.EntityTable.EntitySelectors; + +/// +/// Gets spawns from all of the child selectors +/// +public sealed partial class AllSelector : EntityTableSelector +{ + [DataField(required: true)] + public List Children; + + protected override IEnumerable GetSpawnsImplementation(System.Random rand, + IEntityManager entMan, + IPrototypeManager proto) + { + foreach (var child in Children) + { + foreach (var spawn in child.GetSpawns(rand, entMan, proto)) + { + yield return spawn; + } + } + } +} diff --git a/Content.Shared/EntityTable/EntitySelectors/EntSelector.cs b/Content.Shared/EntityTable/EntitySelectors/EntSelector.cs new file mode 100644 index 0000000000..b1e712b4b3 --- /dev/null +++ b/Content.Shared/EntityTable/EntitySelectors/EntSelector.cs @@ -0,0 +1,27 @@ +using Content.Shared.EntityTable.ValueSelector; +using Robust.Shared.Prototypes; + +namespace Content.Shared.EntityTable.EntitySelectors; + +/// +/// Gets the spawn for the entity prototype specified at whatever count specified. +/// +public sealed partial class EntSelector : EntityTableSelector +{ + [DataField(required: true)] + public EntProtoId Id; + + [DataField] + public NumberSelector Amount = new ConstantNumberSelector(1); + + protected override IEnumerable GetSpawnsImplementation(System.Random rand, + IEntityManager entMan, + IPrototypeManager proto) + { + var num = (int) Math.Round(Amount.Get(rand, entMan, proto)); + for (var i = 0; i < num; i++) + { + yield return Id; + } + } +} diff --git a/Content.Shared/EntityTable/EntitySelectors/EntityTableSelector.cs b/Content.Shared/EntityTable/EntitySelectors/EntityTableSelector.cs new file mode 100644 index 0000000000..2533f17dc5 --- /dev/null +++ b/Content.Shared/EntityTable/EntitySelectors/EntityTableSelector.cs @@ -0,0 +1,49 @@ +using Content.Shared.EntityTable.ValueSelector; +using JetBrains.Annotations; +using Robust.Shared.Prototypes; +using Robust.Shared.Random; + +namespace Content.Shared.EntityTable.EntitySelectors; + +[ImplicitDataDefinitionForInheritors, UsedImplicitly(ImplicitUseTargetFlags.WithInheritors)] +public abstract partial class EntityTableSelector +{ + /// + /// The number of times this selector is run + /// + [DataField] + public NumberSelector Rolls = new ConstantNumberSelector(1); + + /// + /// A weight used to pick between selectors. + /// + [DataField] + public float Weight = 1; + + /// + /// A simple chance that the selector will run. + /// + [DataField] + public double Prob = 1; + + public IEnumerable GetSpawns(System.Random rand, + IEntityManager entMan, + IPrototypeManager proto) + { + var rolls = Rolls.Get(rand, entMan, proto); + for (var i = 0; i < rolls; i++) + { + if (!rand.Prob(Prob)) + continue; + + foreach (var spawn in GetSpawnsImplementation(rand, entMan, proto)) + { + yield return spawn; + } + } + } + + protected abstract IEnumerable GetSpawnsImplementation(System.Random rand, + IEntityManager entMan, + IPrototypeManager proto); +} diff --git a/Content.Shared/EntityTable/EntitySelectors/GroupSelector.cs b/Content.Shared/EntityTable/EntitySelectors/GroupSelector.cs new file mode 100644 index 0000000000..8f761f9866 --- /dev/null +++ b/Content.Shared/EntityTable/EntitySelectors/GroupSelector.cs @@ -0,0 +1,28 @@ +using Content.Shared.Random.Helpers; +using Robust.Shared.Prototypes; + +namespace Content.Shared.EntityTable.EntitySelectors; + +/// +/// Gets the spawns from one of the child selectors, based on the weight of the children +/// +public sealed partial class GroupSelector : EntityTableSelector +{ + [DataField(required: true)] + public List Children = new(); + + protected override IEnumerable GetSpawnsImplementation(System.Random rand, + IEntityManager entMan, + IPrototypeManager proto) + { + var children = new Dictionary(Children.Count); + foreach (var child in Children) + { + children.Add(child, child.Weight); + } + + var pick = SharedRandomExtensions.Pick(children, rand); + + return pick.GetSpawns(rand, entMan, proto); + } +} diff --git a/Content.Shared/EntityTable/EntitySelectors/NestedSelector.cs b/Content.Shared/EntityTable/EntitySelectors/NestedSelector.cs new file mode 100644 index 0000000000..fc8d8f08d3 --- /dev/null +++ b/Content.Shared/EntityTable/EntitySelectors/NestedSelector.cs @@ -0,0 +1,20 @@ +using Robust.Shared.Prototypes; + +namespace Content.Shared.EntityTable.EntitySelectors; + +/// +/// Gets the spawns from the entity table prototype specified. +/// Can be used to reuse common tables. +/// +public sealed partial class NestedSelector : EntityTableSelector +{ + [DataField(required: true)] + public ProtoId TableId; + + protected override IEnumerable GetSpawnsImplementation(System.Random rand, + IEntityManager entMan, + IPrototypeManager proto) + { + return proto.Index(TableId).Table.GetSpawns(rand, entMan, proto); + } +} diff --git a/Content.Shared/EntityTable/EntitySelectors/NoneSelector.cs b/Content.Shared/EntityTable/EntitySelectors/NoneSelector.cs new file mode 100644 index 0000000000..21fcb6d279 --- /dev/null +++ b/Content.Shared/EntityTable/EntitySelectors/NoneSelector.cs @@ -0,0 +1,16 @@ +using Robust.Shared.Prototypes; + +namespace Content.Shared.EntityTable.EntitySelectors; + +/// +/// Selects nothing. +/// +public sealed partial class NoneSelector : EntityTableSelector +{ + protected override IEnumerable GetSpawnsImplementation(System.Random rand, + IEntityManager entMan, + IPrototypeManager proto) + { + yield break; + } +} diff --git a/Content.Shared/EntityTable/EntityTablePrototype.cs b/Content.Shared/EntityTable/EntityTablePrototype.cs new file mode 100644 index 0000000000..63cebe9aeb --- /dev/null +++ b/Content.Shared/EntityTable/EntityTablePrototype.cs @@ -0,0 +1,18 @@ +using Content.Shared.EntityTable.EntitySelectors; +using Robust.Shared.Prototypes; + +namespace Content.Shared.EntityTable; + +/// +/// This is a prototype for... +/// +[Prototype] +public sealed partial class EntityTablePrototype : IPrototype +{ + /// + [IdDataField] + public string ID { get; } = default!; + + [DataField(required: true)] + public EntityTableSelector Table = default!; +} diff --git a/Content.Shared/EntityTable/EntityTableSystem.cs b/Content.Shared/EntityTable/EntityTableSystem.cs new file mode 100644 index 0000000000..ff499e6760 --- /dev/null +++ b/Content.Shared/EntityTable/EntityTableSystem.cs @@ -0,0 +1,20 @@ +using Content.Shared.EntityTable.EntitySelectors; +using Robust.Shared.Prototypes; +using Robust.Shared.Random; + +namespace Content.Shared.EntityTable; + +public sealed class EntityTableSystem : EntitySystem +{ + [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private readonly IRobustRandom _random = default!; + + public IEnumerable GetSpawns(EntityTableSelector? table, System.Random? rand = null) + { + if (table == null) + return new List(); + + rand ??= _random.GetRandom(); + return table.GetSpawns(rand, EntityManager, _prototypeManager); + } +} diff --git a/Content.Shared/EntityTable/ValueSelector/ConstantNumberSelector.cs b/Content.Shared/EntityTable/ValueSelector/ConstantNumberSelector.cs new file mode 100644 index 0000000000..0baf6785f4 --- /dev/null +++ b/Content.Shared/EntityTable/ValueSelector/ConstantNumberSelector.cs @@ -0,0 +1,22 @@ +using Robust.Shared.Prototypes; + +namespace Content.Shared.EntityTable.ValueSelector; + +/// +/// Gives a constant value. +/// +public sealed partial class ConstantNumberSelector : NumberSelector +{ + [DataField] + public float Value = 1; + + public ConstantNumberSelector(float value) + { + Value = value; + } + + public override float Get(System.Random rand, IEntityManager entMan, IPrototypeManager proto) + { + return Value; + } +} diff --git a/Content.Shared/EntityTable/ValueSelector/NumberSelector.cs b/Content.Shared/EntityTable/ValueSelector/NumberSelector.cs new file mode 100644 index 0000000000..8a7743c9dd --- /dev/null +++ b/Content.Shared/EntityTable/ValueSelector/NumberSelector.cs @@ -0,0 +1,16 @@ +using Content.Shared.EntityTable.EntitySelectors; +using JetBrains.Annotations; +using Robust.Shared.Prototypes; + +namespace Content.Shared.EntityTable.ValueSelector; + +/// +/// Used for implementing custom value selection for +/// +[ImplicitDataDefinitionForInheritors, UsedImplicitly(ImplicitUseTargetFlags.WithInheritors)] +public abstract partial class NumberSelector +{ + public abstract float Get(System.Random rand, + IEntityManager entMan, + IPrototypeManager proto); +} diff --git a/Content.Shared/EntityTable/ValueSelector/RangeNumberSelector.cs b/Content.Shared/EntityTable/ValueSelector/RangeNumberSelector.cs new file mode 100644 index 0000000000..e8356fcbb7 --- /dev/null +++ b/Content.Shared/EntityTable/ValueSelector/RangeNumberSelector.cs @@ -0,0 +1,19 @@ +using System.Numerics; +using Robust.Shared.Prototypes; +using Robust.Shared.Random; + +namespace Content.Shared.EntityTable.ValueSelector; + +/// +/// Gives a value between the two numbers specified, inclusive. +/// +public sealed partial class RangeNumberSelector : NumberSelector +{ + [DataField] + public Vector2 Range = new(1, 1); + + public override float Get(System.Random rand, IEntityManager entMan, IPrototypeManager proto) + { + return rand.NextFloat(Range.X, Range.Y + 1); + } +} diff --git a/Content.Shared/Random/Helpers/SharedRandomExtensions.cs b/Content.Shared/Random/Helpers/SharedRandomExtensions.cs index 376e91743d..42d92a9065 100644 --- a/Content.Shared/Random/Helpers/SharedRandomExtensions.cs +++ b/Content.Shared/Random/Helpers/SharedRandomExtensions.cs @@ -108,6 +108,27 @@ namespace Content.Shared.Random.Helpers return true; } + public static T Pick(Dictionary weights, System.Random random) + where T : notnull + { + var sum = weights.Values.Sum(); + var accumulated = 0f; + + var rand = random.NextFloat() * sum; + + foreach (var (key, weight) in weights) + { + accumulated += weight; + + if (accumulated >= rand) + { + return key; + } + } + + throw new InvalidOperationException("Invalid weighted pick"); + } + public static (string reagent, FixedPoint2 quantity) Pick(this WeightedRandomFillSolutionPrototype prototype, IRobustRandom? random = null) { var randomFill = prototype.PickRandomFill(random); diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml index c52e13bd13..ebc7a446b9 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml @@ -1,33 +1,81 @@ +- type: entityTable + id: AllPlushiesTable + table: !type:GroupSelector + children: + - !type:EntSelector + id: PlushieBee + - !type:EntSelector + id: PlushieNar + weight: 0.5 + - !type:EntSelector + id: PlushieRatvar + weight: 0.5 + - !type:EntSelector + id: PlushieNuke + - !type:EntSelector + id: PlushieSlime + - !type:EntSelector + id: PlushieSnake + - !type:GroupSelector + children: + - !type:EntSelector + id: PlushieLizard + weight: 9 + - !type:EntSelector + id: PlushieSpaceLizard + weight: 1 + - !type:GroupSelector + children: + - !type:EntSelector + id: PlushieCarp + - !type:EntSelector + id: PlushieHolocarp + weight: 0.25 + - !type:EntSelector + id: PlushieMagicarp + weight: 0.25 + - !type:EntSelector + id: PlushieRainbowCarp + weight: 0.15 + - !type:EntSelector + id: PlushieVox + - !type:EntSelector + id: PlushieRouny + - !type:GroupSelector + children: + - !type:EntSelector + id: PlushieSharkBlue + - !type:EntSelector + id: PlushieSharkGrey + - !type:EntSelector + id: PlushieSharkPink + - !type:EntSelector + id: PlushieAtmosian + - !type:EntSelector + id: PlushieDiona + - !type:EntSelector + id: PlushieXeno + - !type:EntSelector + id: PlushieHampter + - !type:EntSelector + id: PlushieMoth + - !type:EntSelector + id: PlushieArachind + - !type:EntSelector + id: PlushiePenguin + - type: entity id: CrateFunPlushie parent: CrateGenericSteel name: plushie crate description: A buncha soft plushies. Throw them around and then wonder how you're gonna explain this purchase to NT. components: - - type: StorageFill - contents: - - id: PlushieBee - - id: PlushieNar - - id: PlushieCarp - - id: PlushieNuke - - id: PlushieSlime - - id: PlushieSnake - - id: PlushieLizard - - id: PlushieSpaceLizard - - id: PlushieVox - - id: PlushieRouny - - id: PlushieRatvar - - id: PlushieSharkBlue - orGroup: PlushieShark - - id: PlushieSharkGrey - orGroup: PlushieShark - - id: PlushieAtmosian - - id: PlushieDiona - - id: PlushieXeno - - id: PlushieHampter - - id: PlushieMoth - - id: PlushieArachind - - id: PlushiePenguin + - type: EntityTableContainerFill + containers: + entity_storage: !type:NestedSelector + tableId: AllPlushiesTable + rolls: !type:ConstantNumberSelector + value: 10 - type: entity id: CrateFunLizardPlushieBulk @@ -35,12 +83,18 @@ name: bulk lizard plushie crate description: A buncha soft lizard plushies. Throw them around and then wonder how you're gonna explain this purchase to NT. components: - - type: StorageFill - contents: - - id: PlushieLizard - amount: 3 - - id: PlushieSpaceLizard - amount: 2 + - type: EntityTableContainerFill + containers: + entity_storage: !type:AllSelector + children: + - !type:EntSelector + id: PlushieLizard + amount: !type:ConstantNumberSelector + value: 3 + - !type:EntSelector + id: PlushieSpaceLizard + amount: !type:ConstantNumberSelector + value: 3 - type: entity id: CrateFunInstrumentsVariety diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml index a5b06fca03..cf270a6310 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml @@ -3,338 +3,218 @@ suffix: Filled parent: LockerSyndicatePersonal components: - - type: StorageFill - contents: - - id: ClothingBeltMilitaryWebbing - - id: ClothingHandsGlovesCombat - - id: JetpackBlackFilled - - id: ClothingUniformJumpsuitOperative - - id: ClothingUniformJumpskirtOperative - - id: ClothingHeadsetAltSyndicate - - id: ClothingEyesHudSyndicate + - type: EntityTableContainerFill + containers: + entity_storage: !type:AllSelector + children: + - !type:EntSelector + id: ClothingBeltMilitaryWebbing + - !type:EntSelector + id: ClothingHandsGlovesCombat + - !type:EntSelector + id: JetpackBlackFilled + - !type:EntSelector + id: ClothingUniformJumpsuitOperative + - !type:EntSelector + id: ClothingUniformJumpskirtOperative + - !type:EntSelector + id: ClothingHeadsetAltSyndicate + - !type:EntSelector + id: ClothingEyesHudSyndicate + +- type: entityTable + id: FillLockerEmergencyStandard + table: !type:AllSelector + children: + - !type:EntSelector + id: ClothingMaskBreath + - !type:EntSelector + id: ClothingOuterSuitEmergency + - !type:GroupSelector + children: + - !type:EntSelector + id: EmergencyOxygenTankFilled + - !type:EntSelector + id: OxygenTankFilled + - !type:EntSelector + id: ToolboxEmergencyFilled + prob: 0.5 + - !type:EntSelector + id: MedkitOxygenFilled + prob: 0.2 + - !type:EntSelector + id: WeaponFlareGun + prob: 0.05 + - !type:EntSelector + id: BoxMRE + prob: 0.1 - type: entity id: ClosetEmergencyFilledRandom parent: ClosetEmergency suffix: Filled, Random components: - - type: StorageFill - contents: - - id: ClothingMaskBreath - - id: ClothingOuterSuitEmergency - - id: EmergencyOxygenTankFilled - prob: 0.5 - orGroup: OxygenTank - - id: OxygenTankFilled - prob: 0.5 - orGroup: OxygenTank - - id: ToolboxEmergencyFilled - prob: 0.5 - - id: MedkitOxygenFilled - prob: 0.2 - - id: WeaponFlareGun - prob: 0.05 - - id: BoxMRE - prob: 0.1 + - type: EntityTableContainerFill + containers: + entity_storage: !type:NestedSelector + tableId: FillLockerEmergencyStandard - type: entity id: ClosetWallEmergencyFilledRandom parent: ClosetWallEmergency suffix: Filled, Random components: - - type: StorageFill - contents: - - id: ClothingMaskBreath - - id: ClothingOuterSuitEmergency - - id: EmergencyOxygenTankFilled - prob: 0.5 - orGroup: OxygenTank - - id: OxygenTankFilled - prob: 0.5 - orGroup: OxygenTank - - id: ToolboxEmergencyFilled - prob: 0.5 - - id: MedkitOxygenFilled - prob: 0.2 - - id: WeaponFlareGun - prob: 0.05 - - id: BoxMRE - prob: 0.1 + - type: EntityTableContainerFill + containers: + entity_storage: !type:NestedSelector + tableId: FillLockerEmergencyStandard - type: entity id: ClosetEmergencyN2FilledRandom parent: ClosetEmergencyN2 suffix: Filled, Random components: - - type: StorageFill - contents: - - id: ClothingMaskBreath - - id: ClothingOuterSuitEmergency - - id: EmergencyNitrogenTankFilled - prob: 0.5 - orGroup: NitrogenTank - - id: NitrogenTankFilled - prob: 0.5 - orGroup: NitrogenTank + - type: EntityTableContainerFill + containers: + entity_storage: !type:AllSelector + children: + - !type:EntSelector + id: ClothingMaskBreath + - !type:EntSelector + id: ClothingOuterSuitEmergency + - !type:GroupSelector + children: + - !type:EntSelector + id: EmergencyNitrogenTankFilled + - !type:EntSelector + id: NitrogenTankFilled + +- type: entityTable + id: FillLockerFireStandard + table: !type:AllSelector + children: + - !type:EntSelector + id: ClothingOuterSuitFire + - !type:EntSelector + id: ClothingHeadHelmetFire + - !type:EntSelector + id: ClothingMaskGas + - !type:GroupSelector + children: + - !type:EntSelector + id: EmergencyOxygenTankFilled + - !type:EntSelector + id: OxygenTankFilled + - !type:EntSelector + id: CrowbarRed + - !type:GroupSelector + children: + - !type:EntSelector + id: FireExtinguisher + weight: 98 + - !type:EntSelector + id: SprayBottleWater #It's just budget cut after budget cut man + weight: 2 - type: entity id: ClosetFireFilled parent: ClosetFire suffix: Filled components: - - type: StorageFill - contents: - - id: ClothingOuterSuitFire - - id: ClothingHeadHelmetFire - - id: ClothingMaskGas - - id: EmergencyOxygenTankFilled - prob: 0.5 - orGroup: OxygenTank - - id: OxygenTankFilled - prob: 0.5 - orGroup: OxygenTank - - id: CrowbarRed - - id: FireExtinguisher - prob: 0.98 - orGroup: FireExtinguisher - - id: SprayBottleWater #It's just budget cut after budget cut man - prob: 0.02 - orGroup: FireExtinguisher + - type: EntityTableContainerFill + containers: + entity_storage: !type:NestedSelector + tableId: FillLockerFireStandard - type: entity id: ClosetWallFireFilledRandom parent: ClosetWallFire suffix: Filled components: - - type: StorageFill - contents: - - id: ClothingOuterSuitFire - - id: ClothingHeadHelmetFire - - id: ClothingMaskGas - - id: EmergencyOxygenTankFilled - prob: 0.5 - orGroup: OxygenTank - - id: OxygenTankFilled - prob: 0.5 - orGroup: OxygenTank - - id: CrowbarRed - - id: FireExtinguisher - prob: 0.98 - orGroup: FireExtinguisher - - id: SprayBottleWater #It's just budget cut after budget cut man - prob: 0.02 - orGroup: FireExtinguisher + - type: EntityTableContainerFill + containers: + entity_storage: !type:NestedSelector + tableId: FillLockerFireStandard + +- type: entityTable + id: SyndieMaintLoot + table: !type:GroupSelector + children: + - !type:GroupSelector + children: + - !type:EntSelector + id: ClothingUniformJumpsuitOperative + - !type:EntSelector + id: ClothingUniformJumpskirtOperative + - !type:EntSelector + id: ClothingBackpackDuffelSyndicate + - !type:EntSelector + id: CyberPen + - !type:EntSelector + id: CigPackSyndicate + - !type:EntSelector + id: ClothingBackpackDuffelSyndicatePyjamaBundle + - !type:EntSelector + id: ClothingBeltMilitaryWebbing + - !type:EntSelector + id: ClothingShoesBootsCombatFilled + - !type:EntSelector + id: ToolboxSyndicateFilled + - !type:EntSelector + id: BalloonSyn + - !type:EntSelector + id: WeaponSniperMosin + weight: 2 + +- type: entityTable + id: MaintenanceLockerLoot + table: !type:AllSelector + children: + - !type:EntSelector + id: StrangePill + prob: 0.20 + # Tools + - !type:NestedSelector + tableId: MaintToolsTable + rolls: !type:RangeNumberSelector + range: 1, 5 + # Fluff + - !type:NestedSelector + tableId: MaintFluffTable + prob: 0.33 + rolls: !type:RangeNumberSelector + range: 0, 2 + # Plushies + - !type:NestedSelector + tableId: AllPlushiesTable + prob: 0.10 + rolls: !type:RangeNumberSelector + range: 1, 2 + # Weapons + - !type:NestedSelector + tableId: MaintWeaponTable + prob: 0.075 + # Syndie Loot + - !type:NestedSelector + tableId: SyndieMaintLoot + prob: 0.05 - type: entity id: ClosetMaintenanceFilledRandom suffix: Filled, Random parent: ClosetMaintenance components: - - type: StorageFill - contents: - - id: Lantern - prob: 0.50 - - id: Wirecutter - prob: 0.33 - - id: Screwdriver - prob: 0.33 - - id: Wrench - prob: 0.33 - - id: Crowbar - prob: 0.50 - - id: Welder - prob: 0.33 - - id: Multitool - prob: 0.10 - - id: Soap - prob: 0.44 - - id: null - prob: 0.67 - orGroup: carp - - id: PlushieCarp - prob: 0.2 - orGroup: carp - - id: PlushieHolocarp - prob: 0.05 - orGroup: carp - - id: PlushieMagicarp - prob: 0.05 - orGroup: carp - - id: PlushieRainbowCarp - prob: 0.03 - orGroup: carp - - id: PlushieSlime - prob: 0.2 - - id: PlushieSnake - prob: 0.2 - - id: ClothingShoesSkates - prob: 0.1 - - id: ClothingHandsGlovesColorYellow - prob: 0.05 - - id: ClothingHandsGlovesFingerlessInsulated - prob: 0.07 - - id: ClothingBeltUtility - prob: 0.10 - - id: ClothingHeadHatCone - prob: 0.2 - - id: WeaponFlareGun - prob: 0.1 - - id: ClothingHandsGlovesColorYellowBudget - prob: 0.25 - - id: StrangePill - prob: 0.20 - - id: DrinkMopwataBottleRandom - prob: 0.20 - - id: ModularReceiver - prob: 0.1 - - id: DrinkSpaceGlue - prob: 0.20 - - id: DrinkSpaceLube - prob: 0.20 - - id: BarberScissors - prob: 0.05 - - id: Wristwatch - prob: 0.05 - - id: BookRandomStory - prob: 0.1 - # Syndicate loot - - id: null - prob: 0.95 - orGroup: syndiemaintloot - - id: ClothingUniformJumpskirtOperative - prob: 0.005 - orGroup: syndiemaintloot - - id: ClothingUniformJumpsuitOperative - prob: 0.005 - orGroup: syndiemaintloot - - id: ClothingBackpackDuffelSyndicate - prob: 0.005 - orGroup: syndiemaintloot - - id: CyberPen - prob: 0.005 - orGroup: syndiemaintloot - - id: CigPackSyndicate - prob: 0.005 - orGroup: syndiemaintloot - - id: ClothingBackpackDuffelSyndicatePyjamaBundle - prob: 0.005 - orGroup: syndiemaintloot - - id: ClothingBeltMilitaryWebbing - prob: 0.005 - orGroup: syndiemaintloot - - id: ClothingShoesBootsCombatFilled - prob: 0.005 - orGroup: syndiemaintloot - - id: ToolboxSyndicateFilled - prob: 0.005 - orGroup: syndiemaintloot - - id: BalloonSyn - prob: 0.005 - orGroup: syndiemaintloot - - id: WeaponSniperMosin - prob: 0.0010 - orGroup: syndiemaintloot + - type: EntityTableContainerFill + containers: + entity_storage: !type:NestedSelector + tableId: MaintenanceLockerLoot - type: entity id: ClosetWallMaintenanceFilledRandom parent: ClosetWall suffix: Filled, Random components: - - type: StorageFill - contents: - - id: Lantern - prob: 0.50 - - id: Wirecutter - prob: 0.33 - - id: Screwdriver - prob: 0.33 - - id: Wrench - prob: 0.33 - - id: Crowbar - prob: 0.50 - - id: Welder - prob: 0.33 - - id: Multitool - prob: 0.10 - - id: Soap - prob: 0.44 - - id: null - prob: 0.67 - orGroup: carp - - id: PlushieCarp - prob: 0.2 - orGroup: carp - - id: PlushieHolocarp - prob: 0.05 - orGroup: carp - - id: PlushieMagicarp - prob: 0.05 - orGroup: carp - - id: PlushieRainbowCarp - prob: 0.03 - orGroup: carp - - id: PlushieSlime - prob: 0.2 - - id: PlushieSnake - prob: 0.2 - - id: ClothingHandsGlovesColorYellow - prob: 0.05 - - id: ClothingBeltQuiver - prob: 0.02 - - id: ClothingBeltUtility - prob: 0.10 - - id: ClothingHeadHatCone - prob: 0.2 - - id: WeaponFlareGun - prob: 0.1 - - id: ClothingHandsGlovesColorYellowBudget - prob: 0.25 - - id: StrangePill - prob: 0.20 - - id: DrinkSpaceGlue - prob: 0.20 - - id: ModularReceiver - prob: 0.1 - # Syndicate loot - - id: null - prob: 0.95 - orGroup: syndiemaintloot - - id: ClothingUniformJumpskirtOperative - prob: 0.005 - orGroup: syndiemaintloot - - id: ClothingUniformJumpsuitOperative - prob: 0.005 - orGroup: syndiemaintloot - - id: ClothingBackpackDuffelSyndicate - prob: 0.005 - orGroup: syndiemaintloot - - id: CyberPen - prob: 0.005 - orGroup: syndiemaintloot - - id: ClothingHeadHatOutlawHat - prob: 0.005 - orGroup: syndiemaintloot - - id: ClothingEyesGlassesOutlawGlasses - prob: 0.005 - orGroup: syndiemaintloot - - id: CigPackSyndicate - prob: 0.005 - orGroup: syndiemaintloot - - id: ClothingBackpackDuffelSyndicatePyjamaBundle - prob: 0.005 - orGroup: syndiemaintloot - - id: ClothingBeltMilitaryWebbing - prob: 0.005 - orGroup: syndiemaintloot - - id: ClothingShoesBootsCombatFilled - prob: 0.005 - orGroup: syndiemaintloot - - id: ToolboxSyndicateFilled - prob: 0.005 - orGroup: syndiemaintloot - - id: BalloonSyn - prob: 0.005 - orGroup: syndiemaintloot - - id: WeaponSniperMosin - prob: 0.0010 - orGroup: syndiemaintloot + - type: EntityTableContainerFill + containers: + entity_storage: !type:NestedSelector + tableId: MaintenanceLockerLoot diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index 00798b36e0..193edb069e 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -1,138 +1,478 @@ +- type: entityTable + id: MaintFluffTable + table: !type:GroupSelector + children: + # Common Group + - !type:GroupSelector + weight: 75 + children: + # Smoker's specialty + - !type:AllSelector + children: + - !type:EntSelector + id: Lighter + - !type:EntSelector + id: CigCartonBlue + # Gar glasses + - !type:GroupSelector + children: + - !type:EntSelector + id: ClothingEyesGlassesGar + - !type:EntSelector + id: ClothingEyesGlassesGarOrange + - !type:EntSelector + id: ClothingEyesGlassesGarGiga + - !type:EntSelector + id: Wristwatch + weight: 0.5 + - !type:EntSelector + id: ClothingHeadHatCake + - !type:EntSelector + id: ClothingHeadHatSkub + - !type:EntSelector + id: ClothingHeadHatCone + - !type:EntSelector + id: ClothingNeckBling + - !type:EntSelector + id: ClothingHeadHelmetCosmonaut + - !type:EntSelector + id: ClothingHeadHelmetBasic + - !type:EntSelector + id: ClothingShoeSlippersDuck + - !type:EntSelector + id: ClothingUnderSocksBee + - !type:EntSelector + id: ClothingUnderSocksCoder + - !type:EntSelector + id: ClothingHeadHatSquid + # Animal Masks + - !type:GroupSelector + children: + - !type:EntSelector + id: ClothingMaskRat + - !type:EntSelector + id: ClothingMaskFox + - !type:EntSelector + id: ClothingMaskBee + - !type:EntSelector + id: ClothingMaskBear + - !type:EntSelector + id: ClothingMaskRaven + - !type:EntSelector + id: ClothingMaskJackal + - !type:EntSelector + id: ClothingMaskBat + - !type:EntSelector + id: ClothingBeltSuspenders + - !type:EntSelector + id: ClothingEyesEyepatch + - !type:EntSelector + id: ClothingEyesGlasses + - !type:EntSelector + id: ClothingHandsGlovesLatex + - !type:EntSelector + id: ClothingHandsGlovesFingerless + - !type:EntSelector + id: ClothingHandsGlovesColorBlack + - !type:EntSelector + id: ClothingHeadHatBeret + - !type:EntSelector + id: ClothingHeadHatBowlerHat + - !type:EntSelector + id: ClothingHeadHatFedoraBrown + weight: 0.5 + - !type:EntSelector + id: ClothingHeadHatFedoraGrey + weight: 0.5 + - !type:EntSelector + id: ClothingHeadHatFez + - !type:EntSelector + id: ClothingHeadHatPaper + - !type:EntSelector + id: ClothingHeadHatPirate + - !type:EntSelector + id: ClothingMaskSterile + - !type:EntSelector + id: ClothingNeckHeadphones + - !type:EntSelector + id: ClothingNeckTieRed + - !type:EntSelector + id: ClothingOuterCoatGentle + - !type:AllSelector + children: + - !type:EntSelector + id: ClothingOuterCoatJensen + - !type:EntSelector + id: ClothingEyesGlassesJensen + - !type:EntSelector + id: ClothingOuterCoatLab + - !type:AllSelector + children: + - !type:EntSelector + id: ClothingOuterCoatPirate + - !type:EntSelector + id: ClothingHeadHatPirateTricord + - !type:EntSelector + id: ClothingHeadHatTophat + - !type:EntSelector + id: ClothingOuterHoodieBlack + weight: 0.5 + - !type:EntSelector + id: ClothingOuterHoodieGrey + weight: 0.5 + - !type:GroupSelector + children: + - !type:EntSelector + id: ClothingOuterFlannelRed + - !type:EntSelector + id: ClothingOuterFlannelBlue + - !type:EntSelector + id: ClothingOuterFlannelGreen + - !type:EntSelector + id: ClothingOuterVestHazard + - !type:EntSelector + id: ClothingShoesBootsJack + - !type:EntSelector + id: ClothingShoesHighheelBoots + - !type:EntSelector + id: ClothingShoesBootsLaceup + - !type:EntSelector + id: ClothingShoesLeather + - !type:EntSelector + id: ClothingShoesBootsSalvage + - !type:EntSelector + id: ClothingShoesBootsWork + - !type:EntSelector + id: ClothingShoesTourist + - !type:EntSelector + id: ClothingUniformJumpsuitLoungewear + - !type:EntSelector + id: ClothingHeadHatCowboyRed + # Uncommon Group + - !type:GroupSelector + weight: 23 + children: + - !type:EntSelector + id: ClothingNeckCloakHerald + - !type:EntSelector + id: ClothingHeadHelmetTemplar + # Cloaks + - !type:GroupSelector + children: + - !type:EntSelector + id: ClothingNeckCloakTrans + - !type:EntSelector + id: ClothingNeckCloakAdmin + - !type:EntSelector + id: ClothingNeckCloakMoth + - !type:EntSelector + id: ClothingNeckCloakVoid + - !type:EntSelector + id: ClothingNeckCloakGoliathCloak + - !type:EntSelector + id: ClothingNeckCloakAce + - !type:EntSelector + id: ClothingNeckCloakAro + - !type:EntSelector + id: ClothingNeckCloakBi + - !type:EntSelector + id: ClothingNeckCloakIntersex + - !type:EntSelector + id: ClothingNeckCloakLesbian + - !type:EntSelector + id: ClothingNeckCloakGay + - !type:EntSelector + id: ClothingNeckCloakEnby + - !type:EntSelector + id: ClothingNeckCloakPan + - !type:EntSelector + id: ToySkeleton + - !type:EntSelector + id: Basketball + - !type:EntSelector + id: Football + - !type:EntSelector + id: BalloonNT + - !type:EntSelector + id: BalloonCorgi + - !type:EntSelector + id: MysteryFigureBox + # Cult + - !type:AllSelector + children: + - !type:EntSelector + id: ClothingOuterRobesCult + - !type:EntSelector + id: ClothingShoesCult + - !type:EntSelector + id: ClothingHandsGlovesMercFingerless + - !type:EntSelector + id: ClothingHandsGlovesNitrile + - !type:EntSelector + id: ClothingHandsGlovesPowerglove + - !type:EntSelector + id: ClothingHeadHatAnimalHeadslime + - !type:EntSelector + id: ClothingHeadHatBeretMerc + - !type:EntSelector + id: ClothingHeadHatOutlawHat + - !type:EntSelector + id: ClothingHeadHatUshanka + - !type:EntSelector + id: ClothingHeadHatBunny + - !type:EntSelector + id: ClothingMaskNeckGaiter + - !type:EntSelector + id: ClothingNeckScarfStripedZebra + - !type:EntSelector + id: ClothingOuterGhostSheet + - !type:EntSelector + id: ClothingUniformJumpsuitAncient + - !type:EntSelector + id: ClothingUniformJumpsuitPirate + - !type:EntSelector + id: ClothingShoesBootsCowboyFancy + - !type:EntSelector + id: ClothingHeadHatCowboyBountyHunter + # Pins + - !type:GroupSelector + children: + - !type:EntSelector + id: ClothingNeckLGBTPin + - !type:EntSelector + id: ClothingNeckAromanticPin + - !type:EntSelector + id: ClothingNeckAsexualPin + - !type:EntSelector + id: ClothingNeckBisexualPin + - !type:EntSelector + id: ClothingNeckIntersexPin + - !type:EntSelector + id: ClothingNeckLesbianPin + - !type:EntSelector + id: ClothingNeckNonBinaryPin + - !type:EntSelector + id: ClothingNeckPansexualPin + - !type:EntSelector + id: ClothingNeckTransPin + - !type:EntSelector + id: ClothingNeckAutismPin + - !type:EntSelector + id: ClothingNeckGoldAutismPin + # Rare Group + - !type:GroupSelector + weight: 2 + children: + - !type:EntSelector + id: Skub + - !type:EntSelector + id: PonderingOrb + - !type:EntSelector + id: CluwneHorn + - !type:EntSelector + id: ClothingShoesSkates + - !type:EntSelector + id: DrinkMugDog + - !type:EntSelector + id: CigarGold + - !type:EntSelector + id: ClothingUniformJumpsuitFamilyGuy + - !type:EntSelector + id: WristwatchGold + - type: entity name: Maint Loot Spawner suffix: Fluff+Clothes id: MaintenanceFluffSpawner parent: MarkerBase components: - - type: Sprite - layers: - - state: red - - sprite: Clothing/Eyes/Glasses/gar.rsi - state: icon-super - - type: RandomSpawner - rarePrototypes: - - ClothingUniformJumpsuitFamilyGuy - - CigarGold - - ClothingNeckCloakHerald - - ClothingHeadHelmetTemplar - - ClothingNeckCloakTrans - - ClothingNeckCloakAdmin - - ClothingNeckCloakMoth - - ClothingNeckCloakVoid - - ClothingNeckCloakGoliathCloak - - ClothingNeckCloakAce - - ClothingNeckCloakAro - - ClothingNeckCloakBi - - ClothingNeckCloakIntersex - - ClothingNeckCloakLesbian - - ClothingNeckCloakGay - - ClothingNeckCloakEnby - - ClothingNeckCloakPan - - ToySkeleton - - Basketball - - Football - - BalloonCorgi - - BalloonNT - - PonderingOrb - - Skub - - DrinkMugDog - - ClothingNeckLGBTPin - - ClothingNeckAromanticPin - - ClothingNeckAsexualPin - - ClothingNeckBisexualPin - - ClothingNeckIntersexPin - - ClothingNeckLesbianPin - - ClothingNeckNonBinaryPin - - ClothingNeckPansexualPin - - ClothingNeckTransPin - - CluwneHorn - - ClothingMaskRat - - MysteryFigureBox - - ClothingHandsGlovesMercFingerless - - ClothingHandsGlovesNitrile - - ClothingHandsGlovesPowerglove - - ClothingHeadHatAnimalHeadslime - - ClothingHeadHatBeretMerc - - ClothingHeadHatOutlawHat - - ClothingHeadHatUshanka - - ClothingHeadHatBunny - - ClothingMaskNeckGaiter - - ClothingNeckScarfStripedZebra - - ClothingOuterRobesCult - - ClothingOuterGhostSheet - - ClothingShoesCult - - ClothingUniformJumpsuitAncient - - ClothingUniformJumpsuitPirate - - ClothingShoesBootsCowboyFancy - - ClothingHeadHatCowboyBountyHunter - - ClothingNeckAutismPin - - ClothingNeckGoldAutismPin - - WristwatchGold - rareChance: 0.01 - prototypes: - - Lighter - - CigCartonBlue - - ClothingEyesGlassesGarGiga - - ClothingEyesGlassesGarOrange - - ClothingEyesGlassesGar - - ClothingHeadHatCake - - ClothingHeadHatSkub - - ClothingHeadHatCone - - ClothingNeckBling - - ClothingHeadHelmetCosmonaut - - ClothingHeadHelmetBasic - - ClothingShoeSlippersDuck - - ClothingUnderSocksBee - - ClothingUnderSocksCoder - - ClothingHeadHatSquid - - ClothingMaskFox - - ClothingMaskBee - - ClothingMaskBear - - ClothingMaskRaven - - ClothingMaskJackal - - ClothingMaskBat - - ClothingBeltSuspenders - - ClothingEyesEyepatch - - ClothingEyesGlasses - - ClothingHandsGlovesLatex - - ClothingHandsGlovesFingerless - - ClothingHandsGlovesColorBlack - - ClothingHeadHatBeret - - ClothingHeadHatBowlerHat - - ClothingHeadHatFedoraBrown - - ClothingHeadHatFedoraGrey - - ClothingHeadHatFez - - ClothingHeadHatPaper - - ClothingHeadHatPirate - - ClothingHeadHatPirateTricord - - ClothingHeadHatTophat - - ClothingMaskSterile - - ClothingNeckHeadphones - - ClothingNeckTieRed - - ClothingOuterCoatGentle - - ClothingOuterCoatJensen - - ClothingEyesGlassesJensen - - ClothingOuterCoatLab - - ClothingOuterCoatPirate - - ClothingOuterHoodieBlack - - ClothingOuterHoodieGrey - - ClothingOuterFlannelRed - - ClothingOuterFlannelBlue - - ClothingOuterFlannelGreen - - ClothingOuterVestHazard - - ClothingShoesBootsJack - - ClothingShoesHighheelBoots - - ClothingShoesBootsLaceup - - ClothingShoesLeather - - ClothingShoesBootsSalvage - - ClothingShoesBootsWork - - ClothingShoesTourist - - ClothingUniformJumpsuitLoungewear - - ClothingHeadHatCowboyRed - - Wristwatch - chance: 0.6 - offset: 0.0 + - type: Sprite + layers: + - state: red + - sprite: Clothing/Eyes/Glasses/gar.rsi + state: icon-super + - type: EntityTableSpawner + table: !type:NestedSelector + tableId: MaintFluffTable + prob: 0.6 +- type: entityTable + id: MaintToolsTable + table: !type:GroupSelector + children: + # Common Group + - !type:GroupSelector + weight: 75 + children: + - !type:EntSelector + id: FlashlightLantern + - !type:EntSelector + id: ToolboxEmergencyFilled + - !type:GroupSelector + children: + - !type:EntSelector + id: OxygenTankFilled + - !type:EntSelector + id: DoubleEmergencyOxygenTankFilled + - !type:GroupSelector + children: + - !type:EntSelector + id: NitrogenTankFilled + - !type:EntSelector + id: DoubleEmergencyNitrogenTankFilled + - !type:EntSelector + id: EmergencyFunnyOxygenTankFilled + weight: 0.5 + - !type:GroupSelector + weight: 3 + children: + - !type:EntSelector + id: SheetSteel10 + - !type:EntSelector + id: SheetPlastic10 + - !type:EntSelector + id: SheetGlass10 + - !type:EntSelector + id: PartRodMetal10 + - !type:EntSelector + id: MaterialCardboard10 + weight: 0.25 + - !type:EntSelector + id: MaterialCloth10 + weight: 0.25 + - !type:EntSelector + id: MaterialWoodPlank10 + weight: 0.25 + - !type:EntSelector + id: Plunger + - !type:EntSelector + id: PowerCellMedium + - !type:EntSelector + id: PowerCellSmall + - !type:EntSelector + id: Soap + - !type:EntSelector + id: Wirecutter + - !type:EntSelector + id: Screwdriver + - !type:EntSelector + id: Wrench + - !type:EntSelector + id: Crowbar + - !type:EntSelector + id: Multitool + - !type:EntSelector + id: Shovel + - !type:EntSelector + id: Welder + - !type:EntSelector + id: GasAnalyzer + - !type:EntSelector + id: SprayPainter + - !type:EntSelector + id: Flare + - !type:EntSelector + id: Beaker + - !type:EntSelector + id: ClothingMaskGas + - !type:EntSelector + id: ClothingMaskBreath + - !type:EntSelector + id: DoorElectronics + - !type:EntSelector + id: APCElectronics + - !type:EntSelector + id: InflatableWallStack5 + - !type:EntSelector + id: CableHVStack10 + - !type:EntSelector + id: CableMVStack10 + - !type:EntSelector + id: CableApcStack10 + - !type:GroupSelector + children: + - !type:EntSelector + id: ClothingHandsGlovesColorYellowBudget + weight: 5 + - !type:EntSelector + id: ClothingHandsGlovesFingerlessInsulated + weight: 0.5 + - !type:EntSelector + id: ClothingHandsGlovesColorYellow + weight: 1 + # Uncommon Group + - !type:GroupSelector + weight: 23 + children: + - !type:EntSelector + id: ClothingHeadHatCone + weight: 2 + - !type:EntSelector + id: BookRandomStory + weight: 0.25 + - !type:EntSelector + id: ToolboxElectricalFilled + - !type:EntSelector + id: ToolboxMechanicalFilled + - !type:EntSelector + id: ClothingBeltUtility + - !type:EntSelector + id: ToolboxArtisticFilled + - !type:EntSelector + id: GeigerCounter + - !type:EntSelector + id: trayScanner + - !type:EntSelector + id: HandheldGPSBasic + - !type:EntSelector + id: HandLabeler + - !type:EntSelector + id: GlowstickBase + - !type:EntSelector + id: Bucket + - !type:EntSelector + id: RadioHandheld + - !type:EntSelector + id: AppraisalTool + - !type:EntSelector + id: ModularReceiver + - !type:EntSelector + id: WeaponFlareGun + - !type:EntSelector + id: BarberScissors + - !type:GroupSelector + children: + - !type:EntSelector + id: DrinkSpaceGlue + - !type:EntSelector + id: DrinkSpaceLube + # Rare Group + - !type:GroupSelector + weight: 2 + children: + - !type:EntSelector + id: LanternFlash + - !type:EntSelector + id: PowerCellHigh + - !type:EntSelector + id: NetProbeCartridge + - !type:EntSelector + id: WelderIndustrial + - !type:EntSelector + id: SheetPlasteel10 + - !type:EntSelector + id: ClothingMaskGasExplorer + - !type:EntSelector + id: TechnologyDisk + - !type:EntSelector + id: ResearchDisk5000 + - !type:EntSelector + id: PetCarrier + - !type:EntSelector + id: DrinkMopwataBottleRandom + - !type:EntSelector + id: LidSalami + weight: 0.05 - type: entity name: Maint Loot Spawner @@ -140,75 +480,80 @@ id: MaintenanceToolSpawner parent: MarkerBase components: - - type: Sprite - layers: - - state: red - - sprite: Objects/Power/power_cells.rsi - state: high - - type: RandomSpawner - rarePrototypes: - - LanternFlash - - PowerCellHigh - - NetProbeCartridge - - WelderIndustrial - - SheetPlasteel10 - - ClothingMaskGasExplorer - rareChance: 0.08 - prototypes: - - FlashlightLantern - - OxygenTankFilled - - DoubleEmergencyOxygenTankFilled - - ToolboxEmergencyFilled - - ToolboxArtisticFilled - - NitrogenTankFilled - - DoubleEmergencyNitrogenTankFilled - - EmergencyFunnyOxygenTankFilled - - ToolboxElectricalFilled - - ToolboxMechanicalFilled - - ClothingBeltUtility - - Shovel - - Welder - - WeaponFlareGun - - SheetSteel10 - - SheetPlastic10 - - SheetGlass10 - - PartRodMetal10 - - MaterialCardboard10 - - MaterialCloth10 - - MaterialWoodPlank10 - - ResearchDisk - - Plunger - - TechnologyDisk - - PowerCellMedium - - PowerCellSmall - - Wirecutter - - Screwdriver - - Wrench - - Crowbar - - NetworkConfigurator - - trayScanner - - GasAnalyzer - - SprayPainter - - AppraisalTool - - Flare - - HandheldGPSBasic - - HandLabeler - - GlowstickBase - - Bucket - - RadioHandheld - - GeigerCounter - - Beaker - - ClothingMaskGas - - ClothingMaskBreath - - DoorElectronics - - APCElectronics - - InflatableWallStack5 - - CableHVStack10 - - CableMVStack10 - - CableApcStack10 - - PetCarrier - chance: 0.6 - offset: 0.0 + - type: Sprite + layers: + - state: red + - sprite: Objects/Power/power_cells.rsi + state: high + - type: EntityTableSpawner + table: !type:NestedSelector + tableId: MaintToolsTable + prob: 0.6 + +- type: entityTable + id: MaintWeaponTable + table: !type:GroupSelector + children: + # Common Group + - !type:GroupSelector + weight: 95 + children: + - !type:EntSelector + id: Machete + - !type:EntSelector + id: BaseBallBat + - !type:EntSelector + id: CombatKnife + - !type:EntSelector + id: Spear + - !type:EntSelector + id: RifleStock + - !type:EntSelector + id: ModularReceiver + - !type:EntSelector + id: HydroponicsToolScythe + # Rare Group + - !type:GroupSelector + weight: 5 + children: + - !type:EntSelector + id: Lighter + - !type:EntSelector + id: Matchbox + - !type:EntSelector + id: ClothingEyesBlindfold + - !type:EntSelector + id: ClothingMaskMuzzle + - !type:EntSelector + id: ClothingMaskGasSecurity + - !type:EntSelector + id: ShardGlass + weight: 2 + - !type:EntSelector + id: Syringe + - !type:EntSelector + id: Mousetrap + - !type:GroupSelector + weight: 2 + children: + - !type:EntSelector + id: Brutepack1 + - !type:EntSelector + id: Ointment1 + - !type:EntSelector + id: Gauze1 + - !type:EntSelector + id: Bola + - !type:EntSelector + id: SurvivalKnife + - !type:EntSelector + id: ScalpelShiv + - !type:EntSelector + id: Shiv + - !type:EntSelector + id: SawImprov + - !type:EntSelector + id: HydroponicsToolMiniHoe - type: entity name: Maint Loot Spawner @@ -216,51 +561,15 @@ id: MaintenanceWeaponSpawner parent: MarkerBase components: - - type: Sprite - layers: - - state: red - - sprite: Objects/Weapons/Melee/machete.rsi - state: icon - - type: RandomSpawner - rarePrototypes: - - Machete - - BaseBallBat - - CombatKnife - - Spear - - RifleStock - - ModularReceiver - - HydroponicsToolScythe - rareChance: 0.05 - prototypes: - - FlashlightLantern - - OxygenTankFilled - - DoubleEmergencyOxygenTankFilled - - NitrogenTankFilled - - DoubleEmergencyNitrogenTankFilled - - Lighter - - Matchbox - - Crowbar - - Shovel - - Welder - - WeaponFlareGun - - LidSalami - - ClothingEyesBlindfold - - ClothingMaskMuzzle - - ClothingMaskGasSecurity - - ShardGlass - - Syringe - - Mousetrap - - Brutepack1 - - Ointment1 - - Gauze1 - - Bola - - SurvivalKnife - - ScalpelShiv - - Shiv - - SawImprov - - HydroponicsToolMiniHoe - chance: 0.6 - offset: 0.0 + - type: Sprite + layers: + - state: red + - sprite: Objects/Weapons/Melee/machete.rsi + state: icon + - type: EntityTableSpawner + table: !type:NestedSelector + tableId: MaintWeaponTable + prob: 0.6 - type: entity name: Maint Loot Spawner From 1745000e0d9b030c1de053c00d68e923442da4cf Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 10 Aug 2024 02:13:47 +0000 Subject: [PATCH 329/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 5c0629b489..5886127d85 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: Jajsha - changes: - - message: Emagged cyborgs no longer reveal that they have been emagged by simply - examining their internals. - type: Tweak - id: 6575 - time: '2024-05-10T02:57:34.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27816 - author: RiceMar changes: - message: Larger guns are now wieldable and suffer an inaccuracy when not wielded. @@ -3794,3 +3786,10 @@ id: 7074 time: '2024-08-10T01:10:39.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30830 +- author: EmoGarbage404 + changes: + - message: Maintenance closets have more variety in what they can contain. + type: Tweak + id: 7075 + time: '2024-08-10T02:12:40.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30579 From 1fe46a72102716ec6345ecac5de1af508502a2bc Mon Sep 17 00:00:00 2001 From: Ko4ergaPunk <62609550+Ko4ergaPunk@users.noreply.github.com> Date: Sat, 10 Aug 2024 06:23:46 +0300 Subject: [PATCH 330/422] Changed chemistry airlock color (#30666) * chem * re-check * re-check. again * checks just die. last try * re-check :blessrng: --- .../Structures/Doors/Airlocks/airlocks.yml | 6 + .../Structures/Doors/airlock_groups.yml | 7 +- .../Airlocks/Glass/chemistry.rsi/assembly.png | Bin 0 -> 1271 bytes .../Glass/chemistry.rsi/bolted_unlit.png | Bin 0 -> 144 bytes .../Airlocks/Glass/chemistry.rsi/closed.png | Bin 0 -> 1407 bytes .../Glass/chemistry.rsi/closed_unlit.png | Bin 0 -> 144 bytes .../Airlocks/Glass/chemistry.rsi/closing.png | Bin 0 -> 2394 bytes .../Glass/chemistry.rsi/closing_unlit.png | Bin 0 -> 432 bytes .../Glass/chemistry.rsi/deny_unlit.png | Bin 0 -> 321 bytes .../Glass/chemistry.rsi/emergency_unlit.png | Bin 0 -> 588 bytes .../Airlocks/Glass/chemistry.rsi/meta.json | 195 ++++++++++++++++++ .../Airlocks/Glass/chemistry.rsi/open.png | Bin 0 -> 352 bytes .../Airlocks/Glass/chemistry.rsi/opening.png | Bin 0 -> 2443 bytes .../Glass/chemistry.rsi/opening_unlit.png | Bin 0 -> 284 bytes .../Glass/chemistry.rsi/panel_closing.png | Bin 0 -> 445 bytes .../Glass/chemistry.rsi/panel_open.png | Bin 0 -> 315 bytes .../Glass/chemistry.rsi/panel_opening.png | Bin 0 -> 470 bytes .../Airlocks/Glass/chemistry.rsi/sparks.png | Bin 0 -> 697 bytes .../Glass/chemistry.rsi/sparks_broken.png | Bin 0 -> 183 bytes .../Glass/chemistry.rsi/sparks_damaged.png | Bin 0 -> 184 bytes .../Glass/chemistry.rsi/sparks_open.png | Bin 0 -> 175 bytes .../Airlocks/Glass/chemistry.rsi/welded.png | Bin 0 -> 296 bytes .../Standard/chemistry.rsi/assembly.png | Bin 0 -> 936 bytes .../Standard/chemistry.rsi/bolted_unlit.png | Bin 0 -> 144 bytes .../Standard/chemistry.rsi/closed.png | Bin 0 -> 1054 bytes .../Standard/chemistry.rsi/closed_unlit.png | Bin 0 -> 144 bytes .../Standard/chemistry.rsi/closing.png | Bin 0 -> 1994 bytes .../Standard/chemistry.rsi/closing_unlit.png | Bin 0 -> 432 bytes .../Standard/chemistry.rsi/deny_unlit.png | Bin 0 -> 321 bytes .../chemistry.rsi/emergency_unlit.png | Bin 0 -> 588 bytes .../Airlocks/Standard/chemistry.rsi/meta.json | 195 ++++++++++++++++++ .../Airlocks/Standard/chemistry.rsi/open.png | Bin 0 -> 352 bytes .../Standard/chemistry.rsi/opening.png | Bin 0 -> 2017 bytes .../Standard/chemistry.rsi/opening_unlit.png | Bin 0 -> 284 bytes .../Standard/chemistry.rsi/panel_closing.png | Bin 0 -> 445 bytes .../Standard/chemistry.rsi/panel_open.png | Bin 0 -> 315 bytes .../Standard/chemistry.rsi/panel_opening.png | Bin 0 -> 470 bytes .../Standard/chemistry.rsi/sparks.png | Bin 0 -> 697 bytes .../Standard/chemistry.rsi/sparks_broken.png | Bin 0 -> 183 bytes .../Standard/chemistry.rsi/sparks_damaged.png | Bin 0 -> 184 bytes .../Standard/chemistry.rsi/sparks_open.png | Bin 0 -> 175 bytes .../Standard/chemistry.rsi/welded.png | Bin 0 -> 296 bytes 42 files changed, 401 insertions(+), 2 deletions(-) create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Glass/chemistry.rsi/assembly.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Glass/chemistry.rsi/bolted_unlit.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Glass/chemistry.rsi/closed.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Glass/chemistry.rsi/closed_unlit.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Glass/chemistry.rsi/closing.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Glass/chemistry.rsi/closing_unlit.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Glass/chemistry.rsi/deny_unlit.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Glass/chemistry.rsi/emergency_unlit.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Glass/chemistry.rsi/meta.json create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Glass/chemistry.rsi/open.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Glass/chemistry.rsi/opening.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Glass/chemistry.rsi/opening_unlit.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Glass/chemistry.rsi/panel_closing.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Glass/chemistry.rsi/panel_open.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Glass/chemistry.rsi/panel_opening.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Glass/chemistry.rsi/sparks.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Glass/chemistry.rsi/sparks_broken.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Glass/chemistry.rsi/sparks_damaged.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Glass/chemistry.rsi/sparks_open.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Glass/chemistry.rsi/welded.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/chemistry.rsi/assembly.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/chemistry.rsi/bolted_unlit.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/chemistry.rsi/closed.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/chemistry.rsi/closed_unlit.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/chemistry.rsi/closing.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/chemistry.rsi/closing_unlit.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/chemistry.rsi/deny_unlit.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/chemistry.rsi/emergency_unlit.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/chemistry.rsi/meta.json create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/chemistry.rsi/open.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/chemistry.rsi/opening.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/chemistry.rsi/opening_unlit.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/chemistry.rsi/panel_closing.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/chemistry.rsi/panel_open.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/chemistry.rsi/panel_opening.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/chemistry.rsi/sparks.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/chemistry.rsi/sparks_broken.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/chemistry.rsi/sparks_damaged.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/chemistry.rsi/sparks_open.png create mode 100644 Resources/Textures/Structures/Doors/Airlocks/Standard/chemistry.rsi/welded.png diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml index aead307d75..3de6555be1 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml @@ -64,6 +64,9 @@ parent: AirlockMedical id: AirlockChemistry suffix: Chemistry + components: + - type: Sprite + sprite: Structures/Doors/Airlocks/Standard/chemistry.rsi - type: entity parent: Airlock @@ -210,6 +213,9 @@ parent: AirlockMedicalGlass id: AirlockChemistryGlass suffix: Chemistry + components: + - type: Sprite + sprite: Structures/Doors/Airlocks/Glass/chemistry.rsi - type: entity parent: AirlockMedicalGlass diff --git a/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml b/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml index 4226c39f6b..e8f000514a 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml @@ -5,6 +5,7 @@ atmospherics: Structures/Doors/Airlocks/Standard/atmospherics.rsi basic: Structures/Doors/Airlocks/Standard/basic.rsi cargo: Structures/Doors/Airlocks/Standard/cargo.rsi + chemistry: Structures/Doors/Airlocks/Standard/chemistry.rsi command: Structures/Doors/Airlocks/Standard/command.rsi engineering: Structures/Doors/Airlocks/Standard/engineering.rsi freezer: Structures/Doors/Airlocks/Standard/freezer.rsi @@ -20,9 +21,10 @@ stylePaths: atmospherics: Structures/Doors/Airlocks/Glass/atmospherics.rsi basic: Structures/Doors/Airlocks/Glass/basic.rsi - command: Structures/Doors/Airlocks/Glass/command.rsi - science: Structures/Doors/Airlocks/Glass/science.rsi cargo: Structures/Doors/Airlocks/Glass/cargo.rsi + command: Structures/Doors/Airlocks/Glass/command.rsi + chemistry: Structures/Doors/Airlocks/Glass/chemistry.rsi + science: Structures/Doors/Airlocks/Glass/science.rsi engineering: Structures/Doors/Airlocks/Glass/engineering.rsi glass: Structures/Doors/Airlocks/Glass/glass.rsi maintenance: Structures/Doors/Airlocks/Glass/maint.rsi @@ -67,6 +69,7 @@ atmospherics: Engineering basic: Civilian cargo: Cargo + chemistry: Medical command: Command engineering: Engineering freezer: Civilian diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/chemistry.rsi/assembly.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/chemistry.rsi/assembly.png new file mode 100644 index 0000000000000000000000000000000000000000..43cb50a1529caf024225f6a0cef8cb543a38d3a1 GIT binary patch literal 1271 zcmVPx(u}MThR9JdFITG8q8!`8@TYX_}?7&gb*hZ&-xIV!`Ed z0U$>r5dcOBb9FQif|-n&OU9w!osaQgJ=n#3a`BLJK@aiT8Q;NW1v z%!LaV>N>x1;|4uFJpe?b(V8P53^W2++<3iSnwy(TFVg8Wi9`Z`_V)IMiH+EZTNVMa zSgfky(9jTxL;{b;vnlb7xFutNqi=9{ZTr)w9DResK$&YJYE8IkG+I?BI2?V0!&z7N z8NnTk#qfH)NJ8AZ=kVE<)deNc*=gODNh!5@bm`J1&YwSDWkS<5i>7H7GZO$iSXH`q zKhw0+@<4g=#n;aY6EeV-U3*T>%}%x29a|S`2@6b4PU7`?>xETe`sN=FBY%^x_miA9 z{*ELn6h%p`F3r2wvk!BtOY`oA73x4yl+=3mVNP6%qND(X0Ugk7&X$?X@{-%;Y?-Mf zNG6k;^`KW=7!3fBSzcM~ z@hle~I&99C6i_z%)9Ex&-ur_G4+7Qufyj!=)lhJVku8=xS5{Vjw^JN}qIeb7K7P}* zH)cz*nRo?tO_ z1p&QS{;$w=ovEoQuD^VhZ(jKdT`y#!ynbk)6l8O@%%&ITcj{}oJB~vG%pQK9>B-45 zqK0U-{cujQtns3`*$`?h@k!TqXC7>K7C>o?y) z6-6Ns2=I3xKsFd;yHYSE`Q&nO0iSHj!!NIOF#qm8EcR`tyWv3Ge1ue0B^V463X|CCtk+A&r`P|}TzK&HG2mJ3!QIg$pjeyyImeDU z|6U)fH-9@NQLHp0vPM2P6=(!T4#nE!Z+7pPGcL;#6u!BciCQP3Mj$wZI6PXGO9q4q ziS?ie-n4S1k)pVOeXC1@Viq|5(MArub>u_cVp(Y-@3}oQzj8Z%$CM}(3Y9jPM$j63 zYOCMtmL;Sdz>nufjseI+Lqo)3F)p9`=&1C<8}BWT|7>?X*H?2PZge*kNap2C;>r)U ze9!X_vsXrsL*ZmBClU#SiS?hp9Nq%x-`@tP+0#aLL&2fPKP#+Kv)2*giA19C351DS zKM#+CWHL!xTU%Xj*%(+$P{cF>WBf+kk`Smobc#A5-sqv!7{5_lOK)#)9$;~??k_Px)IY~r8R9J!98jY#~{tYH3Cg|(y zBM=B+NhA`qwzd|LdpsUiuU@VGXR}#SsT2Tiw|hk-m3%mzPP)3f=;`UfqMy0P;~^G{ zl{oC|>?D;+;dDAzL|(~0YRB zJ}!L3Vlg}(Pm!(Jh}_fKezI~=Szpa%q;fO8bm3AlaxcDXJ9l6U{Kji-`|c&gU7 ze68gw5}<`7NtwCnamV7qv;5rjxT7LV1xS*VSzLIQ7mp-K8EwDIGVo9D7vQvh7kbB%}l$i?R8_hndy>sw~~5MLC}i@2yy`N7D%VlY6OD8 zU_~~)c%#W!#78!p6-JHK_PPvEl>MS#JNve_Hh_|9C~QRpm*4AVXJ`MY(e#5R0`p&e zBnA~FioRbDqf)G~l{DmkEn>FmeObIe9s!`Kxf$PybBuhlu|Y4wcljL62im!}Y%4H2 zk;SWP6TY|!$?HEH3Wvi`4OCl^Wf_~(Npo|v>Z>RRMi!PLkeiuq(6_$~!r?HoEF;S@ zlarH#!{HJe!(}LzAfPP2UkZw%Fg!fWjdy?L!uw}Yl+u-GNxpLkfZAY?#hcIbuG(HV zmYo`3r_ARc*xuX2So`NBb(ODiFp3zjMQtz$H@{H-z29zF`q;ko8f))XeW^L%zSD&H z;sES#1z?#xDOsz$=8NZWwsPrhPgw2ZB1N4d7Q(XdaFBz!&}37?Mzzn?Wy>AqH!1M4ltFy94vS|H1^#n z%7v%r4+3vdikbC7mdOQb zR@IN_Z7gDQ5gUZ<$w=?6kN2NYOs3f?3eNkZ#MvThsBIJ z4{+sl??EjWXd;kGrRePJ1mN=NFArQvWS$IsKd|_BzGl80L0elJ`}XZCdpAfIEV=7H z{jzX%Y*rEE`jfE*miBm;%cY8l#bPX8{jR$fP=3B&6d^r~$c3#k*uPYz#%^Fl4q$3& zX(<@p4a!|Aw9wy-#6(u=qo=0_OCS)SzrSC-w~0s?5$Z|w(6(3dA;<%P0Ooi+ju0UT z^eaQO3G#A>Qf+&sgR3Bq$K#l^*YiXo0l?JMRN2A*1rEp3&aSP>^Ss#&mpghvZkX~#s0-h3N2b6`K?}O)meqDd+l#VI$hWM`6MlQ q&#%(rqf#%I&Hk(pG?9U!&gT+u#1#>y1s3nVf%u-TelF{r5}E)5_cy%& literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/chemistry.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/chemistry.rsi/closing.png new file mode 100644 index 0000000000000000000000000000000000000000..9051b942128dfb15913985e09510f987354a7e82 GIT binary patch literal 2394 zcmV-g38nUlP)Px;6iGxuRCt{2oNs6w=N-qtI-hrPq^PzkJF*KIG7jJ!yj5=M*0 zSjSe-n=lM6_(hYY!49#LmSUJ;8OaO3=r%}kpp?+8p?GwAu`MlHf+MdJRT63|ljT2g zJlA$~@xQ&0ANh2;)BSs%lUe!$gMIhh^ZDF8XWiX%U)#~r(y|EvnM}q38;bBM6$=+V zT-q*rnEZ(oCvfiEIkOB?H8?m30O;%M!%t!{%s+U5(a}+Kb#*ayk#Y|mIs|V+1AL8* z#r1Quv(#O*n7q&DvkWm?eSLiZfMhaR{N7HkyqcPtn7OF+$x|npsOIM8s8ZG$ zm5UPBbuiu!03MHriHj1Guv`b@{Tu*Xy?PawE?u%^5HgvJBa_KE)CPf-iyHTd{H&n1 zja3(|eQm;uzyUxil`_*mld{`o@xi>PwvM&S# z)!+VtiHj0b!V>u4ho^CGZqW+Ea0Nd+t-6k-iz3(mDq62yM#t+%aYweEhKmxjt)l}N z117KksdvX*gsWMZwd!!A(I_7K0mv^cRP8xH6h-ip&-Y^QXb&=(|Jnwge7;w89ZMG_ z?w8lDf8lyDhN+{cFe!WTrQxE)+|}L=j1?vUANy;7@U<6$+y|G@{EUc|J9ntNC^4Hq zZ^PEj*Y-z{qwWdYWQfXfWK`0EsKYqFwGbi`kG6-abP)&@L zOC@fL%3BeuE?WDVNF)l^003AE1hDtw%^h(qVC_=Ey>=ZFhhrEY|0iZ&dXt%pl=<+z z;{d*cy3n&dkNsT`soJjJSB3S}0Bn`o8!?tFp|&RY*bjhETNA7n+v9DT-Vw8*(z4rS z-?x9TthSD|OJnHi-8*77R9be=hW=;0ZdGj?R!92fyEsQ>RXq1hed5X0uszcXz|%@$8JdplZAiCNEx6sZ`0qXXzq+ z*^|v?kxHeiKLF&cuzL`sJn|ZnwTqky0FJNX>FiweFde~Qa1#JFH?{rr$QapChry}{`Gt6)}jASwi0N~wjH}$N%ksSW9W5)mh7cN|| z>|ul(kH-N3=g*%#5Gu(^C_TEIs7hnwDpNx1JgM75SN*wKQGSm>!R(_))|O zf-t+XFyq}=d$evxR$dT<*^RYF>*PzioTZ1HD+t1DrM5I&w3vRs9~=PD>8`(*Us~|m zl$94{U&UpNJ(Rer?I^iuGC80SlXkl6r>dQmx7nl8Ah2>NV{!xp*pro4+99%>rH7oW z=0Vd%50iJg>*qmYT3cl$E3YRLFFCvRY>Dl4y6b1Hco^j_FE9VAPNAI{7o$w+%OAz* zXscOytxUW`=-*qSiWfwq9!9tu;9N@WjJlX%O8Y8%BSs@Dua$|9Mx%fefU_2xmoFpp z>b^$#j+^l?!c8O+aQS@2ZQ43I(E65f7c=YIG+Ne%wu>GnM{c(Oh<0S@Cn}k@w>&vtUcshQB=JN zqUNH9$peLp#p3+T9&vS@N>*Mg6Au8vKRg8h*m&_9#bs7KjBs(Fbemo6?bsOGzV7OE zF~giX+F$I82Y@Zmq)=N!B`dF$i3fn^#>cV0wiZ{?w}96=LBqoc_mcw$O15eKybat3 zR}8zDVK!fRqu3WmKmfh0yjCW@wY3%L{rmCfS6(SDr{Q6QD+sD{Y=&IE|8CiXvLPlX z2UyL@>&e82LLr1gA-LUcwD6@nY}UglH<3t`wK40WHVAr{WnI(E%ByAKb0~yj*IiB1 zD~DremCiCN9(uUJ=UT9G`_r?e?ZfwuW8!d3@r>8wVuU$9K3?og@j;A5R$khtP+Jr9 zc$=olqq$l_nTAItu2MT1E?UedfBk-OJ*Na@k(HNb;yvD`X<&Pvgk6O`^lGT!T&D-Fq|3 zcSpZa?2P<(L95jmdU|&-;N>}R>j3cA+n>VqWoGd3FJF6$rAHa}ox$V4_T(DrlctLr zQ@Ra*?VaDe&i(M`Z!C@dy{_TA2UQ=st_>lbZbrWMXzim5z1`j27#bRa zRS%#dz@>-dA0Kn8u04UjUs~$$U z(gPunjT><>%Ou5`X&p;0P>2bV$RGeqE_#`y1_lPelLJtxLn|fE z#LHPyX__8dTvFk1xMUElxaeg9g@Ydshr!A30%&LDl``>4ZD@Pw;R1!MCm95*E_#{d z;3t#G?Y|GuQ?%ph0O0i&W_#!7HDfpxJ*OQyNeIADue37KtiXMgRZ+ M07*qoM6N<$f+4G?<^TWy literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/chemistry.rsi/closing_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/chemistry.rsi/closing_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..2a71f76d5d0c792fe84b136920ab32a386dfc7a5 GIT binary patch literal 432 zcmeAS@N?(olHy`uVBq!ia0vp^2|(UR&i(je0cL#ec*0}-@j8|{(iQzwzWT#=l!&5f jT;0h840aHhFykh_!rG~;5AeP$1@S#y{an^LB{Ts5_a?jl literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/chemistry.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/chemistry.rsi/deny_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..7c56263f83958a17893b3db0b04ce3078c15cea0 GIT binary patch literal 321 zcmeAS@N?(olHy`uVBq!ia0vp^2|(x;TbZ%z1lzVbEa*5x0l` zFLCLtQfk)goBm*9Wqa5)W5IyH?gg7O+Vq@#{gzqI_j{ICbSF<}<0|vo?Y_6yOll7; z+AsO(r`@v>Kf7}$KR*umYV~i&zP&s*_xJv-=38t1deYzEyLbMqy6^o$Z`IbavsGXD zr!(F8`6z;|L6RYjVFqIYc7~Z}LvrZvRZ(vk567Q>-*~3QX2MKG<^wzo#tdf|3@{iQ zO7s8d*3Gv+{xi?r|HRuDl15mS!8LAhWr_IppL3FmClFnFq60fUCY M)78&qol`;+0G5h<`v3p{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/chemistry.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/chemistry.rsi/emergency_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..817f2fb3f95c53ee8720a7c5be418b6208a6a7e6 GIT binary patch literal 588 zcmV-S0<-;zP)EX>4Tx04R}tkv&MmKpe$iQ?*4Z4t5Z6$WV2$AS$ApR-p(LLaorMgUO{|(4-+r zad8w}3l4rPRvlcNb#-tR1i=pwM<*vm7b)?7X`w}o2gm(*ckglc4iIW3rdb_hfTr7K zG9DAtnN>0H3ISaRVg@5Jvy3@OO2Bh`-NVP%yC~1{KKJM7QL`2Ud?N8IGfbO!gLrDw zHaPDShgm^ZiO-2gO}ZfQBiEG%zj4mHEbz>*nM%$Rhl#~}8!K(h3Z_OpNgPo%o$`fr zgH_I3oV8MgHSft^7|QA^%Uq{9h&UFp1PLM(R8T|-HlnoZq*zGOe$2x^;QA$UDdZ}G zkz)a6Xpmh$_#gc4*2+zcHN#J&iAq7)K38aGjOH1{N)-j{YiSY zrA3Z_-fiIGx}_<5z~v6m|76If>`H!`LM{iqpV2pEfWBLxd#%x1b04Py{D4^000SaNLh0L z01FcU01FcV0GgZ_00007bV*G`2j&6>2?sl(`5Ny4002lyL_t(&-tEhw4S+xZ1i>Rg zVKDSSXPx$8c9S!R9J=WmoaL?Fc^hD2`?Q?7f->;>|1mWo(sK)C(|L$0d#;~K^Mr9(a^Er z$#c}HbZO^Ob%|;>6xzX&49N!qNy~eZ-p`MOQpy2XYb8H%Op5?eN_~zuWnI@3>->$@ z8m%>Hnj*6-3vR&EG!4hs9-R3YI1a}tsj6yN7-L-5b*^n&cc=()7*iw0Ln-BqF-`*X zeSZSI|1qBooVS6ZD54oi0Lroie(eX73gt*6x10>7shUeG!P}%@2x0~tp@|M$$+@J4%Q8Ccf)}tz~f!c%l%Cd6V_U3t(D$H;@{(A yu^@kV3Z8}NRd6wI>4wp};XE>M)&@lE@A(%i7ickj!=fGl0000jvytM z-_H#%hceqgP!DI%GT6@KUzps$UP8DR52mwU*-k3$XRjTbM#c~IiL6W5jwA08OV^R{ zBh$!jR$<1c zrox%EBmG=%qh7rqOpOE++%&seQgRG{M*cg9^Q-41c2D5W@ zm8th_OUcRk9(XZ3TQ(O=rO_ZjWo4yUdUr-|Kz<~;F`R9jpdm~U+@5`jQK z58vwz0FMC49UbOJURCt=+W684Qe9Zt#i7z*+(-umMgPEJ@{Ye+h`CN69G2|(bKUOp zWwOBhp^G}jSqM;4R=%ik3e~;L3&3K5?(S}13W{#pXS`tLxy~nc!gB1bH|J(%FdBId zH`_5DWdX(+j3Geg@nyJ6%-|PU{O$EKACXN7Ta!@&8E3~oYEcY-UAAZh2iuHkM>J5pB zhN~08Ldi1ABhM5&JW%UQQVE{}pAl|S?$Y%@LP3Vf_8PtenDE%K0N(Ljk;YVMz+Q<-O-uv3*>R}k<0~+2}XL^ zghTG5R34end|0PFxqNc78Reg=p|=u_{HT=#E>296Et2SkwV2}1O8j?|02)BY2l2vj zH>$?{(8!uKl4I2XxAAFb#h$4Fy4`e8Z^>#~82~6_WLxl@FYbm-+$r4WTjgTKy6J^! z7{>uU(wc~B8jwssROPOd&>)t2!6vK5%RWjt!RTAOG50v^mr*u?{q9qJEe3FlwzXuE zf9#^P=5)%x93rJOtAl_>T0{Q* zL7V{+nSIV;PZA~&h%};?9Ar(jY80#6Y|VQprM^PIQSsE@jW}E0AQvT0@WF{-la@}d zpjIL-7#@HNeOl%{dK1Q2B%hTRhsYJMw)K*Tr@s#M^9$Pku!^mFIA(yusd1Xu-u&A( ziIR9hqtwemnV%=lK>%7B?h&`~@Z4vpQt42@Uf1oEil%Fp3k4BwCEmq_#XU|e*3Jq` zaK(hUljiHxnsATekf#7QYb7LR6qSfu0i@}v5y6vb;wT}Xy|JHCwI}Y#@Ri+WHnp)W=Nq6QCh9>~!H}w_wpF!`;;uBN44 zoq9BkE26r6fYD{|mrN+IcYOqhKwRNnyf2&BE4+F6iCUTSQB-4E8&VysZE1v8qDrVe zHTBIa5c1_c>k&Z_bB^HB~Ub>Q0VWyP0Oh!1!L(@Ns;m?u}4OO-|76O&Ef_aCktjp zZ+8jZMin9`yq6F9m#jcRS5^MmaxB<3@Q8sm?NXgDW(9ZpNMbJOdH18fTE!V(6zo)x z8S>b@13-Sh+tCyuaCRcGdW_I<-_HUv-XPCDYpo4!c`Hvjy5AMkB?(VWo z2!A-5L>T1FQs(=2J$s5!#FNLLB}69fwU2U75VDW>}}wW}>Ceqk%UC zl2ljC6_)C6e{e-Fy?nO5ADun^*VYgIezR@eRk)=P*I=u!G{0vKVb?=X-##u-RY>S2gU(E&lT>%a@F4pxIuqpoo DJQ=}r literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/chemistry.rsi/opening_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/chemistry.rsi/opening_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..84933bd5ed9cd40a972aee792b227f9aec95f233 GIT binary patch literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^2|(X)s_s z#KIwr!I-V$V11^#dUpKLjjy-9DY|#Kuw+Jjzzl{&rWQ^CH3uAwt;hGhNWR~>|B3$l qhyP2a-~C|qG6v`^C}^l(vC57yE3)EC^YOwKkf5ilpUXO@geCx+nr^EA literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/chemistry.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/chemistry.rsi/panel_closing.png new file mode 100644 index 0000000000000000000000000000000000000000..db7be0bc4a0ec0b2bc29e8718fb6b71796846f16 GIT binary patch literal 445 zcmeAS@N?(olHy`uVBq!ia0vp^2|(qk=b{5eiK-()1~xQ&@cMV`(mao8yQ?TZq;#^Y}m${ zacWZ!Yev-i>$j948lYsxftl|YY`yljZkp{(pFL*+-lj#WWzI6YweB*{ESZG)8eLCP zH-4D=_wruJUKQWqugks*3w-~bxAmsS_S>R@6K&4#1!`fty>^f8^xkc+O+xqazTJA; z{=7~2>uGDRIhyR%SJ)ONH}BrkKUz=f@~-S!d-avVtb5`KJrkcF_ZOUaf4N)v?bouY zpX0AZna`Cr-@$dKByUdGcPkF5{Og%j`&-%%FXZlavSVWw{8-KzzB@7SM0TXvt!o+A zif+H$q2jsc@9*!WwR0M*e5Y<-(ETyu&`qBj{lx9nl5Os{*Qk05m8bu?%XoF&`KQ?? l*%zfe7FQS8+W~`WRsIyAi(3!btSA5lf~TvW%Q~loCIEIM%9sEE literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/chemistry.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/chemistry.rsi/panel_open.png new file mode 100644 index 0000000000000000000000000000000000000000..24eb2aedc2248aeb772b38f63ff992254e7aaec0 GIT binary patch literal 315 zcmV-B0mS}^P)G_@Zv*NK(#C83< z0hCg#mPY_q%Og#e`P2l!*GQEjpT`0MYBKbMv^%3TIE=g7KF`WXCR28pn>(x2n zemoXytpJ?bfcIZ;wOEjBHdt%rI!S!%PGhZ=2c^1AoGrxJR_5RoDx&OEP+E*gAHf&mPbH>ZE8FCH9e&*rpCoP%1 zIy_fR`1DT4EhW}ImG2+Fy>#^EcBOlIu{N4r8M|lHdv8DdMa^XX`Q)41s%D;5@l3t_ z>U!DiCu(!NfiicFek|lsbn*16WPNgF)9u86nlDcO+<9uZb*sRm>zlTKo#3wDtk_cV zGUiQg0fX*;t18(yxo?DbZh3Nv5#oCg`Gddm{r7*~nV;{o)~0;#=kiD}oLj`YgzrYV zCx61j+EYJuRBRcZ$AIaEWtl7E0M--(oM3v-T6o|50rvB z?(X|$_9K~q!b>Jme`5^XKVF&j%`2QtMsN-@c!MQ;uYX{&xPXV-MV4h*a7^*H)mTo% z^duKBlw8QrI7#Az6a!+!k42gRM*{jVXw(2^)BtAG0A@rO5W6r+TTo*dR0c>itn&u= ziYhf*#29dhKzXbye)sb`x`T#9jF|@skRQx^J~1)&r}u;k?=m8#VH_qLszE1c7I|*U z-vi17+kNaSpCz%9yQ#rS&sN2x0`#dRVZ$Zo3 z(YozxD(tDJ*Nd^#9ngM11*`#hZL|qqUX-aA#5S}G^!n=WLLU@GQ4~c{6dSK|xP5Tx z!-H@vnhtn%y49-Lc3NyR!WG{&^FjpmIbAy+o5nPrx)V}}E%fz`bB+BtcI@^)8^rTf zBx((Ky3EXU1aLM2IGxVm^KA+58-UdY;QHA(FXNaPN!aD?zV8}<6&DioA6qwm%&S`B zG(?rf)v;@BC^IYu=$f%ZGhhqXw5SF!qXsa;V!%*uXSl{qZh&O*G5ePMUQntINQ83i z$upoRb}H)fv5TKDu*ZP$-hvmY3!Atq6ENBh(WYFFM67|7l05p#?E1nmayZKasmvEs z4%uF#@2=U$hCc&#<3^>qaoRUjD5t(Q@!@5>eLn%YPa&y@Wk6F&Jf;Amr=S&p`TF~H zKQmyzZBbK@-3j_NfaCqFrZteLVgLD`ViBgsl+FQ!832*%0DhkaTq4i015y-4Q4~c{ f6h%=KHvsSpwHV1KmpgiI00000NkvXXu0mjf++aJ5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/chemistry.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/chemistry.rsi/sparks_broken.png new file mode 100644 index 0000000000000000000000000000000000000000..fb5d774588ae44eab5608571cb6aafad7375e158 GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^2|(DFD66%%n7hj|c25u0=Hbzuz>&Md dbBcZ?)Aw7<0^jOhxdW|Y@O1TaS?83{1ORW&Jrn={ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/chemistry.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/chemistry.rsi/sparks_damaged.png new file mode 100644 index 0000000000000000000000000000000000000000..f16a028dee5bbe41a7f4e35f686043e8a112ce4e GIT binary patch literal 184 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeK3?y%aJ*@^(YymzYu0Z<#e`9lQK{p_au_VYZ zn8D%MjWi%9!PCVtL_+fI!HvAl4m=D8Hh=XH6ZQR;XyVo{y01gP^_0k+pXD$8l*-N4 z&iUk!V5<=?maE{?*yyS)-udN6;H*Pi5*L(-Fs)pAdDY$x8SUGCM{GTG-~v& dN}IerjGt7Q1>7HnEC$-e;OXk;vd$@?2>`@EK-2&L literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Doors/Airlocks/Glass/chemistry.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Glass/chemistry.rsi/sparks_open.png new file mode 100644 index 0000000000000000000000000000000000000000..630eabb976ecf11fa59ba29f03502b02bde399aa GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^2|(GM)~O;5D{Ad0LZe;7N97KJC6BX-upNVgWUu;=WLfz+qP_d4j_bJ3vh=hfa5r9 z0qVN81qdO4*#ozUc?-;6LK?t17pG~m0|2;<_}}aJ8%Xzkw*de?p>!O_N2;HSWO<%5 ub^zoJEX!gGaL3n-QrC61fn;4*wm#k_G(h}nBOLz#0000Px&Vo5|nR9J=0mp^D5R~*MbC(eil*F~-pBwZOY( z7r_lGq)Vww3C`l-po6ofgM$xBhL|o|Iu*m25bPAwVr==s^}xa*q9hhIQ3vH+PxnsJ zsY?HRLFn%He!uVcd(wOF_fDCfo^Au2ot**DZnqf(+qRWpESt>^E_?|^QAi{b0H~Ep z1%UPSbru#Dm`o%{UcBffH%?ACee#4_twyC%VRd!2C-K_a8UQORD+9TfmXeuo% zqEsq{>$+V}+H5wxF@aL41jzkBtcu`nC^-D$e!i~1Aow%?@$ILfPY|{hhlz)A1T~b; zU#C4ccR?!L*?Go|8`n8FIOvLBx%-&*^QWP`z+8|wu0o-}XAk2v8Vxi}^Wv6ekxV90 z?Q{4zpO*^nZ9kG?qd?O%EXx8QpU>pXaWn|mMLrPXQypuYH^ z%<(mOCw%d{$#2)c@>or|lTFEw`G zQeo`=Bhs@io(1N><3>};^~ittT8gEADFAWr{++!&-W?lb`)bF5Dpf>)^4c5iu!&f% zH3^%D0P%R7TrS72xg6*DJa5K3rqrwohlht!LAHmrpFWwQP$+Qe=8s(_#L_I+!dHW3 zS>#_%_VMxYzg9v0y)tiybi=x7vbVRx$w#-OvGYuZsoM`C&4uURe*w&~yu93%Ge19% zX`204!C2)^zu`z2#L?G4uM^QQ7{u}aI1iYn8M)w9bVI*pOxN|Uz#x=LB^DPKL%U(r zcLSlN>pH6AIOw{LVHlE$U@H|ErW*>5Ah$S{s{q18ua}3v1JU;fajX8sUV_0xL=^b* z`*FvFK=4Q=VnTe_L#aQ%U#&7bJKF|0Jw1&~KI-c^z~tm40Dl4&>y=8)9~CPA0000< KMNUMnLSTYsQoWD> literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/chemistry.rsi/bolted_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/chemistry.rsi/bolted_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..6857f2a24154b06497367e4b2474465b750393e2 GIT binary patch literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJa8DPPx&*hxe|R9J<*mrqC|XBftR2_pd!A#S!LgR6w;V4#E?4AO$oJ$UFgAf+g*mqN+O z638KkUFw!v+F|VOo2!D)=OY*l0-&lYnx+9D z32|N5$z(DBEG;cDF)_hFFi7b7b%UgFbj0z?muzfokjZ3NSXf|jaS?#|`S}ZL(&;n+ z#bS|oJdUPm_@<_&+PbcjPNxZn!x#2M(=_7oH~_g^&M?po8jS|a%gd;$ilpm0V`F0$ zaaoq>@9#I>o6RP*S`C0mB;rZrJdRK(#N6B*`FtM9-g8-&DHIA0!fZB6tyUux3V9Mg zk3%4xPUCkIpPrsJet@MnX5?}?M@;0}ISPdWvMgJ2{chr3u)e;|%F0Sd6Lz?nFbtSo zd&TbVuIF4cw|O-EZpr@#!r}1c4AkrOD>HE^177xvw=!^E59{^1(H@J%JPWyTO5&l} zY#PCEI841>xAauBn`5a|3c#@&nz@8{CoV9Jz+XRnW+}1{v%OuQ(^lLKm+!aF-)jRX zio*T-YmAQeItaJ6UUBEnBzt>%miPw`p7Z$jpd(*V6u#IF&}cMBCX+_ITrLv|h4?Yi zGPopj;UA|k6^%LwS2v$JVqTC;CMlQ807RovlF1|o2M3m%|8yT{wOUlGRi1pj$?7K$ zXti379O>}Z*8ud!V!YW7aCpnP6TbPg#EZ$VIJE72gBv+Sy&1i+7;JxQybt~S?%Bi5 zvp+8;zcaX`p#Aya6^Lq{e4H$4Huh_Zx5m< z3h(59?P#K0E))G{Qup=s8LPlzK>QD1KfFuzqiM!EoQBm>iArUQqfftgw4KT_gUe4W zbK&*FyTB;3v$K}m@$qp=r4p4&#o#hlK~LtV&fWCb-c9bcFISCc$M=96E^5DQuKy~J z*2}>7CKLxmsZ{b@+|6ld=C&M0Vgzcn8rf{ND-)?yikX=iPj>^sY5y{o;NRm?m?#tq z4iokxR-lu(+i2Rw0ep!>qTT6k;C87n!+tX|pZi`o^7%ZHs;U%=MdRKkMxv9TUBnJ^ z{5%dJuBs}2P16u2gn)fzh?o#}TRGOV literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/chemistry.rsi/closed_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/chemistry.rsi/closed_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..c78d01c42d084dd5be78e8a33a599a90cc86107f GIT binary patch literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJa8DPP>^Ss#&mpghvZkX~#s0-h3N2b6`K?}O)meqDd+l#VI$hWM`6MlQ q&#%(rqf#%I&Hk(pG?9U!&gT+u#1#>y1s3nVf%u-TelF{r5}E)5_cy%& literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/chemistry.rsi/closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/chemistry.rsi/closing.png new file mode 100644 index 0000000000000000000000000000000000000000..96096e51540a429dde87b90ea7d1ed70937e0560 GIT binary patch literal 1994 zcmV;*2Q~PKP)Px+gh@m}RCt{2n{Q|nXB@}Bi6?QTWVDMV4gEvO!urDC3xiA$+82E>*CAun>JI zDH4e|hS;r%i3tFJs;c$>d&$*TM@NS+7qdAf*GV?2v$NATc7K0AHa0d;E|)!ZiN#_F zhr`X$06)Kl7cN`?0Aw;5l*?sLTw<{pve_&EAV^-cdy=wKqobn@w~KNy;>xlN00@V} zLR^fPgeA*ztpT@h-^R?$j3-Sfl}dq9sT444f+!a&t_T+vW)J}K`MjO^h17O)30e=? zDUsDQ4X9Kqek;_=OP8i;Kr|ZlTcKWFx&(pRwXmO6sZ{Dm-F9=40AP4{7=SnHLF9^p z+@b^8BTkfy5tpuwjSbgb%$S4)P(MLlEyfuM=}VMLBksRHeJ#Yrh)J`go;&C9bZukH zAd%H`=e+4QkuFBuVzG$cg_qcO`Y0ahw!7hC#EkFT2P^_tuU>7Qldxaa*Vl*A8-LiT zRBERIepa#Vs<`^0|?dFY_*_k~ z8cNr8b7_jzP`dnD4He0-nrEJab8BNyaHRVo!kqfv~Hk86Ti zUNFn$GBTMA!r^dpoP_;&9!ws*R{x^Ue6<#-i=8?ycqFwY% z00`{F)5W>4Fate3J(~cqxoPdkBE$1R1Azec?AZeVc>Ve{oOtkZ+uGVR++;F|rKKfq z7dy;EA^}xZ0RU2KYpd&7d7d2p$&)7m08>*_jy-s|>2w+ZaOKJsB$G)L3I&XejBvZy zVP3m-4asB@s;VL|J3DLIW>r;@OeO);LZ+yLalT&(6Gl}@K?m!YyO*Z%>|v+`D%c$!7aI`!b;X0utu zVlmU5&+1}_Nmr0;v?|uDJWmc^mSxQccH+Uy1)w=f^*f)(g_lV;f%!&EWLBQ_1H0*= zXVOQlC>Nt|lka!J+qt6AsC5IHCAZ%!9)P0gmt~xp ziybDtJuoxaqPd=4Sa^xkr;p;1E+={D`crJadcm|7qzrAnX^F?<_+~MLwY4>*QmOju zn^QmHz=4)6<9R)Jxw%{pkw^rit$)_XUAi>K?Q-{67dP|g{nh$hQeR)6=FKSaVvT8AW#W5#dr=q|!0#tc@Zc>yc(|cZ$aE}E9lHM15mPD_i<%c2W#!}XI65Z( z*lct)L@p8KdE={+TrLN4;%{wjMY~kX=UR&i(je0cL#ec*0}-@j8|{(iQzwzWT#=l!&5f jT;0h840aHhFykh_!rG~;5AeP$1@S#y{an^LB{Ts5_a?jl literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/chemistry.rsi/deny_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/chemistry.rsi/deny_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..7c56263f83958a17893b3db0b04ce3078c15cea0 GIT binary patch literal 321 zcmeAS@N?(olHy`uVBq!ia0vp^2|(x;TbZ%z1lzVbEa*5x0l` zFLCLtQfk)goBm*9Wqa5)W5IyH?gg7O+Vq@#{gzqI_j{ICbSF<}<0|vo?Y_6yOll7; z+AsO(r`@v>Kf7}$KR*umYV~i&zP&s*_xJv-=38t1deYzEyLbMqy6^o$Z`IbavsGXD zr!(F8`6z;|L6RYjVFqIYc7~Z}LvrZvRZ(vk567Q>-*~3QX2MKG<^wzo#tdf|3@{iQ zO7s8d*3Gv+{xi?r|HRuDl15mS!8LAhWr_IppL3FmClFnFq60fUCY M)78&qol`;+0G5h<`v3p{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/chemistry.rsi/emergency_unlit.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/chemistry.rsi/emergency_unlit.png new file mode 100644 index 0000000000000000000000000000000000000000..817f2fb3f95c53ee8720a7c5be418b6208a6a7e6 GIT binary patch literal 588 zcmV-S0<-;zP)EX>4Tx04R}tkv&MmKpe$iQ?*4Z4t5Z6$WV2$AS$ApR-p(LLaorMgUO{|(4-+r zad8w}3l4rPRvlcNb#-tR1i=pwM<*vm7b)?7X`w}o2gm(*ckglc4iIW3rdb_hfTr7K zG9DAtnN>0H3ISaRVg@5Jvy3@OO2Bh`-NVP%yC~1{KKJM7QL`2Ud?N8IGfbO!gLrDw zHaPDShgm^ZiO-2gO}ZfQBiEG%zj4mHEbz>*nM%$Rhl#~}8!K(h3Z_OpNgPo%o$`fr zgH_I3oV8MgHSft^7|QA^%Uq{9h&UFp1PLM(R8T|-HlnoZq*zGOe$2x^;QA$UDdZ}G zkz)a6Xpmh$_#gc4*2+zcHN#J&iAq7)K38aGjOH1{N)-j{YiSY zrA3Z_-fiIGx}_<5z~v6m|76If>`H!`LM{iqpV2pEfWBLxd#%x1b04Py{D4^000SaNLh0L z01FcU01FcV0GgZ_00007bV*G`2j&6>2?sl(`5Ny4002lyL_t(&-tEhw4S+xZ1i>Rg zVKDSSXPx$8c9S!R9J=WmoaL?Fc^hD2`?Q?7f->;>|1mWo(sK)C(|L$0d#;~K^Mr9(a^Er z$#c}HbZO^Ob%|;>6xzX&49N!qNy~eZ-p`MOQpy2XYb8H%Op5?eN_~zuWnI@3>->$@ z8m%>Hnj*6-3vR&EG!4hs9-R3YI1a}tsj6yN7-L-5b*^n&cc=()7*iw0Ln-BqF-`*X zeSZSI|1qBooVS6ZD54oi0Lroie(eX73gt*6x10>7shUeG!P}%@2x0~tp@|M$$+@J4%Q8Ccf)}tz~f!c%l%Cd6V_U3t(D$H;@{(A yu^@kV3Z8}NRd6wI>4wp};XE>M)&@lE@A(%i7ickj!=fGl0000Px+n@L1LRCt{2n@?yHSscf|i6c=dN^6X5=${SQU|Y zQVKovP_bK#xTWjCLts&RD9G+XAtE9cFTL!^6;h<8U5cU9HWGskEe27;cFi8TGfv*j z%e*)9UXtDR3t}_#-tY6xdr4;I&39af4jn21KqL~uvuDo$03SYl005LqC5V#CYYzvcA6Vi0jmc0&EU`I-SPAzyJW?=FOYv>gqyM zVX#+)Uax zz>XKET&F&ibUKaB&d##I_xt_WyLYelx=<(}o6Q0MT3T9|3RkM(^?ETfGJ>(OF`-O5 zUSx7vd?@56-|zP$9*-M34-O6@o6W-O^)i7f)ljAW42WRb^&*SQ>cdSN{Jy?E?H_=$ znbT`%XvnZlZA;dO$K&w({ZwPDOxl6Yt{10VCqCS219Bi(G&MDa+qZ9<0!h&(!7h^= zj7%ou%49MwUN26$qyID4C;>n)7{t}94{-G89z*AunRgf-?!n^XV%heu z?!3g~Gp&a9!C(;QXFbU0^N2>H+V*5J39r|S>qm-Ot-E*UxtXQ+Z%o&M5?#g%C@U|g zR;L_so%&GpjWQcRZy;dkeE-S371vbJXcWn05&#eg1Q3lz@#4jcvNocbyj}tXTQt|o zht%tUVzG$j+}%R{(9{Rhk@BE+Uxe;KHvP~#O8mmdVbPseSDkXW@a*POy8UxFJvD(Tqi!1 z_D7ci04>jha6f#2_J%(Vo!t-T(Q>4Scf{}F%X|T9f4y3s2LX7r*I&-f;rPy-cyi*z z=KcpiYPH-C=ee0Q+3`a5vBP!ZLou}E6zxC^03MGA9UUD=cXVJQ5Ws$q$Fv=9v07ZGBah>=mn}9Y2SXx>#bZVna)8jL(2nK`jjs0#q3CUzqJIFOOG-ziY zf|zB4p`If4O`D&E(7cdrUM?wKAKEeC{k;oV{<;sHCaZ+Yi3H~6X0UqdXT!b?zaOm= zPs@Jy-ru_b;3&?WJ6G2B*s)_sBodgLo6~A7zfIU?vK$MnyzDrCOBmOV5A7^y=fJNO zi&^dGX}ka8eIa#Z)eymDt!cO)K$F#eyKQCHu~S2of0ml=S}pT#Yg5`iVRf-6kw`Fi z=3OCFYm*C8GMQFhs?8;(eFL)DECvS$0kE6v?(W9fvuByIL26Ah8DW=cwi?Qs$#k-n`IDzr9ioU~}+8p-`DYJ4~8b zy@=-W`f#UGDX5d6Ldi2Db(?C4cIL!-t4|$#H6iVUNfXa)N0D4!A1-}7J)KSi0M^#l z96@PnYH9*d9#7x3YZo`uX*^x;#VOaR4;M?)i>IIyGa{IFy~tp)_)vz2hqV_@GVwI= zWaULMdA#@z9+b+o@}c;AK5d83=R+!$LM#>&4yDzU$>jA?ZN*|SxWnOaSy)zdCY~n0 z->+R=R*PAWQm$OtyiFz}6HgPF#I6RjUgZ{*iKodbD=&k|<3%>p%16ai1ZyUqCZ4Rk zD5f1RvY0GBDo%i`O#C+UlWO{Wz_x6pqh)EU-WW2SfUT7OueA&lAUhLprdlxdss&S( z;rReNnRuF5v+^RDyk2B7S$t5R4^ZXQ6iZfKG?T}RY^IeDnLJ)(Gp&5M1AzcC8&&0N(m$xMRaMjLfLcB;P%lze zPF@m{iKodbD^Knh!Q}BGn`z}kX@7KCNG6^ptE@b^f6E;MtQxy^?{l<3)i+Ila~?`Y z-zn3M7g79Yxv^S6X%;%TB~OsTPywgZcRYk*X%E-o^ZUfJjx7RqxuqA5ddeoPe#eGFca^p=Oe`8Y+`%$4gCD zLupT~sFJZ7YV|bEmRb!R9UT>(iKoddD_^S{;v%BwBII6JSSTBOnfGSNth_q-wYVQ# z4}%ZX)s_s z#KIwr!I-V$V11^#dUpKLjjy-9DY|#Kuw+Jjzzl{&rWQ^CH3uAwt;hGhNWR~>|B3$l qhyP2a-~C|qG6v`^C}^l(vC57yE3)EC^YOwKkf5ilpUXO@geCx+nr^EA literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/chemistry.rsi/panel_closing.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/chemistry.rsi/panel_closing.png new file mode 100644 index 0000000000000000000000000000000000000000..db7be0bc4a0ec0b2bc29e8718fb6b71796846f16 GIT binary patch literal 445 zcmeAS@N?(olHy`uVBq!ia0vp^2|(qk=b{5eiK-()1~xQ&@cMV`(mao8yQ?TZq;#^Y}m${ zacWZ!Yev-i>$j948lYsxftl|YY`yljZkp{(pFL*+-lj#WWzI6YweB*{ESZG)8eLCP zH-4D=_wruJUKQWqugks*3w-~bxAmsS_S>R@6K&4#1!`fty>^f8^xkc+O+xqazTJA; z{=7~2>uGDRIhyR%SJ)ONH}BrkKUz=f@~-S!d-avVtb5`KJrkcF_ZOUaf4N)v?bouY zpX0AZna`Cr-@$dKByUdGcPkF5{Og%j`&-%%FXZlavSVWw{8-KzzB@7SM0TXvt!o+A zif+H$q2jsc@9*!WwR0M*e5Y<-(ETyu&`qBj{lx9nl5Os{*Qk05m8bu?%XoF&`KQ?? l*%zfe7FQS8+W~`WRsIyAi(3!btSA5lf~TvW%Q~loCIEIM%9sEE literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/chemistry.rsi/panel_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/chemistry.rsi/panel_open.png new file mode 100644 index 0000000000000000000000000000000000000000..24eb2aedc2248aeb772b38f63ff992254e7aaec0 GIT binary patch literal 315 zcmV-B0mS}^P)G_@Zv*NK(#C83< z0hCg#mPY_q%Og#e`P2l!*GQEjpT`0MYBKbMv^%3TIE=g7KF`WXCR28pn>(x2n zemoXytpJ?bfcIZ;wOEjBHdt%rI!S!%PGhZ=2c^1AoGrxJR_5RoDx&OEP+E*gAHf&mPbH>ZE8FCH9e&*rpCoP%1 zIy_fR`1DT4EhW}ImG2+Fy>#^EcBOlIu{N4r8M|lHdv8DdMa^XX`Q)41s%D;5@l3t_ z>U!DiCu(!NfiicFek|lsbn*16WPNgF)9u86nlDcO+<9uZb*sRm>zlTKo#3wDtk_cV zGUiQg0fX*;t18(yxo?DbZh3Nv5#oCg`Gddm{r7*~nV;{o)~0;#=kiD}oLj`YgzrYV zCx61j+EYJuRBRcZ$AIaEWtl7E0M--(oM3v-T6o|50rvB z?(X|$_9K~q!b>Jme`5^XKVF&j%`2QtMsN-@c!MQ;uYX{&xPXV-MV4h*a7^*H)mTo% z^duKBlw8QrI7#Az6a!+!k42gRM*{jVXw(2^)BtAG0A@rO5W6r+TTo*dR0c>itn&u= ziYhf*#29dhKzXbye)sb`x`T#9jF|@skRQx^J~1)&r}u;k?=m8#VH_qLszE1c7I|*U z-vi17+kNaSpCz%9yQ#rS&sN2x0`#dRVZ$Zo3 z(YozxD(tDJ*Nd^#9ngM11*`#hZL|qqUX-aA#5S}G^!n=WLLU@GQ4~c{6dSK|xP5Tx z!-H@vnhtn%y49-Lc3NyR!WG{&^FjpmIbAy+o5nPrx)V}}E%fz`bB+BtcI@^)8^rTf zBx((Ky3EXU1aLM2IGxVm^KA+58-UdY;QHA(FXNaPN!aD?zV8}<6&DioA6qwm%&S`B zG(?rf)v;@BC^IYu=$f%ZGhhqXw5SF!qXsa;V!%*uXSl{qZh&O*G5ePMUQntINQ83i z$upoRb}H)fv5TKDu*ZP$-hvmY3!Atq6ENBh(WYFFM67|7l05p#?E1nmayZKasmvEs z4%uF#@2=U$hCc&#<3^>qaoRUjD5t(Q@!@5>eLn%YPa&y@Wk6F&Jf;Amr=S&p`TF~H zKQmyzZBbK@-3j_NfaCqFrZteLVgLD`ViBgsl+FQ!832*%0DhkaTq4i015y-4Q4~c{ f6h%=KHvsSpwHV1KmpgiI00000NkvXXu0mjf++aJ5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/chemistry.rsi/sparks_broken.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/chemistry.rsi/sparks_broken.png new file mode 100644 index 0000000000000000000000000000000000000000..fb5d774588ae44eab5608571cb6aafad7375e158 GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^2|(DFD66%%n7hj|c25u0=Hbzuz>&Md dbBcZ?)Aw7<0^jOhxdW|Y@O1TaS?83{1ORW&Jrn={ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/chemistry.rsi/sparks_damaged.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/chemistry.rsi/sparks_damaged.png new file mode 100644 index 0000000000000000000000000000000000000000..f16a028dee5bbe41a7f4e35f686043e8a112ce4e GIT binary patch literal 184 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeK3?y%aJ*@^(YymzYu0Z<#e`9lQK{p_au_VYZ zn8D%MjWi%9!PCVtL_+fI!HvAl4m=D8Hh=XH6ZQR;XyVo{y01gP^_0k+pXD$8l*-N4 z&iUk!V5<=?maE{?*yyS)-udN6;H*Pi5*L(-Fs)pAdDY$x8SUGCM{GTG-~v& dN}IerjGt7Q1>7HnEC$-e;OXk;vd$@?2>`@EK-2&L literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Doors/Airlocks/Standard/chemistry.rsi/sparks_open.png b/Resources/Textures/Structures/Doors/Airlocks/Standard/chemistry.rsi/sparks_open.png new file mode 100644 index 0000000000000000000000000000000000000000..630eabb976ecf11fa59ba29f03502b02bde399aa GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^2|(GM)~O;5D{Ad0LZe;7N97KJC6BX-upNVgWUu;=WLfz+qP_d4j_bJ3vh=hfa5r9 z0qVN81qdO4*#ozUc?-;6LK?t17pG~m0|2;<_}}aJ8%Xzkw*de?p>!O_N2;HSWO<%5 ub^zoJEX!gGaL3n-QrC61fn;4*wm#k_G(h}nBOLz#0000 Date: Sat, 10 Aug 2024 03:24:53 +0000 Subject: [PATCH 331/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 5886127d85..5c41aa6594 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: RiceMar - changes: - - message: Larger guns are now wieldable and suffer an inaccuracy when not wielded. - type: Add - id: 6576 - time: '2024-05-10T02:58:15.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/26970 - author: Doctor-Cpu changes: - message: Atlas has been reworked. @@ -3793,3 +3786,10 @@ id: 7075 time: '2024-08-10T02:12:40.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30579 +- author: Ko4erga + changes: + - message: Changed chemistry airlock color. + type: Tweak + id: 7076 + time: '2024-08-10T03:23:47.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30666 From 4c678e495582d189ea6a72fe8f1a3e7e2ae16395 Mon Sep 17 00:00:00 2001 From: Alzore <140123969+Blackern5000@users.noreply.github.com> Date: Fri, 9 Aug 2024 22:30:43 -0500 Subject: [PATCH 332/422] Bent pipes deal 8 thrown damage (#30634) 8 pipe throw damage --- .../Entities/Structures/Piping/Atmospherics/pipes.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml index c2fc4e0565..142b5dacfd 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Atmospherics/pipes.yml @@ -155,7 +155,7 @@ - type: DamageOtherOnHit damage: types: - Blunt: 3 #This should be 6 but throwing damage is doubled at the moment for some reason so for now it's 3 + Blunt: 8 # Woe, pipe be upon ye! - type: entity parent: GasPipeBase From 45214c2063911f6bea56474d5bf2c894c393b72d Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 10 Aug 2024 03:31:49 +0000 Subject: [PATCH 333/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 5c41aa6594..2bf3968ed2 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Doctor-Cpu - changes: - - message: Atlas has been reworked. - type: Tweak - id: 6577 - time: '2024-05-10T08:12:14.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27702 - author: TheShuEd changes: - message: 'New events added to the game: Random ships with new ghost roles can @@ -3793,3 +3786,10 @@ id: 7076 time: '2024-08-10T03:23:47.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30666 +- author: Blackern5000 + changes: + - message: Bent pipes now deal 8 thrown damage instead of 3. + type: Tweak + id: 7077 + time: '2024-08-10T03:30:43.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30634 From 7f23634450f3f6e6fc0348d4ffe5be934143ea04 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sat, 10 Aug 2024 05:18:13 -0400 Subject: [PATCH 334/422] [S] hopefully prevents a repeat of 4 am on 8/10/2024 in the #server-leviathan-use channel (#30851) cant test this because the documentation sucks ass but fuck it we ball --- Content.Server/Chat/Managers/ChatManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/Chat/Managers/ChatManager.cs b/Content.Server/Chat/Managers/ChatManager.cs index 6bb552d976..ef4373e1e8 100644 --- a/Content.Server/Chat/Managers/ChatManager.cs +++ b/Content.Server/Chat/Managers/ChatManager.cs @@ -257,7 +257,7 @@ namespace Content.Server.Chat.Managers //TODO: player.Name color, this will need to change the structure of the MsgChatMessage ChatMessageToAll(ChatChannel.OOC, message, wrappedMessage, EntityUid.Invalid, hideChat: false, recordReplay: true, colorOverride: colorOverride, author: player.UserId); - _mommiLink.SendOOCMessage(player.Name, message); + _mommiLink.SendOOCMessage(player.Name, message.Replace("@", "\\@").Replace("<", "\\<")); // @ and < are both problematic for discord _adminLogger.Add(LogType.Chat, LogImpact.Low, $"OOC from {player:Player}: {message}"); } From bf2bd9a33eac6eca78d4a203af89e34337d4f7ae Mon Sep 17 00:00:00 2001 From: Unkn0wn_Gh0st Date: Sat, 10 Aug 2024 07:31:28 -0500 Subject: [PATCH 335/422] Change siren.ogg to gamma.ogg (#30836) --- Resources/Audio/Misc/attributions.yml | 2 +- Resources/Audio/Misc/{siren.ogg => gamma.ogg} | Bin Resources/Prototypes/AlertLevels/alert_levels.yml | 2 +- .../Structures/Lighting/strobe_lighting.yml | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename Resources/Audio/Misc/{siren.ogg => gamma.ogg} (100%) diff --git a/Resources/Audio/Misc/attributions.yml b/Resources/Audio/Misc/attributions.yml index b38cb56a89..9d238031ef 100644 --- a/Resources/Audio/Misc/attributions.yml +++ b/Resources/Audio/Misc/attributions.yml @@ -33,7 +33,7 @@ copyright: "Made by dj-34 (https://github.com/dj-34)" source: "https://github.com/ss220-space/Paradise/blob/05043bcfb35c2e7bcf1efbdbfbf976e1a2504bc2/sound/effects/epsilon.ogg" -- files: ["siren.ogg"] +- files: ["gamma.ogg"] license: "CC0-1.0" copyright: "Created by Bhijin & Myr for Space Station 14" source: "https://github.com/space-wizards/space-station-14" diff --git a/Resources/Audio/Misc/siren.ogg b/Resources/Audio/Misc/gamma.ogg similarity index 100% rename from Resources/Audio/Misc/siren.ogg rename to Resources/Audio/Misc/gamma.ogg diff --git a/Resources/Prototypes/AlertLevels/alert_levels.yml b/Resources/Prototypes/AlertLevels/alert_levels.yml index fb6e316ed0..d08e1d00a7 100644 --- a/Resources/Prototypes/AlertLevels/alert_levels.yml +++ b/Resources/Prototypes/AlertLevels/alert_levels.yml @@ -39,7 +39,7 @@ announcement: alert-level-gamma-announcement selectable: false sound: - path: /Audio/Misc/siren.ogg + path: /Audio/Misc/gamma.ogg params: volume: -2 disableSelection: true diff --git a/Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml b/Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml index 50e24eab73..1a99ab6f10 100644 --- a/Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml +++ b/Resources/Prototypes/Entities/Structures/Lighting/strobe_lighting.yml @@ -136,7 +136,7 @@ volume: 0 range: 10 sound: - path: "/Audio/Misc/siren.ogg" + path: "/Audio/Misc/gamma.ogg" - type: entity id: PoweredStrobeLightEpsilon From 0a4b2208547a73905a6202156929bc1378ad6530 Mon Sep 17 00:00:00 2001 From: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Date: Sat, 10 Aug 2024 14:46:49 +0200 Subject: [PATCH 336/422] remove TerminatorRoleComponent (#30733) --- Content.Server/Roles/TerminatorRoleComponent.cs | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 Content.Server/Roles/TerminatorRoleComponent.cs diff --git a/Content.Server/Roles/TerminatorRoleComponent.cs b/Content.Server/Roles/TerminatorRoleComponent.cs deleted file mode 100644 index 31deb9fb82..0000000000 --- a/Content.Server/Roles/TerminatorRoleComponent.cs +++ /dev/null @@ -1,8 +0,0 @@ -using Content.Shared.Roles; - -namespace Content.Server.Roles; - -[RegisterComponent, ExclusiveAntagonist] -public sealed partial class TerminatorRoleComponent : AntagonistRoleComponent -{ -} From 563190f4d85f89323d7a4dfa17fb21d6a6ec5e58 Mon Sep 17 00:00:00 2001 From: shamp <140359015+shampunj@users.noreply.github.com> Date: Sat, 10 Aug 2024 15:47:55 +0300 Subject: [PATCH 337/422] Add Rat Kings wideswinging (#30808) Update regalrat.yml --- Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml index e478a9492f..f62d8011d9 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml @@ -48,6 +48,7 @@ 0: Alive 200: Dead - type: MeleeWeapon + altDisarm: false soundHit: path: /Audio/Weapons/Xeno/alien_claw_flesh1.ogg angle: 0 @@ -141,6 +142,7 @@ 0: Alive 350: Dead - type: MeleeWeapon + altDisarm: false soundHit: path: /Audio/Weapons/Xeno/alien_claw_flesh2.ogg angle: 0 From 4e1feded66f69e0c45b01832b5dab7ca9b8422b2 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 10 Aug 2024 12:49:01 +0000 Subject: [PATCH 338/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 2bf3968ed2..87e77f7ff5 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: TheShuEd - changes: - - message: 'New events added to the game: Random ships with new ghost roles can - now come to the station.' - type: Add - id: 6578 - time: '2024-05-10T11:35:59.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/24490 - author: MisterMecky changes: - message: Fland kitchen freezer now starts off cold @@ -3793,3 +3785,10 @@ id: 7077 time: '2024-08-10T03:30:43.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30634 +- author: shampunj + changes: + - message: Rat king can now wideswing + type: Tweak + id: 7078 + time: '2024-08-10T12:47:55.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30808 From 9bc1fabdb39ce802e22d06b0c44bfab6dab40b53 Mon Sep 17 00:00:00 2001 From: TakoDragon <69509841+BackeTako@users.noreply.github.com> Date: Sat, 10 Aug 2024 14:51:54 +0200 Subject: [PATCH 339/422] Added suitskirt for psychologist (#30709) * Added jumpskirt * added locale * Added spaces in code * Updated the meta --- .../en-US/preferences/loadout-groups.ftl | 2 ++ .../Entities/Clothing/Uniforms/jumpskirts.yml | 11 +++++++ .../Loadouts/Jobs/Wildcards/psychologist.yml | 10 ++++++ .../Prototypes/Loadouts/loadout_groups.yml | 7 ++++ .../Prototypes/Loadouts/role_loadouts.yml | 1 + .../Roles/Jobs/Wildcards/psychologist.yml | 1 - .../equipped-INNERCLOTHING-monkey.png | Bin 0 -> 946 bytes .../equipped-INNERCLOTHING.png | Bin 0 -> 1084 bytes .../Jumpskirt/psychologist.rsi/icon.png | Bin 0 -> 424 bytes .../psychologist.rsi/inhand-left.png | Bin 0 -> 518 bytes .../psychologist.rsi/inhand-right.png | Bin 0 -> 553 bytes .../Jumpskirt/psychologist.rsi/meta.json | 30 ++++++++++++++++++ 12 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/Loadouts/Jobs/Wildcards/psychologist.yml create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/equipped-INNERCLOTHING-monkey.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/meta.json diff --git a/Resources/Locale/en-US/preferences/loadout-groups.ftl b/Resources/Locale/en-US/preferences/loadout-groups.ftl index b1fba215d9..917826886b 100644 --- a/Resources/Locale/en-US/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/preferences/loadout-groups.ftl @@ -194,5 +194,7 @@ loadout-group-paramedic-shoes = Paramedic shoes # Wildcards loadout-group-reporter-jumpsuit = Reporter jumpsuit +loadout-group-psychologist-jumpsuit = Psychologist jumpsuit + loadout-group-boxer-jumpsuit = Boxer jumpsuit loadout-group-boxer-gloves = Boxer gloves diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 6ad8cc0505..18eae39f03 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -843,3 +843,14 @@ sprite: Clothing/Uniforms/Jumpskirt/musician.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/musician.rsi + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtPsychologist + name: psychologist suitskirt + description: I don't lose things. I place things in locations which later elude me. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/psychologist.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/psychologist.rsi diff --git a/Resources/Prototypes/Loadouts/Jobs/Wildcards/psychologist.yml b/Resources/Prototypes/Loadouts/Jobs/Wildcards/psychologist.yml new file mode 100644 index 0000000000..bc4bae3858 --- /dev/null +++ b/Resources/Prototypes/Loadouts/Jobs/Wildcards/psychologist.yml @@ -0,0 +1,10 @@ +# Jumpsuit +- type: loadout + id: PsychologistJumpsuit + equipment: + jumpsuit: ClothingUniformJumpsuitPsychologist + +- type: loadout + id: PsychologistJumpskirt + equipment: + jumpsuit: ClothingUniformJumpskirtPsychologist diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index 1df741b3c7..f3a1b61695 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -1226,6 +1226,13 @@ - ReporterJumpsuit - JournalistJumpsuit +- type: loadoutGroup + id: PsychologistJumpsuit + name: loadout-group-psychologist-jumpsuit + loadouts: + - PsychologistJumpsuit + - PsychologistJumpskirt + - type: loadoutGroup id: BoxerJumpsuit name: loadout-group-boxer-jumpsuit diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index c204f87c93..878c14dc70 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -489,6 +489,7 @@ id: JobPsychologist groups: - GroupTankHarness + - PsychologistJumpsuit - MedicalBackpack - Glasses - Survival diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml index 5414430bf5..57b8e39842 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml @@ -15,7 +15,6 @@ - type: startingGear id: PsychologistGear equipment: - jumpsuit: ClothingUniformJumpsuitPsychologist shoes: ClothingShoesLeather id: PsychologistPDA ears: ClothingHeadsetMedical diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 0000000000000000000000000000000000000000..e3a9016b83ea4b2a7d9ae2b863affc44e8c07350 GIT binary patch literal 946 zcmV;j15NyiP)Px&Y)M2xRCt{2nz3u!N*KU@DvxFfNc0WT^dQ|6L!iT39)Sm$jrXhx5fsxHL{K}J z>`I3ugS=)7MSnxObZCm7L-xiQimWYxEbgGMLnBqG-8`Kd#n9dljO62dzq`-p58L;F zMx)VaG#ZWO_ry@?90Y;P&(E{IzHan-JvKHr01y#+y`EfOU(@Myl*Ux`XZN;k=bj`< z@^)4KA1d-zs|7%>*Avh4FikUi&g$xF)>Y~VLeUQpMNz)!VtXzAAP5M8KvI!g57RU! z+JYdEAP64Be|~=c)BZ;#`^k%~t^CR7@tDu!@x(pAO}~2!!p%6h{CAQ0%Z^_*003MJ zhrHh1C5~er&&>hwcy5k3j(NSi%f)c0GMqA*e;QT&r2}v=91=wltyas3q9~XBs2%cm zuQEXp6E%2GA}8jVJy(P%UpjYjiZqV$s~I|<6Ty1JU$Ru{AOYcv`S0KV^w z>$`x3{oq$1+Fu5`Oy0SLoT!Z57eABG`e7z#kQ+ZES!B^8l4 zjw=O0>0rclU6RoV+i?KcKRBS-Y+{<`gYO2@G^N>WvVU*@fbBRWqY)X>jU0(-sX#+hHcxm z9+B7KR?Y$N?OeWiUu>(BX|(}A<5v#AENcWZ_xIjnjX<6C2^x(?qtR$I8qF`n7m#vj U4M#NPx&_DMuRRCt{2nm=#bI2gvC9u8FpLsEwL&*bIP06O*6wHjR#6t|*WbR)waM=D>MspIuh&Df*+j3` zE9Ul@=N0K^XJ=<&+id;1^q-KOkP=F%=XtrwXWg^^B7M*Ea+4j~JkMK6pZj^awY5bn zl?uw`GWPfPaeI4<(P)G)4Ds;rAnYZGX#?M0g0e3^*?nFQg`NToP1C5Vsz{Oq0N^+d z03b;csHzH0(}a!yrjsNI8jS|Fx3|$~G;;O46b^u|gcxa}l9mC;%+_Q4}Evf`x5@AV3sFLPmi|{lXIl>r~fu0QqP~Q3L=OkH-Lj z$H&LDPllrOxs5K1u80f&)$}D2i9{liNF)-8L?V&=rWl4n2_Zti0P|uP#!7y;zn~a~ zLBk+`^5zWypjxoldFfbphbp#ZRYGYMLe`gyg(@Iyw?NG7ZB>#k$=tC4|s!w@ZEBr-YCf3jiU6 z`o5p@zLZtWpFKw0QrO@ma_u@e}B)>c?q&wSr1unMd2O+mzS5=+uOrrG64X5zPn3D z!AtY`?hXJjnM`nH+wgrqT{kES_Xq%hX0r(ZXt&#l;}`(&&zCQ&bhQ#pD~@Bd+wGhu zp|F`ZTi5Ay=x{hp^94kEU^xlH;gEJZotz$fBJuRcbqmCC4BNJIt1|}&2dLF*X}*AH zuCK3gc6OHLBxJqVwvCgM6R!TaUK-dUrJ^XPR;vhtApMP^2;=cs`0~`cJ#0*VfG7_e zl^-C&!$#x>i1e^A`2nIlY+Qc8ui`->kw_%}2fhNcAY?JW>H!4+0000Px$Vo5|nR9J=WRWXjjFc2J{5NS~CYoIhG&)_$a((;TbWeR@43#fSpT|$*WLn2Yc zjrSVtJ9OyeMRezpB5ktk+1W`P0}&As5&s>6Q(TrM&1N$IK$c~G?RL8*0Jz<5*lac| zPFC}}uBonT8pn~Ol>V|rK3A3{ad;=3V!d4Y_}cgQR0`L=|CM_?@;vv`St1(8(YxSc zOGM74JkNt&_~42;H4Uaof@zWffR9g2!=-vnz`GG7psFfS6h#nWQ52}EDtIRZI}l3B zX&x*<2mv9!dENWo@AnV)KkGxmQoCBM=zKn7u~=X}pJTmV<8V0Oa=E}gKOT?ocfg@- zTcl|UYb^j^x7z^#thGqf6m8pb=y(F8l%$k`*7|8)YYn9oq?D{bAPx$z)3_wRCt{2*)fiSKokbxe>R)Ym_Q}v+IkDm;3e$!9OG6NUcxhY1UoB(TVjQY zg*LuzR)TH>Ci50E+5byORLIZxgh%27h=_=Yh=_=Yi2fC$5n`>CUatoLm`o;R=5o0d z063jan9XLb&!wIBr>wP-Wtn7ICg<~6;y5n1t4O)eS}P(_nU)=Ko-gkLEEbDa-S}0sDD;O1jd-KrpKCsoE~d(ogTNzRGkcU!DV{f2B*WXUVtm@>2Yuc(4HO#)dO6o z$E`9I*3~KP>2Z(+(3~CzbqiE!O^<_Xg6h*~?-jiWr^lq@8w0A^;^^WG*#H0l07*qo IM6N<$f?rSYOaK4? literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpskirt/psychologist.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..25fa4bcb44c50955ca2fa472ade0177bbb9f825e GIT binary patch literal 553 zcmV+^0@nSBP)Px$<4Ht8RCt{2+A)rTKokbxe>R)Ym<*MaYwImMgO{+^bBtSAcnQzo5$voCZi$s9 z7TWl>8lr&0CvX$_r2C99@{Y;45Rv-hy@*J5vj@v=BF*MN zM4aL+I>u+V;d?p-01SsieD!*{0YBR<7K;S{U_2hzIiIJv#9QR!)c~5l3SN~E~-rPhKf?a|@QmTX>9Y zgNUHt?@N*-h@uGHZWn{W0L$ePyWI}9eZ5|*rV~&{yoCt}!?1K^+wb?SNx&=d-n|8) zD8l)Cwu2FdApjr<0whV&_~maYrJ%KbI^NtOc-=7wf}4HW?``u;ymwEd*81*cbvPW_ zar&?L7B3MI5fKp)5m93vz9|ur^c9(J72{fn$a^ZVzOV`KsbcKvVP(kjtzzurVRg7I z@BZJZQhD690_)RlP$>bvRg7Jft^uwUSf3^jl>82`e5)9{s2uI1(v#Jeim{7Ik3q|q rim?mlKS}vkF)rhD%2 Date: Sat, 10 Aug 2024 12:53:00 +0000 Subject: [PATCH 340/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 87e77f7ff5..37f0d4a1c2 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: MisterMecky - changes: - - message: Fland kitchen freezer now starts off cold - type: Fix - id: 6579 - time: '2024-05-10T15:57:21.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27532 - author: youtissoum changes: - message: Spiders can now wideswing. @@ -3792,3 +3785,10 @@ id: 7078 time: '2024-08-10T12:47:55.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30808 +- author: BackeTako + changes: + - message: Added a suitskirt for the psychologist + type: Add + id: 7079 + time: '2024-08-10T12:51:54.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30709 From d340c5c8440ba6c229c74a912f218247efc97a9f Mon Sep 17 00:00:00 2001 From: Unkn0wn_Gh0st Date: Sat, 10 Aug 2024 07:55:20 -0500 Subject: [PATCH 341/422] ERT Chaplain Loadout fixer (#30855) Chaplain fixy --- Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml index 211a234790..2286179ab1 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/emergencyresponseteam.yml @@ -95,7 +95,7 @@ description: job-description-ertchaplain playTimeTracker: JobERTChaplain setPreference: false - startingGear: ERTEngineerGearEVA + startingGear: ERTChaplainGear icon: "JobIconNanotrasen" supervisors: job-supervisors-centcom canBeAntag: false @@ -119,7 +119,7 @@ neck: ClothingNeckStoleChaplain gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterArmorBasicSlim - id: ERTEngineerPDA + id: ERTChaplainPDA ears: ClothingHeadsetAltCentCom belt: ClothingBeltStorageWaistbag pocket1: Flare From 2b4acde2c82e69e0f9237b1ec31e0aba9b148fd3 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 10 Aug 2024 12:56:26 +0000 Subject: [PATCH 342/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 37f0d4a1c2..9c56822fa5 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,13 +1,4 @@ Entries: -- author: youtissoum - changes: - - message: Spiders can now wideswing. - type: Tweak - - message: Slimes can now wideswing. - type: Tweak - id: 6580 - time: '2024-05-10T23:49:56.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27856 - author: Dutch-VanDerLinde changes: - message: Fix firesuits, ninja suits, and some armor not allowing suit storage. @@ -3792,3 +3783,11 @@ id: 7079 time: '2024-08-10T12:51:54.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30709 +- author: Unkn0wnGh0st333 + changes: + - message: ERT Chaplain starting gear was fixed and will no longer give the ERT + Engineer gear + type: Fix + id: 7080 + time: '2024-08-10T12:55:20.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30855 From fdbf2a229ec0b462eb1ea51cd2f00e64d8536ab3 Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Sat, 10 Aug 2024 10:17:45 -0400 Subject: [PATCH 343/422] Infer type for EntSelector (#30856) Infer type for EntSelector.cs --- .../EntitySelectors/EntSelector.cs | 4 +- .../EntityTableTypeSerializer.cs | 37 + .../Prototypes/Catalog/Fills/Crates/fun.yml | 78 +-- .../Prototypes/Catalog/Fills/Lockers/misc.yml | 117 ++-- .../Markers/Spawners/Random/maintenance.yml | 636 ++++++------------ 5 files changed, 317 insertions(+), 555 deletions(-) create mode 100644 Content.Shared/EntityTable/EntitySelectors/EntityTableTypeSerializer.cs diff --git a/Content.Shared/EntityTable/EntitySelectors/EntSelector.cs b/Content.Shared/EntityTable/EntitySelectors/EntSelector.cs index b1e712b4b3..eea4dd85a7 100644 --- a/Content.Shared/EntityTable/EntitySelectors/EntSelector.cs +++ b/Content.Shared/EntityTable/EntitySelectors/EntSelector.cs @@ -8,7 +8,9 @@ namespace Content.Shared.EntityTable.EntitySelectors; /// public sealed partial class EntSelector : EntityTableSelector { - [DataField(required: true)] + public const string IdDataFieldTag = "id"; + + [DataField(IdDataFieldTag, required: true)] public EntProtoId Id; [DataField] diff --git a/Content.Shared/EntityTable/EntitySelectors/EntityTableTypeSerializer.cs b/Content.Shared/EntityTable/EntitySelectors/EntityTableTypeSerializer.cs new file mode 100644 index 0000000000..5bc256d143 --- /dev/null +++ b/Content.Shared/EntityTable/EntitySelectors/EntityTableTypeSerializer.cs @@ -0,0 +1,37 @@ +using Robust.Shared.Serialization; +using Robust.Shared.Serialization.Manager; +using Robust.Shared.Serialization.Markdown.Mapping; +using Robust.Shared.Serialization.Markdown.Validation; +using Robust.Shared.Serialization.TypeSerializers.Interfaces; + +namespace Content.Shared.EntityTable.EntitySelectors; + +[TypeSerializer] +public sealed class EntityTableTypeSerializer : + ITypeReader +{ + public ValidationNode Validate(ISerializationManager serializationManager, + MappingDataNode node, + IDependencyCollection dependencies, + ISerializationContext? context = null) + { + if (node.Has(EntSelector.IdDataFieldTag)) + return serializationManager.ValidateNode(node, context); + + return new ErrorNode(node, "Custom validation not supported! Please specify the type manually!"); + } + + public EntityTableSelector Read(ISerializationManager serializationManager, + MappingDataNode node, + IDependencyCollection dependencies, + SerializationHookContext hookCtx, + ISerializationContext? context = null, + ISerializationManager.InstantiationDelegate? instanceProvider = null) + { + var type = typeof(EntityTableSelector); + if (node.Has(EntSelector.IdDataFieldTag)) + type = typeof(EntSelector); + + return (EntityTableSelector) serializationManager.Read(type, node, context)!; + } +} diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml index ebc7a446b9..4d34fa4290 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml @@ -2,67 +2,43 @@ id: AllPlushiesTable table: !type:GroupSelector children: - - !type:EntSelector - id: PlushieBee - - !type:EntSelector - id: PlushieNar + - id: PlushieBee + - id: PlushieNar weight: 0.5 - - !type:EntSelector - id: PlushieRatvar + - id: PlushieRatvar weight: 0.5 - - !type:EntSelector - id: PlushieNuke - - !type:EntSelector - id: PlushieSlime - - !type:EntSelector - id: PlushieSnake + - id: PlushieNuke + - id: PlushieSlime + - id: PlushieSnake - !type:GroupSelector children: - - !type:EntSelector - id: PlushieLizard + - id: PlushieLizard weight: 9 - - !type:EntSelector - id: PlushieSpaceLizard + - id: PlushieSpaceLizard weight: 1 - !type:GroupSelector children: - - !type:EntSelector - id: PlushieCarp - - !type:EntSelector - id: PlushieHolocarp + - id: PlushieCarp + - id: PlushieHolocarp weight: 0.25 - - !type:EntSelector - id: PlushieMagicarp + - id: PlushieMagicarp weight: 0.25 - - !type:EntSelector - id: PlushieRainbowCarp + - id: PlushieRainbowCarp weight: 0.15 - - !type:EntSelector - id: PlushieVox - - !type:EntSelector - id: PlushieRouny + - id: PlushieVox + - id: PlushieRouny - !type:GroupSelector children: - - !type:EntSelector - id: PlushieSharkBlue - - !type:EntSelector - id: PlushieSharkGrey - - !type:EntSelector - id: PlushieSharkPink - - !type:EntSelector - id: PlushieAtmosian - - !type:EntSelector - id: PlushieDiona - - !type:EntSelector - id: PlushieXeno - - !type:EntSelector - id: PlushieHampter - - !type:EntSelector - id: PlushieMoth - - !type:EntSelector - id: PlushieArachind - - !type:EntSelector - id: PlushiePenguin + - id: PlushieSharkBlue + - id: PlushieSharkGrey + - id: PlushieSharkPink + - id: PlushieAtmosian + - id: PlushieDiona + - id: PlushieXeno + - id: PlushieHampter + - id: PlushieMoth + - id: PlushieArachind + - id: PlushiePenguin - type: entity id: CrateFunPlushie @@ -87,12 +63,10 @@ containers: entity_storage: !type:AllSelector children: - - !type:EntSelector - id: PlushieLizard + - id: PlushieLizard amount: !type:ConstantNumberSelector value: 3 - - !type:EntSelector - id: PlushieSpaceLizard + - id: PlushieSpaceLizard amount: !type:ConstantNumberSelector value: 3 diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml index cf270a6310..5e2b6aeb75 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml @@ -7,46 +7,31 @@ containers: entity_storage: !type:AllSelector children: - - !type:EntSelector - id: ClothingBeltMilitaryWebbing - - !type:EntSelector - id: ClothingHandsGlovesCombat - - !type:EntSelector - id: JetpackBlackFilled - - !type:EntSelector - id: ClothingUniformJumpsuitOperative - - !type:EntSelector - id: ClothingUniformJumpskirtOperative - - !type:EntSelector - id: ClothingHeadsetAltSyndicate - - !type:EntSelector - id: ClothingEyesHudSyndicate + - id: ClothingBeltMilitaryWebbing + - id: ClothingHandsGlovesCombat + - id: JetpackBlackFilled + - id: ClothingUniformJumpsuitOperative + - id: ClothingUniformJumpskirtOperative + - id: ClothingHeadsetAltSyndicate + - id: ClothingEyesHudSyndicate - type: entityTable id: FillLockerEmergencyStandard table: !type:AllSelector children: - - !type:EntSelector - id: ClothingMaskBreath - - !type:EntSelector - id: ClothingOuterSuitEmergency + - id: ClothingMaskBreath + - id: ClothingOuterSuitEmergency - !type:GroupSelector children: - - !type:EntSelector - id: EmergencyOxygenTankFilled - - !type:EntSelector - id: OxygenTankFilled - - !type:EntSelector - id: ToolboxEmergencyFilled + - id: EmergencyOxygenTankFilled + - id: OxygenTankFilled + - id: ToolboxEmergencyFilled prob: 0.5 - - !type:EntSelector - id: MedkitOxygenFilled + - id: MedkitOxygenFilled prob: 0.2 - - !type:EntSelector - id: WeaponFlareGun + - id: WeaponFlareGun prob: 0.05 - - !type:EntSelector - id: BoxMRE + - id: BoxMRE prob: 0.1 - type: entity @@ -78,42 +63,30 @@ containers: entity_storage: !type:AllSelector children: - - !type:EntSelector - id: ClothingMaskBreath - - !type:EntSelector - id: ClothingOuterSuitEmergency + - id: ClothingMaskBreath + - id: ClothingOuterSuitEmergency - !type:GroupSelector children: - - !type:EntSelector - id: EmergencyNitrogenTankFilled - - !type:EntSelector - id: NitrogenTankFilled + - id: EmergencyNitrogenTankFilled + - id: NitrogenTankFilled - type: entityTable id: FillLockerFireStandard table: !type:AllSelector children: - - !type:EntSelector - id: ClothingOuterSuitFire - - !type:EntSelector - id: ClothingHeadHelmetFire - - !type:EntSelector - id: ClothingMaskGas + - id: ClothingOuterSuitFire + - id: ClothingHeadHelmetFire + - id: ClothingMaskGas - !type:GroupSelector children: - - !type:EntSelector - id: EmergencyOxygenTankFilled - - !type:EntSelector - id: OxygenTankFilled - - !type:EntSelector - id: CrowbarRed + - id: EmergencyOxygenTankFilled + - id: OxygenTankFilled + - id: CrowbarRed - !type:GroupSelector children: - - !type:EntSelector - id: FireExtinguisher + - id: FireExtinguisher weight: 98 - - !type:EntSelector - id: SprayBottleWater #It's just budget cut after budget cut man + - id: SprayBottleWater #It's just budget cut after budget cut man weight: 2 - type: entity @@ -142,36 +115,24 @@ children: - !type:GroupSelector children: - - !type:EntSelector - id: ClothingUniformJumpsuitOperative - - !type:EntSelector - id: ClothingUniformJumpskirtOperative - - !type:EntSelector - id: ClothingBackpackDuffelSyndicate - - !type:EntSelector - id: CyberPen - - !type:EntSelector - id: CigPackSyndicate - - !type:EntSelector - id: ClothingBackpackDuffelSyndicatePyjamaBundle - - !type:EntSelector - id: ClothingBeltMilitaryWebbing - - !type:EntSelector - id: ClothingShoesBootsCombatFilled - - !type:EntSelector - id: ToolboxSyndicateFilled - - !type:EntSelector - id: BalloonSyn - - !type:EntSelector - id: WeaponSniperMosin + - id: ClothingUniformJumpsuitOperative + - id: ClothingUniformJumpskirtOperative + - id: ClothingBackpackDuffelSyndicate + - id: CyberPen + - id: CigPackSyndicate + - id: ClothingBackpackDuffelSyndicatePyjamaBundle + - id: ClothingBeltMilitaryWebbing + - id: ClothingShoesBootsCombatFilled + - id: ToolboxSyndicateFilled + - id: BalloonSyn + - id: WeaponSniperMosin weight: 2 - type: entityTable id: MaintenanceLockerLoot table: !type:AllSelector children: - - !type:EntSelector - id: StrangePill + - id: StrangePill prob: 0.20 # Tools - !type:NestedSelector diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index 193edb069e..f7e22ef62d 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -9,276 +9,158 @@ # Smoker's specialty - !type:AllSelector children: - - !type:EntSelector - id: Lighter - - !type:EntSelector - id: CigCartonBlue + - id: Lighter + - id: CigCartonBlue # Gar glasses - !type:GroupSelector children: - - !type:EntSelector - id: ClothingEyesGlassesGar - - !type:EntSelector - id: ClothingEyesGlassesGarOrange - - !type:EntSelector - id: ClothingEyesGlassesGarGiga - - !type:EntSelector - id: Wristwatch + - id: ClothingEyesGlassesGar + - id: ClothingEyesGlassesGarOrange + - id: ClothingEyesGlassesGarGiga + - id: Wristwatch weight: 0.5 - - !type:EntSelector - id: ClothingHeadHatCake - - !type:EntSelector - id: ClothingHeadHatSkub - - !type:EntSelector - id: ClothingHeadHatCone - - !type:EntSelector - id: ClothingNeckBling - - !type:EntSelector - id: ClothingHeadHelmetCosmonaut - - !type:EntSelector - id: ClothingHeadHelmetBasic - - !type:EntSelector - id: ClothingShoeSlippersDuck - - !type:EntSelector - id: ClothingUnderSocksBee - - !type:EntSelector - id: ClothingUnderSocksCoder - - !type:EntSelector - id: ClothingHeadHatSquid + - id: ClothingHeadHatCake + - id: ClothingHeadHatSkub + - id: ClothingHeadHatCone + - id: ClothingNeckBling + - id: ClothingHeadHelmetCosmonaut + - id: ClothingHeadHelmetBasic + - id: ClothingShoeSlippersDuck + - id: ClothingUnderSocksBee + - id: ClothingUnderSocksCoder + - id: ClothingHeadHatSquid # Animal Masks - !type:GroupSelector children: - - !type:EntSelector - id: ClothingMaskRat - - !type:EntSelector - id: ClothingMaskFox - - !type:EntSelector - id: ClothingMaskBee - - !type:EntSelector - id: ClothingMaskBear - - !type:EntSelector - id: ClothingMaskRaven - - !type:EntSelector - id: ClothingMaskJackal - - !type:EntSelector - id: ClothingMaskBat - - !type:EntSelector - id: ClothingBeltSuspenders - - !type:EntSelector - id: ClothingEyesEyepatch - - !type:EntSelector - id: ClothingEyesGlasses - - !type:EntSelector - id: ClothingHandsGlovesLatex - - !type:EntSelector - id: ClothingHandsGlovesFingerless - - !type:EntSelector - id: ClothingHandsGlovesColorBlack - - !type:EntSelector - id: ClothingHeadHatBeret - - !type:EntSelector - id: ClothingHeadHatBowlerHat - - !type:EntSelector - id: ClothingHeadHatFedoraBrown + - id: ClothingMaskRat + - id: ClothingMaskFox + - id: ClothingMaskBee + - id: ClothingMaskBear + - id: ClothingMaskRaven + - id: ClothingMaskJackal + - id: ClothingMaskBat + - id: ClothingBeltSuspenders + - id: ClothingEyesEyepatch + - id: ClothingEyesGlasses + - id: ClothingHandsGlovesLatex + - id: ClothingHandsGlovesFingerless + - id: ClothingHandsGlovesColorBlack + - id: ClothingHeadHatBeret + - id: ClothingHeadHatBowlerHat + - id: ClothingHeadHatFedoraBrown weight: 0.5 - - !type:EntSelector - id: ClothingHeadHatFedoraGrey + - id: ClothingHeadHatFedoraGrey weight: 0.5 - - !type:EntSelector - id: ClothingHeadHatFez - - !type:EntSelector - id: ClothingHeadHatPaper - - !type:EntSelector - id: ClothingHeadHatPirate - - !type:EntSelector - id: ClothingMaskSterile - - !type:EntSelector - id: ClothingNeckHeadphones - - !type:EntSelector - id: ClothingNeckTieRed - - !type:EntSelector - id: ClothingOuterCoatGentle + - id: ClothingHeadHatFez + - id: ClothingHeadHatPaper + - id: ClothingHeadHatPirate + - id: ClothingMaskSterile + - id: ClothingNeckHeadphones + - id: ClothingNeckTieRed + - id: ClothingOuterCoatGentle - !type:AllSelector children: - - !type:EntSelector - id: ClothingOuterCoatJensen - - !type:EntSelector - id: ClothingEyesGlassesJensen - - !type:EntSelector - id: ClothingOuterCoatLab + - id: ClothingOuterCoatJensen + - id: ClothingEyesGlassesJensen + - id: ClothingOuterCoatLab - !type:AllSelector children: - - !type:EntSelector - id: ClothingOuterCoatPirate - - !type:EntSelector - id: ClothingHeadHatPirateTricord - - !type:EntSelector - id: ClothingHeadHatTophat - - !type:EntSelector - id: ClothingOuterHoodieBlack + - id: ClothingOuterCoatPirate + - id: ClothingHeadHatPirateTricord + - id: ClothingHeadHatTophat + - id: ClothingOuterHoodieBlack weight: 0.5 - - !type:EntSelector - id: ClothingOuterHoodieGrey + - id: ClothingOuterHoodieGrey weight: 0.5 - !type:GroupSelector children: - - !type:EntSelector - id: ClothingOuterFlannelRed - - !type:EntSelector - id: ClothingOuterFlannelBlue - - !type:EntSelector - id: ClothingOuterFlannelGreen - - !type:EntSelector - id: ClothingOuterVestHazard - - !type:EntSelector - id: ClothingShoesBootsJack - - !type:EntSelector - id: ClothingShoesHighheelBoots - - !type:EntSelector - id: ClothingShoesBootsLaceup - - !type:EntSelector - id: ClothingShoesLeather - - !type:EntSelector - id: ClothingShoesBootsSalvage - - !type:EntSelector - id: ClothingShoesBootsWork - - !type:EntSelector - id: ClothingShoesTourist - - !type:EntSelector - id: ClothingUniformJumpsuitLoungewear - - !type:EntSelector - id: ClothingHeadHatCowboyRed + - id: ClothingOuterFlannelRed + - id: ClothingOuterFlannelBlue + - id: ClothingOuterFlannelGreen + - id: ClothingOuterVestHazard + - id: ClothingShoesBootsJack + - id: ClothingShoesHighheelBoots + - id: ClothingShoesBootsLaceup + - id: ClothingShoesLeather + - id: ClothingShoesBootsSalvage + - id: ClothingShoesBootsWork + - id: ClothingShoesTourist + - id: ClothingUniformJumpsuitLoungewear + - id: ClothingHeadHatCowboyRed # Uncommon Group - !type:GroupSelector weight: 23 children: - - !type:EntSelector - id: ClothingNeckCloakHerald - - !type:EntSelector - id: ClothingHeadHelmetTemplar + - id: ClothingNeckCloakHerald + - id: ClothingHeadHelmetTemplar # Cloaks - !type:GroupSelector children: - - !type:EntSelector - id: ClothingNeckCloakTrans - - !type:EntSelector - id: ClothingNeckCloakAdmin - - !type:EntSelector - id: ClothingNeckCloakMoth - - !type:EntSelector - id: ClothingNeckCloakVoid - - !type:EntSelector - id: ClothingNeckCloakGoliathCloak - - !type:EntSelector - id: ClothingNeckCloakAce - - !type:EntSelector - id: ClothingNeckCloakAro - - !type:EntSelector - id: ClothingNeckCloakBi - - !type:EntSelector - id: ClothingNeckCloakIntersex - - !type:EntSelector - id: ClothingNeckCloakLesbian - - !type:EntSelector - id: ClothingNeckCloakGay - - !type:EntSelector - id: ClothingNeckCloakEnby - - !type:EntSelector - id: ClothingNeckCloakPan - - !type:EntSelector - id: ToySkeleton - - !type:EntSelector - id: Basketball - - !type:EntSelector - id: Football - - !type:EntSelector - id: BalloonNT - - !type:EntSelector - id: BalloonCorgi - - !type:EntSelector - id: MysteryFigureBox + - id: ClothingNeckCloakTrans + - id: ClothingNeckCloakAdmin + - id: ClothingNeckCloakMoth + - id: ClothingNeckCloakVoid + - id: ClothingNeckCloakGoliathCloak + - id: ClothingNeckCloakAce + - id: ClothingNeckCloakAro + - id: ClothingNeckCloakBi + - id: ClothingNeckCloakIntersex + - id: ClothingNeckCloakLesbian + - id: ClothingNeckCloakGay + - id: ClothingNeckCloakEnby + - id: ClothingNeckCloakPan + - id: ToySkeleton + - id: Basketball + - id: Football + - id: BalloonNT + - id: BalloonCorgi + - id: MysteryFigureBox # Cult - !type:AllSelector children: - - !type:EntSelector - id: ClothingOuterRobesCult - - !type:EntSelector - id: ClothingShoesCult - - !type:EntSelector - id: ClothingHandsGlovesMercFingerless - - !type:EntSelector - id: ClothingHandsGlovesNitrile - - !type:EntSelector - id: ClothingHandsGlovesPowerglove - - !type:EntSelector - id: ClothingHeadHatAnimalHeadslime - - !type:EntSelector - id: ClothingHeadHatBeretMerc - - !type:EntSelector - id: ClothingHeadHatOutlawHat - - !type:EntSelector - id: ClothingHeadHatUshanka - - !type:EntSelector - id: ClothingHeadHatBunny - - !type:EntSelector - id: ClothingMaskNeckGaiter - - !type:EntSelector - id: ClothingNeckScarfStripedZebra - - !type:EntSelector - id: ClothingOuterGhostSheet - - !type:EntSelector - id: ClothingUniformJumpsuitAncient - - !type:EntSelector - id: ClothingUniformJumpsuitPirate - - !type:EntSelector - id: ClothingShoesBootsCowboyFancy - - !type:EntSelector - id: ClothingHeadHatCowboyBountyHunter + - id: ClothingOuterRobesCult + - id: ClothingShoesCult + - id: ClothingHandsGlovesMercFingerless + - id: ClothingHandsGlovesNitrile + - id: ClothingHandsGlovesPowerglove + - id: ClothingHeadHatAnimalHeadslime + - id: ClothingHeadHatBeretMerc + - id: ClothingHeadHatOutlawHat + - id: ClothingHeadHatUshanka + - id: ClothingHeadHatBunny + - id: ClothingMaskNeckGaiter + - id: ClothingNeckScarfStripedZebra + - id: ClothingOuterGhostSheet + - id: ClothingUniformJumpsuitAncient + - id: ClothingUniformJumpsuitPirate + - id: ClothingShoesBootsCowboyFancy + - id: ClothingHeadHatCowboyBountyHunter # Pins - !type:GroupSelector children: - - !type:EntSelector - id: ClothingNeckLGBTPin - - !type:EntSelector - id: ClothingNeckAromanticPin - - !type:EntSelector - id: ClothingNeckAsexualPin - - !type:EntSelector - id: ClothingNeckBisexualPin - - !type:EntSelector - id: ClothingNeckIntersexPin - - !type:EntSelector - id: ClothingNeckLesbianPin - - !type:EntSelector - id: ClothingNeckNonBinaryPin - - !type:EntSelector - id: ClothingNeckPansexualPin - - !type:EntSelector - id: ClothingNeckTransPin - - !type:EntSelector - id: ClothingNeckAutismPin - - !type:EntSelector - id: ClothingNeckGoldAutismPin + - id: ClothingNeckLGBTPin + - id: ClothingNeckAromanticPin + - id: ClothingNeckAsexualPin + - id: ClothingNeckBisexualPin + - id: ClothingNeckIntersexPin + - id: ClothingNeckLesbianPin + - id: ClothingNeckNonBinaryPin + - id: ClothingNeckPansexualPin + - id: ClothingNeckTransPin + - id: ClothingNeckAutismPin + - id: ClothingNeckGoldAutismPin # Rare Group - !type:GroupSelector weight: 2 children: - - !type:EntSelector - id: Skub - - !type:EntSelector - id: PonderingOrb - - !type:EntSelector - id: CluwneHorn - - !type:EntSelector - id: ClothingShoesSkates - - !type:EntSelector - id: DrinkMugDog - - !type:EntSelector - id: CigarGold - - !type:EntSelector - id: ClothingUniformJumpsuitFamilyGuy - - !type:EntSelector - id: WristwatchGold + - id: Skub + - id: PonderingOrb + - id: CluwneHorn + - id: ClothingShoesSkates + - id: DrinkMugDog + - id: CigarGold + - id: ClothingUniformJumpsuitFamilyGuy + - id: WristwatchGold - type: entity name: Maint Loot Spawner @@ -304,174 +186,104 @@ - !type:GroupSelector weight: 75 children: - - !type:EntSelector - id: FlashlightLantern - - !type:EntSelector - id: ToolboxEmergencyFilled + - id: FlashlightLantern + - id: ToolboxEmergencyFilled - !type:GroupSelector children: - - !type:EntSelector - id: OxygenTankFilled - - !type:EntSelector - id: DoubleEmergencyOxygenTankFilled + - id: OxygenTankFilled + - id: DoubleEmergencyOxygenTankFilled - !type:GroupSelector children: - - !type:EntSelector - id: NitrogenTankFilled - - !type:EntSelector - id: DoubleEmergencyNitrogenTankFilled - - !type:EntSelector - id: EmergencyFunnyOxygenTankFilled + - id: NitrogenTankFilled + - id: DoubleEmergencyNitrogenTankFilled + - id: EmergencyFunnyOxygenTankFilled weight: 0.5 - !type:GroupSelector weight: 3 children: - - !type:EntSelector - id: SheetSteel10 - - !type:EntSelector - id: SheetPlastic10 - - !type:EntSelector - id: SheetGlass10 - - !type:EntSelector - id: PartRodMetal10 - - !type:EntSelector - id: MaterialCardboard10 + - id: SheetSteel10 + - id: SheetPlastic10 + - id: SheetGlass10 + - id: PartRodMetal10 + - id: MaterialCardboard10 weight: 0.25 - - !type:EntSelector - id: MaterialCloth10 + - id: MaterialCloth10 weight: 0.25 - - !type:EntSelector - id: MaterialWoodPlank10 + - id: MaterialWoodPlank10 weight: 0.25 - - !type:EntSelector - id: Plunger - - !type:EntSelector - id: PowerCellMedium - - !type:EntSelector - id: PowerCellSmall - - !type:EntSelector - id: Soap - - !type:EntSelector - id: Wirecutter - - !type:EntSelector - id: Screwdriver - - !type:EntSelector - id: Wrench - - !type:EntSelector - id: Crowbar - - !type:EntSelector - id: Multitool - - !type:EntSelector - id: Shovel - - !type:EntSelector - id: Welder - - !type:EntSelector - id: GasAnalyzer - - !type:EntSelector - id: SprayPainter - - !type:EntSelector - id: Flare - - !type:EntSelector - id: Beaker - - !type:EntSelector - id: ClothingMaskGas - - !type:EntSelector - id: ClothingMaskBreath - - !type:EntSelector - id: DoorElectronics - - !type:EntSelector - id: APCElectronics - - !type:EntSelector - id: InflatableWallStack5 - - !type:EntSelector - id: CableHVStack10 - - !type:EntSelector - id: CableMVStack10 - - !type:EntSelector - id: CableApcStack10 + - id: Plunger + - id: PowerCellMedium + - id: PowerCellSmall + - id: Soap + - id: Wirecutter + - id: Screwdriver + - id: Wrench + - id: Crowbar + - id: Multitool + - id: Shovel + - id: Welder + - id: GasAnalyzer + - id: SprayPainter + - id: Flare + - id: Beaker + - id: ClothingMaskGas + - id: ClothingMaskBreath + - id: DoorElectronics + - id: APCElectronics + - id: InflatableWallStack5 + - id: CableHVStack10 + - id: CableMVStack10 + - id: CableApcStack10 - !type:GroupSelector children: - - !type:EntSelector - id: ClothingHandsGlovesColorYellowBudget + - id: ClothingHandsGlovesColorYellowBudget weight: 5 - - !type:EntSelector - id: ClothingHandsGlovesFingerlessInsulated + - id: ClothingHandsGlovesFingerlessInsulated weight: 0.5 - - !type:EntSelector - id: ClothingHandsGlovesColorYellow + - id: ClothingHandsGlovesColorYellow weight: 1 # Uncommon Group - !type:GroupSelector weight: 23 children: - - !type:EntSelector - id: ClothingHeadHatCone + - id: ClothingHeadHatCone weight: 2 - - !type:EntSelector - id: BookRandomStory + - id: BookRandomStory weight: 0.25 - - !type:EntSelector - id: ToolboxElectricalFilled - - !type:EntSelector - id: ToolboxMechanicalFilled - - !type:EntSelector - id: ClothingBeltUtility - - !type:EntSelector - id: ToolboxArtisticFilled - - !type:EntSelector - id: GeigerCounter - - !type:EntSelector - id: trayScanner - - !type:EntSelector - id: HandheldGPSBasic - - !type:EntSelector - id: HandLabeler - - !type:EntSelector - id: GlowstickBase - - !type:EntSelector - id: Bucket - - !type:EntSelector - id: RadioHandheld - - !type:EntSelector - id: AppraisalTool - - !type:EntSelector - id: ModularReceiver - - !type:EntSelector - id: WeaponFlareGun - - !type:EntSelector - id: BarberScissors + - id: ToolboxElectricalFilled + - id: ToolboxMechanicalFilled + - id: ClothingBeltUtility + - id: ToolboxArtisticFilled + - id: GeigerCounter + - id: trayScanner + - id: HandheldGPSBasic + - id: HandLabeler + - id: GlowstickBase + - id: Bucket + - id: RadioHandheld + - id: AppraisalTool + - id: ModularReceiver + - id: WeaponFlareGun + - id: BarberScissors - !type:GroupSelector children: - - !type:EntSelector - id: DrinkSpaceGlue - - !type:EntSelector - id: DrinkSpaceLube + - id: DrinkSpaceGlue + - id: DrinkSpaceLube # Rare Group - !type:GroupSelector weight: 2 children: - - !type:EntSelector - id: LanternFlash - - !type:EntSelector - id: PowerCellHigh - - !type:EntSelector - id: NetProbeCartridge - - !type:EntSelector - id: WelderIndustrial - - !type:EntSelector - id: SheetPlasteel10 - - !type:EntSelector - id: ClothingMaskGasExplorer - - !type:EntSelector - id: TechnologyDisk - - !type:EntSelector - id: ResearchDisk5000 - - !type:EntSelector - id: PetCarrier - - !type:EntSelector - id: DrinkMopwataBottleRandom - - !type:EntSelector - id: LidSalami + - id: LanternFlash + - id: PowerCellHigh + - id: NetProbeCartridge + - id: WelderIndustrial + - id: SheetPlasteel10 + - id: ClothingMaskGasExplorer + - id: TechnologyDisk + - id: ResearchDisk5000 + - id: PetCarrier + - id: DrinkMopwataBottleRandom + - id: LidSalami weight: 0.05 - type: entity @@ -498,62 +310,38 @@ - !type:GroupSelector weight: 95 children: - - !type:EntSelector - id: Machete - - !type:EntSelector - id: BaseBallBat - - !type:EntSelector - id: CombatKnife - - !type:EntSelector - id: Spear - - !type:EntSelector - id: RifleStock - - !type:EntSelector - id: ModularReceiver - - !type:EntSelector - id: HydroponicsToolScythe + - id: Machete + - id: BaseBallBat + - id: CombatKnife + - id: Spear + - id: RifleStock + - id: ModularReceiver + - id: HydroponicsToolScythe # Rare Group - !type:GroupSelector weight: 5 children: - - !type:EntSelector - id: Lighter - - !type:EntSelector - id: Matchbox - - !type:EntSelector - id: ClothingEyesBlindfold - - !type:EntSelector - id: ClothingMaskMuzzle - - !type:EntSelector - id: ClothingMaskGasSecurity - - !type:EntSelector - id: ShardGlass + - id: Lighter + - id: Matchbox + - id: ClothingEyesBlindfold + - id: ClothingMaskMuzzle + - id: ClothingMaskGasSecurity + - id: ShardGlass weight: 2 - - !type:EntSelector - id: Syringe - - !type:EntSelector - id: Mousetrap + - id: Syringe + - id: Mousetrap - !type:GroupSelector weight: 2 children: - - !type:EntSelector - id: Brutepack1 - - !type:EntSelector - id: Ointment1 - - !type:EntSelector - id: Gauze1 - - !type:EntSelector - id: Bola - - !type:EntSelector - id: SurvivalKnife - - !type:EntSelector - id: ScalpelShiv - - !type:EntSelector - id: Shiv - - !type:EntSelector - id: SawImprov - - !type:EntSelector - id: HydroponicsToolMiniHoe + - id: Brutepack1 + - id: Ointment1 + - id: Gauze1 + - id: Bola + - id: SurvivalKnife + - id: ScalpelShiv + - id: Shiv + - id: SawImprov + - id: HydroponicsToolMiniHoe - type: entity name: Maint Loot Spawner From c812bd8ff4caef3057d8850fdd3907c3353bb339 Mon Sep 17 00:00:00 2001 From: Ubaser <134914314+UbaserB@users.noreply.github.com> Date: Sun, 11 Aug 2024 01:00:21 +1000 Subject: [PATCH 344/422] Partially revert light tube sprites (#29091) * add * reduce contrast --- .../Lighting/light_tube.rsi/base.png | Bin 1521 -> 1631 bytes .../Lighting/light_tube.rsi/broken.png | Bin 1670 -> 1801 bytes .../Lighting/light_tube.rsi/burned.png | Bin 1950 -> 2107 bytes .../Lighting/light_tube.rsi/empty.png | Bin 1564 -> 1574 bytes .../Lighting/light_tube.rsi/glow.png | Bin 1413 -> 1571 bytes .../Lighting/light_tube.rsi/meta.json | 2 +- 6 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/base.png index 02e8764173f9404834b32d7ee1b9e0511d96a1dd..68efd66a582da1c4f129ab15e03aa748ba2ca60f 100644 GIT binary patch delta 732 zcmV<20wewL3*QWoQV%Ga001bO0T((UvH$=BX0c(@0R&=Ub7hk_0#O4pHZ+rq0xttH zHZ+sG0=WiaVRL0XFOysY8IzO)HGfMvw@Ls20(eP8K~#7F?VG`F+CUJ7XOR_>!mDa4i?Cj3xk$1eacH*V! z^h@ELYSDF^IOnw7z3A>%?>)~SbG=>^rMTj$5XeD7d9k=FPxMN&hs5uG_L}H=2`L|y(9G0QE-N4M7 z$k2O8eneX+KOT<-xoRM`O23e0at*Mx`!6Tno8@p3P zsE}+Xz$TCm_U?4M;sGifbDq% z0Co9^Qx*&q@`b4rQmc$S!_1}Q?8GvQ+$<<^VK|S=)2;n-S z#H#D-hnxyvU(hfFWsm7#Ix7Gy58=bc7y={E5xUx%;4w(7BN>4R2s{JJqVUV;wmAO) O00001_r)4jO*6(sXhUlRk*r$F!3T zBy6KUIgVL!@-$}C`g;n~(-;_-csyMkLn;{G&NlQrY#`BEub!Cr>H%Zp4eipGr&xrA zq^pE%_;(hdLq zsN1+yO!CN_b?Wrz{4+P#^oZ6Uy{)>elp$g9?v$R1<;{Lv9PP_5-4;8-aOLcdcK1i3 zDh^D?y&N8HeSBnV?%%%E;g|1Uc=Jy}c)J4E>4>(&iI=};rP}lu-&t+;qt%+zEjoht zS;v-5C#BYjm?TeVHFRn!ZHVBiFE5ijU2*5b+$gDc&$K3Qzy4L>^=H8jmA=E3QdV;> zZ_2z@bvW?t%U+fTjKV%<)eZ)}Zv{`u;o?XoX3zF`W?4Ju=8ZF~XD`f4h?n2CEmM}S z<#=VDtg^M@BQw)oYm1KGe0D$dp!N|S2{ktz<#fr13R9kJajM>M`O!iXvr=Hlh6w*) Y@JgI)I_27=M+`vV>FVdQ&MBb@0KHumoB#j- diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/broken.png index 9d10428af8d2e1bffd1db9fa2a7c457e4560d1c2..04872006575d7af1175a013cc24edd8be262520e 100644 GIT binary patch delta 871 zcmV-t1DO1V4T%nrQV%Ga001bO0T((UvH$=BX0c(@0R&=Ub7hk_0#O4pHZ+rq0xttH zHZ+sG0=WiaVRL0XFOysY8IzO)HGfMvw@Ls210qR8K~#7F?VG=k(=ZgrpQDIYYH3w< zJNRGNVB-)2s7x$yonYgSU}S2K1(vH0Bm~FAZTv5cEiGwPH8)(~>)Z>r2|6JmyH`I; zX>BL5-}}Uke|%jkp6-H7=Ria2KrQ?lj4fk|yIzP*Geo>Ug73T$^9DfAFCzGQx zp>x81q-OP<+xhkMMX}jzs15`i$Mqb3-@BxCyREag4M4)i;`?wsR^Zvka-xeS=EwX{Lb4EeoUt*Ywb6d%Z}({jk25I6W%NdP!V^v@EN{u)i@vk4@%KZpef+s?jwXDzUssXGv8e7V*BNL zie`Y_V7$3$a^%aDF!f+~jetSY+v79RBSDOr89*4b{MCQTo45b~A;l;QW9(P}@WcrK zl=?0&!35)Lo=7Ze_W1d0oc?Qq?^QR5Cb93#wf&pquSS086#&lgXF|A|_yq_HDgfck z@n5s~u%iR8SS&2!7J!rY2Y;>}SeIY@#QuXrYZ1r-(Cv1wzK8$lK?UIS^Yfj5`gLq7 z0GJ-e63l;vQw_k(*mVfd5zJwK62lbOe5gDZz(a@c)la~@D5iLdwewh~!|+|N2*o-b zF3zXrf(ZWCN3@J$Nen`%sW9nx0G7q~ZtPVG>Mp+npb~3eFaF4>0kHPA%Z|IgvCkU7 xdcCIUbV@M@Bk&P_;xwnkE*wb0R(4kZ+DY80#O1vHIs}2F9JC= zlfDAE24`$ll>Zcf2 za=es?yYC>#cRJ4Z|J_AC-Tym>7E+_pP_0%=mkx(R+Ib$)#r0F2uT(033$^dFlgUJ9 zcDBbaX$lme@bZ2b=|Tu zkbVgPAs_^VfDjM@LO=+Uvu~PfSyvvi-*@FYdzU8NnuM}MBI8L(m z^5m2bz`T>J6#Up!b2SL*=)+63s#Sk}Nu-hyDHZ6^pKmu0gp>&ZAz&we0S7-jc=F;Q zQMUM<|1~7g%x!xd5QQ+7cDv2xMqjbc;GbIS19v>Ewh+n1M2sH#zv7@7i!7`&yyjjy z2@nm|?b;xp^zs@j%<*h>Y3;wjI2zH#RhR-m#5rtIPnCM|Tx%G6PnjWNIBOhqD=Q`sE;dMKo1#o~{hQ`ub+x zeIv`Tbq--Kp52hghnj^pIg^AIX@OUW9WZPLyKEWRbgqvmwL-hz7H3j6Zi};a fxe5UxU?+h)RWjYMBniHD00000NkvXXu0mjf%T8GU diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/burned.png index 160db7c5cbb9ef6e21a66640e34658c498b826fc..250db2b70445495b8c01dc7a867263daaa62b0f6 100644 GIT binary patch delta 1211 zcmV;s1VsCu54#YMQV%Ga001bO0T((UvH$=BX0c(@0R&=Ub7hk_0#O4pHZ+rq0xttH zHZ+sG0=WiaVRL0XFOysY8IzO)HGfMvw@Ls21XM{xK~#7F?ORJv8c`HJGxE>~G=fQG zO4|^5EeIxd-%XP)`UBe7q+M3qRr^o6t9IEYHSN9|moD7ZM7l9RqCp~B1Sx6+A58hq zc*y`ROPI{ulOQt}@11kLxvz7-a}+Yk!oo}4bjz2Ds*s{6eC_pk`+vUmzJGPm;&NR# zn$z1lp&baWS69CoH(WB>KQ8m*19t*6K0Z!Ryz#d|5AJ4Ze}A9i@i@6$E>cyMHa9o9 zN+=ZSR;^a6-D{Le&*}L1m;!+S6%R9nwjr&S0ZzBVh%b5o!26n%KsueK zcDqeeQ&SX)M5tUYQznz4Y=1UOA3x;>-s0;QAw3q0ah<)rJ*wC1G&?)n0f5No^KrXY z17N_2#ib?gw~a=Fo<6>yot+&@rBdW}yXoZQgqqDJ4+->=TrM{N#QV2#eQs`!j*gC~ zR;y7Wk)XA85BCJr`Mk0+@XQf+0{M7}fJ8tdAQ6xVNCYGT5&?;TM1MdcAQ6xVNCYGT z5&?;TL_i`S5s(N-1RR2Z1o>9+Pam90r>*{62uFrJ-^>imzS5c zy}eD*XtYbr;GM24FZbB2TIof@cyNpOfQUUkJ*85qM8#r}St-zNpx?|ogQ9!);is~( zu|a2NXAA=9J=6uQhkt9dCE67Li#B?=K~Xr$ZzwLLQmL@w;3h%IfvCk>e)T-aAiyXg zAZWo^&d<*?CwX;sMF$55Oz0A27!bj7i#qtW6aXM(%`|$Ulww^gCq}RJdSc`@I94ui zn22Uk{yW!Upu6<^eaaVsRf{TrDqKhYkqAfxdJs?$7UK{2d4Cz{Um|+`(?&O9CBU4c zV$#9di5XS=U?W=xOnI}o$V;u)>*Wd8Qu}}bZHG|MzZAL=H4M1ws_mpLZLGMWxa5yU+`d(!3zI1GQ@2muuYLm?8(?y|ePOV`)eyh|iX zkqcu2TTK+g>3^`hB$G+r7Q}5kN4fU^fPce9r-;aLU;uD~bGCj*!3kh= zdjJw4FhMv$%qPpd55P$(Qd^wR12E6wc)d_45DryUxWG6+4~N4{DA>IRAe#mDYMRFG zKMw(%p@V?1T0YM(UItQm^7%X`b)kJ1#ytvVW@c_kgke0^I&EUhk7TZ~u`!+X&h815*APs?zI zkkqK%(|9GYmb(968?1J0>rEmjPl96kbILvdunL0R(4kZ+DY80#O1vHIs}2F9JC= zlfDAE24`$L5-|pq3kzE4qR54{2to~Y3?u~?LDo$4 zrOr4wwMhzx=Joz}c*AIexR7z0cMrUIckX>3_x#?>yXT&Bu7Y*qcDuEImX;P#J2y9n zPwyY%Oye=QN=rpua4`sHfm4+Iem`CgPvP>#R!;6bJceW09diqi1w8G(V;6!yb zd_JFO|GE?fuR-NARn$~}9m~th12>z^CYo<_-3OIf7$z9f$-!>Dy;C9EW!JP!YcP---Y&+j6wuINxN|_T^h~v-6TT*SJ?h>9_iTRBx*c0IOr-BA^Lm0{W#T7h5W)o(JO}No0^+N zd1_`x?0F47{Y;KfrxB^Vl_VeutRtXs*fHudEq}-8*H-V7b+#A@QA}lNYirx;du8PH zXlHPEq-3NWkWOkAT3gKIGKi$}=G%2I>P#bxHi9r475y!Lpy@{OsE?U_*)PeavakgA zI;@Gbw(M6wt|3k3sp)C`9gr9U%%XZ+PbPjc`&BJ;=D_3eBxX})z>xe`w{UV1@P80l zo@P*bhSd*H3p_)9Pg0P0DX z8g)<11q`R686eP^$^{-`6yV3NpDTcgMgfPz39CK~QY;(=1|N@$)gWeg`i72t=Z)#> zn-X4OP7snUB;&wr+;bSDn|(p|Hmh9u)!yEoje2feN~bkZ6tnyS)=Y=Fu8$58y2M6( z-J7EJzaPYK867}$h**q8jRas8VXTk<7%@_fkP*L_MGRf3yXoEHW_jpRPf0)$NKN1` X5m!xVYUK-R00000NkvXXu0mjfwr}W8 diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/empty.png index 0f8f9478bd87f9c9547268c5e2a00f98b1940c6d..00c1236d7f6be3da9eece4fb49914097373ac94a 100644 GIT binary patch delta 647 zcmV;20(kwL45kc_QV%Ga001bO0T((UvH$=BX0c(@0R&=Ub7hk_0#O4pHZ+rq0xttH zHZ+sG0=WiaVRL0XFOysY8IzO)HGfMvw@Ls20zXMaK~#7F?VG`FfG?3>#QFDKu0>Aj`Rlrsw~}ZSIjjHfNzU@o=m*eYGtr!7~AdV)?rKS z!pFIGcpQ_D1RsBp00~?|pm9lxr}0=4ig6s9#k`sv;vkB$Fw9eP#l*}(X6O=av`L?umvrYmekQ4CmSd2csQ5+&%g`^_^t~q}`E;>Pw4-?wps&MGip%$8< zy;1i8*8r~%ZmF*ph6#iM79Bpc(Z%oedTn;ePNYG*(XrM=v43fT_M1BeicoyL%PKb9 z!aB4w0?OWByBHDB&IoYvmpw%jBj6NTF7C?+aPe0?MH3_76k0Cs%LurIzre>L7up#C z#Tk-gv|NAO4(-0oinyq*geGX0Sz$~NqTrmUDj`|Ie=WNpQL6udkuj2M0H($J4}GH< z)LMFWC8y9RTEAZ86aYFal&0yGx>28-{AFJAohTIm+wE3fYB3yfeiov002ovPDHLkV1ib{DU$#I delta 635 zcmV->0)+jh44e#*QV$NC000i00SA;*-2easWU*n>0R(4kZ+DY80#O1vHIs}2F9JC= zlfDAE24`$8xJ&w60u7~o|NQQN zmwWD%Y_&$Ck#xIVb9O$TOS`G%`DJZhm&@g?t9QR#EEeXCPU}o2(^zUjwVK3nEaUN5 zX0w^veV3cF!EbJrN@E?3Mwx={v~CjENAkY5odCixH1S4JB$dlj=GZHj=MsjWn@1>G z>&$j|Ba@H>9Fw2~34a_;Ad}{IxZC{}AkGd319Jhy+3R*mu9|n5;(VRnCQp-3saC5- zni~#>Kg8Lc+Ti~1PV){lNwnp1DerHYayR$CzkNs)#hXWJ&z#(P@)CfJF-a0pN=v`r zH!Aag<$2hF4G6P7E7Ue$9!Y=%PESDLXUDqrZT*goEAQj?oPPtmAPUP^dc9uWzPz-D zI>Y`n7JlJQfNBe?!7LFkyDaCRkTZ%b)Cd9A0cx$}qEeFk`ZJC;7wOJ3WOuT5qNLhas+tO6^;VY>vg&x z$dP}iZq0=0YH+o38iY&d_y=70?*R4qknZfl2B)kFjLTlk;v0$)L=&_Cdjc^bg56z3 zX^_jH7?}x?dcAH`6T4Ne2oRtZn$Q16G168tD$>3_n=5iJ{IqxxMm%#Q0TS3x;0uKl Vrvl)h&W`{9002ovPDHLkV1jx7CnEp= diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/glow.png index e1258d83dc3c4702670dbf5f63869fc3c3bd76e6..43816df0cea9ad7b76919aa1eb9a376635456412 100644 GIT binary patch delta 671 zcmZqWUd%Hgh+ktC1B1paMsX{}O$-doX&VzSGqNNl7N<_OUe_b}~b z14-EEPmW=hoIHiuwBFltyB7lklZ~f~V@L(#+u7FsOpXG_)BS}-w`|z(QBZ>=N$KJt zFKOLBY+-c{+J9L@f&wEmuCQ2eb@m@Sbg2B`T61rOhVtW1eUBsl1{l0Gzkk!JpEi?2bYd=?dncE>#E<#-$CnC|_NUi3yG6!%2CIGc zJK37}MLh4eOrd|>a=jfli3Npo*sf}Q-!kpo<)ozh*U#;ns2G+q=g=%`XP22e*>2u%58PM~#;?5Q%eP++ zSF>h@1+QbDAXA}odtHFiPLl#_69z^BAexcIw0KrmpYW>rzW>#n68#;IXO_Ib5w~q+ zr$Bmhq0!_8Y}-$MF*8|t=5qG7cJ;_PdzaNS6llq$H*ZYY{^`~AE2q16Z%cS6sn#8( zVj$|*`uL2Vx%Qc_4foYAf2y2yzhP(T@rm0~BftE7yQ6yv^Tn^c0(V_qPi*0qzCYy| z)5cJvvwpeN3=Yy$7m7Y)Y}*%+yZHg*tra|LIrt5}9L<`|%74KvHRI^Y&kUNoA9H6} z#^}sh%^c(RXOeF`-|eT-PfyF3BnC44$cVnvgr%Z}K@3*szgFf-w;JT- z?Bd{>vTf>@+YUM5GY&`#=gvBConfjY1Ir_~2mG_nwM2Y$`~QUj2s~Z=T-G@yGywpR C6C}L= delta 512 zcmZ3?)5<*|h@Wo`0|Vb2M)oPecNrL%Q#K}EW@Jgv$uFO5!4$}3X*#)wNgqV*W7^3E z61LHw9LFp0X$%aE3p`yMLn;{G&OYdO*np?)vEJlkbH#5s7qFa@sfgm6 z^YE1O2c|iUnR9#Yn%-KGp|m#h*(Cc}Qo7zrzrAloZuHJuVqkw?z;@5accu21mgc8D ze{xxLlD73;IWED=zw$(%ah;u(H9zE7{o6^kVs{jI6ZS`LsLZ_Df4j8)!t|dnZ&~h_ zHJSf&Ypr_KAB*A-YYw|HuDHV7^77MKDf_!dXBe0i@SqJkOc#?sde07e6md_dA*gX? zNyeL`+XwP@Kgjw0$<~$i(|2j!bEjnL-Inn%zc?G`yUG6KIlG2$S+d)e#rUbQD41rRf^_bh6N&-tBW=;uUY4#xpxDz*TijF?qv=h-?p!MG^c7~w$}D|hLE^f zlf`3RIV(Cc?qxl5j4dr*aHH(@18?l7^m0!~XSn*?USnHz?RtHkOCL5UZ27-E>Tv2o oHJMIUp%sn{EDj7TS}GrygM)GwZ9H^t83Pb_y85}Sb4q9e02oi%rT_o{ diff --git a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json index 4b8aa5fa2f..d9fbbe0baf 100644 --- a/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/Lighting/light_tube.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "copyright": "Taken from commit https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/lighting.dmi and edited by Ubaser.", "size": { "x": 32, "y": 32 From 53058df8b98af09c7dccdb78587867f2363fd4ca Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 10 Aug 2024 15:01:27 +0000 Subject: [PATCH 345/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 9c56822fa5..1550ef6c1d 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Dutch-VanDerLinde - changes: - - message: Fix firesuits, ninja suits, and some armor not allowing suit storage. - type: Fix - id: 6581 - time: '2024-05-11T02:20:18.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27897 - author: ike709 changes: - message: UIs can now link to a Guidebook entry via a help button in the top right @@ -3791,3 +3784,10 @@ id: 7080 time: '2024-08-10T12:55:20.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30855 +- author: Ubaser + changes: + - message: Light tube structures now have new sprites. + type: Tweak + id: 7081 + time: '2024-08-10T15:00:22.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29091 From fc1446e73ac7da49c38f0683eed221747ebdd8f4 Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Sat, 10 Aug 2024 11:14:58 -0400 Subject: [PATCH 346/422] Cursed Mask (#29659) * Cursed Mask * extra expressions * block ingestion * mind returning * okay fix the removal shit --- .../Clothing/Systems/CursedMaskSystem.cs | 6 ++ .../Clothing/Systems/CursedMaskSystem.cs | 92 ++++++++++++++++++ .../Components/CursedMaskComponent.cs | 65 +++++++++++++ .../Clothing/SharedCursedMaskSystem.cs | 73 ++++++++++++++ .../Inventory/Events/UnequipAttemptEvent.cs | 6 ++ .../Inventory/SelfEquipOnlyComponent.cs | 16 +++ .../Inventory/SelfEquipOnlySystem.cs | 45 +++++++++ .../Systems/MovementSpeedModifierSystem.cs | 5 + .../NPC/Systems/NpcFactionSystem.cs | 22 +++++ .../en-US/clothing/components/cursed-mask.ftl | 5 + .../Entities/Clothing/Masks/specific.yml | 38 ++++++++ .../Mask/goldenmask.rsi/equipped-MASK-vox.png | Bin 0 -> 453 bytes .../Mask/goldenmask.rsi/equipped-MASK.png | Bin 0 -> 401 bytes .../Mask/goldenmask.rsi/icon-anger.png | Bin 0 -> 422 bytes .../Mask/goldenmask.rsi/icon-despair.png | Bin 0 -> 414 bytes .../Clothing/Mask/goldenmask.rsi/icon-joy.png | Bin 0 -> 414 bytes .../Clothing/Mask/goldenmask.rsi/icon.png | Bin 0 -> 402 bytes .../Mask/goldenmask.rsi/inhand-left.png | Bin 0 -> 360 bytes .../Mask/goldenmask.rsi/inhand-right.png | Bin 0 -> 353 bytes .../Clothing/Mask/goldenmask.rsi/meta.json | 39 ++++++++ 20 files changed, 412 insertions(+) create mode 100644 Content.Client/Clothing/Systems/CursedMaskSystem.cs create mode 100644 Content.Server/Clothing/Systems/CursedMaskSystem.cs create mode 100644 Content.Shared/Clothing/Components/CursedMaskComponent.cs create mode 100644 Content.Shared/Clothing/SharedCursedMaskSystem.cs create mode 100644 Content.Shared/Inventory/SelfEquipOnlyComponent.cs create mode 100644 Content.Shared/Inventory/SelfEquipOnlySystem.cs create mode 100644 Resources/Locale/en-US/clothing/components/cursed-mask.ftl create mode 100644 Resources/Textures/Clothing/Mask/goldenmask.rsi/equipped-MASK-vox.png create mode 100644 Resources/Textures/Clothing/Mask/goldenmask.rsi/equipped-MASK.png create mode 100644 Resources/Textures/Clothing/Mask/goldenmask.rsi/icon-anger.png create mode 100644 Resources/Textures/Clothing/Mask/goldenmask.rsi/icon-despair.png create mode 100644 Resources/Textures/Clothing/Mask/goldenmask.rsi/icon-joy.png create mode 100644 Resources/Textures/Clothing/Mask/goldenmask.rsi/icon.png create mode 100644 Resources/Textures/Clothing/Mask/goldenmask.rsi/inhand-left.png create mode 100644 Resources/Textures/Clothing/Mask/goldenmask.rsi/inhand-right.png create mode 100644 Resources/Textures/Clothing/Mask/goldenmask.rsi/meta.json diff --git a/Content.Client/Clothing/Systems/CursedMaskSystem.cs b/Content.Client/Clothing/Systems/CursedMaskSystem.cs new file mode 100644 index 0000000000..bc931d15fd --- /dev/null +++ b/Content.Client/Clothing/Systems/CursedMaskSystem.cs @@ -0,0 +1,6 @@ +using Content.Shared.Clothing; + +namespace Content.Client.Clothing.Systems; + +/// +public sealed class CursedMaskSystem : SharedCursedMaskSystem; diff --git a/Content.Server/Clothing/Systems/CursedMaskSystem.cs b/Content.Server/Clothing/Systems/CursedMaskSystem.cs new file mode 100644 index 0000000000..2045ff5ccd --- /dev/null +++ b/Content.Server/Clothing/Systems/CursedMaskSystem.cs @@ -0,0 +1,92 @@ +using Content.Server.Administration.Logs; +using Content.Server.GameTicking; +using Content.Server.Mind; +using Content.Server.NPC; +using Content.Server.NPC.HTN; +using Content.Server.NPC.Systems; +using Content.Server.Popups; +using Content.Shared.Clothing; +using Content.Shared.Clothing.Components; +using Content.Shared.Database; +using Content.Shared.NPC.Components; +using Content.Shared.NPC.Systems; +using Content.Shared.Players; +using Content.Shared.Popups; +using Robust.Shared.Player; +using Robust.Shared.Prototypes; + +namespace Content.Server.Clothing.Systems; + +/// +public sealed class CursedMaskSystem : SharedCursedMaskSystem +{ + [Dependency] private readonly IAdminLogManager _adminLog = default!; + [Dependency] private readonly GameTicker _ticker = default!; + [Dependency] private readonly HTNSystem _htn = default!; + [Dependency] private readonly MindSystem _mind = default!; + [Dependency] private readonly NPCSystem _npc = default!; + [Dependency] private readonly NpcFactionSystem _npcFaction = default!; + [Dependency] private readonly PopupSystem _popup = default!; + + // We can't store this info on the component easily + private static readonly ProtoId TakeoverRootTask = "SimpleHostileCompound"; + + protected override void TryTakeover(Entity ent, EntityUid wearer) + { + if (ent.Comp.CurrentState != CursedMaskExpression.Anger) + return; + + if (TryComp(wearer, out var actor) && actor.PlayerSession.GetMind() is { } mind) + { + var session = actor.PlayerSession; + if (!_ticker.OnGhostAttempt(mind, false)) + return; + + ent.Comp.StolenMind = mind; + + _popup.PopupEntity(Loc.GetString("cursed-mask-takeover-popup"), wearer, session, PopupType.LargeCaution); + _adminLog.Add(LogType.Action, + LogImpact.Extreme, + $"{ToPrettyString(wearer):player} had their body taken over and turned into an enemy through the cursed mask {ToPrettyString(ent):entity}"); + } + + var npcFaction = EnsureComp(wearer); + ent.Comp.OldFactions = npcFaction.Factions; + _npcFaction.ClearFactions((wearer, npcFaction), false); + _npcFaction.AddFaction((wearer, npcFaction), ent.Comp.CursedMaskFaction); + + ent.Comp.HasNpc = !EnsureComp(wearer, out var htn); + htn.RootTask = new HTNCompoundTask { Task = TakeoverRootTask }; + htn.Blackboard.SetValue(NPCBlackboard.Owner, wearer); + _npc.WakeNPC(wearer, htn); + _htn.Replan(htn); + } + + protected override void OnClothingUnequip(Entity ent, ref ClothingGotUnequippedEvent args) + { + // If we are taking off the cursed mask + if (ent.Comp.CurrentState == CursedMaskExpression.Anger) + { + if (ent.Comp.HasNpc) + RemComp(args.Wearer); + + var npcFaction = EnsureComp(args.Wearer); + _npcFaction.RemoveFaction((args.Wearer, npcFaction), ent.Comp.CursedMaskFaction, false); + _npcFaction.AddFactions((args.Wearer, npcFaction), ent.Comp.OldFactions); + + ent.Comp.HasNpc = false; + ent.Comp.OldFactions.Clear(); + + if (Exists(ent.Comp.StolenMind)) + { + _mind.TransferTo(ent.Comp.StolenMind.Value, args.Wearer); + _adminLog.Add(LogType.Action, + LogImpact.Extreme, + $"{ToPrettyString(args.Wearer):player} was restored to their body after the removal of {ToPrettyString(ent):entity}."); + ent.Comp.StolenMind = null; + } + } + + RandomizeCursedMask(ent, args.Wearer); + } +} diff --git a/Content.Shared/Clothing/Components/CursedMaskComponent.cs b/Content.Shared/Clothing/Components/CursedMaskComponent.cs new file mode 100644 index 0000000000..6073bdf5fc --- /dev/null +++ b/Content.Shared/Clothing/Components/CursedMaskComponent.cs @@ -0,0 +1,65 @@ +using Content.Shared.Damage; +using Content.Shared.NPC.Prototypes; +using Robust.Shared.GameStates; +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization; + +namespace Content.Shared.Clothing.Components; + +/// +/// This is used for a mask that takes over the host when worn. +/// +[RegisterComponent, NetworkedComponent, Access(typeof(SharedCursedMaskSystem))] +public sealed partial class CursedMaskComponent : Component +{ + /// + /// The current expression shown. Used to determine which effect is applied. + /// + [DataField] + public CursedMaskExpression CurrentState = CursedMaskExpression.Neutral; + + /// + /// Speed modifier applied when the "Joy" expression is present. + /// + [DataField] + public float JoySpeedModifier = 1.15f; + + /// + /// Damage modifier applied when the "Despair" expression is present. + /// + [DataField] + public DamageModifierSet DespairDamageModifier = new(); + + /// + /// Whether or not the mask is currently attached to an NPC. + /// + [DataField] + public bool HasNpc; + + /// + /// The mind that was booted from the wearer when the mask took over. + /// + [DataField] + public EntityUid? StolenMind; + + [DataField] + public ProtoId CursedMaskFaction = "SimpleHostile"; + + [DataField] + public HashSet> OldFactions = new(); +} + +[Serializable, NetSerializable] +public enum CursedMaskVisuals : byte +{ + State +} + +[Serializable, NetSerializable] +public enum CursedMaskExpression : byte +{ + Neutral, + Joy, + Despair, + Anger +} diff --git a/Content.Shared/Clothing/SharedCursedMaskSystem.cs b/Content.Shared/Clothing/SharedCursedMaskSystem.cs new file mode 100644 index 0000000000..8ba83be151 --- /dev/null +++ b/Content.Shared/Clothing/SharedCursedMaskSystem.cs @@ -0,0 +1,73 @@ +using Content.Shared.Clothing.Components; +using Content.Shared.Damage; +using Content.Shared.Examine; +using Content.Shared.Inventory; +using Content.Shared.Movement.Systems; +using Robust.Shared.Random; +using Robust.Shared.Timing; + +namespace Content.Shared.Clothing; + +/// +/// This handles +/// +public abstract class SharedCursedMaskSystem : EntitySystem +{ + [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private readonly MovementSpeedModifierSystem _movementSpeedModifier = default!; + + /// + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnClothingEquip); + SubscribeLocalEvent(OnClothingUnequip); + SubscribeLocalEvent(OnExamine); + + SubscribeLocalEvent>(OnMovementSpeedModifier); + SubscribeLocalEvent>(OnModifyDamage); + } + + private void OnClothingEquip(Entity ent, ref ClothingGotEquippedEvent args) + { + RandomizeCursedMask(ent, args.Wearer); + TryTakeover(ent, args.Wearer); + } + + protected virtual void OnClothingUnequip(Entity ent, ref ClothingGotUnequippedEvent args) + { + RandomizeCursedMask(ent, args.Wearer); + } + + private void OnExamine(Entity ent, ref ExaminedEvent args) + { + args.PushMarkup(Loc.GetString($"cursed-mask-examine-{ent.Comp.CurrentState.ToString()}")); + } + + private void OnMovementSpeedModifier(Entity ent, ref InventoryRelayedEvent args) + { + if (ent.Comp.CurrentState == CursedMaskExpression.Joy) + args.Args.ModifySpeed(ent.Comp.JoySpeedModifier); + } + + private void OnModifyDamage(Entity ent, ref InventoryRelayedEvent args) + { + if (ent.Comp.CurrentState == CursedMaskExpression.Despair) + args.Args.Damage = DamageSpecifier.ApplyModifierSet(args.Args.Damage, ent.Comp.DespairDamageModifier); + } + + protected void RandomizeCursedMask(Entity ent, EntityUid wearer) + { + var random = new System.Random((int) _timing.CurTick.Value); + ent.Comp.CurrentState = random.Pick(Enum.GetValues()); + _appearance.SetData(ent, CursedMaskVisuals.State, ent.Comp.CurrentState); + _movementSpeedModifier.RefreshMovementSpeedModifiers(wearer); + } + + protected virtual void TryTakeover(Entity ent, EntityUid wearer) + { + + } +} diff --git a/Content.Shared/Inventory/Events/UnequipAttemptEvent.cs b/Content.Shared/Inventory/Events/UnequipAttemptEvent.cs index d8d0a2a23b..b647ee8e92 100644 --- a/Content.Shared/Inventory/Events/UnequipAttemptEvent.cs +++ b/Content.Shared/Inventory/Events/UnequipAttemptEvent.cs @@ -17,6 +17,11 @@ public abstract class UnequipAttemptEventBase : CancellableEntityEventArgs /// public readonly EntityUid Equipment; + /// + /// The slotFlags of the slot this item is being removed from. + /// + public readonly SlotFlags SlotFlags; + /// /// The slot the entity is being unequipped from. /// @@ -33,6 +38,7 @@ public abstract class UnequipAttemptEventBase : CancellableEntityEventArgs UnEquipTarget = unEquipTarget; Equipment = equipment; Unequipee = unequipee; + SlotFlags = slotDefinition.SlotFlags; Slot = slotDefinition.Name; } } diff --git a/Content.Shared/Inventory/SelfEquipOnlyComponent.cs b/Content.Shared/Inventory/SelfEquipOnlyComponent.cs new file mode 100644 index 0000000000..ee1980ef8a --- /dev/null +++ b/Content.Shared/Inventory/SelfEquipOnlyComponent.cs @@ -0,0 +1,16 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.Inventory; + +/// +/// This is used for an item that can only be equipped/unequipped by the user. +/// +[RegisterComponent, NetworkedComponent, Access(typeof(SelfEquipOnlySystem))] +public sealed partial class SelfEquipOnlyComponent : Component +{ + /// + /// Whether or not the self-equip only condition requires the person to be conscious. + /// + [DataField] + public bool UnequipRequireConscious = true; +} diff --git a/Content.Shared/Inventory/SelfEquipOnlySystem.cs b/Content.Shared/Inventory/SelfEquipOnlySystem.cs new file mode 100644 index 0000000000..2bd113e22b --- /dev/null +++ b/Content.Shared/Inventory/SelfEquipOnlySystem.cs @@ -0,0 +1,45 @@ +using Content.Shared.ActionBlocker; +using Content.Shared.Clothing.Components; +using Content.Shared.Inventory.Events; + +namespace Content.Shared.Inventory; + +public sealed class SelfEquipOnlySystem : EntitySystem +{ + [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!; + + /// + public override void Initialize() + { + SubscribeLocalEvent(OnBeingEquipped); + SubscribeLocalEvent(OnBeingUnequipped); + } + + private void OnBeingEquipped(Entity ent, ref BeingEquippedAttemptEvent args) + { + if (args.Cancelled) + return; + + if (TryComp(ent, out var clothing) && (clothing.Slots & args.SlotFlags) == SlotFlags.NONE) + return; + + if (args.Equipee != args.EquipTarget) + args.Cancel(); + } + + private void OnBeingUnequipped(Entity ent, ref BeingUnequippedAttemptEvent args) + { + if (args.Cancelled) + return; + + if (args.Unequipee == args.UnEquipTarget) + return; + + if (TryComp(ent, out var clothing) && (clothing.Slots & args.SlotFlags) == SlotFlags.NONE) + return; + + if (ent.Comp.UnequipRequireConscious && !_actionBlocker.CanConsciouslyPerformAction(args.UnEquipTarget)) + return; + args.Cancel(); + } +} diff --git a/Content.Shared/Movement/Systems/MovementSpeedModifierSystem.cs b/Content.Shared/Movement/Systems/MovementSpeedModifierSystem.cs index 7c793d5eb8..8e89e4b62b 100644 --- a/Content.Shared/Movement/Systems/MovementSpeedModifierSystem.cs +++ b/Content.Shared/Movement/Systems/MovementSpeedModifierSystem.cs @@ -69,5 +69,10 @@ namespace Content.Shared.Movement.Systems WalkSpeedModifier *= walk; SprintSpeedModifier *= sprint; } + + public void ModifySpeed(float mod) + { + ModifySpeed(mod, mod); + } } } diff --git a/Content.Shared/NPC/Systems/NpcFactionSystem.cs b/Content.Shared/NPC/Systems/NpcFactionSystem.cs index 355f5bbb3a..98f14afe2a 100644 --- a/Content.Shared/NPC/Systems/NpcFactionSystem.cs +++ b/Content.Shared/NPC/Systems/NpcFactionSystem.cs @@ -100,6 +100,28 @@ public sealed partial class NpcFactionSystem : EntitySystem RefreshFactions((ent, ent.Comp)); } + /// + /// Adds this entity to the particular faction. + /// + public void AddFactions(Entity ent, HashSet> factions, bool dirty = true) + { + ent.Comp ??= EnsureComp(ent); + + foreach (var faction in factions) + { + if (!_proto.HasIndex(faction)) + { + Log.Error($"Unable to find faction {faction}"); + continue; + } + + ent.Comp.Factions.Add(faction); + } + + if (dirty) + RefreshFactions((ent, ent.Comp)); + } + /// /// Removes this entity from the particular faction. /// diff --git a/Resources/Locale/en-US/clothing/components/cursed-mask.ftl b/Resources/Locale/en-US/clothing/components/cursed-mask.ftl new file mode 100644 index 0000000000..c93a6cfb87 --- /dev/null +++ b/Resources/Locale/en-US/clothing/components/cursed-mask.ftl @@ -0,0 +1,5 @@ +cursed-mask-examine-Neutral = It depicts an entirely unremarkable visage. +cursed-mask-examine-Joy = It depicts a face basking in joy. +cursed-mask-examine-Despair = It depicts a face wraught with despair. +cursed-mask-examine-Anger = It depicts a furious expression locked in rage. +cursed-mask-takeover-popup = The mask seizes control over your body! diff --git a/Resources/Prototypes/Entities/Clothing/Masks/specific.yml b/Resources/Prototypes/Entities/Clothing/Masks/specific.yml index c3a07fa8e9..64a1adcebd 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/specific.yml @@ -62,3 +62,41 @@ - type: HideLayerClothing slots: - Snout + +- type: entity + parent: ClothingMaskBase + id: ClothingMaskGoldenCursed + name: golden mask + description: Previously used in strange pantomimes, after one of the actors went mad on stage these masks have avoided use. You swear its face contorts when you're not looking. + components: + - type: Sprite + sprite: Clothing/Mask/goldenmask.rsi + layers: + - state: icon + map: [ "mask" ] + - type: Clothing + sprite: Clothing/Mask/goldenmask.rsi + - type: Appearance + - type: GenericVisualizer + visuals: + enum.CursedMaskVisuals.State: + mask: + Neutral: { state: icon } + Despair: { state: icon-despair } + Joy: { state: icon-joy } + Anger: { state: icon-anger } + - type: Tag + tags: [] # ignore "WhitelistChameleon" tag + - type: SelfEquipOnly + - type: CursedMask + despairDamageModifier: + coefficients: + Blunt: 0.6 + Slash: 0.6 + Piercing: 0.4 + - type: HideLayerClothing + slots: + - Snout + - type: IngestionBlocker + - type: StaticPrice + price: 5000 diff --git a/Resources/Textures/Clothing/Mask/goldenmask.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/goldenmask.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..1b4db3d093f3ce403532aad2a62ec4e9f8ad84d7 GIT binary patch literal 453 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z>pfi@Ln`LH zz2)84Y{0{oU_9&hh6dO3mt8G_Bfi+^oM;kG6`OY2nP;&|nY-YB^@VH!!jD*1yb^HS zcQbg+-oN^1+14^AUHn&muC?MgZ|U18Ik&8$S6UbO<@1dFMAH2Y{r1eAy7sodWxd)< zF^PDaSBW>}`MKrg<5!+to+)=-`QP=Q#-5AhpBCC#6HS>P zxtLVzouBtTd#WhI&ga|bZ}s9jU=SqCH2rC#2LC>Rf6qfBv|cyuU3{bTPUg=w8$Y}5 zd0f8#kHD^_(dBYLe?q`Lol8%`R(@Y|bI;xC^X`;E&}P{}&-u?S>aHuX ru9st2^tW}I4RhYkcQBVRF!=ms5dXPZm)qYlA0+7M>gTe~DWM4fti--h literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/goldenmask.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/goldenmask.rsi/equipped-MASK.png new file mode 100644 index 0000000000000000000000000000000000000000..d1353c49800fd1c34bbec12e444e800b915cf49e GIT binary patch literal 401 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zy**tVLn`LH zy=7Q*SV5rm;c}mMilrQw59xWZdaN*K zTe|mn{bsIPT9Vg3imNZ+h&%c9XXNeUQS$DkXPcM#FE!M#t=iVLf5~6-?(hRIb$0&S zclPVfy{&l_F<vY;i1E_j_xbB5vjaT>0t*g_eP>yd6eiyv&6jlAaE+Hk zPbI_l<0)$+j>b)GI3#~7ZVJ$8@;Sev<~9_CF9;RNQ~&>Wo)hn6Q33Up(mGXDe&#o1 zkMEBz33|sJqcth6G$Lx%`#HW}RTr}y(X5{mSL;*vvie?{m}kV)2BQU=)T96Mp5n5Y o`~Sqnnh&|}*|+w=9PPx$U`a$lR9J=WRy!7hAP^k#avuvUJWmQelNLFTg%qBM6l8TJd=?Umyyr9q#GL_V z2*8CeVQ1KHzQ6rS$ms$?Gqp3US>x}1Dj-G_0tu7gE)@`h>Y(flt2(IK8vo;g5Kjqq+q_>YLhN3D*1mvHza$;m0shibaU$fi325!wF%hB^Xzhv-K|27d+sV!9+U>9lA@UrOCZvdPdF*aTFNU$_7OFJ?WsQYw_3 QuK)l507*qoM6N<$g6~we=>Px# literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/goldenmask.rsi/icon-despair.png b/Resources/Textures/Clothing/Mask/goldenmask.rsi/icon-despair.png new file mode 100644 index 0000000000000000000000000000000000000000..71bdd72fc6fe15a98498be51aa83c4dd9641188b GIT binary patch literal 414 zcmV;P0b%}$P)Px$SV=@dR9J=WRy(r8APihG?>;U_;q$!0K2uWUJZ@C@M7)Agka>IrI7Mc>Gnv>5 z(XPY_8@MnCx5174|8|y;j|)gu>NYsq^S_-cAV-t}3)A37DFB=fStG$EgKvT7pWvHV}l zF`^@Jsrsq_32r4P1&-SxwoFOR8qsk?bL)o%0KobTNx2)Td%3QLp*JEPJ-~ON z2kj=LKpvk1(kEJUy~{loIC(GufxM;t-2$YDw}1}v3l{+359rLWDLe&DK>z>%07*qo IM6N<$f=9Ek8UO$Q literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/goldenmask.rsi/icon-joy.png b/Resources/Textures/Clothing/Mask/goldenmask.rsi/icon-joy.png new file mode 100644 index 0000000000000000000000000000000000000000..93d0e26ddd995f797956bdedadd6c3886a852472 GIT binary patch literal 414 zcmV;P0b%}$P)Px$SV=@dR9J=WRxy%;FbrJZh=EfO+bmPR!o%#WC8qjBT=KpvtTt~wE%z3k2!7?VO|0yljXJY_^S6QaWRV9C!ShP z%vHv59_O}cR)D%(1n7U?NmEer=?-|mj#DB`OW^&QOv!J<`eQPV$+D4`kTs#6bX>Iv z@EG6U)tJaDajyEJ0ESMbCI!+Suo@7sEu*AZJvSK05|sAp)}pMXDUq33Vq*_x2hWs)0Q;e<2>f~N@)Hf zvNoo}1+WidQuc`zP2X~3kH7~Llh;gtvj7(HC!m4+#0da+0uW26unb2>O#lD@07*qo IM6N<$g8zoFF#rGn literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/goldenmask.rsi/icon.png b/Resources/Textures/Clothing/Mask/goldenmask.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..1da86e3c821b218b25d19b67a700f505e9d9410b GIT binary patch literal 402 zcmV;D0d4+?P)Px$Oi4sRR9J=WRa0492Q9{P> zLnOs{OCvI$zqbBJr3Iv=qF0f_dLnH=^EjNVJ=f%0|oiq=v4$ w+;m0Y9-oqrx3)dIFOw|dEue#Z#|{8^0z3MuXv#n8!~g&Q07*qoM6N<$f@_bkmjD0& literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/goldenmask.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/goldenmask.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..3ce2895a3976461d1346d46c0044f2d76a6e9cd1 GIT binary patch literal 360 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zl{{S>Ln`LH zz2%s7*g&B5q36rmT?OY;=6l9{v5AW4o|CaFpncZ_0h7uy?!Wd1H=25m1$}Tk&jU0D z2t00f{X9{zZQiZZl9T^%$DPf8JL~!#zqI=A*{5>eZH+g4c6HC0o#LHUzoWYB_yy0_ z{bgQMc;9Qkd~8eg*S;6A-*_{^H@`faqy4v1`|r-!(yx65fudTQf11qP`ps7C{Anw@ z^J}YSTJ?KyyIofN{ptIwz54YvjAyDY7p}iySZWJ#0|Uc?(qlLGY4tnUJ>W=}NnQP! zLuexZi8Lm+6`wh@Uiuv1NR@jSdUZU)g+<%{X}gP#a4;S}8b`TU2I{0s+#?HE^fU)9Wcd2kxYK2KLamvv4FO#m{p Bpb-E7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/goldenmask.rsi/inhand-right.png b/Resources/Textures/Clothing/Mask/goldenmask.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..ba7133027623e415e20fb05a1efb229af3b12553 GIT binary patch literal 353 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zr9E97Ln`LH zy=5rWWFXM`aQWj}oedvc3YG;_$Z>1f1nNBM>sWMzQ{~K`_|$-#(?vIUr~r)s0*6Ug zEPu{;y!6-9^8H~G&VIc9{amTvzsnyd{hfRL>iWrFuN#z=-sF`?|EIm)_g~@v2<1Jo zjIHL1TJN72FWB#SHSkr8M7dti@90klJdZxR>$~@1*3VUwe*LRFbIjNJ@7_CY`@hZE z6R)1+Yp~QmuIlgY*^|FNPid3Yt^IWA+b1T76Bq(k&8cRaw(8)&1_{gWJUXF|1wKFg zCe-xiT;j=-PFts|E~;Ip>ls!b3Y6^0UT#x<#aQ9_yvD@0Q?@%_SvsZo{DB>1tEw)l xpWK&5w#_QSZ4@T!+`^TuzXnlL{nTISlL|H+$dAj Date: Sat, 10 Aug 2024 17:19:28 +0200 Subject: [PATCH 347/422] Fix some locales (#30860) * Fix some locales * forgor --- Resources/Locale/en-US/actions/actions/disarm-action.ftl | 2 +- Resources/Locale/en-US/chat/managers/chat-manager.ftl | 4 ++-- Resources/Locale/en-US/glue/glue.ftl | 2 +- .../en-US/kitchen/components/kitchen-spike-component.ftl | 2 +- Resources/Locale/en-US/lube/lube.ftl | 4 ++-- Resources/Locale/en-US/power/components/generator.ftl | 2 +- .../en-US/storage/components/secret-stash-component.ftl | 2 +- Resources/Locale/en-US/wieldable/wieldable-component.ftl | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Resources/Locale/en-US/actions/actions/disarm-action.ftl b/Resources/Locale/en-US/actions/actions/disarm-action.ftl index 1b2cb49601..550c984bf5 100644 --- a/Resources/Locale/en-US/actions/actions/disarm-action.ftl +++ b/Resources/Locale/en-US/actions/actions/disarm-action.ftl @@ -1,4 +1,4 @@ -disarm-action-disarmable = {THE($targetName)} is not disarmable! +disarm-action-disarmable = {CAPITALIZE(THE($targetName))} is not disarmable! disarm-action-popup-message-other-clients = {CAPITALIZE(THE($performerName))} disarmed {THE($targetName)}! disarm-action-popup-message-cursor = Disarmed {THE($targetName)}! disarm-action-shove-popup-message-other-clients = {CAPITALIZE(THE($performerName))} shoves {THE($targetName)}! diff --git a/Resources/Locale/en-US/chat/managers/chat-manager.ftl b/Resources/Locale/en-US/chat/managers/chat-manager.ftl index 75ff4351c1..59b927742b 100644 --- a/Resources/Locale/en-US/chat/managers/chat-manager.ftl +++ b/Resources/Locale/en-US/chat/managers/chat-manager.ftl @@ -30,8 +30,8 @@ chat-manager-entity-whisper-unknown-wrap-message = [font size=11][italic][Bubble # THE() is not used here because the entity and its name can technically be disconnected if a nameOverride is passed... chat-manager-entity-me-wrap-message = [italic]{ PROPER($entity) -> - *[false] the {$entityName} {$message}[/italic] - [true] {$entityName} {$message}[/italic] + *[false] The {$entityName} {$message}[/italic] + [true] {CAPITALIZE($entityName)} {$message}[/italic] } chat-manager-entity-looc-wrap-message = LOOC: [bold]{$entityName}:[/bold] {$message} diff --git a/Resources/Locale/en-US/glue/glue.ftl b/Resources/Locale/en-US/glue/glue.ftl index 158ebc9ed8..bbed168267 100644 --- a/Resources/Locale/en-US/glue/glue.ftl +++ b/Resources/Locale/en-US/glue/glue.ftl @@ -1,4 +1,4 @@ -glue-success = {THE($target)} has been covered in glue! +glue-success = { CAPITALIZE(THE($target))} has been covered in glue! glued-name-prefix = glued {$baseName} glue-failure = Can't cover {THE($target)} in glue! glue-verb-text = Apply Glue diff --git a/Resources/Locale/en-US/kitchen/components/kitchen-spike-component.ftl b/Resources/Locale/en-US/kitchen/components/kitchen-spike-component.ftl index 9fd80dbf9c..b2ceffc6aa 100644 --- a/Resources/Locale/en-US/kitchen/components/kitchen-spike-component.ftl +++ b/Resources/Locale/en-US/kitchen/components/kitchen-spike-component.ftl @@ -3,7 +3,7 @@ comp-kitchen-spike-deny-butcher = { CAPITALIZE(THE($victim)) } can't be butchere comp-kitchen-spike-deny-butcher-knife = { CAPITALIZE(THE($victim)) } can't be butchered on { THE($this) }, you need to butcher it using a knife. comp-kitchen-spike-deny-not-dead = { CAPITALIZE(THE($victim)) } can't be butchered. { CAPITALIZE(SUBJECT($victim)) } { CONJUGATE-BE($victim) } is not dead! -comp-kitchen-spike-begin-hook-victim = { THE($user) } begins dragging you onto { THE($this) }! +comp-kitchen-spike-begin-hook-victim = { CAPITALIZE(THE($user)) } begins dragging you onto { THE($this) }! comp-kitchen-spike-begin-hook-self = You begin dragging yourself onto { THE($this) }! comp-kitchen-spike-kill = { CAPITALIZE(THE($user)) } has forced { THE($victim) } onto the spike, killing them instantly! diff --git a/Resources/Locale/en-US/lube/lube.ftl b/Resources/Locale/en-US/lube/lube.ftl index 1b5b66e069..bc8bd4e0b1 100644 --- a/Resources/Locale/en-US/lube/lube.ftl +++ b/Resources/Locale/en-US/lube/lube.ftl @@ -1,6 +1,6 @@ -lube-success = {THE($target)} has been covered in lube! +lube-success = {CAPITALIZE(THE($target))} has been covered in lube! lubed-name-prefix = lubed {$baseName} lube-failure = Can't cover {THE($target)} in lube! -lube-slip = {THE($target)} slips out of your hands! +lube-slip = {CAPITALIZE(THE($target))} slips out of your hands! lube-verb-text = Apply Lube lube-verb-message = Lube an object diff --git a/Resources/Locale/en-US/power/components/generator.ftl b/Resources/Locale/en-US/power/components/generator.ftl index afab640793..6d5f9fdb5d 100644 --- a/Resources/Locale/en-US/power/components/generator.ftl +++ b/Resources/Locale/en-US/power/components/generator.ftl @@ -1,4 +1,4 @@ -generator-clogged = {THE($generator)} shuts off abruptly! +generator-clogged = {CAPITALIZE(THE($generator))} shuts off abruptly! portable-generator-verb-start = Start generator portable-generator-verb-start-msg-unreliable = Start the generator. This may take a few tries. diff --git a/Resources/Locale/en-US/storage/components/secret-stash-component.ftl b/Resources/Locale/en-US/storage/components/secret-stash-component.ftl index 2a8f505e2b..3689242807 100644 --- a/Resources/Locale/en-US/storage/components/secret-stash-component.ftl +++ b/Resources/Locale/en-US/storage/components/secret-stash-component.ftl @@ -2,7 +2,7 @@ comp-secret-stash-action-hide-success = You hide { THE($item) } in the {$stashname}. comp-secret-stash-action-hide-container-not-empty = There's already something in here!? -comp-secret-stash-action-hide-item-too-big = { THE($item) } is too big to fit in the {$stashname}. +comp-secret-stash-action-hide-item-too-big = { CAPITALIZE(THE($item)) } is too big to fit in the {$stashname}. comp-secret-stash-action-get-item-found-something = There was something inside the {$stashname}! comp-secret-stash-on-examine-found-hidden-item = There is something hidden inside the {$stashname}! comp-secret-stash-on-destroyed-popup = Something falls out of the the {$stashname}! diff --git a/Resources/Locale/en-US/wieldable/wieldable-component.ftl b/Resources/Locale/en-US/wieldable/wieldable-component.ftl index 585d611016..1c88e45727 100644 --- a/Resources/Locale/en-US/wieldable/wieldable-component.ftl +++ b/Resources/Locale/en-US/wieldable/wieldable-component.ftl @@ -5,8 +5,8 @@ wieldable-verb-text-unwield = Unwield wieldable-component-successful-wield = You wield { THE($item) }. wieldable-component-failed-wield = You unwield { THE($item) }. -wieldable-component-successful-wield-other = { THE($user) } wields { THE($item) }. -wieldable-component-failed-wield-other = { THE($user) } unwields { THE($item) }. +wieldable-component-successful-wield-other = { CAPITALIZE(THE($user)) } wields { THE($item) }. +wieldable-component-failed-wield-other = { CAPITALIZE(THE($user)) } unwields { THE($item) }. wieldable-component-no-hands = You don't have enough hands! wieldable-component-not-enough-free-hands = {$number -> From 7e44e75d74c9b0195332f280c3b8b76c9eb966a8 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sat, 10 Aug 2024 12:15:05 -0400 Subject: [PATCH 348/422] #30851 followup - murderficates links (#30863) kneecaps links while we're at it --- Content.Server/Chat/Managers/ChatManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/Chat/Managers/ChatManager.cs b/Content.Server/Chat/Managers/ChatManager.cs index ef4373e1e8..b1b083f86b 100644 --- a/Content.Server/Chat/Managers/ChatManager.cs +++ b/Content.Server/Chat/Managers/ChatManager.cs @@ -257,7 +257,7 @@ namespace Content.Server.Chat.Managers //TODO: player.Name color, this will need to change the structure of the MsgChatMessage ChatMessageToAll(ChatChannel.OOC, message, wrappedMessage, EntityUid.Invalid, hideChat: false, recordReplay: true, colorOverride: colorOverride, author: player.UserId); - _mommiLink.SendOOCMessage(player.Name, message.Replace("@", "\\@").Replace("<", "\\<")); // @ and < are both problematic for discord + _mommiLink.SendOOCMessage(player.Name, message.Replace("@", "\\@").Replace("<", "\\<").Replace("/", "\\/")); // @ and < are both problematic for discord due to pinging. / is sanitized solely to kneecap links to murder embeds via blunt force _adminLogger.Add(LogType.Chat, LogImpact.Low, $"OOC from {player:Player}: {message}"); } From 249d3cd74d3e0d6e77f0ee09edaf958e91472020 Mon Sep 17 00:00:00 2001 From: MerrytheManokit <167581110+MerrytheManokit@users.noreply.github.com> Date: Sat, 10 Aug 2024 12:37:33 -0400 Subject: [PATCH 349/422] Remove meta voiceline from the passenger figure (#30868) Update figurines.ftl --- Resources/Locale/en-US/datasets/figurines.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/datasets/figurines.ftl b/Resources/Locale/en-US/datasets/figurines.ftl index 900f09ed37..b981347dbe 100644 --- a/Resources/Locale/en-US/datasets/figurines.ftl +++ b/Resources/Locale/en-US/datasets/figurines.ftl @@ -1,7 +1,7 @@ figurines-hop-1 = Papers, please. figurines-hop-2 = You are fired. -figurines-passenger-1 = How to change hands? +figurines-passenger-1 = Insuls please. figurines-passenger-2 = Call evac. figurines-greytider-1 = Man, this party stinks. I fucking hate these people. From 9ba038d04f885e6947d013c050a2a135e2b96af8 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Sat, 10 Aug 2024 20:16:56 +0200 Subject: [PATCH 350/422] Standartize clothing recipes (#29315) --- .../Prototypes/Recipes/Lathes/clothing.yml | 53 ++++++++++--------- 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml index 98cb1a3d51..b7b6a5c1a1 100644 --- a/Resources/Prototypes/Recipes/Lathes/clothing.yml +++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml @@ -531,6 +531,7 @@ completetime: 4 materials: Cloth: 300 + Durathread: 100 - type: latheRecipe id: ClothingUniformJumpsuitQMFormal @@ -538,6 +539,7 @@ completetime: 4 materials: Cloth: 300 + Durathread: 100 - type: latheRecipe id: ClothingUniformJumpskirtQM @@ -545,6 +547,7 @@ completetime: 4 materials: Cloth: 300 + Durathread: 100 - type: latheRecipe id: ClothingUniformJumpsuitQMTurtleneck @@ -552,6 +555,7 @@ completetime: 4 materials: Cloth: 300 + Durathread: 100 - type: latheRecipe id: ClothingUniformJumpskirtQMTurtleneck @@ -559,6 +563,7 @@ completetime: 4 materials: Cloth: 300 + Durathread: 100 - type: latheRecipe id: ClothingUniformJumpsuitResearchDirector @@ -711,7 +716,7 @@ completetime: 3.2 materials: Cloth: 500 - Durathread: 500 + Durathread: 300 - type: latheRecipe id: ClothingOuterWinterHoP @@ -751,7 +756,7 @@ completetime: 3.2 materials: Cloth: 500 - Durathread: 400 + Durathread: 300 # Mantles - type: latheRecipe id: ClothingNeckMantleCap @@ -815,7 +820,7 @@ completetime: 3.2 materials: Cloth: 500 - Durathread: 300 + Durathread: 200 - type: latheRecipe id: ClothingOuterWinterClown @@ -823,7 +828,7 @@ completetime: 3.2 materials: Cloth: 500 - Durathread: 300 + Durathread: 200 - type: latheRecipe id: ClothingOuterWinterMime @@ -831,7 +836,7 @@ completetime: 3.2 materials: Cloth: 500 - Durathread: 300 + Durathread: 200 - type: latheRecipe id: ClothingOuterWinterCoat @@ -839,7 +844,7 @@ completetime: 3.2 materials: Cloth: 500 - Durathread: 300 + Durathread: 200 - type: latheRecipe id: ClothingOuterWinterJani @@ -847,7 +852,7 @@ completetime: 3.2 materials: Cloth: 500 - Durathread: 400 + Durathread: 200 - type: latheRecipe id: ClothingOuterWinterBar @@ -855,7 +860,7 @@ completetime: 3.2 materials: Cloth: 500 - Durathread: 300 + Durathread: 200 - type: latheRecipe id: ClothingOuterWinterChef @@ -863,7 +868,7 @@ completetime: 3.2 materials: Cloth: 500 - Durathread: 300 + Durathread: 200 - type: latheRecipe id: ClothingOuterWinterHydro @@ -871,7 +876,7 @@ completetime: 3.2 materials: Cloth: 500 - Durathread: 300 + Durathread: 200 - type: latheRecipe id: ClothingOuterWinterAtmos @@ -879,7 +884,7 @@ completetime: 3.2 materials: Cloth: 500 - Durathread: 300 + Durathread: 200 - type: latheRecipe id: ClothingOuterWinterEngi @@ -887,7 +892,7 @@ completetime: 3.2 materials: Cloth: 500 - Durathread: 300 + Durathread: 200 - type: latheRecipe id: ClothingOuterWinterCargo @@ -895,7 +900,7 @@ completetime: 3.2 materials: Cloth: 500 - Durathread: 300 + Durathread: 200 - type: latheRecipe id: ClothingOuterWinterMiner @@ -903,7 +908,7 @@ completetime: 3.2 materials: Cloth: 500 - Durathread: 300 + Durathread: 200 - type: latheRecipe id: ClothingOuterWinterMed @@ -911,7 +916,7 @@ completetime: 3.2 materials: Cloth: 500 - Durathread: 400 + Durathread: 200 - type: latheRecipe id: ClothingOuterWinterPara @@ -919,7 +924,7 @@ completetime: 3.2 materials: Cloth: 500 - Durathread: 450 + Durathread: 200 - type: latheRecipe id: ClothingOuterWinterChem @@ -927,7 +932,7 @@ completetime: 3.2 materials: Cloth: 500 - Durathread: 500 + Durathread: 200 - type: latheRecipe id: ClothingOuterWinterGen @@ -935,7 +940,7 @@ completetime: 3.2 materials: Cloth: 500 - Durathread: 400 + Durathread: 200 - type: latheRecipe id: ClothingOuterWinterViro @@ -943,7 +948,7 @@ completetime: 3.2 materials: Cloth: 500 - Durathread: 400 + Durathread: 200 - type: latheRecipe id: ClothingOuterWinterSci @@ -951,7 +956,7 @@ completetime: 3.2 materials: Cloth: 500 - Durathread: 400 + Durathread: 200 - type: latheRecipe id: ClothingOuterWinterRobo @@ -959,7 +964,7 @@ completetime: 3.2 materials: Cloth: 500 - Durathread: 300 + Durathread: 200 - type: latheRecipe id: ClothingOuterWinterSec @@ -967,7 +972,7 @@ completetime: 3.2 materials: Cloth: 500 - Durathread: 300 + Durathread: 200 - type: latheRecipe id: ClothingOuterWinterSyndie @@ -975,7 +980,7 @@ completetime: 3.2 materials: Cloth: 500 - Durathread: 300 + Durathread: 200 - type: latheRecipe id: ClothingOuterWinterSyndieCap @@ -983,7 +988,7 @@ completetime: 3.2 materials: Cloth: 500 - Durathread: 300 + Durathread: 200 # Hats - type: latheRecipe id: ClothingHeadHatCaptain From 084812cb44bb046f503d50b2da44ee21a9cb9766 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 10 Aug 2024 18:18:03 +0000 Subject: [PATCH 351/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 1550ef6c1d..3bd626b54a 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,14 +1,4 @@ Entries: -- author: ike709 - changes: - - message: UIs can now link to a Guidebook entry via a help button in the top right - corner. - type: Add - - message: Added the help button to the reagent dispenser UI. - type: Add - id: 6582 - time: '2024-05-11T02:21:18.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27891 - author: Vasilis changes: - message: NPC's activly being controlled by a player wont return to their AI behevior @@ -3791,3 +3781,10 @@ id: 7081 time: '2024-08-10T15:00:22.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29091 +- author: lzk228 + changes: + - message: Standartized some clothing recipes. + type: Tweak + id: 7082 + time: '2024-08-10T18:16:56.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29315 From b6e10a0b7b041180feec81db1fe989c4cf659538 Mon Sep 17 00:00:00 2001 From: Kukutis96513 <146854220+Kukutis96513@users.noreply.github.com> Date: Sat, 10 Aug 2024 21:25:12 +0300 Subject: [PATCH 352/422] Reach tweaks reattempt 2 (#30782) * uhhh fix stuff maybe * - added a fax machine - made botany slightly bigger to accommodate a nutrimax vending machine - added air alarms, scrubbers and a waste pipe network --- Resources/Maps/reach.yml | 20562 ++++++++++++++++++++----------------- 1 file changed, 11284 insertions(+), 9278 deletions(-) diff --git a/Resources/Maps/reach.yml b/Resources/Maps/reach.yml index 74b85ec1d1..cdc4745f5f 100644 --- a/Resources/Maps/reach.yml +++ b/Resources/Maps/reach.yml @@ -37,7 +37,7 @@ entities: - type: Broadphase - type: OccluderTree - type: LoadedMap - - uid: 407 + - uid: 2 components: - type: MetaData name: SS Reach II @@ -55,7 +55,7 @@ entities: version: 6 -1,0: ind: -1,0 - tiles: bQAAAAAATgAAAAABLwAAAAABLwAAAAADLwAAAAAALwAAAAADLwAAAAABLwAAAAADLwAAAAADLwAAAAACLwAAAAABLwAAAAABTgAAAAACHwAAAAAAHwAAAAADHwAAAAABfgAAAAAATgAAAAABTgAAAAABTgAAAAACTgAAAAADTgAAAAADTgAAAAADTgAAAAADTgAAAAABTgAAAAAATgAAAAAATgAAAAADTgAAAAAAHwAAAAABHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAACegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADfgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAegAAAAAAegAAAAABegAAAAAAegAAAAAAfgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfgAAAAAAHwAAAAADHwAAAAACfgAAAAAAPAAAAAAATQAAAAAATQAAAAADHwAAAAAAegAAAAAAegAAAAAAegAAAAABegAAAAACHwAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfgAAAAAAHwAAAAABHwAAAAABfgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAHwAAAAACfgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfgAAAAAAHwAAAAACHwAAAAACfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADHwAAAAABHwAAAAAAJAAAAAABfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAABHwAAAAACHwAAAAABJAAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAAHwAAAAACHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAATwAAAAAATwAAAAAAHwAAAAAAHwAAAAABJAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADJAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA + tiles: bQAAAAAATgAAAAABLwAAAAABLwAAAAADLwAAAAAALwAAAAADLwAAAAABLwAAAAADLwAAAAADLwAAAAACLwAAAAABLwAAAAABTgAAAAACHwAAAAAAHwAAAAADHwAAAAABfgAAAAAATgAAAAABTgAAAAABTgAAAAACTgAAAAADTgAAAAADTgAAAAADTgAAAAADTgAAAAABTgAAAAAATgAAAAAATgAAAAADTgAAAAAAHwAAAAABHwAAAAABHwAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAegAAAAADegAAAAACegAAAAABegAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAADfgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAegAAAAAAegAAAAABegAAAAAAegAAAAAAfgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfgAAAAAAHwAAAAADHwAAAAACfgAAAAAAPAAAAAAATQAAAAAATQAAAAADHwAAAAAAegAAAAAAegAAAAAAegAAAAABegAAAAACHwAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfgAAAAAAHwAAAAABHwAAAAABfgAAAAAAPAAAAAAATQAAAAAAPAAAAAAAfgAAAAAAHwAAAAACHwAAAAABHwAAAAAAHwAAAAACfgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfgAAAAAAHwAAAAACHwAAAAACfgAAAAAAPAAAAAAAPAAAAAAAPAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAAHwAAAAABHwAAAAAAHwAAAAADHwAAAAABHwAAAAAAJAAAAAABfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAHwAAAAAAHwAAAAACHwAAAAABHwAAAAACHwAAAAABJAAAAAABfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfgAAAAAAfgAAAAAATwAAAAAATwAAAAAAHwAAAAACHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAATwAAAAAATwAAAAAAHwAAAAAAHwAAAAABJAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAHwAAAAADHwAAAAADJAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAHwAAAAABHwAAAAABfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfgAAAAAAfgAAAAAAfgAAAAAAfgAAAAAA version: 6 0,-1: ind: 0,-1 @@ -114,482 +114,481 @@ entities: color: '#FFFFFFFF' id: Arrows decals: - 261: 3,7 + 260: 3,7 - node: color: '#FFFFFFFF' id: Bot decals: 4: 5,-11 - 258: 0,12 - 259: 0,13 - 260: 3,13 - 389: -24,0 - 390: -22,0 - 393: -23,-3 - 394: -19,-5 - 395: -19,-3 - 396: -19,3 - 399: -17,-1 + 257: 0,12 + 258: 0,13 + 259: 3,13 + 388: -24,0 + 389: -22,0 + 392: -23,-3 + 393: -19,-5 + 394: -19,-3 + 395: -19,3 + 398: -17,-1 - node: color: '#FFFFFFFF' id: BotLeft decals: - 385: -22,1 - 386: -24,-1 - 392: -22,-3 - 397: -17,3 - 398: -17,4 + 384: -22,1 + 385: -24,-1 + 391: -22,-3 + 396: -17,3 + 397: -17,4 - node: color: '#FFFFFFFF' id: BotRight decals: - 387: -22,-1 - 388: -24,1 + 386: -22,-1 + 387: -24,1 - node: color: '#FFFFFFFF' id: Box decals: - 391: -23,0 + 390: -23,0 - node: color: '#FFFFFFFF' id: BrickTileDarkBox decals: - 127: 9,7 - 128: 9,9 - 129: 5,7 - 130: 5,9 - 131: 5,11 - 132: 9,11 - 133: 9,13 - 134: 9,15 - 135: 5,15 - 136: 5,13 + 126: 9,7 + 127: 9,9 + 128: 5,7 + 129: 5,9 + 130: 5,11 + 131: 9,11 + 132: 9,13 + 133: 9,15 + 134: 5,15 + 135: 5,13 - node: color: '#D381C996' id: BrickTileSteelCornerNe decals: - 292: -2,11 + 291: -2,11 - node: color: '#D381C996' id: BrickTileSteelCornerNw decals: - 286: -6,8 - 293: -3,11 + 285: -6,8 + 292: -3,11 - node: color: '#D381C996' id: BrickTileSteelCornerSw decals: - 287: -6,7 + 286: -6,7 - node: color: '#D381C996' id: BrickTileSteelInnerNw decals: - 296: -3,8 + 295: -3,8 - node: color: '#52B4E996' id: BrickTileSteelLineE decals: - 61: 0,0 + 60: 0,0 - node: color: '#D381C996' id: BrickTileSteelLineE decals: - 289: -2,8 - 290: -2,9 - 291: -2,10 + 288: -2,8 + 289: -2,9 + 290: -2,10 - node: color: '#D381C996' id: BrickTileSteelLineN decals: - 297: -4,8 - 298: -5,8 + 296: -4,8 + 297: -5,8 - node: color: '#D381C996' id: BrickTileSteelLineS decals: - 283: -3,7 - 284: -4,7 - 285: -5,7 + 282: -3,7 + 283: -4,7 + 284: -5,7 - node: color: '#D381C996' id: BrickTileSteelLineW decals: - 294: -3,10 - 295: -3,9 + 293: -3,10 + 294: -3,9 - node: color: '#52B4E996' id: BrickTileWhiteBox decals: - 62: 1,0 + 61: 1,0 - node: color: '#9FED5896' id: BrickTileWhiteBox decals: - 59: -3,-8 + 58: -3,-8 - node: color: '#334E6DC8' id: BrickTileWhiteCornerNe decals: - 338: 24,4 + 337: 24,4 - node: color: '#52B4E996' id: BrickTileWhiteCornerNe decals: - 72: 4,1 - 87: 12,1 + 71: 4,1 + 86: 12,1 - node: color: '#DE3A3A96' id: BrickTileWhiteCornerNe decals: - 361: 19,1 - 363: 16,5 + 360: 19,1 + 362: 16,5 - node: color: '#334E6DC8' id: BrickTileWhiteCornerNw decals: - 336: 21,3 - 337: 22,4 + 335: 21,3 + 336: 22,4 - node: color: '#52B4E996' id: BrickTileWhiteCornerNw decals: - 66: 2,-3 - 70: 2,1 - 88: 10,1 + 65: 2,-3 + 69: 2,1 + 87: 10,1 - node: color: '#DE3A3A96' id: BrickTileWhiteCornerNw decals: - 362: 14,5 + 361: 14,5 - node: color: '#334E6DC8' id: BrickTileWhiteCornerSe decals: - 334: 23,-1 + 333: 23,-1 - node: color: '#52B4E996' id: BrickTileWhiteCornerSe decals: - 82: 12,-3 + 81: 12,-3 - node: color: '#DE3A3A96' id: BrickTileWhiteCornerSe decals: - 365: 19,-1 + 364: 19,-1 - node: color: '#334E6DC8' id: BrickTileWhiteCornerSw decals: - 335: 21,-1 + 334: 21,-1 - node: color: '#52B4E996' id: BrickTileWhiteCornerSw decals: - 69: 2,-1 + 68: 2,-1 - node: color: '#DE3A3A96' id: BrickTileWhiteCornerSw decals: - 364: 14,-1 + 363: 14,-1 - node: color: '#334E6DC8' id: BrickTileWhiteEndE decals: - 339: 25,3 + 338: 25,3 - node: color: '#334E6DC8' id: BrickTileWhiteInnerNe decals: - 344: 24,3 + 343: 24,3 - node: color: '#52B4E996' id: BrickTileWhiteInnerNe decals: - 95: 4,-3 + 94: 4,-3 - node: color: '#DE3A3A96' id: BrickTileWhiteInnerNe decals: - 375: 16,1 + 374: 16,1 - node: color: '#334E6DC8' id: BrickTileWhiteInnerNw decals: - 345: 22,3 + 344: 22,3 - node: color: '#52B4E996' id: BrickTileWhiteInnerNw decals: - 67: 3,-3 + 66: 3,-3 - node: color: '#334E6DC8' id: BrickTileWhiteInnerSe decals: - 343: 23,3 + 342: 23,3 - node: color: '#52B4E996' id: BrickTileWhiteInnerSe decals: - 77: 4,-3 + 76: 4,-3 - node: color: '#52B4E996' id: BrickTileWhiteInnerSw decals: - 68: 3,-1 + 67: 3,-1 - node: color: '#334E6DC8' id: BrickTileWhiteLineE decals: - 341: 23,1 - 342: 23,2 + 340: 23,1 + 341: 23,2 - node: color: '#52B4E996' id: BrickTileWhiteLineE decals: - 73: 4,-1 - 74: 4,-2 - 75: 4,-5 - 76: 4,-4 - 83: 12,-2 - 84: 12,-1 + 72: 4,-1 + 73: 4,-2 + 74: 4,-5 + 75: 4,-4 + 82: 12,-2 + 83: 12,-1 - node: color: '#DE3A3A96' id: BrickTileWhiteLineE decals: - 371: 16,4 - 372: 16,3 - 373: 16,2 + 370: 16,4 + 371: 16,3 + 372: 16,2 - node: color: '#334E6DC8' id: BrickTileWhiteLineN decals: - 346: 23,4 + 345: 23,4 - node: color: '#52B4E996' id: BrickTileWhiteLineN decals: - 71: 3,1 - 89: 11,1 - 90: 9,-3 - 91: 8,-3 - 92: 7,-3 - 93: 6,-3 - 94: 5,-3 + 70: 3,1 + 88: 11,1 + 89: 9,-3 + 90: 8,-3 + 91: 7,-3 + 92: 6,-3 + 93: 5,-3 - node: color: '#DE3A3A96' id: BrickTileWhiteLineN decals: - 374: 17,1 + 373: 17,1 - node: color: '#334E6DC8' id: BrickTileWhiteLineS decals: - 340: 24,3 + 339: 24,3 - node: color: '#52B4E996' id: BrickTileWhiteLineS decals: - 78: 6,-3 - 79: 7,-3 - 80: 9,-3 - 81: 10,-3 + 77: 6,-3 + 78: 7,-3 + 79: 9,-3 + 80: 10,-3 - node: color: '#DE3A3A96' id: BrickTileWhiteLineS decals: - 366: 18,-1 - 367: 15,-1 + 365: 18,-1 + 366: 15,-1 - node: color: '#334E6DC8' id: BrickTileWhiteLineW decals: - 347: 21,1 - 348: 21,2 + 346: 21,1 + 347: 21,2 - node: color: '#52B4E996' id: BrickTileWhiteLineW decals: - 63: 3,-2 - 64: 2,-5 - 65: 2,-4 - 85: 10,-2 - 86: 10,-1 + 62: 3,-2 + 63: 2,-5 + 64: 2,-4 + 84: 10,-2 + 85: 10,-1 - node: color: '#9FED5896' id: BrickTileWhiteLineW decals: - 58: -2,-8 + 57: -2,-8 - node: color: '#DE3A3A96' id: BrickTileWhiteLineW decals: - 368: 14,1 - 369: 14,2 - 370: 14,3 + 367: 14,1 + 368: 14,2 + 369: 14,3 - node: color: '#FFFFFFFF' id: Bushd1 decals: - 325: -7.978216,-5.1518655 + 324: -7.978216,-5.1518655 - node: color: '#FFFFFFFF' id: Bushd4 decals: - 326: -7.978216,-3.5581155 - 327: -11.993841,-5.2456155 - 328: -12.025091,-4.3549905 + 325: -7.978216,-3.5581155 + 326: -11.993841,-5.2456155 + 327: -12.025091,-4.3549905 - node: color: '#FFFFFFFF' id: Bushe1 decals: - 329: -12.025091,-3.1831155 + 328: -12.025091,-3.1831155 - node: color: '#FFFFFFFF' id: Bushf1 decals: - 324: -7.946966,-2.8081155 + 323: -7.946966,-2.8081155 - node: color: '#FFFFFFFF' id: Bushf2 decals: - 323: -7.993841,-4.4956155 + 322: -7.993841,-4.4956155 - node: color: '#FFFFFFFF' id: Bushf3 decals: - 322: -12.009466,-3.3393655 + 321: -12.009466,-3.3393655 - node: color: '#FFFFFFFF' id: Bushh2 decals: - 331: -8.009466,-3.7456155 - 332: -7.993841,-4.8862405 + 330: -8.009466,-3.7456155 + 331: -7.993841,-4.8862405 - node: color: '#FFFFFFFF' id: Bushi1 decals: - 316: -7.946966,-4.9018655 + 315: -7.946966,-4.9018655 - node: color: '#FFFFFFFF' id: Bushi3 decals: - 317: -7.931341,-4.0424905 - 320: -12.025091,-4.7612405 - 321: -11.931341,-2.7299905 + 316: -7.931341,-4.0424905 + 319: -12.025091,-4.7612405 + 320: -11.931341,-2.7299905 - node: color: '#FFFFFFFF' id: Bushi4 decals: - 318: -7.962591,-3.2768655 - 319: -11.978216,-3.7612405 + 317: -7.962591,-3.2768655 + 318: -11.978216,-3.7612405 - node: color: '#FFFFFFFF' id: Bushl3 decals: - 330: -11.993841,-4.5581155 + 329: -11.993841,-4.5581155 - node: color: '#FFFFFFFF' id: Bushm3 decals: - 333: -7.978216,-3.8862405 + 332: -7.978216,-3.8862405 - node: color: '#52B4E996' id: CheckerNESW decals: - 96: 5,-5 - 97: 5,-4 - 98: 6,-4 - 99: 6,-5 - 100: 7,-5 - 101: 7,-4 - 102: 8,-4 - 103: 9,-4 - 104: 9,-5 - 105: 8,-5 - 106: 10,-5 - 107: 10,-4 - 108: 11,-4 - 109: 12,-4 - 110: 12,-5 - 111: 11,-5 + 95: 5,-5 + 96: 5,-4 + 97: 6,-4 + 98: 6,-5 + 99: 7,-5 + 100: 7,-4 + 101: 8,-4 + 102: 9,-4 + 103: 9,-5 + 104: 8,-5 + 105: 10,-5 + 106: 10,-4 + 107: 11,-4 + 108: 12,-4 + 109: 12,-5 + 110: 11,-5 - node: color: '#D4D4D428' id: CheckerNWSE decals: - 300: -18,3 - 301: -18,4 - 302: -19,3 - 303: -17,3 + 299: -18,3 + 300: -18,4 + 301: -19,3 + 302: -17,3 - node: color: '#FFFFFFFF' id: Delivery decals: 5: 4,-16 6: 4,-15 - 7: 4,-14 - 257: 0,11 + 256: 0,11 - node: cleanable: True color: '#FFFFFFFF' id: DirtHeavy decals: - 222: -18,-4 - 273: 1,13 + 221: -18,-4 + 272: 1,13 - node: cleanable: True color: '#FFFFFFFF' id: DirtLight decals: - 8: 2,-13 - 12: 3,-13 - 217: -18,-2 + 7: 2,-13 + 11: 3,-13 + 216: -18,-2 + 217: -18,-3 218: -18,-3 - 219: -18,-3 - 220: -19,-4 - 221: -18,-4 - 224: -17,-2 - 225: -17,-4 - 226: -17,-5 - 227: -18,3 - 228: -18,4 - 229: -21,-2 - 230: -21,-1 - 231: -22,2 - 232: -21,3 - 263: 0,7 - 264: 0,8 - 265: 1,9 - 266: 1,10 - 267: 1,11 - 268: 1,13 - 269: 3,7 - 270: 0,6 - 274: 1,12 - 275: 2,10 - 276: 2,12 + 219: -19,-4 + 220: -18,-4 + 223: -17,-2 + 224: -17,-4 + 225: -17,-5 + 226: -18,3 + 227: -18,4 + 228: -21,-2 + 229: -21,-1 + 230: -22,2 + 231: -21,3 + 262: 0,7 + 263: 0,8 + 264: 1,9 + 265: 1,10 + 266: 1,11 + 267: 1,13 + 268: 3,7 + 269: 0,6 + 273: 1,12 + 274: 2,10 + 275: 2,12 + 276: 2,8 277: 2,8 - 278: 2,8 - 279: 2,7 - 280: 1,8 - 281: 0,8 - 282: 1,7 + 278: 2,7 + 279: 1,8 + 280: 0,8 + 281: 1,7 - node: cleanable: True color: '#FFFFFFFF' id: DirtMedium decals: - 9: 2,-12 - 10: 2,-13 - 11: 2,-14 - 223: -19,-3 - 271: 0,7 - 272: 1,10 + 8: 2,-12 + 9: 2,-13 + 10: 2,-14 + 222: -19,-3 + 270: 0,7 + 271: 1,10 - node: color: '#52B4E996' id: FullTileOverlayGreyscale decals: - 117: 13,0 - 118: 9,0 + 116: 13,0 + 117: 9,0 - node: color: '#EFB34196' id: FullTileOverlayGreyscale @@ -602,414 +601,414 @@ entities: color: '#FFFFFFFF' id: Grasse2 decals: - 307: -7.978216,-5.0112405 - 308: -7.962591,-4.3393655 - 309: -7.978216,-3.1987405 - 310: -11.962591,-3.2924905 - 311: -12.025091,-4.2456155 - 315: -11.993841,-2.9487405 + 306: -7.978216,-5.0112405 + 307: -7.962591,-4.3393655 + 308: -7.978216,-3.1987405 + 309: -11.962591,-3.2924905 + 310: -12.025091,-4.2456155 + 314: -11.993841,-2.9487405 - node: color: '#FFFFFFFF' id: Grasse3 decals: - 312: -12.025091,-4.9799905 - 313: -8.025091,-3.7299905 - 314: -8.025091,-2.8706155 + 311: -12.025091,-4.9799905 + 312: -8.025091,-3.7299905 + 313: -8.025091,-2.8706155 - node: color: '#334E6DC8' id: HalfTileOverlayGreyscale decals: - 38: -1,5 - 39: 4,5 - 40: 5,5 - 41: 9,5 - 42: 10,5 - 43: 11,5 - 44: 12,5 - 353: 25,2 + 37: -1,5 + 38: 4,5 + 39: 5,5 + 40: 9,5 + 41: 10,5 + 42: 11,5 + 43: 12,5 + 352: 25,2 - node: color: '#A4610696' id: HalfTileOverlayGreyscale decals: - 240: 1,5 - 241: 2,5 + 239: 1,5 + 240: 2,5 - node: color: '#D381C928' id: HalfTileOverlayGreyscale decals: - 238: -2,5 + 237: -2,5 - node: color: '#EFD58F96' id: HalfTileOverlayGreyscale decals: - 123: 7,1 + 122: 7,1 - node: color: '#334E6DC8' id: HalfTileOverlayGreyscale180 decals: - 45: 12,3 - 46: 11,3 - 47: 10,3 - 48: 9,3 - 49: 8,3 - 50: 7,3 - 51: 6,3 - 52: 5,3 - 53: 4,3 - 54: 3,3 - 55: 2,3 - 56: 1,3 - 354: 25,-1 + 44: 12,3 + 45: 11,3 + 46: 10,3 + 47: 9,3 + 48: 8,3 + 49: 7,3 + 50: 6,3 + 51: 5,3 + 52: 4,3 + 53: 3,3 + 54: 2,3 + 55: 1,3 + 353: 25,-1 - node: color: '#EFB34196' id: HalfTileOverlayGreyscale180 decals: - 216: -18,-5 + 215: -18,-5 - node: color: '#EFD58F96' id: HalfTileOverlayGreyscale180 decals: - 124: 7,-1 + 123: 7,-1 - node: color: '#334E6DC8' id: HalfTileOverlayGreyscale270 decals: - 25: -2,-12 - 26: -2,-11 - 27: -2,-10 - 28: -2,-9 - 29: -2,-7 - 30: -2,-6 - 31: -2,-5 - 32: -2,-4 - 33: -2,-3 - 34: -2,-2 - 35: -2,2 - 36: -2,4 - 37: -2,3 - 357: 24,1 + 24: -2,-12 + 25: -2,-11 + 26: -2,-10 + 27: -2,-9 + 28: -2,-7 + 29: -2,-6 + 30: -2,-5 + 31: -2,-4 + 32: -2,-3 + 33: -2,-2 + 34: -2,2 + 35: -2,4 + 36: -2,3 + 356: 24,1 - node: color: '#EFB34196' id: HalfTileOverlayGreyscale270 decals: - 208: -19,-2 - 209: -19,-3 - 210: -19,-4 - 215: -19,-5 + 207: -19,-2 + 208: -19,-3 + 209: -19,-4 + 214: -19,-5 - node: color: '#EFD58F96' id: HalfTileOverlayGreyscale270 decals: - 125: 6,0 + 124: 6,0 - node: color: '#334E6DC8' id: HalfTileOverlayGreyscale90 decals: - 13: 0,-10 - 14: 0,-11 - 15: 0,-9 - 16: 0,-8 - 17: 0,-6 - 18: 0,-5 - 19: 0,-4 - 20: 0,-3 - 21: 0,-2 - 22: 0,-1 - 23: 0,1 - 24: 0,2 - 235: 0,-14 - 236: 0,-12 - 355: 26,0 - 356: 26,1 + 12: 0,-10 + 13: 0,-11 + 14: 0,-9 + 15: 0,-8 + 16: 0,-6 + 17: 0,-5 + 18: 0,-4 + 19: 0,-3 + 20: 0,-2 + 21: 0,-1 + 22: 0,1 + 23: 0,2 + 234: 0,-14 + 235: 0,-12 + 354: 26,0 + 355: 26,1 - node: color: '#EFB34128' id: HalfTileOverlayGreyscale90 decals: - 237: 0,-13 + 236: 0,-13 - node: color: '#EFB34196' id: HalfTileOverlayGreyscale90 decals: - 211: -17,-4 - 212: -17,-3 - 213: -17,-2 - 214: -17,-5 + 210: -17,-4 + 211: -17,-3 + 212: -17,-2 + 213: -17,-5 - node: color: '#FFFFFFFF' id: HatchSmall decals: - 233: 1,0 - 234: -3,-8 + 232: 1,0 + 233: -3,-8 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' id: LoadingArea decals: - 262: 2,13 + 261: 2,13 - node: color: '#A4610696' id: QuarterTileOverlayGreyscale decals: - 244: 0,7 - 245: 0,8 - 246: 0,9 - 247: 0,10 - 248: 0,11 - 249: 0,12 - 250: 0,13 + 243: 0,7 + 244: 0,8 + 245: 0,9 + 246: 0,10 + 247: 0,11 + 248: 0,12 + 249: 0,13 - node: color: '#334E6DC8' id: QuarterTileOverlayGreyscale180 decals: - 57: 0,3 + 56: 0,3 - node: color: '#334E6DC8' id: QuarterTileOverlayGreyscale270 decals: - 239: -2,5 + 238: -2,5 - node: color: '#52B4E996' id: QuarterTileOverlayGreyscale270 decals: - 115: 4,0 + 114: 4,0 - node: color: '#9FED5896' id: QuarterTileOverlayGreyscale270 decals: - 304: -5,-9 - 305: -6,-8 - 306: -7,-7 + 303: -5,-9 + 304: -6,-8 + 305: -7,-7 - node: color: '#52B4E996' id: QuarterTileOverlayGreyscale90 decals: - 116: 3,-1 + 115: 3,-1 - node: color: '#A4610696' id: QuarterTileOverlayGreyscale90 decals: - 251: 2,13 - 252: 2,12 - 253: 2,11 - 254: 2,10 - 255: 2,9 - 256: 2,8 + 250: 2,13 + 251: 2,12 + 252: 2,11 + 253: 2,10 + 254: 2,9 + 255: 2,8 - node: color: '#334E6DC8' id: ThreeQuarterTileOverlayGreyscale decals: - 350: 24,2 + 349: 24,2 - node: color: '#EFD58F96' id: ThreeQuarterTileOverlayGreyscale decals: - 119: 6,1 + 118: 6,1 - node: color: '#334E6DC8' id: ThreeQuarterTileOverlayGreyscale180 decals: - 349: 26,-1 + 348: 26,-1 - node: color: '#52B4E996' id: ThreeQuarterTileOverlayGreyscale180 decals: - 114: 3,0 + 113: 3,0 - node: color: '#EFD58F96' id: ThreeQuarterTileOverlayGreyscale180 decals: - 120: 8,-1 + 119: 8,-1 - node: color: '#334E6DC8' id: ThreeQuarterTileOverlayGreyscale270 decals: - 352: 24,-1 + 351: 24,-1 - node: color: '#EFD58F96' id: ThreeQuarterTileOverlayGreyscale270 decals: - 122: 6,-1 + 121: 6,-1 - node: color: '#334E6DC8' id: ThreeQuarterTileOverlayGreyscale90 decals: - 351: 26,2 + 350: 26,2 - node: color: '#EFD58F96' id: ThreeQuarterTileOverlayGreyscale90 decals: - 121: 8,1 + 120: 8,1 - node: color: '#FFFFFFFF' id: VentSmall decals: - 299: -16,0 + 298: -16,0 - node: color: '#D381C996' id: WarnCornerGreyscaleSE decals: - 288: -2,7 + 287: -2,7 - node: color: '#FFFFFFFF' id: WarnCornerSmallNW decals: - 205: -21,-2 + 204: -21,-2 - node: color: '#FFFFFFFF' id: WarnCornerSmallSW decals: - 204: -21,2 + 203: -21,2 - node: color: '#52B4E996' id: WarnLineGreyscaleE decals: - 113: 12,0 + 112: 12,0 - node: color: '#DE3A3A96' id: WarnLineGreyscaleE decals: - 378: 19,0 + 377: 19,0 - node: color: '#EFD58F96' id: WarnLineGreyscaleE decals: - 126: 8,0 + 125: 8,0 - node: color: '#FFFFFFFF' id: WarnLineGreyscaleE decals: - 60: 0,-7 + 59: 0,-7 - node: color: '#A4610696' id: WarnLineGreyscaleN decals: - 242: 3,5 - 243: 0,5 + 241: 3,5 + 242: 0,5 - node: color: '#DE3A3A96' id: WarnLineGreyscaleN decals: - 360: 18,1 + 359: 18,1 - node: color: '#DE3A3A96' id: WarnLineGreyscaleS decals: - 358: 17,-1 - 359: 16,-1 + 357: 17,-1 + 358: 16,-1 - node: color: '#52B4E996' id: WarnLineGreyscaleW decals: - 112: 10,0 + 111: 10,0 - node: color: '#DE3A3A96' id: WarnLineGreyscaleW decals: - 376: 14,0 - 377: 14,4 + 375: 14,0 + 376: 14,4 - node: color: '#FFFFFFFF' id: WarnLineN decals: - 195: -24,2 - 196: -23,2 - 197: -22,2 + 194: -24,2 + 195: -23,2 + 196: -22,2 - node: color: '#FFFFFFFF' id: WarnLineS decals: - 198: -21,1 - 199: -21,0 - 200: -21,-1 - 206: -19,-1 - 207: -19,1 + 197: -21,1 + 198: -21,0 + 199: -21,-1 + 205: -19,-1 + 206: -19,1 - node: color: '#FFFFFFFF' id: WarnLineW decals: - 201: -24,-2 - 202: -23,-2 - 203: -22,-2 + 200: -24,-2 + 201: -23,-2 + 202: -22,-2 - node: color: '#FFFFFFFF' id: WoodTrimThinLineE decals: - 147: 5,7 - 148: 5,8 - 149: 5,9 - 150: 5,10 - 151: 5,11 - 152: 5,12 - 153: 5,13 - 154: 5,14 - 155: 5,15 - 156: 5,16 - 379: 14,-5 - 380: 14,-4 - 381: 14,-3 + 146: 5,7 + 147: 5,8 + 148: 5,9 + 149: 5,10 + 150: 5,11 + 151: 5,12 + 152: 5,13 + 153: 5,14 + 154: 5,15 + 155: 5,16 + 378: 14,-5 + 379: 14,-4 + 380: 14,-3 - node: color: '#FFFFFFFF' id: WoodTrimThinLineN decals: - 157: -4,-2 - 158: -5,-2 - 159: -6,-2 - 160: -7,-2 - 161: -9,-2 - 162: -10,-2 - 163: -11,-2 - 164: -13,-2 - 165: -14,-2 - 166: -15,-2 - 179: -4,1 - 180: -5,1 - 181: -6,1 - 182: -7,1 - 183: -8,1 - 184: -10,1 - 185: -9,1 - 186: -11,1 - 187: -12,1 - 188: -13,1 - 189: -14,1 - 190: -15,1 - 191: -8,4 - 192: -9,4 - 193: -10,4 - 194: -11,4 + 156: -4,-2 + 157: -5,-2 + 158: -6,-2 + 159: -7,-2 + 160: -9,-2 + 161: -10,-2 + 162: -11,-2 + 163: -13,-2 + 164: -14,-2 + 165: -15,-2 + 178: -4,1 + 179: -5,1 + 180: -6,1 + 181: -7,1 + 182: -8,1 + 183: -10,1 + 184: -9,1 + 185: -11,1 + 186: -12,1 + 187: -13,1 + 188: -14,1 + 189: -15,1 + 190: -8,4 + 191: -9,4 + 192: -10,4 + 193: -11,4 - node: color: '#FFFFFFFF' id: WoodTrimThinLineS decals: - 167: -4,-1 - 168: -5,-1 - 169: -6,-1 - 170: -7,-1 - 171: -8,-1 - 172: -9,-1 - 173: -10,-1 - 174: -11,-1 - 175: -13,-1 - 176: -12,-1 - 177: -14,-1 - 178: -15,-1 + 166: -4,-1 + 167: -5,-1 + 168: -6,-1 + 169: -7,-1 + 170: -8,-1 + 171: -9,-1 + 172: -10,-1 + 173: -11,-1 + 174: -13,-1 + 175: -12,-1 + 176: -14,-1 + 177: -15,-1 - node: color: '#FFFFFFFF' id: WoodTrimThinLineW decals: - 137: 9,7 - 138: 9,8 - 139: 9,9 - 140: 9,10 - 141: 9,11 - 142: 9,12 - 143: 9,13 - 144: 9,14 - 145: 9,15 - 146: 9,16 - 382: 19,-5 - 383: 19,-4 - 384: 19,-3 + 136: 9,7 + 137: 9,8 + 138: 9,9 + 139: 9,10 + 140: 9,11 + 141: 9,12 + 142: 9,13 + 143: 9,14 + 144: 9,15 + 145: 9,16 + 381: 19,-5 + 382: 19,-4 + 383: 19,-3 - type: GridAtmosphere version: 2 data: @@ -1117,8 +1116,7 @@ entities: -5,0: 0: 61166 -4,1: - 0: 238 - 1: 57344 + 0: 3822 -5,1: 0: 19534 1: 4352 @@ -1128,7 +1126,7 @@ entities: 1: 15 -3,1: 0: 239 - 1: 61440 + 1: 57344 -3,2: 1: 241 -2,1: @@ -1275,10876 +1273,12795 @@ entities: - type: GasTileOverlay - type: RadiationGridResistance - type: SpreaderGrid +- proto: AirAlarm + entities: + - uid: 3 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,10.5 + parent: 2 + - type: DeviceList + devices: + - 1503 + - 1473 + - 1505 + - uid: 4 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,9.5 + parent: 2 + - type: DeviceList + devices: + - 1472 + - 1504 + - uid: 5 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 9.5,-0.5 + parent: 2 + - type: DeviceList + devices: + - 1515 + - 1487 + - 1488 + - 1461 + - 1463 + - 1492 + - 1491 + - 1493 + - uid: 6 + components: + - type: Transform + pos: -5.5,-5.5 + parent: 2 + - type: DeviceList + devices: + - 1464 + - 1489 + - uid: 7 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,-2.5 + parent: 2 + - type: DeviceList + devices: + - 1484 + - 1494 + - 1485 + - 1495 + - 1501 + - 1464 + - uid: 8 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -11.5,3.5 + parent: 2 + - type: DeviceList + devices: + - 1480 + - 1498 + - 1499 + - 1479 + - 1500 + - 1481 + - uid: 9 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -15.5,-3.5 + parent: 2 + - type: DeviceList + devices: + - 1496 + - 1475 + - 1478 + - 1474 + - 1477 + - uid: 10 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 11.5,8.5 + parent: 2 + - type: DeviceList + devices: + - 1506 + - 1507 + - 1470 + - uid: 11 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 17.5,3.5 + parent: 2 + - type: DeviceList + devices: + - 1468 + - 1511 + - 1457 + - 1513 + - 1483 + - 1456 + - 1091 + - 1090 + - 1089 + - uid: 12 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 23.5,-1.5 + parent: 2 + - type: DeviceList + devices: + - 1467 + - 1466 + - 1509 + - 1465 + - 1077 + - uid: 13 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,4.5 + parent: 2 + - type: DeviceList + devices: + - 1482 + - 1502 + - 1471 + - 1469 + - 1455 + - 1490 + - 1516 + - 1088 + - 1087 + - 1086 + - 1102 + - 1097 + - 1096 + - 1083 + - uid: 14 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,-11.5 + parent: 2 + - type: DeviceList + devices: + - 1486 + - 1454 + - 1453 + - 1514 - proto: AirCanister entities: - - uid: 1536 + - uid: 15 components: - type: Transform pos: 7.5,-10.5 - parent: 407 - - uid: 1537 + parent: 2 + - uid: 16 components: - type: Transform pos: 6.5,-10.5 - parent: 407 + parent: 2 - proto: AirlockAtmosphericsGlassLocked entities: - - uid: 1561 + - uid: 17 components: - type: Transform pos: 3.5,-12.5 - parent: 407 + parent: 2 - proto: AirlockAtmosphericsLocked entities: - - uid: 1562 + - uid: 18 components: - type: Transform pos: 1.5,-12.5 - parent: 407 + parent: 2 - proto: AirlockBrigGlassLocked entities: - - uid: 1927 + - uid: 19 components: - type: Transform rot: -1.5707963267948966 rad pos: 13.5,4.5 - parent: 407 - - uid: 2064 + parent: 2 + - uid: 20 components: - type: Transform rot: -1.5707963267948966 rad pos: 13.5,0.5 - parent: 407 + parent: 2 - proto: AirlockCaptainLocked entities: - - uid: 1859 + - uid: 21 components: - type: Transform pos: 22.5,-1.5 - parent: 407 + parent: 2 - proto: AirlockCargoGlassLocked entities: - - uid: 1993 + - uid: 22 components: - type: Transform pos: 0.5,6.5 - parent: 407 + parent: 2 - proto: AirlockChemistryLocked entities: - - uid: 1641 + - uid: 23 components: - type: Transform pos: 9.5,0.5 - parent: 407 + parent: 2 - proto: AirlockCommandGlassLocked entities: - - uid: 1881 + - uid: 24 components: - type: Transform pos: 20.5,0.5 - parent: 407 + parent: 2 - proto: AirlockEngineeringLocked entities: - - uid: 1786 + - uid: 25 components: - type: Transform pos: -15.5,0.5 - parent: 407 + parent: 2 - proto: AirlockExternalGlass entities: - - uid: 1247 + - uid: 26 components: - type: Transform pos: 7.5,17.5 - parent: 407 + parent: 2 - proto: AirlockExternalGlassAtmosphericsLocked entities: - - uid: 1242 + - uid: 27 components: - type: Transform pos: 9.5,-11.5 - parent: 407 + parent: 2 - type: DeviceLinkSource linkedPorts: - 1243: + 28: - DoorStatus: DoorBolt - - uid: 1243 + - uid: 28 components: - type: Transform pos: 12.5,-11.5 - parent: 407 + parent: 2 - type: DeviceLinkSource linkedPorts: - 1242: + 27: - DoorStatus: DoorBolt - proto: AirlockExternalGlassCargoLocked entities: - - uid: 1246 + - uid: 29 components: - type: Transform pos: 1.5,14.5 - parent: 407 + parent: 2 - proto: AirlockExternalGlassEngineeringLocked entities: - - uid: 1244 + - uid: 30 components: - type: Transform pos: -17.5,5.5 - parent: 407 + parent: 2 - type: DeviceLinkSource linkedPorts: - 1245: + 31: - DoorStatus: DoorBolt - - uid: 1245 + - uid: 31 components: - type: Transform pos: -17.5,7.5 - parent: 407 + parent: 2 - type: DeviceLinkSource linkedPorts: - 1244: + 30: - DoorStatus: DoorBolt - proto: AirlockExternalGlassShuttleArrivals entities: - - uid: 241 + - uid: 32 components: - type: Transform rot: 1.5707963267948966 rad pos: 13.5,10.5 - parent: 407 - - uid: 242 + parent: 2 + - uid: 33 components: - type: Transform rot: 1.5707963267948966 rad pos: 13.5,12.5 - parent: 407 + parent: 2 - proto: AirlockExternalGlassShuttleLocked entities: - - uid: 1031 + - uid: 34 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,17.5 - parent: 407 - - uid: 1106 + parent: 2 + - uid: 35 components: - type: Transform rot: 3.141592653589793 rad pos: -2.5,17.5 - parent: 407 + parent: 2 - proto: AirlockGlass entities: - - uid: 1568 + - uid: 36 components: - type: Transform pos: 6.5,6.5 - parent: 407 - - uid: 1569 + parent: 2 + - uid: 37 components: - type: Transform pos: 7.5,6.5 - parent: 407 - - uid: 1570 + parent: 2 + - uid: 38 components: - type: Transform pos: 8.5,6.5 - parent: 407 - - uid: 1572 + parent: 2 + - uid: 39 components: - type: Transform pos: 1.5,0.5 - parent: 407 - - uid: 1573 + parent: 2 + - uid: 40 components: - type: Transform pos: -2.5,-0.5 - parent: 407 - - uid: 1574 + parent: 2 + - uid: 41 components: - type: Transform pos: -2.5,0.5 - parent: 407 - - uid: 1575 + parent: 2 + - uid: 42 components: - type: Transform pos: -2.5,1.5 - parent: 407 + parent: 2 - proto: AirlockGlassShuttle entities: - - uid: 215 + - uid: 43 components: - type: Transform rot: 3.141592653589793 rad pos: 7.5,19.5 - parent: 407 + parent: 2 - proto: AirlockJanitorLocked entities: - - uid: 1673 + - uid: 44 components: - type: Transform pos: -2.5,-7.5 - parent: 407 + parent: 2 - proto: AirlockMaintLocked entities: - - uid: 1240 + - uid: 45 components: - type: Transform pos: 1.5,-6.5 - parent: 407 + parent: 2 - proto: AirlockMaintMedLocked entities: - - uid: 1241 + - uid: 46 components: - type: Transform pos: 3.5,-5.5 - parent: 407 + parent: 2 - proto: AirlockMedicalGlassLocked entities: - - uid: 1636 + - uid: 47 components: - type: Transform pos: 4.5,-1.5 - parent: 407 - - uid: 1637 + parent: 2 + - uid: 48 components: - type: Transform pos: 3.5,-1.5 - parent: 407 + parent: 2 - proto: AirlockScienceGlassLocked entities: - - uid: 1992 + - uid: 49 components: - type: Transform pos: -1.5,6.5 - parent: 407 + parent: 2 - proto: AirlockSecurityGlassLocked entities: - - uid: 1877 + - uid: 50 components: - type: Transform pos: 18.5,2.5 - parent: 407 + parent: 2 - proto: AirlockSecurityLocked entities: - - uid: 2122 + - uid: 51 components: - type: Transform pos: 16.5,-1.5 - parent: 407 - - uid: 2123 + parent: 2 + - uid: 52 components: - type: Transform pos: 17.5,-1.5 - parent: 407 + parent: 2 - proto: AirlockServiceGlassLocked entities: - - uid: 1576 + - uid: 53 components: - type: Transform pos: -7.5,2.5 - parent: 407 - - uid: 1577 + parent: 2 + - uid: 54 components: - type: Transform pos: -11.5,4.5 - parent: 407 - - uid: 1578 + parent: 2 + - uid: 55 components: - type: Transform pos: -6.5,4.5 - parent: 407 + parent: 2 - proto: APCBasic entities: - - uid: 388 + - uid: 56 components: - type: Transform rot: -1.5707963267948966 rad pos: -19.5,-1.5 - parent: 407 - - uid: 389 + parent: 2 + - uid: 57 components: - type: Transform pos: -18.5,5.5 - parent: 407 - - uid: 390 + parent: 2 + - uid: 58 components: - type: Transform pos: -6.5,2.5 - parent: 407 - - uid: 391 + parent: 2 + - uid: 59 components: - type: Transform rot: 3.141592653589793 rad pos: -2.5,6.5 - parent: 407 - - uid: 392 + parent: 2 + - uid: 60 components: - type: Transform rot: 3.141592653589793 rad pos: -7.5,-1.5 - parent: 407 - - uid: 395 + parent: 2 + - uid: 61 components: - type: Transform rot: 1.5707963267948966 rad pos: -2.5,-5.5 - parent: 407 - - uid: 396 + parent: 2 + - uid: 62 components: - type: Transform pos: 9.5,-1.5 - parent: 407 - - uid: 397 + parent: 2 + - uid: 63 components: - type: Transform pos: 4.5,6.5 - parent: 407 - - uid: 398 + parent: 2 + - uid: 64 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,13.5 - parent: 407 - - uid: 399 + parent: 2 + - uid: 65 components: - type: Transform pos: 9.5,17.5 - parent: 407 - - uid: 400 + parent: 2 + - uid: 66 components: - type: Transform pos: 4.5,-9.5 - parent: 407 - - uid: 401 + parent: 2 + - uid: 67 components: - type: Transform pos: 17.5,2.5 - parent: 407 - - uid: 402 + parent: 2 + - uid: 68 components: - type: Transform rot: 1.5707963267948966 rad pos: 20.5,2.5 - parent: 407 + parent: 2 - proto: APECircuitboard entities: - - uid: 2273 + - uid: 69 components: - type: Transform pos: -4.390625,7.619689 - parent: 407 + parent: 2 - proto: Ashtray entities: - - uid: 2225 + - uid: 70 components: - type: Transform pos: -3.2747555,-3.4928942 - parent: 407 + parent: 2 - proto: AtmosDeviceFanTiny entities: - - uid: 211 + - uid: 71 components: - type: Transform pos: 7.5,19.5 - parent: 407 - - uid: 212 + parent: 2 + - uid: 72 components: - type: Transform pos: 13.5,10.5 - parent: 407 - - uid: 386 + parent: 2 + - uid: 73 components: - type: Transform pos: 13.5,12.5 - parent: 407 - - uid: 2151 + parent: 2 + - uid: 74 components: - type: Transform pos: -2.5,17.5 - parent: 407 - - uid: 2163 + parent: 2 + - uid: 75 components: - type: Transform pos: -0.5,17.5 - parent: 407 + parent: 2 - proto: AtmosFixNitrogenMarker entities: - - uid: 1527 + - uid: 76 components: - type: Transform pos: 10.5,-15.5 - parent: 407 - - uid: 1528 + parent: 2 + - uid: 77 components: - type: Transform pos: 9.5,-15.5 - parent: 407 + parent: 2 - proto: AtmosFixOxygenMarker entities: - - uid: 1525 + - uid: 78 components: - type: Transform pos: 9.5,-13.5 - parent: 407 - - uid: 1526 + parent: 2 + - uid: 79 components: - type: Transform pos: 10.5,-13.5 - parent: 407 + parent: 2 - proto: Autolathe entities: - - uid: 1965 + - uid: 80 components: - type: Transform pos: 1.5,9.5 - parent: 407 + parent: 2 - proto: BarSignTheLightbulb entities: - - uid: 1702 + - uid: 81 components: - type: Transform pos: -12.5,2.5 - parent: 407 + parent: 2 - proto: BaseResearchAndDevelopmentPointSource entities: - - uid: 1987 + - uid: 82 components: - type: Transform pos: -5.5,7.5 - parent: 407 + parent: 2 - proto: Bed entities: - - uid: 1875 + - uid: 83 components: - type: Transform pos: 19.5,3.5 - parent: 407 - - uid: 1876 + parent: 2 + - uid: 84 components: - type: Transform pos: 19.5,4.5 - parent: 407 - - uid: 1891 + parent: 2 + - uid: 85 components: - type: Transform pos: 24.5,-3.5 - parent: 407 + parent: 2 - proto: BedsheetCaptain entities: - - uid: 1892 + - uid: 86 components: - type: Transform pos: 24.5,-3.5 - parent: 407 + parent: 2 - proto: BedsheetCMO entities: - - uid: 2269 + - uid: 87 components: - type: Transform pos: 7.5,-4.5 - parent: 407 + parent: 2 - proto: BedsheetMedical entities: - - uid: 1896 + - uid: 88 components: - type: Transform pos: 9.5,-4.5 - parent: 407 - - uid: 1897 + parent: 2 + - uid: 89 components: - type: Transform pos: 5.5,-4.5 - parent: 407 + parent: 2 - proto: BedsheetOrange entities: - - uid: 1879 + - uid: 90 components: - type: Transform pos: 19.5,3.5 - parent: 407 - - uid: 1880 + parent: 2 + - uid: 91 components: - type: Transform pos: 19.5,4.5 - parent: 407 + parent: 2 - proto: BlastDoorScience entities: - - uid: 198 + - uid: 92 components: - type: Transform rot: 1.5707963267948966 rad pos: -5.5,10.5 - parent: 407 + parent: 2 - proto: BluespaceBeaker entities: - - uid: 1740 + - uid: 93 components: - type: Transform pos: 6.3718643,-0.34468752 - parent: 407 + parent: 2 - proto: BoozeDispenser entities: - - uid: 1777 + - uid: 94 components: - type: Transform pos: -8.5,5.5 - parent: 407 + parent: 2 - proto: BoxBodyBag entities: - - uid: 2261 + - uid: 95 components: - type: Transform pos: 2.4605155,-3.2763605 - parent: 407 + parent: 2 - proto: BoxFolderQmClipboard entities: - - uid: 2166 + - uid: 96 components: - type: Transform pos: -1.5352863,14.547528 - parent: 407 + parent: 2 - proto: BoxHandcuff entities: - - uid: 2103 + - uid: 97 components: - type: Transform pos: 18.424814,-4.2784977 - parent: 407 + parent: 2 - proto: BoxLightMixed entities: - - uid: 1670 + - uid: 98 components: - type: Transform pos: -5.592183,-7.3342304 - parent: 407 + parent: 2 - proto: BoxZiptie entities: - - uid: 2104 + - uid: 99 components: - type: Transform pos: 18.65919,-4.4972477 - parent: 407 + parent: 2 - proto: Bucket entities: - - uid: 2067 + - uid: 100 components: - type: Transform pos: -12.511883,3.9677496 - parent: 407 - - uid: 2068 + parent: 2 + - uid: 101 components: - type: Transform pos: -12.730633,3.8739996 - parent: 407 + parent: 2 - proto: ButtonFrameCaution entities: - - uid: 1982 + - uid: 102 components: - type: Transform rot: 1.5707963267948966 rad pos: -19.5,2.5 - parent: 407 + parent: 2 - proto: CableApcExtension entities: - - uid: 363 + - uid: 103 components: - type: Transform pos: 7.5,-1.5 - parent: 407 - - uid: 371 + parent: 2 + - uid: 104 components: - type: Transform pos: -17.5,3.5 - parent: 407 - - uid: 372 + parent: 2 + - uid: 105 components: - type: Transform pos: -20.5,1.5 - parent: 407 - - uid: 373 + parent: 2 + - uid: 106 components: - type: Transform pos: -17.5,4.5 - parent: 407 - - uid: 374 + parent: 2 + - uid: 107 components: - type: Transform pos: -21.5,2.5 - parent: 407 - - uid: 375 + parent: 2 + - uid: 108 components: - type: Transform pos: -18.5,5.5 - parent: 407 - - uid: 683 + parent: 2 + - uid: 109 components: - type: Transform pos: -19.5,-1.5 - parent: 407 - - uid: 684 + parent: 2 + - uid: 110 components: - type: Transform pos: -20.5,-1.5 - parent: 407 - - uid: 685 + parent: 2 + - uid: 111 components: - type: Transform pos: -21.5,-1.5 - parent: 407 - - uid: 686 + parent: 2 + - uid: 112 components: - type: Transform pos: -22.5,-1.5 - parent: 407 - - uid: 687 + parent: 2 + - uid: 113 components: - type: Transform pos: -23.5,-1.5 - parent: 407 - - uid: 688 + parent: 2 + - uid: 114 components: - type: Transform pos: -22.5,-0.5 - parent: 407 - - uid: 689 + parent: 2 + - uid: 115 components: - type: Transform pos: -22.5,0.5 - parent: 407 - - uid: 690 + parent: 2 + - uid: 116 components: - type: Transform pos: -22.5,1.5 - parent: 407 - - uid: 691 + parent: 2 + - uid: 117 components: - type: Transform pos: -20.5,-0.5 - parent: 407 - - uid: 692 + parent: 2 + - uid: 118 components: - type: Transform pos: -20.5,0.5 - parent: 407 - - uid: 693 + parent: 2 + - uid: 119 components: - type: Transform pos: -18.5,4.5 - parent: 407 - - uid: 694 + parent: 2 + - uid: 120 components: - type: Transform pos: -20.5,2.5 - parent: 407 - - uid: 695 + parent: 2 + - uid: 121 components: - type: Transform pos: -22.5,2.5 - parent: 407 - - uid: 696 + parent: 2 + - uid: 122 components: - type: Transform pos: -17.5,2.5 - parent: 407 - - uid: 697 + parent: 2 + - uid: 123 components: - type: Transform pos: -17.5,1.5 - parent: 407 - - uid: 698 + parent: 2 + - uid: 124 components: - type: Transform pos: -17.5,0.5 - parent: 407 - - uid: 699 + parent: 2 + - uid: 125 components: - type: Transform pos: -17.5,-0.5 - parent: 407 - - uid: 700 + parent: 2 + - uid: 126 components: - type: Transform pos: -17.5,-1.5 - parent: 407 - - uid: 701 + parent: 2 + - uid: 127 components: - type: Transform pos: -17.5,-2.5 - parent: 407 - - uid: 702 + parent: 2 + - uid: 128 components: - type: Transform pos: -17.5,-3.5 - parent: 407 - - uid: 703 + parent: 2 + - uid: 129 components: - type: Transform pos: -17.5,-4.5 - parent: 407 - - uid: 704 + parent: 2 + - uid: 130 components: - type: Transform pos: -16.5,0.5 - parent: 407 - - uid: 705 + parent: 2 + - uid: 131 components: - type: Transform pos: -18.5,0.5 - parent: 407 - - uid: 706 + parent: 2 + - uid: 132 components: - type: Transform pos: -17.5,5.5 - parent: 407 - - uid: 707 + parent: 2 + - uid: 133 components: - type: Transform pos: -16.5,5.5 - parent: 407 - - uid: 708 + parent: 2 + - uid: 134 components: - type: Transform pos: -17.5,6.5 - parent: 407 - - uid: 709 + parent: 2 + - uid: 135 components: - type: Transform pos: -17.5,7.5 - parent: 407 - - uid: 710 + parent: 2 + - uid: 136 components: - type: Transform pos: -16.5,7.5 - parent: 407 - - uid: 711 + parent: 2 + - uid: 137 components: - type: Transform pos: -17.5,8.5 - parent: 407 - - uid: 712 + parent: 2 + - uid: 138 components: - type: Transform pos: -18.5,8.5 - parent: 407 - - uid: 713 + parent: 2 + - uid: 139 components: - type: Transform pos: -19.5,8.5 - parent: 407 - - uid: 714 + parent: 2 + - uid: 140 components: - type: Transform pos: -19.5,7.5 - parent: 407 - - uid: 715 + parent: 2 + - uid: 141 components: - type: Transform pos: -19.5,6.5 - parent: 407 - - uid: 716 + parent: 2 + - uid: 142 components: - type: Transform pos: -20.5,6.5 - parent: 407 - - uid: 717 + parent: 2 + - uid: 143 components: - type: Transform pos: -21.5,6.5 - parent: 407 - - uid: 718 + parent: 2 + - uid: 144 components: - type: Transform pos: -21.5,5.5 - parent: 407 - - uid: 719 + parent: 2 + - uid: 145 components: - type: Transform pos: -22.5,5.5 - parent: 407 - - uid: 720 + parent: 2 + - uid: 146 components: - type: Transform pos: -23.5,5.5 - parent: 407 - - uid: 721 + parent: 2 + - uid: 147 components: - type: Transform pos: -24.5,5.5 - parent: 407 - - uid: 722 + parent: 2 + - uid: 148 components: - type: Transform pos: -24.5,4.5 - parent: 407 - - uid: 723 + parent: 2 + - uid: 149 components: - type: Transform pos: -25.5,4.5 - parent: 407 - - uid: 724 + parent: 2 + - uid: 150 components: - type: Transform pos: -25.5,3.5 - parent: 407 - - uid: 725 + parent: 2 + - uid: 151 components: - type: Transform pos: -25.5,2.5 - parent: 407 - - uid: 726 + parent: 2 + - uid: 152 components: - type: Transform pos: -25.5,1.5 - parent: 407 - - uid: 727 + parent: 2 + - uid: 153 components: - type: Transform pos: -25.5,0.5 - parent: 407 - - uid: 728 + parent: 2 + - uid: 154 components: - type: Transform pos: -26.5,0.5 - parent: 407 - - uid: 729 + parent: 2 + - uid: 155 components: - type: Transform pos: -27.5,0.5 - parent: 407 - - uid: 730 + parent: 2 + - uid: 156 components: - type: Transform pos: -28.5,0.5 - parent: 407 - - uid: 731 + parent: 2 + - uid: 157 components: - type: Transform pos: -29.5,0.5 - parent: 407 - - uid: 732 + parent: 2 + - uid: 158 components: - type: Transform pos: -30.5,0.5 - parent: 407 - - uid: 733 + parent: 2 + - uid: 159 components: - type: Transform pos: -30.5,1.5 - parent: 407 - - uid: 734 + parent: 2 + - uid: 160 components: - type: Transform pos: -30.5,2.5 - parent: 407 - - uid: 735 + parent: 2 + - uid: 161 components: - type: Transform pos: -30.5,3.5 - parent: 407 - - uid: 736 + parent: 2 + - uid: 162 components: - type: Transform pos: -30.5,-0.5 - parent: 407 - - uid: 737 + parent: 2 + - uid: 163 components: - type: Transform pos: -6.5,2.5 - parent: 407 - - uid: 738 + parent: 2 + - uid: 164 components: - type: Transform pos: -30.5,-1.5 - parent: 407 - - uid: 739 + parent: 2 + - uid: 165 components: - type: Transform pos: -30.5,-2.5 - parent: 407 - - uid: 740 + parent: 2 + - uid: 166 components: - type: Transform pos: -13.5,-0.5 - parent: 407 - - uid: 741 + parent: 2 + - uid: 167 components: - type: Transform pos: -13.5,-1.5 - parent: 407 - - uid: 742 + parent: 2 + - uid: 168 components: - type: Transform pos: -7.5,2.5 - parent: 407 - - uid: 743 + parent: 2 + - uid: 169 components: - type: Transform pos: -7.5,3.5 - parent: 407 - - uid: 744 + parent: 2 + - uid: 170 components: - type: Transform pos: -7.5,4.5 - parent: 407 - - uid: 745 + parent: 2 + - uid: 171 components: - type: Transform pos: -6.5,4.5 - parent: 407 - - uid: 746 + parent: 2 + - uid: 172 components: - type: Transform pos: -4.5,4.5 - parent: 407 - - uid: 747 + parent: 2 + - uid: 173 components: - type: Transform pos: -5.5,4.5 - parent: 407 - - uid: 748 + parent: 2 + - uid: 174 components: - type: Transform pos: -3.5,4.5 - parent: 407 - - uid: 749 + parent: 2 + - uid: 175 components: - type: Transform pos: -8.5,4.5 - parent: 407 - - uid: 750 + parent: 2 + - uid: 176 components: - type: Transform pos: -9.5,4.5 - parent: 407 - - uid: 751 + parent: 2 + - uid: 177 components: - type: Transform pos: -10.5,4.5 - parent: 407 - - uid: 752 + parent: 2 + - uid: 178 components: - type: Transform pos: -11.5,4.5 - parent: 407 - - uid: 753 + parent: 2 + - uid: 179 components: - type: Transform pos: -12.5,4.5 - parent: 407 - - uid: 754 + parent: 2 + - uid: 180 components: - type: Transform pos: -13.5,4.5 - parent: 407 - - uid: 755 + parent: 2 + - uid: 181 components: - type: Transform pos: -14.5,4.5 - parent: 407 - - uid: 756 + parent: 2 + - uid: 182 components: - type: Transform pos: -13.5,3.5 - parent: 407 - - uid: 757 + parent: 2 + - uid: 183 components: - type: Transform pos: -13.5,5.5 - parent: 407 - - uid: 758 + parent: 2 + - uid: 184 components: - type: Transform pos: -7.5,-1.5 - parent: 407 - - uid: 759 + parent: 2 + - uid: 185 components: - type: Transform pos: -7.5,-0.5 - parent: 407 - - uid: 760 + parent: 2 + - uid: 186 components: - type: Transform pos: -7.5,0.5 - parent: 407 - - uid: 761 + parent: 2 + - uid: 187 components: - type: Transform pos: -8.5,0.5 - parent: 407 - - uid: 762 + parent: 2 + - uid: 188 components: - type: Transform pos: -9.5,0.5 - parent: 407 - - uid: 763 + parent: 2 + - uid: 189 components: - type: Transform pos: -10.5,0.5 - parent: 407 - - uid: 764 + parent: 2 + - uid: 190 components: - type: Transform pos: -11.5,0.5 - parent: 407 - - uid: 765 + parent: 2 + - uid: 191 components: - type: Transform pos: -12.5,0.5 - parent: 407 - - uid: 766 + parent: 2 + - uid: 192 components: - type: Transform pos: -13.5,0.5 - parent: 407 - - uid: 767 + parent: 2 + - uid: 193 components: - type: Transform pos: -14.5,0.5 - parent: 407 - - uid: 768 + parent: 2 + - uid: 194 components: - type: Transform pos: -6.5,0.5 - parent: 407 - - uid: 769 + parent: 2 + - uid: 195 components: - type: Transform pos: -5.5,0.5 - parent: 407 - - uid: 770 + parent: 2 + - uid: 196 components: - type: Transform pos: -4.5,0.5 - parent: 407 - - uid: 771 + parent: 2 + - uid: 197 components: - type: Transform pos: -3.5,0.5 - parent: 407 - - uid: 772 + parent: 2 + - uid: 198 components: - type: Transform pos: -13.5,-2.5 - parent: 407 - - uid: 773 + parent: 2 + - uid: 199 components: - type: Transform pos: -13.5,-3.5 - parent: 407 - - uid: 774 + parent: 2 + - uid: 200 components: - type: Transform pos: -13.5,-4.5 - parent: 407 - - uid: 775 + parent: 2 + - uid: 201 components: - type: Transform pos: -13.5,-5.5 - parent: 407 - - uid: 776 + parent: 2 + - uid: 202 components: - type: Transform pos: -14.5,-5.5 - parent: 407 - - uid: 777 + parent: 2 + - uid: 203 components: - type: Transform pos: -12.5,-5.5 - parent: 407 - - uid: 778 + parent: 2 + - uid: 204 components: - type: Transform pos: -9.5,-0.5 - parent: 407 - - uid: 779 + parent: 2 + - uid: 205 components: - type: Transform pos: -9.5,-1.5 - parent: 407 - - uid: 780 + parent: 2 + - uid: 206 components: - type: Transform pos: -9.5,-2.5 - parent: 407 - - uid: 781 + parent: 2 + - uid: 207 components: - type: Transform pos: -9.5,-3.5 - parent: 407 - - uid: 782 + parent: 2 + - uid: 208 components: - type: Transform pos: -9.5,-4.5 - parent: 407 - - uid: 783 + parent: 2 + - uid: 209 components: - type: Transform pos: -9.5,-5.5 - parent: 407 - - uid: 784 + parent: 2 + - uid: 210 components: - type: Transform pos: -10.5,-5.5 - parent: 407 - - uid: 785 + parent: 2 + - uid: 211 components: - type: Transform pos: -8.5,-5.5 - parent: 407 - - uid: 786 + parent: 2 + - uid: 212 components: - type: Transform pos: -5.5,-0.5 - parent: 407 - - uid: 787 + parent: 2 + - uid: 213 components: - type: Transform pos: -5.5,-1.5 - parent: 407 - - uid: 788 + parent: 2 + - uid: 214 components: - type: Transform pos: -5.5,-2.5 - parent: 407 - - uid: 789 + parent: 2 + - uid: 215 components: - type: Transform pos: -5.5,-3.5 - parent: 407 - - uid: 790 + parent: 2 + - uid: 216 components: - type: Transform pos: -4.5,-3.5 - parent: 407 - - uid: 791 + parent: 2 + - uid: 217 components: - type: Transform pos: -2.5,-5.5 - parent: 407 - - uid: 792 + parent: 2 + - uid: 218 components: - type: Transform pos: -1.5,-5.5 - parent: 407 - - uid: 793 + parent: 2 + - uid: 219 components: - type: Transform pos: -0.5,-5.5 - parent: 407 - - uid: 794 + parent: 2 + - uid: 220 components: - type: Transform pos: -0.5,-4.5 - parent: 407 - - uid: 795 + parent: 2 + - uid: 221 components: - type: Transform pos: -0.5,-3.5 - parent: 407 - - uid: 796 + parent: 2 + - uid: 222 components: - type: Transform pos: -0.5,-2.5 - parent: 407 - - uid: 797 + parent: 2 + - uid: 223 components: - type: Transform pos: -0.5,-1.5 - parent: 407 - - uid: 798 + parent: 2 + - uid: 224 components: - type: Transform pos: -0.5,-0.5 - parent: 407 - - uid: 799 + parent: 2 + - uid: 225 components: - type: Transform pos: -0.5,0.5 - parent: 407 - - uid: 800 + parent: 2 + - uid: 226 components: - type: Transform pos: -0.5,1.5 - parent: 407 - - uid: 801 + parent: 2 + - uid: 227 components: - type: Transform pos: -0.5,2.5 - parent: 407 - - uid: 802 + parent: 2 + - uid: 228 components: - type: Transform pos: -0.5,3.5 - parent: 407 - - uid: 803 + parent: 2 + - uid: 229 components: - type: Transform pos: -0.5,4.5 - parent: 407 - - uid: 804 + parent: 2 + - uid: 230 components: - type: Transform pos: -0.5,-6.5 - parent: 407 - - uid: 805 + parent: 2 + - uid: 231 components: - type: Transform pos: -0.5,-7.5 - parent: 407 - - uid: 806 + parent: 2 + - uid: 232 components: - type: Transform pos: -0.5,-8.5 - parent: 407 - - uid: 807 + parent: 2 + - uid: 233 components: - type: Transform pos: -0.5,-9.5 - parent: 407 - - uid: 808 + parent: 2 + - uid: 234 components: - type: Transform pos: -0.5,-10.5 - parent: 407 - - uid: 809 + parent: 2 + - uid: 235 components: - type: Transform pos: -0.5,-11.5 - parent: 407 - - uid: 810 + parent: 2 + - uid: 236 components: - type: Transform pos: -0.5,-12.5 - parent: 407 - - uid: 811 + parent: 2 + - uid: 237 components: - type: Transform pos: -1.5,-7.5 - parent: 407 - - uid: 812 + parent: 2 + - uid: 238 components: - type: Transform pos: -2.5,-7.5 - parent: 407 - - uid: 813 + parent: 2 + - uid: 239 components: - type: Transform pos: -3.5,-7.5 - parent: 407 - - uid: 814 + parent: 2 + - uid: 240 components: - type: Transform pos: -4.5,-7.5 - parent: 407 - - uid: 815 + parent: 2 + - uid: 241 components: - type: Transform pos: -5.5,-7.5 - parent: 407 - - uid: 816 + parent: 2 + - uid: 242 components: - type: Transform pos: -5.5,-6.5 - parent: 407 - - uid: 817 - components: - - type: Transform - pos: 0.5,-6.5 - parent: 407 - - uid: 818 - components: - - type: Transform - pos: 1.5,-6.5 - parent: 407 - - uid: 819 - components: - - type: Transform - pos: 2.5,-6.5 - parent: 407 - - uid: 820 - components: - - type: Transform - pos: 3.5,-6.5 - parent: 407 - - uid: 821 - components: - - type: Transform - pos: 4.5,-6.5 - parent: 407 - - uid: 822 - components: - - type: Transform - pos: 7.5,-17.5 - parent: 407 - - uid: 823 - components: - - type: Transform - pos: 7.5,-16.5 - parent: 407 - - uid: 824 - components: - - type: Transform - pos: 7.5,-15.5 - parent: 407 - - uid: 825 - components: - - type: Transform - pos: 6.5,-15.5 - parent: 407 - - uid: 826 - components: - - type: Transform - pos: 5.5,-15.5 - parent: 407 - - uid: 827 - components: - - type: Transform - pos: 5.5,-14.5 - parent: 407 - - uid: 828 - components: - - type: Transform - pos: 5.5,-13.5 - parent: 407 - - uid: 829 - components: - - type: Transform - pos: 4.5,-13.5 - parent: 407 - - uid: 830 - components: - - type: Transform - pos: 4.5,-12.5 - parent: 407 - - uid: 831 - components: - - type: Transform - pos: 4.5,-11.5 - parent: 407 - - uid: 832 - components: - - type: Transform - pos: 4.5,-10.5 - parent: 407 - - uid: 833 - components: - - type: Transform - pos: 4.5,-9.5 - parent: 407 - - uid: 834 - components: - - type: Transform - pos: 3.5,-12.5 - parent: 407 - - uid: 835 - components: - - type: Transform - pos: 2.5,-12.5 - parent: 407 - - uid: 836 - components: - - type: Transform - pos: 1.5,-12.5 - parent: 407 - - uid: 837 - components: - - type: Transform - pos: 5.5,-11.5 - parent: 407 - - uid: 838 - components: - - type: Transform - pos: 6.5,-11.5 - parent: 407 - - uid: 839 - components: - - type: Transform - pos: 7.5,-11.5 - parent: 407 - - uid: 840 - components: - - type: Transform - pos: 8.5,-11.5 - parent: 407 - - uid: 841 - components: - - type: Transform - pos: 9.5,-11.5 - parent: 407 - - uid: 842 - components: - - type: Transform - pos: 10.5,-11.5 - parent: 407 - - uid: 843 - components: - - type: Transform - pos: 11.5,-11.5 - parent: 407 - - uid: 844 - components: - - type: Transform - pos: 9.5,-1.5 - parent: 407 - - uid: 845 - components: - - type: Transform - pos: 9.5,-2.5 - parent: 407 - - uid: 846 - components: - - type: Transform - pos: 10.5,-2.5 - parent: 407 - - uid: 847 - components: - - type: Transform - pos: 11.5,-2.5 - parent: 407 - - uid: 848 - components: - - type: Transform - pos: 11.5,-3.5 - parent: 407 - - uid: 849 - components: - - type: Transform - pos: 11.5,-4.5 - parent: 407 - - uid: 850 - components: - - type: Transform - pos: 8.5,-2.5 - parent: 407 - - uid: 851 - components: - - type: Transform - pos: 7.5,-2.5 - parent: 407 - - uid: 852 - components: - - type: Transform - pos: 8.5,-3.5 - parent: 407 - - uid: 853 - components: - - type: Transform - pos: 8.5,-4.5 - parent: 407 - - uid: 854 - components: - - type: Transform - pos: 6.5,-2.5 - parent: 407 - - uid: 855 - components: - - type: Transform - pos: 5.5,-2.5 - parent: 407 - - uid: 856 - components: - - type: Transform - pos: 5.5,-3.5 - parent: 407 - - uid: 857 - components: - - type: Transform - pos: 5.5,-4.5 - parent: 407 - - uid: 858 - components: - - type: Transform - pos: 4.5,-2.5 - parent: 407 - - uid: 859 - components: - - type: Transform - pos: 3.5,-2.5 - parent: 407 - - uid: 860 - components: - - type: Transform - pos: 3.5,-3.5 - parent: 407 - - uid: 861 - components: - - type: Transform - pos: 3.5,-4.5 - parent: 407 - - uid: 862 - components: - - type: Transform - pos: 3.5,-1.5 - parent: 407 - - uid: 863 - components: - - type: Transform - pos: 3.5,-0.5 - parent: 407 - - uid: 864 - components: - - type: Transform - pos: 3.5,0.5 - parent: 407 - - uid: 865 - components: - - type: Transform - pos: 3.5,1.5 - parent: 407 - - uid: 866 - components: - - type: Transform - pos: 7.5,-0.5 - parent: 407 - - uid: 867 - components: - - type: Transform - pos: 7.5,0.5 - parent: 407 - - uid: 868 - components: - - type: Transform - pos: 7.5,1.5 - parent: 407 - - uid: 869 - components: - - type: Transform - pos: 6.5,0.5 - parent: 407 - - uid: 870 - components: - - type: Transform - pos: 5.5,0.5 - parent: 407 - - uid: 871 - components: - - type: Transform - pos: 4.5,0.5 - parent: 407 - - uid: 872 - components: - - type: Transform - pos: 8.5,0.5 - parent: 407 - - uid: 873 - components: - - type: Transform - pos: 9.5,0.5 - parent: 407 - - uid: 874 - components: - - type: Transform - pos: 10.5,0.5 - parent: 407 - - uid: 875 - components: - - type: Transform - pos: 11.5,0.5 - parent: 407 - - uid: 876 - components: - - type: Transform - pos: 11.5,-0.5 - parent: 407 - - uid: 877 - components: - - type: Transform - pos: 11.5,-1.5 - parent: 407 - - uid: 878 - components: - - type: Transform - pos: 11.5,1.5 - parent: 407 - - uid: 879 - components: - - type: Transform - pos: 12.5,1.5 - parent: 407 - - uid: 880 - components: - - type: Transform - pos: 13.5,1.5 - parent: 407 - - uid: 881 - components: - - type: Transform - pos: 13.5,-0.5 - parent: 407 - - uid: 882 - components: - - type: Transform - pos: 13.5,-0.5 - parent: 407 - - uid: 883 - components: - - type: Transform - pos: 12.5,-0.5 - parent: 407 - - uid: 884 - components: - - type: Transform - pos: 4.5,6.5 - parent: 407 - - uid: 885 - components: - - type: Transform - pos: 4.5,5.5 - parent: 407 - - uid: 886 - components: - - type: Transform - pos: 4.5,4.5 - parent: 407 - - uid: 887 - components: - - type: Transform - pos: 3.5,4.5 - parent: 407 - - uid: 888 - components: - - type: Transform - pos: 2.5,4.5 - parent: 407 - - uid: 889 - components: - - type: Transform - pos: 1.5,4.5 - parent: 407 - - uid: 890 - components: - - type: Transform - pos: 5.5,4.5 - parent: 407 - - uid: 891 - components: - - type: Transform - pos: 6.5,4.5 - parent: 407 - - uid: 892 - components: - - type: Transform - pos: 7.5,4.5 - parent: 407 - - uid: 893 - components: - - type: Transform - pos: 8.5,4.5 - parent: 407 - - uid: 894 - components: - - type: Transform - pos: 9.5,4.5 - parent: 407 - - uid: 895 - components: - - type: Transform - pos: 10.5,4.5 - parent: 407 - - uid: 896 - components: - - type: Transform - pos: 11.5,4.5 - parent: 407 - - uid: 897 - components: - - type: Transform - pos: 12.5,4.5 - parent: 407 - - uid: 898 - components: - - type: Transform - pos: 12.5,5.5 - parent: 407 - - uid: 899 - components: - - type: Transform - pos: 13.5,5.5 - parent: 407 - - uid: 900 - components: - - type: Transform - pos: 12.5,3.5 - parent: 407 - - uid: 901 - components: - - type: Transform - pos: 13.5,3.5 - parent: 407 - - uid: 902 - components: - - type: Transform - pos: 17.5,2.5 - parent: 407 - - uid: 903 - components: - - type: Transform - pos: 16.5,2.5 - parent: 407 - - uid: 904 - components: - - type: Transform - pos: 16.5,3.5 - parent: 407 - - uid: 905 - components: - - type: Transform - pos: 16.5,4.5 - parent: 407 - - uid: 906 - components: - - type: Transform - pos: 16.5,5.5 - parent: 407 - - uid: 907 - components: - - type: Transform - pos: 16.5,6.5 - parent: 407 - - uid: 908 - components: - - type: Transform - pos: 15.5,6.5 - parent: 407 - - uid: 909 - components: - - type: Transform - pos: 14.5,6.5 - parent: 407 - - uid: 910 - components: - - type: Transform - pos: 16.5,1.5 - parent: 407 - - uid: 911 - components: - - type: Transform - pos: 16.5,0.5 - parent: 407 - - uid: 912 - components: - - type: Transform - pos: 16.5,-0.5 - parent: 407 - - uid: 913 - components: - - type: Transform - pos: 16.5,-1.5 - parent: 407 - - uid: 914 - components: - - type: Transform - pos: 16.5,-2.5 - parent: 407 - - uid: 915 - components: - - type: Transform - pos: 16.5,-3.5 - parent: 407 - - uid: 916 - components: - - type: Transform - pos: 16.5,-4.5 - parent: 407 - - uid: 917 - components: - - type: Transform - pos: 16.5,-5.5 - parent: 407 - - uid: 918 - components: - - type: Transform - pos: 15.5,-5.5 - parent: 407 - - uid: 919 - components: - - type: Transform - pos: 18.5,-5.5 - parent: 407 - - uid: 920 - components: - - type: Transform - pos: 18.5,-5.5 - parent: 407 - - uid: 921 - components: - - type: Transform - pos: 17.5,-5.5 - parent: 407 - - uid: 922 - components: - - type: Transform - pos: 17.5,-3.5 - parent: 407 - - uid: 923 - components: - - type: Transform - pos: 18.5,-3.5 - parent: 407 - - uid: 924 - components: - - type: Transform - pos: 15.5,-3.5 - parent: 407 - - uid: 925 - components: - - type: Transform - pos: 15.5,0.5 - parent: 407 - - uid: 926 - components: - - type: Transform - pos: 17.5,0.5 - parent: 407 - - uid: 927 - components: - - type: Transform - pos: 18.5,0.5 - parent: 407 - - uid: 928 - components: - - type: Transform - pos: 19.5,0.5 - parent: 407 - - uid: 929 - components: - - type: Transform - pos: 20.5,2.5 - parent: 407 - - uid: 930 - components: - - type: Transform - pos: 19.5,2.5 - parent: 407 - - uid: 931 - components: - - type: Transform - pos: 21.5,2.5 - parent: 407 - - uid: 932 - components: - - type: Transform - pos: 22.5,2.5 - parent: 407 - - uid: 933 - components: - - type: Transform - pos: 22.5,1.5 - parent: 407 - - uid: 934 - components: - - type: Transform - pos: 22.5,-0.5 - parent: 407 - - uid: 935 - components: - - type: Transform - pos: 22.5,0.5 - parent: 407 - - uid: 936 - components: - - type: Transform - pos: 21.5,-0.5 - parent: 407 - - uid: 937 - components: - - type: Transform - pos: 20.5,-0.5 - parent: 407 - - uid: 938 - components: - - type: Transform - pos: 21.5,1.5 - parent: 407 - - uid: 939 - components: - - type: Transform - pos: 20.5,1.5 - parent: 407 - - uid: 940 - components: - - type: Transform - pos: 22.5,-1.5 - parent: 407 - - uid: 941 - components: - - type: Transform - pos: 22.5,-2.5 - parent: 407 - - uid: 942 - components: - - type: Transform - pos: 22.5,-3.5 - parent: 407 - - uid: 943 - components: - - type: Transform - pos: 23.5,-3.5 - parent: 407 - - uid: 944 - components: - - type: Transform - pos: 24.5,-3.5 - parent: 407 - - uid: 945 - components: - - type: Transform - pos: 25.5,-3.5 - parent: 407 - - uid: 946 - components: - - type: Transform - pos: 25.5,-4.5 - parent: 407 - - uid: 947 - components: - - type: Transform - pos: 24.5,-4.5 - parent: 407 - - uid: 948 - components: - - type: Transform - pos: 26.5,-3.5 - parent: 407 - - uid: 949 - components: - - type: Transform - pos: 26.5,-2.5 - parent: 407 - - uid: 950 - components: - - type: Transform - pos: 23.5,0.5 - parent: 407 - - uid: 951 - components: - - type: Transform - pos: 24.5,0.5 - parent: 407 - - uid: 952 - components: - - type: Transform - pos: 25.5,0.5 - parent: 407 - - uid: 953 - components: - - type: Transform - pos: 26.5,0.5 - parent: 407 - - uid: 954 - components: - - type: Transform - pos: 27.5,0.5 - parent: 407 - - uid: 955 - components: - - type: Transform - pos: 27.5,-0.5 - parent: 407 - - uid: 956 - components: - - type: Transform - pos: 27.5,1.5 - parent: 407 - - uid: 957 - components: - - type: Transform - pos: 27.5,2.5 - parent: 407 - - uid: 958 - components: - - type: Transform - pos: 27.5,3.5 - parent: 407 - - uid: 959 - components: - - type: Transform - pos: 26.5,3.5 - parent: 407 - - uid: 960 - components: - - type: Transform - pos: 26.5,4.5 - parent: 407 - - uid: 961 - components: - - type: Transform - pos: 25.5,4.5 - parent: 407 - - uid: 962 - components: - - type: Transform - pos: 25.5,5.5 - parent: 407 - - uid: 963 - components: - - type: Transform - pos: 24.5,5.5 - parent: 407 - - uid: 964 - components: - - type: Transform - pos: 24.5,4.5 - parent: 407 - - uid: 965 - components: - - type: Transform - pos: 23.5,4.5 - parent: 407 - - uid: 966 - components: - - type: Transform - pos: 22.5,4.5 - parent: 407 - - uid: 967 - components: - - type: Transform - pos: 22.5,3.5 - parent: 407 - - uid: 968 - components: - - type: Transform - pos: 19.5,3.5 - parent: 407 - - uid: 969 - components: - - type: Transform - pos: 19.5,4.5 - parent: 407 - - uid: 970 - components: - - type: Transform - pos: 19.5,5.5 - parent: 407 - - uid: 971 - components: - - type: Transform - pos: 19.5,6.5 - parent: 407 - - uid: 972 - components: - - type: Transform - pos: -0.5,13.5 - parent: 407 - - uid: 973 - components: - - type: Transform - pos: 0.5,13.5 - parent: 407 - - uid: 974 - components: - - type: Transform - pos: 1.5,13.5 - parent: 407 - - uid: 975 - components: - - type: Transform - pos: 1.5,14.5 - parent: 407 - - uid: 976 - components: - - type: Transform - pos: 1.5,15.5 - parent: 407 - - uid: 977 - components: - - type: Transform - pos: 1.5,12.5 - parent: 407 - - uid: 978 - components: - - type: Transform - pos: 1.5,11.5 - parent: 407 - - uid: 979 - components: - - type: Transform - pos: 1.5,10.5 - parent: 407 - - uid: 980 - components: - - type: Transform - pos: 1.5,9.5 - parent: 407 - - uid: 981 - components: - - type: Transform - pos: 1.5,8.5 - parent: 407 - - uid: 982 - components: - - type: Transform - pos: 1.5,7.5 - parent: 407 - - uid: 983 - components: - - type: Transform - pos: -2.5,6.5 - parent: 407 - - uid: 984 - components: - - type: Transform - pos: -2.5,7.5 - parent: 407 - - uid: 985 - components: - - type: Transform - pos: -2.5,8.5 - parent: 407 - - uid: 986 - components: - - type: Transform - pos: -2.5,9.5 - parent: 407 - - uid: 987 - components: - - type: Transform - pos: -2.5,10.5 - parent: 407 - - uid: 988 - components: - - type: Transform - pos: -2.5,11.5 - parent: 407 - - uid: 989 - components: - - type: Transform - pos: -1.5,11.5 - parent: 407 - - uid: 990 - components: - - type: Transform - pos: -3.5,8.5 - parent: 407 - - uid: 991 - components: - - type: Transform - pos: -4.5,8.5 - parent: 407 - - uid: 992 - components: - - type: Transform - pos: -5.5,8.5 - parent: 407 - - uid: 993 - components: - - type: Transform - pos: -4.5,9.5 - parent: 407 - - uid: 994 - components: - - type: Transform - pos: -3.5,11.5 - parent: 407 - - uid: 995 - components: - - type: Transform - pos: 9.5,17.5 - parent: 407 - - uid: 996 - components: - - type: Transform - pos: 9.5,16.5 - parent: 407 - - uid: 997 - components: - - type: Transform - pos: 9.5,15.5 - parent: 407 - - uid: 998 - components: - - type: Transform - pos: 9.5,14.5 - parent: 407 - - uid: 999 - components: - - type: Transform - pos: 9.5,13.5 - parent: 407 - - uid: 1000 - components: - - type: Transform - pos: 9.5,12.5 - parent: 407 - - uid: 1001 - components: - - type: Transform - pos: 9.5,11.5 - parent: 407 - - uid: 1002 - components: - - type: Transform - pos: 9.5,10.5 - parent: 407 - - uid: 1003 - components: - - type: Transform - pos: 9.5,9.5 - parent: 407 - - uid: 1004 - components: - - type: Transform - pos: 9.5,8.5 - parent: 407 - - uid: 1005 - components: - - type: Transform - pos: 9.5,7.5 - parent: 407 - - uid: 1006 - components: - - type: Transform - pos: 8.5,7.5 - parent: 407 - - uid: 1007 - components: - - type: Transform - pos: 7.5,7.5 - parent: 407 - - uid: 1008 - components: - - type: Transform - pos: 10.5,11.5 - parent: 407 - - uid: 1009 - components: - - type: Transform - pos: 11.5,11.5 - parent: 407 - - uid: 1012 - components: - - type: Transform - pos: 8.5,16.5 - parent: 407 - - uid: 1013 - components: - - type: Transform - pos: 7.5,16.5 - parent: 407 - - uid: 1014 - components: - - type: Transform - pos: 6.5,16.5 - parent: 407 - - uid: 1015 - components: - - type: Transform - pos: 5.5,16.5 - parent: 407 - - uid: 1016 - components: - - type: Transform - pos: 6.5,15.5 - parent: 407 - - uid: 1017 - components: - - type: Transform - pos: 6.5,14.5 - parent: 407 - - uid: 1018 - components: - - type: Transform - pos: 6.5,13.5 - parent: 407 - - uid: 1019 - components: - - type: Transform - pos: 6.5,12.5 - parent: 407 - - uid: 1020 - components: - - type: Transform - pos: 6.5,11.5 - parent: 407 - - uid: 1021 - components: - - type: Transform - pos: 6.5,10.5 - parent: 407 - - uid: 1022 - components: - - type: Transform - pos: 6.5,9.5 - parent: 407 - - uid: 1023 - components: - - type: Transform - pos: 6.5,8.5 - parent: 407 - - uid: 1024 - components: - - type: Transform - pos: 6.5,7.5 - parent: 407 - - uid: 1571 - components: - - type: Transform - pos: 0.5,15.5 - parent: 407 - - uid: 1656 - components: - - type: Transform - pos: -0.5,15.5 - parent: 407 - - uid: 1725 - components: - - type: Transform - pos: -1.5,15.5 - parent: 407 - - uid: 1886 - components: - - type: Transform - pos: -2.5,15.5 - parent: 407 - - uid: 2186 - components: - - type: Transform - pos: 5.5,-6.5 - parent: 407 - - uid: 2187 - components: - - type: Transform - pos: 5.5,-7.5 - parent: 407 - - uid: 2188 - components: - - type: Transform - pos: 5.5,-8.5 - parent: 407 - - uid: 2189 - components: - - type: Transform - pos: 6.5,-8.5 - parent: 407 - - uid: 2190 - components: - - type: Transform - pos: 7.5,-8.5 - parent: 407 - - uid: 2191 - components: - - type: Transform - pos: 8.5,-8.5 - parent: 407 - - uid: 2192 - components: - - type: Transform - pos: 9.5,-8.5 - parent: 407 - - uid: 2193 - components: - - type: Transform - pos: 10.5,-8.5 - parent: 407 -- proto: CableHV - entities: + parent: 2 - uid: 243 - components: - - type: Transform - pos: 22.5,4.5 - parent: 407 - - uid: 412 - components: - - type: Transform - pos: -21.5,-0.5 - parent: 407 - - uid: 413 - components: - - type: Transform - pos: -22.5,-0.5 - parent: 407 - - uid: 414 - components: - - type: Transform - pos: -23.5,-0.5 - parent: 407 - - uid: 415 - components: - - type: Transform - pos: -23.5,0.5 - parent: 407 - - uid: 416 - components: - - type: Transform - pos: -23.5,1.5 - parent: 407 - - uid: 417 - components: - - type: Transform - pos: -22.5,1.5 - parent: 407 - - uid: 418 - components: - - type: Transform - pos: -21.5,1.5 - parent: 407 - - uid: 419 - components: - - type: Transform - pos: -21.5,0.5 - parent: 407 - - uid: 420 - components: - - type: Transform - pos: -22.5,0.5 - parent: 407 - - uid: 421 - components: - - type: Transform - pos: -22.5,2.5 - parent: 407 - - uid: 422 - components: - - type: Transform - pos: -22.5,3.5 - parent: 407 - - uid: 423 - components: - - type: Transform - pos: -21.5,3.5 - parent: 407 - - uid: 424 - components: - - type: Transform - pos: -20.5,3.5 - parent: 407 - - uid: 425 - components: - - type: Transform - pos: -19.5,3.5 - parent: 407 - - uid: 427 - components: - - type: Transform - pos: -18.5,3.5 - parent: 407 - - uid: 428 - components: - - type: Transform - pos: -18.5,2.5 - parent: 407 - - uid: 429 - components: - - type: Transform - pos: -18.5,1.5 - parent: 407 - - uid: 430 - components: - - type: Transform - pos: -18.5,0.5 - parent: 407 - - uid: 431 - components: - - type: Transform - pos: -18.5,-0.5 - parent: 407 - - uid: 432 - components: - - type: Transform - pos: -18.5,-1.5 - parent: 407 - - uid: 433 - components: - - type: Transform - pos: -18.5,-2.5 - parent: 407 - - uid: 434 - components: - - type: Transform - pos: -18.5,-3.5 - parent: 407 - - uid: 435 - components: - - type: Transform - pos: -19.5,-3.5 - parent: 407 - - uid: 436 - components: - - type: Transform - pos: -17.5,0.5 - parent: 407 - - uid: 437 - components: - - type: Transform - pos: -16.5,0.5 - parent: 407 - - uid: 438 - components: - - type: Transform - pos: -15.5,0.5 - parent: 407 - - uid: 439 - components: - - type: Transform - pos: -14.5,0.5 - parent: 407 - - uid: 440 - components: - - type: Transform - pos: -13.5,0.5 - parent: 407 - - uid: 441 - components: - - type: Transform - pos: -12.5,0.5 - parent: 407 - - uid: 442 - components: - - type: Transform - pos: -11.5,0.5 - parent: 407 - - uid: 443 - components: - - type: Transform - pos: -10.5,0.5 - parent: 407 - - uid: 444 - components: - - type: Transform - pos: -9.5,0.5 - parent: 407 - - uid: 445 - components: - - type: Transform - pos: -8.5,0.5 - parent: 407 - - uid: 446 - components: - - type: Transform - pos: -7.5,0.5 - parent: 407 - - uid: 447 - components: - - type: Transform - pos: -6.5,0.5 - parent: 407 - - uid: 448 - components: - - type: Transform - pos: -5.5,0.5 - parent: 407 - - uid: 449 - components: - - type: Transform - pos: -4.5,0.5 - parent: 407 - - uid: 450 - components: - - type: Transform - pos: -3.5,0.5 - parent: 407 - - uid: 451 - components: - - type: Transform - pos: -2.5,0.5 - parent: 407 - - uid: 452 - components: - - type: Transform - pos: -1.5,0.5 - parent: 407 - - uid: 453 - components: - - type: Transform - pos: -1.5,1.5 - parent: 407 - - uid: 454 - components: - - type: Transform - pos: -1.5,2.5 - parent: 407 - - uid: 455 - components: - - type: Transform - pos: -1.5,3.5 - parent: 407 - - uid: 456 - components: - - type: Transform - pos: -1.5,4.5 - parent: 407 - - uid: 457 - components: - - type: Transform - pos: -1.5,5.5 - parent: 407 - - uid: 458 - components: - - type: Transform - pos: -1.5,6.5 - parent: 407 - - uid: 459 - components: - - type: Transform - pos: -1.5,7.5 - parent: 407 - - uid: 460 - components: - - type: Transform - pos: -2.5,7.5 - parent: 407 - - uid: 461 - components: - - type: Transform - pos: -3.5,7.5 - parent: 407 - - uid: 462 - components: - - type: Transform - pos: -4.5,7.5 - parent: 407 - - uid: 463 - components: - - type: Transform - pos: -5.5,7.5 - parent: 407 - - uid: 464 - components: - - type: Transform - pos: -6.5,7.5 - parent: 407 - - uid: 465 - components: - - type: Transform - pos: -1.5,-0.5 - parent: 407 - - uid: 466 - components: - - type: Transform - pos: -1.5,-1.5 - parent: 407 - - uid: 467 - components: - - type: Transform - pos: -1.5,-2.5 - parent: 407 - - uid: 468 - components: - - type: Transform - pos: -1.5,-3.5 - parent: 407 - - uid: 469 - components: - - type: Transform - pos: -1.5,-4.5 - parent: 407 - - uid: 470 - components: - - type: Transform - pos: -1.5,-5.5 - parent: 407 - - uid: 471 - components: - - type: Transform - pos: -1.5,-6.5 - parent: 407 - - uid: 472 - components: - - type: Transform - pos: -0.5,-6.5 - parent: 407 - - uid: 473 components: - type: Transform pos: 0.5,-6.5 - parent: 407 - - uid: 474 + parent: 2 + - uid: 244 components: - type: Transform pos: 1.5,-6.5 - parent: 407 - - uid: 475 + parent: 2 + - uid: 245 components: - type: Transform pos: 2.5,-6.5 - parent: 407 - - uid: 476 - components: - - type: Transform - pos: 2.5,-7.5 - parent: 407 - - uid: 477 - components: - - type: Transform - pos: 2.5,-8.5 - parent: 407 - - uid: 478 - components: - - type: Transform - pos: 2.5,-9.5 - parent: 407 - - uid: 479 - components: - - type: Transform - pos: -0.5,5.5 - parent: 407 - - uid: 480 - components: - - type: Transform - pos: 0.5,5.5 - parent: 407 - - uid: 481 - components: - - type: Transform - pos: 1.5,5.5 - parent: 407 - - uid: 482 - components: - - type: Transform - pos: 2.5,5.5 - parent: 407 - - uid: 483 - components: - - type: Transform - pos: 3.5,5.5 - parent: 407 - - uid: 484 - components: - - type: Transform - pos: 4.5,5.5 - parent: 407 - - uid: 485 - components: - - type: Transform - pos: 5.5,5.5 - parent: 407 - - uid: 486 - components: - - type: Transform - pos: 6.5,5.5 - parent: 407 - - uid: 487 - components: - - type: Transform - pos: 7.5,5.5 - parent: 407 - - uid: 488 - components: - - type: Transform - pos: 8.5,5.5 - parent: 407 - - uid: 489 - components: - - type: Transform - pos: 8.5,6.5 - parent: 407 - - uid: 490 - components: - - type: Transform - pos: 8.5,7.5 - parent: 407 - - uid: 491 - components: - - type: Transform - pos: 9.5,7.5 - parent: 407 - - uid: 492 - components: - - type: Transform - pos: 10.5,7.5 - parent: 407 - - uid: 493 - components: - - type: Transform - pos: 11.5,7.5 - parent: 407 - - uid: 494 - components: - - type: Transform - pos: 8.5,4.5 - parent: 407 - - uid: 495 - components: - - type: Transform - pos: 9.5,4.5 - parent: 407 - - uid: 496 - components: - - type: Transform - pos: 10.5,4.5 - parent: 407 - - uid: 497 - components: - - type: Transform - pos: 11.5,4.5 - parent: 407 - - uid: 498 - components: - - type: Transform - pos: 12.5,4.5 - parent: 407 - - uid: 499 - components: - - type: Transform - pos: 13.5,4.5 - parent: 407 - - uid: 500 - components: - - type: Transform - pos: 14.5,4.5 - parent: 407 - - uid: 501 - components: - - type: Transform - pos: 15.5,4.5 - parent: 407 - - uid: 502 - components: - - type: Transform - pos: 16.5,4.5 - parent: 407 - - uid: 503 - components: - - type: Transform - pos: 16.5,3.5 - parent: 407 - - uid: 504 - components: - - type: Transform - pos: 16.5,2.5 - parent: 407 - - uid: 505 - components: - - type: Transform - pos: 16.5,1.5 - parent: 407 - - uid: 506 - components: - - type: Transform - pos: 16.5,0.5 - parent: 407 - - uid: 507 - components: - - type: Transform - pos: 17.5,0.5 - parent: 407 - - uid: 508 - components: - - type: Transform - pos: 18.5,0.5 - parent: 407 - - uid: 509 - components: - - type: Transform - pos: 19.5,0.5 - parent: 407 - - uid: 510 - components: - - type: Transform - pos: 20.5,0.5 - parent: 407 - - uid: 511 - components: - - type: Transform - pos: 21.5,0.5 - parent: 407 - - uid: 512 - components: - - type: Transform - pos: 21.5,1.5 - parent: 407 - - uid: 513 - components: - - type: Transform - pos: 21.5,2.5 - parent: 407 - - uid: 514 - components: - - type: Transform - pos: 21.5,3.5 - parent: 407 - - uid: 515 - components: - - type: Transform - pos: 21.5,4.5 - parent: 407 - - uid: 516 - components: - - type: Transform - pos: 15.5,0.5 - parent: 407 - - uid: 517 - components: - - type: Transform - pos: 14.5,0.5 - parent: 407 - - uid: 518 - components: - - type: Transform - pos: 13.5,0.5 - parent: 407 - - uid: 519 - components: - - type: Transform - pos: 12.5,0.5 - parent: 407 - - uid: 520 - components: - - type: Transform - pos: 11.5,0.5 - parent: 407 - - uid: 521 - components: - - type: Transform - pos: 11.5,-0.5 - parent: 407 - - uid: 522 - components: - - type: Transform - pos: 11.5,-1.5 - parent: 407 - - uid: 523 - components: - - type: Transform - pos: 11.5,-2.5 - parent: 407 - - uid: 524 - components: - - type: Transform - pos: 4.5,-2.5 - parent: 407 - - uid: 525 - components: - - type: Transform - pos: 5.5,-2.5 - parent: 407 - - uid: 526 - components: - - type: Transform - pos: 6.5,-2.5 - parent: 407 - - uid: 527 - components: - - type: Transform - pos: 7.5,-2.5 - parent: 407 - - uid: 528 - components: - - type: Transform - pos: 8.5,-2.5 - parent: 407 - - uid: 529 - components: - - type: Transform - pos: 9.5,-2.5 - parent: 407 - - uid: 531 - components: - - type: Transform - pos: 10.5,-2.5 - parent: 407 - - uid: 532 - components: - - type: Transform - pos: 3.5,-3.5 - parent: 407 - - uid: 533 - components: - - type: Transform - pos: 3.5,-2.5 - parent: 407 - - uid: 534 - components: - - type: Transform - pos: 3.5,-1.5 - parent: 407 - - uid: 535 - components: - - type: Transform - pos: 3.5,-0.5 - parent: 407 - - uid: 536 - components: - - type: Transform - pos: 3.5,0.5 - parent: 407 - - uid: 537 - components: - - type: Transform - pos: 2.5,0.5 - parent: 407 - - uid: 538 - components: - - type: Transform - pos: 1.5,0.5 - parent: 407 - - uid: 539 - components: - - type: Transform - pos: 0.5,0.5 - parent: 407 - - uid: 540 - components: - - type: Transform - pos: -0.5,0.5 - parent: 407 - - uid: 541 + parent: 2 + - uid: 246 components: - type: Transform pos: 3.5,-6.5 - parent: 407 - - uid: 542 + parent: 2 + - uid: 247 components: - type: Transform - pos: 3.5,-5.5 - parent: 407 - - uid: 543 + pos: 4.5,-6.5 + parent: 2 + - uid: 248 + components: + - type: Transform + pos: 7.5,-17.5 + parent: 2 + - uid: 249 + components: + - type: Transform + pos: 7.5,-16.5 + parent: 2 + - uid: 250 + components: + - type: Transform + pos: 7.5,-15.5 + parent: 2 + - uid: 251 + components: + - type: Transform + pos: 6.5,-15.5 + parent: 2 + - uid: 252 + components: + - type: Transform + pos: 5.5,-15.5 + parent: 2 + - uid: 253 + components: + - type: Transform + pos: 5.5,-14.5 + parent: 2 + - uid: 254 + components: + - type: Transform + pos: 5.5,-13.5 + parent: 2 + - uid: 255 + components: + - type: Transform + pos: 4.5,-13.5 + parent: 2 + - uid: 256 + components: + - type: Transform + pos: 4.5,-12.5 + parent: 2 + - uid: 257 + components: + - type: Transform + pos: 4.5,-11.5 + parent: 2 + - uid: 258 + components: + - type: Transform + pos: 4.5,-10.5 + parent: 2 + - uid: 259 + components: + - type: Transform + pos: 4.5,-9.5 + parent: 2 + - uid: 260 + components: + - type: Transform + pos: 3.5,-12.5 + parent: 2 + - uid: 261 + components: + - type: Transform + pos: 2.5,-12.5 + parent: 2 + - uid: 262 + components: + - type: Transform + pos: 1.5,-12.5 + parent: 2 + - uid: 263 + components: + - type: Transform + pos: 5.5,-11.5 + parent: 2 + - uid: 264 + components: + - type: Transform + pos: 6.5,-11.5 + parent: 2 + - uid: 265 + components: + - type: Transform + pos: 7.5,-11.5 + parent: 2 + - uid: 266 + components: + - type: Transform + pos: 8.5,-11.5 + parent: 2 + - uid: 267 + components: + - type: Transform + pos: 9.5,-11.5 + parent: 2 + - uid: 268 + components: + - type: Transform + pos: 10.5,-11.5 + parent: 2 + - uid: 269 + components: + - type: Transform + pos: 11.5,-11.5 + parent: 2 + - uid: 270 + components: + - type: Transform + pos: 9.5,-1.5 + parent: 2 + - uid: 271 + components: + - type: Transform + pos: 9.5,-2.5 + parent: 2 + - uid: 272 + components: + - type: Transform + pos: 10.5,-2.5 + parent: 2 + - uid: 273 + components: + - type: Transform + pos: 11.5,-2.5 + parent: 2 + - uid: 274 + components: + - type: Transform + pos: 11.5,-3.5 + parent: 2 + - uid: 275 + components: + - type: Transform + pos: 11.5,-4.5 + parent: 2 + - uid: 276 + components: + - type: Transform + pos: 8.5,-2.5 + parent: 2 + - uid: 277 + components: + - type: Transform + pos: 7.5,-2.5 + parent: 2 + - uid: 278 + components: + - type: Transform + pos: 8.5,-3.5 + parent: 2 + - uid: 279 + components: + - type: Transform + pos: 8.5,-4.5 + parent: 2 + - uid: 280 + components: + - type: Transform + pos: 6.5,-2.5 + parent: 2 + - uid: 281 + components: + - type: Transform + pos: 5.5,-2.5 + parent: 2 + - uid: 282 + components: + - type: Transform + pos: 5.5,-3.5 + parent: 2 + - uid: 283 + components: + - type: Transform + pos: 5.5,-4.5 + parent: 2 + - uid: 284 + components: + - type: Transform + pos: 4.5,-2.5 + parent: 2 + - uid: 285 + components: + - type: Transform + pos: 3.5,-2.5 + parent: 2 + - uid: 286 + components: + - type: Transform + pos: 3.5,-3.5 + parent: 2 + - uid: 287 components: - type: Transform pos: 3.5,-4.5 - parent: 407 - - uid: 544 + parent: 2 + - uid: 288 components: - type: Transform - pos: -17.5,3.5 - parent: 407 - - uid: 545 + pos: 3.5,-1.5 + parent: 2 + - uid: 289 components: - type: Transform - pos: -17.5,4.5 - parent: 407 - - uid: 546 + pos: 3.5,-0.5 + parent: 2 + - uid: 290 components: - type: Transform - pos: -17.5,5.5 - parent: 407 - - uid: 547 + pos: 3.5,0.5 + parent: 2 + - uid: 291 components: - type: Transform - pos: -17.5,6.5 - parent: 407 - - uid: 548 + pos: 3.5,1.5 + parent: 2 + - uid: 292 components: - type: Transform - pos: -17.5,7.5 - parent: 407 - - uid: 549 + pos: 7.5,-0.5 + parent: 2 + - uid: 293 components: - type: Transform - pos: -17.5,8.5 - parent: 407 - - uid: 550 + pos: 7.5,0.5 + parent: 2 + - uid: 294 components: - type: Transform - pos: -16.5,8.5 - parent: 407 - - uid: 551 + pos: 7.5,1.5 + parent: 2 + - uid: 295 components: - type: Transform - pos: -15.5,8.5 - parent: 407 - - uid: 552 + pos: 6.5,0.5 + parent: 2 + - uid: 296 components: - type: Transform - pos: -14.5,8.5 - parent: 407 - - uid: 553 + pos: 5.5,0.5 + parent: 2 + - uid: 297 components: - type: Transform - pos: -14.5,7.5 - parent: 407 - - uid: 554 + pos: 4.5,0.5 + parent: 2 + - uid: 298 components: - type: Transform - pos: -13.5,7.5 - parent: 407 - - uid: 555 + pos: 8.5,0.5 + parent: 2 + - uid: 299 components: - type: Transform - pos: -12.5,7.5 - parent: 407 - - uid: 556 + pos: 9.5,0.5 + parent: 2 + - uid: 300 components: - type: Transform - pos: -11.5,7.5 - parent: 407 - - uid: 557 + pos: 10.5,0.5 + parent: 2 + - uid: 301 components: - type: Transform - pos: -10.5,7.5 - parent: 407 - - uid: 558 + pos: 11.5,0.5 + parent: 2 + - uid: 302 components: - type: Transform - pos: -9.5,7.5 - parent: 407 - - uid: 559 + pos: 11.5,-0.5 + parent: 2 + - uid: 303 components: - type: Transform - pos: -8.5,7.5 - parent: 407 - - uid: 560 + pos: 11.5,-1.5 + parent: 2 + - uid: 304 components: - type: Transform - pos: -7.5,7.5 - parent: 407 - - uid: 561 + pos: 11.5,1.5 + parent: 2 + - uid: 305 components: - type: Transform - pos: -6.5,7.5 - parent: 407 - - uid: 1737 + pos: 12.5,1.5 + parent: 2 + - uid: 306 components: - type: Transform - pos: -23.5,-1.5 - parent: 407 - - uid: 1747 + pos: 13.5,1.5 + parent: 2 + - uid: 307 components: - type: Transform - pos: -23.5,2.5 - parent: 407 - - uid: 2082 + pos: 13.5,-0.5 + parent: 2 + - uid: 308 components: - type: Transform - pos: -20.5,4.5 - parent: 407 - - uid: 2088 + pos: 13.5,-0.5 + parent: 2 + - uid: 309 + components: + - type: Transform + pos: 12.5,-0.5 + parent: 2 + - uid: 310 + components: + - type: Transform + pos: 4.5,6.5 + parent: 2 + - uid: 311 + components: + - type: Transform + pos: 4.5,5.5 + parent: 2 + - uid: 312 + components: + - type: Transform + pos: 4.5,4.5 + parent: 2 + - uid: 313 + components: + - type: Transform + pos: 3.5,4.5 + parent: 2 + - uid: 314 + components: + - type: Transform + pos: 2.5,4.5 + parent: 2 + - uid: 315 + components: + - type: Transform + pos: 1.5,4.5 + parent: 2 + - uid: 316 + components: + - type: Transform + pos: 5.5,4.5 + parent: 2 + - uid: 317 + components: + - type: Transform + pos: 6.5,4.5 + parent: 2 + - uid: 318 + components: + - type: Transform + pos: 7.5,4.5 + parent: 2 + - uid: 319 + components: + - type: Transform + pos: 8.5,4.5 + parent: 2 + - uid: 320 + components: + - type: Transform + pos: 9.5,4.5 + parent: 2 + - uid: 321 + components: + - type: Transform + pos: 10.5,4.5 + parent: 2 + - uid: 322 + components: + - type: Transform + pos: 11.5,4.5 + parent: 2 + - uid: 323 + components: + - type: Transform + pos: 12.5,4.5 + parent: 2 + - uid: 324 + components: + - type: Transform + pos: 12.5,5.5 + parent: 2 + - uid: 325 + components: + - type: Transform + pos: 13.5,5.5 + parent: 2 + - uid: 326 + components: + - type: Transform + pos: 12.5,3.5 + parent: 2 + - uid: 327 + components: + - type: Transform + pos: 13.5,3.5 + parent: 2 + - uid: 328 + components: + - type: Transform + pos: 17.5,2.5 + parent: 2 + - uid: 329 + components: + - type: Transform + pos: 16.5,2.5 + parent: 2 + - uid: 330 + components: + - type: Transform + pos: 16.5,3.5 + parent: 2 + - uid: 331 + components: + - type: Transform + pos: 16.5,4.5 + parent: 2 + - uid: 332 + components: + - type: Transform + pos: 16.5,5.5 + parent: 2 + - uid: 333 + components: + - type: Transform + pos: 16.5,6.5 + parent: 2 + - uid: 334 + components: + - type: Transform + pos: 15.5,6.5 + parent: 2 + - uid: 335 + components: + - type: Transform + pos: 14.5,6.5 + parent: 2 + - uid: 336 + components: + - type: Transform + pos: 16.5,1.5 + parent: 2 + - uid: 337 + components: + - type: Transform + pos: 16.5,0.5 + parent: 2 + - uid: 338 + components: + - type: Transform + pos: 16.5,-0.5 + parent: 2 + - uid: 339 + components: + - type: Transform + pos: 16.5,-1.5 + parent: 2 + - uid: 340 + components: + - type: Transform + pos: 16.5,-2.5 + parent: 2 + - uid: 341 + components: + - type: Transform + pos: 16.5,-3.5 + parent: 2 + - uid: 342 + components: + - type: Transform + pos: 16.5,-4.5 + parent: 2 + - uid: 343 + components: + - type: Transform + pos: 16.5,-5.5 + parent: 2 + - uid: 344 + components: + - type: Transform + pos: 15.5,-5.5 + parent: 2 + - uid: 345 + components: + - type: Transform + pos: 18.5,-5.5 + parent: 2 + - uid: 346 + components: + - type: Transform + pos: 18.5,-5.5 + parent: 2 + - uid: 347 + components: + - type: Transform + pos: 17.5,-5.5 + parent: 2 + - uid: 348 + components: + - type: Transform + pos: 17.5,-3.5 + parent: 2 + - uid: 349 + components: + - type: Transform + pos: 18.5,-3.5 + parent: 2 + - uid: 350 + components: + - type: Transform + pos: 15.5,-3.5 + parent: 2 + - uid: 351 + components: + - type: Transform + pos: 15.5,0.5 + parent: 2 + - uid: 352 + components: + - type: Transform + pos: 17.5,0.5 + parent: 2 + - uid: 353 + components: + - type: Transform + pos: 18.5,0.5 + parent: 2 + - uid: 354 + components: + - type: Transform + pos: 19.5,0.5 + parent: 2 + - uid: 355 + components: + - type: Transform + pos: 20.5,2.5 + parent: 2 + - uid: 356 + components: + - type: Transform + pos: 19.5,2.5 + parent: 2 + - uid: 357 + components: + - type: Transform + pos: 21.5,2.5 + parent: 2 + - uid: 358 + components: + - type: Transform + pos: 22.5,2.5 + parent: 2 + - uid: 359 + components: + - type: Transform + pos: 22.5,1.5 + parent: 2 + - uid: 360 + components: + - type: Transform + pos: 22.5,-0.5 + parent: 2 + - uid: 361 + components: + - type: Transform + pos: 22.5,0.5 + parent: 2 + - uid: 362 + components: + - type: Transform + pos: 21.5,-0.5 + parent: 2 + - uid: 363 + components: + - type: Transform + pos: 20.5,-0.5 + parent: 2 + - uid: 364 + components: + - type: Transform + pos: 21.5,1.5 + parent: 2 + - uid: 365 + components: + - type: Transform + pos: 20.5,1.5 + parent: 2 + - uid: 366 + components: + - type: Transform + pos: 22.5,-1.5 + parent: 2 + - uid: 367 + components: + - type: Transform + pos: 22.5,-2.5 + parent: 2 + - uid: 368 + components: + - type: Transform + pos: 22.5,-3.5 + parent: 2 + - uid: 369 + components: + - type: Transform + pos: 23.5,-3.5 + parent: 2 + - uid: 370 + components: + - type: Transform + pos: 24.5,-3.5 + parent: 2 + - uid: 371 + components: + - type: Transform + pos: 25.5,-3.5 + parent: 2 + - uid: 372 + components: + - type: Transform + pos: 25.5,-4.5 + parent: 2 + - uid: 373 + components: + - type: Transform + pos: 24.5,-4.5 + parent: 2 + - uid: 374 + components: + - type: Transform + pos: 26.5,-3.5 + parent: 2 + - uid: 375 + components: + - type: Transform + pos: 26.5,-2.5 + parent: 2 + - uid: 376 + components: + - type: Transform + pos: 23.5,0.5 + parent: 2 + - uid: 377 + components: + - type: Transform + pos: 24.5,0.5 + parent: 2 + - uid: 378 + components: + - type: Transform + pos: 25.5,0.5 + parent: 2 + - uid: 379 + components: + - type: Transform + pos: 26.5,0.5 + parent: 2 + - uid: 380 + components: + - type: Transform + pos: 27.5,0.5 + parent: 2 + - uid: 381 + components: + - type: Transform + pos: 27.5,-0.5 + parent: 2 + - uid: 382 + components: + - type: Transform + pos: 27.5,1.5 + parent: 2 + - uid: 383 + components: + - type: Transform + pos: 27.5,2.5 + parent: 2 + - uid: 384 + components: + - type: Transform + pos: 27.5,3.5 + parent: 2 + - uid: 385 + components: + - type: Transform + pos: 26.5,3.5 + parent: 2 + - uid: 386 + components: + - type: Transform + pos: 26.5,4.5 + parent: 2 + - uid: 387 + components: + - type: Transform + pos: 25.5,4.5 + parent: 2 + - uid: 388 + components: + - type: Transform + pos: 25.5,5.5 + parent: 2 + - uid: 389 + components: + - type: Transform + pos: 24.5,5.5 + parent: 2 + - uid: 390 + components: + - type: Transform + pos: 24.5,4.5 + parent: 2 + - uid: 391 components: - type: Transform pos: 23.5,4.5 - parent: 407 -- proto: CableMV - entities: - - uid: 530 + parent: 2 + - uid: 392 components: - type: Transform - pos: 11.5,7.5 - parent: 407 - - uid: 562 + pos: 22.5,4.5 + parent: 2 + - uid: 393 components: - type: Transform - pos: -21.5,3.5 - parent: 407 - - uid: 563 + pos: 22.5,3.5 + parent: 2 + - uid: 394 components: - type: Transform - pos: -20.5,3.5 - parent: 407 - - uid: 564 + pos: 19.5,3.5 + parent: 2 + - uid: 395 components: - type: Transform - pos: -19.5,3.5 - parent: 407 - - uid: 565 + pos: 19.5,4.5 + parent: 2 + - uid: 396 components: - type: Transform - pos: -18.5,3.5 - parent: 407 - - uid: 566 + pos: 19.5,5.5 + parent: 2 + - uid: 397 components: - type: Transform - pos: -18.5,4.5 - parent: 407 - - uid: 567 + pos: 19.5,6.5 + parent: 2 + - uid: 398 components: - type: Transform - pos: -18.5,5.5 - parent: 407 - - uid: 568 + pos: -0.5,13.5 + parent: 2 + - uid: 399 components: - type: Transform - pos: -18.5,2.5 - parent: 407 - - uid: 569 + pos: 0.5,13.5 + parent: 2 + - uid: 400 components: - type: Transform - pos: -18.5,1.5 - parent: 407 - - uid: 570 + pos: 1.5,13.5 + parent: 2 + - uid: 401 components: - type: Transform - pos: -18.5,0.5 - parent: 407 - - uid: 571 + pos: 1.5,14.5 + parent: 2 + - uid: 402 components: - type: Transform - pos: -18.5,-0.5 - parent: 407 - - uid: 572 + pos: 1.5,15.5 + parent: 2 + - uid: 403 components: - type: Transform - pos: -18.5,-1.5 - parent: 407 - - uid: 573 + pos: 1.5,12.5 + parent: 2 + - uid: 404 components: - type: Transform - pos: -19.5,-1.5 - parent: 407 - - uid: 574 + pos: 1.5,11.5 + parent: 2 + - uid: 405 components: - type: Transform - pos: -20.5,2.5 - parent: 407 - - uid: 575 + pos: 1.5,10.5 + parent: 2 + - uid: 406 components: - type: Transform - pos: -20.5,1.5 - parent: 407 - - uid: 576 + pos: 1.5,9.5 + parent: 2 + - uid: 407 components: - type: Transform - pos: -20.5,0.5 - parent: 407 - - uid: 577 + pos: 1.5,8.5 + parent: 2 + - uid: 408 components: - type: Transform - pos: -21.5,0.5 - parent: 407 - - uid: 578 - components: - - type: Transform - pos: -22.5,0.5 - parent: 407 - - uid: 579 - components: - - type: Transform - pos: -23.5,0.5 - parent: 407 - - uid: 580 - components: - - type: Transform - pos: -24.5,0.5 - parent: 407 - - uid: 581 - components: - - type: Transform - pos: -24.5,-0.5 - parent: 407 - - uid: 582 - components: - - type: Transform - pos: -24.5,-1.5 - parent: 407 - - uid: 583 - components: - - type: Transform - pos: -24.5,1.5 - parent: 407 - - uid: 584 - components: - - type: Transform - pos: -24.5,2.5 - parent: 407 - - uid: 585 - components: - - type: Transform - pos: -19.5,0.5 - parent: 407 - - uid: 586 - components: - - type: Transform - pos: -7.5,-1.5 - parent: 407 - - uid: 587 - components: - - type: Transform - pos: -7.5,-0.5 - parent: 407 - - uid: 588 - components: - - type: Transform - pos: -7.5,0.5 - parent: 407 - - uid: 589 - components: - - type: Transform - pos: -6.5,0.5 - parent: 407 - - uid: 590 - components: - - type: Transform - pos: -6.5,1.5 - parent: 407 - - uid: 591 - components: - - type: Transform - pos: -6.5,2.5 - parent: 407 - - uid: 592 - components: - - type: Transform - pos: -5.5,0.5 - parent: 407 - - uid: 593 - components: - - type: Transform - pos: -4.5,0.5 - parent: 407 - - uid: 594 - components: - - type: Transform - pos: -3.5,0.5 - parent: 407 - - uid: 595 - components: - - type: Transform - pos: -2.5,0.5 - parent: 407 - - uid: 596 - components: - - type: Transform - pos: -1.5,0.5 - parent: 407 - - uid: 597 - components: - - type: Transform - pos: -1.5,1.5 - parent: 407 - - uid: 598 - components: - - type: Transform - pos: -1.5,2.5 - parent: 407 - - uid: 599 - components: - - type: Transform - pos: -1.5,3.5 - parent: 407 - - uid: 600 - components: - - type: Transform - pos: -1.5,4.5 - parent: 407 - - uid: 601 - components: - - type: Transform - pos: -1.5,5.5 - parent: 407 - - uid: 602 - components: - - type: Transform - pos: -1.5,6.5 - parent: 407 - - uid: 603 - components: - - type: Transform - pos: -1.5,7.5 - parent: 407 - - uid: 604 - components: - - type: Transform - pos: -2.5,7.5 - parent: 407 - - uid: 605 + pos: 1.5,7.5 + parent: 2 + - uid: 409 components: - type: Transform pos: -2.5,6.5 - parent: 407 - - uid: 606 + parent: 2 + - uid: 410 + components: + - type: Transform + pos: -2.5,7.5 + parent: 2 + - uid: 411 + components: + - type: Transform + pos: -2.5,8.5 + parent: 2 + - uid: 412 + components: + - type: Transform + pos: -2.5,9.5 + parent: 2 + - uid: 413 + components: + - type: Transform + pos: -2.5,10.5 + parent: 2 + - uid: 414 + components: + - type: Transform + pos: -2.5,11.5 + parent: 2 + - uid: 415 + components: + - type: Transform + pos: -1.5,11.5 + parent: 2 + - uid: 416 + components: + - type: Transform + pos: -3.5,8.5 + parent: 2 + - uid: 417 + components: + - type: Transform + pos: -4.5,8.5 + parent: 2 + - uid: 418 + components: + - type: Transform + pos: -5.5,8.5 + parent: 2 + - uid: 419 + components: + - type: Transform + pos: -4.5,9.5 + parent: 2 + - uid: 420 + components: + - type: Transform + pos: -3.5,11.5 + parent: 2 + - uid: 421 + components: + - type: Transform + pos: 9.5,17.5 + parent: 2 + - uid: 422 + components: + - type: Transform + pos: 9.5,16.5 + parent: 2 + - uid: 423 + components: + - type: Transform + pos: 9.5,15.5 + parent: 2 + - uid: 424 + components: + - type: Transform + pos: 9.5,14.5 + parent: 2 + - uid: 425 + components: + - type: Transform + pos: 9.5,13.5 + parent: 2 + - uid: 426 + components: + - type: Transform + pos: 9.5,12.5 + parent: 2 + - uid: 427 + components: + - type: Transform + pos: 9.5,11.5 + parent: 2 + - uid: 428 + components: + - type: Transform + pos: 9.5,10.5 + parent: 2 + - uid: 429 + components: + - type: Transform + pos: 9.5,9.5 + parent: 2 + - uid: 430 + components: + - type: Transform + pos: 9.5,8.5 + parent: 2 + - uid: 431 + components: + - type: Transform + pos: 9.5,7.5 + parent: 2 + - uid: 432 + components: + - type: Transform + pos: 8.5,7.5 + parent: 2 + - uid: 433 + components: + - type: Transform + pos: 7.5,7.5 + parent: 2 + - uid: 434 + components: + - type: Transform + pos: 10.5,11.5 + parent: 2 + - uid: 435 + components: + - type: Transform + pos: 11.5,11.5 + parent: 2 + - uid: 436 + components: + - type: Transform + pos: 8.5,16.5 + parent: 2 + - uid: 437 + components: + - type: Transform + pos: 7.5,16.5 + parent: 2 + - uid: 438 + components: + - type: Transform + pos: 6.5,16.5 + parent: 2 + - uid: 439 + components: + - type: Transform + pos: 5.5,16.5 + parent: 2 + - uid: 440 + components: + - type: Transform + pos: 6.5,15.5 + parent: 2 + - uid: 441 + components: + - type: Transform + pos: 6.5,14.5 + parent: 2 + - uid: 442 + components: + - type: Transform + pos: 6.5,13.5 + parent: 2 + - uid: 443 + components: + - type: Transform + pos: 6.5,12.5 + parent: 2 + - uid: 444 + components: + - type: Transform + pos: 6.5,11.5 + parent: 2 + - uid: 445 + components: + - type: Transform + pos: 6.5,10.5 + parent: 2 + - uid: 446 + components: + - type: Transform + pos: 6.5,9.5 + parent: 2 + - uid: 447 + components: + - type: Transform + pos: 6.5,8.5 + parent: 2 + - uid: 448 + components: + - type: Transform + pos: 6.5,7.5 + parent: 2 + - uid: 449 + components: + - type: Transform + pos: 0.5,15.5 + parent: 2 + - uid: 450 + components: + - type: Transform + pos: -0.5,15.5 + parent: 2 + - uid: 451 + components: + - type: Transform + pos: -1.5,15.5 + parent: 2 + - uid: 452 + components: + - type: Transform + pos: -2.5,15.5 + parent: 2 + - uid: 453 + components: + - type: Transform + pos: 5.5,-6.5 + parent: 2 + - uid: 454 + components: + - type: Transform + pos: 5.5,-7.5 + parent: 2 + - uid: 455 + components: + - type: Transform + pos: 5.5,-8.5 + parent: 2 + - uid: 456 + components: + - type: Transform + pos: 6.5,-8.5 + parent: 2 + - uid: 457 + components: + - type: Transform + pos: 7.5,-8.5 + parent: 2 + - uid: 458 + components: + - type: Transform + pos: 8.5,-8.5 + parent: 2 + - uid: 459 + components: + - type: Transform + pos: 9.5,-8.5 + parent: 2 + - uid: 460 + components: + - type: Transform + pos: 10.5,-8.5 + parent: 2 +- proto: CableHV + entities: + - uid: 461 + components: + - type: Transform + pos: 22.5,4.5 + parent: 2 + - uid: 462 + components: + - type: Transform + pos: -21.5,-0.5 + parent: 2 + - uid: 463 + components: + - type: Transform + pos: -22.5,-0.5 + parent: 2 + - uid: 464 + components: + - type: Transform + pos: -23.5,-0.5 + parent: 2 + - uid: 465 + components: + - type: Transform + pos: -23.5,0.5 + parent: 2 + - uid: 466 + components: + - type: Transform + pos: -23.5,1.5 + parent: 2 + - uid: 467 + components: + - type: Transform + pos: -22.5,1.5 + parent: 2 + - uid: 468 + components: + - type: Transform + pos: -21.5,1.5 + parent: 2 + - uid: 469 + components: + - type: Transform + pos: -21.5,0.5 + parent: 2 + - uid: 470 + components: + - type: Transform + pos: -22.5,0.5 + parent: 2 + - uid: 471 + components: + - type: Transform + pos: -22.5,2.5 + parent: 2 + - uid: 472 + components: + - type: Transform + pos: -22.5,3.5 + parent: 2 + - uid: 473 + components: + - type: Transform + pos: -21.5,3.5 + parent: 2 + - uid: 474 + components: + - type: Transform + pos: -20.5,3.5 + parent: 2 + - uid: 475 + components: + - type: Transform + pos: -19.5,3.5 + parent: 2 + - uid: 476 + components: + - type: Transform + pos: -18.5,3.5 + parent: 2 + - uid: 477 + components: + - type: Transform + pos: -18.5,2.5 + parent: 2 + - uid: 478 + components: + - type: Transform + pos: -18.5,1.5 + parent: 2 + - uid: 479 + components: + - type: Transform + pos: -18.5,0.5 + parent: 2 + - uid: 480 + components: + - type: Transform + pos: -18.5,-0.5 + parent: 2 + - uid: 481 + components: + - type: Transform + pos: -18.5,-1.5 + parent: 2 + - uid: 482 + components: + - type: Transform + pos: -18.5,-2.5 + parent: 2 + - uid: 483 + components: + - type: Transform + pos: -18.5,-3.5 + parent: 2 + - uid: 484 + components: + - type: Transform + pos: -19.5,-3.5 + parent: 2 + - uid: 485 + components: + - type: Transform + pos: -17.5,0.5 + parent: 2 + - uid: 486 + components: + - type: Transform + pos: -16.5,0.5 + parent: 2 + - uid: 487 + components: + - type: Transform + pos: -15.5,0.5 + parent: 2 + - uid: 488 + components: + - type: Transform + pos: -14.5,0.5 + parent: 2 + - uid: 489 + components: + - type: Transform + pos: -13.5,0.5 + parent: 2 + - uid: 490 + components: + - type: Transform + pos: -12.5,0.5 + parent: 2 + - uid: 491 + components: + - type: Transform + pos: -11.5,0.5 + parent: 2 + - uid: 492 + components: + - type: Transform + pos: -10.5,0.5 + parent: 2 + - uid: 493 + components: + - type: Transform + pos: -9.5,0.5 + parent: 2 + - uid: 494 + components: + - type: Transform + pos: -8.5,0.5 + parent: 2 + - uid: 495 + components: + - type: Transform + pos: -7.5,0.5 + parent: 2 + - uid: 496 + components: + - type: Transform + pos: -6.5,0.5 + parent: 2 + - uid: 497 + components: + - type: Transform + pos: -5.5,0.5 + parent: 2 + - uid: 498 + components: + - type: Transform + pos: -4.5,0.5 + parent: 2 + - uid: 499 + components: + - type: Transform + pos: -3.5,0.5 + parent: 2 + - uid: 500 + components: + - type: Transform + pos: -2.5,0.5 + parent: 2 + - uid: 501 + components: + - type: Transform + pos: -1.5,0.5 + parent: 2 + - uid: 502 + components: + - type: Transform + pos: -1.5,1.5 + parent: 2 + - uid: 503 + components: + - type: Transform + pos: -1.5,2.5 + parent: 2 + - uid: 504 + components: + - type: Transform + pos: -1.5,3.5 + parent: 2 + - uid: 505 + components: + - type: Transform + pos: -1.5,4.5 + parent: 2 + - uid: 506 + components: + - type: Transform + pos: -1.5,5.5 + parent: 2 + - uid: 507 + components: + - type: Transform + pos: -1.5,6.5 + parent: 2 + - uid: 508 + components: + - type: Transform + pos: -1.5,7.5 + parent: 2 + - uid: 509 + components: + - type: Transform + pos: -2.5,7.5 + parent: 2 + - uid: 510 components: - type: Transform pos: -3.5,7.5 - parent: 407 - - uid: 607 + parent: 2 + - uid: 511 components: - type: Transform pos: -4.5,7.5 - parent: 407 - - uid: 608 + parent: 2 + - uid: 512 components: - type: Transform pos: -5.5,7.5 - parent: 407 + parent: 2 + - uid: 513 + components: + - type: Transform + pos: -6.5,7.5 + parent: 2 + - uid: 514 + components: + - type: Transform + pos: -1.5,-0.5 + parent: 2 + - uid: 515 + components: + - type: Transform + pos: -1.5,-1.5 + parent: 2 + - uid: 516 + components: + - type: Transform + pos: -1.5,-2.5 + parent: 2 + - uid: 517 + components: + - type: Transform + pos: -1.5,-3.5 + parent: 2 + - uid: 518 + components: + - type: Transform + pos: -1.5,-4.5 + parent: 2 + - uid: 519 + components: + - type: Transform + pos: -1.5,-5.5 + parent: 2 + - uid: 520 + components: + - type: Transform + pos: -1.5,-6.5 + parent: 2 + - uid: 521 + components: + - type: Transform + pos: -0.5,-6.5 + parent: 2 + - uid: 522 + components: + - type: Transform + pos: 0.5,-6.5 + parent: 2 + - uid: 523 + components: + - type: Transform + pos: 1.5,-6.5 + parent: 2 + - uid: 524 + components: + - type: Transform + pos: 2.5,-6.5 + parent: 2 + - uid: 525 + components: + - type: Transform + pos: 2.5,-7.5 + parent: 2 + - uid: 526 + components: + - type: Transform + pos: 2.5,-8.5 + parent: 2 + - uid: 527 + components: + - type: Transform + pos: 2.5,-9.5 + parent: 2 + - uid: 528 + components: + - type: Transform + pos: -0.5,5.5 + parent: 2 + - uid: 529 + components: + - type: Transform + pos: 0.5,5.5 + parent: 2 + - uid: 530 + components: + - type: Transform + pos: 1.5,5.5 + parent: 2 + - uid: 531 + components: + - type: Transform + pos: 2.5,5.5 + parent: 2 + - uid: 532 + components: + - type: Transform + pos: 3.5,5.5 + parent: 2 + - uid: 533 + components: + - type: Transform + pos: 4.5,5.5 + parent: 2 + - uid: 534 + components: + - type: Transform + pos: 5.5,5.5 + parent: 2 + - uid: 535 + components: + - type: Transform + pos: 6.5,5.5 + parent: 2 + - uid: 536 + components: + - type: Transform + pos: 7.5,5.5 + parent: 2 + - uid: 537 + components: + - type: Transform + pos: 8.5,5.5 + parent: 2 + - uid: 538 + components: + - type: Transform + pos: 8.5,6.5 + parent: 2 + - uid: 539 + components: + - type: Transform + pos: 8.5,7.5 + parent: 2 + - uid: 540 + components: + - type: Transform + pos: 9.5,7.5 + parent: 2 + - uid: 541 + components: + - type: Transform + pos: 10.5,7.5 + parent: 2 + - uid: 542 + components: + - type: Transform + pos: 11.5,7.5 + parent: 2 + - uid: 543 + components: + - type: Transform + pos: 8.5,4.5 + parent: 2 + - uid: 544 + components: + - type: Transform + pos: 9.5,4.5 + parent: 2 + - uid: 545 + components: + - type: Transform + pos: 10.5,4.5 + parent: 2 + - uid: 546 + components: + - type: Transform + pos: 11.5,4.5 + parent: 2 + - uid: 547 + components: + - type: Transform + pos: 12.5,4.5 + parent: 2 + - uid: 548 + components: + - type: Transform + pos: 13.5,4.5 + parent: 2 + - uid: 549 + components: + - type: Transform + pos: 14.5,4.5 + parent: 2 + - uid: 550 + components: + - type: Transform + pos: 15.5,4.5 + parent: 2 + - uid: 551 + components: + - type: Transform + pos: 16.5,4.5 + parent: 2 + - uid: 552 + components: + - type: Transform + pos: 16.5,3.5 + parent: 2 + - uid: 553 + components: + - type: Transform + pos: 16.5,2.5 + parent: 2 + - uid: 554 + components: + - type: Transform + pos: 16.5,1.5 + parent: 2 + - uid: 555 + components: + - type: Transform + pos: 16.5,0.5 + parent: 2 + - uid: 556 + components: + - type: Transform + pos: 17.5,0.5 + parent: 2 + - uid: 557 + components: + - type: Transform + pos: 18.5,0.5 + parent: 2 + - uid: 558 + components: + - type: Transform + pos: 19.5,0.5 + parent: 2 + - uid: 559 + components: + - type: Transform + pos: 20.5,0.5 + parent: 2 + - uid: 560 + components: + - type: Transform + pos: 21.5,0.5 + parent: 2 + - uid: 561 + components: + - type: Transform + pos: 21.5,1.5 + parent: 2 + - uid: 562 + components: + - type: Transform + pos: 21.5,2.5 + parent: 2 + - uid: 563 + components: + - type: Transform + pos: 21.5,3.5 + parent: 2 + - uid: 564 + components: + - type: Transform + pos: 21.5,4.5 + parent: 2 + - uid: 565 + components: + - type: Transform + pos: 15.5,0.5 + parent: 2 + - uid: 566 + components: + - type: Transform + pos: 14.5,0.5 + parent: 2 + - uid: 567 + components: + - type: Transform + pos: 13.5,0.5 + parent: 2 + - uid: 568 + components: + - type: Transform + pos: 12.5,0.5 + parent: 2 + - uid: 569 + components: + - type: Transform + pos: 11.5,0.5 + parent: 2 + - uid: 570 + components: + - type: Transform + pos: 11.5,-0.5 + parent: 2 + - uid: 571 + components: + - type: Transform + pos: 11.5,-1.5 + parent: 2 + - uid: 572 + components: + - type: Transform + pos: 11.5,-2.5 + parent: 2 + - uid: 573 + components: + - type: Transform + pos: 4.5,-2.5 + parent: 2 + - uid: 574 + components: + - type: Transform + pos: 5.5,-2.5 + parent: 2 + - uid: 575 + components: + - type: Transform + pos: 6.5,-2.5 + parent: 2 + - uid: 576 + components: + - type: Transform + pos: 7.5,-2.5 + parent: 2 + - uid: 577 + components: + - type: Transform + pos: 8.5,-2.5 + parent: 2 + - uid: 578 + components: + - type: Transform + pos: 9.5,-2.5 + parent: 2 + - uid: 579 + components: + - type: Transform + pos: 10.5,-2.5 + parent: 2 + - uid: 580 + components: + - type: Transform + pos: 3.5,-3.5 + parent: 2 + - uid: 581 + components: + - type: Transform + pos: 3.5,-2.5 + parent: 2 + - uid: 582 + components: + - type: Transform + pos: 3.5,-1.5 + parent: 2 + - uid: 583 + components: + - type: Transform + pos: 3.5,-0.5 + parent: 2 + - uid: 584 + components: + - type: Transform + pos: 3.5,0.5 + parent: 2 + - uid: 585 + components: + - type: Transform + pos: 2.5,0.5 + parent: 2 + - uid: 586 + components: + - type: Transform + pos: 1.5,0.5 + parent: 2 + - uid: 587 + components: + - type: Transform + pos: 0.5,0.5 + parent: 2 + - uid: 588 + components: + - type: Transform + pos: -0.5,0.5 + parent: 2 + - uid: 589 + components: + - type: Transform + pos: 3.5,-6.5 + parent: 2 + - uid: 590 + components: + - type: Transform + pos: 3.5,-5.5 + parent: 2 + - uid: 591 + components: + - type: Transform + pos: 3.5,-4.5 + parent: 2 + - uid: 592 + components: + - type: Transform + pos: -17.5,3.5 + parent: 2 + - uid: 593 + components: + - type: Transform + pos: -17.5,4.5 + parent: 2 + - uid: 594 + components: + - type: Transform + pos: -17.5,5.5 + parent: 2 + - uid: 595 + components: + - type: Transform + pos: -17.5,6.5 + parent: 2 + - uid: 596 + components: + - type: Transform + pos: -17.5,7.5 + parent: 2 + - uid: 597 + components: + - type: Transform + pos: -17.5,8.5 + parent: 2 + - uid: 598 + components: + - type: Transform + pos: -16.5,8.5 + parent: 2 + - uid: 599 + components: + - type: Transform + pos: -15.5,8.5 + parent: 2 + - uid: 600 + components: + - type: Transform + pos: -14.5,8.5 + parent: 2 + - uid: 601 + components: + - type: Transform + pos: -14.5,7.5 + parent: 2 + - uid: 602 + components: + - type: Transform + pos: -13.5,7.5 + parent: 2 + - uid: 603 + components: + - type: Transform + pos: -12.5,7.5 + parent: 2 + - uid: 604 + components: + - type: Transform + pos: -11.5,7.5 + parent: 2 + - uid: 605 + components: + - type: Transform + pos: -10.5,7.5 + parent: 2 + - uid: 606 + components: + - type: Transform + pos: -9.5,7.5 + parent: 2 + - uid: 607 + components: + - type: Transform + pos: -8.5,7.5 + parent: 2 + - uid: 608 + components: + - type: Transform + pos: -7.5,7.5 + parent: 2 - uid: 609 components: - type: Transform pos: -6.5,7.5 - parent: 407 + parent: 2 - uid: 610 components: - type: Transform - pos: -7.5,7.5 - parent: 407 + pos: -23.5,-1.5 + parent: 2 - uid: 611 components: - type: Transform - pos: -8.5,7.5 - parent: 407 + pos: -23.5,2.5 + parent: 2 - uid: 612 components: - type: Transform - pos: -8.5,6.5 - parent: 407 + pos: -20.5,4.5 + parent: 2 - uid: 613 components: - type: Transform - pos: -8.5,5.5 - parent: 407 + pos: 23.5,4.5 + parent: 2 +- proto: CableMV + entities: - uid: 614 components: - type: Transform - pos: -8.5,4.5 - parent: 407 + pos: 11.5,7.5 + parent: 2 - uid: 615 components: - type: Transform - pos: -8.5,3.5 - parent: 407 + pos: -21.5,3.5 + parent: 2 - uid: 616 components: - type: Transform - pos: -8.5,2.5 - parent: 407 + pos: -20.5,3.5 + parent: 2 - uid: 617 components: - type: Transform - pos: -8.5,1.5 - parent: 407 + pos: -19.5,3.5 + parent: 2 - uid: 618 components: - type: Transform - pos: -8.5,0.5 - parent: 407 + pos: -18.5,3.5 + parent: 2 - uid: 619 components: - type: Transform - pos: -9.5,6.5 - parent: 407 + pos: -18.5,4.5 + parent: 2 - uid: 620 components: - type: Transform - pos: 2.5,-9.5 - parent: 407 + pos: -18.5,5.5 + parent: 2 - uid: 621 components: - type: Transform - pos: 2.5,-8.5 - parent: 407 + pos: -18.5,2.5 + parent: 2 - uid: 622 components: - type: Transform - pos: 2.5,-7.5 - parent: 407 + pos: -18.5,1.5 + parent: 2 - uid: 623 components: - type: Transform - pos: 3.5,-7.5 - parent: 407 + pos: -18.5,0.5 + parent: 2 - uid: 624 components: - type: Transform - pos: 4.5,-7.5 - parent: 407 + pos: -18.5,-0.5 + parent: 2 - uid: 625 components: - type: Transform - pos: 4.5,-8.5 - parent: 407 + pos: -18.5,-1.5 + parent: 2 - uid: 626 components: - type: Transform - pos: 4.5,-9.5 - parent: 407 + pos: -19.5,-1.5 + parent: 2 - uid: 627 components: - type: Transform - pos: 2.5,-6.5 - parent: 407 + pos: -20.5,2.5 + parent: 2 - uid: 628 components: - type: Transform - pos: 1.5,-6.5 - parent: 407 + pos: -20.5,1.5 + parent: 2 - uid: 629 components: - type: Transform - pos: 0.5,-6.5 - parent: 407 + pos: -20.5,0.5 + parent: 2 - uid: 630 components: - type: Transform - pos: -0.5,-6.5 - parent: 407 + pos: -21.5,0.5 + parent: 2 - uid: 631 components: - type: Transform - pos: -1.5,-6.5 - parent: 407 + pos: -22.5,0.5 + parent: 2 - uid: 632 components: - type: Transform - pos: -1.5,-5.5 - parent: 407 + pos: -23.5,0.5 + parent: 2 - uid: 633 components: - type: Transform - pos: -2.5,-5.5 - parent: 407 + pos: -24.5,0.5 + parent: 2 - uid: 634 components: - type: Transform - pos: 3.5,-6.5 - parent: 407 + pos: -24.5,-0.5 + parent: 2 - uid: 635 components: - type: Transform - pos: 3.5,-5.5 - parent: 407 + pos: -24.5,-1.5 + parent: 2 - uid: 636 components: - type: Transform - pos: 3.5,-4.5 - parent: 407 + pos: -24.5,1.5 + parent: 2 - uid: 637 components: - type: Transform - pos: 3.5,-3.5 - parent: 407 + pos: -24.5,2.5 + parent: 2 - uid: 638 components: - type: Transform - pos: 3.5,-2.5 - parent: 407 + pos: -19.5,0.5 + parent: 2 - uid: 639 components: - type: Transform - pos: 4.5,-2.5 - parent: 407 + pos: -7.5,-1.5 + parent: 2 - uid: 640 components: - type: Transform - pos: 5.5,-2.5 - parent: 407 + pos: -7.5,-0.5 + parent: 2 - uid: 641 components: - type: Transform - pos: 6.5,-2.5 - parent: 407 + pos: -7.5,0.5 + parent: 2 - uid: 642 components: - type: Transform - pos: 7.5,-2.5 - parent: 407 + pos: -6.5,0.5 + parent: 2 - uid: 643 components: - type: Transform - pos: 8.5,-2.5 - parent: 407 + pos: -6.5,1.5 + parent: 2 - uid: 644 components: - type: Transform - pos: 9.5,-2.5 - parent: 407 + pos: -6.5,2.5 + parent: 2 - uid: 645 components: - type: Transform - pos: 9.5,-1.5 - parent: 407 + pos: -5.5,0.5 + parent: 2 - uid: 646 components: - type: Transform - pos: 10.5,7.5 - parent: 407 + pos: -4.5,0.5 + parent: 2 - uid: 647 components: - type: Transform - pos: 9.5,7.5 - parent: 407 + pos: -3.5,0.5 + parent: 2 - uid: 648 components: - type: Transform - pos: 8.5,7.5 - parent: 407 + pos: -2.5,0.5 + parent: 2 - uid: 649 components: - type: Transform - pos: 7.5,7.5 - parent: 407 + pos: -1.5,0.5 + parent: 2 - uid: 650 components: - type: Transform - pos: 7.5,6.5 - parent: 407 + pos: -1.5,1.5 + parent: 2 - uid: 651 components: - type: Transform - pos: 7.5,5.5 - parent: 407 + pos: -1.5,2.5 + parent: 2 - uid: 652 components: - type: Transform - pos: 6.5,5.5 - parent: 407 + pos: -1.5,3.5 + parent: 2 - uid: 653 components: - type: Transform - pos: 5.5,5.5 - parent: 407 + pos: -1.5,4.5 + parent: 2 - uid: 654 components: - type: Transform - pos: 4.5,5.5 - parent: 407 + pos: -1.5,5.5 + parent: 2 - uid: 655 components: - type: Transform - pos: 4.5,6.5 - parent: 407 + pos: -1.5,6.5 + parent: 2 - uid: 656 components: - type: Transform - pos: 7.5,8.5 - parent: 407 + pos: -1.5,7.5 + parent: 2 - uid: 657 components: - type: Transform - pos: 7.5,9.5 - parent: 407 + pos: -2.5,7.5 + parent: 2 - uid: 658 components: - type: Transform - pos: 7.5,10.5 - parent: 407 + pos: -2.5,6.5 + parent: 2 - uid: 659 components: - type: Transform - pos: 7.5,11.5 - parent: 407 + pos: -3.5,7.5 + parent: 2 - uid: 660 components: - type: Transform - pos: 7.5,12.5 - parent: 407 + pos: -4.5,7.5 + parent: 2 - uid: 661 components: - type: Transform - pos: 7.5,13.5 - parent: 407 + pos: -5.5,7.5 + parent: 2 - uid: 662 components: - type: Transform - pos: 7.5,14.5 - parent: 407 + pos: -6.5,7.5 + parent: 2 - uid: 663 components: - type: Transform - pos: 7.5,15.5 - parent: 407 + pos: -7.5,7.5 + parent: 2 - uid: 664 components: - type: Transform - pos: 7.5,16.5 - parent: 407 + pos: -8.5,7.5 + parent: 2 - uid: 665 components: - type: Transform - pos: 8.5,16.5 - parent: 407 + pos: -8.5,6.5 + parent: 2 - uid: 666 components: - type: Transform - pos: 9.5,16.5 - parent: 407 + pos: -8.5,5.5 + parent: 2 - uid: 667 components: - type: Transform - pos: 9.5,17.5 - parent: 407 + pos: -8.5,4.5 + parent: 2 - uid: 668 components: - type: Transform - pos: 21.5,4.5 - parent: 407 + pos: -8.5,3.5 + parent: 2 - uid: 669 components: - type: Transform - pos: 21.5,3.5 - parent: 407 + pos: -8.5,2.5 + parent: 2 - uid: 670 components: - type: Transform - pos: 21.5,2.5 - parent: 407 + pos: -8.5,1.5 + parent: 2 - uid: 671 components: - type: Transform - pos: 20.5,2.5 - parent: 407 + pos: -8.5,0.5 + parent: 2 - uid: 672 components: - type: Transform - pos: 21.5,1.5 - parent: 407 + pos: -9.5,6.5 + parent: 2 - uid: 673 components: - type: Transform - pos: 21.5,0.5 - parent: 407 + pos: 2.5,-9.5 + parent: 2 - uid: 674 components: - type: Transform - pos: 20.5,0.5 - parent: 407 + pos: 2.5,-8.5 + parent: 2 - uid: 675 components: - type: Transform - pos: 19.5,0.5 - parent: 407 + pos: 2.5,-7.5 + parent: 2 + - uid: 676 + components: + - type: Transform + pos: 3.5,-7.5 + parent: 2 - uid: 677 components: - type: Transform - pos: 17.5,0.5 - parent: 407 + pos: 4.5,-7.5 + parent: 2 - uid: 678 components: - type: Transform - pos: 17.5,1.5 - parent: 407 + pos: 4.5,-8.5 + parent: 2 - uid: 679 components: - type: Transform - pos: 17.5,2.5 - parent: 407 + pos: 4.5,-9.5 + parent: 2 - uid: 680 components: - type: Transform - pos: -18.5,-2.5 - parent: 407 + pos: 2.5,-6.5 + parent: 2 - uid: 681 components: - type: Transform - pos: -18.5,-3.5 - parent: 407 + pos: 1.5,-6.5 + parent: 2 - uid: 682 + components: + - type: Transform + pos: 0.5,-6.5 + parent: 2 + - uid: 683 + components: + - type: Transform + pos: -0.5,-6.5 + parent: 2 + - uid: 684 + components: + - type: Transform + pos: -1.5,-6.5 + parent: 2 + - uid: 685 + components: + - type: Transform + pos: -1.5,-5.5 + parent: 2 + - uid: 686 + components: + - type: Transform + pos: -2.5,-5.5 + parent: 2 + - uid: 687 + components: + - type: Transform + pos: 3.5,-6.5 + parent: 2 + - uid: 688 + components: + - type: Transform + pos: 3.5,-5.5 + parent: 2 + - uid: 689 + components: + - type: Transform + pos: 3.5,-4.5 + parent: 2 + - uid: 690 + components: + - type: Transform + pos: 3.5,-3.5 + parent: 2 + - uid: 691 + components: + - type: Transform + pos: 3.5,-2.5 + parent: 2 + - uid: 692 + components: + - type: Transform + pos: 4.5,-2.5 + parent: 2 + - uid: 693 + components: + - type: Transform + pos: 5.5,-2.5 + parent: 2 + - uid: 694 + components: + - type: Transform + pos: 6.5,-2.5 + parent: 2 + - uid: 695 + components: + - type: Transform + pos: 7.5,-2.5 + parent: 2 + - uid: 696 + components: + - type: Transform + pos: 8.5,-2.5 + parent: 2 + - uid: 697 + components: + - type: Transform + pos: 9.5,-2.5 + parent: 2 + - uid: 698 + components: + - type: Transform + pos: 9.5,-1.5 + parent: 2 + - uid: 699 + components: + - type: Transform + pos: 10.5,7.5 + parent: 2 + - uid: 700 + components: + - type: Transform + pos: 9.5,7.5 + parent: 2 + - uid: 701 + components: + - type: Transform + pos: 8.5,7.5 + parent: 2 + - uid: 702 + components: + - type: Transform + pos: 7.5,7.5 + parent: 2 + - uid: 703 + components: + - type: Transform + pos: 7.5,6.5 + parent: 2 + - uid: 704 + components: + - type: Transform + pos: 7.5,5.5 + parent: 2 + - uid: 705 + components: + - type: Transform + pos: 6.5,5.5 + parent: 2 + - uid: 706 + components: + - type: Transform + pos: 5.5,5.5 + parent: 2 + - uid: 707 + components: + - type: Transform + pos: 4.5,5.5 + parent: 2 + - uid: 708 + components: + - type: Transform + pos: 4.5,6.5 + parent: 2 + - uid: 709 + components: + - type: Transform + pos: 7.5,8.5 + parent: 2 + - uid: 710 + components: + - type: Transform + pos: 7.5,9.5 + parent: 2 + - uid: 711 + components: + - type: Transform + pos: 7.5,10.5 + parent: 2 + - uid: 712 + components: + - type: Transform + pos: 7.5,11.5 + parent: 2 + - uid: 713 + components: + - type: Transform + pos: 7.5,12.5 + parent: 2 + - uid: 714 + components: + - type: Transform + pos: 7.5,13.5 + parent: 2 + - uid: 715 + components: + - type: Transform + pos: 7.5,14.5 + parent: 2 + - uid: 716 + components: + - type: Transform + pos: 7.5,15.5 + parent: 2 + - uid: 717 + components: + - type: Transform + pos: 7.5,16.5 + parent: 2 + - uid: 718 + components: + - type: Transform + pos: 8.5,16.5 + parent: 2 + - uid: 719 + components: + - type: Transform + pos: 9.5,16.5 + parent: 2 + - uid: 720 + components: + - type: Transform + pos: 9.5,17.5 + parent: 2 + - uid: 721 + components: + - type: Transform + pos: 21.5,4.5 + parent: 2 + - uid: 722 + components: + - type: Transform + pos: 21.5,3.5 + parent: 2 + - uid: 723 + components: + - type: Transform + pos: 21.5,2.5 + parent: 2 + - uid: 724 + components: + - type: Transform + pos: 20.5,2.5 + parent: 2 + - uid: 725 + components: + - type: Transform + pos: 21.5,1.5 + parent: 2 + - uid: 726 + components: + - type: Transform + pos: 21.5,0.5 + parent: 2 + - uid: 727 + components: + - type: Transform + pos: 20.5,0.5 + parent: 2 + - uid: 728 + components: + - type: Transform + pos: 19.5,0.5 + parent: 2 + - uid: 729 + components: + - type: Transform + pos: 17.5,0.5 + parent: 2 + - uid: 730 + components: + - type: Transform + pos: 17.5,1.5 + parent: 2 + - uid: 731 + components: + - type: Transform + pos: 17.5,2.5 + parent: 2 + - uid: 732 + components: + - type: Transform + pos: -18.5,-2.5 + parent: 2 + - uid: 733 + components: + - type: Transform + pos: -18.5,-3.5 + parent: 2 + - uid: 734 components: - type: Transform pos: -19.5,-3.5 - parent: 407 - - uid: 1361 + parent: 2 + - uid: 735 components: - type: Transform pos: 18.5,0.5 - parent: 407 - - uid: 2170 + parent: 2 + - uid: 736 components: - type: Transform pos: -0.5,5.5 - parent: 407 - - uid: 2171 + parent: 2 + - uid: 737 components: - type: Transform pos: 0.5,5.5 - parent: 407 - - uid: 2172 + parent: 2 + - uid: 738 components: - type: Transform pos: 0.5,6.5 - parent: 407 - - uid: 2173 + parent: 2 + - uid: 739 components: - type: Transform pos: 0.5,7.5 - parent: 407 - - uid: 2174 + parent: 2 + - uid: 740 components: - type: Transform pos: 0.5,8.5 - parent: 407 - - uid: 2175 + parent: 2 + - uid: 741 components: - type: Transform pos: 0.5,9.5 - parent: 407 - - uid: 2176 + parent: 2 + - uid: 742 components: - type: Transform pos: 0.5,10.5 - parent: 407 - - uid: 2177 + parent: 2 + - uid: 743 components: - type: Transform pos: 0.5,11.5 - parent: 407 - - uid: 2178 + parent: 2 + - uid: 744 components: - type: Transform pos: 0.5,12.5 - parent: 407 - - uid: 2179 + parent: 2 + - uid: 745 components: - type: Transform pos: 0.5,13.5 - parent: 407 - - uid: 2180 + parent: 2 + - uid: 746 components: - type: Transform pos: -0.5,13.5 - parent: 407 - - uid: 2181 + parent: 2 + - uid: 747 components: - type: Transform pos: -0.5,11.5 - parent: 407 - - uid: 2182 + parent: 2 + - uid: 748 components: - type: Transform pos: -1.5,11.5 - parent: 407 - - uid: 2183 + parent: 2 + - uid: 749 components: - type: Transform pos: -1.5,10.5 - parent: 407 - - uid: 2184 + parent: 2 + - uid: 750 components: - type: Transform pos: -1.5,9.5 - parent: 407 - - uid: 2185 + parent: 2 + - uid: 751 components: - type: Transform pos: -1.5,8.5 - parent: 407 + parent: 2 - proto: CableTerminal entities: - - uid: 426 + - uid: 752 components: - type: Transform rot: 3.141592653589793 rad pos: -22.5,2.5 - parent: 407 + parent: 2 - proto: Carpet entities: - - uid: 1484 + - uid: 753 components: - type: Transform rot: 3.141592653589793 rad pos: 16.5,-3.5 - parent: 407 - - uid: 2129 + parent: 2 + - uid: 754 components: - type: Transform rot: 3.141592653589793 rad pos: 15.5,-3.5 - parent: 407 - - uid: 2131 + parent: 2 + - uid: 755 components: - type: Transform rot: 3.141592653589793 rad pos: 17.5,-3.5 - parent: 407 - - uid: 2132 + parent: 2 + - uid: 756 components: - type: Transform rot: 3.141592653589793 rad pos: 18.5,-3.5 - parent: 407 + parent: 2 - proto: CarpetBlue entities: - - uid: 1893 + - uid: 757 components: - type: Transform pos: 22.5,-3.5 - parent: 407 - - uid: 1894 + parent: 2 + - uid: 758 components: - type: Transform pos: 23.5,-3.5 - parent: 407 - - uid: 1895 + parent: 2 + - uid: 759 components: - type: Transform pos: 24.5,-3.5 - parent: 407 + parent: 2 - proto: CarpetGreen entities: - - uid: 1764 + - uid: 760 components: - type: Transform rot: 3.141592653589793 rad pos: -6.5,-4.5 - parent: 407 - - uid: 1765 + parent: 2 + - uid: 761 components: - type: Transform rot: 3.141592653589793 rad pos: -6.5,-3.5 - parent: 407 - - uid: 1766 + parent: 2 + - uid: 762 components: - type: Transform rot: 3.141592653589793 rad pos: -6.5,-2.5 - parent: 407 - - uid: 1767 + parent: 2 + - uid: 763 components: - type: Transform rot: 3.141592653589793 rad pos: -5.5,-4.5 - parent: 407 - - uid: 1768 + parent: 2 + - uid: 764 components: - type: Transform rot: 3.141592653589793 rad pos: -5.5,-3.5 - parent: 407 - - uid: 1769 + parent: 2 + - uid: 765 components: - type: Transform rot: 3.141592653589793 rad pos: -5.5,-2.5 - parent: 407 - - uid: 1770 + parent: 2 + - uid: 766 components: - type: Transform rot: 3.141592653589793 rad pos: -4.5,-4.5 - parent: 407 - - uid: 1771 + parent: 2 + - uid: 767 components: - type: Transform rot: 3.141592653589793 rad pos: -4.5,-3.5 - parent: 407 - - uid: 1772 + parent: 2 + - uid: 768 components: - type: Transform rot: 3.141592653589793 rad pos: -4.5,-2.5 - parent: 407 + parent: 2 - proto: CarpetSBlue entities: - - uid: 232 + - uid: 769 components: - type: Transform pos: 7.5,16.5 - parent: 407 - - uid: 1675 + parent: 2 + - uid: 770 components: - type: Transform pos: -14.5,-2.5 - parent: 407 - - uid: 1676 + parent: 2 + - uid: 771 components: - type: Transform pos: -14.5,-3.5 - parent: 407 - - uid: 1677 + parent: 2 + - uid: 772 components: - type: Transform pos: -14.5,-4.5 - parent: 407 - - uid: 1678 + parent: 2 + - uid: 773 components: - type: Transform pos: -13.5,-2.5 - parent: 407 - - uid: 1679 + parent: 2 + - uid: 774 components: - type: Transform pos: -13.5,-3.5 - parent: 407 - - uid: 1680 + parent: 2 + - uid: 775 components: - type: Transform pos: -13.5,-4.5 - parent: 407 - - uid: 1681 + parent: 2 + - uid: 776 components: - type: Transform pos: -12.5,-2.5 - parent: 407 - - uid: 1682 + parent: 2 + - uid: 777 components: - type: Transform pos: -12.5,-3.5 - parent: 407 - - uid: 1683 + parent: 2 + - uid: 778 components: - type: Transform pos: -12.5,-4.5 - parent: 407 - - uid: 1684 + parent: 2 + - uid: 779 components: - type: Transform pos: -10.5,-2.5 - parent: 407 - - uid: 1685 + parent: 2 + - uid: 780 components: - type: Transform pos: -10.5,-3.5 - parent: 407 - - uid: 1686 + parent: 2 + - uid: 781 components: - type: Transform pos: -10.5,-4.5 - parent: 407 - - uid: 1687 + parent: 2 + - uid: 782 components: - type: Transform pos: -9.5,-2.5 - parent: 407 - - uid: 1688 + parent: 2 + - uid: 783 components: - type: Transform pos: -9.5,-3.5 - parent: 407 - - uid: 1689 + parent: 2 + - uid: 784 components: - type: Transform pos: -9.5,-4.5 - parent: 407 - - uid: 1690 + parent: 2 + - uid: 785 components: - type: Transform pos: -8.5,-2.5 - parent: 407 - - uid: 1691 + parent: 2 + - uid: 786 components: - type: Transform pos: -8.5,-3.5 - parent: 407 - - uid: 1692 + parent: 2 + - uid: 787 components: - type: Transform pos: -8.5,-4.5 - parent: 407 - - uid: 2034 + parent: 2 + - uid: 788 components: - type: Transform pos: 7.5,7.5 - parent: 407 - - uid: 2035 + parent: 2 + - uid: 789 components: - type: Transform pos: 7.5,8.5 - parent: 407 - - uid: 2036 + parent: 2 + - uid: 790 components: - type: Transform pos: 7.5,9.5 - parent: 407 - - uid: 2037 + parent: 2 + - uid: 791 components: - type: Transform pos: 7.5,10.5 - parent: 407 - - uid: 2038 + parent: 2 + - uid: 792 components: - type: Transform pos: 7.5,11.5 - parent: 407 - - uid: 2039 + parent: 2 + - uid: 793 components: - type: Transform pos: 7.5,12.5 - parent: 407 - - uid: 2040 + parent: 2 + - uid: 794 components: - type: Transform pos: 7.5,13.5 - parent: 407 - - uid: 2041 + parent: 2 + - uid: 795 components: - type: Transform pos: 7.5,14.5 - parent: 407 - - uid: 2042 + parent: 2 + - uid: 796 components: - type: Transform pos: 7.5,15.5 - parent: 407 - - uid: 2044 + parent: 2 + - uid: 797 components: - type: Transform pos: 8.5,16.5 - parent: 407 - - uid: 2045 + parent: 2 + - uid: 798 components: - type: Transform pos: 6.5,16.5 - parent: 407 - - uid: 2046 + parent: 2 + - uid: 799 components: - type: Transform pos: 6.5,14.5 - parent: 407 - - uid: 2047 + parent: 2 + - uid: 800 components: - type: Transform pos: 8.5,14.5 - parent: 407 - - uid: 2048 + parent: 2 + - uid: 801 components: - type: Transform pos: 8.5,12.5 - parent: 407 - - uid: 2049 + parent: 2 + - uid: 802 components: - type: Transform pos: 6.5,12.5 - parent: 407 - - uid: 2050 + parent: 2 + - uid: 803 components: - type: Transform pos: 6.5,10.5 - parent: 407 - - uid: 2051 + parent: 2 + - uid: 804 components: - type: Transform pos: 8.5,10.5 - parent: 407 - - uid: 2052 + parent: 2 + - uid: 805 components: - type: Transform pos: 8.5,8.5 - parent: 407 - - uid: 2053 + parent: 2 + - uid: 806 components: - type: Transform pos: 6.5,8.5 - parent: 407 + parent: 2 - proto: Catwalk entities: - - uid: 1122 + - uid: 807 components: - type: Transform pos: -30.5,0.5 - parent: 407 - - uid: 1123 + parent: 2 + - uid: 808 components: - type: Transform pos: -29.5,0.5 - parent: 407 - - uid: 1124 + parent: 2 + - uid: 809 components: - type: Transform pos: -28.5,0.5 - parent: 407 - - uid: 1125 + parent: 2 + - uid: 810 components: - type: Transform pos: -27.5,0.5 - parent: 407 - - uid: 1126 + parent: 2 + - uid: 811 components: - type: Transform pos: -26.5,0.5 - parent: 407 - - uid: 1127 + parent: 2 + - uid: 812 components: - type: Transform pos: -25.5,0.5 - parent: 407 - - uid: 1128 + parent: 2 + - uid: 813 components: - type: Transform pos: -25.5,-2.5 - parent: 407 - - uid: 1129 + parent: 2 + - uid: 814 components: - type: Transform pos: -25.5,-1.5 - parent: 407 - - uid: 1130 + parent: 2 + - uid: 815 components: - type: Transform pos: -25.5,-0.5 - parent: 407 - - uid: 1131 + parent: 2 + - uid: 816 components: - type: Transform pos: -25.5,1.5 - parent: 407 - - uid: 1132 + parent: 2 + - uid: 817 components: - type: Transform pos: -25.5,2.5 - parent: 407 - - uid: 1133 + parent: 2 + - uid: 818 components: - type: Transform pos: -25.5,3.5 - parent: 407 - - uid: 1134 + parent: 2 + - uid: 819 components: - type: Transform pos: -25.5,4.5 - parent: 407 - - uid: 1135 + parent: 2 + - uid: 820 components: - type: Transform pos: -24.5,4.5 - parent: 407 - - uid: 1136 + parent: 2 + - uid: 821 components: - type: Transform pos: -24.5,5.5 - parent: 407 - - uid: 1137 + parent: 2 + - uid: 822 components: - type: Transform pos: -23.5,5.5 - parent: 407 - - uid: 1138 + parent: 2 + - uid: 823 components: - type: Transform pos: -22.5,5.5 - parent: 407 - - uid: 1139 + parent: 2 + - uid: 824 components: - type: Transform pos: -21.5,5.5 - parent: 407 - - uid: 1140 + parent: 2 + - uid: 825 components: - type: Transform pos: -21.5,6.5 - parent: 407 - - uid: 1141 + parent: 2 + - uid: 826 components: - type: Transform pos: -20.5,6.5 - parent: 407 - - uid: 1142 + parent: 2 + - uid: 827 components: - type: Transform pos: -19.5,6.5 - parent: 407 - - uid: 1143 + parent: 2 + - uid: 828 components: - type: Transform pos: -19.5,7.5 - parent: 407 - - uid: 1144 + parent: 2 + - uid: 829 components: - type: Transform pos: -19.5,8.5 - parent: 407 - - uid: 1145 + parent: 2 + - uid: 830 components: - type: Transform pos: -18.5,8.5 - parent: 407 - - uid: 1146 + parent: 2 + - uid: 831 components: - type: Transform pos: -17.5,8.5 - parent: 407 - - uid: 1147 + parent: 2 + - uid: 832 components: - type: Transform pos: -16.5,8.5 - parent: 407 - - uid: 1808 + parent: 2 + - uid: 833 components: - type: Transform pos: -18.5,0.5 - parent: 407 - - uid: 1809 + parent: 2 + - uid: 834 components: - type: Transform pos: -17.5,0.5 - parent: 407 - - uid: 1810 + parent: 2 + - uid: 835 components: - type: Transform pos: -16.5,0.5 - parent: 407 - - uid: 1836 + parent: 2 + - uid: 836 components: - type: Transform pos: 2.5,-6.5 - parent: 407 - - uid: 1837 + parent: 2 + - uid: 837 components: - type: Transform pos: 3.5,-6.5 - parent: 407 - - uid: 1838 + parent: 2 + - uid: 838 components: - type: Transform pos: 4.5,-6.5 - parent: 407 - - uid: 1839 + parent: 2 + - uid: 839 components: - type: Transform pos: 5.5,-6.5 - parent: 407 - - uid: 1840 + parent: 2 + - uid: 840 components: - type: Transform pos: 6.5,-6.5 - parent: 407 - - uid: 1841 + parent: 2 + - uid: 841 components: - type: Transform pos: 7.5,-6.5 - parent: 407 - - uid: 1842 + parent: 2 + - uid: 842 components: - type: Transform pos: 8.5,-6.5 - parent: 407 - - uid: 1953 + parent: 2 + - uid: 843 components: - type: Transform pos: -1.5,14.5 - parent: 407 - - uid: 1954 + parent: 2 + - uid: 844 components: - type: Transform pos: -2.5,14.5 - parent: 407 + parent: 2 - proto: Chair entities: - - uid: 1564 + - uid: 845 components: - type: Transform pos: -1.5,-11.5 - parent: 407 - - uid: 1754 + parent: 2 + - uid: 846 components: - type: Transform pos: 4.5,1.5 - parent: 407 - - uid: 2194 + parent: 2 + - uid: 847 components: - type: Transform rot: -1.5707963267948966 rad pos: 8.5,3.5 - parent: 407 - - uid: 2195 + parent: 2 + - uid: 848 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,3.5 - parent: 407 - - uid: 2196 + parent: 2 + - uid: 849 components: - type: Transform rot: -1.5707963267948966 rad pos: 12.5,3.5 - parent: 407 - - uid: 2197 + parent: 2 + - uid: 850 components: - type: Transform rot: 1.5707963267948966 rad pos: 10.5,3.5 - parent: 407 - - uid: 2198 + parent: 2 + - uid: 851 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,3.5 - parent: 407 - - uid: 2199 + parent: 2 + - uid: 852 components: - type: Transform rot: -1.5707963267948966 rad pos: 4.5,3.5 - parent: 407 + parent: 2 - proto: ChairFolding entities: - - uid: 1849 + - uid: 853 components: - type: Transform pos: 6.5,-7.5 - parent: 407 - - uid: 1850 + parent: 2 + - uid: 854 components: - type: Transform rot: -1.5707963267948966 rad pos: 7.5,-8.5 - parent: 407 + parent: 2 - proto: ChairOfficeDark entities: - - uid: 2000 + - uid: 855 components: - type: Transform rot: -1.5707963267948966 rad pos: -1.5,9.5 - parent: 407 - - uid: 2013 + parent: 2 + - uid: 856 components: - type: Transform pos: 2.5,7.5 - parent: 407 - - uid: 2014 + parent: 2 + - uid: 857 components: - type: Transform rot: 3.141592653589793 rad pos: 2.5,10.5 - parent: 407 - - uid: 2105 + parent: 2 + - uid: 858 components: - type: Transform rot: 3.141592653589793 rad pos: 19.5,-3.5 - parent: 407 + parent: 2 - proto: ChairOfficeLight entities: - - uid: 1738 + - uid: 859 components: - type: Transform rot: -1.5707963267948966 rad pos: 7.5,0.5 - parent: 407 + parent: 2 - proto: ChairPilotSeat entities: - - uid: 1806 + - uid: 860 components: - type: Transform rot: 1.5707963267948966 rad pos: 25.5,1.5 - parent: 407 - - uid: 1819 + parent: 2 + - uid: 861 components: - type: Transform rot: -1.5707963267948966 rad pos: -16.5,-1.5 - parent: 407 - - uid: 1825 + parent: 2 + - uid: 862 components: - type: Transform rot: 1.5707963267948966 rad pos: 25.5,0.5 - parent: 407 - - uid: 2054 + parent: 2 + - uid: 863 components: - type: Transform rot: -1.5707963267948966 rad pos: 10.5,16.5 - parent: 407 - - uid: 2055 + parent: 2 + - uid: 864 components: - type: Transform rot: 1.5707963267948966 rad pos: 4.5,15.5 - parent: 407 - - uid: 2056 + parent: 2 + - uid: 865 components: - type: Transform rot: 1.5707963267948966 rad pos: 4.5,16.5 - parent: 407 - - uid: 2138 + parent: 2 + - uid: 866 components: - type: Transform rot: 1.5707963267948966 rad pos: 24.5,3.5 - parent: 407 - - uid: 2139 + parent: 2 + - uid: 867 components: - type: Transform rot: 1.5707963267948966 rad pos: 21.5,-0.5 - parent: 407 - - uid: 2140 + parent: 2 + - uid: 868 components: - type: Transform rot: 1.5707963267948966 rad pos: 21.5,1.5 - parent: 407 - - uid: 2141 + parent: 2 + - uid: 869 components: - type: Transform rot: 1.5707963267948966 rad pos: 21.5,2.5 - parent: 407 - - uid: 2142 + parent: 2 + - uid: 870 components: - type: Transform rot: -1.5707963267948966 rad pos: 23.5,2.5 - parent: 407 - - uid: 2143 + parent: 2 + - uid: 871 components: - type: Transform rot: -1.5707963267948966 rad pos: 23.5,1.5 - parent: 407 - - uid: 2144 + parent: 2 + - uid: 872 components: - type: Transform rot: -1.5707963267948966 rad pos: 23.5,-0.5 - parent: 407 + parent: 2 - proto: ChemDispenser entities: - - uid: 1733 + - uid: 873 components: - type: Transform pos: 7.5,1.5 - parent: 407 + parent: 2 - proto: ChemistryHotplate entities: - - uid: 365 + - uid: 874 components: - type: Transform pos: 11.5,1.5 - parent: 407 + parent: 2 - proto: ChemMaster entities: - - uid: 1732 + - uid: 875 components: - type: Transform pos: 6.5,1.5 - parent: 407 + parent: 2 - proto: CircuitImprinter entities: - - uid: 1490 + - uid: 876 + components: + - type: Transform + pos: 1.5,17.5 + parent: 2 + - uid: 2495 components: - type: Transform pos: -0.5,8.5 - parent: 407 + parent: 2 - proto: CleanerDispenser entities: - - uid: 2279 + - uid: 877 components: - type: Transform pos: -3.5,-5.5 - parent: 407 + parent: 2 - proto: ClosetChefFilled entities: - - uid: 1655 + - uid: 878 components: - type: Transform pos: -4.5,5.5 - parent: 407 + parent: 2 - proto: ClosetEmergencyFilledRandom entities: - - uid: 1033 + - uid: 879 components: - type: Transform pos: 12.5,13.5 - parent: 407 - - uid: 1846 + parent: 2 + - uid: 880 components: - type: Transform pos: 4.5,-8.5 - parent: 407 - - uid: 1847 + parent: 2 + - uid: 881 components: - type: Transform pos: 5.5,-8.5 - parent: 407 - - uid: 2216 + parent: 2 + - uid: 882 components: - type: Transform pos: 9.5,3.5 - parent: 407 - - uid: 2217 + parent: 2 + - uid: 883 components: - type: Transform pos: 5.5,3.5 - parent: 407 - - uid: 2257 + parent: 2 + - uid: 884 components: - type: Transform pos: -16.5,6.5 - parent: 407 + parent: 2 - proto: ClosetFireFilled entities: - - uid: 259 + - uid: 885 components: - type: Transform pos: 11.5,13.5 - parent: 407 + parent: 2 - proto: ClosetJanitorFilled entities: - - uid: 1659 + - uid: 886 components: - type: Transform pos: -3.5,-6.5 - parent: 407 + parent: 2 - type: ContainerContainer containers: entity_storage: !type:Container showEnts: False occludes: True ents: - - 1660 - - 1661 - - 1662 + - 887 + - 889 + - 888 paper_label: !type:ContainerSlot showEnts: False occludes: True ent: null - proto: ClosetL3SecurityFilled entities: - - uid: 1908 + - uid: 890 components: - type: Transform pos: 14.5,-4.5 - parent: 407 + parent: 2 - proto: ClosetRadiationSuitFilled entities: - - uid: 2107 + - uid: 891 components: - type: Transform pos: -18.5,-0.5 - parent: 407 + parent: 2 - proto: ClosetToolFilled entities: - - uid: 1594 + - uid: 892 components: - type: Transform pos: -16.5,1.5 - parent: 407 + parent: 2 - proto: ClosetWallEmergencyFilledRandom entities: - - uid: 2017 + - uid: 893 components: - type: Transform pos: 4.5,-5.5 - parent: 407 - - uid: 2019 + parent: 2 + - uid: 894 components: - type: Transform pos: -5.5,2.5 - parent: 407 - - uid: 2078 + parent: 2 + - uid: 895 components: - type: Transform pos: 11.5,6.5 - parent: 407 + parent: 2 - proto: ClosetWallFireFilledRandom entities: - - uid: 2018 + - uid: 896 components: - type: Transform pos: 5.5,-5.5 - parent: 407 - - uid: 2079 + parent: 2 + - uid: 897 components: - type: Transform pos: 12.5,6.5 - parent: 407 + parent: 2 - proto: ClosetWallMaintenanceFilledRandom entities: - - uid: 2080 + - uid: 898 components: - type: Transform pos: 6.5,-5.5 - parent: 407 + parent: 2 - proto: ClosetWallOrange entities: - - uid: 1874 + - uid: 899 components: - type: Transform pos: 18.5,6.5 - parent: 407 + parent: 2 - proto: ClothingBackpackERTJanitor entities: - - uid: 1660 + - uid: 887 components: - type: Transform - parent: 1659 + parent: 886 - type: Physics canCollide: False - type: InsideEntityStorage - proto: ClothingEyesGlassesMeson entities: - - uid: 1797 + - uid: 900 components: - type: Transform pos: -20.396126,3.7096221 - parent: 407 - - uid: 1798 + parent: 2 + - uid: 901 components: - type: Transform pos: -20.318,3.5689971 - parent: 407 + parent: 2 - proto: ClothingEyesGlassesSecurity entities: - - uid: 2121 + - uid: 902 components: - type: Transform pos: 18.517508,-2.1870496 - parent: 407 + parent: 2 - proto: ClothingEyesHudMedSec entities: - - uid: 1867 + - uid: 903 components: - type: Transform - pos: 19.447674,-4.406915 - parent: 407 + pos: 18.531456,-2.5905745 + parent: 2 - proto: ClothingHeadsetMedicalScience entities: - - uid: 2168 + - uid: 904 components: - type: Transform pos: -2.3716664,7.587408 - parent: 407 + parent: 2 - proto: ClothingHeadsetMining entities: - - uid: 2167 + - uid: 905 components: - type: Transform pos: 1.6413194,11.748624 - parent: 407 + parent: 2 - proto: ClothingNeckCloakMiner entities: - - uid: 1996 + - uid: 906 components: - type: Transform pos: 1.5246525,11.641014 - parent: 407 + parent: 2 - proto: ClothingNeckCloakTrans entities: - - uid: 1905 + - uid: 907 components: - type: Transform pos: 3.506415,3.5395489 - parent: 407 + parent: 2 - proto: ClothingNeckLGBTPin entities: - - uid: 1904 + - uid: 908 components: - type: Transform pos: 6.5183535,-8.5258465 - parent: 407 + parent: 2 - proto: ClothingNeckStethoscope entities: - - uid: 1898 + - uid: 909 components: - type: Transform pos: 6.4035683,-4.3785286 - parent: 407 + parent: 2 - proto: ClothingOuterHardsuitERTJanitor entities: - - uid: 1662 + - uid: 888 components: - type: Transform - parent: 1659 + parent: 886 - type: Physics canCollide: False - type: InsideEntityStorage - proto: ClothingOuterHardsuitRd entities: - - uid: 1988 + - uid: 911 components: - type: Transform - parent: 1980 + parent: 910 - type: Physics canCollide: False - type: InsideEntityStorage - proto: ClothingOuterHardsuitSalvage entities: - - uid: 1970 + - uid: 914 components: - type: Transform pos: 1.5766428,11.571795 - parent: 407 + parent: 2 - proto: ClothingShoesBootsMagAdv entities: - - uid: 1815 + - uid: 915 components: - type: Transform pos: 4.5333743,-11.7164135 - parent: 407 + parent: 2 - proto: ClothingUniformJumpsuitERTJanitor entities: - - uid: 1661 + - uid: 889 components: - type: Transform - parent: 1659 + parent: 886 - type: Physics canCollide: False - type: InsideEntityStorage - proto: ComfyChair entities: - - uid: 1703 + - uid: 916 components: - type: Transform rot: -1.5707963267948966 rad pos: -8.5,-4.5 - parent: 407 - - uid: 1704 + parent: 2 + - uid: 917 components: - type: Transform rot: -1.5707963267948966 rad pos: -8.5,-3.5 - parent: 407 - - uid: 1705 + parent: 2 + - uid: 918 components: - type: Transform rot: -1.5707963267948966 rad pos: -8.5,-2.5 - parent: 407 - - uid: 1706 + parent: 2 + - uid: 919 components: - type: Transform rot: 1.5707963267948966 rad pos: -10.5,-4.5 - parent: 407 - - uid: 1707 + parent: 2 + - uid: 920 components: - type: Transform rot: 1.5707963267948966 rad pos: -10.5,-3.5 - parent: 407 - - uid: 1708 + parent: 2 + - uid: 921 components: - type: Transform rot: 1.5707963267948966 rad pos: -10.5,-2.5 - parent: 407 - - uid: 1709 + parent: 2 + - uid: 922 components: - type: Transform rot: -1.5707963267948966 rad pos: -12.5,-4.5 - parent: 407 - - uid: 1710 + parent: 2 + - uid: 923 components: - type: Transform rot: -1.5707963267948966 rad pos: -12.5,-3.5 - parent: 407 - - uid: 1711 + parent: 2 + - uid: 924 components: - type: Transform rot: -1.5707963267948966 rad pos: -12.5,-2.5 - parent: 407 - - uid: 1712 + parent: 2 + - uid: 925 components: - type: Transform rot: 1.5707963267948966 rad pos: -14.5,-4.5 - parent: 407 - - uid: 1713 + parent: 2 + - uid: 926 components: - type: Transform rot: 1.5707963267948966 rad pos: -14.5,-3.5 - parent: 407 - - uid: 1714 + parent: 2 + - uid: 927 components: - type: Transform rot: 1.5707963267948966 rad pos: -14.5,-2.5 - parent: 407 - - uid: 1757 + parent: 2 + - uid: 928 components: - type: Transform rot: 3.141592653589793 rad pos: -6.5,-2.5 - parent: 407 - - uid: 1758 + parent: 2 + - uid: 929 components: - type: Transform pos: -3.5,-2.5 - parent: 407 - - uid: 1760 + parent: 2 + - uid: 930 components: - type: Transform rot: 1.5707963267948966 rad pos: -6.5,-4.5 - parent: 407 - - uid: 1761 + parent: 2 + - uid: 931 components: - type: Transform rot: -1.5707963267948966 rad pos: -4.5,-4.5 - parent: 407 - - uid: 1888 + parent: 2 + - uid: 932 components: - type: Transform rot: 1.5707963267948966 rad pos: 24.5,-2.5 - parent: 407 - - uid: 2124 + parent: 2 + - uid: 933 components: - type: Transform pos: 16.5,5.5 - parent: 407 - - uid: 2125 + parent: 2 + - uid: 934 components: - type: Transform rot: 3.141592653589793 rad pos: 16.5,3.5 - parent: 407 + parent: 2 - proto: ComputerAnalysisConsole entities: - - uid: 1986 + - uid: 935 components: - type: Transform rot: 1.5707963267948966 rad pos: -2.5,10.5 - parent: 407 + parent: 2 - type: DeviceLinkSource linkedPorts: - 1985: + 1658: - ArtifactAnalyzerSender: ArtifactAnalyzerReceiver +- proto: ComputerCargoBounty + entities: + - uid: 936 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,12.5 + parent: 2 - proto: ComputerCargoOrders entities: - - uid: 1963 + - uid: 937 components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,7.5 - parent: 407 + parent: 2 - proto: ComputerCargoShuttle entities: - - uid: 1962 + - uid: 938 components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,10.5 - parent: 407 + parent: 2 - proto: ComputerComms entities: - - uid: 1937 + - uid: 939 components: - type: Transform rot: -1.5707963267948966 rad pos: 25.5,3.5 - parent: 407 + parent: 2 - proto: ComputerCrewMonitoring entities: - - uid: 1864 + - uid: 940 components: - type: Transform rot: -1.5707963267948966 rad pos: 12.5,-1.5 - parent: 407 + parent: 2 - proto: ComputerCriminalRecords entities: - - uid: 1865 + - uid: 941 components: - type: Transform rot: 3.141592653589793 rad pos: 19.5,-0.5 - parent: 407 + parent: 2 - proto: ComputerId entities: - - uid: 1936 + - uid: 942 components: - type: Transform pos: 24.5,4.5 - parent: 407 + parent: 2 - proto: ComputerMassMedia entities: - - uid: 1832 + - uid: 943 components: - type: Transform rot: -1.5707963267948966 rad pos: 26.5,1.5 - parent: 407 + parent: 2 - proto: ComputerMedicalRecords entities: - - uid: 1863 + - uid: 944 components: - type: Transform rot: -1.5707963267948966 rad pos: 12.5,-0.5 - parent: 407 + parent: 2 - proto: ComputerPowerMonitoring entities: - - uid: 1935 + - uid: 945 components: - type: Transform pos: 23.5,4.5 - parent: 407 + parent: 2 - proto: ComputerRadar entities: - - uid: 1396 + - uid: 946 components: - type: Transform pos: 1.5,16.5 - parent: 407 - - uid: 2095 + parent: 2 + - uid: 947 components: - type: Transform rot: 3.141592653589793 rad pos: 25.5,-0.5 - parent: 407 + parent: 2 - proto: ComputerResearchAndDevelopment entities: - - uid: 1974 + - uid: 948 components: - type: Transform pos: -1.5,12.5 - parent: 407 + parent: 2 - proto: ComputerRoboticsControl entities: - - uid: 1983 + - uid: 949 components: - type: Transform rot: 1.5707963267948966 rad pos: -2.5,9.5 - parent: 407 + parent: 2 - proto: ComputerSalvageExpedition entities: - - uid: 2218 + - uid: 950 components: - type: Transform rot: -1.5707963267948966 rad pos: 2.5,15.5 - parent: 407 + parent: 2 - proto: ComputerShuttle entities: - - uid: 1939 + - uid: 951 components: - type: Transform rot: -1.5707963267948966 rad pos: 26.5,0.5 - parent: 407 + parent: 2 - proto: ComputerShuttleCargo entities: - - uid: 1961 + - uid: 952 components: - type: Transform pos: 2.5,11.5 - parent: 407 + parent: 2 - proto: ComputerShuttleSalvage entities: - - uid: 2278 + - uid: 953 components: - type: Transform pos: 0.5,16.5 - parent: 407 + parent: 2 - proto: ComputerStationRecords entities: - - uid: 1639 + - uid: 954 components: - type: Transform rot: 3.141592653589793 rad pos: 18.5,-0.5 - parent: 407 + parent: 2 - proto: ComputerSurveillanceCameraMonitor entities: - - uid: 1928 + - uid: 955 components: - type: Transform pos: 19.5,-2.5 - parent: 407 + parent: 2 - proto: ConveyorBelt entities: - - uid: 1473 + - uid: 956 components: - type: Transform rot: -1.5707963267948966 rad pos: 9.5,-6.5 - parent: 407 - - uid: 1474 + parent: 2 + - uid: 957 components: - type: Transform rot: -1.5707963267948966 rad pos: 10.5,-6.5 - parent: 407 - - uid: 1955 + parent: 2 + - uid: 958 components: - type: Transform pos: 3.5,12.5 - parent: 407 - - uid: 1956 + parent: 2 + - uid: 959 components: - type: Transform pos: 3.5,11.5 - parent: 407 - - uid: 1957 + parent: 2 + - uid: 960 components: - type: Transform pos: 3.5,10.5 - parent: 407 - - uid: 1958 + parent: 2 + - uid: 961 components: - type: Transform pos: 3.5,9.5 - parent: 407 - - uid: 1959 + parent: 2 + - uid: 962 components: - type: Transform pos: 3.5,8.5 - parent: 407 + parent: 2 - proto: CrateArtifactContainer entities: - - uid: 1035 + - uid: 963 components: - type: Transform pos: -5.5,8.5 - parent: 407 + parent: 2 - proto: CrateEngineeringCableBulk entities: - - uid: 1817 + - uid: 964 components: - type: Transform pos: -16.5,-3.5 - parent: 407 + parent: 2 - proto: CrateMaterialSteel entities: - - uid: 2069 + - uid: 965 components: - type: Transform pos: -18.5,-3.5 - parent: 407 + parent: 2 - proto: CrewMonitoringServer entities: - - uid: 1862 + - uid: 966 components: - type: Transform pos: 2.5,-2.5 - parent: 407 + parent: 2 - type: SingletonDeviceNetServer active: False available: False - proto: CryogenicSleepUnitSpawnerLateJoin entities: - - uid: 1753 + - uid: 967 components: - type: Transform rot: 3.141592653589793 rad pos: 2.5,1.5 - parent: 407 + parent: 2 - proto: DefaultStationBeaconArrivals entities: - - uid: 2238 + - uid: 968 components: - type: Transform pos: 6.5,13.5 - parent: 407 + parent: 2 - proto: DefaultStationBeaconAtmospherics entities: - - uid: 2239 + - uid: 969 components: - type: Transform pos: 6.5,-13.5 - parent: 407 + parent: 2 - proto: DefaultStationBeaconBar entities: - - uid: 2240 + - uid: 970 components: - type: Transform pos: -9.5,3.5 - parent: 407 + parent: 2 - proto: DefaultStationBeaconBotany entities: - - uid: 2248 + - uid: 971 components: - type: Transform pos: -12.5,4.5 - parent: 407 + parent: 2 - proto: DefaultStationBeaconBridge entities: - - uid: 2241 + - uid: 972 components: - type: Transform pos: 22.5,0.5 - parent: 407 + parent: 2 - proto: DefaultStationBeaconBrig entities: - - uid: 2250 + - uid: 973 components: - type: Transform pos: 18.5,4.5 - parent: 407 + parent: 2 - proto: DefaultStationBeaconCargoBay entities: - - uid: 2242 + - uid: 974 components: - type: Transform pos: 2.5,9.5 - parent: 407 + parent: 2 - proto: DefaultStationBeaconChemistry entities: - - uid: 2243 + - uid: 975 components: - type: Transform pos: 7.5,-0.5 - parent: 407 + parent: 2 - proto: DefaultStationBeaconDisposals entities: - - uid: 2244 + - uid: 976 components: - type: Transform pos: 4.5,-7.5 - parent: 407 + parent: 2 - proto: DefaultStationBeaconEngineering entities: - - uid: 2245 + - uid: 977 components: - type: Transform pos: -17.5,0.5 - parent: 407 + parent: 2 - proto: DefaultStationBeaconJanitorsCloset entities: - - uid: 2246 + - uid: 978 components: - type: Transform pos: -3.5,-7.5 - parent: 407 + parent: 2 - proto: DefaultStationBeaconKitchen entities: - - uid: 2247 + - uid: 979 components: - type: Transform pos: -5.5,4.5 - parent: 407 + parent: 2 - proto: DefaultStationBeaconMedbay entities: - - uid: 2249 + - uid: 980 components: - type: Transform pos: 7.5,-2.5 - parent: 407 + parent: 2 - proto: DefaultStationBeaconScience entities: - - uid: 2251 + - uid: 981 components: - type: Transform pos: -3.5,8.5 - parent: 407 + parent: 2 - proto: DefaultStationBeaconSecurity entities: - - uid: 2259 + - uid: 982 components: - type: Transform pos: 16.5,-2.5 - parent: 407 + parent: 2 - proto: DefibrillatorCabinetFilled entities: - - uid: 2267 + - uid: 983 components: - type: Transform pos: 4.5,2.5 - parent: 407 - - uid: 2268 + parent: 2 + - uid: 984 components: - type: Transform rot: 3.141592653589793 rad pos: 11.5,-5.5 - parent: 407 + parent: 2 - proto: DisposalBend entities: - - uid: 1173 + - uid: 985 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,-7.5 - parent: 407 - - uid: 1174 + parent: 2 + - uid: 986 components: - type: Transform rot: -1.5707963267948966 rad pos: -0.5,-7.5 - parent: 407 - - uid: 1175 + parent: 2 + - uid: 987 components: - type: Transform rot: 1.5707963267948966 rad pos: -16.5,0.5 - parent: 407 - - uid: 1205 + parent: 2 + - uid: 988 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,4.5 - parent: 407 - - uid: 1206 + parent: 2 + - uid: 989 components: - type: Transform pos: 14.5,4.5 - parent: 407 + parent: 2 - proto: DisposalJunction entities: - - uid: 1190 + - uid: 990 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,0.5 - parent: 407 - - uid: 1204 + parent: 2 + - uid: 991 components: - type: Transform pos: -0.5,0.5 - parent: 407 + parent: 2 - proto: DisposalPipe entities: - - uid: 1157 + - uid: 992 components: - type: Transform rot: -1.5707963267948966 rad pos: 8.5,-6.5 - parent: 407 - - uid: 1158 + parent: 2 + - uid: 993 components: - type: Transform rot: -1.5707963267948966 rad pos: 7.5,-6.5 - parent: 407 - - uid: 1159 + parent: 2 + - uid: 994 components: - type: Transform rot: -1.5707963267948966 rad pos: 6.5,-6.5 - parent: 407 - - uid: 1160 + parent: 2 + - uid: 995 components: - type: Transform rot: -1.5707963267948966 rad pos: 5.5,-6.5 - parent: 407 - - uid: 1161 + parent: 2 + - uid: 996 components: - type: Transform rot: -1.5707963267948966 rad pos: 4.5,-6.5 - parent: 407 - - uid: 1162 + parent: 2 + - uid: 997 components: - type: Transform rot: -1.5707963267948966 rad pos: 3.5,-6.5 - parent: 407 - - uid: 1163 + parent: 2 + - uid: 998 components: - type: Transform rot: -1.5707963267948966 rad pos: 2.5,-6.5 - parent: 407 - - uid: 1164 + parent: 2 + - uid: 999 components: - type: Transform rot: -1.5707963267948966 rad pos: 1.5,-6.5 - parent: 407 - - uid: 1165 + parent: 2 + - uid: 1000 components: - type: Transform rot: -1.5707963267948966 rad pos: 0.5,-6.5 - parent: 407 - - uid: 1177 + parent: 2 + - uid: 1001 components: - type: Transform rot: 1.5707963267948966 rad pos: -15.5,0.5 - parent: 407 - - uid: 1178 + parent: 2 + - uid: 1002 components: - type: Transform rot: 1.5707963267948966 rad pos: -14.5,0.5 - parent: 407 - - uid: 1179 + parent: 2 + - uid: 1003 components: - type: Transform rot: 1.5707963267948966 rad pos: -13.5,0.5 - parent: 407 - - uid: 1180 + parent: 2 + - uid: 1004 components: - type: Transform rot: 1.5707963267948966 rad pos: -12.5,0.5 - parent: 407 - - uid: 1181 + parent: 2 + - uid: 1005 components: - type: Transform rot: 1.5707963267948966 rad pos: -11.5,0.5 - parent: 407 - - uid: 1182 + parent: 2 + - uid: 1006 components: - type: Transform rot: 1.5707963267948966 rad pos: -10.5,0.5 - parent: 407 - - uid: 1183 + parent: 2 + - uid: 1007 components: - type: Transform rot: 1.5707963267948966 rad pos: -9.5,0.5 - parent: 407 - - uid: 1184 + parent: 2 + - uid: 1008 components: - type: Transform rot: 1.5707963267948966 rad pos: -8.5,0.5 - parent: 407 - - uid: 1185 + parent: 2 + - uid: 1009 components: - type: Transform rot: 1.5707963267948966 rad pos: -7.5,0.5 - parent: 407 - - uid: 1186 + parent: 2 + - uid: 1010 components: - type: Transform rot: 1.5707963267948966 rad pos: -6.5,0.5 - parent: 407 - - uid: 1187 + parent: 2 + - uid: 1011 components: - type: Transform rot: 1.5707963267948966 rad pos: -5.5,0.5 - parent: 407 - - uid: 1188 + parent: 2 + - uid: 1012 components: - type: Transform rot: 1.5707963267948966 rad pos: -4.5,0.5 - parent: 407 - - uid: 1189 + parent: 2 + - uid: 1013 components: - type: Transform pos: -3.5,-0.5 - parent: 407 - - uid: 1191 + parent: 2 + - uid: 1014 components: - type: Transform pos: -0.5,-5.5 - parent: 407 - - uid: 1192 + parent: 2 + - uid: 1015 components: - type: Transform rot: 1.5707963267948966 rad pos: -2.5,-7.5 - parent: 407 - - uid: 1193 + parent: 2 + - uid: 1016 components: - type: Transform rot: 1.5707963267948966 rad pos: -1.5,-7.5 - parent: 407 - - uid: 1197 + parent: 2 + - uid: 1017 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,-4.5 - parent: 407 - - uid: 1198 + parent: 2 + - uid: 1018 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,-3.5 - parent: 407 - - uid: 1199 + parent: 2 + - uid: 1019 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,-2.5 - parent: 407 - - uid: 1200 + parent: 2 + - uid: 1020 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,-1.5 - parent: 407 - - uid: 1201 + parent: 2 + - uid: 1021 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,-0.5 - parent: 407 - - uid: 1202 + parent: 2 + - uid: 1022 components: - type: Transform rot: 1.5707963267948966 rad pos: -2.5,0.5 - parent: 407 - - uid: 1203 + parent: 2 + - uid: 1023 components: - type: Transform rot: 1.5707963267948966 rad pos: -1.5,0.5 - parent: 407 - - uid: 1207 + parent: 2 + - uid: 1024 components: - type: Transform pos: 14.5,0.5 - parent: 407 - - uid: 1208 + parent: 2 + - uid: 1025 components: - type: Transform pos: 14.5,1.5 - parent: 407 - - uid: 1209 + parent: 2 + - uid: 1026 components: - type: Transform pos: 14.5,2.5 - parent: 407 - - uid: 1210 + parent: 2 + - uid: 1027 components: - type: Transform pos: 14.5,3.5 - parent: 407 - - uid: 1211 + parent: 2 + - uid: 1028 components: - type: Transform rot: -1.5707963267948966 rad pos: 13.5,4.5 - parent: 407 - - uid: 1212 + parent: 2 + - uid: 1029 components: - type: Transform rot: -1.5707963267948966 rad pos: 12.5,4.5 - parent: 407 - - uid: 1213 + parent: 2 + - uid: 1030 components: - type: Transform rot: -1.5707963267948966 rad pos: 11.5,4.5 - parent: 407 - - uid: 1214 + parent: 2 + - uid: 1031 components: - type: Transform rot: -1.5707963267948966 rad pos: 10.5,4.5 - parent: 407 - - uid: 1215 + parent: 2 + - uid: 1032 components: - type: Transform rot: -1.5707963267948966 rad pos: 9.5,4.5 - parent: 407 - - uid: 1216 + parent: 2 + - uid: 1033 components: - type: Transform rot: -1.5707963267948966 rad pos: 8.5,4.5 - parent: 407 - - uid: 1217 + parent: 2 + - uid: 1034 components: - type: Transform rot: -1.5707963267948966 rad pos: 7.5,4.5 - parent: 407 - - uid: 1218 + parent: 2 + - uid: 1035 components: - type: Transform rot: -1.5707963267948966 rad pos: 6.5,4.5 - parent: 407 - - uid: 1219 + parent: 2 + - uid: 1036 components: - type: Transform rot: -1.5707963267948966 rad pos: 5.5,4.5 - parent: 407 - - uid: 1220 + parent: 2 + - uid: 1037 components: - type: Transform rot: -1.5707963267948966 rad pos: 4.5,4.5 - parent: 407 - - uid: 1221 + parent: 2 + - uid: 1038 components: - type: Transform rot: -1.5707963267948966 rad pos: 3.5,4.5 - parent: 407 - - uid: 1222 + parent: 2 + - uid: 1039 components: - type: Transform rot: -1.5707963267948966 rad pos: 2.5,4.5 - parent: 407 - - uid: 1223 + parent: 2 + - uid: 1040 components: - type: Transform rot: -1.5707963267948966 rad pos: 1.5,4.5 - parent: 407 - - uid: 1224 + parent: 2 + - uid: 1041 components: - type: Transform rot: -1.5707963267948966 rad pos: 0.5,4.5 - parent: 407 - - uid: 1225 + parent: 2 + - uid: 1042 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,1.5 - parent: 407 - - uid: 1226 + parent: 2 + - uid: 1043 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,2.5 - parent: 407 - - uid: 1227 + parent: 2 + - uid: 1044 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,3.5 - parent: 407 + parent: 2 - proto: DisposalTrunk entities: - - uid: 1156 + - uid: 1045 components: - type: Transform rot: -1.5707963267948966 rad pos: 9.5,-6.5 - parent: 407 - - uid: 1170 + parent: 2 + - uid: 1046 components: - type: Transform rot: 3.141592653589793 rad pos: 14.5,-0.5 - parent: 407 - - uid: 1171 + parent: 2 + - uid: 1047 components: - type: Transform rot: 3.141592653589793 rad pos: -3.5,-1.5 - parent: 407 - - uid: 1172 + parent: 2 + - uid: 1048 components: - type: Transform rot: 3.141592653589793 rad pos: -3.5,-8.5 - parent: 407 - - uid: 1176 + parent: 2 + - uid: 1049 components: - type: Transform rot: 3.141592653589793 rad pos: -16.5,-0.5 - parent: 407 + parent: 2 - proto: DisposalUnit entities: - - uid: 1166 + - uid: 1050 components: - type: Transform pos: -3.5,-8.5 - parent: 407 - - uid: 1167 + parent: 2 + - uid: 1051 components: - type: Transform pos: -3.5,-1.5 - parent: 407 - - uid: 1168 + parent: 2 + - uid: 1052 components: - type: Transform pos: 14.5,-0.5 - parent: 407 - - uid: 1169 + parent: 2 + - uid: 1053 components: - type: Transform pos: -16.5,-0.5 - parent: 407 + parent: 2 - proto: DisposalYJunction entities: - - uid: 1194 + - uid: 1054 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,-6.5 - parent: 407 + parent: 2 - proto: DogBed entities: - - uid: 1885 + - uid: 1055 components: - type: Transform pos: 21.5,-3.5 - parent: 407 + parent: 2 - proto: DoorRemoteAll entities: - - uid: 2262 + - uid: 1056 components: - type: Transform pos: 24.577494,2.096348 - parent: 407 + parent: 2 - proto: DoorRemoteResearch entities: - - uid: 1196 + - uid: 912 components: - type: Transform - parent: 1980 + parent: 910 - type: Physics canCollide: False - type: InsideEntityStorage - proto: DrinkVodkaBottleFull entities: - - uid: 1802 + - uid: 1057 components: - type: Transform pos: -20.785645,3.762307 - parent: 407 + parent: 2 - proto: DrinkWaterBottleFull entities: - - uid: 2272 + - uid: 1058 components: - type: Transform pos: 18.269522,5.673076 - parent: 407 + parent: 2 - proto: EmergencyLight entities: - - uid: 2119 + - uid: 1059 components: - type: Transform rot: 3.141592653589793 rad pos: 7.5,3.5 - parent: 407 - - uid: 2228 + parent: 2 + - uid: 1060 components: - type: Transform rot: -1.5707963267948966 rad pos: 0.5,-8.5 - parent: 407 - - uid: 2229 + parent: 2 + - uid: 1061 components: - type: Transform rot: 3.141592653589793 rad pos: -7.5,-0.5 - parent: 407 - - uid: 2230 + parent: 2 + - uid: 1062 components: - type: Transform rot: -1.5707963267948966 rad pos: -16.5,-0.5 - parent: 407 - - uid: 2231 + parent: 2 + - uid: 1063 components: - type: Transform rot: 3.141592653589793 rad pos: -23.5,-1.5 - parent: 407 - - uid: 2232 + parent: 2 + - uid: 1064 components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,9.5 - parent: 407 - - uid: 2233 + parent: 2 + - uid: 1065 components: - type: Transform rot: -1.5707963267948966 rad pos: -1.5,9.5 - parent: 407 - - uid: 2234 + parent: 2 + - uid: 1066 components: - type: Transform rot: 1.5707963267948966 rad pos: 5.5,12.5 - parent: 407 - - uid: 2235 + parent: 2 + - uid: 1067 components: - type: Transform pos: 17.5,1.5 - parent: 407 - - uid: 2236 + parent: 2 + - uid: 1068 components: - type: Transform pos: 9.5,-2.5 - parent: 407 + parent: 2 - proto: EmergencyRollerBedSpawnFolded entities: - - uid: 1873 + - uid: 1069 components: - type: Transform pos: 2.3683515,-0.47065163 - parent: 407 + parent: 2 +- proto: FaxMachineBase + entities: + - uid: 2496 + components: + - type: Transform + pos: 11.5,3.5 + parent: 2 - proto: FirelockEdge entities: - - uid: 1632 + - uid: 1070 components: - type: Transform rot: 1.5707963267948966 rad pos: 4.5,-2.5 - parent: 407 - - uid: 1633 + parent: 2 + - uid: 1071 components: - type: Transform rot: 3.141592653589793 rad pos: 5.5,-3.5 - parent: 407 - - uid: 1634 + parent: 2 + - uid: 1072 components: - type: Transform rot: 3.141592653589793 rad pos: 8.5,-3.5 - parent: 407 - - uid: 1635 + parent: 2 + - uid: 1073 components: - type: Transform rot: 3.141592653589793 rad pos: 11.5,-3.5 - parent: 407 - - uid: 1717 + parent: 2 + - uid: 1074 components: - type: Transform rot: 3.141592653589793 rad pos: -13.5,-1.5 - parent: 407 - - uid: 1718 + parent: 2 + - uid: 1075 components: - type: Transform rot: 3.141592653589793 rad pos: -9.5,-1.5 - parent: 407 - - uid: 2071 + parent: 2 + - uid: 1076 components: - type: Transform rot: 3.141592653589793 rad pos: -4.5,8.5 - parent: 407 - - uid: 2201 + parent: 2 + - uid: 1077 components: - type: Transform rot: -1.5707963267948966 rad pos: 24.5,0.5 - parent: 407 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 12 - proto: FirelockGlass entities: - - uid: 1580 + - uid: 1078 components: - type: Transform pos: -6.5,3.5 - parent: 407 - - uid: 1581 + parent: 2 + - uid: 1079 components: - type: Transform pos: -4.5,2.5 - parent: 407 - - uid: 1582 + parent: 2 + - uid: 1080 components: - type: Transform pos: -10.5,2.5 - parent: 407 - - uid: 1583 + parent: 2 + - uid: 1081 components: - type: Transform pos: -9.5,2.5 - parent: 407 - - uid: 1584 + parent: 2 + - uid: 1082 components: - type: Transform pos: -8.5,2.5 - parent: 407 - - uid: 1585 + parent: 2 + - uid: 1083 components: - type: Transform pos: 2.5,6.5 - parent: 407 - - uid: 1586 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 13 + - uid: 1084 components: - type: Transform pos: 5.5,0.5 - parent: 407 - - uid: 1587 + parent: 2 + - uid: 1085 components: - type: Transform pos: 7.5,-1.5 - parent: 407 - - uid: 1588 + parent: 2 + - uid: 1086 components: - type: Transform pos: 0.5,-5.5 - parent: 407 - - uid: 1589 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 13 + - uid: 1087 components: - type: Transform pos: -0.5,-5.5 - parent: 407 - - uid: 1590 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 13 + - uid: 1088 components: - type: Transform pos: -1.5,-5.5 - parent: 407 - - uid: 1591 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 13 + - uid: 1089 components: - type: Transform pos: 16.5,2.5 - parent: 407 - - uid: 1592 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 11 + - uid: 1090 components: - type: Transform pos: 15.5,2.5 - parent: 407 - - uid: 1593 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 11 + - uid: 1091 components: - type: Transform pos: 14.5,2.5 - parent: 407 - - uid: 1866 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 11 + - uid: 1092 components: - type: Transform pos: 8.5,-1.5 - parent: 407 - - uid: 1901 + parent: 2 + - uid: 1093 components: - type: Transform pos: -0.5,11.5 - parent: 407 - - uid: 1967 + parent: 2 + - uid: 1094 components: - type: Transform pos: -0.5,10.5 - parent: 407 - - uid: 1989 + parent: 2 + - uid: 1095 components: - type: Transform pos: -0.5,7.5 - parent: 407 - - uid: 2072 + parent: 2 + - uid: 1096 components: - type: Transform pos: 0.5,2.5 - parent: 407 - - uid: 2073 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 13 + - uid: 1097 components: - type: Transform pos: -0.5,2.5 - parent: 407 - - uid: 2074 - components: - - type: Transform - pos: -1.5,2.5 - parent: 407 - - uid: 2075 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 13 + - uid: 1098 components: - type: Transform pos: 7.5,6.5 - parent: 407 - - uid: 2076 + parent: 2 + - uid: 1099 components: - type: Transform pos: 8.5,6.5 - parent: 407 - - uid: 2077 + parent: 2 + - uid: 1100 components: - type: Transform pos: 6.5,6.5 - parent: 407 - - uid: 2263 + parent: 2 + - uid: 1101 components: - type: Transform pos: -0.5,8.5 - parent: 407 + parent: 2 + - uid: 1102 + components: + - type: Transform + pos: -1.5,2.5 + parent: 2 + - type: Door + secondsUntilStateChange: -428.10837 + state: Closing + - type: DeviceNetwork + deviceLists: + - 13 - proto: Fireplace entities: - - uid: 1860 + - uid: 1103 components: - type: Transform pos: 23.5,-2.5 - parent: 407 + parent: 2 - proto: FlashlightLantern entities: - - uid: 1822 + - uid: 1104 components: - type: Transform pos: -18.508236,2.63682 - parent: 407 - - uid: 1823 + parent: 2 + - uid: 1105 components: - type: Transform pos: -18.39886,2.464945 - parent: 407 + parent: 2 - proto: FlippoEngravedLighter entities: - - uid: 2260 + - uid: 1106 components: - type: Transform pos: 26.017355,2.4964807 - parent: 407 + parent: 2 - proto: FloorDrain entities: - - uid: 1011 + - uid: 1107 components: - type: Transform pos: -4.5,3.5 - parent: 407 + parent: 2 - type: Fixtures fixtures: {} - - uid: 1657 + - uid: 1108 components: - type: Transform pos: -5.5,-6.5 - parent: 407 + parent: 2 - type: Fixtures fixtures: {} - proto: GasMinerNitrogen entities: - - uid: 1257 + - uid: 1109 components: - type: Transform pos: 10.5,-15.5 - parent: 407 + parent: 2 - proto: GasMinerOxygen entities: - - uid: 1256 + - uid: 1110 components: - type: Transform pos: 10.5,-13.5 - parent: 407 + parent: 2 - proto: GasMixer entities: - - uid: 1264 + - uid: 1111 components: - type: Transform rot: 3.141592653589793 rad pos: 7.5,-13.5 - parent: 407 + parent: 2 - type: GasMixer inletTwoConcentration: 0.78 inletOneConcentration: 0.22 - type: AtmosPipeColor - color: '#0335FCFF' -- proto: GasMixerFlipped - entities: - - uid: 1529 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 5.5,-14.5 - parent: 407 + color: '#0055CCFF' - proto: GasPassiveVent entities: - - uid: 238 + - uid: 1112 components: - type: Transform rot: -1.5707963267948966 rad pos: 9.5,-13.5 - parent: 407 - - uid: 239 + parent: 2 + - uid: 1113 components: - type: Transform rot: -1.5707963267948966 rad pos: 9.5,-15.5 - parent: 407 - - uid: 1538 + parent: 2 + - uid: 1114 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,-15.5 - parent: 407 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' - proto: GasPipeBend entities: - - uid: 1265 + - uid: 1115 components: - type: Transform rot: 3.141592653589793 rad pos: 7.5,-15.5 - parent: 407 - - uid: 1282 + parent: 2 + - uid: 1116 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,-12.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1283 + color: '#0055CCFF' + - uid: 1117 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,-11.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1284 + color: '#0055CCFF' + - uid: 1118 components: - type: Transform rot: -1.5707963267948966 rad pos: 0.5,-11.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1285 + color: '#0055CCFF' + - uid: 1119 components: - type: Transform pos: 0.5,-9.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1286 + color: '#0055CCFF' + - uid: 1120 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,-9.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1295 + color: '#0055CCFF' + - uid: 1121 components: - type: Transform rot: 3.141592653589793 rad pos: 5.5,-3.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1296 + color: '#0055CCFF' + - uid: 1122 components: - type: Transform pos: 6.5,-3.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1297 + color: '#0055CCFF' + - uid: 1123 components: - type: Transform rot: 3.141592653589793 rad pos: 8.5,-3.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1298 + color: '#0055CCFF' + - uid: 1124 components: - type: Transform pos: 9.5,-3.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1299 + color: '#0055CCFF' + - uid: 1125 components: - type: Transform rot: 3.141592653589793 rad pos: 11.5,-3.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1300 + color: '#0055CCFF' + - uid: 1126 components: - type: Transform pos: 12.5,-3.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1306 + color: '#0055CCFF' + - uid: 1127 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,-4.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1307 + color: '#0055CCFF' + - uid: 1128 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,-2.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1308 + color: '#0055CCFF' + - uid: 1129 components: - type: Transform pos: 0.5,-2.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1313 + color: '#0055CCFF' + - uid: 1130 components: - type: Transform pos: 3.5,0.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1315 + color: '#0055CCFF' + - uid: 1131 components: - type: Transform rot: -1.5707963267948966 rad pos: 3.5,-3.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1372 + color: '#0055CCFF' + - uid: 1132 components: - type: Transform rot: 3.141592653589793 rad pos: 8.5,4.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1373 + color: '#0055CCFF' + - uid: 1133 components: - type: Transform pos: 8.5,5.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1374 + color: '#0055CCFF' + - uid: 1134 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,5.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1375 + color: '#0055CCFF' + - uid: 1135 components: - type: Transform rot: -1.5707963267948966 rad pos: 6.5,4.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1378 + color: '#0055CCFF' + - uid: 1136 components: - type: Transform pos: 7.5,7.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1379 + color: '#0055CCFF' + - uid: 1137 components: - type: Transform rot: 3.141592653589793 rad pos: 5.5,7.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1401 + color: '#0055CCFF' + - uid: 1138 components: - type: Transform rot: 3.141592653589793 rad pos: -1.5,3.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1403 + color: '#0055CCFF' + - uid: 1139 components: - type: Transform rot: -1.5707963267948966 rad pos: 0.5,3.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1434 + color: '#0055CCFF' + - uid: 1140 components: - type: Transform rot: -1.5707963267948966 rad pos: -16.5,-0.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1435 + color: '#0055CCFF' + - uid: 1141 components: - type: Transform rot: 3.141592653589793 rad pos: -18.5,-0.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1436 + color: '#0055CCFF' + - uid: 1142 components: - type: Transform pos: -18.5,0.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1438 + color: '#0055CCFF' + - uid: 1143 components: - type: Transform pos: -16.5,1.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1439 + color: '#0055CCFF' + - uid: 1144 components: - type: Transform rot: 3.141592653589793 rad pos: -17.5,1.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1468 + color: '#0055CCFF' + - uid: 1145 components: - type: Transform rot: -1.5707963267948966 rad pos: 0.5,-4.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1541 + color: '#0055CCFF' + - uid: 1146 components: - type: Transform rot: 1.5707963267948966 rad pos: 3.5,-13.5 - parent: 407 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1147 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,-13.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1148 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,-6.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1149 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 10.5,-5.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1150 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,-5.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1151 + components: + - type: Transform + pos: 6.5,-5.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1152 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-8.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1153 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-6.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1154 + components: + - type: Transform + pos: 8.5,-3.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1155 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,-3.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1156 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,-0.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1157 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -15.5,-0.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1158 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -15.5,-1.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1159 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,1.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1160 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,2.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1161 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,2.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1162 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,3.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1163 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,5.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1164 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,5.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1165 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,11.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1166 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 14.5,-0.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1167 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.5,1.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' - proto: GasPipeFourway entities: - - uid: 1290 + - uid: 1168 components: - type: Transform pos: -0.5,0.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1346 + color: '#0055CCFF' + - uid: 1169 components: - type: Transform pos: 17.5,0.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1348 + color: '#0055CCFF' + - uid: 1170 components: - type: Transform pos: 22.5,0.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1376 + color: '#0055CCFF' + - uid: 1171 components: - type: Transform pos: 7.5,5.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1402 + color: '#0055CCFF' + - uid: 1172 components: - type: Transform pos: -0.5,3.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1437 + color: '#0055CCFF' + - uid: 1173 components: - type: Transform pos: -17.5,-0.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' + - uid: 1174 + components: + - type: Transform + pos: 6.5,-6.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1175 + components: + - type: Transform + pos: -8.5,-0.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1176 + components: + - type: Transform + pos: 8.5,-4.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' - proto: GasPipeStraight entities: - - uid: 237 + - uid: 1177 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,-11.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1178 components: - type: Transform pos: 5.5,15.5 - parent: 407 - - uid: 676 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1179 components: - type: Transform rot: 3.141592653589793 rad pos: 18.5,1.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1262 + color: '#0055CCFF' + - uid: 1180 components: - type: Transform rot: -1.5707963267948966 rad pos: 8.5,-15.5 - parent: 407 - - uid: 1263 + parent: 2 + - uid: 1181 components: - type: Transform rot: -1.5707963267948966 rad pos: 8.5,-13.5 - parent: 407 - - uid: 1266 + parent: 2 + - uid: 1182 components: - type: Transform rot: 3.141592653589793 rad pos: 7.5,-14.5 - parent: 407 - - uid: 1269 + parent: 2 + - uid: 1183 components: - type: Transform rot: -1.5707963267948966 rad pos: 6.5,-12.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1275 + color: '#0055CCFF' + - uid: 1184 components: - type: Transform rot: -1.5707963267948966 rad pos: 8.5,-11.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1276 + color: '#0055CCFF' + - uid: 1185 components: - type: Transform rot: -1.5707963267948966 rad pos: 9.5,-11.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1277 + color: '#0055CCFF' + - uid: 1186 components: - type: Transform rot: -1.5707963267948966 rad pos: 4.5,-12.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1278 + color: '#0055CCFF' + - uid: 1187 components: - type: Transform rot: -1.5707963267948966 rad pos: 3.5,-12.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1279 + color: '#0055CCFF' + - uid: 1188 components: - type: Transform rot: -1.5707963267948966 rad pos: 2.5,-12.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1280 + color: '#0055CCFF' + - uid: 1189 components: - type: Transform rot: -1.5707963267948966 rad pos: 1.5,-12.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1281 + color: '#0055CCFF' + - uid: 1190 components: - type: Transform rot: -1.5707963267948966 rad pos: 0.5,-12.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1294 + color: '#0055CCFF' + - uid: 1191 components: - type: Transform pos: -0.5,-8.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1301 + color: '#0055CCFF' + - uid: 1192 components: - type: Transform rot: -1.5707963267948966 rad pos: -1.5,-7.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1302 + color: '#0055CCFF' + - uid: 1193 components: - type: Transform rot: -1.5707963267948966 rad pos: -2.5,-7.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1303 + color: '#0055CCFF' + - uid: 1194 components: - type: Transform rot: -1.5707963267948966 rad pos: -3.5,-7.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1304 + color: '#0055CCFF' + - uid: 1195 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,-6.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1305 + color: '#0055CCFF' + - uid: 1196 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,-5.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1309 + color: '#0055CCFF' + - uid: 1197 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,-1.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1310 + color: '#0055CCFF' + - uid: 1198 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,-0.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1311 + color: '#0055CCFF' + - uid: 1199 components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,0.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1312 + color: '#0055CCFF' + - uid: 1200 components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,0.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1316 + color: '#0055CCFF' + - uid: 1201 components: - type: Transform pos: 3.5,-1.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1317 + color: '#0055CCFF' + - uid: 1202 components: - type: Transform pos: 3.5,-0.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1320 + color: '#0055CCFF' + - uid: 1203 components: - type: Transform rot: -1.5707963267948966 rad pos: 4.5,-2.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1321 + color: '#0055CCFF' + - uid: 1204 components: - type: Transform rot: -1.5707963267948966 rad pos: 6.5,-2.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1322 + color: '#0055CCFF' + - uid: 1205 components: - type: Transform rot: -1.5707963267948966 rad pos: 7.5,-2.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1323 + color: '#0055CCFF' + - uid: 1206 components: - type: Transform rot: -1.5707963267948966 rad pos: 9.5,-2.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1324 + color: '#0055CCFF' + - uid: 1207 components: - type: Transform rot: -1.5707963267948966 rad pos: 10.5,-2.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1325 + color: '#0055CCFF' + - uid: 1208 components: - type: Transform rot: 3.141592653589793 rad pos: 11.5,-1.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1326 + color: '#0055CCFF' + - uid: 1209 components: - type: Transform rot: 3.141592653589793 rad pos: 11.5,-0.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1327 + color: '#0055CCFF' + - uid: 1210 components: - type: Transform rot: 1.5707963267948966 rad pos: 10.5,0.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1328 + color: '#0055CCFF' + - uid: 1211 components: - type: Transform rot: 1.5707963267948966 rad pos: 9.5,0.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1329 + color: '#0055CCFF' + - uid: 1212 components: - type: Transform rot: 1.5707963267948966 rad pos: 8.5,0.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1330 + color: '#0055CCFF' + - uid: 1213 components: - type: Transform rot: 1.5707963267948966 rad pos: 12.5,0.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1331 + color: '#0055CCFF' + - uid: 1214 components: - type: Transform rot: 1.5707963267948966 rad pos: 13.5,0.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1332 + color: '#0055CCFF' + - uid: 1215 components: - type: Transform rot: 1.5707963267948966 rad pos: 14.5,0.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1347 + color: '#0055CCFF' + - uid: 1216 components: - type: Transform rot: 1.5707963267948966 rad pos: 16.5,0.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1350 + color: '#0055CCFF' + - uid: 1217 components: - type: Transform rot: 1.5707963267948966 rad pos: 19.5,0.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1351 + color: '#0055CCFF' + - uid: 1218 components: - type: Transform rot: 1.5707963267948966 rad pos: 20.5,0.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1352 + color: '#0055CCFF' + - uid: 1219 components: - type: Transform rot: 1.5707963267948966 rad pos: 21.5,0.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1353 + color: '#0055CCFF' + - uid: 1220 components: - type: Transform pos: 17.5,-0.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1354 + color: '#0055CCFF' + - uid: 1221 components: - type: Transform pos: 17.5,-1.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1356 + color: '#0055CCFF' + - uid: 1222 components: - type: Transform rot: 3.141592653589793 rad pos: 18.5,2.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1357 + color: '#0055CCFF' + - uid: 1223 components: - type: Transform rot: 1.5707963267948966 rad pos: 23.5,0.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1358 + color: '#0055CCFF' + - uid: 1224 components: - type: Transform pos: 22.5,-0.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1359 + color: '#0055CCFF' + - uid: 1225 components: - type: Transform pos: 22.5,-1.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1363 + color: '#0055CCFF' + - uid: 1226 components: - type: Transform rot: 3.141592653589793 rad pos: 15.5,1.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1364 + color: '#0055CCFF' + - uid: 1227 components: - type: Transform rot: 3.141592653589793 rad pos: 15.5,2.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1365 + color: '#0055CCFF' + - uid: 1228 components: - type: Transform rot: 3.141592653589793 rad pos: 15.5,3.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1366 + color: '#0055CCFF' + - uid: 1229 components: - type: Transform rot: 1.5707963267948966 rad pos: 14.5,4.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1367 + color: '#0055CCFF' + - uid: 1230 components: - type: Transform rot: 1.5707963267948966 rad pos: 13.5,4.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1368 + color: '#0055CCFF' + - uid: 1231 components: - type: Transform rot: 1.5707963267948966 rad pos: 12.5,4.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1369 + color: '#0055CCFF' + - uid: 1232 components: - type: Transform rot: 1.5707963267948966 rad pos: 11.5,4.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1370 + color: '#0055CCFF' + - uid: 1233 components: - type: Transform rot: 1.5707963267948966 rad pos: 10.5,4.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1371 + color: '#0055CCFF' + - uid: 1234 components: - type: Transform rot: 1.5707963267948966 rad pos: 9.5,4.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1380 + color: '#0055CCFF' + - uid: 1235 components: - type: Transform rot: 3.141592653589793 rad pos: 7.5,6.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1381 + color: '#0055CCFF' + - uid: 1236 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,7.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1382 + color: '#0055CCFF' + - uid: 1237 components: - type: Transform pos: 5.5,8.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1383 + color: '#0055CCFF' + - uid: 1238 components: - type: Transform pos: 5.5,9.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1384 + color: '#0055CCFF' + - uid: 1239 components: - type: Transform pos: 5.5,10.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1385 + color: '#0055CCFF' + - uid: 1240 components: - type: Transform pos: 5.5,11.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1386 + color: '#0055CCFF' + - uid: 1241 components: - type: Transform pos: 5.5,12.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1387 + color: '#0055CCFF' + - uid: 1242 components: - type: Transform pos: 5.5,13.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1388 + color: '#0055CCFF' + - uid: 1243 components: - type: Transform pos: 5.5,14.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1404 + color: '#0055CCFF' + - uid: 1244 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,1.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1405 + color: '#0055CCFF' + - uid: 1245 components: - type: Transform rot: 3.141592653589793 rad pos: -0.5,2.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1406 + color: '#0055CCFF' + - uid: 1246 components: - type: Transform rot: 3.141592653589793 rad pos: -1.5,4.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1407 + color: '#0055CCFF' + - uid: 1247 components: - type: Transform rot: 3.141592653589793 rad pos: -1.5,5.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1408 + color: '#0055CCFF' + - uid: 1248 components: - type: Transform rot: 3.141592653589793 rad pos: -1.5,6.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1409 + color: '#0055CCFF' + - uid: 1249 components: - type: Transform rot: 3.141592653589793 rad pos: -1.5,7.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1410 + color: '#0055CCFF' + - uid: 1250 components: - type: Transform rot: 3.141592653589793 rad pos: 0.5,5.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1411 + color: '#0055CCFF' + - uid: 1251 components: - type: Transform rot: 3.141592653589793 rad pos: 0.5,6.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1412 + color: '#0055CCFF' + - uid: 1252 components: - type: Transform rot: 3.141592653589793 rad pos: 0.5,7.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1413 + color: '#0055CCFF' + - uid: 1253 components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,4.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1414 + color: '#0055CCFF' + - uid: 1254 components: - type: Transform rot: 1.5707963267948966 rad pos: 2.5,4.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1415 + color: '#0055CCFF' + - uid: 1255 components: - type: Transform rot: 1.5707963267948966 rad pos: 3.5,4.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1416 + color: '#0055CCFF' + - uid: 1256 components: - type: Transform rot: 1.5707963267948966 rad pos: 4.5,4.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1417 + color: '#0055CCFF' + - uid: 1257 components: - type: Transform rot: 1.5707963267948966 rad pos: 5.5,4.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1418 + color: '#0055CCFF' + - uid: 1258 components: - type: Transform rot: 1.5707963267948966 rad pos: -1.5,0.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1419 + color: '#0055CCFF' + - uid: 1259 components: - type: Transform rot: 1.5707963267948966 rad pos: -2.5,0.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1420 + color: '#0055CCFF' + - uid: 1260 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,0.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1421 + color: '#0055CCFF' + - uid: 1261 components: - type: Transform rot: 1.5707963267948966 rad pos: -4.5,0.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1423 + color: '#0055CCFF' + - uid: 1262 components: - type: Transform rot: 1.5707963267948966 rad pos: -6.5,0.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1425 + color: '#0055CCFF' + - uid: 1263 components: - type: Transform rot: 1.5707963267948966 rad pos: -8.5,0.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1427 + color: '#0055CCFF' + - uid: 1264 components: - type: Transform rot: 1.5707963267948966 rad pos: -10.5,0.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1428 + color: '#0055CCFF' + - uid: 1265 components: - type: Transform rot: 1.5707963267948966 rad pos: -11.5,0.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1429 + color: '#0055CCFF' + - uid: 1266 components: - type: Transform rot: 1.5707963267948966 rad pos: -12.5,0.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1431 + color: '#0055CCFF' + - uid: 1267 components: - type: Transform rot: 1.5707963267948966 rad pos: -14.5,0.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1432 + color: '#0055CCFF' + - uid: 1268 components: - type: Transform rot: 1.5707963267948966 rad pos: -15.5,0.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1441 + color: '#0055CCFF' + - uid: 1269 components: - type: Transform pos: -17.5,2.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1442 + color: '#0055CCFF' + - uid: 1270 components: - type: Transform pos: -17.5,4.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1443 + color: '#0055CCFF' + - uid: 1271 components: - type: Transform pos: -17.5,5.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1444 + color: '#0055CCFF' + - uid: 1272 components: - type: Transform rot: -1.5707963267948966 rad pos: -19.5,0.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1445 + color: '#0055CCFF' + - uid: 1273 components: - type: Transform rot: 3.141592653589793 rad pos: -17.5,-1.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1451 + color: '#0055CCFF' + - uid: 1274 components: - type: Transform pos: -13.5,-0.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1452 + color: '#0055CCFF' + - uid: 1275 components: - type: Transform pos: -9.5,-0.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1453 + color: '#0055CCFF' + - uid: 1276 components: - type: Transform pos: -5.5,-0.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1454 + color: '#0055CCFF' + - uid: 1277 components: - type: Transform pos: -7.5,1.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1455 + color: '#0055CCFF' + - uid: 1278 components: - type: Transform pos: -7.5,2.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1456 + color: '#0055CCFF' + - uid: 1279 components: - type: Transform pos: -7.5,3.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1459 + color: '#0055CCFF' + - uid: 1280 components: - type: Transform rot: -1.5707963267948966 rad pos: -9.5,4.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1460 + color: '#0055CCFF' + - uid: 1281 components: - type: Transform rot: -1.5707963267948966 rad pos: -10.5,4.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1461 + color: '#0055CCFF' + - uid: 1282 components: - type: Transform rot: -1.5707963267948966 rad pos: -11.5,4.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1462 + color: '#0055CCFF' + - uid: 1283 components: - type: Transform rot: -1.5707963267948966 rad pos: -12.5,4.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1463 + color: '#0055CCFF' + - uid: 1284 components: - type: Transform rot: -1.5707963267948966 rad pos: -6.5,4.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1464 + color: '#0055CCFF' + - uid: 1285 components: - type: Transform rot: -1.5707963267948966 rad pos: -5.5,4.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' -- proto: GasPipeTJunction - entities: - - uid: 1267 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 7.5,-12.5 - parent: 407 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1268 - components: - - type: Transform - pos: 7.5,-11.5 - parent: 407 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1270 + color: '#0055CCFF' + - uid: 1286 components: - type: Transform rot: 3.141592653589793 rad - pos: 5.5,-12.5 - parent: 407 + pos: 6.5,-10.5 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#990000FF' - uid: 1287 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,-10.5 - parent: 407 + rot: 3.141592653589793 rad + pos: 6.5,-12.5 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#990000FF' + - uid: 1288 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,-9.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' - uid: 1289 components: - type: Transform rot: -1.5707963267948966 rad - pos: -0.5,-7.5 - parent: 407 + pos: 3.5,-11.5 + parent: 2 + - uid: 1290 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,-8.5 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#990000FF' - uid: 1291 components: - type: Transform - pos: 2.5,0.5 - parent: 407 + rot: -1.5707963267948966 rad + pos: 7.5,-6.5 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#990000FF' - uid: 1292 components: - type: Transform - pos: 5.5,-2.5 - parent: 407 + rot: -1.5707963267948966 rad + pos: 9.5,-5.5 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#990000FF' - uid: 1293 components: - type: Transform - pos: 8.5,-2.5 - parent: 407 + rot: -1.5707963267948966 rad + pos: 5.5,-6.5 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1314 + color: '#990000FF' + - uid: 1294 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-6.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1295 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,-6.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1296 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,-6.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1297 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,-6.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1298 + components: + - type: Transform + pos: 0.5,-7.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1299 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-8.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1300 components: - type: Transform rot: 1.5707963267948966 rad - pos: 3.5,-2.5 - parent: 407 + pos: -3.5,-8.5 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#990000FF' + - uid: 1301 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-8.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1302 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-6.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1303 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-5.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1304 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-4.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1305 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-3.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1306 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-2.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1307 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-1.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1308 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,-2.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1309 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,-1.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1310 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,-0.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1311 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,-0.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1312 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.5,-0.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1313 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,-0.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1314 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,-0.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1315 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -6.5,-0.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1316 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -7.5,-0.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1317 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -10.5,-0.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' - uid: 1318 components: - type: Transform rot: -1.5707963267948966 rad - pos: 11.5,-2.5 - parent: 407 + pos: -11.5,-0.5 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#990000FF' - uid: 1319 components: - type: Transform - pos: 11.5,0.5 - parent: 407 + rot: 1.5707963267948966 rad + pos: -9.5,-0.5 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1349 + color: '#990000FF' + - uid: 1320 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -13.5,-0.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1321 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -14.5,-0.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1322 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -17.5,-1.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1323 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -18.5,-1.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1324 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -19.5,-1.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1325 + components: + - type: Transform + pos: -3.5,-1.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1326 + components: + - type: Transform + pos: -3.5,-2.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1327 + components: + - type: Transform + pos: -8.5,0.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1328 + components: + - type: Transform + pos: -9.5,2.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1329 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -7.5,1.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1330 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -6.5,1.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1331 components: - type: Transform rot: 3.141592653589793 rad - pos: 18.5,0.5 - parent: 407 + pos: -5.5,2.5 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1360 + color: '#990000FF' + - uid: 1332 components: - type: Transform rot: 3.141592653589793 rad - pos: 15.5,0.5 - parent: 407 + pos: -5.5,3.5 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1362 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 15.5,4.5 - parent: 407 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1400 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 0.5,4.5 - parent: 407 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1422 - components: - - type: Transform - pos: -9.5,0.5 - parent: 407 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1424 - components: - - type: Transform - pos: -13.5,0.5 - parent: 407 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1426 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -7.5,0.5 - parent: 407 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1430 - components: - - type: Transform - pos: -5.5,0.5 - parent: 407 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1433 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -16.5,0.5 - parent: 407 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1440 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -17.5,3.5 - parent: 407 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1457 - components: - - type: Transform - pos: -7.5,4.5 - parent: 407 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1458 - components: - - type: Transform - pos: -8.5,4.5 - parent: 407 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1469 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,-3.5 - parent: 407 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1539 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 3.5,-15.5 - parent: 407 - - uid: 1540 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 3.5,-14.5 - parent: 407 -- proto: GasPort - entities: - - uid: 1272 - components: - - type: Transform - pos: 5.5,-10.5 - parent: 407 - - uid: 1530 - components: - - type: Transform - pos: 5.5,-13.5 - parent: 407 - - uid: 1531 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 6.5,-14.5 - parent: 407 - - uid: 1532 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 5.5,-15.5 - parent: 407 - - uid: 1542 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-15.5 - parent: 407 - - uid: 1543 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-14.5 - parent: 407 - - uid: 1544 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-13.5 - parent: 407 -- proto: GasPressurePump - entities: - - uid: 1271 - components: - - type: Transform - pos: 5.5,-11.5 - parent: 407 - - type: AtmosPipeColor - color: '#0335FCFF' -- proto: GasVentPump - entities: - - uid: 1273 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 6.5,-11.5 - parent: 407 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1274 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 10.5,-11.5 - parent: 407 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1288 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,-10.5 - parent: 407 - - type: AtmosPipeColor - color: '#0335FCFF' + color: '#990000FF' - uid: 1333 components: - type: Transform - pos: 18.5,3.5 - parent: 407 + rot: 3.141592653589793 rad + pos: -1.5,0.5 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#990000FF' - uid: 1334 components: - type: Transform - pos: 17.5,1.5 - parent: 407 + rot: 1.5707963267948966 rad + pos: -0.5,1.5 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#990000FF' - uid: 1335 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 7.5,0.5 - parent: 407 + rot: 3.141592653589793 rad + pos: -2.5,3.5 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#990000FF' - uid: 1336 components: - type: Transform rot: 3.141592653589793 rad - pos: 6.5,-4.5 - parent: 407 + pos: -2.5,4.5 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#990000FF' - uid: 1337 components: - type: Transform rot: 3.141592653589793 rad - pos: 9.5,-4.5 - parent: 407 + pos: -2.5,5.5 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#990000FF' - uid: 1338 components: - type: Transform rot: 3.141592653589793 rad - pos: 12.5,-4.5 - parent: 407 + pos: -2.5,6.5 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#990000FF' - uid: 1339 components: - type: Transform rot: 3.141592653589793 rad - pos: 2.5,-0.5 - parent: 407 + pos: -2.5,7.5 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#990000FF' - uid: 1340 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 2.5,-3.5 - parent: 407 + rot: -1.5707963267948966 rad + pos: -1.5,8.5 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#990000FF' - uid: 1341 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -4.5,-7.5 - parent: 407 + rot: -1.5707963267948966 rad + pos: -0.5,8.5 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1343 - components: - - type: Transform - pos: 22.5,1.5 - parent: 407 - - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1344 + color: '#990000FF' + - uid: 1342 components: - type: Transform rot: -1.5707963267948966 rad - pos: 24.5,0.5 - parent: 407 + pos: 0.5,8.5 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#990000FF' + - uid: 1343 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,8.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1344 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,9.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' - uid: 1345 components: - type: Transform rot: 3.141592653589793 rad - pos: 22.5,-2.5 - parent: 407 + pos: 1.5,10.5 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#990000FF' + - uid: 1346 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,11.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1347 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,12.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1348 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,13.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1349 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,14.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1350 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,2.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1351 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,2.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1352 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,3.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1353 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,3.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1354 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,3.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' - uid: 1355 components: - type: Transform rot: 3.141592653589793 rad - pos: 17.5,-2.5 - parent: 407 + pos: 5.5,4.5 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#990000FF' + - uid: 1356 + components: + - type: Transform + pos: 6.5,6.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1357 + components: + - type: Transform + pos: 6.5,7.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1358 + components: + - type: Transform + pos: 6.5,8.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1359 + components: + - type: Transform + pos: 6.5,10.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1360 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,11.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1361 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,11.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1362 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.5,11.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1363 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 10.5,11.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1364 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 11.5,11.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1365 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 7.5,9.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1366 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 6.5,3.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1367 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,3.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1368 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,3.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1369 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.5,3.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1370 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 11.5,3.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1371 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 12.5,3.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1372 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 13.5,3.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1373 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 15.5,3.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1374 + components: + - type: Transform + pos: 14.5,2.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1375 + components: + - type: Transform + pos: 14.5,1.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1376 + components: + - type: Transform + pos: 14.5,0.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' - uid: 1377 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 15.5,-0.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1378 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 17.5,-0.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1379 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 18.5,-0.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1380 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 20.5,-0.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1381 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,-0.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1382 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 23.5,0.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1383 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 21.5,-1.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1384 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 21.5,-2.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1385 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 16.5,-1.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1386 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 16.5,-2.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1387 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,0.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1388 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,1.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1389 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,2.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1390 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.5,1.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1391 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -11.5,1.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1392 + components: + - type: Transform + pos: -12.5,2.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1393 + components: + - type: Transform + pos: -12.5,3.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1394 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-0.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1395 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.5,-4.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1396 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 10.5,4.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' +- proto: GasPipeTJunction + entities: + - uid: 1397 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 10.5,3.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1398 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,1.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1399 + components: + - type: Transform + pos: 5.5,-13.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1400 + components: + - type: Transform + pos: -1.5,2.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1401 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,-12.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1402 + components: + - type: Transform + pos: 7.5,-11.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1403 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,-12.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1404 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-10.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1405 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,-7.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1406 + components: + - type: Transform + pos: 2.5,0.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1407 + components: + - type: Transform + pos: 5.5,-2.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1408 + components: + - type: Transform + pos: 8.5,-2.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1409 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,-2.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1410 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 11.5,-2.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1411 + components: + - type: Transform + pos: 11.5,0.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1412 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 18.5,0.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1413 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 15.5,0.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1414 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 15.5,4.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1415 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,4.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1416 + components: + - type: Transform + pos: -9.5,0.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1417 + components: + - type: Transform + pos: -13.5,0.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1418 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,0.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1419 + components: + - type: Transform + pos: -5.5,0.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1420 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -16.5,0.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1421 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -17.5,3.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1422 + components: + - type: Transform + pos: -7.5,4.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1423 + components: + - type: Transform + pos: -8.5,4.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1424 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-3.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1425 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,-15.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1426 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,-14.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1427 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,-7.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1428 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 8.5,-5.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1429 + components: + - type: Transform + pos: 0.5,-6.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1430 + components: + - type: Transform + pos: -1.5,-8.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1431 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,-0.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1432 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,-0.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1433 + components: + - type: Transform + pos: 7.5,-0.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1434 + components: + - type: Transform + pos: -12.5,-0.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1435 + components: + - type: Transform + pos: -16.5,-1.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1436 + components: + - type: Transform + pos: -3.5,-0.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1437 + components: + - type: Transform + pos: -8.5,1.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1438 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,1.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1439 + components: + - type: Transform + pos: -2.5,8.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1440 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 1.5,8.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1441 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,3.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1442 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,9.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1443 + components: + - type: Transform + pos: 14.5,3.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1444 + components: + - type: Transform + pos: 16.5,-0.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1445 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-0.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1446 + components: + - type: Transform + pos: 21.5,-0.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1447 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 23.5,-0.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' +- proto: GasPort + entities: + - uid: 1448 + components: + - type: Transform + pos: 5.5,-10.5 + parent: 2 + - uid: 1449 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-15.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1450 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-14.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' +- proto: GasPressurePump + entities: + - uid: 1451 + components: + - type: Transform + pos: 5.5,-11.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasValve + entities: + - uid: 1452 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-13.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' +- proto: GasVentPump + entities: + - uid: 1453 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,-11.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 14 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1454 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 10.5,-11.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 14 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1455 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,-10.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 13 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1456 + components: + - type: Transform + pos: 18.5,3.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 11 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1457 + components: + - type: Transform + pos: 17.5,1.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 11 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1458 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 7.5,0.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1459 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,-4.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1460 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,-4.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1461 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 12.5,-4.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 5 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1462 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-0.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1463 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 2.5,-3.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 5 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1464 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,-7.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 7 + - 6 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1465 + components: + - type: Transform + pos: 22.5,1.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1466 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,0.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1467 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 22.5,-2.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 12 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1468 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 17.5,-2.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 11 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1469 components: - type: Transform rot: 3.141592653589793 rad pos: 7.5,4.5 - parent: 407 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 13 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1395 + color: '#0055CCFF' + - uid: 1470 components: - type: Transform pos: 5.5,16.5 - parent: 407 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 10 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1397 + color: '#0055CCFF' + - uid: 1471 components: - type: Transform pos: -0.5,4.5 - parent: 407 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 13 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1398 + color: '#0055CCFF' + - uid: 1472 components: - type: Transform pos: -1.5,8.5 - parent: 407 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 4 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1399 + color: '#0055CCFF' + - uid: 1473 components: - type: Transform pos: 0.5,8.5 - parent: 407 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 3 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1446 + color: '#0055CCFF' + - uid: 1474 components: - type: Transform pos: -17.5,0.5 - parent: 407 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 9 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1447 + color: '#0055CCFF' + - uid: 1475 components: - type: Transform rot: 1.5707963267948966 rad pos: -20.5,0.5 - parent: 407 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 9 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1448 + color: '#0055CCFF' + - uid: 1476 components: - type: Transform rot: -1.5707963267948966 rad pos: -16.5,3.5 - parent: 407 + parent: 2 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1449 + color: '#0055CCFF' + - uid: 1477 components: - type: Transform pos: -17.5,6.5 - parent: 407 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 9 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1450 + color: '#0055CCFF' + - uid: 1478 components: - type: Transform rot: 3.141592653589793 rad pos: -17.5,-2.5 - parent: 407 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 9 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1465 + color: '#0055CCFF' + - uid: 1479 components: - type: Transform rot: 3.141592653589793 rad pos: -8.5,3.5 - parent: 407 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 8 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1466 + color: '#0055CCFF' + - uid: 1480 components: - type: Transform rot: 1.5707963267948966 rad pos: -13.5,4.5 - parent: 407 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 8 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1467 + color: '#0055CCFF' + - uid: 1481 components: - type: Transform rot: -1.5707963267948966 rad pos: -4.5,4.5 - parent: 407 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 8 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 1470 + color: '#0055CCFF' + - uid: 1482 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,-3.5 - parent: 407 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 13 - type: AtmosPipeColor - color: '#0335FCFF' - - uid: 2258 + color: '#0055CCFF' + - uid: 1483 components: - type: Transform pos: 15.5,5.5 - parent: 407 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 11 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1484 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -13.5,-1.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 7 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 1485 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,-1.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 7 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasVentScrubber + entities: + - uid: 1486 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,-7.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 14 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1487 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 7.5,-4.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 5 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1488 + components: + - type: Transform + pos: 5.5,-4.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 5 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1489 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,-8.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 6 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1490 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-9.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 13 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1491 + components: + - type: Transform + pos: 6.5,0.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 5 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1492 + components: + - type: Transform + pos: 4.5,0.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 5 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1493 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 10.5,-0.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 5 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1494 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.5,-1.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 7 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1495 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,-1.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 7 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1496 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -20.5,-1.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 9 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1497 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -16.5,-2.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1498 + components: + - type: Transform + pos: -12.5,4.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 8 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1499 + components: + - type: Transform + pos: -9.5,3.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 8 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1500 + components: + - type: Transform + pos: -5.5,4.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 8 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1501 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-3.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 7 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1502 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,1.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 13 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1503 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,8.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 3 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1504 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -4.5,8.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 4 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1505 + components: + - type: Transform + pos: 1.5,15.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 3 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1506 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 12.5,11.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 10 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1507 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 8.5,9.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 10 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1508 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,-0.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1509 + components: + - type: Transform + pos: 23.5,1.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 12 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1510 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 21.5,-3.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1511 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 16.5,-3.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 11 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1512 + components: + - type: Transform + pos: 19.5,3.5 + parent: 2 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1513 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 16.5,3.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 11 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1514 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,-14.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 14 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1515 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 10.5,-4.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 5 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 1516 + components: + - type: Transform + pos: 10.5,5.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 13 + - type: AtmosPipeColor + color: '#990000FF' - proto: GeigerCounter entities: - - uid: 1795 + - uid: 1517 components: - type: Transform pos: -20.66175,3.4127471 - parent: 407 - - uid: 1796 + parent: 2 + - uid: 1518 components: - type: Transform pos: -20.521126,3.3189971 - parent: 407 + parent: 2 - proto: GeneratorRTGDamaged entities: - - uid: 403 + - uid: 1519 components: - type: Transform pos: -22.5,0.5 - parent: 407 + parent: 2 - proto: GeneratorWallmountAPU entities: - - uid: 2081 + - uid: 1520 components: - type: Transform pos: -20.5,4.5 - parent: 407 + parent: 2 - proto: GravityGeneratorMini entities: - - uid: 1799 + - uid: 1521 components: - type: Transform pos: -22.5,-2.5 - parent: 407 + parent: 2 - type: GravityGenerator charge: 100 - type: PointLight radius: 175.75 - proto: Grille entities: - - uid: 155 + - uid: 1522 components: - type: Transform pos: -30.5,-1.5 - parent: 407 - - uid: 222 + parent: 2 + - uid: 1523 components: - type: Transform pos: 6.5,18.5 - parent: 407 - - uid: 224 + parent: 2 + - uid: 1524 components: - type: Transform pos: 8.5,17.5 - parent: 407 - - uid: 226 + parent: 2 + - uid: 1525 components: - type: Transform pos: 8.5,18.5 - parent: 407 - - uid: 235 + parent: 2 + - uid: 1526 components: - type: Transform pos: 6.5,19.5 - parent: 407 - - uid: 236 + parent: 2 + - uid: 1527 components: - type: Transform pos: 8.5,19.5 - parent: 407 - - uid: 256 + parent: 2 + - uid: 1528 components: - type: Transform pos: -1.5,17.5 - parent: 407 - - uid: 1036 + parent: 2 + - uid: 1529 components: - type: Transform pos: 2.5,17.5 - parent: 407 - - uid: 1037 + parent: 2 + - uid: 1530 components: - type: Transform pos: 16.5,6.5 - parent: 407 - - uid: 1038 + parent: 2 + - uid: 1531 components: - type: Transform pos: 15.5,6.5 - parent: 407 - - uid: 1039 + parent: 2 + - uid: 1532 components: - type: Transform pos: 14.5,6.5 - parent: 407 - - uid: 1040 + parent: 2 + - uid: 1533 components: - type: Transform pos: 13.5,5.5 - parent: 407 - - uid: 1041 + parent: 2 + - uid: 1534 components: - type: Transform pos: 13.5,3.5 - parent: 407 - - uid: 1042 + parent: 2 + - uid: 1535 components: - type: Transform pos: 19.5,2.5 - parent: 407 - - uid: 1043 + parent: 2 + - uid: 1536 components: - type: Transform pos: 20.5,1.5 - parent: 407 - - uid: 1044 + parent: 2 + - uid: 1537 components: - type: Transform pos: 20.5,-0.5 - parent: 407 - - uid: 1045 + parent: 2 + - uid: 1538 components: - type: Transform pos: 25.5,-4.5 - parent: 407 - - uid: 1046 + parent: 2 + - uid: 1539 components: - type: Transform pos: 27.5,-0.5 - parent: 407 - - uid: 1047 + parent: 2 + - uid: 1540 components: - type: Transform pos: 25.5,-3.5 - parent: 407 - - uid: 1048 + parent: 2 + - uid: 1541 components: - type: Transform pos: 26.5,-3.5 - parent: 407 - - uid: 1049 + parent: 2 + - uid: 1542 components: - type: Transform pos: 26.5,-2.5 - parent: 407 - - uid: 1050 + parent: 2 + - uid: 1543 components: - type: Transform pos: 24.5,-4.5 - parent: 407 - - uid: 1051 + parent: 2 + - uid: 1544 components: - type: Transform pos: 27.5,0.5 - parent: 407 - - uid: 1052 - components: - - type: Transform - pos: 27.5,1.5 - parent: 407 - - uid: 1053 - components: - - type: Transform - pos: 27.5,2.5 - parent: 407 - - uid: 1054 - components: - - type: Transform - pos: 27.5,3.5 - parent: 407 - - uid: 1055 - components: - - type: Transform - pos: 26.5,3.5 - parent: 407 - - uid: 1056 - components: - - type: Transform - pos: 26.5,4.5 - parent: 407 - - uid: 1057 - components: - - type: Transform - pos: 25.5,4.5 - parent: 407 - - uid: 1058 - components: - - type: Transform - pos: 25.5,5.5 - parent: 407 - - uid: 1059 - components: - - type: Transform - pos: 24.5,5.5 - parent: 407 - - uid: 1060 - components: - - type: Transform - pos: 19.5,6.5 - parent: 407 - - uid: 1061 - components: - - type: Transform - pos: 13.5,-0.5 - parent: 407 - - uid: 1062 - components: - - type: Transform - pos: 13.5,1.5 - parent: 407 - - uid: 1063 - components: - - type: Transform - pos: 18.5,-5.5 - parent: 407 - - uid: 1064 - components: - - type: Transform - pos: 17.5,-5.5 - parent: 407 - - uid: 1065 - components: - - type: Transform - pos: 16.5,-5.5 - parent: 407 - - uid: 1066 - components: - - type: Transform - pos: 15.5,-5.5 - parent: 407 - - uid: 1067 - components: - - type: Transform - pos: 12.5,-6.5 - parent: 407 - - uid: 1068 - components: - - type: Transform - pos: 12.5,-10.5 - parent: 407 - - uid: 1069 - components: - - type: Transform - pos: 9.5,-10.5 - parent: 407 - - uid: 1070 - components: - - type: Transform - pos: 8.5,-13.5 - parent: 407 - - uid: 1071 - components: - - type: Transform - pos: 8.5,-15.5 - parent: 407 - - uid: 1072 - components: - - type: Transform - pos: 7.5,-17.5 - parent: 407 - - uid: 1073 - components: - - type: Transform - pos: 3.5,-15.5 - parent: 407 - - uid: 1074 - components: - - type: Transform - pos: 0.5,-14.5 - parent: 407 - - uid: 1075 - components: - - type: Transform - pos: -0.5,-14.5 - parent: 407 - - uid: 1076 - components: - - type: Transform - pos: -0.5,-13.5 - parent: 407 - - uid: 1077 - components: - - type: Transform - pos: -1.5,-13.5 - parent: 407 - - uid: 1078 - components: - - type: Transform - pos: -1.5,-12.5 - parent: 407 - - uid: 1079 - components: - - type: Transform - pos: -4.5,-9.5 - parent: 407 - - uid: 1080 - components: - - type: Transform - pos: -5.5,-9.5 - parent: 407 - - uid: 1081 - components: - - type: Transform - pos: -5.5,-8.5 - parent: 407 - - uid: 1082 - components: - - type: Transform - pos: -6.5,-8.5 - parent: 407 - - uid: 1083 - components: - - type: Transform - pos: -6.5,-7.5 - parent: 407 - - uid: 1084 - components: - - type: Transform - pos: -8.5,-5.5 - parent: 407 - - uid: 1085 - components: - - type: Transform - pos: -9.5,-5.5 - parent: 407 - - uid: 1086 - components: - - type: Transform - pos: -10.5,-5.5 - parent: 407 - - uid: 1087 - components: - - type: Transform - pos: -12.5,-5.5 - parent: 407 - - uid: 1088 - components: - - type: Transform - pos: -13.5,-5.5 - parent: 407 - - uid: 1089 - components: - - type: Transform - pos: -14.5,-5.5 - parent: 407 - - uid: 1090 - components: - - type: Transform - pos: -24.5,-1.5 - parent: 407 - - uid: 1091 - components: - - type: Transform - pos: -24.5,-0.5 - parent: 407 - - uid: 1092 - components: - - type: Transform - pos: -24.5,0.5 - parent: 407 - - uid: 1093 - components: - - type: Transform - pos: -24.5,1.5 - parent: 407 - - uid: 1094 - components: - - type: Transform - pos: -24.5,2.5 - parent: 407 - - uid: 1095 - components: - - type: Transform - pos: -16.5,5.5 - parent: 407 - - uid: 1096 - components: - - type: Transform - pos: -16.5,7.5 - parent: 407 - - uid: 1097 - components: - - type: Transform - pos: -30.5,2.5 - parent: 407 - - uid: 1099 - components: - - type: Transform - pos: -8.5,6.5 - parent: 407 - - uid: 1100 - components: - - type: Transform - pos: -9.5,6.5 - parent: 407 - - uid: 1101 - components: - - type: Transform - pos: -13.5,6.5 - parent: 407 - - uid: 1102 - components: - - type: Transform - pos: -14.5,2.5 - parent: 407 - - uid: 1103 - components: - - type: Transform - pos: -3.5,11.5 - parent: 407 - - uid: 1104 - components: - - type: Transform - pos: 0.5,14.5 - parent: 407 - - uid: 1105 - components: - - type: Transform - pos: 0.5,17.5 - parent: 407 - - uid: 1107 - components: - - type: Transform - pos: 2.5,14.5 - parent: 407 - - uid: 1113 - components: - - type: Transform - pos: 6.5,17.5 - parent: 407 - - uid: 1148 - components: - - type: Transform - pos: -14.5,9.5 - parent: 407 - - uid: 1149 - components: - - type: Transform - pos: -13.5,9.5 - parent: 407 - - uid: 1150 - components: - - type: Transform - pos: -12.5,9.5 - parent: 407 - - uid: 1151 - components: - - type: Transform - pos: -11.5,9.5 - parent: 407 - - uid: 1152 - components: - - type: Transform - pos: -10.5,9.5 - parent: 407 - - uid: 1153 - components: - - type: Transform - pos: -9.5,9.5 - parent: 407 - - uid: 1228 - components: - - type: Transform - pos: 1.5,-4.5 - parent: 407 - - uid: 1229 - components: - - type: Transform - pos: 1.5,-3.5 - parent: 407 - - uid: 1230 - components: - - type: Transform - pos: 1.5,-2.5 - parent: 407 - - uid: 1231 - components: - - type: Transform - pos: 2.5,-1.5 - parent: 407 - - uid: 1232 - components: - - type: Transform - pos: 1.5,-0.5 - parent: 407 - - uid: 1233 - components: - - type: Transform - pos: 1.5,1.5 - parent: 407 - - uid: 1234 - components: - - type: Transform - pos: 6.5,-1.5 - parent: 407 - - uid: 1248 - components: - - type: Transform - pos: 1.5,6.5 - parent: 407 + parent: 2 - uid: 1545 components: - type: Transform - pos: 3.5,-14.5 - parent: 407 + pos: 27.5,1.5 + parent: 2 - uid: 1546 components: - type: Transform - pos: 3.5,-13.5 - parent: 407 + pos: 27.5,2.5 + parent: 2 + - uid: 1547 + components: + - type: Transform + pos: 27.5,3.5 + parent: 2 + - uid: 1548 + components: + - type: Transform + pos: 26.5,3.5 + parent: 2 + - uid: 1549 + components: + - type: Transform + pos: 26.5,4.5 + parent: 2 + - uid: 1550 + components: + - type: Transform + pos: 25.5,4.5 + parent: 2 + - uid: 1551 + components: + - type: Transform + pos: 25.5,5.5 + parent: 2 + - uid: 1552 + components: + - type: Transform + pos: 24.5,5.5 + parent: 2 + - uid: 1553 + components: + - type: Transform + pos: 19.5,6.5 + parent: 2 + - uid: 1554 + components: + - type: Transform + pos: 13.5,-0.5 + parent: 2 + - uid: 1555 + components: + - type: Transform + pos: 13.5,1.5 + parent: 2 + - uid: 1556 + components: + - type: Transform + pos: 18.5,-5.5 + parent: 2 + - uid: 1557 + components: + - type: Transform + pos: 17.5,-5.5 + parent: 2 + - uid: 1558 + components: + - type: Transform + pos: 16.5,-5.5 + parent: 2 + - uid: 1559 + components: + - type: Transform + pos: 15.5,-5.5 + parent: 2 + - uid: 1560 + components: + - type: Transform + pos: 12.5,-6.5 + parent: 2 + - uid: 1561 + components: + - type: Transform + pos: 12.5,-10.5 + parent: 2 + - uid: 1562 + components: + - type: Transform + pos: 9.5,-10.5 + parent: 2 + - uid: 1563 + components: + - type: Transform + pos: 8.5,-13.5 + parent: 2 + - uid: 1564 + components: + - type: Transform + pos: 8.5,-15.5 + parent: 2 + - uid: 1565 + components: + - type: Transform + pos: 7.5,-17.5 + parent: 2 + - uid: 1566 + components: + - type: Transform + pos: 3.5,-15.5 + parent: 2 - uid: 1567 + components: + - type: Transform + pos: 0.5,-14.5 + parent: 2 + - uid: 1568 + components: + - type: Transform + pos: -0.5,-14.5 + parent: 2 + - uid: 1569 + components: + - type: Transform + pos: -0.5,-13.5 + parent: 2 + - uid: 1570 + components: + - type: Transform + pos: -1.5,-13.5 + parent: 2 + - uid: 1571 + components: + - type: Transform + pos: -1.5,-12.5 + parent: 2 + - uid: 1572 + components: + - type: Transform + pos: -4.5,-9.5 + parent: 2 + - uid: 1573 + components: + - type: Transform + pos: -5.5,-9.5 + parent: 2 + - uid: 1574 + components: + - type: Transform + pos: -5.5,-8.5 + parent: 2 + - uid: 1575 + components: + - type: Transform + pos: -6.5,-8.5 + parent: 2 + - uid: 1576 + components: + - type: Transform + pos: -6.5,-7.5 + parent: 2 + - uid: 1577 + components: + - type: Transform + pos: -8.5,-5.5 + parent: 2 + - uid: 1578 + components: + - type: Transform + pos: -9.5,-5.5 + parent: 2 + - uid: 1579 + components: + - type: Transform + pos: -10.5,-5.5 + parent: 2 + - uid: 1580 + components: + - type: Transform + pos: -12.5,-5.5 + parent: 2 + - uid: 1581 + components: + - type: Transform + pos: -13.5,-5.5 + parent: 2 + - uid: 1582 + components: + - type: Transform + pos: -14.5,-5.5 + parent: 2 + - uid: 1583 + components: + - type: Transform + pos: -24.5,-1.5 + parent: 2 + - uid: 1584 + components: + - type: Transform + pos: -24.5,-0.5 + parent: 2 + - uid: 1585 + components: + - type: Transform + pos: -24.5,0.5 + parent: 2 + - uid: 1586 + components: + - type: Transform + pos: -24.5,1.5 + parent: 2 + - uid: 1587 + components: + - type: Transform + pos: -24.5,2.5 + parent: 2 + - uid: 1588 + components: + - type: Transform + pos: -16.5,5.5 + parent: 2 + - uid: 1589 + components: + - type: Transform + pos: -16.5,7.5 + parent: 2 + - uid: 1590 + components: + - type: Transform + pos: -30.5,2.5 + parent: 2 + - uid: 1591 + components: + - type: Transform + pos: -8.5,6.5 + parent: 2 + - uid: 1592 + components: + - type: Transform + pos: -9.5,6.5 + parent: 2 + - uid: 1593 + components: + - type: Transform + pos: -14.5,2.5 + parent: 2 + - uid: 1594 + components: + - type: Transform + pos: -3.5,11.5 + parent: 2 + - uid: 1595 + components: + - type: Transform + pos: 0.5,14.5 + parent: 2 + - uid: 1596 + components: + - type: Transform + pos: 0.5,17.5 + parent: 2 + - uid: 1597 + components: + - type: Transform + pos: 2.5,14.5 + parent: 2 + - uid: 1598 + components: + - type: Transform + pos: 6.5,17.5 + parent: 2 + - uid: 1599 + components: + - type: Transform + pos: -14.5,9.5 + parent: 2 + - uid: 1600 + components: + - type: Transform + pos: -13.5,9.5 + parent: 2 + - uid: 1601 + components: + - type: Transform + pos: -12.5,9.5 + parent: 2 + - uid: 1602 + components: + - type: Transform + pos: -11.5,9.5 + parent: 2 + - uid: 1603 + components: + - type: Transform + pos: -10.5,9.5 + parent: 2 + - uid: 1604 + components: + - type: Transform + pos: -9.5,9.5 + parent: 2 + - uid: 1605 + components: + - type: Transform + pos: 1.5,-4.5 + parent: 2 + - uid: 1606 + components: + - type: Transform + pos: 1.5,-3.5 + parent: 2 + - uid: 1607 + components: + - type: Transform + pos: 1.5,-2.5 + parent: 2 + - uid: 1608 + components: + - type: Transform + pos: 2.5,-1.5 + parent: 2 + - uid: 1609 + components: + - type: Transform + pos: 1.5,-0.5 + parent: 2 + - uid: 1610 + components: + - type: Transform + pos: 1.5,1.5 + parent: 2 + - uid: 1611 + components: + - type: Transform + pos: 6.5,-1.5 + parent: 2 + - uid: 1612 + components: + - type: Transform + pos: 1.5,6.5 + parent: 2 + - uid: 1613 + components: + - type: Transform + pos: 3.5,-14.5 + parent: 2 + - uid: 1614 + components: + - type: Transform + pos: 3.5,-13.5 + parent: 2 + - uid: 1615 components: - type: Transform pos: 3.5,2.5 - parent: 407 - - uid: 2012 + parent: 2 + - uid: 1616 components: - type: Transform pos: -4.5,11.5 - parent: 407 + parent: 2 + - uid: 1617 + components: + - type: Transform + pos: -13.5,7.5 + parent: 2 - proto: Gyroscope entities: - - uid: 1120 + - uid: 1618 components: - type: Transform pos: -26.5,1.5 - parent: 407 - - uid: 1121 + parent: 2 + - uid: 1619 components: - type: Transform pos: -26.5,-0.5 - parent: 407 + parent: 2 - proto: HandheldCrewMonitor entities: - - uid: 2137 + - uid: 1620 components: - type: Transform pos: 10.650544,-4.5766006 - parent: 407 + parent: 2 - proto: HandTeleporter entities: - - uid: 1813 + - uid: 913 components: - type: Transform - parent: 1980 + parent: 910 - type: Physics canCollide: False - type: InsideEntityStorage - proto: HolofanProjector entities: - - uid: 1554 + - uid: 1621 components: - type: Transform pos: 4.5765324,-10.477916 - parent: 407 - - uid: 1555 + parent: 2 + - uid: 1622 components: - type: Transform pos: 4.6859074,-10.602916 - parent: 407 + parent: 2 - proto: HoPIDCard entities: - - uid: 2145 + - uid: 1623 components: - type: Transform pos: 24.549932,2.4577096 - parent: 407 + parent: 2 - proto: hydroponicsTray entities: - - uid: 1783 + - uid: 1624 components: - type: Transform pos: -12.5,3.5 - parent: 407 - - uid: 1784 + parent: 2 + - uid: 1625 components: - type: Transform pos: -13.5,3.5 - parent: 407 - - uid: 1785 + parent: 2 + - uid: 1626 components: - type: Transform pos: -14.5,3.5 - parent: 407 + parent: 2 + - uid: 1627 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -12.5,5.5 + parent: 2 - proto: Hypospray entities: - - uid: 1741 + - uid: 1628 components: - type: Transform pos: 6.6989994,-0.46516204 - parent: 407 + parent: 2 - proto: IngotGold1 entities: - - uid: 1851 + - uid: 1629 components: - type: Transform pos: 6.506955,-8.404718 - parent: 407 - - uid: 1852 + parent: 2 + - uid: 1630 components: - type: Transform pos: 6.506955,-8.404718 - parent: 407 - - uid: 1853 + parent: 2 + - uid: 1631 components: - type: Transform pos: 6.506955,-8.404718 - parent: 407 + parent: 2 - proto: IntercomEngineering entities: - - uid: 1856 + - uid: 1632 components: - type: Transform rot: 1.5707963267948966 rad pos: -15.5,-0.5 - parent: 407 + parent: 2 - proto: IntercomMedical entities: - - uid: 1858 + - uid: 1633 components: - type: Transform rot: -1.5707963267948966 rad pos: 5.5,-0.5 - parent: 407 + parent: 2 - proto: JanitorialTrolley entities: - - uid: 1664 + - uid: 1634 components: - type: Transform rot: -1.5707963267948966 rad pos: -4.5,-8.5 - parent: 407 + parent: 2 - proto: JetpackBlueFilled entities: - - uid: 1971 + - uid: 1635 components: - type: Transform pos: 1.3578928,11.64992 - parent: 407 + parent: 2 - proto: KitchenElectricGrill entities: - - uid: 1724 + - uid: 1636 components: - type: Transform pos: -3.5,3.5 - parent: 407 + parent: 2 - proto: KitchenMicrowave entities: - - uid: 1722 + - uid: 1637 components: - type: Transform pos: -3.5,4.5 - parent: 407 + parent: 2 - proto: KitchenReagentGrinder entities: - - uid: 1723 + - uid: 1638 components: - type: Transform pos: -3.5,5.5 - parent: 407 - - uid: 2106 + parent: 2 + - uid: 1639 components: - type: Transform pos: 12.5,1.5 - parent: 407 + parent: 2 - proto: KitchenSpike entities: - - uid: 1394 + - uid: 1640 components: - type: Transform pos: -5.5,3.5 - parent: 407 + parent: 2 - proto: Lamp entities: - - uid: 2127 + - uid: 1641 components: - type: Transform pos: 16.296532,4.957177 - parent: 407 + parent: 2 - proto: LampGold entities: - - uid: 1889 + - uid: 1642 components: - type: Transform rot: -1.5707963267948966 rad pos: 25.746017,-2.1150365 - parent: 407 + parent: 2 - proto: LargeBeaker entities: - - uid: 1734 + - uid: 1643 components: - type: Transform pos: -3.43964,5.3541145 - parent: 407 + parent: 2 - proto: LockerAtmosphericsFilledHardsuit entities: - - uid: 408 + - uid: 1644 components: - type: Transform pos: 2.5,-11.5 - parent: 407 + parent: 2 - proto: LockerBoozeFilled entities: - - uid: 1779 + - uid: 1645 components: - type: Transform pos: -10.5,5.5 - parent: 407 + parent: 2 - proto: LockerBotanistFilled entities: - - uid: 1727 + - uid: 1646 components: - type: Transform pos: -14.5,4.5 - parent: 407 + parent: 2 - proto: LockerCaptainFilledHardsuit entities: - - uid: 1831 + - uid: 1647 components: - type: Transform pos: 21.5,-2.5 - parent: 407 + parent: 2 - proto: LockerChemistryFilled entities: - - uid: 2221 + - uid: 1648 components: - type: Transform pos: 10.198524,-0.49005228 - parent: 407 + parent: 2 - proto: LockerEngineerFilledHardsuit entities: - - uid: 1807 + - uid: 1649 components: - type: Transform pos: -18.5,-2.5 - parent: 407 - - uid: 1812 + parent: 2 + - uid: 1650 components: - type: Transform pos: -18.5,-4.5 - parent: 407 + parent: 2 - proto: LockerEvidence entities: - - uid: 1878 + - uid: 1651 components: - type: Transform pos: 19.5,1.5 - parent: 407 + parent: 2 - proto: LockerFreezerVaultFilled entities: - - uid: 1890 + - uid: 1652 components: - type: Transform pos: 24.5,-0.5 - parent: 407 + parent: 2 - proto: LockerHeadOfSecurityFilledHardsuit entities: - - uid: 1861 + - uid: 1653 components: - type: Transform pos: 22.5,4.5 - parent: 407 + parent: 2 - proto: LockerMedicalFilled entities: - - uid: 1743 + - uid: 1654 components: - type: Transform pos: 4.5,-4.5 - parent: 407 + parent: 2 - proto: LockerMedicineFilled entities: - - uid: 1871 + - uid: 1655 components: - type: Transform pos: 12.5,-2.5 - parent: 407 + parent: 2 - proto: LockerScienceFilled entities: - - uid: 1980 + - uid: 910 components: - type: Transform pos: -2.5,11.5 - parent: 407 + parent: 2 - type: ContainerContainer containers: entity_storage: !type:Container showEnts: False occludes: True ents: - - 1813 - - 1988 - - 1196 + - 913 + - 911 + - 912 paper_label: !type:ContainerSlot showEnts: False occludes: True ent: null - proto: LockerSecurityFilled entities: - - uid: 1909 + - uid: 1656 components: - type: Transform pos: 14.5,-3.5 - parent: 407 + parent: 2 - proto: LockerWallMedicalFilled entities: - - uid: 1742 + - uid: 1657 components: - type: Transform pos: 5.5,-1.5 - parent: 407 + parent: 2 - proto: MachineArtifactAnalyzer entities: - - uid: 1985 + - uid: 1658 components: - type: Transform pos: -3.5,10.5 - parent: 407 + parent: 2 - proto: MachineCentrifuge entities: - - uid: 2220 + - uid: 1659 components: - type: Transform pos: 8.5,-0.5 - parent: 407 + parent: 2 - proto: MachineElectrolysisUnit entities: - - uid: 1728 + - uid: 1660 components: - type: Transform pos: 8.5,1.5 - parent: 407 + parent: 2 - proto: MaintenanceFluffSpawner entities: - - uid: 2065 + - uid: 1661 components: - type: Transform pos: 8.5,-8.5 - parent: 407 + parent: 2 - proto: MaterialReclaimer entities: - - uid: 1830 + - uid: 1662 components: - type: Transform pos: 10.5,-8.5 - parent: 407 + parent: 2 - proto: MedicalBed entities: - - uid: 1625 + - uid: 1663 components: - type: Transform pos: 5.5,-4.5 - parent: 407 - - uid: 1626 + parent: 2 + - uid: 1664 components: - type: Transform pos: 7.5,-4.5 - parent: 407 - - uid: 1627 + parent: 2 + - uid: 1665 components: - type: Transform pos: 9.5,-4.5 - parent: 407 + parent: 2 +- proto: MedicalTechFab + entities: + - uid: 1666 + components: + - type: Transform + pos: 10.5,-3.5 + parent: 2 - proto: MedkitBruteFilled - entities: - - uid: 1921 - components: - - type: Transform - pos: 4.470603,-3.3152924 - parent: 407 -- proto: MedkitBurnFilled - entities: - - uid: 1922 - components: - - type: Transform - pos: 4.470603,-3.5184174 - parent: 407 -- proto: MopBucket - entities: - - uid: 1668 - components: - - type: Transform - pos: -5.529683,-6.4279804 - parent: 407 -- proto: MopItem entities: - uid: 1667 + components: + - type: Transform + pos: 4.470603,-3.3152924 + parent: 2 +- proto: MedkitBurnFilled + entities: + - uid: 1668 + components: + - type: Transform + pos: 4.470603,-3.5184174 + parent: 2 +- proto: MopBucket + entities: + - uid: 1669 + components: + - type: Transform + pos: -5.529683,-6.4279804 + parent: 2 +- proto: MopItem + entities: + - uid: 1670 components: - type: Transform pos: -5.592183,-7.4904804 - parent: 407 + parent: 2 - proto: Multitool entities: - - uid: 2148 + - uid: 1671 components: - type: Transform pos: 26.518682,2.5202096 - parent: 407 - - uid: 2277 - components: - - type: Transform - pos: -16.322409,-2.5030437 - parent: 407 -- proto: NitrogenCanister - entities: - - uid: 1533 - components: - - type: Transform - pos: 11.5,-10.5 - parent: 407 -- proto: OreProcessor - entities: - - uid: 2009 - components: - - type: Transform - pos: -0.5,11.5 - parent: 407 -- proto: OxygenCanister - entities: - - uid: 1534 - components: - - type: Transform - pos: 10.5,-10.5 - parent: 407 -- proto: PartRodMetal - entities: - - uid: 1552 - components: - - type: Transform - pos: 7.4046574,-16.509167 - parent: 407 - - uid: 1553 - components: - - type: Transform - pos: 7.4046574,-16.509167 - parent: 407 -- proto: PianoInstrument - entities: - - uid: 1756 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -6.5,-1.5 - parent: 407 -- proto: PlaqueAtmos - entities: - - uid: 1558 - components: - - type: Transform - pos: 6.5,-9.5 - parent: 407 -- proto: PlasmaCanister - entities: - - uid: 251 - components: - - type: Transform - pos: 8.5,-10.5 - parent: 407 -- proto: PlasmaReinforcedWindowDirectional - entities: - - uid: 1250 - components: - - type: Transform - pos: -3.5,9.5 - parent: 407 - - uid: 1976 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -2.5,10.5 - parent: 407 - - uid: 1977 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -2.5,9.5 - parent: 407 -- proto: PlasmaTankFilled - entities: - - uid: 1938 - components: - - type: Transform - pos: -21.613918,-2.399491 - parent: 407 - - uid: 1979 - components: - - type: Transform - pos: -21.520168,-2.446366 - parent: 407 - - uid: 2070 - components: - - type: Transform - pos: -21.379543,-2.540116 - parent: 407 -- proto: PlasticFlapsAirtightClear - entities: - - uid: 1902 - components: - - type: Transform - pos: 3.5,6.5 - parent: 407 -- proto: PlasticFlapsAirtightOpaque - entities: - - uid: 1098 - components: - - type: Transform - pos: -19.5,3.5 - parent: 407 - - uid: 2094 - components: - - type: Transform - pos: 4.5,13.5 - parent: 407 -- proto: Plunger - entities: - - uid: 2118 - components: - - type: Transform - pos: -4.2076445,-6.1772423 - parent: 407 -- proto: PortableGeneratorJrPacman - entities: - - uid: 1638 - components: - - type: Transform - pos: -23.5,2.5 - parent: 407 - - uid: 1872 - components: - - type: Transform - pos: 9.5,-8.5 - parent: 407 -- proto: PortableGeneratorPacman - entities: - - uid: 1640 - components: - - type: Transform - pos: -23.5,-1.5 - parent: 407 -- proto: PortableScrubber - entities: - - uid: 1947 - components: - - type: Transform - pos: 4.5,-15.5 - parent: 407 - - uid: 1948 - components: - - type: Transform - pos: 4.5,-14.5 - parent: 407 - - uid: 1949 - components: - - type: Transform - pos: 4.5,-13.5 - parent: 407 -- proto: PosterContrabandAtmosiaDeclarationIndependence - entities: - - uid: 1559 - components: - - type: Transform - pos: 8.5,-9.5 - parent: 407 -- proto: PosterContrabandBeachStarYamamoto - entities: - - uid: 1844 - components: - - type: Transform - pos: 11.5,-7.5 - parent: 407 -- proto: PosterContrabandHighEffectEngineering - entities: - - uid: 1793 - components: - - type: Transform - pos: -23.5,3.5 - parent: 407 -- proto: PosterContrabandSpaceCola - entities: - - uid: 2208 - components: - - type: Transform - pos: -11.5,5.5 - parent: 407 -- proto: PosterContrabandTools - entities: - - uid: 1792 - components: - - type: Transform - pos: -19.5,-2.5 - parent: 407 -- proto: PosterLegitAnatomyPoster - entities: - - uid: 2214 - components: - - type: Transform - pos: 13.5,-2.5 - parent: 407 -- proto: PosterLegitCleanliness - entities: + parent: 2 - uid: 1672 components: - type: Transform - pos: -2.5,-6.5 - parent: 407 -- proto: PosterLegitCohibaRobustoAd + pos: -16.322409,-2.5030437 + parent: 2 +- proto: NitrogenCanister entities: - - uid: 2152 - components: - - type: Transform - pos: -7.5,6.5 - parent: 407 -- proto: PosterLegitHelpOthers - entities: - - uid: 2206 - components: - - type: Transform - pos: -4.5,-5.5 - parent: 407 -- proto: PosterLegitHereForYourSafety - entities: - - uid: 2153 - components: - - type: Transform - pos: 13.5,6.5 - parent: 407 -- proto: PosterLegitHighClassMartini - entities: - - uid: 2226 - components: - - type: Transform - pos: -2.5,-3.5 - parent: 407 -- proto: PosterLegitJustAWeekAway - entities: - - uid: 2154 - components: - - type: Transform - pos: 4.5,11.5 - parent: 407 -- proto: PosterLegitNanomichiAd - entities: - - uid: 2207 - components: - - type: Transform - pos: 4.5,8.5 - parent: 407 -- proto: PosterLegitNanotrasenLogo - entities: - - uid: 2020 - components: - - type: Transform - pos: -11.5,-1.5 - parent: 407 - - uid: 2155 - components: - - type: Transform - pos: 10.5,17.5 - parent: 407 - - uid: 2156 - components: - - type: Transform - pos: 4.5,17.5 - parent: 407 - - uid: 2204 - components: - - type: Transform - pos: 10.5,6.5 - parent: 407 - - uid: 2205 - components: - - type: Transform - pos: 26.5,-1.5 - parent: 407 -- proto: PosterLegitNTTGC - entities: - - uid: 2213 - components: - - type: Transform - pos: 11.5,2.5 - parent: 407 -- proto: PosterLegitPDAAd - entities: - - uid: 2157 - components: - - type: Transform - pos: 20.5,3.5 - parent: 407 -- proto: PosterLegitPeriodicTable - entities: - - uid: 2215 - components: - - type: Transform - pos: 9.5,1.5 - parent: 407 -- proto: PosterLegitReportCrimes - entities: - - uid: 2158 - components: - - type: Transform - pos: -10.5,6.5 - parent: 407 -- proto: PosterLegitSafetyInternals - entities: - - uid: 2159 - components: - - type: Transform - pos: -4.5,6.5 - parent: 407 -- proto: PosterLegitScience - entities: - - uid: 2043 - components: - - type: Transform - pos: -1.5,13.5 - parent: 407 -- proto: PosterLegitSecWatch - entities: - - uid: 2113 - components: - - type: Transform - pos: 20.5,5.5 - parent: 407 -- proto: PosterLegitSpaceCops - entities: - - uid: 2209 - components: - - type: Transform - pos: 14.5,-1.5 - parent: 407 -- proto: PosterLegitUeNo - entities: - - uid: 1845 - components: - - type: Transform - pos: 9.5,-9.5 - parent: 407 -- proto: PosterLegitVacation - entities: - - uid: 2212 - components: - - type: Transform - pos: 7.5,2.5 - parent: 407 -- proto: PottedPlant21 - entities: - - uid: 1926 - components: - - type: Transform - pos: 2.4826317,-3.6277924 - parent: 407 -- proto: PottedPlant22 - entities: - - uid: 1755 - components: - - type: Transform - pos: 3.5,1.5 - parent: 407 - - uid: 1773 - components: - - type: Transform - pos: -5.781889,-2.132682 - parent: 407 - - uid: 1821 - components: - - type: Transform - pos: -11.5,1.5 - parent: 407 - - uid: 1833 - components: - - type: Transform - pos: -6.5,1.5 - parent: 407 - - uid: 2062 - components: - - type: Transform - pos: 4.5,5.5 - parent: 407 - - uid: 2063 - components: - - type: Transform - pos: 10.5,5.5 - parent: 407 - - uid: 2083 - components: - - type: Transform - pos: -1.5,-9.5 - parent: 407 - - uid: 2084 - components: - - type: Transform - pos: -1.5,-3.5 - parent: 407 -- proto: PottedPlant26 - entities: - - uid: 1535 - components: - - type: Transform - pos: 10.2875805,-1.5445261 - parent: 407 -- proto: PottedPlantBioluminscent - entities: - - uid: 2128 - components: - - type: Transform - pos: 14.5,5.5 - parent: 407 -- proto: PowerCellHyper - entities: - - uid: 1835 - components: - - type: Transform - pos: -16.358204,-2.3107126 - parent: 407 -- proto: PowerCellRecharger - entities: - - uid: 1820 - components: - - type: Transform - pos: -16.5,-2.5 - parent: 407 - - uid: 1995 - components: - - type: Transform - pos: 2.5,6.5 - parent: 407 - - uid: 2266 - components: - - type: Transform - pos: 7.5,-3.5 - parent: 407 - - uid: 2274 - components: - - type: Transform - pos: -0.5,10.5 - parent: 407 -- proto: Poweredlight - entities: - - uid: 206 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 0.5,9.5 - parent: 407 - - uid: 1479 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -18.5,4.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1480 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -16.5,6.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1481 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -17.5,-4.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1482 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -14.5,-0.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1483 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -11.5,-4.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1491 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.5,9.5 - parent: 407 - - uid: 1493 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 5.5,9.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1494 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 5.5,14.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1495 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 10.5,14.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1496 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 10.5,9.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1498 - components: - - type: Transform - pos: -0.5,5.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1499 - components: - - type: Transform - pos: 10.5,5.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1500 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 16.5,4.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1501 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 6.5,-0.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1502 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-0.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1503 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,-1.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1504 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 0.5,-10.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1505 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 7.5,-14.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1506 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 10.5,-13.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1507 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 10.5,-15.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1508 + - uid: 1673 components: - type: Transform pos: 11.5,-10.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1516 - components: - - type: Transform - pos: 11.5,1.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1518 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 19.5,-3.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1519 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 24.5,-0.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1520 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 14.5,-3.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1521 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 21.5,3.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1522 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 19.5,-0.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1523 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 14.5,-0.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1919 - components: - - type: Transform - pos: -5.5,1.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 2130 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -7.5,-4.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 -- proto: PoweredlightLED - entities: - - uid: 1475 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -25.5,3.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1476 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -25.5,-2.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1509 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 13.5,-9.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1524 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -18.5,8.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 -- proto: PoweredlightSodium - entities: - - uid: 1477 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -20.5,-1.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1478 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -20.5,2.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 -- proto: PoweredSmallLight - entities: - - uid: 1486 - components: - - type: Transform - pos: -12.5,5.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1487 - components: - - type: Transform - pos: -10.5,5.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1488 - components: - - type: Transform - pos: -7.5,5.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1489 - components: - - type: Transform - pos: -5.5,5.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1510 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,-13.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1511 - components: - - type: Transform - pos: 9.5,-6.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1512 - components: - - type: Transform - pos: 4.5,-6.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1513 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 11.5,-4.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1514 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 8.5,-4.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1515 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 6.5,-4.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1517 - components: - - type: Transform - pos: 18.5,5.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1665 - components: - - type: Transform - pos: -4.5,-6.5 - parent: 407 - - type: ApcPowerReceiver - powerLoad: 0 - - uid: 1828 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,-4.5 - parent: 407 - - uid: 1975 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -2.5,15.5 - parent: 407 - - uid: 2015 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,15.5 - parent: 407 -- proto: Protolathe - entities: - - uid: 205 - components: - - type: Transform - pos: -0.5,7.5 - parent: 407 -- proto: Rack - entities: - - uid: 1548 - components: - - type: Transform - pos: 4.5,-10.5 - parent: 407 - - uid: 1549 - components: - - type: Transform - pos: 7.5,-16.5 - parent: 407 - - uid: 1629 - components: - - type: Transform - pos: -21.5,-2.5 - parent: 407 - - uid: 1663 - components: - - type: Transform - pos: -5.5,-7.5 - parent: 407 - - uid: 1794 - components: - - type: Transform - pos: -20.5,3.5 - parent: 407 - - uid: 1843 - components: - - type: Transform - pos: -4.5,7.5 - parent: 407 - - uid: 1884 - components: - - type: Transform - pos: 18.5,5.5 - parent: 407 - - uid: 2147 - components: - - type: Transform - pos: -1.5,14.5 - parent: 407 -- proto: RadiationCollector - entities: - - uid: 404 - components: - - type: Transform - pos: -23.5,-0.5 - parent: 407 - - uid: 405 - components: - - type: Transform - pos: -23.5,0.5 - parent: 407 - - uid: 406 - components: - - type: Transform - pos: -23.5,1.5 - parent: 407 - - uid: 409 - components: - - type: Transform - pos: -21.5,1.5 - parent: 407 - - uid: 410 - components: - - type: Transform - pos: -21.5,0.5 - parent: 407 - - uid: 411 - components: - - type: Transform - pos: -21.5,-0.5 - parent: 407 -- proto: Railing - entities: - - uid: 2024 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 10.5,8.5 - parent: 407 - - uid: 2025 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 9.5,9.5 - parent: 407 - - uid: 2026 - components: - - type: Transform - pos: 10.5,10.5 - parent: 407 - - uid: 2027 - components: - - type: Transform - pos: 10.5,15.5 - parent: 407 - - uid: 2028 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 9.5,14.5 - parent: 407 - - uid: 2029 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 10.5,13.5 - parent: 407 -- proto: RailingCornerSmall - entities: - - uid: 223 - components: - - type: Transform - pos: 11.5,13.5 - parent: 407 - - uid: 1010 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 11.5,10.5 - parent: 407 - - uid: 2030 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 9.5,15.5 - parent: 407 - - uid: 2031 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 9.5,10.5 - parent: 407 - - uid: 2032 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 9.5,13.5 - parent: 407 - - uid: 2033 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 9.5,8.5 - parent: 407 -- proto: RandomArtifactSpawner - entities: - - uid: 1978 - components: - - type: Transform - pos: -4.5,10.5 - parent: 407 -- proto: RandomBoard - entities: - - uid: 1631 - components: - - type: Transform - pos: -16.5,-4.5 - parent: 407 -- proto: RCD - entities: - - uid: 2066 - components: - - type: Transform - pos: 4.5666795,-10.266068 - parent: 407 -- proto: ReagentContainerFlour - entities: - - uid: 1565 - components: - - type: Transform - pos: -3.642765,5.4634895 - parent: 407 -- proto: Recycler - entities: - - uid: 1238 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 11.5,-6.5 - parent: 407 -- proto: ReinforcedPlasmaWindow - entities: - - uid: 1154 - components: - - type: Transform - pos: 8.5,-15.5 - parent: 407 - - uid: 1155 - components: - - type: Transform - pos: 8.5,-13.5 - parent: 407 -- proto: ReinforcedWindow - entities: - - uid: 1249 - components: - - type: Transform - pos: 1.5,6.5 - parent: 407 -- proto: ResearchAndDevelopmentServer - entities: - - uid: 1981 - components: - - type: Transform - pos: -2.5,12.5 - parent: 407 -- proto: ResearchDisk10000 - entities: - - uid: 2169 - components: - - type: Transform - pos: 10.483304,-6.5229325 - parent: 407 -- proto: SalvageMagnet - entities: - - uid: 1492 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,16.5 - parent: 407 -- proto: Screen - entities: - - uid: 2252 - components: - - type: Transform - pos: 5.5,6.5 - parent: 407 - - uid: 2253 - components: - - type: Transform - pos: -15.5,-1.5 - parent: 407 - - uid: 2254 - components: - - type: Transform - pos: -2.5,-1.5 - parent: 407 - - uid: 2255 - components: - - type: Transform - pos: 1.5,-10.5 - parent: 407 - - uid: 2256 - components: - - type: Transform - pos: 21.5,-1.5 - parent: 407 -- proto: SeedExtractor - entities: - - uid: 1781 - components: - - type: Transform - pos: -12.5,5.5 - parent: 407 -- proto: SheetGlass - entities: - - uid: 2003 - components: - - type: Transform - pos: -3.0838065,7.537944 - parent: 407 - - uid: 2004 - components: - - type: Transform - pos: -3.0838065,7.537944 - parent: 407 -- proto: SheetPlasma - entities: - - uid: 1630 - components: - - type: Transform - pos: -21.551367,-2.3599691 - parent: 407 -- proto: SheetPlastic - entities: - - uid: 2005 - components: - - type: Transform - pos: -2.6463065,7.537944 - parent: 407 - - uid: 2006 - components: - - type: Transform - pos: -2.6463065,7.537944 - parent: 407 -- proto: SheetSteel - entities: - - uid: 1550 - components: - - type: Transform - pos: 7.5296574,-16.509167 - parent: 407 - - uid: 1551 - components: - - type: Transform - pos: 7.5296574,-16.509167 - parent: 407 - - uid: 2007 - components: - - type: Transform - pos: -3.5525565,7.506694 - parent: 407 - - uid: 2008 - components: - - type: Transform - pos: -3.5525565,7.506694 - parent: 407 -- proto: ShuttersNormalOpen - entities: - - uid: 1651 - components: - - type: Transform - pos: -8.5,2.5 - parent: 407 - - uid: 1652 - components: - - type: Transform - pos: -10.5,2.5 - parent: 407 - - uid: 1803 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -4.5,2.5 - parent: 407 - - uid: 2162 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -3.5,2.5 - parent: 407 - - uid: 2222 - components: - - type: Transform - pos: -14.5,2.5 - parent: 407 -- proto: ShuttersRadiation - entities: - - uid: 1252 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -19.5,-0.5 - parent: 407 - - uid: 1253 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -19.5,0.5 - parent: 407 - - uid: 1254 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -19.5,1.5 - parent: 407 -- proto: ShuttersWindowOpen - entities: - - uid: 1650 - components: - - type: Transform - pos: -9.5,2.5 - parent: 407 -- proto: ShuttleWindow - entities: - - uid: 18 - components: - - type: Transform - pos: 7.5,-17.5 - parent: 407 - - uid: 29 - components: - - type: Transform - pos: 9.5,-10.5 - parent: 407 - - uid: 30 - components: - - type: Transform - pos: 12.5,-10.5 - parent: 407 - - uid: 49 - components: - - type: Transform - pos: 3.5,-13.5 - parent: 407 - - uid: 50 - components: - - type: Transform - pos: 3.5,-14.5 - parent: 407 - - uid: 51 - components: - - type: Transform - pos: 3.5,-15.5 - parent: 407 - - uid: 55 - components: - - type: Transform - pos: 12.5,-6.5 - parent: 407 - - uid: 70 - components: - - type: Transform - pos: 0.5,-14.5 - parent: 407 - - uid: 71 - components: - - type: Transform - pos: -0.5,-14.5 - parent: 407 - - uid: 72 - components: - - type: Transform - pos: -0.5,-13.5 - parent: 407 - - uid: 73 - components: - - type: Transform - pos: -1.5,-13.5 - parent: 407 - - uid: 74 - components: - - type: Transform - pos: -1.5,-12.5 - parent: 407 - - uid: 91 - components: - - type: Transform - pos: -6.5,-7.5 - parent: 407 - - uid: 92 - components: - - type: Transform - pos: -6.5,-8.5 - parent: 407 - - uid: 93 - components: - - type: Transform - pos: -5.5,-8.5 - parent: 407 - - uid: 94 - components: - - type: Transform - pos: -5.5,-9.5 - parent: 407 - - uid: 95 - components: - - type: Transform - pos: -4.5,-9.5 - parent: 407 - - uid: 138 - components: - - type: Transform - pos: -16.5,5.5 - parent: 407 - - uid: 139 - components: - - type: Transform - pos: -16.5,7.5 - parent: 407 - - uid: 156 - components: - - type: Transform - pos: -14.5,2.5 - parent: 407 - - uid: 180 - components: - - type: Transform - pos: -13.5,6.5 - parent: 407 - - uid: 181 - components: - - type: Transform - pos: -9.5,6.5 - parent: 407 - - uid: 182 - components: - - type: Transform - pos: -8.5,6.5 - parent: 407 - - uid: 183 - components: - - type: Transform - pos: -14.5,-5.5 - parent: 407 - - uid: 184 - components: - - type: Transform - pos: -13.5,-5.5 - parent: 407 - - uid: 185 - components: - - type: Transform - pos: -12.5,-5.5 - parent: 407 - - uid: 186 - components: - - type: Transform - pos: -10.5,-5.5 - parent: 407 - - uid: 187 - components: - - type: Transform - pos: -9.5,-5.5 - parent: 407 - - uid: 188 - components: - - type: Transform - pos: -8.5,-5.5 - parent: 407 - - uid: 203 - components: - - type: Transform - pos: -3.5,11.5 - parent: 407 - - uid: 213 - components: - - type: Transform - pos: 0.5,14.5 - parent: 407 - - uid: 214 - components: - - type: Transform - pos: 13.5,11.5 - parent: 407 - - uid: 216 - components: - - type: Transform - pos: 2.5,14.5 - parent: 407 - - uid: 225 - components: - - type: Transform - pos: 8.5,19.5 - parent: 407 - - uid: 227 - components: - - type: Transform - pos: -1.5,17.5 - parent: 407 - - uid: 229 - components: - - type: Transform - pos: 6.5,17.5 - parent: 407 - - uid: 234 - components: - - type: Transform - pos: 8.5,17.5 - parent: 407 - - uid: 255 - components: - - type: Transform - pos: 2.5,17.5 - parent: 407 - - uid: 261 - components: - - type: Transform - pos: 0.5,17.5 - parent: 407 - - uid: 272 - components: - - type: Transform - pos: 15.5,-5.5 - parent: 407 - - uid: 273 - components: - - type: Transform - pos: 16.5,-5.5 - parent: 407 - - uid: 274 - components: - - type: Transform - pos: 17.5,-5.5 - parent: 407 - - uid: 275 - components: - - type: Transform - pos: 18.5,-5.5 - parent: 407 - - uid: 276 - components: - - type: Transform - pos: 13.5,-0.5 - parent: 407 - - uid: 277 - components: - - type: Transform - pos: 13.5,1.5 - parent: 407 - - uid: 278 - components: - - type: Transform - pos: 13.5,3.5 - parent: 407 - - uid: 279 - components: - - type: Transform - pos: 13.5,5.5 - parent: 407 - - uid: 280 - components: - - type: Transform - pos: 14.5,6.5 - parent: 407 - - uid: 281 - components: - - type: Transform - pos: 15.5,6.5 - parent: 407 - - uid: 282 - components: - - type: Transform - pos: 16.5,6.5 - parent: 407 - - uid: 283 - components: - - type: Transform - pos: 19.5,2.5 - parent: 407 - - uid: 284 - components: - - type: Transform - pos: 20.5,1.5 - parent: 407 - - uid: 285 - components: - - type: Transform - pos: 20.5,-0.5 - parent: 407 - - uid: 325 - components: - - type: Transform - pos: 27.5,-0.5 - parent: 407 - - uid: 326 - components: - - type: Transform - pos: 27.5,0.5 - parent: 407 - - uid: 327 - components: - - type: Transform - pos: 27.5,1.5 - parent: 407 - - uid: 328 - components: - - type: Transform - pos: 27.5,2.5 - parent: 407 - - uid: 329 - components: - - type: Transform - pos: 27.5,3.5 - parent: 407 - - uid: 330 - components: - - type: Transform - pos: 26.5,3.5 - parent: 407 - - uid: 331 - components: - - type: Transform - pos: 26.5,4.5 - parent: 407 - - uid: 332 - components: - - type: Transform - pos: 25.5,4.5 - parent: 407 - - uid: 333 - components: - - type: Transform - pos: 25.5,5.5 - parent: 407 - - uid: 334 - components: - - type: Transform - pos: 24.5,5.5 - parent: 407 - - uid: 335 - components: - - type: Transform - pos: 19.5,6.5 - parent: 407 - - uid: 347 - components: - - type: Transform - pos: 3.5,2.5 - parent: 407 - - uid: 357 - components: - - type: Transform - pos: 1.5,-4.5 - parent: 407 - - uid: 358 - components: - - type: Transform - pos: 1.5,-3.5 - parent: 407 - - uid: 359 - components: - - type: Transform - pos: 1.5,-2.5 - parent: 407 - - uid: 360 - components: - - type: Transform - pos: 1.5,-0.5 - parent: 407 - - uid: 361 - components: - - type: Transform - pos: 1.5,1.5 - parent: 407 - - uid: 362 - components: - - type: Transform - pos: 2.5,-1.5 - parent: 407 - - uid: 364 - components: - - type: Transform - pos: 6.5,-1.5 - parent: 407 - - uid: 377 - components: - - type: Transform - pos: 24.5,-4.5 - parent: 407 - - uid: 378 - components: - - type: Transform - pos: 25.5,-4.5 - parent: 407 - - uid: 379 - components: - - type: Transform - pos: 25.5,-3.5 - parent: 407 - - uid: 380 - components: - - type: Transform - pos: 26.5,-3.5 - parent: 407 - - uid: 381 - components: - - type: Transform - pos: 26.5,-2.5 - parent: 407 - - uid: 1025 - components: - - type: Transform - pos: -24.5,-1.5 - parent: 407 - - uid: 1026 - components: - - type: Transform - pos: -24.5,-0.5 - parent: 407 - - uid: 1027 - components: - - type: Transform - pos: -24.5,0.5 - parent: 407 - - uid: 1028 - components: - - type: Transform - pos: -24.5,1.5 - parent: 407 - - uid: 1029 - components: - - type: Transform - pos: -24.5,2.5 - parent: 407 - - uid: 1032 - components: - - type: Transform - pos: 8.5,18.5 - parent: 407 - - uid: 1112 - components: - - type: Transform - pos: 6.5,18.5 - parent: 407 - - uid: 1260 - components: - - type: Transform - pos: 6.5,19.5 - parent: 407 - - uid: 2210 - components: - - type: Transform - pos: -4.5,11.5 - parent: 407 -- proto: SignalButton - entities: - - uid: 1251 - components: - - type: Transform - pos: -5.5,9.5 - parent: 407 - - type: DeviceLinkSource - linkedPorts: - 198: - - Pressed: Toggle - - uid: 1255 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -19.5,2.5 - parent: 407 - - type: DeviceLinkSource - linkedPorts: - 1254: - - Pressed: Toggle - 1253: - - Pressed: Toggle - 1252: - - Pressed: Toggle -- proto: SignalButtonDirectional - entities: - - uid: 1759 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -6.5,5.5 - parent: 407 - - type: DeviceLinkSource - linkedPorts: - 1652: - - Pressed: Toggle - 1650: - - Pressed: Toggle - 1651: - - Pressed: Toggle - - uid: 2223 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -15.5,3.5 - parent: 407 - - type: DeviceLinkSource - linkedPorts: - 2222: - - Pressed: Toggle - - uid: 2224 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -6.5,5.5 - parent: 407 - - type: DeviceLinkSource - linkedPorts: - 1803: - - Pressed: Toggle - 2162: - - Pressed: Toggle -- proto: SignAtmos - entities: - - uid: 1560 - components: - - type: Transform - pos: 1.5,-11.5 - parent: 407 -- proto: SignBar - entities: - - uid: 2227 - components: - - type: Transform - pos: -2.5,2.5 - parent: 407 -- proto: SignCargoDock - entities: - - uid: 2016 - components: - - type: Transform - pos: 3.5,14.5 - parent: 407 -- proto: SignChem - entities: - - uid: 1744 - components: - - type: Transform - pos: 5.5,1.5 - parent: 407 -- proto: SignElectricalMed - entities: - - uid: 1854 - components: - - type: Transform - pos: 3.5,-8.5 - parent: 407 -- proto: SignEngineering - entities: - - uid: 1857 - components: - - type: Transform - pos: -15.5,1.5 - parent: 407 -- proto: SignEVA - entities: - - uid: 1829 - components: - - type: Transform - pos: -15.5,6.5 - parent: 407 -- proto: SignKiddiePlaque - entities: - - uid: 2161 - components: - - type: Transform - pos: -17.5,-5.5 - parent: 407 -- proto: SignMedical - entities: - - uid: 1745 - components: - - type: Transform - pos: 1.5,-1.5 - parent: 407 -- proto: SignPlaque - entities: - - uid: 2160 - components: - - type: Transform - pos: 24.5,-1.5 - parent: 407 -- proto: SignPrison - entities: - - uid: 1883 - components: - - type: Transform - pos: 17.5,4.5 - parent: 407 -- proto: SignScience - entities: - - uid: 1984 - components: - - type: Transform - pos: -0.5,6.5 - parent: 407 -- proto: SignSecureMed - entities: - - uid: 2117 - components: - - type: Transform - pos: 20.5,-1.5 - parent: 407 -- proto: SignSecureSmallRed - entities: - - uid: 2116 - components: - - type: Transform - pos: 15.5,-1.5 - parent: 407 -- proto: SignSecurity - entities: - - uid: 2120 - components: - - type: Transform - pos: 13.5,2.5 - parent: 407 -- proto: SignToolStorage - entities: - - uid: 1791 - components: - - type: Transform - pos: -19.5,4.5 - parent: 407 -- proto: SinkWide - entities: - - uid: 228 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -4.5,3.5 - parent: 407 - - uid: 1726 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -10.5,3.5 - parent: 407 - - uid: 1834 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -12.5,3.5 - parent: 407 - - uid: 2270 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 7.5,-0.5 - parent: 407 - - uid: 2271 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 18.5,4.5 - parent: 407 -- proto: SmartFridge - entities: - - uid: 1579 - components: - - type: Transform - pos: -6.5,3.5 - parent: 407 - - uid: 1869 - components: - - type: Transform - pos: 8.5,-1.5 - parent: 407 -- proto: SMESBasic - entities: - - uid: 376 - components: - - type: Transform - pos: -22.5,3.5 - parent: 407 -- proto: SoapNT - entities: - - uid: 2111 - components: - - type: Transform - pos: 16.59669,-4.5284977 - parent: 407 -- proto: SodaDispenser - entities: - - uid: 1778 - components: - - type: Transform - pos: -9.5,5.5 - parent: 407 -- proto: SpaceHeater - entities: - - uid: 1114 - components: - - type: Transform - pos: 6.5,-15.5 - parent: 407 -- proto: SpawnMobCorgi - entities: - - uid: 1030 - components: - - type: Transform - pos: 18.5,-3.5 - parent: 407 -- proto: SpawnMobFoxRenault - entities: - - uid: 1826 - components: - - type: Transform - pos: 21.5,-3.5 - parent: 407 -- proto: SpawnPointAtmos - entities: - - uid: 1814 - components: - - type: Transform - pos: 6.5,-12.5 - parent: 407 -- proto: SpawnPointBartender - entities: - - uid: 1916 - components: - - type: Transform - pos: -9.5,4.5 - parent: 407 -- proto: SpawnPointBotanist - entities: - - uid: 1915 - components: - - type: Transform - pos: -13.5,4.5 - parent: 407 -- proto: SpawnPointCaptain - entities: - - uid: 1941 - components: - - type: Transform - pos: 23.5,-3.5 - parent: 407 -- proto: SpawnPointCargoTechnician - entities: - - uid: 1998 - components: - - type: Transform - pos: 1.5,12.5 - parent: 407 - - uid: 1999 - components: - - type: Transform - pos: 0.5,12.5 - parent: 407 -- proto: SpawnPointChef - entities: - - uid: 1917 - components: - - type: Transform - pos: -4.5,4.5 - parent: 407 -- proto: SpawnPointChemist - entities: - - uid: 1739 - components: - - type: Transform - pos: 8.5,0.5 - parent: 407 -- proto: SpawnPointHeadOfSecurity - entities: - - uid: 2133 - components: - - type: Transform - pos: 22.5,2.5 - parent: 407 -- proto: SpawnPointJanitor + parent: 2 +- proto: OreProcessor entities: - uid: 1674 components: - type: Transform - pos: -4.5,-7.5 - parent: 407 -- proto: SpawnPointLatejoin + pos: -0.5,11.5 + parent: 2 +- proto: OxygenCanister entities: - - uid: 2057 + - uid: 1675 components: - type: Transform - pos: 4.5,15.5 - parent: 407 - - uid: 2058 - components: - - type: Transform - pos: 4.5,16.5 - parent: 407 - - uid: 2059 - components: - - type: Transform - pos: 10.5,16.5 - parent: 407 -- proto: SpawnPointMedicalDoctor + pos: 10.5,-10.5 + parent: 2 +- proto: PartRodMetal entities: + - uid: 1676 + components: + - type: Transform + pos: 7.4046574,-16.509167 + parent: 2 + - uid: 1677 + components: + - type: Transform + pos: 7.4046574,-16.509167 + parent: 2 +- proto: PianoInstrument + entities: + - uid: 1678 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -6.5,-1.5 + parent: 2 +- proto: PlaqueAtmos + entities: + - uid: 1679 + components: + - type: Transform + pos: 6.5,-9.5 + parent: 2 +- proto: PlasmaCanister + entities: + - uid: 1680 + components: + - type: Transform + pos: 8.5,-10.5 + parent: 2 +- proto: PlasmaReinforcedWindowDirectional + entities: + - uid: 1681 + components: + - type: Transform + pos: -3.5,9.5 + parent: 2 + - uid: 1682 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,10.5 + parent: 2 + - uid: 1683 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,9.5 + parent: 2 +- proto: PlasmaTankFilled + entities: + - uid: 1684 + components: + - type: Transform + pos: -21.613918,-2.399491 + parent: 2 + - uid: 1685 + components: + - type: Transform + pos: -21.520168,-2.446366 + parent: 2 + - uid: 1686 + components: + - type: Transform + pos: -21.379543,-2.540116 + parent: 2 +- proto: PlasticFlapsAirtightClear + entities: + - uid: 1687 + components: + - type: Transform + pos: 3.5,6.5 + parent: 2 +- proto: PlasticFlapsAirtightOpaque + entities: + - uid: 1688 + components: + - type: Transform + pos: -19.5,3.5 + parent: 2 + - uid: 1689 + components: + - type: Transform + pos: 4.5,13.5 + parent: 2 +- proto: Plunger + entities: + - uid: 1690 + components: + - type: Transform + pos: -4.2076445,-6.1772423 + parent: 2 +- proto: PortableGeneratorJrPacman + entities: + - uid: 1691 + components: + - type: Transform + pos: -23.5,2.5 + parent: 2 + - uid: 1692 + components: + - type: Transform + pos: 9.5,-8.5 + parent: 2 +- proto: PortableGeneratorPacman + entities: + - uid: 1693 + components: + - type: Transform + pos: -23.5,-1.5 + parent: 2 +- proto: PortableScrubber + entities: + - uid: 1694 + components: + - type: Transform + pos: 4.5,-15.5 + parent: 2 + - uid: 1695 + components: + - type: Transform + pos: 4.5,-14.5 + parent: 2 +- proto: PosterContrabandAtmosiaDeclarationIndependence + entities: + - uid: 1696 + components: + - type: Transform + pos: 8.5,-9.5 + parent: 2 +- proto: PosterContrabandBeachStarYamamoto + entities: + - uid: 1697 + components: + - type: Transform + pos: 11.5,-7.5 + parent: 2 +- proto: PosterContrabandHighEffectEngineering + entities: + - uid: 1698 + components: + - type: Transform + pos: -23.5,3.5 + parent: 2 +- proto: PosterContrabandSpaceCola + entities: + - uid: 1699 + components: + - type: Transform + pos: -11.5,5.5 + parent: 2 +- proto: PosterContrabandTools + entities: + - uid: 1700 + components: + - type: Transform + pos: -19.5,-2.5 + parent: 2 +- proto: PosterLegitAnatomyPoster + entities: + - uid: 1701 + components: + - type: Transform + pos: 13.5,-2.5 + parent: 2 +- proto: PosterLegitCleanliness + entities: + - uid: 1702 + components: + - type: Transform + pos: -2.5,-6.5 + parent: 2 +- proto: PosterLegitCohibaRobustoAd + entities: + - uid: 1703 + components: + - type: Transform + pos: -7.5,6.5 + parent: 2 +- proto: PosterLegitHelpOthers + entities: + - uid: 1704 + components: + - type: Transform + pos: -4.5,-5.5 + parent: 2 +- proto: PosterLegitHereForYourSafety + entities: + - uid: 1705 + components: + - type: Transform + pos: 13.5,6.5 + parent: 2 +- proto: PosterLegitHighClassMartini + entities: + - uid: 1706 + components: + - type: Transform + pos: -2.5,-3.5 + parent: 2 +- proto: PosterLegitJustAWeekAway + entities: + - uid: 1707 + components: + - type: Transform + pos: 4.5,11.5 + parent: 2 +- proto: PosterLegitNanomichiAd + entities: + - uid: 1708 + components: + - type: Transform + pos: 4.5,8.5 + parent: 2 +- proto: PosterLegitNanotrasenLogo + entities: + - uid: 1709 + components: + - type: Transform + pos: -11.5,-1.5 + parent: 2 + - uid: 1710 + components: + - type: Transform + pos: 10.5,17.5 + parent: 2 + - uid: 1711 + components: + - type: Transform + pos: 4.5,17.5 + parent: 2 + - uid: 1712 + components: + - type: Transform + pos: 10.5,6.5 + parent: 2 + - uid: 1713 + components: + - type: Transform + pos: 26.5,-1.5 + parent: 2 +- proto: PosterLegitNTTGC + entities: + - uid: 1714 + components: + - type: Transform + pos: 11.5,2.5 + parent: 2 +- proto: PosterLegitPDAAd + entities: + - uid: 1715 + components: + - type: Transform + pos: 20.5,3.5 + parent: 2 +- proto: PosterLegitPeriodicTable + entities: + - uid: 1716 + components: + - type: Transform + pos: 9.5,1.5 + parent: 2 +- proto: PosterLegitReportCrimes + entities: + - uid: 1717 + components: + - type: Transform + pos: -10.5,6.5 + parent: 2 +- proto: PosterLegitSafetyInternals + entities: + - uid: 1718 + components: + - type: Transform + pos: -4.5,6.5 + parent: 2 +- proto: PosterLegitScience + entities: + - uid: 1719 + components: + - type: Transform + pos: -1.5,13.5 + parent: 2 +- proto: PosterLegitSecWatch + entities: + - uid: 1720 + components: + - type: Transform + pos: 20.5,5.5 + parent: 2 +- proto: PosterLegitSpaceCops + entities: + - uid: 1721 + components: + - type: Transform + pos: 14.5,-1.5 + parent: 2 +- proto: PosterLegitUeNo + entities: + - uid: 1722 + components: + - type: Transform + pos: 9.5,-9.5 + parent: 2 +- proto: PosterLegitVacation + entities: + - uid: 1723 + components: + - type: Transform + pos: 7.5,2.5 + parent: 2 +- proto: PottedPlant21 + entities: + - uid: 1724 + components: + - type: Transform + pos: 2.4826317,-3.6277924 + parent: 2 +- proto: PottedPlant22 + entities: + - uid: 1725 + components: + - type: Transform + pos: 3.5,1.5 + parent: 2 + - uid: 1726 + components: + - type: Transform + pos: -5.781889,-2.132682 + parent: 2 + - uid: 1727 + components: + - type: Transform + pos: -11.5,1.5 + parent: 2 + - uid: 1728 + components: + - type: Transform + pos: -6.5,1.5 + parent: 2 + - uid: 1729 + components: + - type: Transform + pos: 4.5,5.5 + parent: 2 + - uid: 1730 + components: + - type: Transform + pos: 10.5,5.5 + parent: 2 + - uid: 1731 + components: + - type: Transform + pos: -1.5,-9.5 + parent: 2 + - uid: 1732 + components: + - type: Transform + pos: -1.5,-3.5 + parent: 2 +- proto: PottedPlant26 + entities: + - uid: 1733 + components: + - type: Transform + pos: 10.2875805,-1.5445261 + parent: 2 +- proto: PottedPlantBioluminscent + entities: + - uid: 1734 + components: + - type: Transform + pos: 14.5,5.5 + parent: 2 +- proto: PowerCellHyper + entities: + - uid: 1735 + components: + - type: Transform + pos: -16.358204,-2.3107126 + parent: 2 +- proto: PowerCellRecharger + entities: + - uid: 1736 + components: + - type: Transform + pos: -16.5,-2.5 + parent: 2 + - uid: 1737 + components: + - type: Transform + pos: 2.5,6.5 + parent: 2 + - uid: 1738 + components: + - type: Transform + pos: 7.5,-3.5 + parent: 2 + - uid: 1739 + components: + - type: Transform + pos: -0.5,10.5 + parent: 2 +- proto: Poweredlight + entities: + - uid: 1740 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 0.5,9.5 + parent: 2 + - uid: 1741 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -18.5,4.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1742 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -16.5,6.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1743 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -17.5,-4.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1744 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -14.5,-0.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1745 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,-4.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1746 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.5,9.5 + parent: 2 + - uid: 1747 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,9.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1748 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,14.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1749 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 10.5,14.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1750 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 10.5,9.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1751 + components: + - type: Transform + pos: -0.5,5.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1752 + components: + - type: Transform + pos: 10.5,5.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1753 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 16.5,4.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1754 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,-0.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1755 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.5,-0.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1756 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-1.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1757 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,-10.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1758 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,-14.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1759 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 10.5,-13.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1760 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 10.5,-15.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1761 + components: + - type: Transform + pos: 11.5,-10.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1762 + components: + - type: Transform + pos: 11.5,1.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1763 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 19.5,-3.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1764 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 24.5,-0.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1765 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 14.5,-3.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1766 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 21.5,3.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1767 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 19.5,-0.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1768 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 14.5,-0.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1769 + components: + - type: Transform + pos: -5.5,1.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1770 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,-4.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 +- proto: PoweredlightLED + entities: + - uid: 1771 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -25.5,3.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1772 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -25.5,-2.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1773 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 13.5,-9.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1774 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -18.5,8.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 +- proto: PoweredlightSodium + entities: + - uid: 1775 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -20.5,-1.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1776 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -20.5,2.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 +- proto: PoweredSmallLight + entities: + - uid: 1777 + components: + - type: Transform + pos: -12.5,6.5 + parent: 2 + - uid: 1778 + components: + - type: Transform + pos: -10.5,5.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1779 + components: + - type: Transform + pos: -7.5,5.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1780 + components: + - type: Transform + pos: -5.5,5.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1781 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-13.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1782 + components: + - type: Transform + pos: 9.5,-6.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1783 + components: + - type: Transform + pos: 4.5,-6.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1784 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 11.5,-4.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1785 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 8.5,-4.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1786 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,-4.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1787 + components: + - type: Transform + pos: 18.5,5.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1788 + components: + - type: Transform + pos: -4.5,-6.5 + parent: 2 + - type: ApcPowerReceiver + powerLoad: 0 + - uid: 1789 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-4.5 + parent: 2 + - uid: 1790 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,15.5 + parent: 2 + - uid: 1791 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,15.5 + parent: 2 +- proto: Protolathe + entities: + - uid: 1792 + components: + - type: Transform + pos: -0.5,7.5 + parent: 2 +- proto: Rack + entities: + - uid: 1793 + components: + - type: Transform + pos: 4.5,-10.5 + parent: 2 + - uid: 1794 + components: + - type: Transform + pos: 7.5,-16.5 + parent: 2 + - uid: 1795 + components: + - type: Transform + pos: -21.5,-2.5 + parent: 2 + - uid: 1796 + components: + - type: Transform + pos: -5.5,-7.5 + parent: 2 + - uid: 1797 + components: + - type: Transform + pos: -20.5,3.5 + parent: 2 + - uid: 1798 + components: + - type: Transform + pos: -4.5,7.5 + parent: 2 + - uid: 1799 + components: + - type: Transform + pos: 18.5,5.5 + parent: 2 + - uid: 1800 + components: + - type: Transform + pos: -1.5,14.5 + parent: 2 +- proto: RadiationCollector + entities: + - uid: 1801 + components: + - type: Transform + pos: -23.5,-0.5 + parent: 2 + - uid: 1802 + components: + - type: Transform + pos: -23.5,0.5 + parent: 2 + - uid: 1803 + components: + - type: Transform + pos: -23.5,1.5 + parent: 2 + - uid: 1804 + components: + - type: Transform + pos: -21.5,1.5 + parent: 2 + - uid: 1805 + components: + - type: Transform + pos: -21.5,0.5 + parent: 2 + - uid: 1806 + components: + - type: Transform + pos: -21.5,-0.5 + parent: 2 +- proto: Railing + entities: + - uid: 1807 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 10.5,8.5 + parent: 2 + - uid: 1808 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 9.5,9.5 + parent: 2 + - uid: 1809 + components: + - type: Transform + pos: 10.5,10.5 + parent: 2 + - uid: 1810 + components: + - type: Transform + pos: 10.5,15.5 + parent: 2 + - uid: 1811 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 9.5,14.5 + parent: 2 + - uid: 1812 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 10.5,13.5 + parent: 2 +- proto: RailingCornerSmall + entities: + - uid: 1813 + components: + - type: Transform + pos: 11.5,13.5 + parent: 2 + - uid: 1814 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 11.5,10.5 + parent: 2 + - uid: 1815 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,15.5 + parent: 2 + - uid: 1816 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,10.5 + parent: 2 + - uid: 1817 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.5,13.5 + parent: 2 + - uid: 1818 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.5,8.5 + parent: 2 +- proto: RandomArtifactSpawner + entities: + - uid: 1819 + components: + - type: Transform + pos: -4.5,10.5 + parent: 2 +- proto: RandomBoard + entities: + - uid: 1820 + components: + - type: Transform + pos: -16.5,-4.5 + parent: 2 +- proto: RCD + entities: + - uid: 1821 + components: + - type: Transform + pos: 4.5666795,-10.266068 + parent: 2 +- proto: ReagentContainerFlour + entities: + - uid: 1822 + components: + - type: Transform + pos: -3.642765,5.4634895 + parent: 2 +- proto: Recycler + entities: + - uid: 1823 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 11.5,-6.5 + parent: 2 +- proto: ReinforcedPlasmaWindow + entities: + - uid: 1824 + components: + - type: Transform + pos: 8.5,-15.5 + parent: 2 + - uid: 1825 + components: + - type: Transform + pos: 8.5,-13.5 + parent: 2 +- proto: ReinforcedWindow + entities: + - uid: 1826 + components: + - type: Transform + pos: 1.5,6.5 + parent: 2 +- proto: ResearchAndDevelopmentServer + entities: + - uid: 1827 + components: + - type: Transform + pos: -2.5,12.5 + parent: 2 +- proto: ResearchDisk10000 + entities: + - uid: 1828 + components: + - type: Transform + pos: 10.483304,-6.5229325 + parent: 2 +- proto: SalvageMagnet + entities: + - uid: 1829 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,16.5 + parent: 2 +- proto: Screen + entities: + - uid: 1830 + components: + - type: Transform + pos: 5.5,6.5 + parent: 2 + - uid: 1831 + components: + - type: Transform + pos: -15.5,-1.5 + parent: 2 + - uid: 1832 + components: + - type: Transform + pos: -2.5,-1.5 + parent: 2 + - uid: 1833 + components: + - type: Transform + pos: 1.5,-10.5 + parent: 2 + - uid: 1834 + components: + - type: Transform + pos: 21.5,-1.5 + parent: 2 +- proto: SecurityTechFab + entities: + - uid: 1835 + components: + - type: Transform + pos: 15.5,-4.5 + parent: 2 +- proto: SeedExtractor + entities: + - uid: 1836 + components: + - type: Transform + pos: -12.5,6.5 + parent: 2 +- proto: SheetGlass + entities: + - uid: 1837 + components: + - type: Transform + pos: -3.0838065,7.537944 + parent: 2 + - uid: 1838 + components: + - type: Transform + pos: -3.0838065,7.537944 + parent: 2 + - uid: 1839 + components: + - type: Transform + pos: 19.12654,-4.309994 + parent: 2 +- proto: SheetPlasma + entities: + - uid: 1840 + components: + - type: Transform + pos: -21.551367,-2.3599691 + parent: 2 +- proto: SheetPlastic + entities: + - uid: 1841 + components: + - type: Transform + pos: -2.6463065,7.537944 + parent: 2 + - uid: 1842 + components: + - type: Transform + pos: -2.6463065,7.537944 + parent: 2 + - uid: 1843 + components: + - type: Transform + pos: 19.548414,-4.591244 + parent: 2 +- proto: SheetSteel + entities: + - uid: 1844 + components: + - type: Transform + pos: 7.5296574,-16.509167 + parent: 2 + - uid: 1845 + components: + - type: Transform + pos: 7.5296574,-16.509167 + parent: 2 + - uid: 1846 + components: + - type: Transform + pos: -3.5525565,7.506694 + parent: 2 + - uid: 1847 + components: + - type: Transform + pos: -3.5525565,7.506694 + parent: 2 + - uid: 1848 + components: + - type: Transform + pos: 19.704664,-4.278744 + parent: 2 +- proto: ShuttersNormalOpen + entities: + - uid: 1849 + components: + - type: Transform + pos: -8.5,2.5 + parent: 2 + - uid: 1850 + components: + - type: Transform + pos: -10.5,2.5 + parent: 2 + - uid: 1851 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,2.5 + parent: 2 + - uid: 1852 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,2.5 + parent: 2 + - uid: 1853 + components: + - type: Transform + pos: -14.5,2.5 + parent: 2 +- proto: ShuttersRadiation + entities: + - uid: 1854 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -19.5,-0.5 + parent: 2 + - uid: 1855 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -19.5,0.5 + parent: 2 + - uid: 1856 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -19.5,1.5 + parent: 2 +- proto: ShuttersWindowOpen + entities: + - uid: 1857 + components: + - type: Transform + pos: -9.5,2.5 + parent: 2 +- proto: ShuttleWindow + entities: + - uid: 1858 + components: + - type: Transform + pos: -13.5,7.5 + parent: 2 + - uid: 1859 + components: + - type: Transform + pos: 7.5,-17.5 + parent: 2 + - uid: 1860 + components: + - type: Transform + pos: 9.5,-10.5 + parent: 2 + - uid: 1861 + components: + - type: Transform + pos: 12.5,-10.5 + parent: 2 + - uid: 1862 + components: + - type: Transform + pos: 3.5,-13.5 + parent: 2 + - uid: 1863 + components: + - type: Transform + pos: 3.5,-14.5 + parent: 2 + - uid: 1864 + components: + - type: Transform + pos: 3.5,-15.5 + parent: 2 + - uid: 1865 + components: + - type: Transform + pos: 12.5,-6.5 + parent: 2 + - uid: 1866 + components: + - type: Transform + pos: 0.5,-14.5 + parent: 2 + - uid: 1867 + components: + - type: Transform + pos: -0.5,-14.5 + parent: 2 + - uid: 1868 + components: + - type: Transform + pos: -0.5,-13.5 + parent: 2 + - uid: 1869 + components: + - type: Transform + pos: -1.5,-13.5 + parent: 2 + - uid: 1870 + components: + - type: Transform + pos: -1.5,-12.5 + parent: 2 + - uid: 1871 + components: + - type: Transform + pos: -6.5,-7.5 + parent: 2 + - uid: 1872 + components: + - type: Transform + pos: -6.5,-8.5 + parent: 2 + - uid: 1873 + components: + - type: Transform + pos: -5.5,-8.5 + parent: 2 + - uid: 1874 + components: + - type: Transform + pos: -5.5,-9.5 + parent: 2 + - uid: 1875 + components: + - type: Transform + pos: -4.5,-9.5 + parent: 2 + - uid: 1876 + components: + - type: Transform + pos: -16.5,5.5 + parent: 2 + - uid: 1877 + components: + - type: Transform + pos: -16.5,7.5 + parent: 2 + - uid: 1878 + components: + - type: Transform + pos: -14.5,2.5 + parent: 2 + - uid: 1879 + components: + - type: Transform + pos: -9.5,6.5 + parent: 2 + - uid: 1880 + components: + - type: Transform + pos: -8.5,6.5 + parent: 2 + - uid: 1881 + components: + - type: Transform + pos: -14.5,-5.5 + parent: 2 + - uid: 1882 + components: + - type: Transform + pos: -13.5,-5.5 + parent: 2 + - uid: 1883 + components: + - type: Transform + pos: -12.5,-5.5 + parent: 2 + - uid: 1884 + components: + - type: Transform + pos: -10.5,-5.5 + parent: 2 + - uid: 1885 + components: + - type: Transform + pos: -9.5,-5.5 + parent: 2 + - uid: 1886 + components: + - type: Transform + pos: -8.5,-5.5 + parent: 2 + - uid: 1887 + components: + - type: Transform + pos: -3.5,11.5 + parent: 2 + - uid: 1888 + components: + - type: Transform + pos: 0.5,14.5 + parent: 2 + - uid: 1889 + components: + - type: Transform + pos: 13.5,11.5 + parent: 2 + - uid: 1890 + components: + - type: Transform + pos: 2.5,14.5 + parent: 2 + - uid: 1891 + components: + - type: Transform + pos: 8.5,19.5 + parent: 2 + - uid: 1892 + components: + - type: Transform + pos: -1.5,17.5 + parent: 2 + - uid: 1893 + components: + - type: Transform + pos: 6.5,17.5 + parent: 2 + - uid: 1894 + components: + - type: Transform + pos: 8.5,17.5 + parent: 2 + - uid: 1895 + components: + - type: Transform + pos: 2.5,17.5 + parent: 2 + - uid: 1896 + components: + - type: Transform + pos: 0.5,17.5 + parent: 2 + - uid: 1897 + components: + - type: Transform + pos: 15.5,-5.5 + parent: 2 + - uid: 1898 + components: + - type: Transform + pos: 16.5,-5.5 + parent: 2 + - uid: 1899 + components: + - type: Transform + pos: 17.5,-5.5 + parent: 2 + - uid: 1900 + components: + - type: Transform + pos: 18.5,-5.5 + parent: 2 + - uid: 1901 + components: + - type: Transform + pos: 13.5,-0.5 + parent: 2 + - uid: 1902 + components: + - type: Transform + pos: 13.5,1.5 + parent: 2 + - uid: 1903 + components: + - type: Transform + pos: 13.5,3.5 + parent: 2 + - uid: 1904 + components: + - type: Transform + pos: 13.5,5.5 + parent: 2 + - uid: 1905 + components: + - type: Transform + pos: 14.5,6.5 + parent: 2 + - uid: 1906 + components: + - type: Transform + pos: 15.5,6.5 + parent: 2 + - uid: 1907 + components: + - type: Transform + pos: 16.5,6.5 + parent: 2 + - uid: 1908 + components: + - type: Transform + pos: 19.5,2.5 + parent: 2 + - uid: 1909 + components: + - type: Transform + pos: 20.5,1.5 + parent: 2 + - uid: 1910 + components: + - type: Transform + pos: 20.5,-0.5 + parent: 2 - uid: 1911 components: - type: Transform - pos: 3.5,-3.5 - parent: 407 + pos: 27.5,-0.5 + parent: 2 - uid: 1912 components: - type: Transform - pos: 4.5,-2.5 - parent: 407 -- proto: SpawnPointMusician - entities: + pos: 27.5,0.5 + parent: 2 + - uid: 1913 + components: + - type: Transform + pos: 27.5,1.5 + parent: 2 + - uid: 1914 + components: + - type: Transform + pos: 27.5,2.5 + parent: 2 + - uid: 1915 + components: + - type: Transform + pos: 27.5,3.5 + parent: 2 + - uid: 1916 + components: + - type: Transform + pos: 26.5,3.5 + parent: 2 + - uid: 1917 + components: + - type: Transform + pos: 26.5,4.5 + parent: 2 + - uid: 1918 + components: + - type: Transform + pos: 25.5,4.5 + parent: 2 + - uid: 1919 + components: + - type: Transform + pos: 25.5,5.5 + parent: 2 - uid: 1920 + components: + - type: Transform + pos: 24.5,5.5 + parent: 2 + - uid: 1921 + components: + - type: Transform + pos: 19.5,6.5 + parent: 2 + - uid: 1922 + components: + - type: Transform + pos: 3.5,2.5 + parent: 2 + - uid: 1923 + components: + - type: Transform + pos: 1.5,-4.5 + parent: 2 + - uid: 1924 + components: + - type: Transform + pos: 1.5,-3.5 + parent: 2 + - uid: 1925 + components: + - type: Transform + pos: 1.5,-2.5 + parent: 2 + - uid: 1926 + components: + - type: Transform + pos: 1.5,-0.5 + parent: 2 + - uid: 1927 + components: + - type: Transform + pos: 1.5,1.5 + parent: 2 + - uid: 1928 + components: + - type: Transform + pos: 2.5,-1.5 + parent: 2 + - uid: 1929 + components: + - type: Transform + pos: 6.5,-1.5 + parent: 2 + - uid: 1930 + components: + - type: Transform + pos: 24.5,-4.5 + parent: 2 + - uid: 1931 + components: + - type: Transform + pos: 25.5,-4.5 + parent: 2 + - uid: 1932 + components: + - type: Transform + pos: 25.5,-3.5 + parent: 2 + - uid: 1933 + components: + - type: Transform + pos: 26.5,-3.5 + parent: 2 + - uid: 1934 + components: + - type: Transform + pos: 26.5,-2.5 + parent: 2 + - uid: 1935 + components: + - type: Transform + pos: -24.5,-1.5 + parent: 2 + - uid: 1936 + components: + - type: Transform + pos: -24.5,-0.5 + parent: 2 + - uid: 1937 + components: + - type: Transform + pos: -24.5,0.5 + parent: 2 + - uid: 1938 + components: + - type: Transform + pos: -24.5,1.5 + parent: 2 + - uid: 1939 + components: + - type: Transform + pos: -24.5,2.5 + parent: 2 + - uid: 1940 + components: + - type: Transform + pos: 8.5,18.5 + parent: 2 + - uid: 1941 + components: + - type: Transform + pos: 6.5,18.5 + parent: 2 + - uid: 1942 + components: + - type: Transform + pos: 6.5,19.5 + parent: 2 + - uid: 1943 + components: + - type: Transform + pos: -4.5,11.5 + parent: 2 +- proto: SignalButton + entities: + - uid: 1944 + components: + - type: Transform + pos: -5.5,9.5 + parent: 2 + - type: DeviceLinkSource + linkedPorts: + 92: + - Pressed: Toggle + - uid: 1945 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -19.5,2.5 + parent: 2 + - type: DeviceLinkSource + linkedPorts: + 1856: + - Pressed: Toggle + 1855: + - Pressed: Toggle + 1854: + - Pressed: Toggle +- proto: SignalButtonDirectional + entities: + - uid: 1946 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -6.5,5.5 + parent: 2 + - type: DeviceLinkSource + linkedPorts: + 1850: + - Pressed: Toggle + 1857: + - Pressed: Toggle + 1849: + - Pressed: Toggle + - uid: 1947 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -15.5,3.5 + parent: 2 + - type: DeviceLinkSource + linkedPorts: + 1853: + - Pressed: Toggle + - uid: 1948 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.5,5.5 + parent: 2 + - type: DeviceLinkSource + linkedPorts: + 1851: + - Pressed: Toggle + 1852: + - Pressed: Toggle +- proto: SignAtmos + entities: + - uid: 1949 + components: + - type: Transform + pos: 1.5,-11.5 + parent: 2 +- proto: SignBar + entities: + - uid: 1950 + components: + - type: Transform + pos: -2.5,2.5 + parent: 2 +- proto: SignCargoDock + entities: + - uid: 1951 + components: + - type: Transform + pos: 3.5,14.5 + parent: 2 +- proto: SignChem + entities: + - uid: 1952 + components: + - type: Transform + pos: 5.5,1.5 + parent: 2 +- proto: SignElectricalMed + entities: + - uid: 1953 + components: + - type: Transform + pos: 3.5,-8.5 + parent: 2 +- proto: SignEngineering + entities: + - uid: 1954 + components: + - type: Transform + pos: -15.5,1.5 + parent: 2 +- proto: SignEVA + entities: + - uid: 1955 + components: + - type: Transform + pos: -15.5,6.5 + parent: 2 +- proto: SignKiddiePlaque + entities: + - uid: 1956 + components: + - type: Transform + pos: -17.5,-5.5 + parent: 2 +- proto: SignMedical + entities: + - uid: 1957 + components: + - type: Transform + pos: 1.5,-1.5 + parent: 2 +- proto: SignPlaque + entities: + - uid: 1958 + components: + - type: Transform + pos: 24.5,-1.5 + parent: 2 +- proto: SignPrison + entities: + - uid: 1959 + components: + - type: Transform + pos: 17.5,4.5 + parent: 2 +- proto: SignScience + entities: + - uid: 1960 + components: + - type: Transform + pos: -0.5,6.5 + parent: 2 +- proto: SignSecureMed + entities: + - uid: 1961 + components: + - type: Transform + pos: 20.5,-1.5 + parent: 2 +- proto: SignSecureSmallRed + entities: + - uid: 1962 + components: + - type: Transform + pos: 15.5,-1.5 + parent: 2 +- proto: SignSecurity + entities: + - uid: 1963 + components: + - type: Transform + pos: 13.5,2.5 + parent: 2 +- proto: SignToolStorage + entities: + - uid: 1964 + components: + - type: Transform + pos: -19.5,4.5 + parent: 2 +- proto: SinkWide + entities: + - uid: 1965 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,3.5 + parent: 2 + - uid: 1966 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -10.5,3.5 + parent: 2 + - uid: 1967 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -12.5,3.5 + parent: 2 + - uid: 1968 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 7.5,-0.5 + parent: 2 + - uid: 1969 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 18.5,4.5 + parent: 2 +- proto: SmartFridge + entities: + - uid: 1970 + components: + - type: Transform + pos: -6.5,3.5 + parent: 2 + - uid: 1971 + components: + - type: Transform + pos: 8.5,-1.5 + parent: 2 +- proto: SMESBasic + entities: + - uid: 1972 + components: + - type: Transform + pos: -22.5,3.5 + parent: 2 +- proto: SoapNT + entities: + - uid: 1973 + components: + - type: Transform + pos: 16.59669,-4.5284977 + parent: 2 +- proto: SodaDispenser + entities: + - uid: 1974 + components: + - type: Transform + pos: -9.5,5.5 + parent: 2 +- proto: SpaceHeater + entities: + - uid: 1975 + components: + - type: Transform + pos: 6.5,-15.5 + parent: 2 +- proto: SpawnMobCorgi + entities: + - uid: 1976 + components: + - type: Transform + pos: 18.5,-3.5 + parent: 2 +- proto: SpawnMobFoxRenault + entities: + - uid: 1977 + components: + - type: Transform + pos: 21.5,-3.5 + parent: 2 +- proto: SpawnPointAtmos + entities: + - uid: 1978 + components: + - type: Transform + pos: 6.5,-12.5 + parent: 2 +- proto: SpawnPointBartender + entities: + - uid: 1979 + components: + - type: Transform + pos: -9.5,4.5 + parent: 2 +- proto: SpawnPointBotanist + entities: + - uid: 1980 + components: + - type: Transform + pos: -13.5,4.5 + parent: 2 +- proto: SpawnPointCaptain + entities: + - uid: 1981 + components: + - type: Transform + pos: 23.5,-3.5 + parent: 2 +- proto: SpawnPointCargoTechnician + entities: + - uid: 1982 + components: + - type: Transform + pos: 1.5,12.5 + parent: 2 + - uid: 1983 + components: + - type: Transform + pos: 0.5,12.5 + parent: 2 +- proto: SpawnPointChef + entities: + - uid: 1984 + components: + - type: Transform + pos: -4.5,4.5 + parent: 2 +- proto: SpawnPointChemist + entities: + - uid: 1985 + components: + - type: Transform + pos: 8.5,0.5 + parent: 2 +- proto: SpawnPointHeadOfSecurity + entities: + - uid: 1986 + components: + - type: Transform + pos: 22.5,2.5 + parent: 2 +- proto: SpawnPointJanitor + entities: + - uid: 1987 + components: + - type: Transform + pos: -4.5,-7.5 + parent: 2 +- proto: SpawnPointLatejoin + entities: + - uid: 1988 + components: + - type: Transform + pos: 4.5,15.5 + parent: 2 + - uid: 1989 + components: + - type: Transform + pos: 4.5,16.5 + parent: 2 + - uid: 1990 + components: + - type: Transform + pos: 10.5,16.5 + parent: 2 +- proto: SpawnPointMedicalDoctor + entities: + - uid: 1991 + components: + - type: Transform + pos: 3.5,-3.5 + parent: 2 + - uid: 1992 + components: + - type: Transform + pos: 4.5,-2.5 + parent: 2 +- proto: SpawnPointMusician + entities: + - uid: 1993 components: - type: Transform pos: -4.5,-2.5 - parent: 407 + parent: 2 - proto: SpawnPointObserver entities: - - uid: 2237 + - uid: 1994 components: - type: Transform pos: -9.5,0.5 - parent: 407 + parent: 2 - proto: SpawnPointPassenger entities: - - uid: 2060 + - uid: 1995 components: - type: Transform pos: 6.5,15.5 - parent: 407 - - uid: 2061 + parent: 2 + - uid: 1996 components: - type: Transform pos: 8.5,15.5 - parent: 407 + parent: 2 - proto: SpawnPointScientist entities: - uid: 1997 components: - type: Transform pos: -2.5,8.5 - parent: 407 + parent: 2 - proto: SpawnPointSecurityOfficer entities: - - uid: 2134 + - uid: 1998 components: - type: Transform pos: 15.5,-3.5 - parent: 407 - - uid: 2135 + parent: 2 + - uid: 1999 components: - type: Transform pos: 16.5,-3.5 - parent: 407 - - uid: 2136 + parent: 2 + - uid: 2000 components: - type: Transform pos: 17.5,-3.5 - parent: 407 + parent: 2 - proto: SpawnPointStationEngineer entities: - - uid: 1913 + - uid: 2001 components: - type: Transform pos: -17.5,-3.5 - parent: 407 - - uid: 1914 + parent: 2 + - uid: 2002 components: - type: Transform pos: -17.5,0.5 - parent: 407 + parent: 2 - proto: SprayBottleSpaceCleaner entities: - - uid: 1671 + - uid: 2003 components: - type: Transform pos: -5.545308,-7.7092304 - parent: 407 + parent: 2 - proto: StasisBed entities: - - uid: 1628 + - uid: 2004 components: - type: Transform pos: 12.5,-4.5 - parent: 407 + parent: 2 - proto: StatueVenusBlue entities: - - uid: 2023 + - uid: 2005 components: - type: Transform pos: 10.5,9.5 - parent: 407 + parent: 2 - proto: StatueVenusRed entities: - - uid: 2022 + - uid: 2006 components: - type: Transform pos: 10.5,14.5 - parent: 407 + parent: 2 - proto: StoolBar entities: - - uid: 1699 + - uid: 2007 components: - type: Transform rot: 3.141592653589793 rad pos: -10.5,1.5 - parent: 407 - - uid: 1700 + parent: 2 + - uid: 2008 components: - type: Transform rot: 3.141592653589793 rad pos: -9.5,1.5 - parent: 407 - - uid: 1701 + parent: 2 + - uid: 2009 components: - type: Transform rot: 3.141592653589793 rad pos: -8.5,1.5 - parent: 407 + parent: 2 - proto: Stunbaton entities: - - uid: 2108 + - uid: 2010 components: - type: Transform pos: 16.40919,-4.3566227 - parent: 407 - - uid: 2109 + parent: 2 + - uid: 2011 components: - type: Transform pos: 16.581064,-4.4972477 - parent: 407 + parent: 2 - proto: SubstationBasic entities: - - uid: 115 + - uid: 2012 components: - type: MetaData name: Starboard Quarter Substation - type: Transform pos: -19.5,-3.5 - parent: 407 - - uid: 366 + parent: 2 + - uid: 2013 components: - type: MetaData name: Port Bow Substation - type: Transform pos: 11.5,7.5 - parent: 407 - - uid: 367 + parent: 2 + - uid: 2014 components: - type: MetaData name: Bow Substation - type: Transform pos: 21.5,4.5 - parent: 407 - - uid: 368 + parent: 2 + - uid: 2015 components: - type: MetaData name: Starboard Bow Substation - type: Transform pos: 2.5,-9.5 - parent: 407 - - uid: 369 + parent: 2 + - uid: 2016 components: - type: MetaData name: Port Stern Substation - type: Transform pos: -6.5,7.5 - parent: 407 - - uid: 370 + parent: 2 + - uid: 2017 components: - type: MetaData name: Aft Substation - type: Transform pos: -21.5,3.5 - parent: 407 + parent: 2 - proto: SuitStorageBasic entities: - - uid: 1827 + - uid: 2018 components: - type: Transform pos: -16.5,3.5 - parent: 407 + parent: 2 - proto: SuitStorageEVAAlternate entities: - - uid: 1547 + - uid: 2019 components: - type: Transform pos: -16.5,4.5 - parent: 407 + parent: 2 - proto: SuitStorageSec entities: - - uid: 1870 + - uid: 2020 components: - type: Transform pos: 17.5,-4.5 - parent: 407 + parent: 2 - proto: SurveillanceCameraRouterSecurity entities: - - uid: 1907 + - uid: 2021 components: - type: Transform pos: 14.5,-2.5 - parent: 407 + parent: 2 - proto: SurveillanceCameraSecurity entities: - - uid: 1940 + - uid: 2022 components: - type: Transform rot: -1.5707963267948966 rad pos: 21.5,2.5 - parent: 407 + parent: 2 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraSecurity nameSet: True id: Bridge - - uid: 1942 + - uid: 2023 components: - type: Transform rot: -1.5707963267948966 rad pos: 18.5,4.5 - parent: 407 + parent: 2 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraSecurity nameSet: True id: Brig - - uid: 1943 + - uid: 2024 components: - type: Transform rot: 1.5707963267948966 rad pos: -20.5,-1.5 - parent: 407 + parent: 2 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraSecurity nameSet: True id: Radiation Engine - - uid: 1944 + - uid: 2025 components: - type: Transform rot: 1.5707963267948966 rad pos: -16.5,1.5 - parent: 407 + parent: 2 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraSecurity nameSet: True id: Engineering - - uid: 1945 + - uid: 2026 components: - type: Transform rot: 3.141592653589793 rad pos: -6.5,1.5 - parent: 407 + parent: 2 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraSecurity nameSet: True id: Bar - - uid: 1946 + - uid: 2027 components: - type: Transform rot: -1.5707963267948966 rad pos: 4.5,-13.5 - parent: 407 + parent: 2 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraSecurity nameSet: True id: Atmosia - - uid: 1950 + - uid: 2028 components: - type: Transform rot: 3.141592653589793 rad pos: 6.5,-6.5 - parent: 407 + parent: 2 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraSecurity nameSet: True id: Disposals - - uid: 1951 + - uid: 2029 components: - type: Transform rot: 3.141592653589793 rad pos: 4.5,1.5 - parent: 407 + parent: 2 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraSecurity nameSet: True id: Medbay - - uid: 1952 + - uid: 2030 components: - type: Transform rot: -1.5707963267948966 rad pos: 5.5,12.5 - parent: 407 + parent: 2 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraSecurity nameSet: True id: Arrivals - - uid: 1972 + - uid: 2031 components: - type: Transform rot: -1.5707963267948966 rad pos: 0.5,9.5 - parent: 407 + parent: 2 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraSecurity nameSet: True id: Cargo Bay - - uid: 1973 + - uid: 2032 components: - type: Transform rot: 1.5707963267948966 rad pos: -1.5,9.5 - parent: 407 + parent: 2 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraSecurity nameSet: True id: Science - - uid: 2085 + - uid: 2033 components: - type: Transform rot: -1.5707963267948966 rad pos: -1.5,-4.5 - parent: 407 + parent: 2 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraSecurity nameSet: True id: Abeam to Starboard - - uid: 2086 + - uid: 2034 components: - type: Transform pos: -15.5,8.5 - parent: 407 + parent: 2 - type: SurveillanceCamera setupAvailableNetworks: - SurveillanceCameraSecurity @@ -12152,2476 +14069,2565 @@ entities: id: Off the Port Quarter - proto: SyringeInaprovaline entities: - - uid: 1899 + - uid: 2035 components: - type: Transform pos: 10.559818,-4.3941536 - parent: 407 + parent: 2 - proto: SyringeTranexamicAcid entities: - - uid: 1900 + - uid: 2036 components: - type: Transform pos: 9.481693,-3.4879038 - parent: 407 + parent: 2 - proto: Table entities: - - uid: 1235 + - uid: 2037 components: - type: Transform pos: 11.5,1.5 - parent: 407 - - uid: 1719 + parent: 2 + - uid: 2038 components: - type: Transform pos: -3.5,3.5 - parent: 407 - - uid: 1720 + parent: 2 + - uid: 2039 components: - type: Transform pos: -3.5,4.5 - parent: 407 - - uid: 1721 + parent: 2 + - uid: 2040 components: - type: Transform pos: -3.5,5.5 - parent: 407 - - uid: 1804 + parent: 2 + - uid: 2041 components: - type: Transform pos: -18.5,2.5 - parent: 407 - - uid: 1816 + parent: 2 + - uid: 2042 components: - type: Transform pos: -16.5,-4.5 - parent: 407 - - uid: 1818 + parent: 2 + - uid: 2043 components: - type: Transform pos: -16.5,-2.5 - parent: 407 - - uid: 1868 + parent: 2 + - uid: 2044 components: - type: Transform pos: 12.5,1.5 - parent: 407 - - uid: 1964 + parent: 2 + - uid: 2045 components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,11.5 - parent: 407 - - uid: 2001 + parent: 2 + - uid: 2046 components: - type: Transform rot: -1.5707963267948966 rad pos: -2.5,7.5 - parent: 407 - - uid: 2002 + parent: 2 + - uid: 2047 components: - type: Transform rot: -1.5707963267948966 rad pos: -3.5,7.5 - parent: 407 - - uid: 2126 + parent: 2 + - uid: 2048 components: - type: Transform pos: 16.5,4.5 - parent: 407 + parent: 2 - proto: TableCarpet entities: - - uid: 1693 + - uid: 2049 components: - type: Transform pos: -13.5,-4.5 - parent: 407 - - uid: 1694 + parent: 2 + - uid: 2050 components: - type: Transform pos: -13.5,-3.5 - parent: 407 - - uid: 1695 + parent: 2 + - uid: 2051 components: - type: Transform pos: -13.5,-2.5 - parent: 407 - - uid: 1696 + parent: 2 + - uid: 2052 components: - type: Transform pos: -9.5,-4.5 - parent: 407 - - uid: 1697 + parent: 2 + - uid: 2053 components: - type: Transform pos: -9.5,-3.5 - parent: 407 - - uid: 1698 + parent: 2 + - uid: 2054 components: - type: Transform pos: -9.5,-2.5 - parent: 407 - - uid: 1848 + parent: 2 + - uid: 2055 components: - type: Transform pos: 6.5,-8.5 - parent: 407 - - uid: 1887 + parent: 2 + - uid: 2056 components: - type: Transform pos: 25.5,-2.5 - parent: 407 + parent: 2 - proto: TableGlass entities: - - uid: 1735 + - uid: 2057 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,-0.5 - parent: 407 - - uid: 1736 + parent: 2 + - uid: 2058 components: - type: Transform rot: 1.5707963267948966 rad pos: 8.5,-0.5 - parent: 407 - - uid: 1748 + parent: 2 + - uid: 2059 components: - type: Transform pos: 4.5,-3.5 - parent: 407 - - uid: 1749 + parent: 2 + - uid: 2060 components: - type: Transform pos: 7.5,-3.5 - parent: 407 - - uid: 1750 + parent: 2 + - uid: 2061 components: - type: Transform pos: 9.5,-3.5 - parent: 407 - - uid: 1751 + parent: 2 + - uid: 2062 components: - type: Transform pos: 6.5,-4.5 - parent: 407 - - uid: 1752 + parent: 2 + - uid: 2063 components: - type: Transform pos: 10.5,-4.5 - parent: 407 - - uid: 1762 + parent: 2 + - uid: 2064 components: - type: Transform rot: 3.141592653589793 rad pos: -5.5,-4.5 - parent: 407 - - uid: 1763 + parent: 2 + - uid: 2065 components: - type: Transform rot: 3.141592653589793 rad pos: -3.5,-3.5 - parent: 407 - - uid: 2200 + parent: 2 + - uid: 2066 components: - type: Transform rot: -1.5707963267948966 rad pos: 3.5,3.5 - parent: 407 - - uid: 2202 + parent: 2 + - uid: 2067 components: - type: Transform rot: -1.5707963267948966 rad pos: 7.5,3.5 - parent: 407 - - uid: 2203 + parent: 2 + - uid: 2068 components: - type: Transform rot: -1.5707963267948966 rad pos: 11.5,3.5 - parent: 407 - - uid: 2219 + parent: 2 + - uid: 2069 components: - type: Transform pos: 8.5,1.5 - parent: 407 + parent: 2 - proto: TableReinforced entities: - - uid: 171 + - uid: 2070 components: - type: Transform pos: -3.5,2.5 - parent: 407 - - uid: 1642 + parent: 2 + - uid: 2071 components: - type: Transform pos: 7.5,-1.5 - parent: 407 - - uid: 1643 + parent: 2 + - uid: 2072 components: - type: Transform pos: 5.5,0.5 - parent: 407 - - uid: 1644 + parent: 2 + - uid: 2073 components: - type: Transform pos: 2.5,6.5 - parent: 407 - - uid: 1645 + parent: 2 + - uid: 2074 components: - type: Transform pos: -4.5,2.5 - parent: 407 - - uid: 1774 + parent: 2 + - uid: 2075 components: - type: Transform rot: 3.141592653589793 rad pos: -9.5,5.5 - parent: 407 - - uid: 1775 + parent: 2 + - uid: 2076 components: - type: Transform rot: 3.141592653589793 rad pos: -8.5,5.5 - parent: 407 - - uid: 1929 + parent: 2 + - uid: 2077 components: - type: Transform pos: 18.5,-2.5 - parent: 407 - - uid: 1930 + parent: 2 + - uid: 2078 components: - type: Transform pos: 19.5,-4.5 - parent: 407 - - uid: 1931 + parent: 2 + - uid: 2079 components: - type: Transform pos: 18.5,-4.5 - parent: 407 - - uid: 1933 + parent: 2 + - uid: 2080 components: - type: Transform pos: 16.5,-4.5 - parent: 407 - - uid: 1966 + parent: 2 + - uid: 2081 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,10.5 - parent: 407 - - uid: 2089 + parent: 2 + - uid: 2082 components: - type: Transform pos: 26.5,2.5 - parent: 407 - - uid: 2090 + parent: 2 + - uid: 2083 components: - type: Transform pos: 25.5,2.5 - parent: 407 - - uid: 2091 + parent: 2 + - uid: 2084 components: - type: Transform pos: 24.5,2.5 - parent: 407 - - uid: 2092 + parent: 2 + - uid: 2085 components: - type: Transform pos: 24.5,1.5 - parent: 407 + parent: 2 - proto: TableWood entities: - - uid: 1646 + - uid: 2086 components: - type: Transform pos: -10.5,2.5 - parent: 407 - - uid: 1647 + parent: 2 + - uid: 2087 components: - type: Transform pos: -9.5,2.5 - parent: 407 - - uid: 1648 + parent: 2 + - uid: 2088 components: - type: Transform pos: -8.5,2.5 - parent: 407 + parent: 2 - proto: TargetStrange entities: - - uid: 1906 + - uid: 2089 components: - type: Transform pos: -20.5,-5.5 - parent: 407 + parent: 2 - proto: TelecomServerFilled entities: - - uid: 2093 + - uid: 2090 components: - type: Transform pos: 26.5,-0.5 - parent: 407 + parent: 2 - proto: Thruster entities: - - uid: 1108 + - uid: 2091 components: - type: Transform rot: -1.5707963267948966 rad pos: 12.5,-8.5 - parent: 407 - - uid: 1109 + parent: 2 + - uid: 2092 components: - type: Transform rot: -1.5707963267948966 rad pos: 12.5,-13.5 - parent: 407 - - uid: 1110 + parent: 2 + - uid: 2093 components: - type: Transform rot: 3.141592653589793 rad pos: 9.5,-17.5 - parent: 407 - - uid: 1111 + parent: 2 + - uid: 2094 components: - type: Transform rot: 3.141592653589793 rad pos: 5.5,-17.5 - parent: 407 - - uid: 1116 + parent: 2 + - uid: 2095 components: - type: Transform rot: 1.5707963267948966 rad pos: -30.5,-2.5 - parent: 407 - - uid: 1117 + parent: 2 + - uid: 2096 components: - type: Transform rot: 1.5707963267948966 rad pos: -31.5,-3.5 - parent: 407 - - uid: 1118 + parent: 2 + - uid: 2097 components: - type: Transform rot: 1.5707963267948966 rad pos: -30.5,3.5 - parent: 407 - - uid: 1119 + parent: 2 + - uid: 2098 components: - type: Transform rot: 1.5707963267948966 rad pos: -31.5,4.5 - parent: 407 - - uid: 1261 + parent: 2 + - uid: 2099 components: - type: Transform rot: -1.5707963267948966 rad pos: 12.5,15.5 - parent: 407 + parent: 2 - proto: ToolboxEmergencyFilled entities: - - uid: 1824 + - uid: 2100 components: - type: Transform pos: -18.58636,2.82432 - parent: 407 - - uid: 2149 + parent: 2 + - uid: 2101 components: - type: Transform pos: 24.518682,1.6764594 - parent: 407 - - uid: 2150 - components: - - type: Transform - pos: 2.4632533,-7.742214 - parent: 407 -- proto: TrashBag - entities: - - uid: 1669 - components: - - type: Transform - pos: -5.342183,-7.4904804 - parent: 407 -- proto: TrashBananaPeel - entities: - - uid: 1666 - components: - - type: Transform - pos: -4.498433,-6.6936054 - parent: 407 -- proto: TwoWayLever - entities: - - uid: 1471 - components: - - type: Transform - pos: 9.5,-7.5 - parent: 407 - - uid: 1472 - components: - - type: Transform - pos: 10.5,-7.5 - parent: 407 - - uid: 1960 - components: - - type: Transform - pos: 2.5,12.5 - parent: 407 -- proto: VendingMachineBooze - entities: - - uid: 1776 - components: - - type: Transform - pos: -7.5,5.5 - parent: 407 -- proto: VendingMachineChefvend - entities: - - uid: 2276 - components: - - type: Transform - pos: 3.5,-7.5 - parent: 407 -- proto: VendingMachineChemicals - entities: - - uid: 1800 - components: - - type: Transform - pos: 10.5,1.5 - parent: 407 -- proto: VendingMachineCigs - entities: - - uid: 1563 - components: - - type: Transform - pos: -3.5,-4.5 - parent: 407 -- proto: VendingMachineCoffee - entities: - - uid: 1566 - components: - - type: Transform - pos: -2.5,-10.5 - parent: 407 -- proto: VendingMachineCondiments - entities: - - uid: 1485 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -3.5,2.5 - parent: 407 -- proto: VendingMachineDinnerware - entities: - - uid: 1654 - components: - - type: Transform - pos: -5.5,5.5 - parent: 407 -- proto: VendingMachineEngivend - entities: - - uid: 1811 - components: - - type: Transform - pos: -18.5,-1.5 - parent: 407 -- proto: VendingMachineGames - entities: - - uid: 1729 - components: - - type: Transform - pos: 0.5,-13.5 - parent: 407 -- proto: VendingMachineJaniDrobe - entities: - - uid: 1658 - components: - - type: Transform - pos: -6.5,-6.5 - parent: 407 -- proto: VendingMachineMedical - entities: - - uid: 1746 - components: - - type: Transform - pos: 2.5,-4.5 - parent: 407 -- proto: VendingMachineSalvage - entities: - - uid: 1497 - components: - - type: Transform - pos: -2.5,14.5 - parent: 407 -- proto: VendingMachineSec - entities: - - uid: 1910 - components: - - type: Transform - pos: 15.5,-2.5 - parent: 407 -- proto: VendingMachineSecDrobe - entities: - - uid: 2112 - components: - - type: Transform - pos: 15.5,-0.5 - parent: 407 -- proto: VendingMachineSeedsUnlocked - entities: - - uid: 1780 - components: - - type: Transform - pos: -13.5,5.5 - parent: 407 -- proto: VendingMachineSnack - entities: - - uid: 240 - components: - - type: Transform - pos: 1.5,3.5 - parent: 407 -- proto: VendingMachineSustenance - entities: - - uid: 1882 - components: - - type: Transform - pos: 19.5,5.5 - parent: 407 -- proto: VendingMachineTankDispenserEngineering - entities: - - uid: 1595 - components: - - type: Transform - pos: -16.5,2.5 - parent: 407 -- proto: VendingMachineTankDispenserEVA - entities: - - uid: 1557 - components: - - type: Transform - pos: 2.5,-13.5 - parent: 407 - - uid: 1788 - components: - - type: Transform - pos: -18.5,3.5 - parent: 407 -- proto: VendingMachineYouTool - entities: - - uid: 1789 - components: - - type: Transform - pos: -18.5,4.5 - parent: 407 -- proto: WallShuttle - entities: - - uid: 2 - components: - - type: Transform - pos: -31.5,-4.5 - parent: 407 - - uid: 3 - components: - - type: Transform - pos: 8.5,-12.5 - parent: 407 - - uid: 4 - components: - - type: Transform - pos: 9.5,-12.5 - parent: 407 - - uid: 5 - components: - - type: Transform - pos: 10.5,-12.5 - parent: 407 - - uid: 6 - components: - - type: Transform - pos: 11.5,-12.5 - parent: 407 - - uid: 7 - components: - - type: Transform - pos: 11.5,-13.5 - parent: 407 - - uid: 8 - components: - - type: Transform - pos: 11.5,-14.5 - parent: 407 - - uid: 9 - components: - - type: Transform - pos: 11.5,-15.5 - parent: 407 - - uid: 10 - components: - - type: Transform - pos: 11.5,-16.5 - parent: 407 - - uid: 11 - components: - - type: Transform - pos: 10.5,-14.5 - parent: 407 - - uid: 12 - components: - - type: Transform - pos: 9.5,-14.5 - parent: 407 - - uid: 13 - components: - - type: Transform - pos: 8.5,-14.5 - parent: 407 - - uid: 14 - components: - - type: Transform - pos: 10.5,-16.5 - parent: 407 - - uid: 15 - components: - - type: Transform - pos: 9.5,-16.5 - parent: 407 - - uid: 16 - components: - - type: Transform - pos: 8.5,-16.5 - parent: 407 - - uid: 17 - components: - - type: Transform - pos: 8.5,-17.5 - parent: 407 - - uid: 19 - components: - - type: Transform - pos: 10.5,-17.5 - parent: 407 - - uid: 20 - components: - - type: Transform - pos: 6.5,-17.5 - parent: 407 - - uid: 21 - components: - - type: Transform - pos: 6.5,-16.5 - parent: 407 - - uid: 22 - components: - - type: Transform - pos: 5.5,-16.5 - parent: 407 - - uid: 23 - components: - - type: Transform - pos: 4.5,-16.5 - parent: 407 - - uid: 24 - components: - - type: Transform - pos: 3.5,-16.5 - parent: 407 - - uid: 25 - components: - - type: Transform - pos: 4.5,-17.5 - parent: 407 - - uid: 26 - components: - - type: Transform - pos: 12.5,-14.5 - parent: 407 - - uid: 27 - components: - - type: Transform - pos: 12.5,-12.5 - parent: 407 - - uid: 28 - components: - - type: Transform - pos: 12.5,-9.5 - parent: 407 - - uid: 31 - components: - - type: Transform - pos: 11.5,-9.5 - parent: 407 - - uid: 32 - components: - - type: Transform - pos: 10.5,-9.5 - parent: 407 - - uid: 33 - components: - - type: Transform - pos: 9.5,-9.5 - parent: 407 - - uid: 34 - components: - - type: Transform - pos: 8.5,-9.5 - parent: 407 - - uid: 35 - components: - - type: Transform - pos: 7.5,-9.5 - parent: 407 - - uid: 36 - components: - - type: Transform - pos: 6.5,-9.5 - parent: 407 - - uid: 37 - components: - - type: Transform - pos: 5.5,-9.5 - parent: 407 - - uid: 38 - components: - - type: Transform - pos: 4.5,-9.5 - parent: 407 - - uid: 39 - components: - - type: Transform - pos: 3.5,-9.5 - parent: 407 - - uid: 40 - components: - - type: Transform - pos: 3.5,-10.5 - parent: 407 - - uid: 41 - components: - - type: Transform - pos: 3.5,-11.5 - parent: 407 - - uid: 42 - components: - - type: Transform - pos: 1.5,-11.5 - parent: 407 - - uid: 43 - components: - - type: Transform - pos: 1.5,-10.5 - parent: 407 - - uid: 44 - components: - - type: Transform - pos: 1.5,-9.5 - parent: 407 - - uid: 45 - components: - - type: Transform - pos: 2.5,-10.5 - parent: 407 - - uid: 46 - components: - - type: Transform - pos: 1.5,-13.5 - parent: 407 - - uid: 47 - components: - - type: Transform - pos: 1.5,-14.5 - parent: 407 - - uid: 48 - components: - - type: Transform - pos: 2.5,-14.5 - parent: 407 - - uid: 52 - components: - - type: Transform - pos: 11.5,-8.5 - parent: 407 - - uid: 53 - components: - - type: Transform - pos: 11.5,-7.5 - parent: 407 - - uid: 54 - components: - - type: Transform - pos: 12.5,-7.5 - parent: 407 - - uid: 56 - components: - - type: Transform - pos: 1.5,-5.5 - parent: 407 - - uid: 57 - components: - - type: Transform - pos: 2.5,-5.5 - parent: 407 - - uid: 58 - components: - - type: Transform - pos: 4.5,-5.5 - parent: 407 - - uid: 59 - components: - - type: Transform - pos: 5.5,-5.5 - parent: 407 - - uid: 60 - components: - - type: Transform - pos: 6.5,-5.5 - parent: 407 - - uid: 61 - components: - - type: Transform - pos: 7.5,-5.5 - parent: 407 - - uid: 62 - components: - - type: Transform - pos: 8.5,-5.5 - parent: 407 - - uid: 63 - components: - - type: Transform - pos: 9.5,-5.5 - parent: 407 - - uid: 64 - components: - - type: Transform - pos: 10.5,-5.5 - parent: 407 - - uid: 65 - components: - - type: Transform - pos: 11.5,-5.5 - parent: 407 - - uid: 66 - components: - - type: Transform - pos: 12.5,-5.5 - parent: 407 - - uid: 67 - components: - - type: Transform - pos: 1.5,-8.5 - parent: 407 - - uid: 68 - components: - - type: Transform - pos: 1.5,-7.5 - parent: 407 - - uid: 69 - components: - - type: Transform - pos: 3.5,-8.5 - parent: 407 - - uid: 75 - components: - - type: Transform - pos: -2.5,-12.5 - parent: 407 - - uid: 76 - components: - - type: Transform - pos: -2.5,-11.5 - parent: 407 - - uid: 77 - components: - - type: Transform - pos: -3.5,-11.5 - parent: 407 - - uid: 78 - components: - - type: Transform - pos: -3.5,-10.5 - parent: 407 - - uid: 79 - components: - - type: Transform - pos: -3.5,-9.5 - parent: 407 - - uid: 80 - components: - - type: Transform - pos: -2.5,-9.5 - parent: 407 - - uid: 81 - components: - - type: Transform - pos: -2.5,-8.5 - parent: 407 - - uid: 82 - components: - - type: Transform - pos: -2.5,-6.5 - parent: 407 - - uid: 83 - components: - - type: Transform - pos: -2.5,-5.5 - parent: 407 - - uid: 84 - components: - - type: Transform - pos: -3.5,-5.5 - parent: 407 - - uid: 85 - components: - - type: Transform - pos: -4.5,-5.5 - parent: 407 - - uid: 86 - components: - - type: Transform - pos: -5.5,-5.5 - parent: 407 - - uid: 87 - components: - - type: Transform - pos: -6.5,-5.5 - parent: 407 - - uid: 88 - components: - - type: Transform - pos: -7.5,-5.5 - parent: 407 - - uid: 89 - components: - - type: Transform - pos: -7.5,-6.5 - parent: 407 - - uid: 90 - components: - - type: Transform - pos: -7.5,-7.5 - parent: 407 - - uid: 96 - components: - - type: Transform - pos: -11.5,-5.5 - parent: 407 - - uid: 97 - components: - - type: Transform - pos: -15.5,-5.5 - parent: 407 - - uid: 98 - components: - - type: Transform - pos: -16.5,-5.5 - parent: 407 - - uid: 99 - components: - - type: Transform - pos: -17.5,-5.5 - parent: 407 - - uid: 100 - components: - - type: Transform - pos: -18.5,-5.5 - parent: 407 - - uid: 101 - components: - - type: Transform - pos: -19.5,-5.5 - parent: 407 - - uid: 102 - components: - - type: Transform - pos: -15.5,-4.5 - parent: 407 - - uid: 103 - components: - - type: Transform - pos: -15.5,-3.5 - parent: 407 - - uid: 104 - components: - - type: Transform - pos: -15.5,-2.5 - parent: 407 - - uid: 105 - components: - - type: Transform - pos: -15.5,-1.5 - parent: 407 - - uid: 106 - components: - - type: Transform - pos: -15.5,-0.5 - parent: 407 - - uid: 107 - components: - - type: Transform - pos: -15.5,1.5 - parent: 407 - - uid: 108 - components: - - type: Transform - pos: -15.5,2.5 - parent: 407 - - uid: 109 - components: - - type: Transform - pos: -15.5,3.5 - parent: 407 - - uid: 110 - components: - - type: Transform - pos: -15.5,4.5 - parent: 407 - - uid: 111 - components: - - type: Transform - pos: -15.5,5.5 - parent: 407 - - uid: 112 - components: - - type: Transform - pos: -15.5,6.5 - parent: 407 - - uid: 113 - components: - - type: Transform - pos: -15.5,7.5 - parent: 407 - - uid: 114 - components: - - type: Transform - pos: -19.5,2.5 - parent: 407 - - uid: 116 - components: - - type: Transform - pos: -19.5,4.5 - parent: 407 - - uid: 117 - components: - - type: Transform - pos: -19.5,5.5 - parent: 407 - - uid: 118 - components: - - type: Transform - pos: -19.5,-1.5 - parent: 407 - - uid: 119 - components: - - type: Transform - pos: -19.5,-2.5 - parent: 407 - - uid: 120 - components: - - type: Transform - pos: -18.5,5.5 - parent: 407 - - uid: 121 - components: - - type: Transform - pos: -19.5,-4.5 - parent: 407 - - uid: 122 - components: - - type: Transform - pos: -20.5,-4.5 - parent: 407 - - uid: 123 - components: - - type: Transform - pos: -20.5,-3.5 - parent: 407 - - uid: 124 - components: - - type: Transform - pos: -21.5,-3.5 - parent: 407 - - uid: 125 - components: - - type: Transform - pos: -22.5,-3.5 - parent: 407 - - uid: 126 - components: - - type: Transform - pos: -23.5,-3.5 - parent: 407 - - uid: 127 - components: - - type: Transform - pos: -23.5,-2.5 - parent: 407 - - uid: 128 - components: - - type: Transform - pos: -24.5,-2.5 - parent: 407 - - uid: 129 - components: - - type: Transform - pos: -23.5,3.5 - parent: 407 - - uid: 130 - components: - - type: Transform - pos: -24.5,3.5 - parent: 407 - - uid: 131 - components: - - type: Transform - pos: -23.5,4.5 - parent: 407 - - uid: 132 - components: - - type: Transform - pos: -22.5,4.5 - parent: 407 - - uid: 133 - components: - - type: Transform - pos: -21.5,4.5 - parent: 407 - - uid: 134 - components: - - type: Transform - pos: -20.5,4.5 - parent: 407 - - uid: 135 - components: - - type: Transform - pos: -20.5,5.5 - parent: 407 - - uid: 136 - components: - - type: Transform - pos: -18.5,6.5 - parent: 407 - - uid: 137 - components: - - type: Transform - pos: -18.5,7.5 - parent: 407 - - uid: 140 - components: - - type: Transform - pos: -30.5,-4.5 - parent: 407 - - uid: 141 - components: - - type: Transform - pos: -30.5,-3.5 - parent: 407 - - uid: 142 - components: - - type: Transform - pos: -29.5,-3.5 - parent: 407 - - uid: 143 - components: - - type: Transform - pos: -31.5,-1.5 - parent: 407 - - uid: 144 - components: - - type: Transform - pos: -29.5,-2.5 - parent: 407 - - uid: 145 - components: - - type: Transform - pos: -28.5,-2.5 - parent: 407 - - uid: 146 - components: - - type: Transform - pos: -29.5,-1.5 - parent: 407 - - uid: 147 - components: - - type: Transform - pos: -29.5,2.5 - parent: 407 - - uid: 148 - components: - - type: Transform - pos: -29.5,3.5 - parent: 407 - - uid: 149 - components: - - type: Transform - pos: -28.5,3.5 - parent: 407 - - uid: 150 - components: - - type: Transform - pos: -29.5,4.5 - parent: 407 - - uid: 151 - components: - - type: Transform - pos: -31.5,2.5 - parent: 407 - - uid: 152 - components: - - type: Transform - pos: -30.5,4.5 - parent: 407 - - uid: 153 - components: - - type: Transform - pos: -30.5,5.5 - parent: 407 - - uid: 154 - components: - - type: Transform - pos: -31.5,5.5 - parent: 407 - - uid: 157 - components: - - type: Transform - pos: -12.5,2.5 - parent: 407 - - uid: 158 - components: - - type: Transform - pos: -13.5,2.5 - parent: 407 - - uid: 159 - components: - - type: Transform - pos: -11.5,2.5 - parent: 407 - - uid: 160 - components: - - type: Transform - pos: -11.5,3.5 - parent: 407 - - uid: 161 - components: - - type: Transform - pos: -11.5,5.5 - parent: 407 - - uid: 162 - components: - - type: Transform - pos: -11.5,6.5 - parent: 407 - - uid: 163 - components: - - type: Transform - pos: -12.5,6.5 - parent: 407 - - uid: 164 - components: - - type: Transform - pos: -14.5,6.5 - parent: 407 - - uid: 165 - components: - - type: Transform - pos: -10.5,6.5 - parent: 407 - - uid: 166 - components: - - type: Transform - pos: -7.5,6.5 - parent: 407 - - uid: 167 - components: - - type: Transform - pos: -6.5,6.5 - parent: 407 - - uid: 168 - components: - - type: Transform - pos: -6.5,5.5 - parent: 407 - - uid: 169 - components: - - type: Transform - pos: -5.5,2.5 - parent: 407 - - uid: 170 - components: - - type: Transform - pos: -6.5,2.5 - parent: 407 - - uid: 172 - components: - - type: Transform - pos: -2.5,2.5 - parent: 407 - - uid: 173 - components: - - type: Transform - pos: -2.5,3.5 - parent: 407 - - uid: 174 - components: - - type: Transform - pos: -2.5,4.5 - parent: 407 - - uid: 175 - components: - - type: Transform - pos: -2.5,5.5 - parent: 407 - - uid: 176 - components: - - type: Transform - pos: -2.5,6.5 - parent: 407 - - uid: 177 - components: - - type: Transform - pos: -3.5,6.5 - parent: 407 - - uid: 178 - components: - - type: Transform - pos: -4.5,6.5 - parent: 407 - - uid: 179 - components: - - type: Transform - pos: -5.5,6.5 - parent: 407 - - uid: 189 - components: - - type: Transform - pos: -2.5,-4.5 - parent: 407 - - uid: 190 - components: - - type: Transform - pos: -2.5,-3.5 - parent: 407 - - uid: 191 - components: - - type: Transform - pos: -2.5,-2.5 - parent: 407 - - uid: 192 - components: - - type: Transform - pos: -2.5,-1.5 - parent: 407 - - uid: 193 - components: - - type: Transform - pos: -7.5,7.5 - parent: 407 - - uid: 194 - components: - - type: Transform - pos: -7.5,8.5 - parent: 407 - - uid: 195 - components: - - type: Transform - pos: -6.5,8.5 - parent: 407 - - uid: 196 - components: - - type: Transform - pos: -6.5,9.5 - parent: 407 - - uid: 197 - components: - - type: Transform - pos: -5.5,9.5 - parent: 407 - - uid: 199 - components: - - type: Transform - pos: -3.5,12.5 - parent: 407 - - uid: 200 - components: - - type: Transform - pos: -3.5,14.5 - parent: 407 - - uid: 201 - components: - - type: Transform - pos: -2.5,13.5 - parent: 407 - - uid: 202 - components: - - type: Transform - pos: -1.5,13.5 - parent: 407 - - uid: 204 - components: - - type: Transform - pos: -0.5,6.5 - parent: 407 - - uid: 207 - components: - - type: Transform - pos: -0.5,9.5 - parent: 407 - - uid: 208 - components: - - type: Transform - pos: -0.5,12.5 - parent: 407 - - uid: 209 - components: - - type: Transform - pos: -0.5,13.5 - parent: 407 - - uid: 210 - components: - - type: Transform - pos: -0.5,14.5 - parent: 407 - - uid: 217 - components: - - type: Transform - pos: 3.5,14.5 - parent: 407 - - uid: 218 - components: - - type: Transform - pos: 3.5,15.5 - parent: 407 - - uid: 219 - components: - - type: Transform - pos: 3.5,16.5 - parent: 407 - - uid: 220 - components: - - type: Transform - pos: 3.5,17.5 - parent: 407 - - uid: 221 - components: - - type: Transform - pos: 4.5,17.5 - parent: 407 - - uid: 230 - components: - - type: Transform - pos: 9.5,17.5 - parent: 407 - - uid: 231 - components: - - type: Transform - pos: 10.5,17.5 - parent: 407 - - uid: 233 - components: - - type: Transform - pos: 11.5,17.5 - parent: 407 - - uid: 244 - components: - - type: Transform - pos: 4.5,6.5 - parent: 407 - - uid: 245 - components: - - type: Transform - pos: 4.5,7.5 - parent: 407 - - uid: 246 - components: - - type: Transform - pos: 4.5,8.5 - parent: 407 - - uid: 247 - components: - - type: Transform - pos: 4.5,9.5 - parent: 407 - - uid: 248 - components: - - type: Transform - pos: 4.5,10.5 - parent: 407 - - uid: 249 - components: - - type: Transform - pos: 4.5,11.5 - parent: 407 - - uid: 250 - components: - - type: Transform - pos: 4.5,12.5 - parent: 407 - - uid: 252 - components: - - type: Transform - pos: 4.5,14.5 - parent: 407 - - uid: 253 - components: - - type: Transform - pos: -3.5,17.5 - parent: 407 - - uid: 254 - components: - - type: Transform - pos: -3.5,15.5 - parent: 407 - - uid: 257 - components: - - type: Transform - pos: 11.5,14.5 - parent: 407 - - uid: 258 - components: - - type: Transform - pos: 11.5,15.5 - parent: 407 - - uid: 260 - components: - - type: Transform - pos: 11.5,16.5 - parent: 407 - - uid: 262 - components: - - type: Transform - pos: -3.5,13.5 - parent: 407 - - uid: 263 - components: - - type: Transform - pos: 11.5,9.5 - parent: 407 - - uid: 264 - components: - - type: Transform - pos: 11.5,8.5 - parent: 407 - - uid: 265 - components: - - type: Transform - pos: 12.5,8.5 - parent: 407 - - uid: 266 - components: - - type: Transform - pos: 12.5,7.5 - parent: 407 - - uid: 267 - components: - - type: Transform - pos: 12.5,6.5 - parent: 407 - - uid: 268 - components: - - type: Transform - pos: 11.5,6.5 - parent: 407 - - uid: 269 - components: - - type: Transform - pos: 10.5,6.5 - parent: 407 - - uid: 270 - components: - - type: Transform - pos: 9.5,6.5 - parent: 407 - - uid: 271 - components: - - type: Transform - pos: 5.5,6.5 - parent: 407 - - uid: 286 - components: - - type: Transform - pos: 14.5,-5.5 - parent: 407 - - uid: 287 - components: - - type: Transform - pos: 13.5,-5.5 - parent: 407 - - uid: 288 - components: - - type: Transform - pos: 13.5,-4.5 - parent: 407 - - uid: 289 - components: - - type: Transform - pos: 13.5,-3.5 - parent: 407 - - uid: 290 - components: - - type: Transform - pos: 13.5,-2.5 - parent: 407 - - uid: 291 - components: - - type: Transform - pos: 13.5,-1.5 - parent: 407 - - uid: 292 - components: - - type: Transform - pos: 14.5,-1.5 - parent: 407 - - uid: 293 - components: - - type: Transform - pos: 15.5,-1.5 - parent: 407 - - uid: 294 - components: - - type: Transform - pos: 18.5,-1.5 - parent: 407 - - uid: 295 - components: - - type: Transform - pos: 19.5,-1.5 - parent: 407 - - uid: 296 - components: - - type: Transform - pos: 20.5,-1.5 - parent: 407 - - uid: 297 - components: - - type: Transform - pos: 20.5,-2.5 - parent: 407 - - uid: 298 - components: - - type: Transform - pos: 20.5,-3.5 - parent: 407 - - uid: 299 - components: - - type: Transform - pos: 20.5,-4.5 - parent: 407 - - uid: 300 - components: - - type: Transform - pos: 20.5,-5.5 - parent: 407 - - uid: 301 - components: - - type: Transform - pos: 19.5,-5.5 - parent: 407 - - uid: 302 - components: - - type: Transform - pos: 23.5,-4.5 - parent: 407 - - uid: 303 - components: - - type: Transform - pos: 22.5,-4.5 - parent: 407 - - uid: 304 - components: - - type: Transform - pos: 21.5,-4.5 - parent: 407 - - uid: 305 - components: - - type: Transform - pos: 21.5,-1.5 - parent: 407 - - uid: 306 - components: - - type: Transform - pos: 23.5,-1.5 - parent: 407 - - uid: 307 - components: - - type: Transform - pos: 24.5,-1.5 - parent: 407 - - uid: 308 - components: - - type: Transform - pos: 25.5,-1.5 - parent: 407 - - uid: 309 - components: - - type: Transform - pos: 26.5,-1.5 - parent: 407 - - uid: 310 - components: - - type: Transform - pos: 27.5,-1.5 - parent: 407 - - uid: 311 - components: - - type: Transform - pos: 17.5,6.5 - parent: 407 - - uid: 312 - components: - - type: Transform - pos: 17.5,2.5 - parent: 407 - - uid: 313 - components: - - type: Transform - pos: 17.5,5.5 - parent: 407 - - uid: 314 - components: - - type: Transform - pos: 17.5,3.5 - parent: 407 - - uid: 315 - components: - - type: Transform - pos: 17.5,4.5 - parent: 407 - - uid: 316 - components: - - type: Transform - pos: 18.5,6.5 - parent: 407 - - uid: 317 - components: - - type: Transform - pos: 20.5,6.5 - parent: 407 - - uid: 318 - components: - - type: Transform - pos: 20.5,5.5 - parent: 407 - - uid: 319 - components: - - type: Transform - pos: 20.5,4.5 - parent: 407 - - uid: 320 - components: - - type: Transform - pos: 20.5,3.5 - parent: 407 - - uid: 321 - components: - - type: Transform - pos: 20.5,2.5 - parent: 407 - - uid: 322 - components: - - type: Transform - pos: 21.5,5.5 - parent: 407 - - uid: 323 - components: - - type: Transform - pos: 22.5,5.5 - parent: 407 - - uid: 324 - components: - - type: Transform - pos: 23.5,5.5 - parent: 407 - - uid: 336 - components: - - type: Transform - pos: 13.5,6.5 - parent: 407 - - uid: 337 - components: - - type: Transform - pos: 13.5,2.5 - parent: 407 - - uid: 338 - components: - - type: Transform - pos: 12.5,2.5 - parent: 407 - - uid: 339 - components: - - type: Transform - pos: 11.5,2.5 - parent: 407 - - uid: 340 - components: - - type: Transform - pos: 10.5,2.5 - parent: 407 - - uid: 341 - components: - - type: Transform - pos: 9.5,2.5 - parent: 407 - - uid: 342 - components: - - type: Transform - pos: 8.5,2.5 - parent: 407 - - uid: 343 - components: - - type: Transform - pos: 7.5,2.5 - parent: 407 - - uid: 344 - components: - - type: Transform - pos: 6.5,2.5 - parent: 407 - - uid: 345 - components: - - type: Transform - pos: 5.5,2.5 - parent: 407 - - uid: 346 - components: - - type: Transform - pos: 4.5,2.5 - parent: 407 - - uid: 348 - components: - - type: Transform - pos: 2.5,2.5 - parent: 407 - - uid: 349 - components: - - type: Transform - pos: 1.5,2.5 - parent: 407 - - uid: 350 - components: - - type: Transform - pos: 9.5,1.5 - parent: 407 - - uid: 351 - components: - - type: Transform - pos: 9.5,-0.5 - parent: 407 - - uid: 352 - components: - - type: Transform - pos: 9.5,-1.5 - parent: 407 - - uid: 353 - components: - - type: Transform - pos: 5.5,-1.5 - parent: 407 - - uid: 354 - components: - - type: Transform - pos: 5.5,-0.5 - parent: 407 - - uid: 355 - components: - - type: Transform - pos: 5.5,1.5 - parent: 407 - - uid: 356 - components: - - type: Transform - pos: 1.5,-1.5 - parent: 407 - - uid: 385 - components: - - type: Transform - pos: -3.5,16.5 - parent: 407 - - uid: 393 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -7.5,-1.5 - parent: 407 - - uid: 394 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -11.5,-1.5 - parent: 407 - - uid: 1034 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 12.5,14.5 - parent: 407 - - uid: 1115 - components: - - type: Transform - pos: 5.5,17.5 - parent: 407 - - uid: 1389 - components: - - type: Transform - pos: 12.5,9.5 - parent: 407 - - uid: 1390 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 13.5,14.5 - parent: 407 - - uid: 1391 - components: - - type: Transform - pos: 13.5,9.5 - parent: 407 - - uid: 1392 - components: - - type: Transform - pos: 13.5,13.5 - parent: 407 - - uid: 1393 - components: - - type: Transform - pos: 1.5,17.5 - parent: 407 - - uid: 2211 - components: - - type: Transform - pos: -5.5,11.5 - parent: 407 -- proto: WallShuttleDiagonal - entities: - - uid: 382 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 12.5,-15.5 - parent: 407 - - uid: 383 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 11.5,-17.5 - parent: 407 - - uid: 384 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 3.5,-17.5 - parent: 407 - - uid: 387 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 12.5,16.5 - parent: 407 -- proto: WallWeaponCapacitorRecharger - entities: - - uid: 1342 - components: - - type: Transform - pos: 18.5,-1.5 - parent: 407 -- proto: WarningN2 - entities: - - uid: 1259 - components: - - type: Transform - pos: 8.5,-14.5 - parent: 407 -- proto: WarningO2 - entities: - - uid: 1258 - components: - - type: Transform - pos: 8.5,-12.5 - parent: 407 -- proto: WaterTankHighCapacity - entities: - - uid: 1782 - components: - - type: Transform - pos: -14.5,5.5 - parent: 407 -- proto: WeaponCapacitorRecharger - entities: - - uid: 1934 - components: - - type: Transform - pos: 18.5,-2.5 - parent: 407 - - uid: 2146 - components: - - type: Transform - pos: 25.5,2.5 - parent: 407 -- proto: WeaponPistolCHIMP - entities: - - uid: 2275 - components: - - type: Transform - pos: -4.330495,7.357918 - parent: 407 -- proto: WelderIndustrialAdvanced - entities: - - uid: 1556 - components: - - type: Transform - pos: 4.4984074,-10.399791 - parent: 407 -- proto: WeldingFuelTankFull - entities: - - uid: 1801 - components: - - type: Transform - pos: -20.5,-2.5 - parent: 407 -- proto: Windoor - entities: - - uid: 1715 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -13.5,-1.5 - parent: 407 - - uid: 1716 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -9.5,-1.5 - parent: 407 -- proto: WindoorBarKitchenLocked - entities: - - uid: 1653 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -4.5,2.5 - parent: 407 -- proto: WindoorCargoLocked - entities: - - uid: 2087 - components: - - type: Transform - pos: 3.5,7.5 - parent: 407 -- proto: WindoorSecure - entities: - - uid: 1239 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 9.5,-6.5 - parent: 407 -- proto: WindoorSecureCargoLocked - entities: - - uid: 1195 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 3.5,13.5 - parent: 407 - - uid: 1968 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,10.5 - parent: 407 - - uid: 1991 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,7.5 - parent: 407 - - uid: 1994 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,6.5 - parent: 407 - - uid: 2010 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,11.5 - parent: 407 - - uid: 2265 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -0.5,8.5 - parent: 407 -- proto: WindoorSecureChemistryLocked - entities: - - uid: 1730 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 5.5,0.5 - parent: 407 - - uid: 1731 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 7.5,-1.5 - parent: 407 -- proto: WindoorSecureCommandLocked - entities: + parent: 2 - uid: 2102 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 24.5,0.5 - parent: 407 -- proto: WindoorSecureEngineeringLocked + pos: 2.4632533,-7.742214 + parent: 2 +- proto: TrashBag entities: - - uid: 1787 + - uid: 2103 components: - type: Transform - rot: 3.141592653589793 rad - pos: -17.5,-1.5 - parent: 407 - - uid: 1790 - components: - - type: Transform - pos: -17.5,3.5 - parent: 407 - - uid: 1855 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 2.5,-8.5 - parent: 407 - - uid: 2021 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 10.5,7.5 - parent: 407 - - uid: 2165 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 21.5,3.5 - parent: 407 -- proto: WindoorSecureMedicalLocked + pos: -5.342183,-7.4904804 + parent: 2 +- proto: TrashBananaPeel entities: - - uid: 1923 + - uid: 2104 components: - type: Transform - rot: 3.141592653589793 rad - pos: 5.5,-3.5 - parent: 407 - - uid: 1924 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 8.5,-3.5 - parent: 407 - - uid: 1925 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 11.5,-3.5 - parent: 407 -- proto: WindoorSecureScienceLocked + pos: -4.498433,-6.6936054 + parent: 2 +- proto: TwoWayLever entities: - - uid: 1903 + - uid: 2105 components: - type: Transform - pos: -4.5,9.5 - parent: 407 - - uid: 1969 + pos: 9.5,-7.5 + parent: 2 + - type: DeviceLinkSource + linkedPorts: + 956: + - Right: Forward + - Left: Reverse + - Middle: Off + 957: + - Left: Reverse + - Right: Forward + - Middle: Off + - uid: 2106 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,10.5 - parent: 407 - - uid: 1990 + pos: 10.5,-7.5 + parent: 2 + - type: DeviceLinkSource + linkedPorts: + 1823: + - Left: Reverse + - Right: Forward + - Middle: Off + - uid: 2107 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,7.5 - parent: 407 - - uid: 2011 + pos: 2.5,12.5 + parent: 2 + - type: DeviceLinkSource + linkedPorts: + 958: + - Middle: Off + - Right: Forward + - Left: Reverse + 959: + - Left: Reverse + - Right: Forward + - Middle: Off + 960: + - Left: Reverse + - Right: Forward + - Middle: Off + 961: + - Left: Reverse + - Right: Forward + - Middle: Off + 962: + - Left: Reverse + - Right: Forward + - Middle: Off +- proto: VendingMachineBooze + entities: + - uid: 2108 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,11.5 - parent: 407 - - uid: 2264 + pos: -7.5,5.5 + parent: 2 +- proto: VendingMachineChefvend + entities: + - uid: 2109 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -0.5,8.5 - parent: 407 -- proto: WindoorServiceLocked + pos: 3.5,-7.5 + parent: 2 +- proto: VendingMachineChemicals entities: - uid: 2110 components: - type: Transform - pos: -10.5,2.5 - parent: 407 + pos: 10.5,1.5 + parent: 2 +- proto: VendingMachineCigs + entities: + - uid: 2111 + components: + - type: Transform + pos: -3.5,-4.5 + parent: 2 +- proto: VendingMachineClothing + entities: + - uid: 2112 + components: + - type: Transform + pos: 5.5,7.5 + parent: 2 +- proto: VendingMachineCoffee + entities: + - uid: 2113 + components: + - type: Transform + pos: -2.5,-10.5 + parent: 2 +- proto: VendingMachineCondiments + entities: - uid: 2114 - components: - - type: Transform - pos: -9.5,2.5 - parent: 407 - - uid: 2115 - components: - - type: Transform - pos: -8.5,2.5 - parent: 407 -- proto: WindowFrostedDirectional - entities: - - uid: 1614 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 4.5,-3.5 - parent: 407 - - uid: 1615 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 4.5,-4.5 - parent: 407 - - uid: 1616 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 6.5,-3.5 - parent: 407 - - uid: 1617 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 6.5,-3.5 - parent: 407 - - uid: 1618 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 6.5,-4.5 - parent: 407 - - uid: 1619 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 7.5,-3.5 - parent: 407 - - uid: 1620 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 9.5,-3.5 - parent: 407 - - uid: 1621 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 10.5,-3.5 - parent: 407 - - uid: 1622 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 12.5,-3.5 - parent: 407 - - uid: 1623 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 10.5,-4.5 - parent: 407 - - uid: 1624 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 10.5,-3.5 - parent: 407 -- proto: WindowReinforcedDirectional - entities: - - uid: 1236 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 10.5,-7.5 - parent: 407 - - uid: 1237 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 9.5,-7.5 - parent: 407 - - uid: 1596 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -18.5,-1.5 - parent: 407 - - uid: 1597 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -16.5,-1.5 - parent: 407 - - uid: 1598 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -8.5,-1.5 - parent: 407 - - uid: 1599 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -10.5,-1.5 - parent: 407 - - uid: 1600 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -12.5,-1.5 - parent: 407 - - uid: 1601 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -14.5,-1.5 - parent: 407 - - uid: 1602 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -7.5,-4.5 - parent: 407 - - uid: 1603 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -7.5,-3.5 - parent: 407 - - uid: 1604 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -7.5,-2.5 - parent: 407 - - uid: 1605 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -7.5,-4.5 - parent: 407 - - uid: 1606 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -7.5,-3.5 - parent: 407 - - uid: 1607 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -7.5,-2.5 - parent: 407 - - uid: 1608 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,-4.5 - parent: 407 - - uid: 1609 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,-3.5 - parent: 407 - - uid: 1610 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -11.5,-2.5 - parent: 407 - - uid: 1611 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -11.5,-2.5 - parent: 407 - - uid: 1612 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -11.5,-3.5 - parent: 407 - - uid: 1613 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -11.5,-4.5 - parent: 407 - - uid: 1649 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -8.5,2.5 - parent: 407 - - uid: 1805 - components: - - type: Transform - pos: -16.5,3.5 - parent: 407 - - uid: 1918 components: - type: Transform rot: 3.141592653589793 rad pos: -3.5,2.5 - parent: 407 - - uid: 1932 + parent: 2 +- proto: VendingMachineDinnerware + entities: + - uid: 2115 + components: + - type: Transform + pos: -5.5,5.5 + parent: 2 +- proto: VendingMachineEngivend + entities: + - uid: 2116 + components: + - type: Transform + pos: -18.5,-1.5 + parent: 2 +- proto: VendingMachineGames + entities: + - uid: 2117 + components: + - type: Transform + pos: 0.5,-13.5 + parent: 2 +- proto: VendingMachineJaniDrobe + entities: + - uid: 2118 + components: + - type: Transform + pos: -6.5,-6.5 + parent: 2 +- proto: VendingMachineMedical + entities: + - uid: 2119 + components: + - type: Transform + pos: 2.5,-4.5 + parent: 2 +- proto: VendingMachineNutri + entities: + - uid: 2120 + components: + - type: Transform + pos: -13.5,6.5 + parent: 2 +- proto: VendingMachineSalvage + entities: + - uid: 2121 + components: + - type: Transform + pos: -2.5,14.5 + parent: 2 +- proto: VendingMachineSec + entities: + - uid: 2122 + components: + - type: Transform + pos: 15.5,-2.5 + parent: 2 +- proto: VendingMachineSecDrobe + entities: + - uid: 2123 + components: + - type: Transform + pos: 15.5,-0.5 + parent: 2 +- proto: VendingMachineSeeds + entities: + - uid: 2124 + components: + - type: Transform + pos: -14.5,6.5 + parent: 2 +- proto: VendingMachineSnack + entities: + - uid: 2125 + components: + - type: Transform + pos: 1.5,3.5 + parent: 2 +- proto: VendingMachineSustenance + entities: + - uid: 2126 + components: + - type: Transform + pos: 19.5,5.5 + parent: 2 +- proto: VendingMachineTankDispenserEngineering + entities: + - uid: 2127 + components: + - type: Transform + pos: -16.5,2.5 + parent: 2 +- proto: VendingMachineTankDispenserEVA + entities: + - uid: 2128 + components: + - type: Transform + pos: 2.5,-13.5 + parent: 2 + - uid: 2129 components: - type: Transform pos: -18.5,3.5 - parent: 407 - - uid: 2096 + parent: 2 + - uid: 2130 + components: + - type: Transform + pos: -1.5,16.5 + parent: 2 +- proto: VendingMachineTheater + entities: + - uid: 2131 + components: + - type: Transform + pos: 5.5,8.5 + parent: 2 +- proto: VendingMachineWinter + entities: + - uid: 2132 + components: + - type: Transform + pos: 5.5,9.5 + parent: 2 +- proto: VendingMachineYouTool + entities: + - uid: 2133 + components: + - type: Transform + pos: -18.5,4.5 + parent: 2 +- proto: WallShuttle + entities: + - uid: 2134 + components: + - type: Transform + pos: -11.5,7.5 + parent: 2 + - uid: 2135 + components: + - type: Transform + pos: -31.5,-4.5 + parent: 2 + - uid: 2136 + components: + - type: Transform + pos: 8.5,-12.5 + parent: 2 + - uid: 2137 + components: + - type: Transform + pos: 9.5,-12.5 + parent: 2 + - uid: 2138 + components: + - type: Transform + pos: 10.5,-12.5 + parent: 2 + - uid: 2139 + components: + - type: Transform + pos: 11.5,-12.5 + parent: 2 + - uid: 2140 + components: + - type: Transform + pos: 11.5,-13.5 + parent: 2 + - uid: 2141 + components: + - type: Transform + pos: 11.5,-14.5 + parent: 2 + - uid: 2142 + components: + - type: Transform + pos: 11.5,-15.5 + parent: 2 + - uid: 2143 + components: + - type: Transform + pos: 11.5,-16.5 + parent: 2 + - uid: 2144 + components: + - type: Transform + pos: 10.5,-14.5 + parent: 2 + - uid: 2145 + components: + - type: Transform + pos: 9.5,-14.5 + parent: 2 + - uid: 2146 + components: + - type: Transform + pos: 8.5,-14.5 + parent: 2 + - uid: 2147 + components: + - type: Transform + pos: 10.5,-16.5 + parent: 2 + - uid: 2148 + components: + - type: Transform + pos: 9.5,-16.5 + parent: 2 + - uid: 2149 + components: + - type: Transform + pos: 8.5,-16.5 + parent: 2 + - uid: 2150 + components: + - type: Transform + pos: 8.5,-17.5 + parent: 2 + - uid: 2151 + components: + - type: Transform + pos: 10.5,-17.5 + parent: 2 + - uid: 2152 + components: + - type: Transform + pos: 6.5,-17.5 + parent: 2 + - uid: 2153 + components: + - type: Transform + pos: 6.5,-16.5 + parent: 2 + - uid: 2154 + components: + - type: Transform + pos: 5.5,-16.5 + parent: 2 + - uid: 2155 + components: + - type: Transform + pos: 4.5,-16.5 + parent: 2 + - uid: 2156 + components: + - type: Transform + pos: 3.5,-16.5 + parent: 2 + - uid: 2157 + components: + - type: Transform + pos: 4.5,-17.5 + parent: 2 + - uid: 2158 + components: + - type: Transform + pos: 12.5,-14.5 + parent: 2 + - uid: 2159 + components: + - type: Transform + pos: 12.5,-12.5 + parent: 2 + - uid: 2160 + components: + - type: Transform + pos: 12.5,-9.5 + parent: 2 + - uid: 2161 + components: + - type: Transform + pos: 11.5,-9.5 + parent: 2 + - uid: 2162 + components: + - type: Transform + pos: 10.5,-9.5 + parent: 2 + - uid: 2163 + components: + - type: Transform + pos: 9.5,-9.5 + parent: 2 + - uid: 2164 + components: + - type: Transform + pos: 8.5,-9.5 + parent: 2 + - uid: 2165 + components: + - type: Transform + pos: 7.5,-9.5 + parent: 2 + - uid: 2166 + components: + - type: Transform + pos: 6.5,-9.5 + parent: 2 + - uid: 2167 + components: + - type: Transform + pos: 5.5,-9.5 + parent: 2 + - uid: 2168 + components: + - type: Transform + pos: 4.5,-9.5 + parent: 2 + - uid: 2169 + components: + - type: Transform + pos: 3.5,-9.5 + parent: 2 + - uid: 2170 + components: + - type: Transform + pos: 3.5,-10.5 + parent: 2 + - uid: 2171 + components: + - type: Transform + pos: 3.5,-11.5 + parent: 2 + - uid: 2172 + components: + - type: Transform + pos: 1.5,-11.5 + parent: 2 + - uid: 2173 + components: + - type: Transform + pos: 1.5,-10.5 + parent: 2 + - uid: 2174 + components: + - type: Transform + pos: 1.5,-9.5 + parent: 2 + - uid: 2175 + components: + - type: Transform + pos: 2.5,-10.5 + parent: 2 + - uid: 2176 + components: + - type: Transform + pos: 1.5,-13.5 + parent: 2 + - uid: 2177 + components: + - type: Transform + pos: 1.5,-14.5 + parent: 2 + - uid: 2178 + components: + - type: Transform + pos: 2.5,-14.5 + parent: 2 + - uid: 2179 + components: + - type: Transform + pos: 11.5,-8.5 + parent: 2 + - uid: 2180 + components: + - type: Transform + pos: 11.5,-7.5 + parent: 2 + - uid: 2181 + components: + - type: Transform + pos: 12.5,-7.5 + parent: 2 + - uid: 2182 + components: + - type: Transform + pos: 1.5,-5.5 + parent: 2 + - uid: 2183 + components: + - type: Transform + pos: 2.5,-5.5 + parent: 2 + - uid: 2184 + components: + - type: Transform + pos: 4.5,-5.5 + parent: 2 + - uid: 2185 + components: + - type: Transform + pos: 5.5,-5.5 + parent: 2 + - uid: 2186 + components: + - type: Transform + pos: 6.5,-5.5 + parent: 2 + - uid: 2187 + components: + - type: Transform + pos: 7.5,-5.5 + parent: 2 + - uid: 2188 + components: + - type: Transform + pos: 8.5,-5.5 + parent: 2 + - uid: 2189 + components: + - type: Transform + pos: 9.5,-5.5 + parent: 2 + - uid: 2190 + components: + - type: Transform + pos: 10.5,-5.5 + parent: 2 + - uid: 2191 + components: + - type: Transform + pos: 11.5,-5.5 + parent: 2 + - uid: 2192 + components: + - type: Transform + pos: 12.5,-5.5 + parent: 2 + - uid: 2193 + components: + - type: Transform + pos: 1.5,-8.5 + parent: 2 + - uid: 2194 + components: + - type: Transform + pos: 1.5,-7.5 + parent: 2 + - uid: 2195 + components: + - type: Transform + pos: 3.5,-8.5 + parent: 2 + - uid: 2196 + components: + - type: Transform + pos: -2.5,-12.5 + parent: 2 + - uid: 2197 + components: + - type: Transform + pos: -2.5,-11.5 + parent: 2 + - uid: 2198 + components: + - type: Transform + pos: -3.5,-11.5 + parent: 2 + - uid: 2199 + components: + - type: Transform + pos: -3.5,-10.5 + parent: 2 + - uid: 2200 + components: + - type: Transform + pos: -3.5,-9.5 + parent: 2 + - uid: 2201 + components: + - type: Transform + pos: -2.5,-9.5 + parent: 2 + - uid: 2202 + components: + - type: Transform + pos: -2.5,-8.5 + parent: 2 + - uid: 2203 + components: + - type: Transform + pos: -2.5,-6.5 + parent: 2 + - uid: 2204 + components: + - type: Transform + pos: -2.5,-5.5 + parent: 2 + - uid: 2205 + components: + - type: Transform + pos: -3.5,-5.5 + parent: 2 + - uid: 2206 + components: + - type: Transform + pos: -4.5,-5.5 + parent: 2 + - uid: 2207 + components: + - type: Transform + pos: -5.5,-5.5 + parent: 2 + - uid: 2208 + components: + - type: Transform + pos: -6.5,-5.5 + parent: 2 + - uid: 2209 + components: + - type: Transform + pos: -7.5,-5.5 + parent: 2 + - uid: 2210 + components: + - type: Transform + pos: -7.5,-6.5 + parent: 2 + - uid: 2211 + components: + - type: Transform + pos: -7.5,-7.5 + parent: 2 + - uid: 2212 + components: + - type: Transform + pos: -11.5,-5.5 + parent: 2 + - uid: 2213 + components: + - type: Transform + pos: -15.5,-5.5 + parent: 2 + - uid: 2214 + components: + - type: Transform + pos: -16.5,-5.5 + parent: 2 + - uid: 2215 + components: + - type: Transform + pos: -17.5,-5.5 + parent: 2 + - uid: 2216 + components: + - type: Transform + pos: -18.5,-5.5 + parent: 2 + - uid: 2217 + components: + - type: Transform + pos: -19.5,-5.5 + parent: 2 + - uid: 2218 + components: + - type: Transform + pos: -15.5,-4.5 + parent: 2 + - uid: 2219 + components: + - type: Transform + pos: -15.5,-3.5 + parent: 2 + - uid: 2220 + components: + - type: Transform + pos: -15.5,-2.5 + parent: 2 + - uid: 2221 + components: + - type: Transform + pos: -15.5,-1.5 + parent: 2 + - uid: 2222 + components: + - type: Transform + pos: -15.5,-0.5 + parent: 2 + - uid: 2223 + components: + - type: Transform + pos: -15.5,1.5 + parent: 2 + - uid: 2224 + components: + - type: Transform + pos: -15.5,2.5 + parent: 2 + - uid: 2225 + components: + - type: Transform + pos: -15.5,3.5 + parent: 2 + - uid: 2226 + components: + - type: Transform + pos: -15.5,4.5 + parent: 2 + - uid: 2227 + components: + - type: Transform + pos: -15.5,5.5 + parent: 2 + - uid: 2228 + components: + - type: Transform + pos: -15.5,6.5 + parent: 2 + - uid: 2229 + components: + - type: Transform + pos: -15.5,7.5 + parent: 2 + - uid: 2230 + components: + - type: Transform + pos: -19.5,2.5 + parent: 2 + - uid: 2231 + components: + - type: Transform + pos: -19.5,4.5 + parent: 2 + - uid: 2232 + components: + - type: Transform + pos: -19.5,5.5 + parent: 2 + - uid: 2233 + components: + - type: Transform + pos: -19.5,-1.5 + parent: 2 + - uid: 2234 + components: + - type: Transform + pos: -19.5,-2.5 + parent: 2 + - uid: 2235 + components: + - type: Transform + pos: -18.5,5.5 + parent: 2 + - uid: 2236 + components: + - type: Transform + pos: -19.5,-4.5 + parent: 2 + - uid: 2237 + components: + - type: Transform + pos: -20.5,-4.5 + parent: 2 + - uid: 2238 + components: + - type: Transform + pos: -20.5,-3.5 + parent: 2 + - uid: 2239 + components: + - type: Transform + pos: -21.5,-3.5 + parent: 2 + - uid: 2240 + components: + - type: Transform + pos: -22.5,-3.5 + parent: 2 + - uid: 2241 + components: + - type: Transform + pos: -23.5,-3.5 + parent: 2 + - uid: 2242 + components: + - type: Transform + pos: -23.5,-2.5 + parent: 2 + - uid: 2243 + components: + - type: Transform + pos: -24.5,-2.5 + parent: 2 + - uid: 2244 + components: + - type: Transform + pos: -23.5,3.5 + parent: 2 + - uid: 2245 + components: + - type: Transform + pos: -24.5,3.5 + parent: 2 + - uid: 2246 + components: + - type: Transform + pos: -23.5,4.5 + parent: 2 + - uid: 2247 + components: + - type: Transform + pos: -22.5,4.5 + parent: 2 + - uid: 2248 + components: + - type: Transform + pos: -21.5,4.5 + parent: 2 + - uid: 2249 + components: + - type: Transform + pos: -20.5,4.5 + parent: 2 + - uid: 2250 + components: + - type: Transform + pos: -20.5,5.5 + parent: 2 + - uid: 2251 + components: + - type: Transform + pos: -18.5,6.5 + parent: 2 + - uid: 2252 + components: + - type: Transform + pos: -18.5,7.5 + parent: 2 + - uid: 2253 + components: + - type: Transform + pos: -30.5,-4.5 + parent: 2 + - uid: 2254 + components: + - type: Transform + pos: -30.5,-3.5 + parent: 2 + - uid: 2255 + components: + - type: Transform + pos: -29.5,-3.5 + parent: 2 + - uid: 2256 + components: + - type: Transform + pos: -31.5,-1.5 + parent: 2 + - uid: 2257 + components: + - type: Transform + pos: -29.5,-2.5 + parent: 2 + - uid: 2258 + components: + - type: Transform + pos: -28.5,-2.5 + parent: 2 + - uid: 2259 + components: + - type: Transform + pos: -29.5,-1.5 + parent: 2 + - uid: 2260 + components: + - type: Transform + pos: -29.5,2.5 + parent: 2 + - uid: 2261 + components: + - type: Transform + pos: -29.5,3.5 + parent: 2 + - uid: 2262 + components: + - type: Transform + pos: -28.5,3.5 + parent: 2 + - uid: 2263 + components: + - type: Transform + pos: -29.5,4.5 + parent: 2 + - uid: 2264 + components: + - type: Transform + pos: -31.5,2.5 + parent: 2 + - uid: 2265 + components: + - type: Transform + pos: -30.5,4.5 + parent: 2 + - uid: 2266 + components: + - type: Transform + pos: -30.5,5.5 + parent: 2 + - uid: 2267 + components: + - type: Transform + pos: -31.5,5.5 + parent: 2 + - uid: 2268 + components: + - type: Transform + pos: -12.5,2.5 + parent: 2 + - uid: 2269 + components: + - type: Transform + pos: -13.5,2.5 + parent: 2 + - uid: 2270 + components: + - type: Transform + pos: -11.5,2.5 + parent: 2 + - uid: 2271 + components: + - type: Transform + pos: -11.5,3.5 + parent: 2 + - uid: 2272 + components: + - type: Transform + pos: -11.5,5.5 + parent: 2 + - uid: 2273 + components: + - type: Transform + pos: -12.5,7.5 + parent: 2 + - uid: 2274 + components: + - type: Transform + pos: -14.5,7.5 + parent: 2 + - uid: 2275 + components: + - type: Transform + pos: -11.5,6.5 + parent: 2 + - uid: 2276 + components: + - type: Transform + pos: -10.5,6.5 + parent: 2 + - uid: 2277 + components: + - type: Transform + pos: -7.5,6.5 + parent: 2 + - uid: 2278 + components: + - type: Transform + pos: -6.5,6.5 + parent: 2 + - uid: 2279 + components: + - type: Transform + pos: -6.5,5.5 + parent: 2 + - uid: 2280 + components: + - type: Transform + pos: -5.5,2.5 + parent: 2 + - uid: 2281 + components: + - type: Transform + pos: -6.5,2.5 + parent: 2 + - uid: 2282 + components: + - type: Transform + pos: -2.5,2.5 + parent: 2 + - uid: 2283 + components: + - type: Transform + pos: -2.5,3.5 + parent: 2 + - uid: 2284 + components: + - type: Transform + pos: -2.5,4.5 + parent: 2 + - uid: 2285 + components: + - type: Transform + pos: -2.5,5.5 + parent: 2 + - uid: 2286 + components: + - type: Transform + pos: -2.5,6.5 + parent: 2 + - uid: 2287 + components: + - type: Transform + pos: -3.5,6.5 + parent: 2 + - uid: 2288 + components: + - type: Transform + pos: -4.5,6.5 + parent: 2 + - uid: 2289 + components: + - type: Transform + pos: -5.5,6.5 + parent: 2 + - uid: 2290 + components: + - type: Transform + pos: -2.5,-4.5 + parent: 2 + - uid: 2291 + components: + - type: Transform + pos: -2.5,-3.5 + parent: 2 + - uid: 2292 + components: + - type: Transform + pos: -2.5,-2.5 + parent: 2 + - uid: 2293 + components: + - type: Transform + pos: -2.5,-1.5 + parent: 2 + - uid: 2294 + components: + - type: Transform + pos: -7.5,7.5 + parent: 2 + - uid: 2295 + components: + - type: Transform + pos: -7.5,8.5 + parent: 2 + - uid: 2296 + components: + - type: Transform + pos: -6.5,8.5 + parent: 2 + - uid: 2297 + components: + - type: Transform + pos: -6.5,9.5 + parent: 2 + - uid: 2298 + components: + - type: Transform + pos: -5.5,9.5 + parent: 2 + - uid: 2299 + components: + - type: Transform + pos: -3.5,12.5 + parent: 2 + - uid: 2300 + components: + - type: Transform + pos: -3.5,14.5 + parent: 2 + - uid: 2301 + components: + - type: Transform + pos: -2.5,13.5 + parent: 2 + - uid: 2302 + components: + - type: Transform + pos: -1.5,13.5 + parent: 2 + - uid: 2303 + components: + - type: Transform + pos: -0.5,6.5 + parent: 2 + - uid: 2304 + components: + - type: Transform + pos: -0.5,9.5 + parent: 2 + - uid: 2305 + components: + - type: Transform + pos: -0.5,12.5 + parent: 2 + - uid: 2306 + components: + - type: Transform + pos: -0.5,13.5 + parent: 2 + - uid: 2307 + components: + - type: Transform + pos: -0.5,14.5 + parent: 2 + - uid: 2308 + components: + - type: Transform + pos: 3.5,14.5 + parent: 2 + - uid: 2309 + components: + - type: Transform + pos: 3.5,15.5 + parent: 2 + - uid: 2310 + components: + - type: Transform + pos: 3.5,16.5 + parent: 2 + - uid: 2311 + components: + - type: Transform + pos: 3.5,17.5 + parent: 2 + - uid: 2312 + components: + - type: Transform + pos: 4.5,17.5 + parent: 2 + - uid: 2313 + components: + - type: Transform + pos: 9.5,17.5 + parent: 2 + - uid: 2314 + components: + - type: Transform + pos: 10.5,17.5 + parent: 2 + - uid: 2315 + components: + - type: Transform + pos: 11.5,17.5 + parent: 2 + - uid: 2316 + components: + - type: Transform + pos: 4.5,6.5 + parent: 2 + - uid: 2317 + components: + - type: Transform + pos: 4.5,7.5 + parent: 2 + - uid: 2318 + components: + - type: Transform + pos: 4.5,8.5 + parent: 2 + - uid: 2319 + components: + - type: Transform + pos: 4.5,9.5 + parent: 2 + - uid: 2320 + components: + - type: Transform + pos: 4.5,10.5 + parent: 2 + - uid: 2321 + components: + - type: Transform + pos: 4.5,11.5 + parent: 2 + - uid: 2322 + components: + - type: Transform + pos: 4.5,12.5 + parent: 2 + - uid: 2323 + components: + - type: Transform + pos: 4.5,14.5 + parent: 2 + - uid: 2324 + components: + - type: Transform + pos: -3.5,17.5 + parent: 2 + - uid: 2325 + components: + - type: Transform + pos: -3.5,15.5 + parent: 2 + - uid: 2326 + components: + - type: Transform + pos: 11.5,14.5 + parent: 2 + - uid: 2327 + components: + - type: Transform + pos: 11.5,15.5 + parent: 2 + - uid: 2328 + components: + - type: Transform + pos: 11.5,16.5 + parent: 2 + - uid: 2329 + components: + - type: Transform + pos: -3.5,13.5 + parent: 2 + - uid: 2330 + components: + - type: Transform + pos: 11.5,9.5 + parent: 2 + - uid: 2331 + components: + - type: Transform + pos: 11.5,8.5 + parent: 2 + - uid: 2332 + components: + - type: Transform + pos: 12.5,8.5 + parent: 2 + - uid: 2333 + components: + - type: Transform + pos: 12.5,7.5 + parent: 2 + - uid: 2334 + components: + - type: Transform + pos: 12.5,6.5 + parent: 2 + - uid: 2335 + components: + - type: Transform + pos: 11.5,6.5 + parent: 2 + - uid: 2336 + components: + - type: Transform + pos: 10.5,6.5 + parent: 2 + - uid: 2337 + components: + - type: Transform + pos: 9.5,6.5 + parent: 2 + - uid: 2338 + components: + - type: Transform + pos: 5.5,6.5 + parent: 2 + - uid: 2339 + components: + - type: Transform + pos: 14.5,-5.5 + parent: 2 + - uid: 2340 + components: + - type: Transform + pos: 13.5,-5.5 + parent: 2 + - uid: 2341 + components: + - type: Transform + pos: 13.5,-4.5 + parent: 2 + - uid: 2342 + components: + - type: Transform + pos: 13.5,-3.5 + parent: 2 + - uid: 2343 + components: + - type: Transform + pos: 13.5,-2.5 + parent: 2 + - uid: 2344 + components: + - type: Transform + pos: 13.5,-1.5 + parent: 2 + - uid: 2345 + components: + - type: Transform + pos: 14.5,-1.5 + parent: 2 + - uid: 2346 + components: + - type: Transform + pos: 15.5,-1.5 + parent: 2 + - uid: 2347 + components: + - type: Transform + pos: 18.5,-1.5 + parent: 2 + - uid: 2348 + components: + - type: Transform + pos: 19.5,-1.5 + parent: 2 + - uid: 2349 + components: + - type: Transform + pos: 20.5,-1.5 + parent: 2 + - uid: 2350 + components: + - type: Transform + pos: 20.5,-2.5 + parent: 2 + - uid: 2351 + components: + - type: Transform + pos: 20.5,-3.5 + parent: 2 + - uid: 2352 + components: + - type: Transform + pos: 20.5,-4.5 + parent: 2 + - uid: 2353 + components: + - type: Transform + pos: 20.5,-5.5 + parent: 2 + - uid: 2354 + components: + - type: Transform + pos: 19.5,-5.5 + parent: 2 + - uid: 2355 + components: + - type: Transform + pos: 23.5,-4.5 + parent: 2 + - uid: 2356 + components: + - type: Transform + pos: 22.5,-4.5 + parent: 2 + - uid: 2357 + components: + - type: Transform + pos: 21.5,-4.5 + parent: 2 + - uid: 2358 + components: + - type: Transform + pos: 21.5,-1.5 + parent: 2 + - uid: 2359 + components: + - type: Transform + pos: 23.5,-1.5 + parent: 2 + - uid: 2360 + components: + - type: Transform + pos: 24.5,-1.5 + parent: 2 + - uid: 2361 + components: + - type: Transform + pos: 25.5,-1.5 + parent: 2 + - uid: 2362 + components: + - type: Transform + pos: 26.5,-1.5 + parent: 2 + - uid: 2363 + components: + - type: Transform + pos: 27.5,-1.5 + parent: 2 + - uid: 2364 + components: + - type: Transform + pos: 17.5,6.5 + parent: 2 + - uid: 2365 + components: + - type: Transform + pos: 17.5,2.5 + parent: 2 + - uid: 2366 + components: + - type: Transform + pos: 17.5,5.5 + parent: 2 + - uid: 2367 + components: + - type: Transform + pos: 17.5,3.5 + parent: 2 + - uid: 2368 + components: + - type: Transform + pos: 17.5,4.5 + parent: 2 + - uid: 2369 + components: + - type: Transform + pos: 18.5,6.5 + parent: 2 + - uid: 2370 + components: + - type: Transform + pos: 20.5,6.5 + parent: 2 + - uid: 2371 + components: + - type: Transform + pos: 20.5,5.5 + parent: 2 + - uid: 2372 + components: + - type: Transform + pos: 20.5,4.5 + parent: 2 + - uid: 2373 + components: + - type: Transform + pos: 20.5,3.5 + parent: 2 + - uid: 2374 + components: + - type: Transform + pos: 20.5,2.5 + parent: 2 + - uid: 2375 + components: + - type: Transform + pos: 21.5,5.5 + parent: 2 + - uid: 2376 + components: + - type: Transform + pos: 22.5,5.5 + parent: 2 + - uid: 2377 + components: + - type: Transform + pos: 23.5,5.5 + parent: 2 + - uid: 2378 + components: + - type: Transform + pos: 13.5,6.5 + parent: 2 + - uid: 2379 + components: + - type: Transform + pos: 13.5,2.5 + parent: 2 + - uid: 2380 + components: + - type: Transform + pos: 12.5,2.5 + parent: 2 + - uid: 2381 + components: + - type: Transform + pos: 11.5,2.5 + parent: 2 + - uid: 2382 + components: + - type: Transform + pos: 10.5,2.5 + parent: 2 + - uid: 2383 + components: + - type: Transform + pos: 9.5,2.5 + parent: 2 + - uid: 2384 + components: + - type: Transform + pos: 8.5,2.5 + parent: 2 + - uid: 2385 + components: + - type: Transform + pos: 7.5,2.5 + parent: 2 + - uid: 2386 + components: + - type: Transform + pos: 6.5,2.5 + parent: 2 + - uid: 2387 + components: + - type: Transform + pos: 5.5,2.5 + parent: 2 + - uid: 2388 + components: + - type: Transform + pos: 4.5,2.5 + parent: 2 + - uid: 2389 + components: + - type: Transform + pos: 2.5,2.5 + parent: 2 + - uid: 2390 + components: + - type: Transform + pos: 1.5,2.5 + parent: 2 + - uid: 2391 + components: + - type: Transform + pos: 9.5,1.5 + parent: 2 + - uid: 2392 + components: + - type: Transform + pos: 9.5,-0.5 + parent: 2 + - uid: 2393 + components: + - type: Transform + pos: 9.5,-1.5 + parent: 2 + - uid: 2394 + components: + - type: Transform + pos: 5.5,-1.5 + parent: 2 + - uid: 2395 + components: + - type: Transform + pos: 5.5,-0.5 + parent: 2 + - uid: 2396 + components: + - type: Transform + pos: 5.5,1.5 + parent: 2 + - uid: 2397 + components: + - type: Transform + pos: 1.5,-1.5 + parent: 2 + - uid: 2398 + components: + - type: Transform + pos: -3.5,16.5 + parent: 2 + - uid: 2399 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -7.5,-1.5 + parent: 2 + - uid: 2400 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -11.5,-1.5 + parent: 2 + - uid: 2401 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 12.5,14.5 + parent: 2 + - uid: 2402 + components: + - type: Transform + pos: 5.5,17.5 + parent: 2 + - uid: 2403 + components: + - type: Transform + pos: 12.5,9.5 + parent: 2 + - uid: 2404 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 13.5,14.5 + parent: 2 + - uid: 2405 + components: + - type: Transform + pos: 13.5,9.5 + parent: 2 + - uid: 2406 + components: + - type: Transform + pos: 13.5,13.5 + parent: 2 + - uid: 2407 + components: + - type: Transform + pos: 1.5,17.5 + parent: 2 + - uid: 2408 + components: + - type: Transform + pos: -5.5,11.5 + parent: 2 +- proto: WallShuttleDiagonal + entities: + - uid: 2409 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 12.5,-15.5 + parent: 2 + - uid: 2410 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 11.5,-17.5 + parent: 2 + - uid: 2411 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,-17.5 + parent: 2 + - uid: 2412 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 12.5,16.5 + parent: 2 +- proto: WallWeaponCapacitorRecharger + entities: + - uid: 2413 + components: + - type: Transform + pos: 18.5,-1.5 + parent: 2 +- proto: WardrobePrisonFilled + entities: + - uid: 2414 + components: + - type: Transform + pos: 17.5,1.5 + parent: 2 +- proto: WarningN2 + entities: + - uid: 2415 + components: + - type: Transform + pos: 8.5,-14.5 + parent: 2 +- proto: WarningO2 + entities: + - uid: 2416 + components: + - type: Transform + pos: 8.5,-12.5 + parent: 2 +- proto: WaterTankHighCapacity + entities: + - uid: 2417 + components: + - type: Transform + pos: -14.5,5.5 + parent: 2 +- proto: WeaponCapacitorRecharger + entities: + - uid: 2418 + components: + - type: Transform + pos: 18.5,-2.5 + parent: 2 + - uid: 2419 + components: + - type: Transform + pos: 25.5,2.5 + parent: 2 +- proto: WeaponPistolCHIMP + entities: + - uid: 2420 + components: + - type: Transform + pos: -4.330495,7.357918 + parent: 2 +- proto: WelderIndustrialAdvanced + entities: + - uid: 2421 + components: + - type: Transform + pos: 4.4984074,-10.399791 + parent: 2 +- proto: WeldingFuelTankFull + entities: + - uid: 2422 + components: + - type: Transform + pos: -20.5,-2.5 + parent: 2 +- proto: Windoor + entities: + - uid: 2423 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -13.5,-1.5 + parent: 2 + - uid: 2424 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -9.5,-1.5 + parent: 2 +- proto: WindoorBarKitchenLocked + entities: + - uid: 2425 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,2.5 + parent: 2 +- proto: WindoorCargoLocked + entities: + - uid: 2426 + components: + - type: Transform + pos: 3.5,7.5 + parent: 2 +- proto: WindoorSecure + entities: + - uid: 2427 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.5,-6.5 + parent: 2 +- proto: WindoorSecureCargoLocked + entities: + - uid: 2428 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,13.5 + parent: 2 + - uid: 2429 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,10.5 + parent: 2 + - uid: 2430 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,7.5 + parent: 2 + - uid: 2431 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,6.5 + parent: 2 + - uid: 2432 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,11.5 + parent: 2 + - uid: 2433 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -0.5,8.5 + parent: 2 +- proto: WindoorSecureChemistryLocked + entities: + - uid: 2434 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 5.5,0.5 + parent: 2 + - uid: 2435 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,-1.5 + parent: 2 +- proto: WindoorSecureCommandLocked + entities: + - uid: 2436 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 24.5,0.5 + parent: 2 +- proto: WindoorSecureEngineeringLocked + entities: + - uid: 2437 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -17.5,-1.5 + parent: 2 + - uid: 2438 + components: + - type: Transform + pos: -17.5,3.5 + parent: 2 + - uid: 2439 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,-8.5 + parent: 2 + - uid: 2440 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 10.5,7.5 + parent: 2 + - uid: 2441 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 21.5,3.5 + parent: 2 +- proto: WindoorSecureMedicalLocked + entities: + - uid: 2442 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 5.5,-3.5 + parent: 2 + - uid: 2443 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 8.5,-3.5 + parent: 2 + - uid: 2444 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 11.5,-3.5 + parent: 2 +- proto: WindoorSecureScienceLocked + entities: + - uid: 2445 + components: + - type: Transform + pos: -4.5,9.5 + parent: 2 + - type: DeviceLinkSource + lastSignals: + DoorStatus: True + - type: Door + secondsUntilStateChange: -424.20837 + state: Opening + - uid: 2446 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,10.5 + parent: 2 + - uid: 2447 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,7.5 + parent: 2 + - uid: 2448 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,11.5 + parent: 2 + - uid: 2449 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -0.5,8.5 + parent: 2 +- proto: WindoorServiceLocked + entities: + - uid: 2450 + components: + - type: Transform + pos: -10.5,2.5 + parent: 2 + - uid: 2451 + components: + - type: Transform + pos: -9.5,2.5 + parent: 2 + - uid: 2452 + components: + - type: Transform + pos: -8.5,2.5 + parent: 2 +- proto: WindowFrostedDirectional + entities: + - uid: 2453 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,-3.5 + parent: 2 + - uid: 2454 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 4.5,-4.5 + parent: 2 + - uid: 2455 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 6.5,-3.5 + parent: 2 + - uid: 2456 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,-3.5 + parent: 2 + - uid: 2457 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 6.5,-4.5 + parent: 2 + - uid: 2458 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 7.5,-3.5 + parent: 2 + - uid: 2459 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,-3.5 + parent: 2 + - uid: 2460 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 10.5,-3.5 + parent: 2 + - uid: 2461 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 12.5,-3.5 + parent: 2 + - uid: 2462 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 10.5,-4.5 + parent: 2 + - uid: 2463 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 10.5,-3.5 + parent: 2 +- proto: WindowReinforcedDirectional + entities: + - uid: 2464 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 10.5,-7.5 + parent: 2 + - uid: 2465 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 9.5,-7.5 + parent: 2 + - uid: 2466 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -18.5,-1.5 + parent: 2 + - uid: 2467 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -16.5,-1.5 + parent: 2 + - uid: 2468 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -8.5,-1.5 + parent: 2 + - uid: 2469 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -10.5,-1.5 + parent: 2 + - uid: 2470 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -12.5,-1.5 + parent: 2 + - uid: 2471 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -14.5,-1.5 + parent: 2 + - uid: 2472 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,-4.5 + parent: 2 + - uid: 2473 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,-3.5 + parent: 2 + - uid: 2474 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -7.5,-2.5 + parent: 2 + - uid: 2475 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -7.5,-4.5 + parent: 2 + - uid: 2476 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -7.5,-3.5 + parent: 2 + - uid: 2477 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -7.5,-2.5 + parent: 2 + - uid: 2478 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -11.5,-4.5 + parent: 2 + - uid: 2479 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -11.5,-3.5 + parent: 2 + - uid: 2480 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -11.5,-2.5 + parent: 2 + - uid: 2481 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -11.5,-2.5 + parent: 2 + - uid: 2482 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -11.5,-3.5 + parent: 2 + - uid: 2483 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -11.5,-4.5 + parent: 2 + - uid: 2484 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -8.5,2.5 + parent: 2 + - uid: 2485 + components: + - type: Transform + pos: -16.5,3.5 + parent: 2 + - uid: 2486 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,2.5 + parent: 2 + - uid: 2487 + components: + - type: Transform + pos: -18.5,3.5 + parent: 2 + - uid: 2488 components: - type: Transform rot: -1.5707963267948966 rad pos: 24.5,-0.5 - parent: 407 - - uid: 2097 + parent: 2 + - uid: 2489 components: - type: Transform rot: -1.5707963267948966 rad pos: 24.5,1.5 - parent: 407 - - uid: 2098 + parent: 2 + - uid: 2490 components: - type: Transform rot: -1.5707963267948966 rad pos: 24.5,2.5 - parent: 407 - - uid: 2099 + parent: 2 + - uid: 2491 components: - type: Transform rot: 3.141592653589793 rad pos: 24.5,2.5 - parent: 407 - - uid: 2100 + parent: 2 + - uid: 2492 components: - type: Transform rot: 3.141592653589793 rad pos: 25.5,2.5 - parent: 407 - - uid: 2101 + parent: 2 + - uid: 2493 components: - type: Transform rot: 3.141592653589793 rad pos: 26.5,2.5 - parent: 407 - - uid: 2164 + parent: 2 + - uid: 2494 components: - type: Transform rot: -1.5707963267948966 rad pos: 22.5,4.5 - parent: 407 + parent: 2 ... From 707daa1a5e110b904847f6abcbe1470d891abf01 Mon Sep 17 00:00:00 2001 From: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com> Date: Sat, 10 Aug 2024 18:53:56 +0000 Subject: [PATCH 353/422] tweak(snowy_labs): Remove non-valid holoparasite (#30875) --- Resources/Maps/Dungeon/snowy_labs.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Resources/Maps/Dungeon/snowy_labs.yml b/Resources/Maps/Dungeon/snowy_labs.yml index 3ce318951c..27e4fe1c07 100644 --- a/Resources/Maps/Dungeon/snowy_labs.yml +++ b/Resources/Maps/Dungeon/snowy_labs.yml @@ -10731,14 +10731,6 @@ entities: rot: -1.5707963267948966 rad pos: 52.5,14.5 parent: 1653 -- proto: ArabianLamp - entities: - - uid: 1204 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 1.5085075,47.438328 - parent: 1653 - proto: MaintenanceFluffSpawner entities: - uid: 1245 From 4d75cb54c85606f34a4aea26339040c23d836a99 Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Sat, 10 Aug 2024 22:31:32 +0300 Subject: [PATCH 354/422] Custom burgers - FoodSequence system (#30755) * setup foodsequence * name generation and max layers limit * move to nutrition * move code to serverside * move to appearance data * marked fields as required * Update foodsequence.yml * b * burgeers! * Update produce.yml * Update meat.yml * Update burger.yml * fix duplicate naming * Update Resources/Locale/en-US/nutrition/components/food-sequence.ftl Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com> * merge flavor profiles * make food trash List<> * merge trash * Update FoodComponent.cs * Update FoodComponent.cs * organs and cannabis support --------- Co-authored-by: Hrosts <35345601+Hrosts@users.noreply.github.com> --- .../EntitySystems/ClientFoodSequenceSystem.cs | 57 +++ .../Nutrition/Components/FoodComponent.cs | 4 +- .../Nutrition/EntitySystems/CreamPieSystem.cs | 7 +- .../EntitySystems/FoodSequenceSystem.cs | 140 +++++++ .../Nutrition/EntitySystems/FoodSystem.cs | 24 +- .../EntitySystems/SliceableFoodSystem.cs | 13 +- .../FoodSequenceElementComponent.cs | 43 ++ .../FoodSequenceStartPointComponent.cs | 66 +++ .../EntitySystems/SharedFoodSequenceSystem.cs | 5 + .../nutrition/components/food-sequence.ftl | 70 ++++ Resources/Prototypes/Body/Organs/human.yml | 42 ++ .../Objects/Consumable/Food/Baked/pie.yml | 3 +- .../Consumable/Food/Containers/tin.yml | 12 +- .../Objects/Consumable/Food/burger.yml | 65 ++- .../Entities/Objects/Consumable/Food/egg.yml | 3 +- .../Objects/Consumable/Food/frozen.yml | 27 +- .../Objects/Consumable/Food/ingredients.yml | 14 + .../Objects/Consumable/Food/meals.yml | 6 +- .../Entities/Objects/Consumable/Food/meat.yml | 392 ++++++++++++++++++ .../Objects/Consumable/Food/produce.yml | 317 +++++++++++++- .../Objects/Consumable/Food/skewer.yml | 3 +- .../Objects/Consumable/Food/snacks.yml | 42 +- .../Entities/Objects/Consumable/Food/soup.yml | 6 +- .../Entities/Objects/Materials/materials.yml | 3 +- .../Objects/Specific/Hydroponics/leaves.yml | 49 +++ .../Consumable/Food/burger.rsi/bun_bottom.png | Bin 0 -> 319 bytes .../Consumable/Food/burger.rsi/bun_top.png | Bin 0 -> 367 bytes .../Consumable/Food/burger.rsi/meta.json | 6 + .../Consumable/Food/meat.rsi/tomato.png | Bin 463 -> 476 bytes .../Specific/Hydroponics/aloe.rsi/produce.png | Bin 903 -> 817 bytes .../Hydroponics/apple.rsi/produce.png | Bin 378 -> 389 bytes .../Hydroponics/blood_tomato.rsi/produce.png | Bin 234 -> 262 bytes .../Hydroponics/blue_tomato.rsi/produce.png | Bin 219 -> 248 bytes .../Hydroponics/cannabis.rsi/produce.png | Bin 220 -> 239 bytes 34 files changed, 1358 insertions(+), 61 deletions(-) create mode 100644 Content.Client/Nutrition/EntitySystems/ClientFoodSequenceSystem.cs create mode 100644 Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs create mode 100644 Content.Shared/Nutrition/Components/FoodSequenceElementComponent.cs create mode 100644 Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs create mode 100644 Content.Shared/Nutrition/EntitySystems/SharedFoodSequenceSystem.cs create mode 100644 Resources/Locale/en-US/nutrition/components/food-sequence.ftl create mode 100644 Resources/Textures/Objects/Consumable/Food/burger.rsi/bun_bottom.png create mode 100644 Resources/Textures/Objects/Consumable/Food/burger.rsi/bun_top.png diff --git a/Content.Client/Nutrition/EntitySystems/ClientFoodSequenceSystem.cs b/Content.Client/Nutrition/EntitySystems/ClientFoodSequenceSystem.cs new file mode 100644 index 0000000000..452bb552de --- /dev/null +++ b/Content.Client/Nutrition/EntitySystems/ClientFoodSequenceSystem.cs @@ -0,0 +1,57 @@ +using Content.Shared.Nutrition.Components; +using Content.Shared.Nutrition.EntitySystems; +using Robust.Client.GameObjects; + +namespace Content.Client.Nutrition.EntitySystems; + +public sealed class ClientFoodSequenceSystem : SharedFoodSequenceSystem +{ + public override void Initialize() + { + SubscribeLocalEvent(OnHandleState); + } + + private void OnHandleState(Entity start, ref AfterAutoHandleStateEvent args) + { + if (!TryComp(start, out var sprite)) + return; + + UpdateFoodVisuals(start, sprite); + } + + private void UpdateFoodVisuals(Entity start, SpriteComponent? sprite = null) + { + if (!Resolve(start, ref sprite, false)) + return; + + //Remove old layers + foreach (var key in start.Comp.RevealedLayers) + { + sprite.RemoveLayer(key); + } + start.Comp.RevealedLayers.Clear(); + + //Add new layers + var counter = 0; + foreach (var state in start.Comp.FoodLayers) + { + if (state.Sprite is null) + continue; + + counter++; + + var keyCode = $"food-layer-{counter}"; + start.Comp.RevealedLayers.Add(keyCode); + + var index = sprite.LayerMapReserveBlank(keyCode); + + //Set image + sprite.LayerSetSprite(index, state.Sprite); + + //Offset the layer + var layerPos = start.Comp.StartPosition; + layerPos += start.Comp.Offset * counter; + sprite.LayerSetOffset(index, layerPos); + } + } +} diff --git a/Content.Server/Nutrition/Components/FoodComponent.cs b/Content.Server/Nutrition/Components/FoodComponent.cs index 5ead67a12b..cfb69f53f0 100644 --- a/Content.Server/Nutrition/Components/FoodComponent.cs +++ b/Content.Server/Nutrition/Components/FoodComponent.cs @@ -7,7 +7,7 @@ using Robust.Shared.Prototypes; namespace Content.Server.Nutrition.Components; -[RegisterComponent, Access(typeof(FoodSystem))] +[RegisterComponent, Access(typeof(FoodSystem), typeof(FoodSequenceSystem))] public sealed partial class FoodComponent : Component { [DataField] @@ -17,7 +17,7 @@ public sealed partial class FoodComponent : Component public SoundSpecifier UseSound = new SoundCollectionSpecifier("eating"); [DataField] - public EntProtoId? Trash; + public List Trash = new(); [DataField] public FixedPoint2? TransferAmount = FixedPoint2.New(5); diff --git a/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs b/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs index a28679ddbc..50b9297ca7 100644 --- a/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/CreamPieSystem.cs @@ -48,9 +48,12 @@ namespace Content.Server.Nutrition.EntitySystems { _puddle.TrySpillAt(uid, solution, out _, false); } - if (!string.IsNullOrEmpty(foodComp.Trash)) + if (foodComp.Trash.Count == 0) { - EntityManager.SpawnEntity(foodComp.Trash, Transform(uid).Coordinates); + foreach (var trash in foodComp.Trash) + { + EntityManager.SpawnEntity(trash, Transform(uid).Coordinates); + } } } ActivatePayload(uid); diff --git a/Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs new file mode 100644 index 0000000000..6970f11b6e --- /dev/null +++ b/Content.Server/Nutrition/EntitySystems/FoodSequenceSystem.cs @@ -0,0 +1,140 @@ +using System.Text; +using Content.Server.Nutrition.Components; +using Content.Shared.Chemistry.EntitySystems; +using Content.Shared.Interaction; +using Content.Shared.Nutrition.Components; +using Content.Shared.Nutrition.EntitySystems; +using Content.Shared.Popups; + +namespace Content.Server.Nutrition.EntitySystems; + +public sealed class FoodSequenceSystem : SharedFoodSequenceSystem +{ + [Dependency] private readonly SharedSolutionContainerSystem _solutionContainer = default!; + [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private readonly MetaDataSystem _metaData = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnInteractUsing); + } + + private void OnInteractUsing(Entity ent, ref InteractUsingEvent args) + { + if (TryComp(args.Used, out var sequenceElement)) + TryAddFoodElement(ent, (args.Used, sequenceElement), args.User); + } + + private bool TryAddFoodElement(Entity start, Entity element, EntityUid? user = null) + { + FoodSequenceElementEntry? elementData = null; + foreach (var entry in element.Comp.Entries) + { + if (entry.Key == start.Comp.Key) + { + elementData = entry.Value; + break; + } + } + + if (elementData is null) + return false; + + //if we run out of space, we can still put in one last, final finishing element. + if (start.Comp.FoodLayers.Count >= start.Comp.MaxLayers && !elementData.Value.Final || start.Comp.Finished) + { + if (user is not null) + _popup.PopupEntity(Loc.GetString("food-sequence-no-space"), start, user.Value); + return false; + } + + if (elementData.Value.Sprite is not null) + { + start.Comp.FoodLayers.Add(elementData.Value); + Dirty(start); + } + + if (elementData.Value.Final) + start.Comp.Finished = true; + + UpdateFoodName(start); + MergeFoodSolutions(start, element); + MergeFlavorProfiles(start, element); + MergeTrash(start, element); + QueueDel(element); + return true; + } + + private void UpdateFoodName(Entity start) + { + if (start.Comp.NameGeneration is null) + return; + + var content = new StringBuilder(); + var separator = ""; + if (start.Comp.ContentSeparator is not null) + separator = Loc.GetString(start.Comp.ContentSeparator); + + HashSet existedContentNames = new(); + foreach (var layer in start.Comp.FoodLayers) + { + if (layer.Name is not null && !existedContentNames.Contains(layer.Name.Value)) + { + content.Append(Loc.GetString(layer.Name.Value)); + existedContentNames.Add(layer.Name.Value); + } + + content.Append(separator); + } + + var newName = Loc.GetString(start.Comp.NameGeneration.Value, + ("prefix", start.Comp.NamePrefix is not null ? Loc.GetString(start.Comp.NamePrefix) : ""), + ("content", content), + ("suffix", start.Comp.NameSuffix is not null ? Loc.GetString(start.Comp.NameSuffix) : "")); + + _metaData.SetEntityName(start, newName); + } + + private void MergeFoodSolutions(Entity start, Entity element) + { + if (!_solutionContainer.TryGetSolution(start.Owner, start.Comp.Solution, out var startSolutionEntity, out var startSolution)) + return; + + if (!_solutionContainer.TryGetSolution(element.Owner, element.Comp.Solution, out _, out var elementSolution)) + return; + + startSolution.MaxVolume += elementSolution.MaxVolume; + _solutionContainer.TryAddSolution(startSolutionEntity.Value, elementSolution); + } + + private void MergeFlavorProfiles(Entity start, Entity element) + { + if (!TryComp(start, out var startProfile)) + return; + + if (!TryComp(element, out var elementProfile)) + return; + + foreach (var flavor in elementProfile.Flavors) + { + if (startProfile != null && !startProfile.Flavors.Contains(flavor)) + startProfile.Flavors.Add(flavor); + } + } + + private void MergeTrash(Entity start, Entity element) + { + if (!TryComp(start, out var startFood)) + return; + + if (!TryComp(element, out var elementFood)) + return; + + foreach (var trash in elementFood.Trash) + { + startFood.Trash.Add(trash); + } + } +} diff --git a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs index 53c1b39982..3a7c249c2b 100644 --- a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs @@ -335,27 +335,31 @@ public sealed class FoodSystem : EntitySystem if (ev.Cancelled) return; - if (string.IsNullOrEmpty(component.Trash)) + if (component.Trash.Count == 0) { QueueDel(food); return; } //We're empty. Become trash. + //cache some data as we remove food, before spawning trash and passing it to the hand. + var position = _transform.GetMapCoordinates(food); - var finisher = Spawn(component.Trash, position); + var trashes = component.Trash; + var tryPickup = _hands.IsHolding(user, food, out _); - // If the user is holding the item - if (_hands.IsHolding(user, food, out var hand)) + Del(food); + foreach (var trash in trashes) { - Del(food); + var spawnedTrash = Spawn(trash, position); - // Put the trash in the user's hand - _hands.TryPickup(user, finisher, hand); - return; + // If the user is holding the item + if (tryPickup) + { + // Put the trash in the user's hand + _hands.TryPickupAnyHand(user, spawnedTrash); + } } - - QueueDel(food); } private void AddEatVerb(Entity entity, ref GetVerbsEvent ev) diff --git a/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs b/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs index ac3df5868f..946a789b36 100644 --- a/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs @@ -125,18 +125,21 @@ namespace Content.Server.Nutrition.EntitySystems if (ev.Cancelled) return; - if (string.IsNullOrEmpty(foodComp.Trash)) + if (foodComp.Trash.Count == 0) { QueueDel(uid); return; } // Locate the sliced food and spawn its trash - var trashUid = Spawn(foodComp.Trash, _xformSystem.GetMapCoordinates(uid)); + foreach (var trash in foodComp.Trash) + { + var trashUid = Spawn(trash, _xformSystem.GetMapCoordinates(uid)); - // try putting the trash in the food's container too, to be consistent with slice spawning? - _xformSystem.DropNextTo(trashUid, uid); - _xformSystem.SetLocalRotation(trashUid, 0); + // try putting the trash in the food's container too, to be consistent with slice spawning? + _xformSystem.DropNextTo(trashUid, uid); + _xformSystem.SetLocalRotation(trashUid, 0); + } QueueDel(uid); } diff --git a/Content.Shared/Nutrition/Components/FoodSequenceElementComponent.cs b/Content.Shared/Nutrition/Components/FoodSequenceElementComponent.cs new file mode 100644 index 0000000000..1fc8aeec0a --- /dev/null +++ b/Content.Shared/Nutrition/Components/FoodSequenceElementComponent.cs @@ -0,0 +1,43 @@ +using Content.Shared.Nutrition.EntitySystems; +using Robust.Shared.Serialization; +using Robust.Shared.Utility; + +namespace Content.Shared.Nutrition.Components; + +/// +/// Tndicates that this entity can be inserted into FoodSequence, which will transfer all reagents to the target. +/// +[RegisterComponent, Access(typeof(SharedFoodSequenceSystem))] +public sealed partial class FoodSequenceElementComponent : Component +{ + /// + /// the same object can be used in different sequences, and it will have a different sprite in different sequences. + /// + [DataField(required: true)] + public Dictionary Entries = new(); + + /// + /// which solution we will add to the main dish + /// + [DataField] + public string Solution = "food"; +} + +[DataRecord, Serializable, NetSerializable] +public partial record struct FoodSequenceElementEntry() +{ + /// + /// A localized name piece to build into the item name generator. + /// + public LocId? Name { get; set; } = null; + + /// + /// state used to generate the appearance of the added layer + /// + public SpriteSpecifier? Sprite { get; set; } = null; + + /// + /// If the layer is the final one, it can be added over the limit, but no other layers can be added after it. + /// + public bool Final { get; set; } = false; +} diff --git a/Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs b/Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs new file mode 100644 index 0000000000..b8186fdaf0 --- /dev/null +++ b/Content.Shared/Nutrition/Components/FoodSequenceStartPointComponent.cs @@ -0,0 +1,66 @@ +using System.Numerics; +using Content.Shared.Nutrition.EntitySystems; +using Robust.Shared.GameStates; +using Robust.Shared.Serialization; + +namespace Content.Shared.Nutrition.Components; + +/// +/// A starting point for the creation of procedural food. +/// +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true), Access(typeof(SharedFoodSequenceSystem))] +public sealed partial class FoodSequenceStartPointComponent : Component +{ + /// + /// A key that determines which types of food elements can be attached to a food. + /// + [DataField(required: true)] + public string Key = string.Empty; + + /// + /// The maximum number of layers of food that can be placed on this item. + /// + [DataField] + public int MaxLayers = 10; + + /// + /// Start shift from the center of the sprite where the first layer of food will be placed. + /// + [DataField] + public Vector2 StartPosition = Vector2.Zero; + + /// + /// Shift from the start position applied to each subsequent layer. + /// + [DataField] + public Vector2 Offset = Vector2.Zero; + + /// + /// Can we put more layers? + /// + [DataField] + public bool Finished; + + /// + /// list of sprite states to be displayed on this object. + /// + [DataField, AutoNetworkedField] + public List FoodLayers = new(); + + public HashSet RevealedLayers = new(); + + [DataField] + public string Solution = "food"; + + [DataField] + public LocId? NameGeneration; + + [DataField] + public LocId? NamePrefix; + + [DataField] + public LocId? ContentSeparator; + + [DataField] + public LocId? NameSuffix; +} diff --git a/Content.Shared/Nutrition/EntitySystems/SharedFoodSequenceSystem.cs b/Content.Shared/Nutrition/EntitySystems/SharedFoodSequenceSystem.cs new file mode 100644 index 0000000000..2623e4a716 --- /dev/null +++ b/Content.Shared/Nutrition/EntitySystems/SharedFoodSequenceSystem.cs @@ -0,0 +1,5 @@ +namespace Content.Shared.Nutrition.EntitySystems; + +public abstract class SharedFoodSequenceSystem : EntitySystem +{ +} diff --git a/Resources/Locale/en-US/nutrition/components/food-sequence.ftl b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl new file mode 100644 index 0000000000..5679dd1b52 --- /dev/null +++ b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl @@ -0,0 +1,70 @@ +food-sequence-no-space = You can't put any more! + +food-sequence-standart-gen = {$prefix}{$content}{$suffix} + +#Burger +food-sequence-burger-suffix = burger + +food-sequence-burger-content-raw-meat = raw +food-sequence-burger-content-carp = carpo +food-sequence-burger-content-bear = bear +food-sequence-burger-content-penguin = peng +food-sequence-burger-content-chiken = chiken +food-sequence-burger-content-duck = duck +food-sequence-burger-content-corgi = corgi +food-sequence-burger-content-crab = crabs +food-sequence-burger-content-goliath = goli +food-sequence-burger-content-dragon = dragon +food-sequence-burger-content-rat = rat +food-sequence-burger-content-lizard = lizzy +food-sequence-burger-content-plant = plant +food-sequence-burger-content-rotten = trash +food-sequence-burger-content-spider = web +food-sequence-burger-content-clump = clump +food-sequence-burger-content-snake = snake +food-sequence-burger-content-xeno = xeno +food-sequence-burger-content-tomato = tomato +food-sequence-burger-content-salami = salami +food-sequence-burger-content-clown = clown +food-sequence-burger-content-slime = slime + +food-sequence-burger-content-pea = pea +food-sequence-burger-content-banana = banana +food-sequence-burger-content-mimana = mimana +food-sequence-burger-content-carrot = carro +food-sequence-burger-content-cabbage = cabba +food-sequence-burger-content-garlic = garli +food-sequence-burger-content-lemon = lemon +food-sequence-burger-content-orange = orange +food-sequence-burger-content-pineapple = pine +food-sequence-burger-content-potato = potato +food-sequence-burger-content-apple = apple +food-sequence-burger-content-cocoa = cocoa +food-sequence-burger-content-corn = corn +food-sequence-burger-content-onion = oni +food-sequence-burger-content-mushroom = shroom +food-sequence-burger-content-chili = chili +food-sequence-burger-content-chilly = chilly +food-sequence-burger-content-aloe = aloe +food-sequence-burger-content-poppy = poppy +food-sequence-burger-content-lily = lily +food-sequence-burger-content-ambrosia = ambro +food-sequence-burger-content-galaxy = galaxy +food-sequence-burger-content-glasstle = glass +food-sequence-burger-content-gatfruit = gat +food-sequence-burger-content-rice = rice +food-sequence-burger-content-soy = soy +food-sequence-burger-content-koibean = koi +food-sequence-burger-content-watermelon = water +food-sequence-burger-content-cannabis = funny +food-sequence-burger-content-rainbow-cannabis = FUNNY +food-sequence-burger-content-tobacco = tobaco + +food-sequence-burger-content-cheese = cheese + +food-sequence-burger-content-brain = brain +food-sequence-burger-content-tongue = tongue +food-sequence-burger-content-appendix = appendi +food-sequence-burger-content-ears = ear +food-sequence-burger-content-stomach = stomach +food-sequence-burger-content-liver = liver \ No newline at end of file diff --git a/Resources/Prototypes/Body/Organs/human.yml b/Resources/Prototypes/Body/Organs/human.yml index 69081020ce..962ec18e70 100644 --- a/Resources/Prototypes/Body/Organs/human.yml +++ b/Resources/Prototypes/Body/Organs/human.yml @@ -67,6 +67,13 @@ - type: FlavorProfile flavors: - people + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-brain + sprite: + sprite: Mobs/Species/Human/organs.rsi + state: brain - type: entity id: OrganHumanEyes @@ -87,6 +94,13 @@ components: - type: Sprite state: tongue + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-tongue + sprite: + sprite: Mobs/Species/Human/organs.rsi + state: tongue - type: entity id: OrganHumanAppendix @@ -98,6 +112,13 @@ - state: appendix - state: appendix-inflamed visible: false + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-appendix + sprite: + sprite: Mobs/Species/Human/organs.rsi + state: appendix - type: entity id: OrganHumanEars @@ -107,6 +128,13 @@ components: - type: Sprite state: ears + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-ears + sprite: + sprite: Mobs/Species/Human/organs.rsi + state: ears - type: entity id: OrganHumanLungs @@ -189,6 +217,13 @@ groups: - id: Food - id: Drink + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-stomach + sprite: + sprite: Mobs/Species/Human/organs.rsi + state: stomach - type: entity id: OrganHumanLiver @@ -204,6 +239,13 @@ groups: - id: Alcohol rateModifier: 0.1 # removes alcohol very slowly along with the stomach removing it as a drink + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-liver + sprite: + sprite: Mobs/Species/Human/organs.rsi + state: liver - type: entity id: OrganHumanKidneys diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml index 09ec706e1f..c9ac483343 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml @@ -23,7 +23,8 @@ - ReagentId: Vitamin Quantity: 5 - type: Food #All pies here made with a pie tin; unless you're some kind of savage, you're probably not destroying this when you eat or slice the pie! - trash: FoodPlateTin + trash: + - FoodPlateTin - type: SliceableFood count: 4 - type: Tag diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml index dc1a4ec74c..3fbf14a6d6 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/tin.yml @@ -88,7 +88,8 @@ - sweet - funny - type: Food - trash: FoodTinPeachesTrash + trash: + - FoodTinPeachesTrash - type: Tag tags: - Fruit @@ -110,7 +111,8 @@ - type: Sprite sprite: Objects/Consumable/Food/Tins/maint_peaches.rsi - type: Food - trash: FoodTinPeachesMaintTrash + trash: + - FoodTinPeachesMaintTrash # only exists for backwards compatibility with a few maps, nothing else uses it - type: entity @@ -147,7 +149,8 @@ - salty - cheap - type: Food - trash: FoodTinBeansTrash + trash: + - FoodTinBeansTrash - type: entity parent: FoodTinBaseTrash @@ -176,7 +179,8 @@ - salty - cheap - type: Food - trash: FoodTinMRETrash + trash: + - FoodTinMRETrash - type: Tag tags: - Meat diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml index 22e6fce8e1..8009779a36 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/burger.yml @@ -19,7 +19,69 @@ reagents: - ReagentId: Nutriment Quantity: 6.66 # 1/3 of a loaf of bread, technically losing 0.01 nutriment per batch of three buns over making bread loaves/slices + - type: Butcherable + butcherDelay: 1 + spawned: + - id: FoodBreadBunTop + amount: 1 + - id: FoodBreadBunBottom + amount: 1 +- type: entity + id: FoodBreadBunBottom + parent: FoodBreadSliceBase + name: bottom bun + description: It's time to start building the burger tower. + components: + - type: Food + - type: Sprite + drawdepth: Mobs + noRot: true + sprite: Objects/Consumable/Food/burger.rsi + layers: + - state: bun_bottom + - type: FoodSequenceStartPoint + key: burger + maxLayers: 20 + startPosition: 0, 0 + offset: 0, 0.1 + nameGeneration: food-sequence-standart-gen + nameSuffix: food-sequence-burger-suffix + - type: Appearance + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 3.3 # 1/2 of a bun + +- type: entity + id: FoodBreadBunTop + parent: FoodBreadSliceBase + name: top bun + description: the perfect finish for your burger tower + components: + - type: Food + - type: Sprite + sprite: Objects/Consumable/Food/burger.rsi + layers: + - state: bun_top + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 3.3 # 1/2 of a bun + - type: FoodSequenceElement + entries: + burger: + final: true + sprite: + sprite: Objects/Consumable/Food/burger.rsi + state: bun_top + # Base - type: entity @@ -620,7 +682,8 @@ description: An elusive rib shaped burger with limited availability across the galaxy. Not as good as you remember it. components: - type: Food - trash: FoodKebabSkewer + trash: + - FoodKebabSkewer - type: FlavorProfile flavors: - bun diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml index 8cd2fa70ee..a4593d5006 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/egg.yml @@ -11,7 +11,8 @@ - Egg - Meat - type: Food - trash: Eggshells + trash: + - Eggshells - type: Sprite sprite: Objects/Consumable/Food/egg.rsi - type: Item diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml index c760e5e3eb..6465b5d06f 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml @@ -88,7 +88,8 @@ - state: popsicle color: orange - type: Food - trash: FoodFrozenPopsicleTrash + trash: + - FoodFrozenPopsicleTrash - type: entity name: berry creamsicle @@ -103,7 +104,8 @@ - state: popsicle color: red - type: Food - trash: FoodFrozenPopsicleTrash + trash: + - FoodFrozenPopsicleTrash - type: Tag tags: - Fruit @@ -119,7 +121,8 @@ - state: stick - state: jumbo - type: Food - trash: FoodFrozenPopsicleTrash + trash: + - FoodFrozenPopsicleTrash - type: SolutionContainerManager solutions: food: @@ -149,7 +152,8 @@ - state: alpha-filling # color: foo - type: Food - trash: FoodFrozenSnowconeTrash + trash: + - FoodFrozenSnowconeTrash - type: SolutionContainerManager solutions: food: @@ -187,7 +191,8 @@ - state: cone - state: berry - type: Food - trash: FoodFrozenSnowconeTrash + trash: + - FoodFrozenSnowconeTrash - type: Tag tags: - Fruit @@ -203,7 +208,8 @@ - state: cone - state: fruitsalad - type: Food - trash: FoodFrozenSnowconeTrash + trash: + - FoodFrozenSnowconeTrash - type: Tag tags: - Fruit @@ -219,7 +225,8 @@ - state: cone - state: clown - type: Food - trash: FoodFrozenSnowconeTrash + trash: + - FoodFrozenSnowconeTrash - type: entity name: mime snowcone @@ -232,7 +239,8 @@ - state: cone - state: mime - type: Food - trash: FoodFrozenSnowconeTrash + trash: + - FoodFrozenSnowconeTrash - type: entity name: rainbow snowcone @@ -245,7 +253,8 @@ - state: cone - state: rainbow - type: Food - trash: FoodFrozenSnowconeTrash + trash: + - FoodFrozenSnowconeTrash # Trash diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml index a81ed55545..5272334511 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml @@ -570,6 +570,13 @@ - type: SliceableFood count: 3 slice: FoodCheeseSlice + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-cheese + sprite: + sprite: Objects/Consumable/Food/ingredients.rsi + state: cheesewheel - type: entity name: cheese wedge @@ -592,6 +599,13 @@ - type: Tag tags: - Slice + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-cheese + sprite: + sprite: Objects/Consumable/Food/ingredients.rsi + state: cheesewedge - type: entity name: chèvre log diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml index 33c2a39d7f..1ded684c77 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml @@ -330,7 +330,8 @@ description: BBQ ribs, slathered in a healthy coating of BBQ sauce. The least vegan thing to ever exist. components: - type: Food - trash: FoodKebabSkewer + trash: + - FoodKebabSkewer - type: FlavorProfile flavors: - meaty @@ -591,7 +592,8 @@ description: Buttery. components: - type: Food - trash: FoodPlate + trash: + - FoodPlate - type: FlavorProfile flavors: - corn diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml index 59b1db1782..885c483ad0 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml @@ -106,6 +106,13 @@ graph: MeatSteak node: start defaultTarget: meat steak + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-raw-meat + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: plain - type: Tag tags: - Meat @@ -150,6 +157,13 @@ reagents: - ReagentId: CarpoToxin Quantity: 5 + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-carp + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: fish - type: Extractable juiceSolution: reagents: @@ -185,6 +199,13 @@ graph: Bacon node: start defaultTarget: bacon + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-carp + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: bacon - type: entity name: raw bear meat @@ -209,6 +230,13 @@ graph: BearSteak node: start defaultTarget: filet migrawr + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-bear + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: bear - type: entity @@ -234,6 +262,13 @@ graph: PenguinSteak node: start defaultTarget: cooked penguin + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-penguin + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: bird - type: entity name: raw chicken meat @@ -260,6 +295,13 @@ graph: ChickenSteak node: start defaultTarget: cooked chicken + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-chiken + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: bird - type: entity name: raw duck meat @@ -284,6 +326,13 @@ graph: DuckSteak node: start defaultTarget: cooked duck + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-penguin + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: bird - type: entity name: prime-cut corgi meat @@ -309,6 +358,13 @@ price: 750 - type: StealTarget stealGroup: FoodMeatCorgi + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-corgi + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: corgi - type: entity name: raw crab meat @@ -333,6 +389,13 @@ graph: CrabSteak node: start defaultTarget: cooked crab + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-crab + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: crab - type: entity name: raw goliath meat @@ -356,6 +419,13 @@ graph: GoliathSteak node: start defaultTarget: goliath steak + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-goliath + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: goliath - type: entity name: dragon flesh @@ -383,6 +453,13 @@ reagents: - ReagentId: Ichor Quantity: 10 + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-dragon + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: dragon - type: entity name: raw rat meat @@ -403,6 +480,13 @@ - type: SliceableFood count: 3 slice: FoodMeatCutlet + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-rat + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: plain - type: entity name: raw lizard meat @@ -427,6 +511,13 @@ graph: LizardSteak node: start defaultTarget: lizard steak + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-lizard + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: lizard - type: entity name: raw plant meat @@ -436,6 +527,13 @@ components: - type: Sprite state: plant + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-plant + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: plant - type: entity name: rotten meat @@ -461,6 +559,13 @@ Quantity: 4 - ReagentId: Fat Quantity: 4 + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-rotten + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: rotten - type: entity name: raw spider meat @@ -481,6 +586,13 @@ - type: SliceableFood count: 3 slice: FoodMeatSpiderCutlet + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-spider + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: spider - type: entity name: raw spider leg @@ -498,6 +610,13 @@ Quantity: 10 - ReagentId: Fat Quantity: 3 + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-spider + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: spiderleg - type: entity name: meatwheat clump @@ -513,6 +632,13 @@ reagents: - ReagentId: UncookedAnimalProteins Quantity: 1 + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-clump + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: clump - type: entity name: raw snake meat @@ -533,6 +659,13 @@ Quantity: 10 - ReagentId: Toxin Quantity: 2 + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-snake + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: snake - type: entity name: raw xeno meat @@ -560,6 +693,13 @@ - type: SliceableFood count: 3 slice: FoodMeatXenoCutlet + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-xeno + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: xeno - type: entity name: raw rouny meat @@ -589,6 +729,13 @@ graph: RounySteak node: start defaultTarget: rouny steak + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-xeno + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: xeno - type: entity name: killer tomato meat @@ -603,6 +750,13 @@ slice: FoodMeatTomatoCutlet - type: StaticPrice price: 100 + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-tomato + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: tomato - type: entity name: salami @@ -648,6 +802,13 @@ state: clown - type: SliceableFood slice: FoodMeatSalamiSlice + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-clown + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: clown - type: entity name: meatball @@ -661,6 +822,13 @@ - Meat - type: Sprite state: meatball + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-raw-meat + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: meatball - type: entity name: slimeball @@ -677,6 +845,13 @@ - Meat - type: Sprite state: slime + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-slime + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: slime # Cooked @@ -740,6 +915,12 @@ - type: Construction graph: MeatSteak node: meat steak + - type: FoodSequenceElement + entries: + burger: + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: plain-cooked - type: entity name: bacon @@ -771,6 +952,12 @@ - type: Construction graph: Bacon node: bacon + - type: FoodSequenceElement + entries: + burger: + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: bacon-cooked - type: entity name: cooked bear @@ -800,6 +987,13 @@ - type: Construction graph: BearSteak node: filet migrawr + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-bear + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: product-cooked - type: entity name: penguin filet @@ -828,6 +1022,13 @@ - type: Construction graph: PenguinSteak node: cooked penguin + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-penguin + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: bird-cooked - type: entity name: cooked chicken @@ -856,6 +1057,13 @@ - type: Construction graph: ChickenSteak node: cooked chicken + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-chiken + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: bird-cooked - type: entity name: fried chicken @@ -884,6 +1092,13 @@ Quantity: 5 - ReagentId: Protein Quantity: 5 + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-chiken + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: chicken-fried - type: entity name: cooked duck @@ -912,6 +1127,13 @@ - type: Construction graph: DuckSteak node: cooked duck + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-duck + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: bird-cooked - type: entity name: cooked crab @@ -940,6 +1162,13 @@ - type: Construction graph: CrabSteak node: cooked crab + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-crab + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: crab-cooked - type: entity name: goliath steak @@ -966,6 +1195,13 @@ - type: Construction graph: GoliathSteak node: goliath steak + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-goliath + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: goliath-cooked - type: entity name: rouny steak @@ -996,6 +1232,13 @@ - type: Construction graph: RounySteak node: rouny steak + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-xeno + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: rouny-cooked - type: entity name: lizard steak @@ -1025,6 +1268,13 @@ - type: Construction graph: LizardSteak node: lizard steak + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-lizard + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: lizard-cooked - type: entity name: boiled spider leg @@ -1047,6 +1297,13 @@ Quantity: 5 - ReagentId: Protein Quantity: 5 + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-spider + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: spiderleg-cooked - type: entity name: meatball @@ -1068,6 +1325,12 @@ Quantity: 5 - ReagentId: Protein Quantity: 5 + - type: FoodSequenceElement + entries: + burger: + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: meatball-cooked # Cutlets @@ -1094,6 +1357,12 @@ Quantity: 3 - ReagentId: Fat Quantity: 2 + - type: FoodSequenceElement + entries: + burger: + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: cutlet - type: entity name: raw bear cutlet @@ -1119,6 +1388,14 @@ Quantity: 3 - ReagentId: Fat Quantity: 2 + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-bear + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: cutlet + color: brown - type: entity name: raw penguin cutlet @@ -1142,6 +1419,14 @@ Quantity: 3 - ReagentId: Fat Quantity: 2 + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-penguin + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: cutlet + color: white - type: entity name: raw chicken cutlet @@ -1165,6 +1450,14 @@ Quantity: 3 - ReagentId: Fat Quantity: 2 + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-chiken + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: cutlet + color: white - type: entity name: raw duck cutlet @@ -1188,6 +1481,14 @@ Quantity: 3 - ReagentId: Fat Quantity: 2 + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-duck + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: cutlet + color: white - type: entity name: raw lizard cutlet @@ -1214,6 +1515,14 @@ Quantity: 3 - ReagentId: Fat Quantity: 2 + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-lizard + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: cutlet + color: pink - type: entity name: raw spider cutlet @@ -1236,6 +1545,13 @@ Quantity: 3 - ReagentId: Fat Quantity: 2 + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-spider + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: spidercutlet - type: entity name: raw xeno cutlet @@ -1260,6 +1576,13 @@ reagents: - ReagentId: SulfuricAcid Quantity: 20 + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-xeno + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: xenocutlet - type: entity name: raw killer tomato cutlet @@ -1276,6 +1599,13 @@ color: red - type: StaticPrice price: 30 + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-tomato + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: salami-slice - type: entity name: salami slice @@ -1298,6 +1628,13 @@ Quantity: 1 - ReagentId: Protein Quantity: 1 + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-salami + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: salami-slice # Cooked @@ -1322,6 +1659,12 @@ Quantity: 2 - ReagentId: Protein Quantity: 2 + - type: FoodSequenceElement + entries: + burger: + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: cutlet-cooked - type: entity name: bear cutlet @@ -1347,6 +1690,13 @@ Quantity: 2 - ReagentId: Protein Quantity: 2 + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-bear + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: cutlet-cooked - type: entity name: penguin cutlet @@ -1370,6 +1720,13 @@ Quantity: 2 - ReagentId: Protein Quantity: 2 + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-penguin + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: cutlet-cooked - type: entity name: chicken cutlet @@ -1393,6 +1750,13 @@ Quantity: 2 - ReagentId: Protein Quantity: 2 + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-chiken + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: cutlet-cooked - type: entity name: duck cutlet @@ -1416,6 +1780,13 @@ Quantity: 2 - ReagentId: Protein Quantity: 2 + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-duck + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: cutlet-cooked - type: entity name: lizard cutlet @@ -1440,6 +1811,13 @@ Quantity: 2 - ReagentId: Protein Quantity: 2 + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-lizard + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: cutlet-cooked - type: entity name: spider cutlet @@ -1462,6 +1840,13 @@ Quantity: 1 - ReagentId: Protein Quantity: 1 + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-spider + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: cutlet-cooked - type: entity name: xeno cutlet @@ -1484,3 +1869,10 @@ Quantity: 1 - ReagentId: Protein Quantity: 1 + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-xeno + sprite: + sprite: Objects/Consumable/Food/meat.rsi + state: xenocutlet-cooked diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 88a30150d8..d980db0ca1 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -142,6 +142,13 @@ - type: Tag tags: - Vegetable + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-pea + sprite: + sprite: Objects/Specific/Hydroponics/laughin_pea.rsi + state: produce - type: entity name: tower-cap log @@ -254,7 +261,8 @@ flavors: - banana - type: Food - trash: TrashBananaPeel + trash: + - TrashBananaPeel - type: SolutionContainerManager solutions: food: @@ -277,6 +285,13 @@ tags: - Fruit - Banana + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-banana + sprite: + sprite: Objects/Specific/Hydroponics/banana.rsi + state: produce - type: entity name: mimana @@ -289,7 +304,8 @@ - banana - nothing - type: Food - trash: TrashMimanaPeel + trash: + - TrashMimanaPeel - type: SolutionContainerManager solutions: food: @@ -313,6 +329,13 @@ - type: Tag tags: - Fruit + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-mimana + sprite: + sprite: Objects/Specific/Hydroponics/mimana.rsi + state: produce - type: entity name: banana peel @@ -451,6 +474,13 @@ Quantity: 10 - ReagentId: Oculine Quantity: 2 + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-carrot + sprite: + sprite: Objects/Specific/Hydroponics/carrot.rsi + state: produce - type: entity name: cabbage @@ -477,6 +507,13 @@ - type: Tag tags: - Vegetable + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-cabbage + sprite: + sprite: Objects/Specific/Hydroponics/cabbage.rsi + state: produce - type: entity name: garlic @@ -505,6 +542,13 @@ - type: Tag tags: - Vegetable + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-garlic + sprite: + sprite: Objects/Specific/Hydroponics/garlic.rsi + state: produce - type: entity name: lemon @@ -537,6 +581,13 @@ tags: - Lemon - Fruit + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-lemon + sprite: + sprite: Objects/Specific/Hydroponics/lemon.rsi + state: produce - type: entity name: lemoon @@ -568,6 +619,13 @@ - type: Tag tags: - Fruit + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-lemon + sprite: + sprite: Objects/Specific/Hydroponics/lemoon.rsi + state: produce - type: entity name: lime @@ -591,6 +649,13 @@ tags: - Lime - Fruit + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-lemon + sprite: + sprite: Objects/Specific/Hydroponics/lime.rsi + state: produce - type: entity name: orange @@ -613,6 +678,13 @@ - type: Tag tags: - Fruit + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-orange + sprite: + sprite: Objects/Specific/Hydroponics/orange.rsi + state: produce - type: entity name: pineapple @@ -649,6 +721,13 @@ - type: Tag tags: - Fruit + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-pineapple + sprite: + sprite: Objects/Specific/Hydroponics/pineapple.rsi + state: produce - type: entity name: potato @@ -681,6 +760,13 @@ tags: - Potato - Vegetable + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-potato + sprite: + sprite: Objects/Specific/Hydroponics/potato.rsi + state: produce - type: entity @@ -737,6 +823,13 @@ tags: - Fruit - Vegetable + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-tomato + sprite: + sprite: Objects/Specific/Hydroponics/tomato.rsi + state: produce - type: entity name: blue tomato @@ -782,6 +875,13 @@ tags: - Fruit - Vegetable + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-tomato + sprite: + sprite: Objects/Specific/Hydroponics/blue_tomato.rsi + state: produce - type: entity name: blood tomato @@ -825,6 +925,13 @@ tags: - Fruit # Fuck you they're a fruit - Vegetable + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-tomato + sprite: + sprite: Objects/Specific/Hydroponics/blood_tomato.rsi + state: produce - type: entity name: eggplant @@ -883,6 +990,13 @@ - type: Tag tags: - Fruit + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-apple + sprite: + sprite: Objects/Specific/Hydroponics/apple.rsi + state: produce - type: entity name: golden apple @@ -919,6 +1033,13 @@ - type: Tag tags: - Fruit + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-apple + sprite: + sprite: Objects/Specific/Hydroponics/golden_apple.rsi + state: produce - type: entity name: cocoa pod @@ -952,6 +1073,13 @@ - type: Tag tags: - Fruit + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-cocoa + sprite: + sprite: Objects/Specific/Hydroponics/cocoa.rsi + state: produce - type: entity name: ear of corn @@ -963,7 +1091,8 @@ flavors: - corn - type: Food - trash: FoodCornTrash + trash: + - FoodCornTrash - type: SolutionContainerManager solutions: food: @@ -989,6 +1118,13 @@ Quantity: 3 - ReagentId: Enzyme Quantity: 2 + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-corn + sprite: + sprite: Objects/Specific/Hydroponics/corn.rsi + state: produce - type: entity name: corn cob @@ -1011,6 +1147,13 @@ reagents: - ReagentId: Cornmeal Quantity: 10 + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-corn + sprite: + sprite: Objects/Specific/Hydroponics/corn.rsi + state: produce - type: entity name: onion @@ -1042,6 +1185,13 @@ - type: Tag tags: - Vegetable + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-onion + sprite: + sprite: Objects/Specific/Hydroponics/onion.rsi + state: produce - type: entity name: red onion @@ -1073,6 +1223,13 @@ - type: Tag tags: - Vegetable + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-onion + sprite: + sprite: Objects/Specific/Hydroponics/onion_red.rsi + state: produce - type: entity name: chanterelle cluster @@ -1093,6 +1250,13 @@ - type: Tag tags: - Vegetable + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-mushroom + sprite: + sprite: Objects/Specific/Hydroponics/chanterelle.rsi + state: produce # Slices @@ -1136,6 +1300,13 @@ tags: - Fruit - Slice + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-pineapple + sprite: + sprite: Objects/Specific/Hydroponics/pineapple.rsi + state: slice - type: entity name: onion slice @@ -1163,6 +1334,13 @@ tags: - Vegetable - Slice + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-onion + sprite: + sprite: Objects/Specific/Hydroponics/onion.rsi + state: slice - type: entity name: red onion slice @@ -1190,6 +1368,13 @@ tags: - Vegetable - Slice + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-onion + sprite: + sprite: Objects/Specific/Hydroponics/onion_red.rsi + state: slice - type: entity name: chili pepper @@ -1218,6 +1403,13 @@ - type: Tag tags: - Vegetable + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-chili + sprite: + sprite: Objects/Specific/Hydroponics/chili.rsi + state: produce - type: entity name: chilly pepper @@ -1244,6 +1436,13 @@ sprite: Objects/Specific/Hydroponics/chilly.rsi - type: Produce seedId: chilly + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-chilly + sprite: + sprite: Objects/Specific/Hydroponics/chilly.rsi + state: produce - type: entity name: aloe @@ -1272,6 +1471,13 @@ - type: Tag tags: - Vegetable + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-aloe + sprite: + sprite: Objects/Specific/Hydroponics/aloe.rsi + state: produce - type: entity name: poppy @@ -1304,6 +1510,13 @@ - type: Tag tags: - Flower # TODO add "RedFlower" or "Poppy" tag, when other color flowers will be + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-poppy + sprite: + sprite: Objects/Specific/Hydroponics/poppy.rsi + state: produce - type: entity name: lily @@ -1332,6 +1545,13 @@ - type: Tag tags: - Flower + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-lily + sprite: + sprite: Objects/Specific/Hydroponics/lily.rsi + state: produce - type: entity name: lingzhi @@ -1358,6 +1578,13 @@ seedId: lingzhi - type: Extractable grindableSolutionName: food + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-mushroom + sprite: + sprite: Objects/Specific/Hydroponics/lingzhi.rsi + state: produce - type: entity name: ambrosia vulgaris @@ -1397,6 +1624,13 @@ - type: Tag tags: - Ambrosia + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-ambrosia + sprite: + sprite: Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi + state: produce - type: entity name: ambrosia deus @@ -1434,6 +1668,13 @@ - type: Tag tags: - Ambrosia + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-ambrosia + sprite: + sprite: Objects/Specific/Hydroponics/ambrosia_deus.rsi + state: produce - type: entity name: galaxythistle @@ -1461,6 +1702,13 @@ tags: - Galaxythistle - Fruit # Probably? + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-galaxy + sprite: + sprite: Objects/Specific/Hydroponics/galaxythistle.rsi + state: produce - type: entity name: glasstle @@ -1525,7 +1773,13 @@ - type: Tag tags: - Galaxythistle - + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-glasstle + sprite: + sprite: Objects/Specific/Hydroponics/glasstle.rsi + state: produce - type: entity name: fly amanita @@ -1552,6 +1806,13 @@ - type: Extractable grindableSolutionName: food - type: BadFood + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-mushroom + sprite: + sprite: Objects/Specific/Hydroponics/fly_amanita.rsi + state: produce - type: entity name: gatfruit @@ -1576,10 +1837,18 @@ - type: Produce seedId: gatfruit - type: Food - trash: WeaponRevolverPython + trash: + - WeaponRevolverPython - type: Tag tags: - Fruit # It's in the name + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-gatfruit + sprite: + sprite: Objects/Specific/Hydroponics/gatfruit.rsi + state: produce - type: entity name: rice bushel @@ -1597,6 +1866,13 @@ Quantity: 10 - type: Produce seedId: rice + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-rice + sprite: + sprite: Objects/Specific/Hydroponics/rice.rsi + state: produce - type: entity name: soybeans @@ -1623,6 +1899,13 @@ - type: Tag tags: - Vegetable + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-soy + sprite: + sprite: Objects/Specific/Hydroponics/soybeans.rsi + state: produce - type: entity name: spaceman's trumpet @@ -1651,6 +1934,13 @@ - Flower - type: Instrument #hehe trumpet program: 56 + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-soy + sprite: + sprite: Objects/Specific/Hydroponics/soybeans.rsi + state: produce - type: entity name: koibean @@ -1679,6 +1969,13 @@ - type: Tag tags: - Vegetable + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-koibean + sprite: + sprite: Objects/Specific/Hydroponics/koibean.rsi + state: produce - type: entity name: watermelon @@ -1775,6 +2072,13 @@ tags: - Fruit - Slice + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-watermelon + sprite: + sprite: Objects/Specific/Hydroponics/watermelon.rsi + state: slice - type: entity name: grapes @@ -1848,7 +2152,8 @@ flavors: - bungo - type: Food - trash: FoodBungoPit + trash: + - FoodBungoPit - type: SolutionContainerManager solutions: food: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml index 6c16a541cd..64b8c288af 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/skewer.yml @@ -7,7 +7,8 @@ abstract: true components: - type: Food - trash: FoodKebabSkewer + trash: + - FoodKebabSkewer - type: Sprite sprite: Objects/Consumable/Food/skewer.rsi - type: SolutionContainerManager diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml index e8a646e8c9..ff0504d39e 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml @@ -41,7 +41,8 @@ state: boritos - type: Item - type: Food - trash: FoodPacketBoritosTrash + trash: + - FoodPacketBoritosTrash - type: entity name: C&Ds @@ -56,7 +57,8 @@ state: cnds - type: Item - type: Food - trash: FoodPacketCnDsTrash + trash: + - FoodPacketCnDsTrash - type: entity name: cheesie honkers @@ -72,7 +74,8 @@ state: cheesiehonkers - type: Item - type: Food - trash: FoodPacketCheesieTrash + trash: + - FoodPacketCheesieTrash - type: entity name: chips @@ -89,7 +92,8 @@ state: chips - type: Item - type: Food - trash: FoodPacketChipsTrash + trash: + - FoodPacketChipsTrash - type: entity name: chocolate bar @@ -183,7 +187,8 @@ state: pistachio - type: Item - type: Food - trash: FoodPacketPistachioTrash + trash: + - FoodPacketPistachioTrash - type: Tag tags: - Fruit # Seed of a fruit, you can yell at me @@ -204,7 +209,8 @@ - type: Item heldPrefix: popcorn - type: Food - trash: FoodPacketPopcornTrash + trash: + - FoodPacketPopcornTrash - type: entity name: 4no raisins @@ -219,7 +225,8 @@ state: raisins - type: Item - type: Food - trash: FoodPacketRaisinsTrash + trash: + - FoodPacketRaisinsTrash - type: Tag tags: - Fruit @@ -237,7 +244,8 @@ state: semki - type: Item - type: Food - trash: FoodPacketSemkiTrash + trash: + - FoodPacketSemkiTrash - type: entity name: sus jerky @@ -252,7 +260,8 @@ state: susjerky - type: Item - type: Food - trash: FoodPacketSusTrash + trash: + - FoodPacketSusTrash - type: Tag tags: - Meat @@ -270,7 +279,8 @@ state: syndicakes - type: Item - type: Food - trash: FoodPacketSyndiTrash + trash: + - FoodPacketSyndiTrash - type: entity parent: FoodSnackBase @@ -294,7 +304,8 @@ - type: Sprite state: ramen - type: Food - trash: FoodPacketCupRamenTrash + trash: + - FoodPacketCupRamenTrash - type: entity parent: DrinkRamen @@ -336,7 +347,8 @@ - ReagentId: Soysauce Quantity: 2 - type: Food - trash: FoodPacketChowMeinTrash + trash: + - FoodPacketChowMeinTrash - type: entity name: dan dan noodles @@ -364,7 +376,8 @@ - ReagentId: Soysauce Quantity: 2 - type: Food - trash: FoodPacketDanDanTrash + trash: + - FoodPacketDanDanTrash - type: entity name: fortune cookie @@ -389,7 +402,8 @@ heldPrefix: packet size: Tiny - type: Food - trash: FoodCookieFortune + trash: + - FoodCookieFortune - type: entity id: FoodSnackNutribrick diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml index 6b96f3bcb3..5c2a87c2b1 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml @@ -8,7 +8,8 @@ - type: Item storedRotation: -90 - type: Food - trash: FoodBowlBig + trash: + - FoodBowlBig utensil: Spoon - type: SolutionContainerManager solutions: @@ -970,7 +971,8 @@ flavors: - miso - type: Food - trash: FoodBowlFancy + trash: + - FoodBowlFancy - type: Sprite layers: - state: bowl2 diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml index a3fc4a2774..e8d4094400 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml @@ -510,7 +510,8 @@ flavors: - banana - type: Food - trash: TrashBananiumPeel + trash: + - TrashBananiumPeel - type: BadFood - type: SolutionContainerManager solutions: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml index c26ba925e0..6bef30e8c7 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml @@ -17,6 +17,13 @@ reagents: - ReagentId: THC Quantity: 15 + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-cannabis + sprite: + sprite: Objects/Specific/Hydroponics/cannabis.rsi + state: produce - type: entity @@ -37,6 +44,13 @@ - type: Sprite sprite: Objects/Specific/Hydroponics/tobacco.rsi state: dried + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-cannabis + sprite: + sprite: Objects/Specific/Hydroponics/tobacco.rsi + state: dried - type: entity name: ground cannabis @@ -65,6 +79,13 @@ - Smokable - type: Item size: Tiny + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-cannabis + sprite: + sprite: Objects/Misc/reagent_fillings.rsi + state: powderpile - type: entity name: rainbow cannabis leaves @@ -97,6 +118,13 @@ # Quantity: 1 - ReagentId: Psicodine Quantity: 0.6 + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-rainbow-cannabis + sprite: + sprite: Objects/Specific/Hydroponics/rainbow_cannabis.rsi + state: produce - type: entity name: dried rainbow cannabis leaves @@ -127,6 +155,13 @@ - type: Sprite sprite: Objects/Specific/Hydroponics/rainbow_cannabis.rsi state: dried + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-rainbow-cannabis + sprite: + sprite: Objects/Specific/Hydroponics/rainbow_cannabis.rsi + state: dried - type: entity name: ground rainbow cannabis @@ -160,6 +195,13 @@ - type: Construction graph: smokeableGroundCannabisRainbow node: groundRainbow + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-rainbow-cannabis + sprite: + sprite: Objects/Specific/Hydroponics/rainbow_cannabis.rsi + state: powderpile_rainbow - type: entity name: tobacco leaves @@ -218,3 +260,10 @@ - Smokable - type: Item size: Tiny + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-tobacco + sprite: + sprite: Objects/Misc/reagent_fillings.rsi + state: powderpile diff --git a/Resources/Textures/Objects/Consumable/Food/burger.rsi/bun_bottom.png b/Resources/Textures/Objects/Consumable/Food/burger.rsi/bun_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..aec759f62a0d4acf5c95c4d3d2cc8178cd07db8a GIT binary patch literal 319 zcmV-F0l@x=P)Px#`AI}UR9J=Wl)Y*KK@>($#AXpJjMcyr!Nx{gF$nttsZHbKrP10K5M)K{Ok*Q# zSg>*}gb+yKTF8i)$le_hn|sRn`wn;R3@D1CC=cezWm8~CFUQ7fx3h{a!SBrit={Wt zd@&4xed;12UK|)w8(j74f95ywip4Nw@VU<=A*w)DI6&2})9L{nt09%h6p)19B2kc7 zMv0dhel8Iuo@lLD0FHMo;WwO%!$H`Dfgx?168*Oqc7Ek*6PDvGAEPg3>u+%*=6VHf zQ=<0#L$}jl=T}a1<#@|vx+F@xT;aI{tOS4+vDjd^<3I49$T_Y*p`s{?asbW!TZPx$DM>^@R9J=Wlrc-gKp2Lf29ZikD0E7e2w9WTMTC@4aP$YXztR4Hjs+tes|v;C=?2X;-6_XSv0iCj^`dW&GtHLB0Tmr zT+0MN4?Px>2smU-j8sk@+GM%#WyhdB==1UTBIB9wu$V;LFAud$R7%Xnd!vBX@(lo^ zW5~Ej1OWR)u-@)!nb4|=yOv2hUjfj)y9MApxGszVdZU1`ua)*mBLe`gWuk|k9LLic zA`yH>&xk}2PiHcg&R4QO{>;F7yOY&tzQaBdv$gfJR9w@6!4?Srv7q8O; zwO;{zU&*mBaGF=})5MLfbJczS6?=^@c-o|=`v=O5Px$mPtfGR9Jv$rvT`k-2iZK zaj5c|Fh>aisk=eDNYpHX#lE+A= z7&O`>ONBXe=}v#K8mHH_NbSV}YisR*6a=U3MkaxgNvIAaO9d5^v9xL>N02EY&$i4CKz4f!^!0G^Q2$37c z%TyF(t_9!+;Z}dL`6IT-TpK_jW1J47HBM1SONklsqAtVu7`_c0dY(({>}1z{n(22a=_Nipf}7wUJg`Z2&1Kvj(T__T2-6Mq9<2<+_6X zHNexW4WQa6g$2U=8jHLoF0gX%_T|~vBX9{%qN!;*^3Klw_MB1iG*0Vyq&6O$*%zyE zTD8&K+%K;m8BWGrecXF`X#oHVLR945c=+D>S#w}@05^ol4dZ1h3NqIM@PlxxKiT{d zTV$>cAQ1BH1tS2%$ymh}nJ)$42O|<=9n(;uLWTNM`UKXP!3|HOi8BBI002ovPDHLk FV1mv3tt0>d diff --git a/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/aloe.rsi/produce.png index 68f2133a9984185760b34ab2742e08141fe36bf0..3e0c08cf2d6e3c8e3557a85934584fabf8c089d4 100644 GIT binary patch delta 393 zcmV;40e1d}2eAgQvjKkrXh}ptR9J=Wl|M_vKp4iKhFaPnHBfYj(6Oi>h={A-z{#nT zZq8lY9J0A&aB@o!N54eYd;lZa>X4zK5L>u}H1r(8ok99138|pmvmKYa_s8=-?*$MN z5)%3gx_iB)gO^LXiMwlgif7jcT@^Ry_iN8p0+1~}i#+ToM<9PuP$|gL3s~_mCaBNT zqFYTBVNB3zs~qHTw}4kTmCnaf za?{c&01T%i0Kjy{D4^000SaNLh0L01FcU01FcV0GgZ_ z00007bV*G`2j&6<6Cxyhx+%~A000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dak zSAh-}0004BNkl zTRM8Vq^$21>Nd}x5Be%@&hLed0OXr5A`d&t5l9p;0}<*p4`YJXa@BN8QW3@ky{?*p z9PSQqeKBeTB36GDgfRgCB%*>uRIrFVw3Y!#6hM{~0D$AWFl>!7cfhoC3IOBz1OPCd zdD*wrkwjcUblP&GkyI8Nwnl|;8;)$Q;Q-q(QA4%*HEZS~_)n_ghz3^KLv2pMMXaEF;C0JszA@ zjzVDdq?(pa$MZ?Ho}a;6EeK`+MMu)rB~kEW9+(4^IRXF=S5KP-C~ghQ9~jsF(if-+ Vu~FH3;57gM002ovPDHLkV1ms~zuW)- diff --git a/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/apple.rsi/produce.png index 0bb7ca471b441e1a8e95737a1e226d2158d245d5..cc0a026b59f55fe524fffa5bc072e72acc42ab9b 100644 GIT binary patch delta 363 zcmV-x0hIpw0)+#RBYyw^b5ch_0Itp)=>Px$KS@MER9J=Wl(9;~Kpcm^rYSTSw6#MK zA%j&EIyegY2;%6bb#e6p92|-uK7xGSTBm~#x?-sn`=Iv zeD0s+Y-udlSqI*C!McU~X}WAPb=8rN=w3o-AlyMhJdwLw;6$kt6$=2Fxi^AW7-b-8 zC*{2=*p`}HxnzLXhkOgH5G*IY->ZVL0P{AOS@4#Bp}@YE9LGQDA80UWYlk922CFD^a1`_r#L-Rb z;_3r9I21vA1p5|(_zDFPLAMG{O*=GNLW`u4ww^->F)q!8xZP*DaKFoazWnYE6bgkx zp^%{7MAVyzH22KN$ek`YUH=>4bTi#Bu{pRvq$StlE_9C(qkj(cC-5|emJ4U)u)f`j zzt?YK9f8*<3H|Dh^7#>!d{kb^!$uWec9V5vZfdVl64{-70A>&Oe7`w7_x#%0%pVs` z_&Nmr5ek=boyg5yF?A6ATktXnYZMU&a%&IFiHuez0H7^>;(owXgGnbUAJo9mlgVQT zu!m4+gYJQDhFSB28e~>r*??RY?Dc;L@V?;R)Z7+~+u&BgE&4S>59LXTbz!V)gj)<- y{a0!a{c-g~{wYfR@Ol${YC)hRVueDX2>1b4wOVfEB2GB~0000k6_OXRol$xv zI&0-diSiQr4TZ&_Zygh5PCr;@t8+&$G4a>wLy!MCJv#Z>^SbV;3aO+s+W((1CHk@o Usy$=209wl6>FVdQ&MBb@02BRGrvLx| delta 149 zcmV;G0BZk+0_p*fB#|*Ze*tt-PE!Ct=GbNc003x7L_t(IjqT1c5`ZuW1i%Cg#sKmE zzm>$X0~-qqy>^cqQu^~s^0Nj2WL!#tz-g_Owg$j{gN%t9FpH>HXr{(u+|m8O#?4i= z2ZeDggS+;yaJqzr={F0P`wNLD&nI2CsN#+>e>(?p4+RlIo5ETE3jhEBNkvXXu0mjf DI59r| diff --git a/Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/blue_tomato.rsi/produce.png index 465dd4eefba5cd76ca04263a1f4be64fed919f43..b2a6d230a3c4cd5344cbbe4a3d459834289a48ac 100644 GIT binary patch delta 161 zcmcc3_=9nR3KwH>kh>GZx^prwCo0<43zP);1vC6d1qTAUof#MyqC8z3Lo9mVo^#}D zFyL^xC?>K|_shTSqO*4t-h^a}kIdXtpUyXFeBLHpVi|JINmO)^me9Rfd)c2R zrhjl;SYX`l7{hPg-pHG;;9+{@Jxj%z9iQ3P``%?0bYfQ2WM|^#0b0Z0>FVdQ&MBb@ E0L->W)c^nh delta 133 zcmV;00DAxU0owtPB#|*ZdjWJ(PE!Ct=GbNc003D@L_t(IjqT1s4uCKSM9~%$D+Rp& zZN(<;95=3v&h~v0O8NKF)rSR9-sA%z1rHON00000NkvXXu0mjfkTW-> diff --git a/Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/cannabis.rsi/produce.png index a03a31182b1513f9953168253a5405d9b45b6989..601dc37fbc89881ee3c8d548f9aff4c70f63dc0d 100644 GIT binary patch delta 191 zcmcb^_?~fsgct`i0|SH0lCEPwim^Dz-HBn{IhmIe6;xNXiOy?@4bDSj&w rT~v@_5&HYT+!9%n7n6d0thVOyRx&C)5?`|y=mG{$S3j3^P6Fp zAPhxI!Mm0P2#t3Iy_2|sj^O?~h!?aSK$|paUef Date: Sat, 10 Aug 2024 19:32:38 +0000 Subject: [PATCH 355/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 3bd626b54a..87d6f66552 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: Vasilis - changes: - - message: NPC's activly being controlled by a player wont return to their AI behevior - if the player disconnects. - type: Fix - id: 6583 - time: '2024-05-11T15:01:29.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27651 - author: ShadowCommander changes: - message: Fixed screen freeze in some cases when getting gibbed or butchered. @@ -3788,3 +3780,10 @@ id: 7082 time: '2024-08-10T18:16:56.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29315 +- author: TheShuEd + changes: + - message: You cat cut burger bun into two halfs, and make custom burgers now! + type: Add + id: 7083 + time: '2024-08-10T19:31:32.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30755 From e569a78f171bafe3596e7e72bd34ed0cb2b1a9bc Mon Sep 17 00:00:00 2001 From: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com> Date: Sat, 10 Aug 2024 19:47:28 +0000 Subject: [PATCH 356/422] chore(bagel): Remove EntityStorageComponent (#30881) --- Resources/Maps/bagel.yml | 56 ---------------------------------------- 1 file changed, 56 deletions(-) diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml index 09e40b30ce..d86d7dd464 100644 --- a/Resources/Maps/bagel.yml +++ b/Resources/Maps/bagel.yml @@ -60581,10 +60581,6 @@ entities: - type: Transform pos: 7.5,23.5 parent: 60 - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - type: EntityStorage air: volume: 200 @@ -60628,10 +60624,6 @@ entities: - 0 - 0 - 0 - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - uid: 3600 components: - type: Transform @@ -60655,10 +60647,6 @@ entities: - 0 - 0 - 0 - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - uid: 13604 components: - type: Transform @@ -60687,10 +60675,6 @@ entities: - 0 - 0 - 0 - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - proto: CrateEngineeringCableHV entities: - uid: 3440 @@ -60716,10 +60700,6 @@ entities: - 0 - 0 - 0 - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - uid: 11479 components: - type: Transform @@ -60743,10 +60723,6 @@ entities: - 0 - 0 - 0 - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - uid: 20420 components: - type: Transform @@ -60770,10 +60746,6 @@ entities: - 0 - 0 - 0 - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - proto: CrateEngineeringCableLV entities: - uid: 2034 @@ -60799,10 +60771,6 @@ entities: - 0 - 0 - 0 - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - proto: CrateEngineeringCableMV entities: - uid: 3756 @@ -60828,10 +60796,6 @@ entities: - 0 - 0 - 0 - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - uid: 11680 components: - type: Transform @@ -60855,10 +60819,6 @@ entities: - 0 - 0 - 0 - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - uid: 19314 components: - type: Transform @@ -60882,10 +60842,6 @@ entities: - 0 - 0 - 0 - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - proto: CrateEngineeringSecure entities: - uid: 3669 @@ -61042,10 +60998,6 @@ entities: - 0 - 0 - 0 - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - proto: CrateNPCChicken entities: - uid: 5597 @@ -61115,10 +61067,6 @@ entities: - type: Transform pos: -47.5,-10.5 parent: 60 - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - type: EntityStorage air: volume: 200 @@ -61151,10 +61099,6 @@ entities: - type: Transform pos: -7.5,-28.5 parent: 60 - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - type: EntityStorage air: volume: 200 From 6803021623a2e9eea8bc8b31412c95b9b738de5c Mon Sep 17 00:00:00 2001 From: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com> Date: Sat, 10 Aug 2024 19:47:41 +0000 Subject: [PATCH 357/422] chore(meta): Remove EntityStorageComponent (#30883) --- Resources/Maps/meta.yml | 538 ---------------------------------------- 1 file changed, 538 deletions(-) diff --git a/Resources/Maps/meta.yml b/Resources/Maps/meta.yml index 82ab0632da..1b24c70772 100644 --- a/Resources/Maps/meta.yml +++ b/Resources/Maps/meta.yml @@ -57605,20 +57605,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 19392 components: - type: Transform @@ -57672,20 +57658,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: ClosetEmergencyFilledRandom entities: - uid: 483 @@ -57767,20 +57739,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 3573 components: - type: Transform @@ -57804,20 +57762,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 3685 components: - type: Transform @@ -57841,20 +57785,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 6049 components: - type: Transform @@ -57878,20 +57808,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 6050 components: - type: Transform @@ -57915,20 +57831,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 6152 components: - type: Transform @@ -57952,20 +57854,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 6153 components: - type: Transform @@ -57989,20 +57877,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 6154 components: - type: Transform @@ -58026,20 +57900,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 9783 components: - type: Transform @@ -58474,20 +58334,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 2152 components: - type: Transform @@ -58511,20 +58357,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 3591 components: - type: Transform @@ -58548,20 +58380,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 6051 components: - type: Transform @@ -58585,20 +58403,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 6155 components: - type: Transform @@ -58622,20 +58426,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 9199 components: - type: Transform @@ -59144,20 +58934,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: ClosetL3VirologyFilled entities: - uid: 16254 @@ -59254,20 +59030,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: ClosetMaintenanceFilledRandom entities: - uid: 1541 @@ -59293,20 +59055,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 2080 components: - type: Transform @@ -59330,20 +59078,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 10307 components: - type: Transform @@ -62760,28 +62494,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - PaperLabel: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - uid: 9406 components: - type: Transform @@ -62810,10 +62522,6 @@ entities: - 0 - 0 - 0 - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - proto: CrateEngineeringCableHV entities: - uid: 17216 @@ -62839,10 +62547,6 @@ entities: - 0 - 0 - 0 - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - uid: 22525 components: - type: Transform @@ -62866,10 +62570,6 @@ entities: - 0 - 0 - 0 - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - proto: CrateEngineeringCableMV entities: - uid: 6200 @@ -62895,28 +62595,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - PaperLabel: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - proto: CrateEngineeringSecure entities: - uid: 9203 @@ -63005,10 +62683,6 @@ entities: - type: Transform pos: -32.5,-54.5 parent: 5350 - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - type: EntityStorage air: volume: 200 @@ -63052,10 +62726,6 @@ entities: - 0 - 0 - 0 - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - uid: 15155 components: - type: Transform @@ -63079,10 +62749,6 @@ entities: - 0 - 0 - 0 - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - proto: CrateNPCHamlet entities: - uid: 5346 @@ -63115,10 +62781,6 @@ entities: - 0 - 0 - 0 - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - proto: CrateScienceSecure entities: - uid: 11228 @@ -63140,10 +62802,6 @@ entities: - type: Transform pos: -25.5,28.5 parent: 5350 - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - type: EntityStorage air: volume: 200 @@ -73926,20 +73584,6 @@ entities: - type: Transform pos: -30.428444,12.756947 parent: 5350 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - storagebase: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - type: PlaceableSurface isPlaceable: False - uid: 22815 @@ -116562,20 +116206,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: LockerChemistryFilled entities: - uid: 14303 @@ -116708,20 +116338,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 3247 components: - type: Transform @@ -116745,20 +116361,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 6199 components: - type: Transform @@ -116782,20 +116384,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 10321 components: - type: Transform @@ -117001,20 +116589,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 8212 components: - type: Transform @@ -117038,20 +116612,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 8233 components: - type: Transform @@ -117075,20 +116635,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 10487 components: - type: Transform @@ -117168,20 +116714,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 3158 components: - type: Transform @@ -117543,20 +117075,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: LockerResearchDirectorFilled entities: - uid: 22243 @@ -117840,20 +117358,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: LockerWeldingSuppliesFilled entities: - uid: 11832 @@ -161743,20 +161247,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 8204 components: - type: Transform @@ -161780,20 +161270,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 8205 components: - type: Transform @@ -161817,20 +161293,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: WardrobeSecurityFilled entities: - uid: 10524 From 6b5eb93fe7129dbe1b873218cc6a5c9d008443a4 Mon Sep 17 00:00:00 2001 From: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com> Date: Sat, 10 Aug 2024 19:47:52 +0000 Subject: [PATCH 358/422] chore(omega): Remove EntityStorageComponent (#30879) --- Resources/Maps/omega.yml | 1277 -------------------------------------- 1 file changed, 1277 deletions(-) diff --git a/Resources/Maps/omega.yml b/Resources/Maps/omega.yml index ae09e9e5fd..dff0f45a80 100644 --- a/Resources/Maps/omega.yml +++ b/Resources/Maps/omega.yml @@ -28528,20 +28528,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: ClosetChefFilled entities: - uid: 1568 @@ -28567,20 +28553,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: ClosetEmergencyFilledRandom entities: - uid: 1676 @@ -28606,20 +28578,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 1795 components: - type: Transform @@ -28643,20 +28601,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 2677 components: - type: Transform @@ -28680,20 +28624,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 2845 components: - type: Transform @@ -28722,20 +28652,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 4484 components: - type: Transform @@ -28759,20 +28675,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 4522 components: - type: Transform @@ -28796,20 +28698,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 4540 components: - type: Transform @@ -28833,20 +28721,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 4599 components: - type: Transform @@ -28870,20 +28744,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 4725 components: - type: Transform @@ -28930,20 +28790,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 7616 components: - type: Transform @@ -28967,20 +28813,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 9632 components: - type: Transform @@ -29009,20 +28841,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 10602 components: - type: Transform @@ -29046,20 +28864,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 10876 components: - type: Transform @@ -29083,20 +28887,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 11461 components: - type: Transform @@ -29120,20 +28910,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: ClosetEmergencyN2FilledRandom entities: - uid: 9631 @@ -29166,20 +28942,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 1796 components: - type: Transform @@ -29203,20 +28965,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 3674 components: - type: Transform @@ -29263,20 +29011,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 7615 components: - type: Transform @@ -29300,20 +29034,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 8456 components: - type: Transform @@ -29342,20 +29062,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 9690 components: - type: Transform @@ -29379,20 +29085,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 12474 components: - type: Transform @@ -29466,20 +29158,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: ClosetL3ScienceFilled entities: - uid: 6310 @@ -29505,20 +29183,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 11149 components: - type: Transform @@ -29542,20 +29206,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: ClosetL3SecurityFilled entities: - uid: 8423 @@ -29581,20 +29231,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: ClosetL3VirologyFilled entities: - uid: 8869 @@ -29620,20 +29256,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: ClosetLegalFilled entities: - uid: 8477 @@ -29659,20 +29281,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: ClosetMaintenanceFilledRandom entities: - uid: 9068 @@ -29698,20 +29306,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 10527 components: - type: Transform @@ -29735,20 +29329,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 10900 components: - type: Transform @@ -29772,20 +29352,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 11309 components: - type: Transform @@ -29809,57 +29375,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - uid: 11618 - components: - - type: Transform - pos: 30.5,-36.5 - parent: 4812 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14957 - moles: - - 1.6033952 - - 6.031821 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 11882 components: - type: Transform @@ -29883,20 +29398,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: ClosetRadiationSuitFilled entities: - uid: 6358 @@ -29922,20 +29423,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 9686 components: - type: Transform @@ -29959,20 +29446,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 9687 components: - type: Transform @@ -29996,20 +29469,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 11775 components: - type: Transform @@ -30033,20 +29492,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: ClosetSteelBase entities: - uid: 11811 @@ -30072,21 +29517,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: - - 11812 - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: ClosetWallAtmospherics entities: - uid: 9099 @@ -31874,10 +31304,6 @@ entities: - type: Transform pos: -16.5,9.5 parent: 4812 - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - type: EntityStorage air: volume: 200 @@ -31896,24 +31322,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - PaperLabel: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: CrateEmptySpawner entities: - uid: 3448 @@ -31933,10 +31341,6 @@ entities: - type: Transform pos: -38.5,-10.5 parent: 4812 - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - type: EntityStorage air: volume: 200 @@ -31955,24 +31359,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - PaperLabel: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: CrateEngineeringAMEShielding entities: - uid: 10777 @@ -31980,10 +31366,6 @@ entities: - type: Transform pos: -38.5,-11.5 parent: 4812 - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - type: EntityStorage air: volume: 200 @@ -32002,33 +31384,11 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - PaperLabel: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 10779 components: - type: Transform pos: -38.5,-12.5 parent: 4812 - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - type: EntityStorage air: volume: 200 @@ -32047,24 +31407,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - PaperLabel: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: CrateEngineeringCableBulk entities: - uid: 4489 @@ -32090,28 +31432,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - PaperLabel: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - uid: 10705 components: - type: Transform @@ -32135,28 +31455,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - PaperLabel: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - uid: 10723 components: - type: Transform @@ -32180,28 +31478,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - PaperLabel: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - proto: CrateEngineeringCableHV entities: - uid: 10925 @@ -32227,28 +31503,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - PaperLabel: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - proto: CrateFilledSpawner entities: - uid: 3713 @@ -32317,28 +31571,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - PaperLabel: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - proto: CrateScience entities: - uid: 12463 @@ -32371,10 +31603,6 @@ entities: - type: Transform pos: 12.5,-23.5 parent: 4812 - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - type: EntityStorage air: volume: 200 @@ -32393,33 +31621,11 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - PaperLabel: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 6251 components: - type: Transform pos: 14.5,-23.5 parent: 4812 - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - type: EntityStorage air: volume: 200 @@ -32438,24 +31644,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - PaperLabel: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: CrateTrashCart entities: - uid: 6171 @@ -56700,20 +55888,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 9571 components: - type: Transform @@ -56737,20 +55911,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: LockerBoozeFilled entities: - uid: 1648 @@ -56776,20 +55936,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: LockerBotanistFilled entities: - uid: 1103 @@ -56815,20 +55961,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: LockerCaptainFilled entities: - uid: 2595 @@ -56854,20 +55986,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: LockerChemistryFilled entities: - uid: 6609 @@ -56893,20 +56011,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: LockerChiefEngineerFilled entities: - uid: 9879 @@ -56932,20 +56036,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: LockerChiefMedicalOfficerFilledHardsuit entities: - uid: 7453 @@ -56978,20 +56068,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: LockerElectricalSuppliesFilled entities: - uid: 2578 @@ -57017,20 +56093,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 4491 components: - type: Transform @@ -57054,20 +56116,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 10600 components: - type: Transform @@ -57091,20 +56139,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 10722 components: - type: Transform @@ -57128,20 +56162,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: LockerEngineerFilled entities: - uid: 9719 @@ -57167,20 +56187,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 9720 components: - type: Transform @@ -57204,20 +56210,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 9721 components: - type: Transform @@ -57241,20 +56233,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: LockerEvidence entities: - uid: 4977 @@ -57295,20 +56273,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: LockerFreezer entities: - uid: 1538 @@ -57334,20 +56298,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 1563 components: - type: Transform @@ -57371,20 +56321,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 7394 components: - type: Transform @@ -57422,20 +56358,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: LockerHeadOfSecurityFilled entities: - uid: 8252 @@ -57461,20 +56383,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: LockerMedical entities: - uid: 7328 @@ -57529,20 +56437,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: LockerQuarterMasterFilled entities: - uid: 3441 @@ -57604,20 +56498,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: LockerSalvageSpecialistFilledHardsuit entities: - uid: 6777 @@ -57703,20 +56583,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 8421 components: - type: Transform @@ -57740,20 +56606,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 8422 components: - type: Transform @@ -57777,20 +56629,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: LockerWallMedicalFilled entities: - uid: 7430 @@ -57823,20 +56661,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: LockerWeldingSuppliesFilled entities: - uid: 9681 @@ -57862,20 +56686,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: MachineAnomalyGenerator entities: - uid: 6341 @@ -79598,20 +78408,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: WardrobeFormal entities: - uid: 10921 @@ -79637,23 +78433,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: - - 10924 - - 10923 - - 10922 - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: WardrobeMixedFilled entities: - uid: 10852 @@ -79704,20 +78483,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 8355 components: - type: Transform @@ -79741,20 +78506,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 8383 components: - type: Transform @@ -79778,20 +78529,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - uid: 8384 components: - type: Transform @@ -79815,20 +78552,6 @@ entities: - 0 - 0 - 0 - - type: ContainerContainer - containers: - EntityStorageComponent: !type:Container - showEnts: False - occludes: True - ents: [] - entity_storage: !type:Container - showEnts: False - occludes: True - ents: [] - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: WardrobeYellowFilled entities: - uid: 12169 From 95034512c1c54e3d0c993999e5f8acd94213b71d Mon Sep 17 00:00:00 2001 From: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com> Date: Sat, 10 Aug 2024 19:48:10 +0000 Subject: [PATCH 359/422] chore(marathon): Remove EntityStorageComponent (#30877) --- Resources/Maps/marathon.yml | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml index cce7a0d7b3..4cf794b85c 100644 --- a/Resources/Maps/marathon.yml +++ b/Resources/Maps/marathon.yml @@ -52686,10 +52686,6 @@ entities: - 0 - 0 - 0 - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - uid: 7840 components: - type: Transform @@ -52723,10 +52719,6 @@ entities: - 0 - 0 - 0 - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - uid: 22442 components: - type: Transform @@ -52782,10 +52774,6 @@ entities: - 0 - 0 - 0 - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - proto: CrateFilledSpawner entities: - uid: 3505 @@ -52852,10 +52840,6 @@ entities: - type: Transform pos: -28.5,17.5 parent: 30 - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - type: EntityStorage air: volume: 200 @@ -52933,10 +52917,6 @@ entities: - type: Transform pos: -32.5,12.5 parent: 30 - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - type: EntityStorage air: volume: 200 @@ -52960,10 +52940,6 @@ entities: - type: Transform pos: 46.5,23.5 parent: 30 - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - type: EntityStorage air: volume: 200 From 8afec58a0c48c5f5adb870bc447b60849c5408a0 Mon Sep 17 00:00:00 2001 From: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com> Date: Sat, 10 Aug 2024 19:48:19 +0000 Subject: [PATCH 360/422] chore(atlas): Remove EntityStorageComponent (#30876) --- Resources/Maps/atlas.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Resources/Maps/atlas.yml b/Resources/Maps/atlas.yml index bdc2c9cd29..8b9e1ab49e 100644 --- a/Resources/Maps/atlas.yml +++ b/Resources/Maps/atlas.yml @@ -20529,10 +20529,6 @@ entities: - type: Transform pos: -14.5,-18.5 parent: 30 - - type: Construction - containers: - - EntityStorageComponent - - entity_storage - uid: 7864 components: - type: Transform From d524d61b22f49991fc227744d4a26d9ec3add4da Mon Sep 17 00:00:00 2001 From: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com> Date: Sat, 10 Aug 2024 19:48:47 +0000 Subject: [PATCH 361/422] tweak(oasis): Lower the engineering borg spawn (#30874) --- Resources/Maps/oasis.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Resources/Maps/oasis.yml b/Resources/Maps/oasis.yml index ae213b3dd1..f83aa4e4aa 100644 --- a/Resources/Maps/oasis.yml +++ b/Resources/Maps/oasis.yml @@ -14481,7 +14481,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -9254.769 + secondsUntilStateChange: -9307.528 state: Opening - uid: 6934 components: @@ -14493,7 +14493,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -9257.402 + secondsUntilStateChange: -9310.162 state: Opening - uid: 6935 components: @@ -14505,7 +14505,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -9256.252 + secondsUntilStateChange: -9309.012 state: Opening - uid: 6936 components: @@ -14516,7 +14516,7 @@ entities: lastSignals: DoorStatus: True - type: Door - secondsUntilStateChange: -9255.469 + secondsUntilStateChange: -9308.229 state: Opening - proto: AirlockTheatreLocked entities: @@ -92183,7 +92183,7 @@ entities: pos: -13.5,-1.5 parent: 2 - type: Door - secondsUntilStateChange: -578.74854 + secondsUntilStateChange: -631.5082 state: Closing - type: DeviceNetwork deviceLists: @@ -136211,7 +136211,7 @@ entities: pos: 36.5,-35.5 parent: 2 - type: Door - secondsUntilStateChange: -37410.598 + secondsUntilStateChange: -37463.355 state: Opening - uid: 5211 components: @@ -137911,7 +137911,7 @@ entities: - type: Transform pos: 35.5,35.5 parent: 2 -- proto: LogicGate +- proto: LogicGateOr entities: - uid: 28922 components: @@ -157096,7 +157096,7 @@ entities: - uid: 28413 components: - type: Transform - pos: 13.5,61.5 + pos: 13.5,46.5 parent: 2 - uid: 28414 components: @@ -183809,7 +183809,7 @@ entities: pos: 24.5,2.5 parent: 21002 - type: Door - secondsUntilStateChange: -382615.2 + secondsUntilStateChange: -382667.94 state: Opening - uid: 28863 components: From 76d60140f6796ae665d8ea3ba866f45dd49aede7 Mon Sep 17 00:00:00 2001 From: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com> Date: Sat, 10 Aug 2024 19:49:01 +0000 Subject: [PATCH 362/422] add(meta): Add missing airvent to airlock (#30871) --- Resources/Maps/meta.yml | 4670 ++++++++++++++++++++------------------- 1 file changed, 2350 insertions(+), 2320 deletions(-) diff --git a/Resources/Maps/meta.yml b/Resources/Maps/meta.yml index 1b24c70772..fba648a5c1 100644 --- a/Resources/Maps/meta.yml +++ b/Resources/Maps/meta.yml @@ -10635,7 +10635,7 @@ entities: pos: -42.5,29.5 parent: 5350 - type: Door - secondsUntilStateChange: -206.70142 + secondsUntilStateChange: -296.73486 state: Opening - type: DeviceLinkSink invokeCounter: 2 @@ -74014,14 +74014,14 @@ entities: pos: -22.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 512 components: - type: Transform pos: 17.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 515 components: - type: Transform @@ -74029,7 +74029,7 @@ entities: pos: 17.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 592 components: - type: Transform @@ -74037,14 +74037,14 @@ entities: pos: 13.5,-1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 607 components: - type: Transform pos: 4.5,1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 648 components: - type: Transform @@ -74082,7 +74082,7 @@ entities: pos: -12.5,1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 773 components: - type: Transform @@ -74090,7 +74090,7 @@ entities: pos: 13.5,-3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 802 components: - type: Transform @@ -74129,7 +74129,7 @@ entities: pos: -2.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 1092 components: - type: Transform @@ -74145,7 +74145,7 @@ entities: pos: -0.5,-14.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 1607 components: - type: Transform @@ -74153,7 +74153,7 @@ entities: pos: -0.5,-15.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 1608 components: - type: Transform @@ -74192,7 +74192,7 @@ entities: pos: 24.5,-19.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2568 components: - type: Transform @@ -74214,7 +74214,7 @@ entities: pos: 34.5,-9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2655 components: - type: Transform @@ -74227,7 +74227,7 @@ entities: pos: 37.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2696 components: - type: Transform @@ -74250,7 +74250,7 @@ entities: pos: 20.5,-1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 3082 components: - type: Transform @@ -74258,7 +74258,7 @@ entities: pos: 24.5,-18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4008 components: - type: Transform @@ -74273,7 +74273,7 @@ entities: pos: -44.5,3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4093 components: - type: Transform @@ -74288,7 +74288,7 @@ entities: pos: -34.5,5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4148 components: - type: Transform @@ -74296,14 +74296,14 @@ entities: pos: -40.5,21.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4160 components: - type: Transform pos: -40.5,27.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4165 components: - type: Transform @@ -74311,7 +74311,7 @@ entities: pos: -34.5,22.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4180 components: - type: Transform @@ -74319,7 +74319,7 @@ entities: pos: -19.5,22.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4181 components: - type: Transform @@ -74327,14 +74327,14 @@ entities: pos: -19.5,25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4215 components: - type: Transform pos: -18.5,13.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4216 components: - type: Transform @@ -74342,7 +74342,7 @@ entities: pos: -23.5,13.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4261 components: - type: Transform @@ -74396,7 +74396,7 @@ entities: pos: -41.5,9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4352 components: - type: Transform @@ -74418,7 +74418,7 @@ entities: pos: -42.5,27.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5314 components: - type: Transform @@ -74426,7 +74426,7 @@ entities: pos: 57.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5489 components: - type: Transform @@ -74442,7 +74442,7 @@ entities: pos: -56.5,-9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5491 components: - type: Transform @@ -74457,7 +74457,7 @@ entities: pos: -70.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5544 components: - type: Transform @@ -74465,7 +74465,7 @@ entities: pos: -70.5,-9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5827 components: - type: Transform @@ -74481,7 +74481,7 @@ entities: pos: -61.5,-17.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6656 components: - type: Transform @@ -74504,7 +74504,7 @@ entities: pos: -7.5,34.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6801 components: - type: Transform @@ -74520,7 +74520,7 @@ entities: pos: -13.5,33.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6831 components: - type: Transform @@ -74528,7 +74528,7 @@ entities: pos: -12.5,33.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6832 components: - type: Transform @@ -74552,7 +74552,7 @@ entities: pos: 6.5,27.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6956 components: - type: Transform @@ -74560,7 +74560,7 @@ entities: pos: 4.5,36.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6957 components: - type: Transform @@ -74583,7 +74583,7 @@ entities: pos: 13.5,40.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7040 components: - type: Transform @@ -74597,14 +74597,14 @@ entities: pos: 2.5,44.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7058 components: - type: Transform pos: -3.5,37.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7061 components: - type: Transform @@ -74612,7 +74612,7 @@ entities: pos: -6.5,37.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7063 components: - type: Transform @@ -74627,7 +74627,7 @@ entities: pos: 17.5,15.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7168 components: - type: Transform @@ -74651,7 +74651,7 @@ entities: pos: -8.5,57.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7313 components: - type: Transform @@ -74666,7 +74666,7 @@ entities: pos: -7.5,57.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7819 components: - type: Transform @@ -74681,7 +74681,7 @@ entities: pos: -4.5,55.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7847 components: - type: Transform @@ -74689,7 +74689,7 @@ entities: pos: -12.5,55.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7852 components: - type: Transform @@ -74697,7 +74697,7 @@ entities: pos: 4.5,40.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8671 components: - type: Transform @@ -74705,7 +74705,7 @@ entities: pos: 34.5,19.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8748 components: - type: Transform @@ -74729,7 +74729,7 @@ entities: pos: 28.5,45.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8752 components: - type: Transform @@ -74743,7 +74743,7 @@ entities: pos: 36.5,45.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8754 components: - type: Transform @@ -74751,7 +74751,7 @@ entities: pos: 36.5,37.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8811 components: - type: Transform @@ -74759,7 +74759,7 @@ entities: pos: 22.5,29.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8812 components: - type: Transform @@ -74767,7 +74767,7 @@ entities: pos: 21.5,29.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8814 components: - type: Transform @@ -74775,7 +74775,7 @@ entities: pos: 16.5,19.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8815 components: - type: Transform @@ -74783,7 +74783,7 @@ entities: pos: 16.5,28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9003 components: - type: Transform @@ -74807,7 +74807,7 @@ entities: pos: 47.5,14.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9333 components: - type: Transform @@ -74829,7 +74829,7 @@ entities: pos: -31.5,30.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9474 components: - type: Transform @@ -74837,7 +74837,7 @@ entities: pos: -39.5,30.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9726 components: - type: Transform @@ -74845,7 +74845,7 @@ entities: pos: 47.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9733 components: - type: Transform @@ -74886,7 +74886,7 @@ entities: pos: 57.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 10965 components: - type: Transform @@ -74926,7 +74926,7 @@ entities: pos: 59.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11078 components: - type: Transform @@ -74934,7 +74934,7 @@ entities: pos: 59.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11118 components: - type: Transform @@ -74980,7 +74980,7 @@ entities: pos: 55.5,12.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11224 components: - type: Transform @@ -75048,7 +75048,7 @@ entities: pos: 43.5,-5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11862 components: - type: Transform @@ -75056,7 +75056,7 @@ entities: pos: 40.5,-5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11863 components: - type: Transform @@ -75064,7 +75064,7 @@ entities: pos: 43.5,-17.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12115 components: - type: Transform @@ -75080,14 +75080,14 @@ entities: pos: 22.5,-22.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12136 components: - type: Transform pos: 23.5,-22.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12140 components: - type: Transform @@ -75110,7 +75110,7 @@ entities: pos: 54.5,25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 13000 components: - type: Transform @@ -75125,14 +75125,14 @@ entities: pos: 31.5,43.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 13038 components: - type: Transform pos: 29.5,49.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 13044 components: - type: Transform @@ -75173,7 +75173,7 @@ entities: pos: -12.5,-29.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14617 components: - type: Transform @@ -75217,14 +75217,14 @@ entities: pos: -16.5,-48.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15526 components: - type: Transform pos: -16.5,-55.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15532 components: - type: Transform @@ -75240,7 +75240,7 @@ entities: pos: -7.5,-33.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16357 components: - type: Transform @@ -75248,7 +75248,7 @@ entities: pos: -36.5,-45.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16358 components: - type: Transform @@ -75256,7 +75256,7 @@ entities: pos: -36.5,-46.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16407 components: - type: Transform @@ -75281,7 +75281,7 @@ entities: pos: -41.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17346 components: - type: Transform @@ -75289,7 +75289,7 @@ entities: pos: -49.5,-41.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17664 components: - type: Transform @@ -75297,7 +75297,7 @@ entities: pos: -32.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17703 components: - type: Transform @@ -75313,7 +75313,7 @@ entities: pos: -35.5,-28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18360 components: - type: Transform @@ -75321,7 +75321,7 @@ entities: pos: -35.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18477 components: - type: Transform @@ -75329,7 +75329,7 @@ entities: pos: -47.5,-23.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18478 components: - type: Transform @@ -75337,14 +75337,14 @@ entities: pos: -46.5,-23.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18479 components: - type: Transform pos: -47.5,-21.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18480 components: - type: Transform @@ -75352,14 +75352,14 @@ entities: pos: -52.5,-21.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18481 components: - type: Transform pos: -46.5,-21.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18492 components: - type: Transform @@ -75367,14 +75367,14 @@ entities: pos: -54.5,-12.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18493 components: - type: Transform pos: -54.5,-11.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18494 components: - type: Transform @@ -75382,7 +75382,7 @@ entities: pos: -55.5,-11.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18504 components: - type: Transform @@ -75413,7 +75413,7 @@ entities: pos: 40.5,30.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18969 components: - type: Transform @@ -75421,7 +75421,7 @@ entities: pos: 46.5,30.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18970 components: - type: Transform @@ -75429,7 +75429,7 @@ entities: pos: 46.5,32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18997 components: - type: Transform @@ -75437,7 +75437,7 @@ entities: pos: 54.5,36.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 19033 components: - type: Transform @@ -75445,7 +75445,7 @@ entities: pos: 28.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 19034 components: - type: Transform @@ -75453,7 +75453,7 @@ entities: pos: 31.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 19035 components: - type: Transform @@ -75461,7 +75461,7 @@ entities: pos: 31.5,12.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 19047 components: - type: Transform @@ -75469,7 +75469,7 @@ entities: pos: 40.5,12.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 19340 components: - type: Transform @@ -75482,7 +75482,7 @@ entities: pos: 6.5,-25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20796 components: - type: Transform @@ -75490,7 +75490,7 @@ entities: pos: 7.5,-46.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20804 components: - type: Transform @@ -75498,7 +75498,7 @@ entities: pos: 7.5,-50.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20882 components: - type: Transform @@ -75506,21 +75506,21 @@ entities: pos: 22.5,-52.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20883 components: - type: Transform pos: 23.5,-52.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20888 components: - type: Transform pos: 29.5,-54.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20953 components: - type: Transform @@ -75661,14 +75661,14 @@ entities: pos: -10.5,-62.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21574 components: - type: Transform pos: -9.5,-71.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21575 components: - type: Transform @@ -75676,14 +75676,14 @@ entities: pos: -11.5,-71.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21606 components: - type: Transform pos: 1.5,-67.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21619 components: - type: Transform @@ -75691,7 +75691,7 @@ entities: pos: -18.5,-65.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 23387 components: - type: Transform @@ -75737,7 +75737,14 @@ entities: pos: 55.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' + - uid: 24856 + components: + - type: Transform + pos: -1.5,-71.5 + parent: 5350 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 25656 components: - type: Transform @@ -75745,7 +75752,7 @@ entities: pos: 94.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25657 components: - type: Transform @@ -75753,7 +75760,7 @@ entities: pos: 94.5,6.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25658 components: - type: Transform @@ -75761,7 +75768,7 @@ entities: pos: 95.5,6.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25659 components: - type: Transform @@ -75769,7 +75776,7 @@ entities: pos: 96.5,13.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25660 components: - type: Transform @@ -75777,7 +75784,7 @@ entities: pos: 95.5,13.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25661 components: - type: Transform @@ -75785,21 +75792,21 @@ entities: pos: 96.5,18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25662 components: - type: Transform pos: 112.5,18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25663 components: - type: Transform pos: 113.5,13.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25664 components: - type: Transform @@ -75807,7 +75814,7 @@ entities: pos: 112.5,13.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25665 components: - type: Transform @@ -75815,14 +75822,14 @@ entities: pos: 113.5,6.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25666 components: - type: Transform pos: 115.5,6.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25669 components: - type: Transform @@ -75830,7 +75837,7 @@ entities: pos: 115.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25670 components: - type: Transform @@ -75838,7 +75845,7 @@ entities: pos: 112.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25671 components: - type: Transform @@ -75846,7 +75853,7 @@ entities: pos: 112.5,-18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25672 components: - type: Transform @@ -75854,7 +75861,7 @@ entities: pos: 96.5,-18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25897 components: - type: Transform @@ -75862,7 +75869,7 @@ entities: pos: 104.5,4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25926 components: - type: Transform @@ -75893,14 +75900,14 @@ entities: pos: -22.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 273 components: - type: Transform pos: -22.5,5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 395 components: - type: Transform @@ -75942,14 +75949,14 @@ entities: pos: 27.5,-9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 3901 components: - type: Transform pos: -34.5,16.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4130 components: - type: Transform @@ -75963,14 +75970,14 @@ entities: pos: -3.5,25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6771 components: - type: Transform pos: -3.5,34.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6772 components: - type: Transform @@ -75998,7 +76005,7 @@ entities: pos: 6.5,32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6872 components: - type: Transform @@ -76012,21 +76019,21 @@ entities: pos: 6.5,14.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7164 components: - type: Transform pos: -8.5,55.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7236 components: - type: Transform pos: -12.5,48.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7300 components: - type: Transform @@ -76047,7 +76054,7 @@ entities: pos: 39.5,4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11123 components: - type: Transform @@ -76075,7 +76082,7 @@ entities: pos: -28.5,-32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14701 components: - type: Transform @@ -76101,7 +76108,7 @@ entities: pos: -3.5,-25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14948 components: - type: Transform @@ -76115,42 +76122,42 @@ entities: pos: -21.5,-55.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18547 components: - type: Transform pos: 54.5,32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20752 components: - type: Transform pos: 11.5,-35.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20831 components: - type: Transform pos: 21.5,-42.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25559 components: - type: Transform pos: 94.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25879 components: - type: Transform pos: 104.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - proto: GasPipeStraight entities: - uid: 248 @@ -76159,175 +76166,175 @@ entities: pos: -22.5,-19.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 249 components: - type: Transform pos: -22.5,-18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 250 components: - type: Transform pos: -22.5,-17.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 251 components: - type: Transform pos: -22.5,-16.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 252 components: - type: Transform pos: -22.5,-15.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 253 components: - type: Transform pos: -22.5,-14.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 254 components: - type: Transform pos: -22.5,-13.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 255 components: - type: Transform pos: -22.5,-12.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 256 components: - type: Transform pos: -22.5,-11.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 257 components: - type: Transform pos: -22.5,-10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 258 components: - type: Transform pos: -22.5,-9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 259 components: - type: Transform pos: -22.5,-8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 261 components: - type: Transform pos: -22.5,-6.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 262 components: - type: Transform pos: -22.5,-5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 264 components: - type: Transform pos: -22.5,-3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 266 components: - type: Transform pos: -22.5,-1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 267 components: - type: Transform pos: -22.5,-0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 269 components: - type: Transform pos: -22.5,1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 270 components: - type: Transform pos: -22.5,2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 271 components: - type: Transform pos: -22.5,3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 272 components: - type: Transform pos: -22.5,4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 274 components: - type: Transform pos: -22.5,6.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 275 components: - type: Transform pos: -22.5,7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 276 components: - type: Transform pos: -22.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 277 components: - type: Transform pos: -22.5,9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 278 components: - type: Transform @@ -76335,7 +76342,7 @@ entities: pos: -21.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 279 components: - type: Transform @@ -76343,7 +76350,7 @@ entities: pos: -20.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 280 components: - type: Transform @@ -76351,7 +76358,7 @@ entities: pos: -19.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 282 components: - type: Transform @@ -76359,7 +76366,7 @@ entities: pos: -17.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 283 components: - type: Transform @@ -76367,7 +76374,7 @@ entities: pos: -16.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 284 components: - type: Transform @@ -76375,7 +76382,7 @@ entities: pos: -15.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 285 components: - type: Transform @@ -76383,7 +76390,7 @@ entities: pos: -14.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 286 components: - type: Transform @@ -76391,7 +76398,7 @@ entities: pos: -13.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 289 components: - type: Transform @@ -76399,7 +76406,7 @@ entities: pos: -10.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 290 components: - type: Transform @@ -76407,7 +76414,7 @@ entities: pos: -9.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 291 components: - type: Transform @@ -76415,7 +76422,7 @@ entities: pos: -8.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 292 components: - type: Transform @@ -76423,7 +76430,7 @@ entities: pos: -7.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 293 components: - type: Transform @@ -76431,7 +76438,7 @@ entities: pos: -6.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 294 components: - type: Transform @@ -76439,7 +76446,7 @@ entities: pos: -5.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 297 components: - type: Transform @@ -76447,7 +76454,7 @@ entities: pos: -2.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 298 components: - type: Transform @@ -76455,7 +76462,7 @@ entities: pos: -1.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 299 components: - type: Transform @@ -76463,7 +76470,7 @@ entities: pos: -0.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 300 components: - type: Transform @@ -76471,7 +76478,7 @@ entities: pos: 0.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 301 components: - type: Transform @@ -76479,7 +76486,7 @@ entities: pos: 1.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 302 components: - type: Transform @@ -76487,7 +76494,7 @@ entities: pos: 2.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 303 components: - type: Transform @@ -76495,7 +76502,7 @@ entities: pos: 3.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 304 components: - type: Transform @@ -76503,7 +76510,7 @@ entities: pos: 4.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 305 components: - type: Transform @@ -76511,7 +76518,7 @@ entities: pos: 5.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 307 components: - type: Transform @@ -76519,7 +76526,7 @@ entities: pos: 7.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 308 components: - type: Transform @@ -76527,7 +76534,7 @@ entities: pos: 8.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 309 components: - type: Transform @@ -76535,7 +76542,7 @@ entities: pos: 9.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 310 components: - type: Transform @@ -76543,7 +76550,7 @@ entities: pos: 10.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 312 components: - type: Transform @@ -76551,7 +76558,7 @@ entities: pos: 12.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 313 components: - type: Transform @@ -76559,7 +76566,7 @@ entities: pos: 13.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 314 components: - type: Transform @@ -76567,7 +76574,7 @@ entities: pos: 14.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 315 components: - type: Transform @@ -76575,7 +76582,7 @@ entities: pos: 15.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 317 components: - type: Transform @@ -76583,7 +76590,7 @@ entities: pos: 17.5,9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 318 components: - type: Transform @@ -76591,7 +76598,7 @@ entities: pos: 17.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 319 components: - type: Transform @@ -76599,7 +76606,7 @@ entities: pos: 17.5,7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 320 components: - type: Transform @@ -76607,7 +76614,7 @@ entities: pos: 17.5,6.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 323 components: - type: Transform @@ -76615,7 +76622,7 @@ entities: pos: 17.5,3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 324 components: - type: Transform @@ -76623,7 +76630,7 @@ entities: pos: 17.5,2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 325 components: - type: Transform @@ -76631,7 +76638,7 @@ entities: pos: 17.5,1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 326 components: - type: Transform @@ -76639,7 +76646,7 @@ entities: pos: 17.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 327 components: - type: Transform @@ -76647,7 +76654,7 @@ entities: pos: 17.5,-0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 330 components: - type: Transform @@ -76655,7 +76662,7 @@ entities: pos: 17.5,-3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 332 components: - type: Transform @@ -76663,7 +76670,7 @@ entities: pos: 17.5,-5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 333 components: - type: Transform @@ -76671,7 +76678,7 @@ entities: pos: 17.5,-6.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 334 components: - type: Transform @@ -76679,7 +76686,7 @@ entities: pos: -20.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 335 components: - type: Transform @@ -76687,7 +76694,7 @@ entities: pos: 17.5,-8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 336 components: - type: Transform @@ -76695,7 +76702,7 @@ entities: pos: 17.5,-9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 337 components: - type: Transform @@ -76703,7 +76710,7 @@ entities: pos: 17.5,-10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 338 components: - type: Transform @@ -76711,7 +76718,7 @@ entities: pos: 17.5,-11.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 339 components: - type: Transform @@ -76719,7 +76726,7 @@ entities: pos: 17.5,-12.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 340 components: - type: Transform @@ -76727,7 +76734,7 @@ entities: pos: 17.5,-13.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 341 components: - type: Transform @@ -76735,7 +76742,7 @@ entities: pos: 17.5,-14.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 342 components: - type: Transform @@ -76743,7 +76750,7 @@ entities: pos: 17.5,-15.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 343 components: - type: Transform @@ -76751,7 +76758,7 @@ entities: pos: 17.5,-16.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 344 components: - type: Transform @@ -76759,7 +76766,7 @@ entities: pos: 17.5,-17.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 345 components: - type: Transform @@ -76767,7 +76774,7 @@ entities: pos: 17.5,-18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 348 components: - type: Transform @@ -76775,7 +76782,7 @@ entities: pos: 15.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 349 components: - type: Transform @@ -76783,7 +76790,7 @@ entities: pos: 14.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 350 components: - type: Transform @@ -76791,7 +76798,7 @@ entities: pos: 13.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 351 components: - type: Transform @@ -76799,7 +76806,7 @@ entities: pos: 12.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 352 components: - type: Transform @@ -76807,7 +76814,7 @@ entities: pos: 11.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 353 components: - type: Transform @@ -76815,7 +76822,7 @@ entities: pos: 10.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 354 components: - type: Transform @@ -76823,7 +76830,7 @@ entities: pos: 9.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 355 components: - type: Transform @@ -76831,7 +76838,7 @@ entities: pos: 8.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 356 components: - type: Transform @@ -76839,7 +76846,7 @@ entities: pos: 7.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 357 components: - type: Transform @@ -76847,7 +76854,7 @@ entities: pos: 6.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 358 components: - type: Transform @@ -76855,7 +76862,7 @@ entities: pos: 5.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 359 components: - type: Transform @@ -76863,7 +76870,7 @@ entities: pos: 4.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 361 components: - type: Transform @@ -76871,7 +76878,7 @@ entities: pos: 2.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 362 components: - type: Transform @@ -76879,7 +76886,7 @@ entities: pos: 1.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 365 components: - type: Transform @@ -76887,7 +76894,7 @@ entities: pos: -1.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 366 components: - type: Transform @@ -76895,7 +76902,7 @@ entities: pos: -2.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 368 components: - type: Transform @@ -76903,7 +76910,7 @@ entities: pos: -4.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 369 components: - type: Transform @@ -76911,7 +76918,7 @@ entities: pos: -5.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 370 components: - type: Transform @@ -76919,7 +76926,7 @@ entities: pos: -6.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 371 components: - type: Transform @@ -76927,7 +76934,7 @@ entities: pos: -7.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 372 components: - type: Transform @@ -76935,7 +76942,7 @@ entities: pos: -8.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 374 components: - type: Transform @@ -76943,7 +76950,7 @@ entities: pos: -10.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 375 components: - type: Transform @@ -76951,7 +76958,7 @@ entities: pos: -11.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 376 components: - type: Transform @@ -76959,7 +76966,7 @@ entities: pos: -12.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 377 components: - type: Transform @@ -76967,7 +76974,7 @@ entities: pos: -13.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 378 components: - type: Transform @@ -76975,7 +76982,7 @@ entities: pos: -14.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 379 components: - type: Transform @@ -76983,7 +76990,7 @@ entities: pos: -15.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 380 components: - type: Transform @@ -76991,7 +76998,7 @@ entities: pos: -16.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 381 components: - type: Transform @@ -76999,7 +77006,7 @@ entities: pos: -17.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 383 components: - type: Transform @@ -77007,7 +77014,7 @@ entities: pos: -19.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 386 components: - type: Transform @@ -77513,7 +77520,7 @@ entities: pos: -21.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 464 components: - type: Transform @@ -77809,7 +77816,7 @@ entities: pos: -19.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 517 components: - type: Transform @@ -77817,7 +77824,7 @@ entities: pos: -18.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 520 components: - type: Transform @@ -77825,7 +77832,7 @@ entities: pos: -15.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 521 components: - type: Transform @@ -77833,7 +77840,7 @@ entities: pos: -14.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 522 components: - type: Transform @@ -77841,7 +77848,7 @@ entities: pos: -13.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 523 components: - type: Transform @@ -77849,7 +77856,7 @@ entities: pos: -12.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 524 components: - type: Transform @@ -77857,7 +77864,7 @@ entities: pos: -11.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 525 components: - type: Transform @@ -77865,7 +77872,7 @@ entities: pos: -10.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 527 components: - type: Transform @@ -77873,7 +77880,7 @@ entities: pos: -8.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 529 components: - type: Transform @@ -77881,7 +77888,7 @@ entities: pos: -6.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 530 components: - type: Transform @@ -77889,7 +77896,7 @@ entities: pos: -5.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 532 components: - type: Transform @@ -77897,7 +77904,7 @@ entities: pos: -3.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 533 components: - type: Transform @@ -77905,7 +77912,7 @@ entities: pos: -2.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 534 components: - type: Transform @@ -77913,7 +77920,7 @@ entities: pos: -1.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 535 components: - type: Transform @@ -77921,7 +77928,7 @@ entities: pos: -0.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 537 components: - type: Transform @@ -77937,7 +77944,7 @@ entities: pos: 2.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 539 components: - type: Transform @@ -77945,7 +77952,7 @@ entities: pos: 3.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 541 components: - type: Transform @@ -77953,7 +77960,7 @@ entities: pos: 5.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 542 components: - type: Transform @@ -77961,7 +77968,7 @@ entities: pos: 6.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 543 components: - type: Transform @@ -77969,7 +77976,7 @@ entities: pos: 7.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 545 components: - type: Transform @@ -77977,7 +77984,7 @@ entities: pos: 9.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 546 components: - type: Transform @@ -77985,7 +77992,7 @@ entities: pos: 10.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 547 components: - type: Transform @@ -77993,7 +78000,7 @@ entities: pos: 11.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 548 components: - type: Transform @@ -78001,7 +78008,7 @@ entities: pos: 12.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 549 components: - type: Transform @@ -78009,7 +78016,7 @@ entities: pos: 13.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 550 components: - type: Transform @@ -78017,7 +78024,7 @@ entities: pos: 14.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 551 components: - type: Transform @@ -78025,7 +78032,7 @@ entities: pos: 15.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 552 components: - type: Transform @@ -78033,7 +78040,7 @@ entities: pos: 16.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 555 components: - type: Transform @@ -78169,7 +78176,7 @@ entities: pos: 1.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 577 components: - type: Transform @@ -78265,7 +78272,7 @@ entities: pos: 4.5,-6.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 591 components: - type: Transform @@ -78273,7 +78280,7 @@ entities: pos: 4.5,-5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 593 components: - type: Transform @@ -78281,7 +78288,7 @@ entities: pos: 4.5,-3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 594 components: - type: Transform @@ -78289,7 +78296,7 @@ entities: pos: 4.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 595 components: - type: Transform @@ -78297,7 +78304,7 @@ entities: pos: 4.5,-1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 597 components: - type: Transform @@ -78305,7 +78312,7 @@ entities: pos: 4.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 598 components: - type: Transform @@ -78313,7 +78320,7 @@ entities: pos: -9.5,-6.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 599 components: - type: Transform @@ -78321,7 +78328,7 @@ entities: pos: -9.5,-5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 601 components: - type: Transform @@ -78329,7 +78336,7 @@ entities: pos: -9.5,-3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 603 components: - type: Transform @@ -78337,7 +78344,7 @@ entities: pos: -9.5,-1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 604 components: - type: Transform @@ -78345,7 +78352,7 @@ entities: pos: -9.5,-0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 605 components: - type: Transform @@ -78353,7 +78360,7 @@ entities: pos: -9.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 608 components: - type: Transform @@ -78361,7 +78368,7 @@ entities: pos: 3.5,1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 609 components: - type: Transform @@ -78369,7 +78376,7 @@ entities: pos: 2.5,1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 610 components: - type: Transform @@ -78377,7 +78384,7 @@ entities: pos: 1.5,1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 611 components: - type: Transform @@ -78385,7 +78392,7 @@ entities: pos: 0.5,1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 612 components: - type: Transform @@ -78393,7 +78400,7 @@ entities: pos: -0.5,1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 613 components: - type: Transform @@ -78401,7 +78408,7 @@ entities: pos: -1.5,1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 615 components: - type: Transform @@ -78409,7 +78416,7 @@ entities: pos: -3.5,1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 616 components: - type: Transform @@ -78417,7 +78424,7 @@ entities: pos: -4.5,1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 618 components: - type: Transform @@ -78425,7 +78432,7 @@ entities: pos: -6.5,1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 619 components: - type: Transform @@ -78433,7 +78440,7 @@ entities: pos: -7.5,1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 620 components: - type: Transform @@ -78441,7 +78448,7 @@ entities: pos: -8.5,1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 621 components: - type: Transform @@ -78641,7 +78648,7 @@ entities: pos: -21.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 736 components: - type: Transform @@ -78649,7 +78656,7 @@ entities: pos: -20.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 737 components: - type: Transform @@ -78657,7 +78664,7 @@ entities: pos: -19.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 738 components: - type: Transform @@ -78665,7 +78672,7 @@ entities: pos: -18.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 740 components: - type: Transform @@ -78673,7 +78680,7 @@ entities: pos: -16.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 741 components: - type: Transform @@ -78681,7 +78688,7 @@ entities: pos: -15.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 742 components: - type: Transform @@ -78689,7 +78696,7 @@ entities: pos: -14.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 743 components: - type: Transform @@ -78697,7 +78704,7 @@ entities: pos: -13.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 744 components: - type: Transform @@ -78705,7 +78712,7 @@ entities: pos: -12.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 745 components: - type: Transform @@ -78713,7 +78720,7 @@ entities: pos: -11.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 746 components: - type: Transform @@ -78721,7 +78728,7 @@ entities: pos: -10.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 748 components: - type: Transform @@ -78769,7 +78776,7 @@ entities: pos: -11.5,1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 758 components: - type: Transform @@ -78777,56 +78784,56 @@ entities: pos: -10.5,1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 759 components: - type: Transform pos: -12.5,2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 760 components: - type: Transform pos: -12.5,3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 761 components: - type: Transform pos: -12.5,4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 763 components: - type: Transform pos: -12.5,6.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 764 components: - type: Transform pos: -12.5,7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 765 components: - type: Transform pos: -12.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 766 components: - type: Transform pos: -12.5,9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 767 components: - type: Transform @@ -78842,7 +78849,7 @@ entities: pos: 3.5,-0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 777 components: - type: Transform @@ -78850,7 +78857,7 @@ entities: pos: 5.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 778 components: - type: Transform @@ -78858,7 +78865,7 @@ entities: pos: 6.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 779 components: - type: Transform @@ -78866,7 +78873,7 @@ entities: pos: 7.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 780 components: - type: Transform @@ -78874,7 +78881,7 @@ entities: pos: 8.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 781 components: - type: Transform @@ -78882,7 +78889,7 @@ entities: pos: 9.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 782 components: - type: Transform @@ -78890,7 +78897,7 @@ entities: pos: 10.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 783 components: - type: Transform @@ -78898,14 +78905,14 @@ entities: pos: 12.5,-3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 784 components: - type: Transform pos: 13.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 785 components: - type: Transform @@ -78913,7 +78920,7 @@ entities: pos: 14.5,-1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 786 components: - type: Transform @@ -78921,7 +78928,7 @@ entities: pos: 15.5,-1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 787 components: - type: Transform @@ -78929,7 +78936,7 @@ entities: pos: 16.5,-1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 788 components: - type: Transform @@ -78968,49 +78975,49 @@ entities: pos: 11.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 796 components: - type: Transform pos: 11.5,-1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 797 components: - type: Transform pos: 11.5,-0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 798 components: - type: Transform pos: 11.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 799 components: - type: Transform pos: 11.5,1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 800 components: - type: Transform pos: 11.5,2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 801 components: - type: Transform pos: 11.5,3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 805 components: - type: Transform @@ -79082,7 +79089,7 @@ entities: pos: -8.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 817 components: - type: Transform @@ -79090,7 +79097,7 @@ entities: pos: -7.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 818 components: - type: Transform @@ -79098,7 +79105,7 @@ entities: pos: -6.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 819 components: - type: Transform @@ -79106,7 +79113,7 @@ entities: pos: -5.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 821 components: - type: Transform @@ -79114,7 +79121,7 @@ entities: pos: -3.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 822 components: - type: Transform @@ -79146,7 +79153,7 @@ entities: pos: -2.5,-3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 830 components: - type: Transform @@ -79154,7 +79161,7 @@ entities: pos: -2.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 831 components: - type: Transform @@ -79162,7 +79169,7 @@ entities: pos: -2.5,-1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 832 components: - type: Transform @@ -79170,7 +79177,7 @@ entities: pos: -2.5,-0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 833 components: - type: Transform @@ -79178,7 +79185,7 @@ entities: pos: -2.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 834 components: - type: Transform @@ -79186,7 +79193,7 @@ entities: pos: -13.5,5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 835 components: - type: Transform @@ -79194,7 +79201,7 @@ entities: pos: -14.5,5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 836 components: - type: Transform @@ -79202,7 +79209,7 @@ entities: pos: -15.5,5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 838 components: - type: Transform @@ -79233,14 +79240,14 @@ entities: pos: -4.5,-8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 992 components: - type: Transform pos: -4.5,-9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 993 components: - type: Transform @@ -79278,14 +79285,14 @@ entities: pos: -16.5,-8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 1583 components: - type: Transform pos: -16.5,-9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 1585 components: - type: Transform @@ -79293,7 +79300,7 @@ entities: pos: 0.5,-19.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 1586 components: - type: Transform @@ -79301,7 +79308,7 @@ entities: pos: 0.5,-18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 1587 components: - type: Transform @@ -79309,7 +79316,7 @@ entities: pos: 0.5,-17.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 1588 components: - type: Transform @@ -79317,7 +79324,7 @@ entities: pos: 0.5,-16.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 1589 components: - type: Transform @@ -79325,7 +79332,7 @@ entities: pos: 0.5,-15.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 1591 components: - type: Transform @@ -79333,7 +79340,7 @@ entities: pos: 0.5,-13.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 1592 components: - type: Transform @@ -79341,7 +79348,7 @@ entities: pos: 0.5,-12.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 1593 components: - type: Transform @@ -79349,7 +79356,7 @@ entities: pos: 0.5,-11.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 1594 components: - type: Transform @@ -79357,7 +79364,7 @@ entities: pos: 0.5,-10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 1595 components: - type: Transform @@ -79365,7 +79372,7 @@ entities: pos: 0.5,-9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 1596 components: - type: Transform @@ -79373,7 +79380,7 @@ entities: pos: 0.5,-8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 1597 components: - type: Transform @@ -79557,7 +79564,7 @@ entities: pos: 18.5,4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2490 components: - type: Transform @@ -79565,7 +79572,7 @@ entities: pos: 19.5,4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2492 components: - type: Transform @@ -79573,7 +79580,7 @@ entities: pos: 21.5,4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2493 components: - type: Transform @@ -79581,7 +79588,7 @@ entities: pos: 22.5,4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2494 components: - type: Transform @@ -79589,7 +79596,7 @@ entities: pos: 23.5,4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2497 components: - type: Transform @@ -79597,7 +79604,7 @@ entities: pos: 26.5,4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2498 components: - type: Transform @@ -79605,7 +79612,7 @@ entities: pos: 27.5,4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2500 components: - type: Transform @@ -79768,35 +79775,35 @@ entities: pos: 24.5,3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2528 components: - type: Transform pos: 24.5,2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2529 components: - type: Transform pos: 24.5,1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2531 components: - type: Transform pos: 24.5,-0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2532 components: - type: Transform pos: 24.5,-1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2533 components: - type: Transform @@ -79804,7 +79811,7 @@ entities: pos: 23.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2534 components: - type: Transform @@ -79812,7 +79819,7 @@ entities: pos: 22.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2535 components: - type: Transform @@ -79820,7 +79827,7 @@ entities: pos: 21.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2537 components: - type: Transform @@ -79828,7 +79835,7 @@ entities: pos: 19.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2538 components: - type: Transform @@ -79836,7 +79843,7 @@ entities: pos: 18.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2539 components: - type: Transform @@ -79844,7 +79851,7 @@ entities: pos: 27.5,-15.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2540 components: - type: Transform @@ -79852,7 +79859,7 @@ entities: pos: 27.5,-14.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2542 components: - type: Transform @@ -79860,7 +79867,7 @@ entities: pos: 27.5,-12.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2543 components: - type: Transform @@ -79868,7 +79875,7 @@ entities: pos: 27.5,-11.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2544 components: - type: Transform @@ -79876,7 +79883,7 @@ entities: pos: 27.5,-10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2546 components: - type: Transform @@ -79884,7 +79891,7 @@ entities: pos: 27.5,-8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2547 components: - type: Transform @@ -79892,7 +79899,7 @@ entities: pos: 27.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2548 components: - type: Transform @@ -79900,7 +79907,7 @@ entities: pos: 27.5,-6.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2549 components: - type: Transform @@ -79908,7 +79915,7 @@ entities: pos: 27.5,-5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2550 components: - type: Transform @@ -79916,7 +79923,7 @@ entities: pos: 27.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2551 components: - type: Transform @@ -79924,7 +79931,7 @@ entities: pos: 27.5,-3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2553 components: - type: Transform @@ -79932,7 +79939,7 @@ entities: pos: 26.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2554 components: - type: Transform @@ -79940,7 +79947,7 @@ entities: pos: 25.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2555 components: - type: Transform @@ -79948,7 +79955,7 @@ entities: pos: 18.5,-19.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2556 components: - type: Transform @@ -79956,7 +79963,7 @@ entities: pos: 19.5,-19.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2557 components: - type: Transform @@ -79964,7 +79971,7 @@ entities: pos: 20.5,-19.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2558 components: - type: Transform @@ -79972,7 +79979,7 @@ entities: pos: 21.5,-19.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2562 components: - type: Transform @@ -79980,7 +79987,7 @@ entities: pos: 25.5,-18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2563 components: - type: Transform @@ -79988,14 +79995,14 @@ entities: pos: 26.5,-18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2565 components: - type: Transform pos: 27.5,-17.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2571 components: - type: Transform @@ -80277,7 +80284,7 @@ entities: pos: 28.5,-18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2614 components: - type: Transform @@ -80285,7 +80292,7 @@ entities: pos: 29.5,-18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2615 components: - type: Transform @@ -80293,7 +80300,7 @@ entities: pos: 30.5,-18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2621 components: - type: Transform @@ -80301,7 +80308,7 @@ entities: pos: 26.5,-13.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2622 components: - type: Transform @@ -80309,7 +80316,7 @@ entities: pos: 25.5,-13.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2623 components: - type: Transform @@ -80317,7 +80324,7 @@ entities: pos: 24.5,-13.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2625 components: - type: Transform @@ -80325,7 +80332,7 @@ entities: pos: 26.5,-9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2626 components: - type: Transform @@ -80333,7 +80340,7 @@ entities: pos: 25.5,-9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2632 components: - type: Transform @@ -80397,7 +80404,7 @@ entities: pos: 28.5,-9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2644 components: - type: Transform @@ -80405,7 +80412,7 @@ entities: pos: 29.5,-9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2645 components: - type: Transform @@ -80413,7 +80420,7 @@ entities: pos: 30.5,-9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2646 components: - type: Transform @@ -80421,7 +80428,7 @@ entities: pos: 31.5,-9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2647 components: - type: Transform @@ -80429,7 +80436,7 @@ entities: pos: 32.5,-9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2648 components: - type: Transform @@ -80437,7 +80444,7 @@ entities: pos: 33.5,-9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2651 components: - type: Transform @@ -80445,7 +80452,7 @@ entities: pos: 34.5,-11.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2652 components: - type: Transform @@ -80453,7 +80460,7 @@ entities: pos: 34.5,-12.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2660 components: - type: Transform @@ -80461,7 +80468,7 @@ entities: pos: 28.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2661 components: - type: Transform @@ -80469,7 +80476,7 @@ entities: pos: 29.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2662 components: - type: Transform @@ -80477,7 +80484,7 @@ entities: pos: 30.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2663 components: - type: Transform @@ -80485,7 +80492,7 @@ entities: pos: 31.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2664 components: - type: Transform @@ -80493,7 +80500,7 @@ entities: pos: 32.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2666 components: - type: Transform @@ -80501,7 +80508,7 @@ entities: pos: 34.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2667 components: - type: Transform @@ -80509,7 +80516,7 @@ entities: pos: 35.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2668 components: - type: Transform @@ -80517,7 +80524,7 @@ entities: pos: 36.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2669 components: - type: Transform @@ -80525,7 +80532,7 @@ entities: pos: 37.5,-3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2670 components: - type: Transform @@ -80533,7 +80540,7 @@ entities: pos: 37.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2671 components: - type: Transform @@ -80541,7 +80548,7 @@ entities: pos: 37.5,-5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2673 components: - type: Transform @@ -80549,7 +80556,7 @@ entities: pos: 37.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2674 components: - type: Transform @@ -80557,7 +80564,7 @@ entities: pos: 37.5,-8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2675 components: - type: Transform @@ -80565,7 +80572,7 @@ entities: pos: 37.5,-9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2685 components: - type: Transform @@ -80634,7 +80641,7 @@ entities: pos: 33.5,-3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2701 components: - type: Transform @@ -80727,7 +80734,7 @@ entities: pos: -42.5,30.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 3825 components: - type: Transform @@ -80749,7 +80756,7 @@ entities: pos: -44.5,2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 3841 components: - type: Transform @@ -80757,7 +80764,7 @@ entities: pos: -46.5,3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 3842 components: - type: Transform @@ -80765,7 +80772,7 @@ entities: pos: -48.5,3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 3844 components: - type: Transform @@ -80773,7 +80780,7 @@ entities: pos: -52.5,3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 3845 components: - type: Transform @@ -80781,7 +80788,7 @@ entities: pos: -54.5,3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 3846 components: - type: Transform @@ -80813,7 +80820,7 @@ entities: pos: -45.5,3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 3853 components: - type: Transform @@ -80821,7 +80828,7 @@ entities: pos: -47.5,3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 3854 components: - type: Transform @@ -80829,7 +80836,7 @@ entities: pos: -49.5,3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 3855 components: - type: Transform @@ -80837,7 +80844,7 @@ entities: pos: -51.5,3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 3856 components: - type: Transform @@ -80845,7 +80852,7 @@ entities: pos: -53.5,3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 3857 components: - type: Transform @@ -80884,7 +80891,7 @@ entities: pos: -42.5,29.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 3914 components: - type: Transform @@ -80900,7 +80907,7 @@ entities: pos: -23.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 3961 components: - type: Transform @@ -80908,7 +80915,7 @@ entities: pos: -24.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 3962 components: - type: Transform @@ -80916,7 +80923,7 @@ entities: pos: -25.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 3963 components: - type: Transform @@ -80924,7 +80931,7 @@ entities: pos: -26.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 3964 components: - type: Transform @@ -80932,7 +80939,7 @@ entities: pos: -27.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 3965 components: - type: Transform @@ -80940,7 +80947,7 @@ entities: pos: -28.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 3966 components: - type: Transform @@ -80948,7 +80955,7 @@ entities: pos: -29.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 3967 components: - type: Transform @@ -80956,7 +80963,7 @@ entities: pos: -30.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 3968 components: - type: Transform @@ -80964,7 +80971,7 @@ entities: pos: -31.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 3970 components: - type: Transform @@ -80972,7 +80979,7 @@ entities: pos: -33.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 3971 components: - type: Transform @@ -80980,7 +80987,7 @@ entities: pos: -34.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 3972 components: - type: Transform @@ -80988,7 +80995,7 @@ entities: pos: -35.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 3973 components: - type: Transform @@ -80996,7 +81003,7 @@ entities: pos: -36.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 3974 components: - type: Transform @@ -81004,7 +81011,7 @@ entities: pos: -37.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 3975 components: - type: Transform @@ -81012,7 +81019,7 @@ entities: pos: -38.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 3976 components: - type: Transform @@ -81020,7 +81027,7 @@ entities: pos: -39.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 3977 components: - type: Transform @@ -81028,7 +81035,7 @@ entities: pos: -40.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 3979 components: - type: Transform @@ -81036,7 +81043,7 @@ entities: pos: -42.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 3980 components: - type: Transform @@ -81044,7 +81051,7 @@ entities: pos: -43.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 3981 components: - type: Transform @@ -81212,7 +81219,7 @@ entities: pos: -44.5,-3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4011 components: - type: Transform @@ -81220,7 +81227,7 @@ entities: pos: -44.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4012 components: - type: Transform @@ -81228,7 +81235,7 @@ entities: pos: -44.5,-1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4013 components: - type: Transform @@ -81236,7 +81243,7 @@ entities: pos: -44.5,-0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4014 components: - type: Transform @@ -81268,7 +81275,7 @@ entities: pos: -33.5,16.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4029 components: - type: Transform @@ -81276,7 +81283,7 @@ entities: pos: -45.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4030 components: - type: Transform @@ -81284,7 +81291,7 @@ entities: pos: -46.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4031 components: - type: Transform @@ -81292,7 +81299,7 @@ entities: pos: -47.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4032 components: - type: Transform @@ -81300,7 +81307,7 @@ entities: pos: -48.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4034 components: - type: Transform @@ -81308,7 +81315,7 @@ entities: pos: -50.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4035 components: - type: Transform @@ -81316,7 +81323,7 @@ entities: pos: -51.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4037 components: - type: Transform @@ -81324,7 +81331,7 @@ entities: pos: -53.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4038 components: - type: Transform @@ -81332,7 +81339,7 @@ entities: pos: -54.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4040 components: - type: Transform @@ -81419,7 +81426,7 @@ entities: pos: -44.5,1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4120 components: - type: Transform @@ -81435,7 +81442,7 @@ entities: pos: -23.5,5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4122 components: - type: Transform @@ -81443,7 +81450,7 @@ entities: pos: -24.5,5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4123 components: - type: Transform @@ -81451,7 +81458,7 @@ entities: pos: -25.5,5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4124 components: - type: Transform @@ -81459,7 +81466,7 @@ entities: pos: -26.5,5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4126 components: - type: Transform @@ -81467,7 +81474,7 @@ entities: pos: -28.5,5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4127 components: - type: Transform @@ -81475,7 +81482,7 @@ entities: pos: -29.5,5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4128 components: - type: Transform @@ -81483,7 +81490,7 @@ entities: pos: -30.5,5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4129 components: - type: Transform @@ -81491,7 +81498,7 @@ entities: pos: -31.5,5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4132 components: - type: Transform @@ -81499,63 +81506,63 @@ entities: pos: -33.5,5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4133 components: - type: Transform pos: -34.5,6.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4134 components: - type: Transform pos: -34.5,7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4135 components: - type: Transform pos: -34.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4137 components: - type: Transform pos: -34.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4140 components: - type: Transform pos: -34.5,13.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4141 components: - type: Transform pos: -34.5,14.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4142 components: - type: Transform pos: -34.5,15.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4144 components: - type: Transform pos: -34.5,17.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4149 components: - type: Transform @@ -81563,7 +81570,7 @@ entities: pos: -34.5,20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4150 components: - type: Transform @@ -81571,7 +81578,7 @@ entities: pos: -35.5,21.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4151 components: - type: Transform @@ -81579,7 +81586,7 @@ entities: pos: -36.5,21.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4152 components: - type: Transform @@ -81587,7 +81594,7 @@ entities: pos: -37.5,21.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4153 components: - type: Transform @@ -81595,7 +81602,7 @@ entities: pos: -38.5,21.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4154 components: - type: Transform @@ -81603,35 +81610,35 @@ entities: pos: -39.5,21.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4155 components: - type: Transform pos: -40.5,22.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4156 components: - type: Transform pos: -40.5,23.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4157 components: - type: Transform pos: -40.5,24.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4159 components: - type: Transform pos: -40.5,26.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4161 components: - type: Transform @@ -81639,7 +81646,7 @@ entities: pos: -41.5,27.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4166 components: - type: Transform @@ -81647,7 +81654,7 @@ entities: pos: -33.5,22.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4167 components: - type: Transform @@ -81655,7 +81662,7 @@ entities: pos: -32.5,22.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4169 components: - type: Transform @@ -81663,7 +81670,7 @@ entities: pos: -30.5,22.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4170 components: - type: Transform @@ -81671,7 +81678,7 @@ entities: pos: -29.5,22.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4171 components: - type: Transform @@ -81679,7 +81686,7 @@ entities: pos: -28.5,22.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4172 components: - type: Transform @@ -81687,7 +81694,7 @@ entities: pos: -26.5,22.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4174 components: - type: Transform @@ -81695,7 +81702,7 @@ entities: pos: -25.5,22.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4176 components: - type: Transform @@ -81703,7 +81710,7 @@ entities: pos: -18.5,11.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4177 components: - type: Transform @@ -81711,7 +81718,7 @@ entities: pos: -22.5,22.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4178 components: - type: Transform @@ -81719,7 +81726,7 @@ entities: pos: -21.5,22.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4179 components: - type: Transform @@ -81727,21 +81734,21 @@ entities: pos: -20.5,22.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4182 components: - type: Transform pos: -19.5,23.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4183 components: - type: Transform pos: -19.5,24.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4184 components: - type: Transform @@ -81749,7 +81756,7 @@ entities: pos: -18.5,25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4185 components: - type: Transform @@ -81757,7 +81764,7 @@ entities: pos: -17.5,25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4187 components: - type: Transform @@ -81765,7 +81772,7 @@ entities: pos: -15.5,25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4188 components: - type: Transform @@ -81773,7 +81780,7 @@ entities: pos: -14.5,25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4189 components: - type: Transform @@ -81781,7 +81788,7 @@ entities: pos: -13.5,25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4190 components: - type: Transform @@ -81789,7 +81796,7 @@ entities: pos: -12.5,25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4192 components: - type: Transform @@ -81797,7 +81804,7 @@ entities: pos: -10.5,25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4193 components: - type: Transform @@ -81805,7 +81812,7 @@ entities: pos: -9.5,25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4194 components: - type: Transform @@ -81813,7 +81820,7 @@ entities: pos: -8.5,25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4195 components: - type: Transform @@ -81821,7 +81828,7 @@ entities: pos: -7.5,25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4196 components: - type: Transform @@ -81829,7 +81836,7 @@ entities: pos: -6.5,25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4197 components: - type: Transform @@ -81837,7 +81844,7 @@ entities: pos: -5.5,25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4198 components: - type: Transform @@ -81845,7 +81852,7 @@ entities: pos: -4.5,25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4199 components: - type: Transform @@ -81853,7 +81860,7 @@ entities: pos: -3.5,11.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4200 components: - type: Transform @@ -81861,7 +81868,7 @@ entities: pos: -3.5,12.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4201 components: - type: Transform @@ -81869,7 +81876,7 @@ entities: pos: -3.5,13.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4202 components: - type: Transform @@ -81877,7 +81884,7 @@ entities: pos: -3.5,14.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4203 components: - type: Transform @@ -81885,7 +81892,7 @@ entities: pos: -3.5,15.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4204 components: - type: Transform @@ -81893,7 +81900,7 @@ entities: pos: -3.5,16.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4205 components: - type: Transform @@ -81901,7 +81908,7 @@ entities: pos: -3.5,17.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4206 components: - type: Transform @@ -81909,7 +81916,7 @@ entities: pos: -3.5,18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4208 components: - type: Transform @@ -81917,7 +81924,7 @@ entities: pos: -3.5,20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4209 components: - type: Transform @@ -81925,7 +81932,7 @@ entities: pos: -3.5,21.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4210 components: - type: Transform @@ -81933,7 +81940,7 @@ entities: pos: -3.5,22.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4211 components: - type: Transform @@ -81941,7 +81948,7 @@ entities: pos: -3.5,23.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4212 components: - type: Transform @@ -81949,7 +81956,7 @@ entities: pos: -3.5,24.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4214 components: - type: Transform @@ -81957,63 +81964,63 @@ entities: pos: -18.5,12.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4218 components: - type: Transform pos: -23.5,14.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4219 components: - type: Transform pos: -23.5,15.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4220 components: - type: Transform pos: -23.5,16.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4221 components: - type: Transform pos: -23.5,17.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4222 components: - type: Transform pos: -23.5,18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4223 components: - type: Transform pos: -23.5,19.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4224 components: - type: Transform pos: -23.5,20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4225 components: - type: Transform pos: -23.5,21.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4226 components: - type: Transform @@ -82021,7 +82028,7 @@ entities: pos: -22.5,13.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4228 components: - type: Transform @@ -82029,7 +82036,7 @@ entities: pos: -20.5,13.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4229 components: - type: Transform @@ -82037,7 +82044,7 @@ entities: pos: -19.5,13.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4230 components: - type: Transform @@ -82645,7 +82652,7 @@ entities: pos: -35.5,9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4336 components: - type: Transform @@ -82653,7 +82660,7 @@ entities: pos: -36.5,9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4337 components: - type: Transform @@ -82661,7 +82668,7 @@ entities: pos: -37.5,9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4338 components: - type: Transform @@ -82669,7 +82676,7 @@ entities: pos: -38.5,9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4339 components: - type: Transform @@ -82677,7 +82684,7 @@ entities: pos: -39.5,9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4340 components: - type: Transform @@ -82685,28 +82692,28 @@ entities: pos: -40.5,9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4343 components: - type: Transform pos: -41.5,7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4344 components: - type: Transform pos: -41.5,6.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4345 components: - type: Transform pos: -41.5,5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4350 components: - type: Transform @@ -82714,7 +82721,7 @@ entities: pos: -32.5,16.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4351 components: - type: Transform @@ -82722,7 +82729,7 @@ entities: pos: -31.5,16.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4354 components: - type: Transform @@ -82730,7 +82737,7 @@ entities: pos: -35.5,18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4355 components: - type: Transform @@ -82738,7 +82745,7 @@ entities: pos: -36.5,18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4356 components: - type: Transform @@ -82746,7 +82753,7 @@ entities: pos: -37.5,18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4357 components: - type: Transform @@ -82754,7 +82761,7 @@ entities: pos: -38.5,18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4358 components: - type: Transform @@ -82762,7 +82769,7 @@ entities: pos: -39.5,18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4359 components: - type: Transform @@ -82770,7 +82777,7 @@ entities: pos: -40.5,18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4360 components: - type: Transform @@ -82778,7 +82785,7 @@ entities: pos: -41.5,18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4361 components: - type: Transform @@ -82786,7 +82793,7 @@ entities: pos: -42.5,18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4362 components: - type: Transform @@ -82794,7 +82801,7 @@ entities: pos: -43.5,18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4364 components: - type: Transform @@ -82802,7 +82809,7 @@ entities: pos: -35.5,16.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4365 components: - type: Transform @@ -82810,7 +82817,7 @@ entities: pos: -36.5,16.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4366 components: - type: Transform @@ -82818,7 +82825,7 @@ entities: pos: -37.5,16.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4367 components: - type: Transform @@ -82826,7 +82833,7 @@ entities: pos: -38.5,16.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4368 components: - type: Transform @@ -82834,7 +82841,7 @@ entities: pos: -39.5,16.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4369 components: - type: Transform @@ -82842,7 +82849,7 @@ entities: pos: -40.5,16.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4370 components: - type: Transform @@ -82850,7 +82857,7 @@ entities: pos: -41.5,16.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4371 components: - type: Transform @@ -82858,7 +82865,7 @@ entities: pos: -42.5,16.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4372 components: - type: Transform @@ -82866,7 +82873,7 @@ entities: pos: -43.5,16.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4375 components: - type: Transform @@ -82874,7 +82881,7 @@ entities: pos: -33.5,11.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4376 components: - type: Transform @@ -82882,7 +82889,7 @@ entities: pos: -32.5,11.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4377 components: - type: Transform @@ -82890,7 +82897,7 @@ entities: pos: -31.5,11.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4379 components: - type: Transform @@ -83001,7 +83008,7 @@ entities: pos: -35.5,19.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4400 components: - type: Transform @@ -83009,7 +83016,7 @@ entities: pos: -35.5,12.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4428 components: - type: Transform @@ -83017,7 +83024,7 @@ entities: pos: -53.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4429 components: - type: Transform @@ -83025,7 +83032,7 @@ entities: pos: -52.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4430 components: - type: Transform @@ -83033,7 +83040,7 @@ entities: pos: -51.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4431 components: - type: Transform @@ -83041,7 +83048,7 @@ entities: pos: -50.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4432 components: - type: Transform @@ -83049,7 +83056,7 @@ entities: pos: -49.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4433 components: - type: Transform @@ -83057,7 +83064,7 @@ entities: pos: -48.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4434 components: - type: Transform @@ -83065,7 +83072,7 @@ entities: pos: -47.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4435 components: - type: Transform @@ -83073,7 +83080,7 @@ entities: pos: -46.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4436 components: - type: Transform @@ -83081,7 +83088,7 @@ entities: pos: -45.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4437 components: - type: Transform @@ -83089,7 +83096,7 @@ entities: pos: -44.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4438 components: - type: Transform @@ -83097,7 +83104,7 @@ entities: pos: -43.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4439 components: - type: Transform @@ -83105,14 +83112,14 @@ entities: pos: -42.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4456 components: - type: Transform pos: -42.5,28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4796 components: - type: Transform @@ -83127,7 +83134,7 @@ entities: pos: 29.5,4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4963 components: - type: Transform @@ -83135,7 +83142,7 @@ entities: pos: 30.5,4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4964 components: - type: Transform @@ -83143,7 +83150,7 @@ entities: pos: 31.5,4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4965 components: - type: Transform @@ -83151,7 +83158,7 @@ entities: pos: 32.5,4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4966 components: - type: Transform @@ -83159,7 +83166,7 @@ entities: pos: 33.5,4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4967 components: - type: Transform @@ -83167,7 +83174,7 @@ entities: pos: 34.5,4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4968 components: - type: Transform @@ -83175,7 +83182,7 @@ entities: pos: 35.5,4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4969 components: - type: Transform @@ -83183,7 +83190,7 @@ entities: pos: 36.5,4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4970 components: - type: Transform @@ -83191,7 +83198,7 @@ entities: pos: 37.5,4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4971 components: - type: Transform @@ -83199,7 +83206,7 @@ entities: pos: 38.5,4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4974 components: - type: Transform @@ -83207,7 +83214,7 @@ entities: pos: 41.5,4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4975 components: - type: Transform @@ -83215,7 +83222,7 @@ entities: pos: 42.5,4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4976 components: - type: Transform @@ -83223,7 +83230,7 @@ entities: pos: 43.5,4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4977 components: - type: Transform @@ -83351,14 +83358,14 @@ entities: pos: -50.5,2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5315 components: - type: Transform pos: 57.5,-5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5459 components: - type: Transform @@ -83366,7 +83373,7 @@ entities: pos: -55.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5460 components: - type: Transform @@ -83374,49 +83381,49 @@ entities: pos: -55.5,3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5461 components: - type: Transform pos: -56.5,-3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5462 components: - type: Transform pos: -56.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5464 components: - type: Transform pos: -56.5,-0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5465 components: - type: Transform pos: -56.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5466 components: - type: Transform pos: -56.5,1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5467 components: - type: Transform pos: -56.5,2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5468 components: - type: Transform @@ -83465,21 +83472,21 @@ entities: pos: -56.5,4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5476 components: - type: Transform pos: -56.5,5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5478 components: - type: Transform pos: -56.5,7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5479 components: - type: Transform @@ -83507,21 +83514,21 @@ entities: pos: -56.5,-5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5483 components: - type: Transform pos: -56.5,-6.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5485 components: - type: Transform pos: -56.5,-8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5486 components: - type: Transform @@ -83622,7 +83629,7 @@ entities: pos: -58.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5505 components: - type: Transform @@ -83630,7 +83637,7 @@ entities: pos: -57.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5506 components: - type: Transform @@ -83638,7 +83645,7 @@ entities: pos: -59.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5507 components: - type: Transform @@ -83646,7 +83653,7 @@ entities: pos: -60.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5508 components: - type: Transform @@ -83654,7 +83661,7 @@ entities: pos: -61.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5509 components: - type: Transform @@ -83662,7 +83669,7 @@ entities: pos: -62.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5511 components: - type: Transform @@ -83670,7 +83677,7 @@ entities: pos: -64.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5512 components: - type: Transform @@ -83678,7 +83685,7 @@ entities: pos: -65.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5513 components: - type: Transform @@ -83686,7 +83693,7 @@ entities: pos: -66.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5514 components: - type: Transform @@ -83694,7 +83701,7 @@ entities: pos: -55.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5515 components: - type: Transform @@ -83702,7 +83709,7 @@ entities: pos: -54.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5516 components: - type: Transform @@ -83710,7 +83717,7 @@ entities: pos: -57.5,-9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5517 components: - type: Transform @@ -83718,7 +83725,7 @@ entities: pos: -58.5,-9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5518 components: - type: Transform @@ -83726,7 +83733,7 @@ entities: pos: -59.5,-9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5519 components: - type: Transform @@ -83734,7 +83741,7 @@ entities: pos: -60.5,-9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5521 components: - type: Transform @@ -83742,7 +83749,7 @@ entities: pos: -62.5,-9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5523 components: - type: Transform @@ -83750,7 +83757,7 @@ entities: pos: -64.5,-9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5524 components: - type: Transform @@ -83758,7 +83765,7 @@ entities: pos: -65.5,-9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5525 components: - type: Transform @@ -83766,7 +83773,7 @@ entities: pos: -66.5,-9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5526 components: - type: Transform @@ -83838,7 +83845,7 @@ entities: pos: -68.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5546 components: - type: Transform @@ -83846,7 +83853,7 @@ entities: pos: -69.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5547 components: - type: Transform @@ -83854,7 +83861,7 @@ entities: pos: -70.5,7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5548 components: - type: Transform @@ -83862,7 +83869,7 @@ entities: pos: -70.5,6.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5549 components: - type: Transform @@ -83870,7 +83877,7 @@ entities: pos: -63.5,7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5550 components: - type: Transform @@ -83878,7 +83885,7 @@ entities: pos: -63.5,6.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5551 components: - type: Transform @@ -83886,7 +83893,7 @@ entities: pos: -63.5,-8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5552 components: - type: Transform @@ -83894,7 +83901,7 @@ entities: pos: -63.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5553 components: - type: Transform @@ -83902,7 +83909,7 @@ entities: pos: -70.5,-8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5554 components: - type: Transform @@ -83910,7 +83917,7 @@ entities: pos: -70.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5555 components: - type: Transform @@ -83918,7 +83925,7 @@ entities: pos: -69.5,-9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5556 components: - type: Transform @@ -83926,7 +83933,7 @@ entities: pos: -68.5,-9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5663 components: - type: Transform @@ -83934,63 +83941,63 @@ entities: pos: -13.5,-25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5743 components: - type: Transform pos: -18.5,-22.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5811 components: - type: Transform pos: -61.5,-10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5812 components: - type: Transform pos: -61.5,-11.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5813 components: - type: Transform pos: -61.5,-12.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5814 components: - type: Transform pos: -61.5,-13.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5815 components: - type: Transform pos: -61.5,-14.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5816 components: - type: Transform pos: -61.5,-15.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5817 components: - type: Transform pos: -61.5,-16.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5818 components: - type: Transform @@ -84094,7 +84101,7 @@ entities: pos: -62.5,-17.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5835 components: - type: Transform @@ -84102,7 +84109,7 @@ entities: pos: -63.5,-17.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5836 components: - type: Transform @@ -84110,7 +84117,7 @@ entities: pos: -64.5,-17.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5837 components: - type: Transform @@ -84118,14 +84125,14 @@ entities: pos: -65.5,-17.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6156 components: - type: Transform pos: -18.5,-23.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6516 components: - type: Transform @@ -84139,14 +84146,14 @@ entities: pos: -0.5,50.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6518 components: - type: Transform pos: -0.5,49.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6519 components: - type: Transform @@ -84162,7 +84169,7 @@ entities: pos: 0.5,48.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6521 components: - type: Transform @@ -84178,7 +84185,7 @@ entities: pos: -12.5,54.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6523 components: - type: Transform @@ -84194,7 +84201,7 @@ entities: pos: -10.5,48.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6539 components: - type: Transform @@ -84226,7 +84233,7 @@ entities: pos: 4.5,32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6545 components: - type: Transform @@ -84234,7 +84241,7 @@ entities: pos: 3.5,32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6546 components: - type: Transform @@ -84258,7 +84265,7 @@ entities: pos: -6.5,55.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6560 components: - type: Transform @@ -84266,7 +84273,7 @@ entities: pos: -4.5,52.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6561 components: - type: Transform @@ -84274,7 +84281,7 @@ entities: pos: -4.5,53.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6562 components: - type: Transform @@ -84290,7 +84297,7 @@ entities: pos: -14.5,44.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6609 components: - type: Transform @@ -84322,7 +84329,7 @@ entities: pos: -2.5,48.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6613 components: - type: Transform @@ -84330,7 +84337,7 @@ entities: pos: -5.5,48.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6614 components: - type: Transform @@ -84338,14 +84345,14 @@ entities: pos: -7.5,48.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6637 components: - type: Transform pos: -12.5,35.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6649 components: - type: Transform @@ -84369,7 +84376,7 @@ entities: pos: 8.5,41.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6683 components: - type: Transform @@ -84377,7 +84384,7 @@ entities: pos: 8.5,42.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6685 components: - type: Transform @@ -84409,7 +84416,7 @@ entities: pos: -8.5,52.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6693 components: - type: Transform @@ -84417,7 +84424,7 @@ entities: pos: -7.5,58.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6699 components: - type: Transform @@ -84447,7 +84454,7 @@ entities: pos: 1.5,25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6735 components: - type: Transform @@ -84455,7 +84462,7 @@ entities: pos: 0.5,25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6736 components: - type: Transform @@ -84463,7 +84470,7 @@ entities: pos: -0.5,25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6737 components: - type: Transform @@ -84471,7 +84478,7 @@ entities: pos: -1.5,25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6738 components: - type: Transform @@ -84479,49 +84486,49 @@ entities: pos: -2.5,25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6739 components: - type: Transform pos: -3.5,26.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6740 components: - type: Transform pos: -3.5,27.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6742 components: - type: Transform pos: -3.5,29.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6743 components: - type: Transform pos: -3.5,30.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6744 components: - type: Transform pos: -3.5,31.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6745 components: - type: Transform pos: -3.5,32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6746 components: - type: Transform @@ -84633,28 +84640,28 @@ entities: pos: 2.5,26.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6765 components: - type: Transform pos: 2.5,27.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6767 components: - type: Transform pos: 2.5,29.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6768 components: - type: Transform pos: 2.5,30.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6775 components: - type: Transform @@ -84702,7 +84709,7 @@ entities: pos: -4.5,34.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6781 components: - type: Transform @@ -84710,7 +84717,7 @@ entities: pos: -5.5,34.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6782 components: - type: Transform @@ -84718,7 +84725,7 @@ entities: pos: -3.5,33.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6783 components: - type: Transform @@ -84726,7 +84733,7 @@ entities: pos: -2.5,34.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6784 components: - type: Transform @@ -84734,7 +84741,7 @@ entities: pos: -1.5,34.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6785 components: - type: Transform @@ -84742,7 +84749,7 @@ entities: pos: -0.5,34.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6786 components: - type: Transform @@ -84750,7 +84757,7 @@ entities: pos: 0.5,34.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6787 components: - type: Transform @@ -84758,14 +84765,14 @@ entities: pos: 1.5,34.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6788 components: - type: Transform pos: 2.5,33.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6789 components: - type: Transform @@ -84793,14 +84800,14 @@ entities: pos: 2.5,35.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6793 components: - type: Transform pos: 2.5,36.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6794 components: - type: Transform @@ -84828,14 +84835,14 @@ entities: pos: -3.5,35.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6798 components: - type: Transform pos: -3.5,36.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6802 components: - type: Transform @@ -84843,7 +84850,7 @@ entities: pos: -6.5,34.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6809 components: - type: Transform @@ -84864,14 +84871,14 @@ entities: pos: -7.5,32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6812 components: - type: Transform pos: -7.5,33.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6813 components: - type: Transform @@ -84879,7 +84886,7 @@ entities: pos: -9.5,31.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6814 components: - type: Transform @@ -84887,7 +84894,7 @@ entities: pos: -8.5,31.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6815 components: - type: Transform @@ -84895,7 +84902,7 @@ entities: pos: -11.5,31.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6816 components: - type: Transform @@ -84903,7 +84910,7 @@ entities: pos: -12.5,31.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6817 components: - type: Transform @@ -84951,7 +84958,7 @@ entities: pos: -7.5,30.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6823 components: - type: Transform @@ -84959,7 +84966,7 @@ entities: pos: -7.5,29.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6824 components: - type: Transform @@ -84975,7 +84982,7 @@ entities: pos: -10.5,30.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6826 components: - type: Transform @@ -84983,7 +84990,7 @@ entities: pos: -10.5,29.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6827 components: - type: Transform @@ -84999,7 +85006,7 @@ entities: pos: -13.5,30.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6829 components: - type: Transform @@ -85007,7 +85014,7 @@ entities: pos: -13.5,29.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6833 components: - type: Transform @@ -85031,7 +85038,7 @@ entities: pos: -13.5,32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6839 components: - type: Transform @@ -85039,7 +85046,7 @@ entities: pos: -12.5,36.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6840 components: - type: Transform @@ -85047,7 +85054,7 @@ entities: pos: -12.5,37.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6841 components: - type: Transform @@ -85055,7 +85062,7 @@ entities: pos: -12.5,38.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6842 components: - type: Transform @@ -85063,7 +85070,7 @@ entities: pos: -12.5,39.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6843 components: - type: Transform @@ -85071,7 +85078,7 @@ entities: pos: -12.5,40.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6844 components: - type: Transform @@ -85079,7 +85086,7 @@ entities: pos: -12.5,41.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6845 components: - type: Transform @@ -85087,7 +85094,7 @@ entities: pos: -12.5,42.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6846 components: - type: Transform @@ -85095,7 +85102,7 @@ entities: pos: -12.5,43.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6849 components: - type: Transform @@ -85103,7 +85110,7 @@ entities: pos: -12.5,46.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6850 components: - type: Transform @@ -85199,7 +85206,7 @@ entities: pos: 5.5,32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6865 components: - type: Transform @@ -85255,7 +85262,7 @@ entities: pos: 7.5,32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6874 components: - type: Transform @@ -85263,7 +85270,7 @@ entities: pos: 8.5,32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6875 components: - type: Transform @@ -85271,7 +85278,7 @@ entities: pos: 9.5,32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6878 components: - type: Transform @@ -85279,7 +85286,7 @@ entities: pos: 12.5,32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6879 components: - type: Transform @@ -85287,7 +85294,7 @@ entities: pos: 13.5,32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6880 components: - type: Transform @@ -85295,7 +85302,7 @@ entities: pos: 14.5,32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6881 components: - type: Transform @@ -85303,7 +85310,7 @@ entities: pos: 15.5,32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6883 components: - type: Transform @@ -85379,28 +85386,28 @@ entities: pos: 11.5,31.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6894 components: - type: Transform pos: 11.5,30.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6895 components: - type: Transform pos: 11.5,29.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6896 components: - type: Transform pos: 11.5,28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6898 components: - type: Transform @@ -85421,49 +85428,49 @@ entities: pos: 6.5,11.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6901 components: - type: Transform pos: 6.5,31.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6902 components: - type: Transform pos: 6.5,30.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6903 components: - type: Transform pos: 6.5,29.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6904 components: - type: Transform pos: 6.5,28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6905 components: - type: Transform pos: 6.5,12.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6906 components: - type: Transform pos: 6.5,13.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6907 components: - type: Transform @@ -85527,7 +85534,7 @@ entities: pos: 6.5,15.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6917 components: - type: Transform @@ -85535,7 +85542,7 @@ entities: pos: 6.5,16.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6918 components: - type: Transform @@ -85543,7 +85550,7 @@ entities: pos: 6.5,17.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6919 components: - type: Transform @@ -85551,7 +85558,7 @@ entities: pos: 6.5,18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6922 components: - type: Transform @@ -85627,7 +85634,7 @@ entities: pos: 9.5,14.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6934 components: - type: Transform @@ -85635,7 +85642,7 @@ entities: pos: 8.5,14.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6935 components: - type: Transform @@ -85643,7 +85650,7 @@ entities: pos: 7.5,14.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6936 components: - type: Transform @@ -85651,7 +85658,7 @@ entities: pos: 11.5,11.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6937 components: - type: Transform @@ -85659,7 +85666,7 @@ entities: pos: 11.5,12.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6938 components: - type: Transform @@ -85667,7 +85674,7 @@ entities: pos: 11.5,13.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6939 components: - type: Transform @@ -85707,7 +85714,7 @@ entities: pos: 11.5,16.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6945 components: - type: Transform @@ -85715,7 +85722,7 @@ entities: pos: 11.5,17.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6947 components: - type: Transform @@ -85755,7 +85762,7 @@ entities: pos: 6.5,33.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6953 components: - type: Transform @@ -85763,7 +85770,7 @@ entities: pos: 6.5,34.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6954 components: - type: Transform @@ -85771,7 +85778,7 @@ entities: pos: 6.5,35.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6960 components: - type: Transform @@ -85835,7 +85842,7 @@ entities: pos: 12.5,36.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6968 components: - type: Transform @@ -85843,7 +85850,7 @@ entities: pos: 11.5,36.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6969 components: - type: Transform @@ -85851,7 +85858,7 @@ entities: pos: 10.5,36.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6970 components: - type: Transform @@ -85859,7 +85866,7 @@ entities: pos: 9.5,36.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6971 components: - type: Transform @@ -85867,7 +85874,7 @@ entities: pos: 8.5,36.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6972 components: - type: Transform @@ -85875,7 +85882,7 @@ entities: pos: 7.5,36.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6973 components: - type: Transform @@ -85883,7 +85890,7 @@ entities: pos: 5.5,36.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6974 components: - type: Transform @@ -85914,7 +85921,7 @@ entities: pos: 4.5,37.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6979 components: - type: Transform @@ -85922,7 +85929,7 @@ entities: pos: 4.5,38.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6981 components: - type: Transform @@ -85930,7 +85937,7 @@ entities: pos: 5.5,40.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6983 components: - type: Transform @@ -85938,7 +85945,7 @@ entities: pos: 13.5,38.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6985 components: - type: Transform @@ -85970,7 +85977,7 @@ entities: pos: 14.5,39.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6990 components: - type: Transform @@ -85992,7 +85999,7 @@ entities: pos: 6.5,40.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6995 components: - type: Transform @@ -86000,7 +86007,7 @@ entities: pos: 7.5,40.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6997 components: - type: Transform @@ -86008,7 +86015,7 @@ entities: pos: 9.5,40.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6998 components: - type: Transform @@ -86016,7 +86023,7 @@ entities: pos: 10.5,40.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6999 components: - type: Transform @@ -86024,7 +86031,7 @@ entities: pos: 11.5,40.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7000 components: - type: Transform @@ -86032,7 +86039,7 @@ entities: pos: 12.5,40.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7002 components: - type: Transform @@ -86088,7 +86095,7 @@ entities: pos: 15.5,39.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7030 components: - type: Transform @@ -86096,7 +86103,7 @@ entities: pos: 2.5,37.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7031 components: - type: Transform @@ -86104,7 +86111,7 @@ entities: pos: 2.5,38.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7032 components: - type: Transform @@ -86144,7 +86151,7 @@ entities: pos: 2.5,40.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7037 components: - type: Transform @@ -86152,7 +86159,7 @@ entities: pos: 2.5,41.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7038 components: - type: Transform @@ -86160,7 +86167,7 @@ entities: pos: 2.5,42.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7039 components: - type: Transform @@ -86168,7 +86175,7 @@ entities: pos: 2.5,43.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7044 components: - type: Transform @@ -86192,7 +86199,7 @@ entities: pos: 1.5,44.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7047 components: - type: Transform @@ -86200,7 +86207,7 @@ entities: pos: 0.5,44.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7048 components: - type: Transform @@ -86240,7 +86247,7 @@ entities: pos: -1.5,44.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7053 components: - type: Transform @@ -86248,7 +86255,7 @@ entities: pos: -2.5,44.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7054 components: - type: Transform @@ -86256,7 +86263,7 @@ entities: pos: -3.5,44.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7055 components: - type: Transform @@ -86264,7 +86271,7 @@ entities: pos: -4.5,44.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7056 components: - type: Transform @@ -86272,7 +86279,7 @@ entities: pos: -5.5,44.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7057 components: - type: Transform @@ -86280,7 +86287,7 @@ entities: pos: -6.5,44.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7059 components: - type: Transform @@ -86288,7 +86295,7 @@ entities: pos: -4.5,37.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7060 components: - type: Transform @@ -86296,7 +86303,7 @@ entities: pos: -5.5,37.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7062 components: - type: Transform @@ -86319,7 +86326,7 @@ entities: pos: 14.5,37.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7118 components: - type: Transform @@ -86327,7 +86334,7 @@ entities: pos: 12.5,15.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7119 components: - type: Transform @@ -86335,7 +86342,7 @@ entities: pos: 13.5,15.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7120 components: - type: Transform @@ -86343,7 +86350,7 @@ entities: pos: 14.5,15.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7121 components: - type: Transform @@ -86351,7 +86358,7 @@ entities: pos: 15.5,15.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7122 components: - type: Transform @@ -86359,7 +86366,7 @@ entities: pos: 16.5,15.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7136 components: - type: Transform @@ -86383,7 +86390,7 @@ entities: pos: -4.5,49.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7153 components: - type: Transform @@ -86399,7 +86406,7 @@ entities: pos: -9.5,55.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7156 components: - type: Transform @@ -86407,7 +86414,7 @@ entities: pos: -11.5,48.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7158 components: - type: Transform @@ -86415,7 +86422,7 @@ entities: pos: -8.5,54.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7159 components: - type: Transform @@ -86423,7 +86430,7 @@ entities: pos: -11.5,55.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7163 components: - type: Transform @@ -86438,7 +86445,7 @@ entities: pos: 39.5,5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7238 components: - type: Transform @@ -86462,7 +86469,7 @@ entities: pos: 8.5,43.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7305 components: - type: Transform @@ -86470,7 +86477,7 @@ entities: pos: -8.5,53.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7306 components: - type: Transform @@ -86494,7 +86501,7 @@ entities: pos: -7.5,59.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7309 components: - type: Transform @@ -86525,7 +86532,7 @@ entities: pos: -4.5,50.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7328 components: - type: Transform @@ -86533,7 +86540,7 @@ entities: pos: -4.5,54.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7329 components: - type: Transform @@ -86541,7 +86548,7 @@ entities: pos: -10.5,55.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7359 components: - type: Transform @@ -86557,7 +86564,7 @@ entities: pos: -8.5,50.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7382 components: - type: Transform @@ -86565,7 +86572,7 @@ entities: pos: -12.5,50.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7383 components: - type: Transform @@ -86573,7 +86580,7 @@ entities: pos: -12.5,49.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7384 components: - type: Transform @@ -86589,7 +86596,7 @@ entities: pos: -9.5,48.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7734 components: - type: Transform @@ -86597,7 +86604,7 @@ entities: pos: -6.5,48.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7735 components: - type: Transform @@ -86605,7 +86612,7 @@ entities: pos: -3.5,48.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7736 components: - type: Transform @@ -86613,7 +86620,7 @@ entities: pos: -1.5,48.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7737 components: - type: Transform @@ -86637,7 +86644,7 @@ entities: pos: -13.5,44.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7786 components: - type: Transform @@ -86668,7 +86675,7 @@ entities: pos: -8.5,49.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7822 components: - type: Transform @@ -86676,7 +86683,7 @@ entities: pos: -5.5,55.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7833 components: - type: Transform @@ -86684,7 +86691,7 @@ entities: pos: -12.5,52.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7834 components: - type: Transform @@ -86708,7 +86715,7 @@ entities: pos: -12.5,53.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7837 components: - type: Transform @@ -86740,7 +86747,7 @@ entities: pos: -7.5,55.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7853 components: - type: Transform @@ -86756,7 +86763,7 @@ entities: pos: 16.5,39.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7909 components: - type: Transform @@ -86764,7 +86771,7 @@ entities: pos: -12.5,47.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8244 components: - type: Transform @@ -86772,7 +86779,7 @@ entities: pos: 46.5,1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8253 components: - type: Transform @@ -86780,7 +86787,7 @@ entities: pos: 46.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8672 components: - type: Transform @@ -86998,7 +87005,7 @@ entities: pos: 33.5,19.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8712 components: - type: Transform @@ -87006,7 +87013,7 @@ entities: pos: 31.5,19.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8713 components: - type: Transform @@ -87014,7 +87021,7 @@ entities: pos: 30.5,19.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8714 components: - type: Transform @@ -87022,7 +87029,7 @@ entities: pos: 29.5,19.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8715 components: - type: Transform @@ -87030,7 +87037,7 @@ entities: pos: 28.5,19.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8718 components: - type: Transform @@ -87038,7 +87045,7 @@ entities: pos: 25.5,19.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8719 components: - type: Transform @@ -87046,7 +87053,7 @@ entities: pos: 24.5,19.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8720 components: - type: Transform @@ -87054,7 +87061,7 @@ entities: pos: 23.5,19.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8721 components: - type: Transform @@ -87062,7 +87069,7 @@ entities: pos: 22.5,19.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8724 components: - type: Transform @@ -87070,7 +87077,7 @@ entities: pos: 19.5,19.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8725 components: - type: Transform @@ -87078,7 +87085,7 @@ entities: pos: 18.5,19.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8726 components: - type: Transform @@ -87086,7 +87093,7 @@ entities: pos: 17.5,16.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8727 components: - type: Transform @@ -87094,7 +87101,7 @@ entities: pos: 17.5,17.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8728 components: - type: Transform @@ -87102,105 +87109,105 @@ entities: pos: 17.5,18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8729 components: - type: Transform pos: 34.5,20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8730 components: - type: Transform pos: 34.5,21.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8732 components: - type: Transform pos: 34.5,23.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8733 components: - type: Transform pos: 34.5,24.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8734 components: - type: Transform pos: 34.5,25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8735 components: - type: Transform pos: 34.5,26.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8736 components: - type: Transform pos: 34.5,27.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8738 components: - type: Transform pos: 34.5,29.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8739 components: - type: Transform pos: 34.5,30.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8740 components: - type: Transform pos: 34.5,31.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8742 components: - type: Transform pos: 34.5,33.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8743 components: - type: Transform pos: 34.5,34.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8744 components: - type: Transform pos: 34.5,35.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8745 components: - type: Transform pos: 34.5,36.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8755 components: - type: Transform @@ -87332,35 +87339,35 @@ entities: pos: 36.5,38.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8777 components: - type: Transform pos: 36.5,40.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8778 components: - type: Transform pos: 36.5,41.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8780 components: - type: Transform pos: 36.5,43.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8781 components: - type: Transform pos: 36.5,44.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8782 components: - type: Transform @@ -87368,7 +87375,7 @@ entities: pos: 35.5,45.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8783 components: - type: Transform @@ -87376,7 +87383,7 @@ entities: pos: 34.5,45.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8784 components: - type: Transform @@ -87384,7 +87391,7 @@ entities: pos: 33.5,45.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8785 components: - type: Transform @@ -87392,7 +87399,7 @@ entities: pos: 32.5,45.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8786 components: - type: Transform @@ -87400,7 +87407,7 @@ entities: pos: 31.5,45.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8787 components: - type: Transform @@ -87408,7 +87415,7 @@ entities: pos: 30.5,45.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8789 components: - type: Transform @@ -87416,7 +87423,7 @@ entities: pos: 28.5,38.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8790 components: - type: Transform @@ -87424,7 +87431,7 @@ entities: pos: 28.5,39.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8792 components: - type: Transform @@ -87432,7 +87439,7 @@ entities: pos: 28.5,41.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8793 components: - type: Transform @@ -87440,7 +87447,7 @@ entities: pos: 28.5,42.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8794 components: - type: Transform @@ -87456,7 +87463,7 @@ entities: pos: 28.5,44.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8796 components: - type: Transform @@ -87464,7 +87471,7 @@ entities: pos: 29.5,37.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8797 components: - type: Transform @@ -87472,7 +87479,7 @@ entities: pos: 30.5,37.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8798 components: - type: Transform @@ -87480,7 +87487,7 @@ entities: pos: 31.5,37.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8799 components: - type: Transform @@ -87488,7 +87495,7 @@ entities: pos: 32.5,37.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8800 components: - type: Transform @@ -87496,7 +87503,7 @@ entities: pos: 33.5,37.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8801 components: - type: Transform @@ -87504,7 +87511,7 @@ entities: pos: 35.5,37.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8802 components: - type: Transform @@ -87512,7 +87519,7 @@ entities: pos: 27.5,20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8803 components: - type: Transform @@ -87520,7 +87527,7 @@ entities: pos: 27.5,21.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8804 components: - type: Transform @@ -87528,7 +87535,7 @@ entities: pos: 27.5,22.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8805 components: - type: Transform @@ -87575,56 +87582,56 @@ entities: pos: 16.5,20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8817 components: - type: Transform pos: 16.5,21.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8818 components: - type: Transform pos: 16.5,22.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8819 components: - type: Transform pos: 16.5,23.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8820 components: - type: Transform pos: 16.5,24.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8821 components: - type: Transform pos: 16.5,25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8822 components: - type: Transform pos: 16.5,26.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8823 components: - type: Transform pos: 16.5,27.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8824 components: - type: Transform @@ -87632,7 +87639,7 @@ entities: pos: 17.5,28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8825 components: - type: Transform @@ -87640,7 +87647,7 @@ entities: pos: 18.5,28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8826 components: - type: Transform @@ -87648,7 +87655,7 @@ entities: pos: 19.5,28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8827 components: - type: Transform @@ -87656,7 +87663,7 @@ entities: pos: 20.5,28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8828 components: - type: Transform @@ -87664,7 +87671,7 @@ entities: pos: 22.5,30.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8829 components: - type: Transform @@ -87672,7 +87679,7 @@ entities: pos: 22.5,31.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8830 components: - type: Transform @@ -87680,7 +87687,7 @@ entities: pos: 22.5,32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8831 components: - type: Transform @@ -87688,7 +87695,7 @@ entities: pos: 22.5,33.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8832 components: - type: Transform @@ -87696,7 +87703,7 @@ entities: pos: 22.5,34.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8833 components: - type: Transform @@ -87704,7 +87711,7 @@ entities: pos: 22.5,35.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8834 components: - type: Transform @@ -87712,7 +87719,7 @@ entities: pos: 22.5,36.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8835 components: - type: Transform @@ -87720,7 +87727,7 @@ entities: pos: 27.5,37.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8836 components: - type: Transform @@ -87728,7 +87735,7 @@ entities: pos: 26.5,37.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8837 components: - type: Transform @@ -87736,7 +87743,7 @@ entities: pos: 25.5,37.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8838 components: - type: Transform @@ -87752,7 +87759,7 @@ entities: pos: 23.5,37.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8840 components: - type: Transform @@ -87760,7 +87767,7 @@ entities: pos: 15.5,37.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8841 components: - type: Transform @@ -87768,7 +87775,7 @@ entities: pos: 16.5,37.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8842 components: - type: Transform @@ -87776,7 +87783,7 @@ entities: pos: 17.5,37.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8843 components: - type: Transform @@ -87784,7 +87791,7 @@ entities: pos: 18.5,37.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8844 components: - type: Transform @@ -87792,7 +87799,7 @@ entities: pos: 19.5,37.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8845 components: - type: Transform @@ -87800,7 +87807,7 @@ entities: pos: 20.5,37.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8846 components: - type: Transform @@ -87808,7 +87815,7 @@ entities: pos: 21.5,37.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8889 components: - type: Transform @@ -87816,7 +87823,7 @@ entities: pos: 58.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8978 components: - type: Transform @@ -87824,7 +87831,7 @@ entities: pos: 46.5,4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8983 components: - type: Transform @@ -87832,7 +87839,7 @@ entities: pos: 59.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8987 components: - type: Transform @@ -87898,7 +87905,7 @@ entities: pos: 45.5,4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9005 components: - type: Transform @@ -87906,7 +87913,7 @@ entities: pos: 44.5,4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9006 components: - type: Transform @@ -87914,7 +87921,7 @@ entities: pos: 47.5,3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9007 components: - type: Transform @@ -87922,7 +87929,7 @@ entities: pos: 47.5,2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9010 components: - type: Transform @@ -87930,7 +87937,7 @@ entities: pos: 47.5,-0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9011 components: - type: Transform @@ -87938,7 +87945,7 @@ entities: pos: 47.5,-1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9012 components: - type: Transform @@ -87946,7 +87953,7 @@ entities: pos: 47.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9013 components: - type: Transform @@ -87954,7 +87961,7 @@ entities: pos: 47.5,-3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9014 components: - type: Transform @@ -87962,7 +87969,7 @@ entities: pos: 47.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9015 components: - type: Transform @@ -87970,7 +87977,7 @@ entities: pos: 47.5,-5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9016 components: - type: Transform @@ -87978,7 +87985,7 @@ entities: pos: 48.5,4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9018 components: - type: Transform @@ -88002,7 +88009,7 @@ entities: pos: 92.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9027 components: - type: Transform @@ -88010,7 +88017,7 @@ entities: pos: 60.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9039 components: - type: Transform @@ -88018,7 +88025,7 @@ entities: pos: 49.5,4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9069 components: - type: Transform @@ -88031,7 +88038,7 @@ entities: pos: 51.5,-3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9168 components: - type: Transform @@ -88039,7 +88046,7 @@ entities: pos: 51.5,-1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9169 components: - type: Transform @@ -88047,7 +88054,7 @@ entities: pos: 51.5,-0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9170 components: - type: Transform @@ -88055,7 +88062,7 @@ entities: pos: 51.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9171 components: - type: Transform @@ -88063,7 +88070,7 @@ entities: pos: 51.5,1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9172 components: - type: Transform @@ -88071,7 +88078,7 @@ entities: pos: 51.5,2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9173 components: - type: Transform @@ -88079,7 +88086,7 @@ entities: pos: 51.5,3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9175 components: - type: Transform @@ -88095,7 +88102,7 @@ entities: pos: 47.5,13.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9177 components: - type: Transform @@ -88103,7 +88110,7 @@ entities: pos: 50.5,16.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9180 components: - type: Transform @@ -88111,7 +88118,7 @@ entities: pos: 50.5,15.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9220 components: - type: Transform @@ -88139,7 +88146,7 @@ entities: pos: -16.5,26.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9315 components: - type: Transform @@ -88163,7 +88170,7 @@ entities: pos: -24.5,23.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9318 components: - type: Transform @@ -88171,7 +88178,7 @@ entities: pos: -24.5,24.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9319 components: - type: Transform @@ -88179,7 +88186,7 @@ entities: pos: -24.5,25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9320 components: - type: Transform @@ -88187,7 +88194,7 @@ entities: pos: -24.5,26.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9322 components: - type: Transform @@ -88290,7 +88297,7 @@ entities: pos: -31.5,23.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9340 components: - type: Transform @@ -88298,7 +88305,7 @@ entities: pos: -31.5,24.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9341 components: - type: Transform @@ -88306,7 +88313,7 @@ entities: pos: -31.5,25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9342 components: - type: Transform @@ -88314,7 +88321,7 @@ entities: pos: -31.5,26.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9343 components: - type: Transform @@ -88322,7 +88329,7 @@ entities: pos: -31.5,27.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9344 components: - type: Transform @@ -88330,7 +88337,7 @@ entities: pos: -31.5,28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9345 components: - type: Transform @@ -88338,7 +88345,7 @@ entities: pos: -31.5,29.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9475 components: - type: Transform @@ -88346,7 +88353,7 @@ entities: pos: -32.5,30.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9476 components: - type: Transform @@ -88354,7 +88361,7 @@ entities: pos: -33.5,30.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9477 components: - type: Transform @@ -88362,7 +88369,7 @@ entities: pos: -34.5,30.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9479 components: - type: Transform @@ -88370,7 +88377,7 @@ entities: pos: -36.5,30.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9480 components: - type: Transform @@ -88378,7 +88385,7 @@ entities: pos: -37.5,30.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9481 components: - type: Transform @@ -88386,91 +88393,91 @@ entities: pos: -38.5,30.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9482 components: - type: Transform pos: -39.5,31.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9483 components: - type: Transform pos: -39.5,32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9484 components: - type: Transform pos: -39.5,33.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9485 components: - type: Transform pos: -39.5,34.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9486 components: - type: Transform pos: -39.5,35.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9487 components: - type: Transform pos: -39.5,36.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9488 components: - type: Transform pos: -39.5,37.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9489 components: - type: Transform pos: -39.5,38.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9490 components: - type: Transform pos: -39.5,39.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9722 components: - type: Transform pos: 51.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9723 components: - type: Transform pos: 51.5,-5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9725 components: - type: Transform pos: 47.5,-6.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9728 components: - type: Transform @@ -88478,7 +88485,7 @@ entities: pos: 48.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9729 components: - type: Transform @@ -88486,7 +88493,7 @@ entities: pos: 49.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9730 components: - type: Transform @@ -88494,7 +88501,7 @@ entities: pos: 50.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9731 components: - type: Transform @@ -88555,14 +88562,14 @@ entities: pos: 11.5,26.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9938 components: - type: Transform pos: 11.5,27.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 10028 components: - type: Transform @@ -88577,7 +88584,7 @@ entities: pos: -35.5,31.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 10659 components: - type: Transform @@ -88585,7 +88592,7 @@ entities: pos: -35.5,32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 10776 components: - type: Transform @@ -88593,7 +88600,7 @@ entities: pos: -11.5,11.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 10777 components: - type: Transform @@ -88601,7 +88608,7 @@ entities: pos: -11.5,12.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 10778 components: - type: Transform @@ -88609,7 +88616,7 @@ entities: pos: -11.5,13.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 10779 components: - type: Transform @@ -88617,7 +88624,7 @@ entities: pos: -11.5,14.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 10780 components: - type: Transform @@ -88625,7 +88632,7 @@ entities: pos: -11.5,15.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 10781 components: - type: Transform @@ -88689,7 +88696,7 @@ entities: pos: -55.5,-1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 10952 components: - type: Transform @@ -88985,7 +88992,7 @@ entities: pos: 63.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11074 components: - type: Transform @@ -88993,7 +89000,7 @@ entities: pos: 62.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11075 components: - type: Transform @@ -89001,7 +89008,7 @@ entities: pos: 61.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11079 components: - type: Transform @@ -89009,7 +89016,7 @@ entities: pos: 58.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11080 components: - type: Transform @@ -89017,7 +89024,7 @@ entities: pos: 57.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11081 components: - type: Transform @@ -89025,7 +89032,7 @@ entities: pos: 56.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11082 components: - type: Transform @@ -89033,7 +89040,7 @@ entities: pos: 55.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11083 components: - type: Transform @@ -89041,7 +89048,7 @@ entities: pos: 54.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11084 components: - type: Transform @@ -89049,7 +89056,7 @@ entities: pos: 53.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11085 components: - type: Transform @@ -89057,14 +89064,14 @@ entities: pos: 52.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11086 components: - type: Transform pos: 59.5,-1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11088 components: - type: Transform @@ -89095,7 +89102,7 @@ entities: pos: 59.5,-0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11093 components: - type: Transform @@ -89318,7 +89325,7 @@ entities: pos: 50.5,5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11140 components: - type: Transform @@ -89326,7 +89333,7 @@ entities: pos: 50.5,6.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11141 components: - type: Transform @@ -89334,7 +89341,7 @@ entities: pos: 50.5,7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11144 components: - type: Transform @@ -89350,7 +89357,7 @@ entities: pos: 55.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11146 components: - type: Transform @@ -89358,7 +89365,7 @@ entities: pos: 52.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11147 components: - type: Transform @@ -89366,7 +89373,7 @@ entities: pos: 53.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11148 components: - type: Transform @@ -89374,7 +89381,7 @@ entities: pos: 54.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11149 components: - type: Transform @@ -89390,7 +89397,7 @@ entities: pos: 56.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11151 components: - type: Transform @@ -89398,7 +89405,7 @@ entities: pos: 57.5,-6.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11152 components: - type: Transform @@ -89406,7 +89413,7 @@ entities: pos: 50.5,9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11153 components: - type: Transform @@ -89414,7 +89421,7 @@ entities: pos: 50.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11154 components: - type: Transform @@ -89422,7 +89429,7 @@ entities: pos: 50.5,11.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11157 components: - type: Transform @@ -89430,7 +89437,7 @@ entities: pos: 50.5,13.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11160 components: - type: Transform @@ -89438,7 +89445,7 @@ entities: pos: 48.5,14.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11161 components: - type: Transform @@ -89982,63 +89989,63 @@ entities: pos: 40.5,3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11840 components: - type: Transform pos: 40.5,2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11841 components: - type: Transform pos: 40.5,1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11842 components: - type: Transform pos: 40.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11843 components: - type: Transform pos: 40.5,-0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11844 components: - type: Transform pos: 40.5,-1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11845 components: - type: Transform pos: 40.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11846 components: - type: Transform pos: 40.5,-3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11847 components: - type: Transform pos: 40.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11848 components: - type: Transform @@ -90046,7 +90053,7 @@ entities: pos: 41.5,-5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11849 components: - type: Transform @@ -90054,7 +90061,7 @@ entities: pos: 42.5,-5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11850 components: - type: Transform @@ -90062,7 +90069,7 @@ entities: pos: 43.5,-6.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11851 components: - type: Transform @@ -90070,7 +90077,7 @@ entities: pos: 43.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11852 components: - type: Transform @@ -90078,7 +90085,7 @@ entities: pos: 43.5,-8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11853 components: - type: Transform @@ -90086,7 +90093,7 @@ entities: pos: 43.5,-9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11854 components: - type: Transform @@ -90094,7 +90101,7 @@ entities: pos: 43.5,-10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11855 components: - type: Transform @@ -90102,7 +90109,7 @@ entities: pos: 43.5,-11.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11856 components: - type: Transform @@ -90110,7 +90117,7 @@ entities: pos: 43.5,-12.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11857 components: - type: Transform @@ -90118,7 +90125,7 @@ entities: pos: 43.5,-13.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11858 components: - type: Transform @@ -90126,7 +90133,7 @@ entities: pos: 43.5,-14.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11859 components: - type: Transform @@ -90134,7 +90141,7 @@ entities: pos: 43.5,-15.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11860 components: - type: Transform @@ -90142,7 +90149,7 @@ entities: pos: 43.5,-16.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11864 components: - type: Transform @@ -90150,7 +90157,7 @@ entities: pos: 44.5,-17.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11865 components: - type: Transform @@ -90158,7 +90165,7 @@ entities: pos: 45.5,-17.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11866 components: - type: Transform @@ -90166,14 +90173,14 @@ entities: pos: 46.5,-17.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12052 components: - type: Transform pos: 39.5,6.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12054 components: - type: Transform @@ -90181,7 +90188,7 @@ entities: pos: 38.5,7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12055 components: - type: Transform @@ -90189,7 +90196,7 @@ entities: pos: 37.5,7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12056 components: - type: Transform @@ -90197,7 +90204,7 @@ entities: pos: 36.5,7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12057 components: - type: Transform @@ -90205,7 +90212,7 @@ entities: pos: 35.5,7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12058 components: - type: Transform @@ -90213,42 +90220,42 @@ entities: pos: 34.5,7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12106 components: - type: Transform pos: 8.5,-8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12107 components: - type: Transform pos: 8.5,-9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12108 components: - type: Transform pos: 8.5,-10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12109 components: - type: Transform pos: 8.5,-11.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12110 components: - type: Transform pos: 8.5,-12.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12112 components: - type: Transform @@ -90280,7 +90287,7 @@ entities: pos: -17.5,-6.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12132 components: - type: Transform @@ -90288,7 +90295,7 @@ entities: pos: 26.5,-16.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12133 components: - type: Transform @@ -90296,7 +90303,7 @@ entities: pos: 25.5,-16.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12134 components: - type: Transform @@ -90304,21 +90311,21 @@ entities: pos: 24.5,-16.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12137 components: - type: Transform pos: 22.5,-21.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12138 components: - type: Transform pos: 22.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12144 components: - type: Transform @@ -90326,7 +90333,7 @@ entities: pos: 20.5,5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12145 components: - type: Transform @@ -90334,7 +90341,7 @@ entities: pos: 20.5,6.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12146 components: - type: Transform @@ -90387,28 +90394,28 @@ entities: pos: 47.5,12.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12332 components: - type: Transform pos: 47.5,11.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12333 components: - type: Transform pos: 47.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12334 components: - type: Transform pos: 47.5,9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12338 components: - type: Transform @@ -90463,7 +90470,7 @@ entities: pos: 50.5,17.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12405 components: - type: Transform @@ -90471,7 +90478,7 @@ entities: pos: 50.5,18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12406 components: - type: Transform @@ -90479,7 +90486,7 @@ entities: pos: 50.5,19.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12407 components: - type: Transform @@ -90487,7 +90494,7 @@ entities: pos: 50.5,20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12408 components: - type: Transform @@ -90495,7 +90502,7 @@ entities: pos: 50.5,21.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12409 components: - type: Transform @@ -90503,7 +90510,7 @@ entities: pos: 50.5,22.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12411 components: - type: Transform @@ -90511,7 +90518,7 @@ entities: pos: 50.5,24.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12413 components: - type: Transform @@ -90519,7 +90526,7 @@ entities: pos: 51.5,25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12414 components: - type: Transform @@ -90527,7 +90534,7 @@ entities: pos: 52.5,25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12415 components: - type: Transform @@ -90535,7 +90542,7 @@ entities: pos: 53.5,25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12416 components: - type: Transform @@ -90543,7 +90550,7 @@ entities: pos: 54.5,26.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12417 components: - type: Transform @@ -90551,7 +90558,7 @@ entities: pos: 54.5,27.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12418 components: - type: Transform @@ -90559,7 +90566,7 @@ entities: pos: 54.5,28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12419 components: - type: Transform @@ -90567,7 +90574,7 @@ entities: pos: 54.5,29.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12452 components: - type: Transform @@ -90575,7 +90582,7 @@ entities: pos: 54.5,30.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12686 components: - type: Transform @@ -90615,7 +90622,7 @@ entities: pos: 33.5,32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12691 components: - type: Transform @@ -90623,7 +90630,7 @@ entities: pos: 32.5,32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12692 components: - type: Transform @@ -90631,7 +90638,7 @@ entities: pos: 31.5,32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12693 components: - type: Transform @@ -90639,7 +90646,7 @@ entities: pos: 30.5,32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12726 components: - type: Transform @@ -90743,7 +90750,7 @@ entities: pos: 21.5,27.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12785 components: - type: Transform @@ -90751,7 +90758,7 @@ entities: pos: 21.5,26.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12786 components: - type: Transform @@ -90759,7 +90766,7 @@ entities: pos: 21.5,25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12787 components: - type: Transform @@ -90767,7 +90774,7 @@ entities: pos: 21.5,24.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12789 components: - type: Transform @@ -90775,7 +90782,7 @@ entities: pos: 21.5,22.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12790 components: - type: Transform @@ -90783,7 +90790,7 @@ entities: pos: 21.5,21.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12791 components: - type: Transform @@ -90791,7 +90798,7 @@ entities: pos: 21.5,20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12825 components: - type: Transform @@ -90869,7 +90876,7 @@ entities: pos: 26.5,18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12992 components: - type: Transform @@ -90885,7 +90892,7 @@ entities: pos: 20.5,18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12997 components: - type: Transform @@ -90893,7 +90900,7 @@ entities: pos: 29.5,43.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12998 components: - type: Transform @@ -90901,7 +90908,7 @@ entities: pos: 30.5,43.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12999 components: - type: Transform @@ -90916,7 +90923,7 @@ entities: pos: 31.5,42.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 13003 components: - type: Transform @@ -91011,7 +91018,7 @@ entities: pos: 37.5,39.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 13017 components: - type: Transform @@ -91019,7 +91026,7 @@ entities: pos: 38.5,39.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 13018 components: - type: Transform @@ -91027,7 +91034,7 @@ entities: pos: 39.5,39.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 13019 components: - type: Transform @@ -91035,7 +91042,7 @@ entities: pos: 40.5,39.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 13020 components: - type: Transform @@ -91043,7 +91050,7 @@ entities: pos: 41.5,39.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 13021 components: - type: Transform @@ -91051,7 +91058,7 @@ entities: pos: 42.5,39.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 13022 components: - type: Transform @@ -91059,7 +91066,7 @@ entities: pos: 43.5,39.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 13023 components: - type: Transform @@ -91067,7 +91074,7 @@ entities: pos: 44.5,39.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 13024 components: - type: Transform @@ -91075,7 +91082,7 @@ entities: pos: 45.5,39.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 13035 components: - type: Transform @@ -91083,7 +91090,7 @@ entities: pos: 29.5,46.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 13036 components: - type: Transform @@ -91091,7 +91098,7 @@ entities: pos: 29.5,47.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 13037 components: - type: Transform @@ -91099,7 +91106,7 @@ entities: pos: 29.5,48.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 13039 components: - type: Transform @@ -91146,7 +91153,7 @@ entities: pos: -50.5,-53.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 13454 components: - type: Transform @@ -91154,7 +91161,7 @@ entities: pos: 24.5,38.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 13455 components: - type: Transform @@ -91162,7 +91169,7 @@ entities: pos: 24.5,39.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 13456 components: - type: Transform @@ -91170,7 +91177,7 @@ entities: pos: 24.5,40.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 13457 components: - type: Transform @@ -91178,7 +91185,7 @@ entities: pos: 24.5,41.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 13458 components: - type: Transform @@ -91186,7 +91193,7 @@ entities: pos: 24.5,42.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 13459 components: - type: Transform @@ -91194,7 +91201,7 @@ entities: pos: 24.5,43.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 13460 components: - type: Transform @@ -91202,7 +91209,7 @@ entities: pos: 24.5,44.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14189 components: - type: Transform @@ -91218,7 +91225,7 @@ entities: pos: -19.5,-25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14253 components: - type: Transform @@ -91233,7 +91240,7 @@ entities: pos: -4.5,-33.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14258 components: - type: Transform @@ -91256,7 +91263,7 @@ entities: pos: -16.5,-25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14373 components: - type: Transform @@ -91264,14 +91271,14 @@ entities: pos: -17.5,-25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14374 components: - type: Transform pos: -21.5,-27.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14387 components: - type: Transform @@ -91286,7 +91293,7 @@ entities: pos: -20.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14404 components: - type: Transform @@ -91310,7 +91317,7 @@ entities: pos: -15.5,-25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14451 components: - type: Transform @@ -91334,105 +91341,105 @@ entities: pos: -26.5,-32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14467 components: - type: Transform pos: -28.5,-30.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14523 components: - type: Transform pos: -3.5,-21.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14524 components: - type: Transform pos: -3.5,-22.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14525 components: - type: Transform pos: -3.5,-23.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14526 components: - type: Transform pos: -3.5,-24.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14528 components: - type: Transform pos: -3.5,-26.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14529 components: - type: Transform pos: -3.5,-27.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14530 components: - type: Transform pos: -3.5,-28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14531 components: - type: Transform pos: -3.5,-29.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14532 components: - type: Transform pos: -3.5,-30.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14533 components: - type: Transform pos: -3.5,-31.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14534 components: - type: Transform pos: -3.5,-32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14537 components: - type: Transform pos: -3.5,-35.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14538 components: - type: Transform pos: -3.5,-36.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14542 components: - type: Transform @@ -91531,7 +91538,7 @@ entities: pos: -4.5,-25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14558 components: - type: Transform @@ -91539,7 +91546,7 @@ entities: pos: -5.5,-25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14559 components: - type: Transform @@ -91547,7 +91554,7 @@ entities: pos: -6.5,-25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14560 components: - type: Transform @@ -91555,7 +91562,7 @@ entities: pos: -7.5,-25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14561 components: - type: Transform @@ -91563,7 +91570,7 @@ entities: pos: -8.5,-25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14564 components: - type: Transform @@ -91571,7 +91578,7 @@ entities: pos: -9.5,-23.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14565 components: - type: Transform @@ -91579,7 +91586,7 @@ entities: pos: -9.5,-22.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14566 components: - type: Transform @@ -91587,7 +91594,7 @@ entities: pos: -9.5,-21.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14567 components: - type: Transform @@ -91595,7 +91602,7 @@ entities: pos: -10.5,-25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14571 components: - type: Transform @@ -91603,7 +91610,7 @@ entities: pos: -12.5,-28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14572 components: - type: Transform @@ -91611,7 +91618,7 @@ entities: pos: -12.5,-27.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14576 components: - type: Transform @@ -91619,7 +91626,7 @@ entities: pos: -15.5,-29.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14577 components: - type: Transform @@ -91627,7 +91634,7 @@ entities: pos: -16.5,-29.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14578 components: - type: Transform @@ -91635,7 +91642,7 @@ entities: pos: -17.5,-29.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14579 components: - type: Transform @@ -91643,7 +91650,7 @@ entities: pos: -18.5,-29.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14580 components: - type: Transform @@ -91651,7 +91658,7 @@ entities: pos: -19.5,-29.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14581 components: - type: Transform @@ -91659,70 +91666,70 @@ entities: pos: -20.5,-29.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14583 components: - type: Transform pos: -21.5,-28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14592 components: - type: Transform pos: -21.5,-30.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14593 components: - type: Transform pos: -21.5,-31.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14595 components: - type: Transform pos: -21.5,-33.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14596 components: - type: Transform pos: -21.5,-34.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14597 components: - type: Transform pos: -21.5,-35.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14599 components: - type: Transform pos: -21.5,-37.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14600 components: - type: Transform pos: -21.5,-38.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14601 components: - type: Transform pos: -21.5,-39.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14602 components: - type: Transform @@ -91730,7 +91737,7 @@ entities: pos: -22.5,-32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14603 components: - type: Transform @@ -91738,7 +91745,7 @@ entities: pos: -23.5,-32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14604 components: - type: Transform @@ -91746,7 +91753,7 @@ entities: pos: -24.5,-32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14605 components: - type: Transform @@ -91754,14 +91761,14 @@ entities: pos: -25.5,-32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14608 components: - type: Transform pos: -28.5,-31.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14610 components: - type: Transform @@ -91769,7 +91776,7 @@ entities: pos: -30.5,-32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14611 components: - type: Transform @@ -91777,7 +91784,7 @@ entities: pos: -31.5,-32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14612 components: - type: Transform @@ -91785,7 +91792,7 @@ entities: pos: -32.5,-32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14613 components: - type: Transform @@ -91793,7 +91800,7 @@ entities: pos: -33.5,-32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14614 components: - type: Transform @@ -91801,21 +91808,21 @@ entities: pos: -34.5,-32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14615 components: - type: Transform pos: -28.5,-29.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14616 components: - type: Transform pos: -28.5,-28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14621 components: - type: Transform @@ -91829,14 +91836,14 @@ entities: pos: -18.5,-21.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14627 components: - type: Transform pos: -21.5,-26.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14636 components: - type: Transform @@ -92254,7 +92261,7 @@ entities: pos: -19.5,-36.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14736 components: - type: Transform @@ -92262,7 +92269,7 @@ entities: pos: -18.5,-36.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14737 components: - type: Transform @@ -92270,7 +92277,7 @@ entities: pos: -17.5,-36.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14738 components: - type: Transform @@ -92278,7 +92285,7 @@ entities: pos: -16.5,-36.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14743 components: - type: Transform @@ -92286,42 +92293,42 @@ entities: pos: -13.5,-29.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14744 components: - type: Transform pos: -28.5,-33.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14745 components: - type: Transform pos: -28.5,-34.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14746 components: - type: Transform pos: -28.5,-35.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14747 components: - type: Transform pos: -28.5,-36.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14748 components: - type: Transform pos: -28.5,-37.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14749 components: - type: Transform @@ -92349,7 +92356,7 @@ entities: pos: -18.5,-24.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14796 components: - type: Transform @@ -92357,7 +92364,7 @@ entities: pos: -11.5,-25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14799 components: - type: Transform @@ -92365,7 +92372,7 @@ entities: pos: -12.5,-26.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14848 components: - type: Transform @@ -92373,7 +92380,7 @@ entities: pos: -20.5,-25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14940 components: - type: Transform @@ -92388,70 +92395,70 @@ entities: pos: -31.5,-50.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15238 components: - type: Transform pos: -31.5,-49.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15239 components: - type: Transform pos: -31.5,-48.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15240 components: - type: Transform pos: -31.5,-47.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15241 components: - type: Transform pos: -31.5,-46.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15242 components: - type: Transform pos: -27.5,-50.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15243 components: - type: Transform pos: -27.5,-49.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15244 components: - type: Transform pos: -27.5,-48.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15245 components: - type: Transform pos: -27.5,-47.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15246 components: - type: Transform pos: -27.5,-46.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15247 components: - type: Transform @@ -92459,7 +92466,7 @@ entities: pos: -30.5,-45.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15248 components: - type: Transform @@ -92467,7 +92474,7 @@ entities: pos: -29.5,-45.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15249 components: - type: Transform @@ -92475,7 +92482,7 @@ entities: pos: -28.5,-45.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15251 components: - type: Transform @@ -92483,7 +92490,7 @@ entities: pos: -25.5,-45.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15252 components: - type: Transform @@ -92491,7 +92498,7 @@ entities: pos: -24.5,-45.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15253 components: - type: Transform @@ -92499,7 +92506,7 @@ entities: pos: -23.5,-45.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15254 components: - type: Transform @@ -92507,7 +92514,7 @@ entities: pos: -22.5,-45.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15256 components: - type: Transform @@ -92515,7 +92522,7 @@ entities: pos: -21.5,-44.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15257 components: - type: Transform @@ -92523,7 +92530,7 @@ entities: pos: -21.5,-43.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15258 components: - type: Transform @@ -92531,7 +92538,7 @@ entities: pos: -21.5,-42.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15260 components: - type: Transform @@ -92539,7 +92546,7 @@ entities: pos: -21.5,-40.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15269 components: - type: Transform @@ -92713,7 +92720,7 @@ entities: pos: -21.5,-46.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15294 components: - type: Transform @@ -92721,7 +92728,7 @@ entities: pos: -21.5,-47.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15296 components: - type: Transform @@ -92729,7 +92736,7 @@ entities: pos: -21.5,-49.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15297 components: - type: Transform @@ -92737,7 +92744,7 @@ entities: pos: -21.5,-50.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15298 components: - type: Transform @@ -92745,7 +92752,7 @@ entities: pos: -21.5,-51.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15299 components: - type: Transform @@ -92753,7 +92760,7 @@ entities: pos: -21.5,-52.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15300 components: - type: Transform @@ -92825,7 +92832,7 @@ entities: pos: -19.5,-41.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15313 components: - type: Transform @@ -92833,7 +92840,7 @@ entities: pos: -18.5,-41.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15314 components: - type: Transform @@ -92841,7 +92848,7 @@ entities: pos: -17.5,-41.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15315 components: - type: Transform @@ -92849,7 +92856,7 @@ entities: pos: -16.5,-41.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15321 components: - type: Transform @@ -92923,7 +92930,7 @@ entities: pos: -20.5,-48.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15336 components: - type: Transform @@ -92931,7 +92938,7 @@ entities: pos: -19.5,-48.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15337 components: - type: Transform @@ -92939,7 +92946,7 @@ entities: pos: -18.5,-48.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15338 components: - type: Transform @@ -92947,14 +92954,14 @@ entities: pos: -17.5,-48.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15341 components: - type: Transform pos: -16.5,-49.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15342 components: - type: Transform @@ -92962,7 +92969,7 @@ entities: pos: -15.5,-50.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15343 components: - type: Transform @@ -92970,7 +92977,7 @@ entities: pos: -14.5,-50.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15346 components: - type: Transform @@ -92994,7 +93001,7 @@ entities: pos: -22.5,-55.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15519 components: - type: Transform @@ -93002,21 +93009,21 @@ entities: pos: -23.5,-55.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15520 components: - type: Transform pos: -21.5,-54.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15521 components: - type: Transform pos: -21.5,-53.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15522 components: - type: Transform @@ -93024,7 +93031,7 @@ entities: pos: -20.5,-55.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15523 components: - type: Transform @@ -93032,7 +93039,7 @@ entities: pos: -19.5,-55.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15524 components: - type: Transform @@ -93040,7 +93047,7 @@ entities: pos: -18.5,-55.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15525 components: - type: Transform @@ -93048,21 +93055,21 @@ entities: pos: -17.5,-55.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15527 components: - type: Transform pos: -16.5,-56.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15528 components: - type: Transform pos: -16.5,-57.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15535 components: - type: Transform @@ -93123,7 +93130,7 @@ entities: pos: -14.5,-25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15673 components: - type: Transform @@ -93131,7 +93138,7 @@ entities: pos: -6.5,-33.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16076 components: - type: Transform @@ -93161,7 +93168,7 @@ entities: pos: -33.5,-45.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16360 components: - type: Transform @@ -93169,7 +93176,7 @@ entities: pos: -34.5,-45.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16361 components: - type: Transform @@ -93177,7 +93184,7 @@ entities: pos: -35.5,-45.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16362 components: - type: Transform @@ -93185,7 +93192,7 @@ entities: pos: -37.5,-46.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16363 components: - type: Transform @@ -93193,7 +93200,7 @@ entities: pos: -38.5,-46.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16365 components: - type: Transform @@ -93201,7 +93208,7 @@ entities: pos: -40.5,-46.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16366 components: - type: Transform @@ -93209,7 +93216,7 @@ entities: pos: -41.5,-46.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16368 components: - type: Transform @@ -93217,7 +93224,7 @@ entities: pos: -43.5,-46.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16369 components: - type: Transform @@ -93225,7 +93232,7 @@ entities: pos: -44.5,-46.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16370 components: - type: Transform @@ -93233,7 +93240,7 @@ entities: pos: -45.5,-46.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16371 components: - type: Transform @@ -93241,7 +93248,7 @@ entities: pos: -46.5,-46.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16372 components: - type: Transform @@ -93249,7 +93256,7 @@ entities: pos: -47.5,-46.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16373 components: - type: Transform @@ -93257,7 +93264,7 @@ entities: pos: -48.5,-46.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16374 components: - type: Transform @@ -93265,7 +93272,7 @@ entities: pos: -49.5,-46.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16379 components: - type: Transform @@ -93273,7 +93280,7 @@ entities: pos: -50.5,-52.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16383 components: - type: Transform @@ -93281,7 +93288,7 @@ entities: pos: -51.5,-54.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16384 components: - type: Transform @@ -93289,7 +93296,7 @@ entities: pos: -52.5,-54.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16385 components: - type: Transform @@ -93297,7 +93304,7 @@ entities: pos: -51.5,-51.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16386 components: - type: Transform @@ -93305,35 +93312,35 @@ entities: pos: -52.5,-51.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16387 components: - type: Transform pos: -50.5,-50.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16388 components: - type: Transform pos: -50.5,-49.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16389 components: - type: Transform pos: -50.5,-48.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16390 components: - type: Transform pos: -50.5,-47.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16391 components: - type: Transform @@ -93341,7 +93348,7 @@ entities: pos: -51.5,-46.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16392 components: - type: Transform @@ -93349,7 +93356,7 @@ entities: pos: -52.5,-46.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16401 components: - type: Transform @@ -93410,7 +93417,7 @@ entities: pos: -5.5,-33.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16722 components: - type: Transform @@ -93418,7 +93425,7 @@ entities: pos: -39.5,-45.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16723 components: - type: Transform @@ -93426,7 +93433,7 @@ entities: pos: -39.5,-44.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16724 components: - type: Transform @@ -93434,7 +93441,7 @@ entities: pos: -39.5,-43.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16725 components: - type: Transform @@ -93442,7 +93449,7 @@ entities: pos: -39.5,-42.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16726 components: - type: Transform @@ -93450,7 +93457,7 @@ entities: pos: -39.5,-40.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16727 components: - type: Transform @@ -93458,7 +93465,7 @@ entities: pos: -42.5,-41.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16728 components: - type: Transform @@ -93466,7 +93473,7 @@ entities: pos: -43.5,-41.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16729 components: - type: Transform @@ -93474,7 +93481,7 @@ entities: pos: -41.5,-41.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16730 components: - type: Transform @@ -93482,7 +93489,7 @@ entities: pos: -44.5,-41.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16731 components: - type: Transform @@ -93490,7 +93497,7 @@ entities: pos: -45.5,-41.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16732 components: - type: Transform @@ -93498,7 +93505,7 @@ entities: pos: -46.5,-41.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16733 components: - type: Transform @@ -93506,7 +93513,7 @@ entities: pos: -47.5,-41.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16734 components: - type: Transform @@ -93514,21 +93521,21 @@ entities: pos: -48.5,-41.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16735 components: - type: Transform pos: -49.5,-40.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16736 components: - type: Transform pos: -49.5,-39.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16737 components: - type: Transform @@ -93536,7 +93543,7 @@ entities: pos: -40.5,-41.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17263 components: - type: Transform @@ -93544,7 +93551,7 @@ entities: pos: -43.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17264 components: - type: Transform @@ -93552,7 +93559,7 @@ entities: pos: -42.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17265 components: - type: Transform @@ -93560,7 +93567,7 @@ entities: pos: -41.5,-5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17266 components: - type: Transform @@ -93568,7 +93575,7 @@ entities: pos: -41.5,-6.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17465 components: - type: Transform @@ -93576,7 +93583,7 @@ entities: pos: -51.5,-28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17466 components: - type: Transform @@ -93584,7 +93591,7 @@ entities: pos: -50.5,-28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17467 components: - type: Transform @@ -93592,7 +93599,7 @@ entities: pos: -49.5,-28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17468 components: - type: Transform @@ -93600,7 +93607,7 @@ entities: pos: -48.5,-28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17470 components: - type: Transform @@ -93608,7 +93615,7 @@ entities: pos: -46.5,-28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17471 components: - type: Transform @@ -93616,7 +93623,7 @@ entities: pos: -45.5,-28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17472 components: - type: Transform @@ -93624,7 +93631,7 @@ entities: pos: -44.5,-28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17474 components: - type: Transform @@ -93632,7 +93639,7 @@ entities: pos: -42.5,-28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17475 components: - type: Transform @@ -93640,7 +93647,7 @@ entities: pos: -41.5,-28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17476 components: - type: Transform @@ -93648,7 +93655,7 @@ entities: pos: -40.5,-28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17477 components: - type: Transform @@ -93656,7 +93663,7 @@ entities: pos: -39.5,-29.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17478 components: - type: Transform @@ -93664,7 +93671,7 @@ entities: pos: -39.5,-30.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17479 components: - type: Transform @@ -93672,7 +93679,7 @@ entities: pos: -39.5,-31.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17480 components: - type: Transform @@ -93680,7 +93687,7 @@ entities: pos: -39.5,-32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17481 components: - type: Transform @@ -93688,7 +93695,7 @@ entities: pos: -39.5,-33.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17482 components: - type: Transform @@ -93696,7 +93703,7 @@ entities: pos: -39.5,-34.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17483 components: - type: Transform @@ -93704,7 +93711,7 @@ entities: pos: -39.5,-35.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17484 components: - type: Transform @@ -93712,7 +93719,7 @@ entities: pos: -39.5,-36.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17485 components: - type: Transform @@ -93720,7 +93727,7 @@ entities: pos: -39.5,-37.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17486 components: - type: Transform @@ -93728,7 +93735,7 @@ entities: pos: -39.5,-38.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17487 components: - type: Transform @@ -93736,7 +93743,7 @@ entities: pos: -39.5,-39.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17489 components: - type: Transform @@ -93744,7 +93751,7 @@ entities: pos: -43.5,-33.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17490 components: - type: Transform @@ -93752,7 +93759,7 @@ entities: pos: -43.5,-32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17491 components: - type: Transform @@ -93760,7 +93767,7 @@ entities: pos: -43.5,-31.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17492 components: - type: Transform @@ -93768,7 +93775,7 @@ entities: pos: -43.5,-30.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17493 components: - type: Transform @@ -93776,7 +93783,7 @@ entities: pos: -43.5,-29.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17649 components: - type: Transform @@ -93784,7 +93791,7 @@ entities: pos: -23.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17650 components: - type: Transform @@ -93792,7 +93799,7 @@ entities: pos: -24.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17651 components: - type: Transform @@ -93800,7 +93807,7 @@ entities: pos: -25.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17652 components: - type: Transform @@ -93808,7 +93815,7 @@ entities: pos: -26.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17653 components: - type: Transform @@ -93816,7 +93823,7 @@ entities: pos: -27.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17654 components: - type: Transform @@ -93824,7 +93831,7 @@ entities: pos: -28.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17655 components: - type: Transform @@ -93832,7 +93839,7 @@ entities: pos: -29.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17656 components: - type: Transform @@ -93848,7 +93855,7 @@ entities: pos: -31.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17658 components: - type: Transform @@ -93856,7 +93863,7 @@ entities: pos: -32.5,-6.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17659 components: - type: Transform @@ -93864,7 +93871,7 @@ entities: pos: -32.5,-5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17660 components: - type: Transform @@ -93872,7 +93879,7 @@ entities: pos: -32.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17661 components: - type: Transform @@ -93880,7 +93887,7 @@ entities: pos: -32.5,-3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17662 components: - type: Transform @@ -93888,7 +93895,7 @@ entities: pos: -32.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17663 components: - type: Transform @@ -93896,49 +93903,49 @@ entities: pos: -32.5,-1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17666 components: - type: Transform pos: -30.5,-8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17668 components: - type: Transform pos: -30.5,-10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17669 components: - type: Transform pos: -30.5,-11.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17670 components: - type: Transform pos: -30.5,-12.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17671 components: - type: Transform pos: -30.5,-13.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17672 components: - type: Transform pos: -30.5,-14.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17687 components: - type: Transform @@ -94057,28 +94064,28 @@ entities: pos: -49.5,-5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18355 components: - type: Transform pos: -49.5,-6.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18356 components: - type: Transform pos: -49.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18357 components: - type: Transform pos: -49.5,-8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18361 components: - type: Transform @@ -94086,7 +94093,7 @@ entities: pos: -38.5,-28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18362 components: - type: Transform @@ -94094,7 +94101,7 @@ entities: pos: -37.5,-28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18363 components: - type: Transform @@ -94102,56 +94109,56 @@ entities: pos: -36.5,-28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18364 components: - type: Transform pos: -35.5,-27.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18365 components: - type: Transform pos: -35.5,-26.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18366 components: - type: Transform pos: -35.5,-25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18367 components: - type: Transform pos: -35.5,-24.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18368 components: - type: Transform pos: -35.5,-23.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18369 components: - type: Transform pos: -35.5,-22.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18370 components: - type: Transform pos: -35.5,-21.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18371 components: - type: Transform @@ -94159,7 +94166,7 @@ entities: pos: -34.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18372 components: - type: Transform @@ -94167,7 +94174,7 @@ entities: pos: -33.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18373 components: - type: Transform @@ -94175,7 +94182,7 @@ entities: pos: -32.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18374 components: - type: Transform @@ -94183,7 +94190,7 @@ entities: pos: -31.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18375 components: - type: Transform @@ -94191,7 +94198,7 @@ entities: pos: -30.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18376 components: - type: Transform @@ -94199,7 +94206,7 @@ entities: pos: -29.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18377 components: - type: Transform @@ -94207,7 +94214,7 @@ entities: pos: -28.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18378 components: - type: Transform @@ -94215,7 +94222,7 @@ entities: pos: -27.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18379 components: - type: Transform @@ -94223,7 +94230,7 @@ entities: pos: -26.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18380 components: - type: Transform @@ -94231,7 +94238,7 @@ entities: pos: -25.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18381 components: - type: Transform @@ -94239,7 +94246,7 @@ entities: pos: -24.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18382 components: - type: Transform @@ -94247,112 +94254,112 @@ entities: pos: -23.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18451 components: - type: Transform pos: -52.5,-5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18452 components: - type: Transform pos: -52.5,-6.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18453 components: - type: Transform pos: -52.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18454 components: - type: Transform pos: -52.5,-8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18455 components: - type: Transform pos: -52.5,-9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18456 components: - type: Transform pos: -52.5,-10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18457 components: - type: Transform pos: -52.5,-11.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18459 components: - type: Transform pos: -52.5,-13.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18460 components: - type: Transform pos: -52.5,-14.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18461 components: - type: Transform pos: -52.5,-15.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18462 components: - type: Transform pos: -52.5,-16.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18463 components: - type: Transform pos: -52.5,-17.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18464 components: - type: Transform pos: -52.5,-18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18465 components: - type: Transform pos: -52.5,-19.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18466 components: - type: Transform pos: -52.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18467 components: - type: Transform @@ -94360,7 +94367,7 @@ entities: pos: -51.5,-21.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18468 components: - type: Transform @@ -94368,7 +94375,7 @@ entities: pos: -50.5,-21.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18469 components: - type: Transform @@ -94376,7 +94383,7 @@ entities: pos: -49.5,-21.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18470 components: - type: Transform @@ -94384,7 +94391,7 @@ entities: pos: -48.5,-21.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18471 components: - type: Transform @@ -94404,7 +94411,7 @@ entities: pos: -46.5,-22.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18473 components: - type: Transform @@ -94412,7 +94419,7 @@ entities: pos: -47.5,-24.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18474 components: - type: Transform @@ -94420,7 +94427,7 @@ entities: pos: -47.5,-25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18475 components: - type: Transform @@ -94428,7 +94435,7 @@ entities: pos: -47.5,-26.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18476 components: - type: Transform @@ -94436,7 +94443,7 @@ entities: pos: -47.5,-27.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18486 components: - type: Transform @@ -94452,7 +94459,7 @@ entities: pos: -53.5,-12.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18499 components: - type: Transform @@ -94504,7 +94511,7 @@ entities: pos: 35.5,28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18974 components: - type: Transform @@ -94512,7 +94519,7 @@ entities: pos: 36.5,28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18975 components: - type: Transform @@ -94520,7 +94527,7 @@ entities: pos: 37.5,28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18976 components: - type: Transform @@ -94528,7 +94535,7 @@ entities: pos: 38.5,28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18977 components: - type: Transform @@ -94536,14 +94543,14 @@ entities: pos: 39.5,28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18978 components: - type: Transform pos: 40.5,29.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18979 components: - type: Transform @@ -94551,7 +94558,7 @@ entities: pos: 41.5,30.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18980 components: - type: Transform @@ -94559,7 +94566,7 @@ entities: pos: 42.5,30.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18981 components: - type: Transform @@ -94567,7 +94574,7 @@ entities: pos: 43.5,30.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18982 components: - type: Transform @@ -94575,7 +94582,7 @@ entities: pos: 44.5,30.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18983 components: - type: Transform @@ -94583,7 +94590,7 @@ entities: pos: 45.5,30.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18984 components: - type: Transform @@ -94591,7 +94598,7 @@ entities: pos: 46.5,31.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18985 components: - type: Transform @@ -94599,7 +94606,7 @@ entities: pos: 47.5,32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18986 components: - type: Transform @@ -94607,7 +94614,7 @@ entities: pos: 48.5,32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18987 components: - type: Transform @@ -94615,7 +94622,7 @@ entities: pos: 49.5,32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18988 components: - type: Transform @@ -94623,7 +94630,7 @@ entities: pos: 51.5,32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18989 components: - type: Transform @@ -94631,7 +94638,7 @@ entities: pos: 52.5,32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18990 components: - type: Transform @@ -94639,49 +94646,49 @@ entities: pos: 53.5,32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18991 components: - type: Transform pos: 54.5,33.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18992 components: - type: Transform pos: 54.5,34.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18993 components: - type: Transform pos: 54.5,35.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18994 components: - type: Transform pos: 50.5,33.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18995 components: - type: Transform pos: 50.5,34.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18996 components: - type: Transform pos: 50.5,35.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18999 components: - type: Transform @@ -94689,7 +94696,7 @@ entities: pos: 55.5,36.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 19000 components: - type: Transform @@ -94697,7 +94704,7 @@ entities: pos: 56.5,37.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 19028 components: - type: Transform @@ -94705,7 +94712,7 @@ entities: pos: 28.5,5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 19029 components: - type: Transform @@ -94713,7 +94720,7 @@ entities: pos: 28.5,6.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 19030 components: - type: Transform @@ -94721,7 +94728,7 @@ entities: pos: 28.5,7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 19031 components: - type: Transform @@ -94729,7 +94736,7 @@ entities: pos: 28.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 19032 components: - type: Transform @@ -94737,7 +94744,7 @@ entities: pos: 28.5,9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 19036 components: - type: Transform @@ -94745,7 +94752,7 @@ entities: pos: 29.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 19037 components: - type: Transform @@ -94753,7 +94760,7 @@ entities: pos: 30.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 19038 components: - type: Transform @@ -94761,7 +94768,7 @@ entities: pos: 31.5,11.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 19039 components: - type: Transform @@ -94769,7 +94776,7 @@ entities: pos: 32.5,12.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 19040 components: - type: Transform @@ -94777,7 +94784,7 @@ entities: pos: 33.5,12.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 19041 components: - type: Transform @@ -94785,7 +94792,7 @@ entities: pos: 34.5,12.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 19042 components: - type: Transform @@ -94793,7 +94800,7 @@ entities: pos: 35.5,12.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 19043 components: - type: Transform @@ -94801,7 +94808,7 @@ entities: pos: 36.5,12.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 19044 components: - type: Transform @@ -94809,7 +94816,7 @@ entities: pos: 37.5,12.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 19045 components: - type: Transform @@ -94817,7 +94824,7 @@ entities: pos: 38.5,12.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 19046 components: - type: Transform @@ -94825,7 +94832,7 @@ entities: pos: 39.5,12.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 19048 components: - type: Transform @@ -94833,7 +94840,7 @@ entities: pos: 40.5,13.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 19049 components: - type: Transform @@ -94841,7 +94848,7 @@ entities: pos: 40.5,14.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 19050 components: - type: Transform @@ -94849,7 +94856,7 @@ entities: pos: 40.5,15.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 19051 components: - type: Transform @@ -94857,7 +94864,7 @@ entities: pos: 40.5,16.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 19052 components: - type: Transform @@ -94865,7 +94872,7 @@ entities: pos: 40.5,17.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 19053 components: - type: Transform @@ -94873,7 +94880,7 @@ entities: pos: 40.5,18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 19054 components: - type: Transform @@ -94881,7 +94888,7 @@ entities: pos: 40.5,19.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 19055 components: - type: Transform @@ -94889,7 +94896,7 @@ entities: pos: 40.5,20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 19056 components: - type: Transform @@ -94897,7 +94904,7 @@ entities: pos: 40.5,21.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 19057 components: - type: Transform @@ -94905,7 +94912,7 @@ entities: pos: 40.5,22.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 19058 components: - type: Transform @@ -94913,7 +94920,7 @@ entities: pos: 40.5,23.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 19059 components: - type: Transform @@ -94921,7 +94928,7 @@ entities: pos: 40.5,24.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 19060 components: - type: Transform @@ -94929,7 +94936,7 @@ entities: pos: 40.5,25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 19061 components: - type: Transform @@ -94937,7 +94944,7 @@ entities: pos: 40.5,26.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 19062 components: - type: Transform @@ -94945,7 +94952,7 @@ entities: pos: 40.5,27.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 19382 components: - type: Transform @@ -95001,7 +95008,7 @@ entities: pos: -7.5,-32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20588 components: - type: Transform @@ -95016,28 +95023,28 @@ entities: pos: 3.5,-21.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20638 components: - type: Transform pos: 3.5,-22.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20639 components: - type: Transform pos: 3.5,-23.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20640 components: - type: Transform pos: 3.5,-24.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20641 components: - type: Transform @@ -95120,7 +95127,7 @@ entities: pos: -1.5,-25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20652 components: - type: Transform @@ -95128,7 +95135,7 @@ entities: pos: -0.5,-25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20653 components: - type: Transform @@ -95136,7 +95143,7 @@ entities: pos: 0.5,-25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20654 components: - type: Transform @@ -95144,7 +95151,7 @@ entities: pos: 1.5,-25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20655 components: - type: Transform @@ -95152,168 +95159,168 @@ entities: pos: 2.5,-25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20660 components: - type: Transform pos: -3.5,-37.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20661 components: - type: Transform pos: -3.5,-38.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20662 components: - type: Transform pos: -3.5,-39.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20663 components: - type: Transform pos: -3.5,-40.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20664 components: - type: Transform pos: -3.5,-41.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20665 components: - type: Transform pos: -3.5,-42.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20666 components: - type: Transform pos: -3.5,-43.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20668 components: - type: Transform pos: -3.5,-45.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20669 components: - type: Transform pos: -3.5,-46.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20670 components: - type: Transform pos: -3.5,-47.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20671 components: - type: Transform pos: -3.5,-48.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20672 components: - type: Transform pos: -3.5,-49.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20673 components: - type: Transform pos: -3.5,-50.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20674 components: - type: Transform pos: -3.5,-51.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20675 components: - type: Transform pos: -3.5,-52.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20676 components: - type: Transform pos: -3.5,-53.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20677 components: - type: Transform pos: -3.5,-54.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20679 components: - type: Transform pos: -3.5,-56.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20680 components: - type: Transform pos: -3.5,-57.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20681 components: - type: Transform pos: -3.5,-58.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20682 components: - type: Transform pos: -3.5,-59.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20683 components: - type: Transform pos: -3.5,-60.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20684 components: - type: Transform pos: -3.5,-61.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20685 components: - type: Transform @@ -95481,7 +95488,7 @@ entities: pos: 6.5,-26.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20725 components: - type: Transform @@ -95489,7 +95496,7 @@ entities: pos: 4.5,-25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20726 components: - type: Transform @@ -95497,77 +95504,77 @@ entities: pos: 5.5,-25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20728 components: - type: Transform pos: 6.5,-27.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20729 components: - type: Transform pos: 6.5,-28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20730 components: - type: Transform pos: 6.5,-29.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20731 components: - type: Transform pos: 6.5,-30.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20733 components: - type: Transform pos: 6.5,-32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20734 components: - type: Transform pos: 6.5,-33.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20735 components: - type: Transform pos: 6.5,-34.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20737 components: - type: Transform pos: 6.5,-36.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20738 components: - type: Transform pos: 6.5,-37.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20739 components: - type: Transform pos: 6.5,-38.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20742 components: - type: Transform @@ -95575,7 +95582,7 @@ entities: pos: 5.5,-39.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20743 components: - type: Transform @@ -95583,7 +95590,7 @@ entities: pos: 4.5,-39.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20744 components: - type: Transform @@ -95591,56 +95598,56 @@ entities: pos: 3.5,-39.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20745 components: - type: Transform pos: 2.5,-38.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20746 components: - type: Transform pos: 2.5,-37.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20747 components: - type: Transform pos: 2.5,-36.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20748 components: - type: Transform pos: 2.5,-35.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20749 components: - type: Transform pos: 2.5,-34.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20750 components: - type: Transform pos: 2.5,-33.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20751 components: - type: Transform pos: 2.5,-32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20753 components: - type: Transform @@ -95648,7 +95655,7 @@ entities: pos: 7.5,-35.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20754 components: - type: Transform @@ -95656,7 +95663,7 @@ entities: pos: 8.5,-35.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20755 components: - type: Transform @@ -95664,7 +95671,7 @@ entities: pos: 9.5,-35.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20756 components: - type: Transform @@ -95672,7 +95679,7 @@ entities: pos: 10.5,-35.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20757 components: - type: Transform @@ -95680,7 +95687,7 @@ entities: pos: 12.5,-35.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20758 components: - type: Transform @@ -95688,7 +95695,7 @@ entities: pos: 13.5,-35.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20759 components: - type: Transform @@ -95696,7 +95703,7 @@ entities: pos: 14.5,-35.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20760 components: - type: Transform @@ -95704,7 +95711,7 @@ entities: pos: 11.5,-34.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20761 components: - type: Transform @@ -95712,7 +95719,7 @@ entities: pos: 11.5,-33.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20762 components: - type: Transform @@ -95720,7 +95727,7 @@ entities: pos: 11.5,-32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20763 components: - type: Transform @@ -95728,7 +95735,7 @@ entities: pos: 11.5,-31.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20764 components: - type: Transform @@ -95736,7 +95743,7 @@ entities: pos: 11.5,-30.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20766 components: - type: Transform @@ -95744,7 +95751,7 @@ entities: pos: 12.5,-29.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20767 components: - type: Transform @@ -95752,7 +95759,7 @@ entities: pos: 13.5,-29.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20768 components: - type: Transform @@ -95760,7 +95767,7 @@ entities: pos: 14.5,-29.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20769 components: - type: Transform @@ -95768,7 +95775,7 @@ entities: pos: 15.5,-29.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20770 components: - type: Transform @@ -95776,7 +95783,7 @@ entities: pos: 16.5,-29.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20771 components: - type: Transform @@ -95784,7 +95791,7 @@ entities: pos: 17.5,-29.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20772 components: - type: Transform @@ -95792,7 +95799,7 @@ entities: pos: 18.5,-29.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20773 components: - type: Transform @@ -95800,7 +95807,7 @@ entities: pos: 19.5,-29.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20775 components: - type: Transform @@ -95808,7 +95815,7 @@ entities: pos: 21.5,-29.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20776 components: - type: Transform @@ -95816,7 +95823,7 @@ entities: pos: 22.5,-29.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20777 components: - type: Transform @@ -95824,63 +95831,63 @@ entities: pos: 23.5,-29.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20786 components: - type: Transform pos: 11.5,-37.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20787 components: - type: Transform pos: 11.5,-38.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20788 components: - type: Transform pos: 11.5,-39.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20789 components: - type: Transform pos: 11.5,-40.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20790 components: - type: Transform pos: 11.5,-41.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20792 components: - type: Transform pos: 11.5,-43.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20793 components: - type: Transform pos: 11.5,-44.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20794 components: - type: Transform pos: 11.5,-45.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20797 components: - type: Transform @@ -95888,7 +95895,7 @@ entities: pos: 10.5,-46.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20798 components: - type: Transform @@ -95896,7 +95903,7 @@ entities: pos: 9.5,-46.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20799 components: - type: Transform @@ -95904,28 +95911,28 @@ entities: pos: 8.5,-46.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20800 components: - type: Transform pos: 7.5,-47.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20801 components: - type: Transform pos: 7.5,-48.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20802 components: - type: Transform pos: 7.5,-49.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20805 components: - type: Transform @@ -95933,7 +95940,7 @@ entities: pos: 9.5,-50.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20806 components: - type: Transform @@ -95941,7 +95948,7 @@ entities: pos: 10.5,-50.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20807 components: - type: Transform @@ -95949,7 +95956,7 @@ entities: pos: 11.5,-50.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20808 components: - type: Transform @@ -95957,7 +95964,7 @@ entities: pos: 12.5,-50.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20809 components: - type: Transform @@ -95965,7 +95972,7 @@ entities: pos: 13.5,-50.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20810 components: - type: Transform @@ -95973,7 +95980,7 @@ entities: pos: 14.5,-50.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20811 components: - type: Transform @@ -95981,7 +95988,7 @@ entities: pos: 15.5,-50.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20812 components: - type: Transform @@ -95989,7 +95996,7 @@ entities: pos: 16.5,-50.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20813 components: - type: Transform @@ -95997,7 +96004,7 @@ entities: pos: 17.5,-50.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20814 components: - type: Transform @@ -96005,7 +96012,7 @@ entities: pos: 18.5,-50.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20816 components: - type: Transform @@ -96013,7 +96020,7 @@ entities: pos: 20.5,-50.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20817 components: - type: Transform @@ -96021,7 +96028,7 @@ entities: pos: 21.5,-50.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20822 components: - type: Transform @@ -96029,7 +96036,7 @@ entities: pos: 12.5,-42.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20823 components: - type: Transform @@ -96037,7 +96044,7 @@ entities: pos: 13.5,-42.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20824 components: - type: Transform @@ -96045,7 +96052,7 @@ entities: pos: 14.5,-42.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20825 components: - type: Transform @@ -96053,7 +96060,7 @@ entities: pos: 15.5,-42.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20826 components: - type: Transform @@ -96061,7 +96068,7 @@ entities: pos: 16.5,-42.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20827 components: - type: Transform @@ -96069,7 +96076,7 @@ entities: pos: 17.5,-42.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20828 components: - type: Transform @@ -96077,7 +96084,7 @@ entities: pos: 18.5,-42.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20829 components: - type: Transform @@ -96085,7 +96092,7 @@ entities: pos: 19.5,-42.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20830 components: - type: Transform @@ -96093,7 +96100,7 @@ entities: pos: 20.5,-42.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20832 components: - type: Transform @@ -96101,7 +96108,7 @@ entities: pos: 22.5,-42.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20833 components: - type: Transform @@ -96109,7 +96116,7 @@ entities: pos: 23.5,-42.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20834 components: - type: Transform @@ -96117,7 +96124,7 @@ entities: pos: 24.5,-42.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20835 components: - type: Transform @@ -96125,7 +96132,7 @@ entities: pos: 25.5,-42.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20836 components: - type: Transform @@ -96133,7 +96140,7 @@ entities: pos: 26.5,-42.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20837 components: - type: Transform @@ -96141,7 +96148,7 @@ entities: pos: 27.5,-42.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20839 components: - type: Transform @@ -96149,7 +96156,7 @@ entities: pos: 29.5,-42.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20840 components: - type: Transform @@ -96157,7 +96164,7 @@ entities: pos: 30.5,-42.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20841 components: - type: Transform @@ -96165,7 +96172,7 @@ entities: pos: 31.5,-42.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20843 components: - type: Transform @@ -96173,7 +96180,7 @@ entities: pos: 33.5,-42.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20844 components: - type: Transform @@ -96181,7 +96188,7 @@ entities: pos: 34.5,-42.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20845 components: - type: Transform @@ -96189,7 +96196,7 @@ entities: pos: 35.5,-42.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20846 components: - type: Transform @@ -96197,7 +96204,7 @@ entities: pos: 36.5,-42.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20847 components: - type: Transform @@ -96205,7 +96212,7 @@ entities: pos: 21.5,-41.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20848 components: - type: Transform @@ -96213,7 +96220,7 @@ entities: pos: 21.5,-40.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20849 components: - type: Transform @@ -96221,7 +96228,7 @@ entities: pos: 21.5,-39.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20850 components: - type: Transform @@ -96229,7 +96236,7 @@ entities: pos: 21.5,-38.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20851 components: - type: Transform @@ -96237,7 +96244,7 @@ entities: pos: 28.5,-41.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20854 components: - type: Transform @@ -96259,14 +96266,14 @@ entities: pos: 22.5,-51.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20885 components: - type: Transform pos: 23.5,-53.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20889 components: - type: Transform @@ -96274,7 +96281,7 @@ entities: pos: 24.5,-54.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20890 components: - type: Transform @@ -96282,7 +96289,7 @@ entities: pos: 25.5,-54.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20891 components: - type: Transform @@ -96290,7 +96297,7 @@ entities: pos: 26.5,-54.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20892 components: - type: Transform @@ -96298,7 +96305,7 @@ entities: pos: 27.5,-54.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20893 components: - type: Transform @@ -96306,7 +96313,7 @@ entities: pos: 28.5,-54.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20894 components: - type: Transform @@ -96314,7 +96321,7 @@ entities: pos: 29.5,-55.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20895 components: - type: Transform @@ -96322,7 +96329,7 @@ entities: pos: 29.5,-56.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20896 components: - type: Transform @@ -96330,7 +96337,7 @@ entities: pos: 29.5,-57.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20897 components: - type: Transform @@ -96338,7 +96345,7 @@ entities: pos: 29.5,-58.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20962 components: - type: Transform @@ -96618,7 +96625,7 @@ entities: pos: 7.5,-31.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21012 components: - type: Transform @@ -97995,14 +98002,6 @@ entities: parent: 5350 - type: AtmosPipeColor color: '#FF1212FF' - - uid: 21570 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -3.5,-71.5 - parent: 5350 - - type: AtmosPipeColor - color: '#0335FCFF' - uid: 21571 components: - type: Transform @@ -98010,7 +98009,7 @@ entities: pos: -3.5,-72.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21572 components: - type: Transform @@ -98018,7 +98017,7 @@ entities: pos: -11.5,-72.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21573 components: - type: Transform @@ -98026,7 +98025,7 @@ entities: pos: -9.5,-72.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21577 components: - type: Transform @@ -98034,7 +98033,7 @@ entities: pos: -9.5,-70.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21578 components: - type: Transform @@ -98042,7 +98041,7 @@ entities: pos: -8.5,-70.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21579 components: - type: Transform @@ -98050,7 +98049,7 @@ entities: pos: -7.5,-70.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21580 components: - type: Transform @@ -98058,7 +98057,7 @@ entities: pos: -6.5,-70.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21582 components: - type: Transform @@ -98066,7 +98065,7 @@ entities: pos: -4.5,-70.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21583 components: - type: Transform @@ -98074,7 +98073,7 @@ entities: pos: -3.5,-69.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21584 components: - type: Transform @@ -98082,7 +98081,7 @@ entities: pos: -3.5,-68.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21585 components: - type: Transform @@ -98090,7 +98089,7 @@ entities: pos: -3.5,-66.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21586 components: - type: Transform @@ -98098,7 +98097,7 @@ entities: pos: -3.5,-65.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21587 components: - type: Transform @@ -98106,7 +98105,7 @@ entities: pos: -3.5,-64.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21588 components: - type: Transform @@ -98114,7 +98113,7 @@ entities: pos: -3.5,-63.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21589 components: - type: Transform @@ -98122,7 +98121,7 @@ entities: pos: -4.5,-62.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21590 components: - type: Transform @@ -98130,7 +98129,7 @@ entities: pos: -5.5,-62.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21591 components: - type: Transform @@ -98138,7 +98137,7 @@ entities: pos: -6.5,-62.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21593 components: - type: Transform @@ -98146,7 +98145,7 @@ entities: pos: -8.5,-62.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21594 components: - type: Transform @@ -98154,49 +98153,49 @@ entities: pos: -9.5,-62.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21595 components: - type: Transform pos: -10.5,-63.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21596 components: - type: Transform pos: -10.5,-64.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21598 components: - type: Transform pos: -10.5,-66.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21599 components: - type: Transform pos: -10.5,-67.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21600 components: - type: Transform pos: -10.5,-68.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21601 components: - type: Transform pos: -10.5,-69.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21602 components: - type: Transform @@ -98204,7 +98203,7 @@ entities: pos: -2.5,-67.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21603 components: - type: Transform @@ -98212,7 +98211,7 @@ entities: pos: -1.5,-67.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21604 components: - type: Transform @@ -98220,7 +98219,7 @@ entities: pos: -0.5,-67.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21605 components: - type: Transform @@ -98228,7 +98227,7 @@ entities: pos: 0.5,-67.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21612 components: - type: Transform @@ -98236,7 +98235,7 @@ entities: pos: -11.5,-65.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21613 components: - type: Transform @@ -98244,7 +98243,7 @@ entities: pos: -12.5,-65.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21614 components: - type: Transform @@ -98252,7 +98251,7 @@ entities: pos: -13.5,-65.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21615 components: - type: Transform @@ -98260,7 +98259,7 @@ entities: pos: -14.5,-65.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21616 components: - type: Transform @@ -98268,7 +98267,7 @@ entities: pos: -15.5,-65.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21617 components: - type: Transform @@ -98276,7 +98275,7 @@ entities: pos: -16.5,-65.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21618 components: - type: Transform @@ -98284,7 +98283,7 @@ entities: pos: -17.5,-65.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21621 components: - type: Transform @@ -98292,7 +98291,7 @@ entities: pos: -18.5,-72.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21622 components: - type: Transform @@ -98300,7 +98299,7 @@ entities: pos: -18.5,-71.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21623 components: - type: Transform @@ -98308,7 +98307,7 @@ entities: pos: -18.5,-69.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21624 components: - type: Transform @@ -98316,7 +98315,7 @@ entities: pos: -18.5,-68.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21625 components: - type: Transform @@ -98324,7 +98323,7 @@ entities: pos: -18.5,-67.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21626 components: - type: Transform @@ -98332,7 +98331,7 @@ entities: pos: -18.5,-66.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21627 components: - type: Transform @@ -98340,7 +98339,7 @@ entities: pos: -19.5,-70.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21628 components: - type: Transform @@ -98348,7 +98347,7 @@ entities: pos: -20.5,-70.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21629 components: - type: Transform @@ -98356,7 +98355,7 @@ entities: pos: -21.5,-70.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21630 components: - type: Transform @@ -98364,7 +98363,7 @@ entities: pos: -22.5,-70.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21631 components: - type: Transform @@ -98372,42 +98371,42 @@ entities: pos: -23.5,-70.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21633 components: - type: Transform pos: -24.5,-69.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21634 components: - type: Transform pos: -24.5,-68.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21635 components: - type: Transform pos: -24.5,-67.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21636 components: - type: Transform pos: -24.5,-66.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21637 components: - type: Transform pos: -24.5,-65.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21641 components: - type: Transform @@ -98462,14 +98461,14 @@ entities: pos: 50.5,26.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 23374 components: - type: Transform pos: 50.5,27.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 23376 components: - type: Transform @@ -98477,7 +98476,7 @@ entities: pos: 48.5,23.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 23377 components: - type: Transform @@ -98485,7 +98484,7 @@ entities: pos: 47.5,23.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 23378 components: - type: Transform @@ -98493,7 +98492,7 @@ entities: pos: 46.5,23.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 23390 components: - type: Transform @@ -98693,7 +98692,7 @@ entities: pos: 69.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 23512 components: - type: Transform @@ -98701,7 +98700,7 @@ entities: pos: 68.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 23513 components: - type: Transform @@ -98709,7 +98708,7 @@ entities: pos: 67.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 23514 components: - type: Transform @@ -98717,7 +98716,7 @@ entities: pos: 66.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 23515 components: - type: Transform @@ -98725,7 +98724,7 @@ entities: pos: 65.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 23516 components: - type: Transform @@ -98733,7 +98732,7 @@ entities: pos: 64.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 23517 components: - type: Transform @@ -98741,7 +98740,7 @@ entities: pos: 63.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 23518 components: - type: Transform @@ -98749,7 +98748,7 @@ entities: pos: 62.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 23519 components: - type: Transform @@ -98757,7 +98756,7 @@ entities: pos: 61.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 23520 components: - type: Transform @@ -98765,7 +98764,7 @@ entities: pos: 60.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 23521 components: - type: Transform @@ -98773,7 +98772,7 @@ entities: pos: 59.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 23522 components: - type: Transform @@ -98781,7 +98780,7 @@ entities: pos: 58.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 23523 components: - type: Transform @@ -98789,7 +98788,7 @@ entities: pos: 57.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 23524 components: - type: Transform @@ -98797,28 +98796,28 @@ entities: pos: 56.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 23526 components: - type: Transform pos: 55.5,9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 23527 components: - type: Transform pos: 55.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 23528 components: - type: Transform pos: 55.5,11.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 23529 components: - type: Transform @@ -98826,7 +98825,7 @@ entities: pos: 54.5,12.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 23530 components: - type: Transform @@ -98834,7 +98833,7 @@ entities: pos: 53.5,12.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 23531 components: - type: Transform @@ -98842,7 +98841,7 @@ entities: pos: 52.5,12.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 23532 components: - type: Transform @@ -98850,7 +98849,7 @@ entities: pos: 51.5,12.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 23568 components: - type: Transform @@ -98898,7 +98897,22 @@ entities: pos: 54.5,31.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' + - uid: 24813 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,-71.5 + parent: 5350 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 24857 + components: + - type: Transform + pos: -1.5,-72.5 + parent: 5350 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 24893 components: - type: Transform @@ -98906,7 +98920,7 @@ entities: pos: 64.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 24894 components: - type: Transform @@ -98914,7 +98928,7 @@ entities: pos: 65.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 24895 components: - type: Transform @@ -98922,7 +98936,7 @@ entities: pos: 66.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 24896 components: - type: Transform @@ -98930,7 +98944,7 @@ entities: pos: 67.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 24897 components: - type: Transform @@ -98938,7 +98952,7 @@ entities: pos: 68.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 24898 components: - type: Transform @@ -98946,7 +98960,7 @@ entities: pos: 69.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 24899 components: - type: Transform @@ -98954,7 +98968,7 @@ entities: pos: 70.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 24900 components: - type: Transform @@ -98962,7 +98976,7 @@ entities: pos: 71.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 24901 components: - type: Transform @@ -98970,7 +98984,7 @@ entities: pos: 72.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 24902 components: - type: Transform @@ -98978,7 +98992,7 @@ entities: pos: 73.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 24903 components: - type: Transform @@ -98986,7 +99000,7 @@ entities: pos: 74.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 24904 components: - type: Transform @@ -98994,7 +99008,7 @@ entities: pos: 75.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 24905 components: - type: Transform @@ -99002,7 +99016,7 @@ entities: pos: 76.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 24906 components: - type: Transform @@ -99010,7 +99024,7 @@ entities: pos: 77.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 24907 components: - type: Transform @@ -99018,7 +99032,7 @@ entities: pos: 78.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 24908 components: - type: Transform @@ -99026,7 +99040,7 @@ entities: pos: 79.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 24909 components: - type: Transform @@ -99034,7 +99048,7 @@ entities: pos: 80.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 24910 components: - type: Transform @@ -99042,7 +99056,7 @@ entities: pos: 81.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 24911 components: - type: Transform @@ -99050,7 +99064,7 @@ entities: pos: 82.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 24912 components: - type: Transform @@ -99058,7 +99072,7 @@ entities: pos: 83.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 24913 components: - type: Transform @@ -99066,7 +99080,7 @@ entities: pos: 84.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 24914 components: - type: Transform @@ -99074,7 +99088,7 @@ entities: pos: 85.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 24915 components: - type: Transform @@ -99082,7 +99096,7 @@ entities: pos: 86.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 24916 components: - type: Transform @@ -99090,7 +99104,7 @@ entities: pos: 87.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 24917 components: - type: Transform @@ -99098,7 +99112,7 @@ entities: pos: 88.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 24918 components: - type: Transform @@ -99106,7 +99120,7 @@ entities: pos: 89.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 24919 components: - type: Transform @@ -99114,7 +99128,7 @@ entities: pos: 90.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 24920 components: - type: Transform @@ -99122,7 +99136,7 @@ entities: pos: 91.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25550 components: - type: Transform @@ -99130,112 +99144,112 @@ entities: pos: 97.5,18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25561 components: - type: Transform pos: 94.5,1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25562 components: - type: Transform pos: 94.5,2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25563 components: - type: Transform pos: 94.5,3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25564 components: - type: Transform pos: 94.5,4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25565 components: - type: Transform pos: 94.5,5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25566 components: - type: Transform pos: 95.5,7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25567 components: - type: Transform pos: 95.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25568 components: - type: Transform pos: 95.5,9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25569 components: - type: Transform pos: 95.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25570 components: - type: Transform pos: 95.5,11.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25571 components: - type: Transform pos: 95.5,12.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25572 components: - type: Transform pos: 96.5,14.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25573 components: - type: Transform pos: 96.5,15.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25574 components: - type: Transform pos: 96.5,16.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25575 components: - type: Transform pos: 96.5,17.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25576 components: - type: Transform @@ -99243,7 +99257,7 @@ entities: pos: 98.5,18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25577 components: - type: Transform @@ -99251,7 +99265,7 @@ entities: pos: 99.5,18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25578 components: - type: Transform @@ -99259,7 +99273,7 @@ entities: pos: 100.5,18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25579 components: - type: Transform @@ -99267,7 +99281,7 @@ entities: pos: 101.5,18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25580 components: - type: Transform @@ -99275,7 +99289,7 @@ entities: pos: 102.5,18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25581 components: - type: Transform @@ -99283,7 +99297,7 @@ entities: pos: 103.5,18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25582 components: - type: Transform @@ -99291,7 +99305,7 @@ entities: pos: 105.5,18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25583 components: - type: Transform @@ -99299,7 +99313,7 @@ entities: pos: 106.5,18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25584 components: - type: Transform @@ -99307,7 +99321,7 @@ entities: pos: 107.5,18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25585 components: - type: Transform @@ -99315,7 +99329,7 @@ entities: pos: 108.5,18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25586 components: - type: Transform @@ -99323,7 +99337,7 @@ entities: pos: 109.5,18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25587 components: - type: Transform @@ -99331,7 +99345,7 @@ entities: pos: 110.5,18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25588 components: - type: Transform @@ -99339,7 +99353,7 @@ entities: pos: 111.5,18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25589 components: - type: Transform @@ -99347,7 +99361,7 @@ entities: pos: 112.5,17.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25590 components: - type: Transform @@ -99355,7 +99369,7 @@ entities: pos: 112.5,16.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25591 components: - type: Transform @@ -99363,7 +99377,7 @@ entities: pos: 112.5,15.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25592 components: - type: Transform @@ -99371,7 +99385,7 @@ entities: pos: 112.5,14.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25593 components: - type: Transform @@ -99379,7 +99393,7 @@ entities: pos: 113.5,12.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25594 components: - type: Transform @@ -99387,7 +99401,7 @@ entities: pos: 113.5,11.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25595 components: - type: Transform @@ -99395,7 +99409,7 @@ entities: pos: 113.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25596 components: - type: Transform @@ -99403,7 +99417,7 @@ entities: pos: 113.5,9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25597 components: - type: Transform @@ -99411,7 +99425,7 @@ entities: pos: 113.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25598 components: - type: Transform @@ -99419,7 +99433,7 @@ entities: pos: 113.5,7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25599 components: - type: Transform @@ -99427,7 +99441,7 @@ entities: pos: 115.5,5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25600 components: - type: Transform @@ -99435,7 +99449,7 @@ entities: pos: 115.5,4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25601 components: - type: Transform @@ -99443,7 +99457,7 @@ entities: pos: 115.5,3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25602 components: - type: Transform @@ -99451,7 +99465,7 @@ entities: pos: 115.5,2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25603 components: - type: Transform @@ -99459,7 +99473,7 @@ entities: pos: 115.5,1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25604 components: - type: Transform @@ -99467,7 +99481,7 @@ entities: pos: 111.5,-18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25605 components: - type: Transform @@ -99475,7 +99489,7 @@ entities: pos: 115.5,-0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25606 components: - type: Transform @@ -99483,7 +99497,7 @@ entities: pos: 115.5,-1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25607 components: - type: Transform @@ -99491,7 +99505,7 @@ entities: pos: 115.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25608 components: - type: Transform @@ -99499,7 +99513,7 @@ entities: pos: 115.5,-3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25609 components: - type: Transform @@ -99507,7 +99521,7 @@ entities: pos: 114.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25610 components: - type: Transform @@ -99515,98 +99529,98 @@ entities: pos: 113.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25611 components: - type: Transform pos: 112.5,-5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25612 components: - type: Transform pos: 112.5,-6.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25613 components: - type: Transform pos: 112.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25614 components: - type: Transform pos: 112.5,-8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25615 components: - type: Transform pos: 112.5,-9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25616 components: - type: Transform pos: 112.5,-10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25617 components: - type: Transform pos: 112.5,-11.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25618 components: - type: Transform pos: 112.5,-12.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25619 components: - type: Transform pos: 112.5,-13.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25620 components: - type: Transform pos: 112.5,-14.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25621 components: - type: Transform pos: 112.5,-15.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25622 components: - type: Transform pos: 112.5,-16.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25623 components: - type: Transform pos: 112.5,-17.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25624 components: - type: Transform @@ -99614,7 +99628,7 @@ entities: pos: 110.5,-18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25625 components: - type: Transform @@ -99622,7 +99636,7 @@ entities: pos: 109.5,-18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25626 components: - type: Transform @@ -99630,7 +99644,7 @@ entities: pos: 108.5,-18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25627 components: - type: Transform @@ -99638,7 +99652,7 @@ entities: pos: 107.5,-18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25628 components: - type: Transform @@ -99646,7 +99660,7 @@ entities: pos: 106.5,-18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25629 components: - type: Transform @@ -99654,7 +99668,7 @@ entities: pos: 105.5,-18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25630 components: - type: Transform @@ -99662,7 +99676,7 @@ entities: pos: 103.5,-18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25631 components: - type: Transform @@ -99670,7 +99684,7 @@ entities: pos: 102.5,-18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25632 components: - type: Transform @@ -99678,7 +99692,7 @@ entities: pos: 101.5,-18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25633 components: - type: Transform @@ -99686,7 +99700,7 @@ entities: pos: 100.5,-18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25634 components: - type: Transform @@ -99694,7 +99708,7 @@ entities: pos: 99.5,-18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25635 components: - type: Transform @@ -99702,7 +99716,7 @@ entities: pos: 98.5,-18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25636 components: - type: Transform @@ -99710,7 +99724,7 @@ entities: pos: 97.5,-18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25637 components: - type: Transform @@ -99718,7 +99732,7 @@ entities: pos: 96.5,-17.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25638 components: - type: Transform @@ -99726,7 +99740,7 @@ entities: pos: 96.5,-16.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25639 components: - type: Transform @@ -99734,7 +99748,7 @@ entities: pos: 96.5,-15.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25640 components: - type: Transform @@ -99742,7 +99756,7 @@ entities: pos: 96.5,-14.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25641 components: - type: Transform @@ -99750,7 +99764,7 @@ entities: pos: 96.5,-13.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25642 components: - type: Transform @@ -99758,7 +99772,7 @@ entities: pos: 96.5,-12.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25643 components: - type: Transform @@ -99766,7 +99780,7 @@ entities: pos: 96.5,-11.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25644 components: - type: Transform @@ -99774,7 +99788,7 @@ entities: pos: 96.5,-10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25645 components: - type: Transform @@ -99782,7 +99796,7 @@ entities: pos: 96.5,-9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25646 components: - type: Transform @@ -99790,7 +99804,7 @@ entities: pos: 96.5,-8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25647 components: - type: Transform @@ -99798,7 +99812,7 @@ entities: pos: 96.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25648 components: - type: Transform @@ -99806,7 +99820,7 @@ entities: pos: 96.5,-6.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25649 components: - type: Transform @@ -99814,7 +99828,7 @@ entities: pos: 96.5,-5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25650 components: - type: Transform @@ -99822,35 +99836,35 @@ entities: pos: 95.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25651 components: - type: Transform pos: 94.5,-3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25652 components: - type: Transform pos: 94.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25653 components: - type: Transform pos: 94.5,-1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25654 components: - type: Transform pos: 94.5,-0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25667 components: - type: Transform @@ -99858,7 +99872,7 @@ entities: pos: 114.5,6.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25870 components: - type: Transform @@ -99866,7 +99880,7 @@ entities: pos: 95.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25871 components: - type: Transform @@ -99874,7 +99888,7 @@ entities: pos: 96.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25872 components: - type: Transform @@ -99882,7 +99896,7 @@ entities: pos: 97.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25873 components: - type: Transform @@ -99890,7 +99904,7 @@ entities: pos: 98.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25875 components: - type: Transform @@ -99898,7 +99912,7 @@ entities: pos: 100.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25876 components: - type: Transform @@ -99906,7 +99920,7 @@ entities: pos: 101.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25877 components: - type: Transform @@ -99914,7 +99928,7 @@ entities: pos: 102.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25878 components: - type: Transform @@ -99922,7 +99936,7 @@ entities: pos: 103.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25880 components: - type: Transform @@ -99930,7 +99944,7 @@ entities: pos: 105.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25881 components: - type: Transform @@ -99938,7 +99952,7 @@ entities: pos: 106.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25882 components: - type: Transform @@ -99946,7 +99960,7 @@ entities: pos: 107.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25883 components: - type: Transform @@ -99954,7 +99968,7 @@ entities: pos: 108.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25886 components: - type: Transform @@ -99962,7 +99976,7 @@ entities: pos: 111.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25887 components: - type: Transform @@ -99970,7 +99984,7 @@ entities: pos: 112.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25888 components: - type: Transform @@ -99978,7 +99992,7 @@ entities: pos: 113.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25889 components: - type: Transform @@ -99986,7 +100000,7 @@ entities: pos: 114.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25895 components: - type: Transform @@ -99994,7 +100008,7 @@ entities: pos: 104.5,2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25896 components: - type: Transform @@ -100002,28 +100016,28 @@ entities: pos: 104.5,3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25898 components: - type: Transform pos: 104.5,-0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25899 components: - type: Transform pos: 104.5,-1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25900 components: - type: Transform pos: 104.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25903 components: - type: Transform @@ -100031,7 +100045,7 @@ entities: pos: 104.5,-5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25904 components: - type: Transform @@ -100039,7 +100053,7 @@ entities: pos: 104.5,-6.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25905 components: - type: Transform @@ -100047,7 +100061,7 @@ entities: pos: 104.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25906 components: - type: Transform @@ -100055,7 +100069,7 @@ entities: pos: 104.5,-8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25907 components: - type: Transform @@ -100063,7 +100077,7 @@ entities: pos: 104.5,-9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25908 components: - type: Transform @@ -100071,7 +100085,7 @@ entities: pos: 97.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25909 components: - type: Transform @@ -100079,7 +100093,7 @@ entities: pos: 98.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25910 components: - type: Transform @@ -100087,7 +100101,7 @@ entities: pos: 99.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25911 components: - type: Transform @@ -100095,7 +100109,7 @@ entities: pos: 100.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25912 components: - type: Transform @@ -100103,7 +100117,7 @@ entities: pos: 101.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25914 components: - type: Transform @@ -100111,7 +100125,7 @@ entities: pos: 103.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25915 components: - type: Transform @@ -100119,7 +100133,7 @@ entities: pos: 103.5,-3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25925 components: - type: Transform @@ -100198,7 +100212,7 @@ entities: pos: 102.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - proto: GasPipeTJunction entities: - uid: 265 @@ -100208,7 +100222,7 @@ entities: pos: -22.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 268 components: - type: Transform @@ -100216,7 +100230,7 @@ entities: pos: -22.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 281 components: - type: Transform @@ -100224,14 +100238,14 @@ entities: pos: -18.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 287 components: - type: Transform pos: -12.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 288 components: - type: Transform @@ -100255,7 +100269,7 @@ entities: pos: -3.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 306 components: - type: Transform @@ -100263,7 +100277,7 @@ entities: pos: 6.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 311 components: - type: Transform @@ -100271,7 +100285,7 @@ entities: pos: 11.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 322 components: - type: Transform @@ -100287,7 +100301,7 @@ entities: pos: 17.5,-1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 329 components: - type: Transform @@ -100303,7 +100317,7 @@ entities: pos: 17.5,-19.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 363 components: - type: Transform @@ -100325,7 +100339,7 @@ entities: pos: -9.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 385 components: - type: Transform @@ -100357,7 +100371,7 @@ entities: pos: -11.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 430 components: - type: Transform @@ -100372,7 +100386,7 @@ entities: pos: -4.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 444 components: - type: Transform @@ -100388,7 +100402,7 @@ entities: pos: 17.5,4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 458 components: - type: Transform @@ -100396,14 +100410,14 @@ entities: pos: 17.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 489 components: - type: Transform pos: -3.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 492 components: - type: Transform @@ -100419,7 +100433,7 @@ entities: pos: 0.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 496 components: - type: Transform @@ -100434,14 +100448,14 @@ entities: pos: -21.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 511 components: - type: Transform pos: 16.5,10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 513 components: - type: Transform @@ -100449,7 +100463,7 @@ entities: pos: 17.5,5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 514 components: - type: Transform @@ -100465,14 +100479,14 @@ entities: pos: 16.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 519 components: - type: Transform pos: -16.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 526 components: - type: Transform @@ -100480,7 +100494,7 @@ entities: pos: 4.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 528 components: - type: Transform @@ -100509,7 +100523,7 @@ entities: pos: -9.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 544 components: - type: Transform @@ -100517,7 +100531,7 @@ entities: pos: -22.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 553 components: - type: Transform @@ -100525,7 +100539,7 @@ entities: pos: 17.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 554 components: - type: Transform @@ -100541,7 +100555,7 @@ entities: pos: 17.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 566 components: - type: Transform @@ -100557,21 +100571,21 @@ entities: pos: -0.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 570 components: - type: Transform pos: -4.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 575 components: - type: Transform pos: 0.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 578 components: - type: Transform @@ -100595,7 +100609,7 @@ entities: pos: 4.5,-0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 600 components: - type: Transform @@ -100611,14 +100625,14 @@ entities: pos: -9.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 606 components: - type: Transform pos: -9.5,1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 614 components: - type: Transform @@ -100626,7 +100640,7 @@ entities: pos: -4.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 617 components: - type: Transform @@ -100650,7 +100664,7 @@ entities: pos: -9.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 639 components: - type: Transform @@ -100658,7 +100672,7 @@ entities: pos: -5.5,1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 739 components: - type: Transform @@ -100666,7 +100680,7 @@ entities: pos: -17.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 762 components: - type: Transform @@ -100674,7 +100688,7 @@ entities: pos: -12.5,5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 774 components: - type: Transform @@ -100682,7 +100696,7 @@ entities: pos: 11.5,-3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 775 components: - type: Transform @@ -100698,7 +100712,7 @@ entities: pos: 4.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 790 components: - type: Transform @@ -100706,14 +100720,14 @@ entities: pos: 11.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 820 components: - type: Transform pos: -2.5,1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 1206 components: - type: Transform @@ -100721,7 +100735,7 @@ entities: pos: -34.5,18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 1590 components: - type: Transform @@ -100737,7 +100751,7 @@ entities: pos: 0.5,-14.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 1678 components: - type: Transform @@ -100759,7 +100773,7 @@ entities: pos: -17.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2495 components: - type: Transform @@ -100781,21 +100795,21 @@ entities: pos: 8.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2508 components: - type: Transform pos: 24.5,4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2509 components: - type: Transform pos: -7.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2511 components: - type: Transform @@ -100803,7 +100817,7 @@ entities: pos: 24.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2512 components: - type: Transform @@ -100826,7 +100840,7 @@ entities: pos: 24.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2530 components: - type: Transform @@ -100850,14 +100864,14 @@ entities: pos: 27.5,-13.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2552 components: - type: Transform pos: 27.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2564 components: - type: Transform @@ -100881,7 +100895,7 @@ entities: pos: 27.5,-18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2588 components: - type: Transform @@ -100889,7 +100903,7 @@ entities: pos: 20.5,4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2589 components: - type: Transform @@ -100935,7 +100949,7 @@ entities: pos: 20.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2650 components: - type: Transform @@ -100943,7 +100957,7 @@ entities: pos: 34.5,-10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2654 components: - type: Transform @@ -100964,7 +100978,7 @@ entities: pos: 37.5,-6.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2677 components: - type: Transform @@ -100979,7 +100993,7 @@ entities: pos: 33.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 3077 components: - type: Transform @@ -100994,14 +101008,14 @@ entities: pos: 25.5,4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 3159 components: - type: Transform pos: 22.5,-19.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 3267 components: - type: Transform @@ -101009,7 +101023,7 @@ entities: pos: 27.5,-16.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 3268 components: - type: Transform @@ -101024,7 +101038,7 @@ entities: pos: -50.5,3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 3851 components: - type: Transform @@ -101039,7 +101053,7 @@ entities: pos: -32.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 3978 components: - type: Transform @@ -101069,7 +101083,7 @@ entities: pos: -41.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4004 components: - type: Transform @@ -101077,7 +101091,7 @@ entities: pos: -44.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4005 components: - type: Transform @@ -101093,7 +101107,7 @@ entities: pos: -44.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4125 components: - type: Transform @@ -101108,7 +101122,7 @@ entities: pos: -34.5,9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4138 components: - type: Transform @@ -101116,7 +101130,7 @@ entities: pos: -34.5,11.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4139 components: - type: Transform @@ -101124,7 +101138,7 @@ entities: pos: -34.5,12.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4146 components: - type: Transform @@ -101132,7 +101146,7 @@ entities: pos: -34.5,19.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4147 components: - type: Transform @@ -101140,7 +101154,7 @@ entities: pos: -34.5,21.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4158 components: - type: Transform @@ -101148,7 +101162,7 @@ entities: pos: -40.5,25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4168 components: - type: Transform @@ -101156,14 +101170,14 @@ entities: pos: -31.5,22.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4173 components: - type: Transform pos: -27.5,22.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4175 components: - type: Transform @@ -101171,7 +101185,7 @@ entities: pos: -24.5,22.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4186 components: - type: Transform @@ -101195,14 +101209,14 @@ entities: pos: -3.5,19.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4217 components: - type: Transform pos: -23.5,22.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4227 components: - type: Transform @@ -101232,7 +101246,7 @@ entities: pos: -11.5,25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4260 components: - type: Transform @@ -101240,7 +101254,7 @@ entities: pos: -16.5,25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4262 components: - type: Transform @@ -101263,7 +101277,7 @@ entities: pos: -21.5,13.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4285 components: - type: Transform @@ -101279,7 +101293,7 @@ entities: pos: -27.5,5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4291 components: - type: Transform @@ -101295,7 +101309,7 @@ entities: pos: -32.5,5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4302 components: - type: Transform @@ -101327,7 +101341,7 @@ entities: pos: -41.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4784 components: - type: Transform @@ -101341,7 +101355,7 @@ entities: pos: 23.5,-19.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4797 components: - type: Transform @@ -101364,7 +101378,7 @@ entities: pos: 3.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5455 components: - type: Transform @@ -101372,7 +101386,7 @@ entities: pos: -56.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5456 components: - type: Transform @@ -101380,7 +101394,7 @@ entities: pos: -56.5,3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5457 components: - type: Transform @@ -101404,7 +101418,7 @@ entities: pos: -56.5,-1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5469 components: - type: Transform @@ -101434,7 +101448,7 @@ entities: pos: -56.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5495 components: - type: Transform @@ -101442,7 +101456,7 @@ entities: pos: -56.5,6.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5510 components: - type: Transform @@ -101450,7 +101464,7 @@ entities: pos: -63.5,-9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5520 components: - type: Transform @@ -101464,7 +101478,7 @@ entities: pos: -63.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5528 components: - type: Transform @@ -101472,21 +101486,21 @@ entities: pos: -56.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5530 components: - type: Transform pos: -61.5,-9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5542 components: - type: Transform pos: -67.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5557 components: - type: Transform @@ -101494,28 +101508,28 @@ entities: pos: -67.5,-9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5568 components: - type: Transform pos: -39.5,-28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5569 components: - type: Transform pos: -49.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5570 components: - type: Transform pos: -52.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5747 components: - type: Transform @@ -101523,7 +101537,7 @@ entities: pos: 28.5,4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6538 components: - type: Transform @@ -101539,7 +101553,7 @@ entities: pos: -8.5,48.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6542 components: - type: Transform @@ -101547,7 +101561,7 @@ entities: pos: -4.5,48.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6648 components: - type: Transform @@ -101555,7 +101569,7 @@ entities: pos: -12.5,44.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6651 components: - type: Transform @@ -101571,7 +101585,7 @@ entities: pos: 8.5,40.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6731 components: - type: Transform @@ -101587,7 +101601,7 @@ entities: pos: 2.5,25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6741 components: - type: Transform @@ -101603,7 +101617,7 @@ entities: pos: -3.5,28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6758 components: - type: Transform @@ -101611,7 +101625,7 @@ entities: pos: 2.5,28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6761 components: - type: Transform @@ -101635,7 +101649,7 @@ entities: pos: 2.5,31.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6770 components: - type: Transform @@ -101643,7 +101657,7 @@ entities: pos: 2.5,32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6773 components: - type: Transform @@ -101651,7 +101665,7 @@ entities: pos: 2.5,34.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6803 components: - type: Transform @@ -101667,7 +101681,7 @@ entities: pos: -7.5,31.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6805 components: - type: Transform @@ -101681,7 +101695,7 @@ entities: pos: -10.5,31.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6807 components: - type: Transform @@ -101697,7 +101711,7 @@ entities: pos: -13.5,31.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6837 components: - type: Transform @@ -101705,7 +101719,7 @@ entities: pos: -12.5,34.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6848 components: - type: Transform @@ -101721,7 +101735,7 @@ entities: pos: -12.5,45.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6876 components: - type: Transform @@ -101736,14 +101750,14 @@ entities: pos: 11.5,32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6882 components: - type: Transform pos: 10.5,32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6886 components: - type: Transform @@ -101766,7 +101780,7 @@ entities: pos: 11.5,15.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6921 components: - type: Transform @@ -101782,14 +101796,14 @@ entities: pos: 11.5,14.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6951 components: - type: Transform pos: 6.5,36.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6955 components: - type: Transform @@ -101804,7 +101818,7 @@ entities: pos: 13.5,36.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6976 components: - type: Transform @@ -101820,7 +101834,7 @@ entities: pos: 4.5,39.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6982 components: - type: Transform @@ -101836,7 +101850,7 @@ entities: pos: 13.5,37.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7020 components: - type: Transform @@ -101844,7 +101858,7 @@ entities: pos: 13.5,39.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7028 components: - type: Transform @@ -101860,14 +101874,14 @@ entities: pos: 2.5,39.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7042 components: - type: Transform pos: -0.5,44.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7043 components: - type: Transform @@ -101882,7 +101896,7 @@ entities: pos: 17.5,19.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7151 components: - type: Transform @@ -101906,7 +101920,7 @@ entities: pos: -4.5,51.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7206 components: - type: Transform @@ -101922,7 +101936,7 @@ entities: pos: -8.5,51.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7240 components: - type: Transform @@ -101938,7 +101952,7 @@ entities: pos: -12.5,51.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7314 components: - type: Transform @@ -101962,14 +101976,14 @@ entities: pos: -0.5,48.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7432 components: - type: Transform pos: 40.5,4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7433 components: - type: Transform @@ -101984,7 +101998,7 @@ entities: pos: 10.5,14.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7669 components: - type: Transform @@ -102000,7 +102014,7 @@ entities: pos: -8.5,56.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7910 components: - type: Transform @@ -102016,7 +102030,7 @@ entities: pos: 47.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8568 components: - type: Transform @@ -102024,7 +102038,7 @@ entities: pos: 47.5,1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8669 components: - type: Transform @@ -102032,7 +102046,7 @@ entities: pos: 27.5,19.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8688 components: - type: Transform @@ -102078,7 +102092,7 @@ entities: pos: 32.5,19.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8708 components: - type: Transform @@ -102134,7 +102148,7 @@ entities: pos: 36.5,39.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8741 components: - type: Transform @@ -102149,7 +102163,7 @@ entities: pos: 34.5,37.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8747 components: - type: Transform @@ -102165,14 +102179,14 @@ entities: pos: 28.5,37.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8763 components: - type: Transform pos: 20.5,19.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8766 components: - type: Transform @@ -102180,14 +102194,14 @@ entities: pos: 21.5,19.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8770 components: - type: Transform pos: 26.5,19.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8771 components: - type: Transform @@ -102195,7 +102209,7 @@ entities: pos: 34.5,22.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8776 components: - type: Transform @@ -102203,7 +102217,7 @@ entities: pos: 34.5,32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8779 components: - type: Transform @@ -102227,14 +102241,14 @@ entities: pos: 28.5,43.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8810 components: - type: Transform pos: 22.5,37.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8813 components: - type: Transform @@ -102250,7 +102264,7 @@ entities: pos: 29.5,45.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8979 components: - type: Transform @@ -102265,7 +102279,7 @@ entities: pos: 28.5,40.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8986 components: - type: Transform @@ -102296,7 +102310,7 @@ entities: pos: 47.5,4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9068 components: - type: Transform @@ -102304,7 +102318,7 @@ entities: pos: 21.5,28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9099 components: - type: Transform @@ -102312,7 +102326,7 @@ entities: pos: 24.5,37.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9165 components: - type: Transform @@ -102320,7 +102334,7 @@ entities: pos: 50.5,4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9167 components: - type: Transform @@ -102328,14 +102342,14 @@ entities: pos: 51.5,-2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9174 components: - type: Transform pos: 51.5,4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9727 components: - type: Transform @@ -102343,7 +102357,7 @@ entities: pos: 51.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9793 components: - type: Transform @@ -102359,7 +102373,7 @@ entities: pos: 34.5,28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 10122 components: - type: Transform @@ -102375,7 +102389,7 @@ entities: pos: -35.5,30.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 10950 components: - type: Transform @@ -102406,7 +102420,7 @@ entities: pos: 51.5,-6.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 10963 components: - type: Transform @@ -102453,7 +102467,7 @@ entities: pos: 60.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11096 components: - type: Transform @@ -102493,7 +102507,7 @@ entities: pos: 50.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11143 components: - type: Transform @@ -102508,7 +102522,7 @@ entities: pos: 49.5,14.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11159 components: - type: Transform @@ -102516,7 +102530,7 @@ entities: pos: 50.5,14.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11225 components: - type: Transform @@ -102595,7 +102609,7 @@ entities: pos: 39.5,7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12410 components: - type: Transform @@ -102603,7 +102617,7 @@ entities: pos: 50.5,23.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12412 components: - type: Transform @@ -102611,7 +102625,7 @@ entities: pos: 50.5,25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12788 components: - type: Transform @@ -102619,7 +102633,7 @@ entities: pos: 21.5,23.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12824 components: - type: Transform @@ -102635,7 +102649,7 @@ entities: pos: 36.5,42.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12906 components: - type: Transform @@ -102663,7 +102677,7 @@ entities: pos: -18.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14300 components: - type: Transform @@ -102671,7 +102685,7 @@ entities: pos: -3.5,-33.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14472 components: - type: Transform @@ -102701,7 +102715,7 @@ entities: pos: -9.5,-25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14563 components: - type: Transform @@ -102709,7 +102723,7 @@ entities: pos: -9.5,-24.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14574 components: - type: Transform @@ -102724,14 +102738,14 @@ entities: pos: -21.5,-29.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14586 components: - type: Transform pos: -21.5,-25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14594 components: - type: Transform @@ -102739,7 +102753,7 @@ entities: pos: -21.5,-32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14598 components: - type: Transform @@ -102747,7 +102761,7 @@ entities: pos: -21.5,-36.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14607 components: - type: Transform @@ -102755,14 +102769,14 @@ entities: pos: -27.5,-32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14609 components: - type: Transform pos: -29.5,-32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14622 components: - type: Transform @@ -102776,7 +102790,7 @@ entities: pos: -12.5,-25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14640 components: - type: Transform @@ -102800,7 +102814,7 @@ entities: pos: -3.5,-34.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14674 components: - type: Transform @@ -102816,7 +102830,7 @@ entities: pos: -14.5,-29.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14698 components: - type: Transform @@ -102840,7 +102854,7 @@ entities: pos: -20.5,-36.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14849 components: - type: Transform @@ -102848,7 +102862,7 @@ entities: pos: -18.5,-25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14883 components: - type: Transform @@ -102870,21 +102884,21 @@ entities: pos: -31.5,-45.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15235 components: - type: Transform pos: -27.5,-45.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15236 components: - type: Transform pos: -32.5,-45.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15250 components: - type: Transform @@ -102900,14 +102914,14 @@ entities: pos: -21.5,-45.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15259 components: - type: Transform pos: -20.5,-41.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15265 components: - type: Transform @@ -102936,7 +102950,7 @@ entities: pos: -26.5,-45.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15289 components: - type: Transform @@ -102952,7 +102966,7 @@ entities: pos: -21.5,-41.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15295 components: - type: Transform @@ -102960,7 +102974,7 @@ entities: pos: -21.5,-48.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15308 components: - type: Transform @@ -102999,7 +103013,7 @@ entities: pos: -16.5,-50.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15533 components: - type: Transform @@ -103015,7 +103029,7 @@ entities: pos: -39.5,-46.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16367 components: - type: Transform @@ -103023,14 +103037,14 @@ entities: pos: -42.5,-46.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16375 components: - type: Transform pos: -50.5,-46.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16376 components: - type: Transform @@ -103038,7 +103052,7 @@ entities: pos: -50.5,-51.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16378 components: - type: Transform @@ -103046,7 +103060,7 @@ entities: pos: -50.5,-54.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16403 components: - type: Transform @@ -103066,7 +103080,7 @@ entities: pos: -39.5,-41.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16741 components: - type: Transform @@ -103079,7 +103093,7 @@ entities: pos: -43.5,-28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17648 components: - type: Transform @@ -103087,7 +103101,7 @@ entities: pos: -32.5,-0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17667 components: - type: Transform @@ -103095,14 +103109,14 @@ entities: pos: -30.5,-9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17694 components: - type: Transform pos: -30.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17696 components: - type: Transform @@ -103124,7 +103138,7 @@ entities: pos: -47.5,-28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18216 components: - type: Transform @@ -103132,7 +103146,7 @@ entities: pos: -22.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18458 components: - type: Transform @@ -103140,7 +103154,7 @@ entities: pos: -52.5,-12.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18506 components: - type: Transform @@ -103164,7 +103178,7 @@ entities: pos: 40.5,28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18971 components: - type: Transform @@ -103172,7 +103186,7 @@ entities: pos: 50.5,32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18998 components: - type: Transform @@ -103180,14 +103194,14 @@ entities: pos: 56.5,36.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20636 components: - type: Transform pos: -2.5,-25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20656 components: - type: Transform @@ -103195,7 +103209,7 @@ entities: pos: 3.5,-25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20657 components: - type: Transform @@ -103211,7 +103225,7 @@ entities: pos: -3.5,-44.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20678 components: - type: Transform @@ -103219,7 +103233,7 @@ entities: pos: -3.5,-55.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20689 components: - type: Transform @@ -103243,7 +103257,7 @@ entities: pos: 6.5,-31.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20736 components: - type: Transform @@ -103251,7 +103265,7 @@ entities: pos: 6.5,-35.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20740 components: - type: Transform @@ -103259,7 +103273,7 @@ entities: pos: 6.5,-39.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20765 components: - type: Transform @@ -103267,14 +103281,14 @@ entities: pos: 11.5,-29.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20774 components: - type: Transform pos: 20.5,-29.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20784 components: - type: Transform @@ -103282,7 +103296,7 @@ entities: pos: 2.5,-39.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20785 components: - type: Transform @@ -103290,7 +103304,7 @@ entities: pos: 11.5,-36.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20791 components: - type: Transform @@ -103298,7 +103312,7 @@ entities: pos: 11.5,-42.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20795 components: - type: Transform @@ -103306,7 +103320,7 @@ entities: pos: 11.5,-46.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20803 components: - type: Transform @@ -103314,7 +103328,7 @@ entities: pos: 8.5,-50.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20815 components: - type: Transform @@ -103329,7 +103343,7 @@ entities: pos: 22.5,-50.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20838 components: - type: Transform @@ -103337,7 +103351,7 @@ entities: pos: 28.5,-42.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20842 components: - type: Transform @@ -103359,7 +103373,7 @@ entities: pos: 23.5,-54.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20968 components: - type: Transform @@ -103447,7 +103461,7 @@ entities: pos: 19.5,-50.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21067 components: - type: Transform @@ -103479,7 +103493,7 @@ entities: pos: 32.5,-42.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21489 components: - type: Transform @@ -103502,7 +103516,7 @@ entities: pos: -5.5,-70.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21508 components: - type: Transform @@ -103550,7 +103564,7 @@ entities: pos: -3.5,-62.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21567 components: - type: Transform @@ -103558,7 +103572,7 @@ entities: pos: -3.5,-70.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21568 components: - type: Transform @@ -103566,7 +103580,7 @@ entities: pos: -10.5,-70.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21569 components: - type: Transform @@ -103574,7 +103588,15 @@ entities: pos: -10.5,-71.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' + - uid: 21570 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -3.5,-71.5 + parent: 5350 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 21576 components: - type: Transform @@ -103582,7 +103604,7 @@ entities: pos: -3.5,-67.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21581 components: - type: Transform @@ -103597,7 +103619,7 @@ entities: pos: -7.5,-62.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21597 components: - type: Transform @@ -103605,7 +103627,7 @@ entities: pos: -10.5,-65.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21620 components: - type: Transform @@ -103613,7 +103635,7 @@ entities: pos: -18.5,-70.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21632 components: - type: Transform @@ -103621,7 +103643,7 @@ entities: pos: -24.5,-70.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 23375 components: - type: Transform @@ -103629,7 +103651,7 @@ entities: pos: 49.5,23.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 23386 components: - type: Transform @@ -103653,7 +103675,7 @@ entities: pos: 50.5,12.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25558 components: - type: Transform @@ -103661,14 +103683,14 @@ entities: pos: 93.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25655 components: - type: Transform pos: 96.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25668 components: - type: Transform @@ -103676,14 +103698,14 @@ entities: pos: 115.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25673 components: - type: Transform pos: 104.5,-18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25674 components: - type: Transform @@ -103691,7 +103713,7 @@ entities: pos: 104.5,18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25884 components: - type: Transform @@ -103699,7 +103721,7 @@ entities: pos: 110.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25885 components: - type: Transform @@ -103707,7 +103729,7 @@ entities: pos: 109.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25890 components: - type: Transform @@ -103715,7 +103737,7 @@ entities: pos: 99.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25894 components: - type: Transform @@ -103723,7 +103745,7 @@ entities: pos: 104.5,1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25901 components: - type: Transform @@ -103731,7 +103753,7 @@ entities: pos: 104.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25902 components: - type: Transform @@ -103739,7 +103761,7 @@ entities: pos: 104.5,-3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - proto: GasPort entities: - uid: 8245 @@ -103749,7 +103771,7 @@ entities: pos: 45.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8937 components: - type: Transform @@ -103806,7 +103828,7 @@ entities: pos: 45.5,1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 10946 components: - type: Transform @@ -103994,7 +104016,7 @@ entities: pos: 34.5,-13.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2682 components: - type: Transform @@ -104026,7 +104048,7 @@ entities: pos: -35.5,33.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 10966 components: - type: Transform @@ -104105,7 +104127,7 @@ entities: pos: 61.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11249 components: - type: Transform @@ -104146,7 +104168,7 @@ entities: pos: 24.5,45.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14726 components: - type: Transform @@ -104154,14 +104176,14 @@ entities: pos: -28.5,-27.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16739 components: - type: Transform pos: -49.5,-38.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18495 components: - type: Transform @@ -104169,7 +104191,7 @@ entities: pos: -55.5,-12.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 19378 components: - type: Transform @@ -104188,14 +104210,14 @@ entities: pos: 28.5,-40.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25874 components: - type: Transform pos: 110.5,1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - proto: GasThermoMachineFreezer entities: - uid: 2630 @@ -104298,14 +104320,14 @@ entities: pos: -17.5,-1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 768 components: - type: Transform pos: -5.5,2.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 771 components: - type: Transform @@ -104313,7 +104335,7 @@ entities: pos: 2.5,-0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 793 components: - type: Transform @@ -104321,21 +104343,21 @@ entities: pos: 11.5,-5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 813 components: - type: Transform pos: 11.5,4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 827 components: - type: Transform pos: -4.5,-3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 837 components: - type: Transform @@ -104343,7 +104365,7 @@ entities: pos: -16.5,5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 994 components: - type: Transform @@ -104351,7 +104373,7 @@ entities: pos: -4.5,-10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 1584 components: - type: Transform @@ -104359,7 +104381,7 @@ entities: pos: -16.5,-10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 1611 components: - type: Transform @@ -104367,14 +104389,14 @@ entities: pos: 0.5,-15.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2077 components: - type: Transform pos: -21.5,-19.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2624 components: - type: Transform @@ -104382,7 +104404,7 @@ entities: pos: 23.5,-13.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2642 components: - type: Transform @@ -104390,7 +104412,7 @@ entities: pos: 24.5,-9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2656 components: - type: Transform @@ -104404,7 +104426,7 @@ entities: pos: 33.5,-10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2676 components: - type: Transform @@ -104412,7 +104434,7 @@ entities: pos: 37.5,-10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2708 components: - type: Transform @@ -104420,7 +104442,7 @@ entities: pos: 36.5,-6.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2711 components: - type: Transform @@ -104428,7 +104450,7 @@ entities: pos: 19.5,-1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2713 components: - type: Transform @@ -104436,7 +104458,7 @@ entities: pos: 23.5,0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 2716 components: - type: Transform @@ -104444,7 +104466,7 @@ entities: pos: 33.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 3007 components: - type: Transform @@ -104452,7 +104474,7 @@ entities: pos: 31.5,-18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 3835 components: - type: Transform @@ -104460,7 +104482,7 @@ entities: pos: -36.5,19.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4143 components: - type: Transform @@ -104468,7 +104490,7 @@ entities: pos: -36.5,12.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4244 components: - type: Transform @@ -104476,7 +104498,7 @@ entities: pos: -7.5,28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4328 components: - type: Transform @@ -104484,14 +104506,14 @@ entities: pos: -41.5,25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4329 components: - type: Transform pos: -27.5,6.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4346 components: - type: Transform @@ -104499,14 +104521,14 @@ entities: pos: -41.5,4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4348 components: - type: Transform pos: -32.5,6.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4373 components: - type: Transform @@ -104514,7 +104536,7 @@ entities: pos: -44.5,16.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4374 components: - type: Transform @@ -104522,7 +104544,7 @@ entities: pos: -44.5,18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4378 components: - type: Transform @@ -104530,7 +104552,7 @@ entities: pos: -30.5,11.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4392 components: - type: Transform @@ -104538,21 +104560,21 @@ entities: pos: -30.5,16.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4402 components: - type: Transform pos: -21.5,14.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4457 components: - type: Transform pos: -42.5,31.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 4972 components: - type: Transform @@ -104560,7 +104582,7 @@ entities: pos: 23.5,-20.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5017 components: - type: Transform @@ -104568,7 +104590,7 @@ entities: pos: -50.5,1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5558 components: - type: Transform @@ -104576,7 +104598,7 @@ entities: pos: -70.5,5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5559 components: - type: Transform @@ -104584,7 +104606,7 @@ entities: pos: -67.5,7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5560 components: - type: Transform @@ -104592,28 +104614,28 @@ entities: pos: -63.5,5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5561 components: - type: Transform pos: -63.5,-6.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5562 components: - type: Transform pos: -67.5,-8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5563 components: - type: Transform pos: -70.5,-6.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 5838 components: - type: Transform @@ -104621,7 +104643,7 @@ entities: pos: -66.5,-17.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6471 components: - type: Transform @@ -104629,14 +104651,14 @@ entities: pos: 1.5,48.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6549 components: - type: Transform pos: -7.5,60.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6602 components: - type: Transform @@ -104644,14 +104666,14 @@ entities: pos: -15.5,44.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6662 components: - type: Transform pos: 8.5,44.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 6694 components: - type: Transform @@ -104659,7 +104681,7 @@ entities: pos: -13.5,48.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7074 components: - type: Transform @@ -104667,7 +104689,7 @@ entities: pos: -10.5,28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7075 components: - type: Transform @@ -104675,7 +104697,7 @@ entities: pos: -13.5,28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7076 components: - type: Transform @@ -104683,7 +104705,7 @@ entities: pos: -2.5,28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7077 components: - type: Transform @@ -104691,7 +104713,7 @@ entities: pos: 1.5,28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7078 components: - type: Transform @@ -104699,7 +104721,7 @@ entities: pos: 1.5,31.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7079 components: - type: Transform @@ -104707,7 +104729,7 @@ entities: pos: 5.5,27.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7083 components: - type: Transform @@ -104715,7 +104737,7 @@ entities: pos: 1.5,39.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7084 components: - type: Transform @@ -104723,7 +104745,7 @@ entities: pos: -0.5,43.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7085 components: - type: Transform @@ -104731,7 +104753,7 @@ entities: pos: -7.5,44.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7086 components: - type: Transform @@ -104739,14 +104761,14 @@ entities: pos: -11.5,45.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7091 components: - type: Transform pos: -6.5,38.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7101 components: - type: Transform @@ -104754,7 +104776,7 @@ entities: pos: 16.5,32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7102 components: - type: Transform @@ -104762,7 +104784,7 @@ entities: pos: 10.5,31.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7104 components: - type: Transform @@ -104770,7 +104792,7 @@ entities: pos: 5.5,39.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7115 components: - type: Transform @@ -104778,21 +104800,21 @@ entities: pos: 5.5,14.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7116 components: - type: Transform pos: 6.5,19.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7117 components: - type: Transform pos: 11.5,18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7125 components: - type: Transform @@ -104800,7 +104822,7 @@ entities: pos: 2.5,24.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7127 components: - type: Transform @@ -104808,7 +104830,7 @@ entities: pos: -11.5,24.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7130 components: - type: Transform @@ -104816,7 +104838,7 @@ entities: pos: -2.5,19.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7193 components: - type: Transform @@ -104824,7 +104846,7 @@ entities: pos: -3.5,51.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7194 components: - type: Transform @@ -104832,7 +104854,7 @@ entities: pos: -7.5,51.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7195 components: - type: Transform @@ -104840,14 +104862,14 @@ entities: pos: -11.5,51.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7197 components: - type: Transform pos: -0.5,51.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7337 components: - type: Transform @@ -104855,7 +104877,7 @@ entities: pos: -11.5,34.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7342 components: - type: Transform @@ -104863,7 +104885,7 @@ entities: pos: 39.5,3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7388 components: - type: Transform @@ -104871,7 +104893,7 @@ entities: pos: -9.5,56.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 7725 components: - type: Transform @@ -104879,7 +104901,7 @@ entities: pos: 17.5,39.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 8847 components: - type: Transform @@ -104887,21 +104909,21 @@ entities: pos: 14.5,36.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9225 components: - type: Transform pos: -16.5,27.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9321 components: - type: Transform pos: -24.5,27.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9338 components: - type: Transform @@ -104909,14 +104931,14 @@ entities: pos: -27.5,21.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9491 components: - type: Transform pos: -39.5,40.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 9939 components: - type: Transform @@ -104924,7 +104946,7 @@ entities: pos: 11.5,25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 10185 components: - type: Transform @@ -104932,14 +104954,14 @@ entities: pos: -7.5,-8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 10788 components: - type: Transform pos: -11.5,16.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 10791 components: - type: Transform @@ -104947,7 +104969,7 @@ entities: pos: -57.5,6.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 10793 components: - type: Transform @@ -104955,7 +104977,7 @@ entities: pos: -57.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 10795 components: - type: Transform @@ -104963,7 +104985,7 @@ entities: pos: -54.5,-1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 10797 components: - type: Transform @@ -104971,7 +104993,7 @@ entities: pos: -41.5,-0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 10799 components: - type: Transform @@ -104979,7 +105001,7 @@ entities: pos: -21.5,5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 10802 components: - type: Transform @@ -104987,7 +105009,7 @@ entities: pos: -4.5,9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11092 components: - type: Transform @@ -104995,7 +105017,7 @@ entities: pos: 60.5,-0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 11242 components: - type: Transform @@ -105011,7 +105033,7 @@ entities: pos: 47.5,-17.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12033 components: - type: Transform @@ -105022,7 +105044,7 @@ entities: deviceLists: - 23907 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12049 components: - type: Transform @@ -105037,7 +105059,7 @@ entities: pos: 52.5,-6.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12059 components: - type: Transform @@ -105045,14 +105067,14 @@ entities: pos: 33.5,7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12060 components: - type: Transform pos: 39.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12103 components: - type: Transform @@ -105060,7 +105082,7 @@ entities: pos: 16.5,5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12104 components: - type: Transform @@ -105068,7 +105090,7 @@ entities: pos: 16.5,9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12111 components: - type: Transform @@ -105076,14 +105098,14 @@ entities: pos: 8.5,-13.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12118 components: - type: Transform pos: -17.5,-5.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12120 components: - type: Transform @@ -105091,7 +105113,7 @@ entities: pos: 16.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12122 components: - type: Transform @@ -105099,21 +105121,21 @@ entities: pos: -21.5,-4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12124 components: - type: Transform pos: -0.5,-19.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12126 components: - type: Transform pos: 16.5,-19.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12131 components: - type: Transform @@ -105121,7 +105143,7 @@ entities: pos: 23.5,-16.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12139 components: - type: Transform @@ -105129,7 +105151,7 @@ entities: pos: 23.5,-23.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12142 components: - type: Transform @@ -105137,14 +105159,14 @@ entities: pos: 25.5,3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12150 components: - type: Transform pos: 20.5,7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12400 components: - type: Transform @@ -105152,7 +105174,7 @@ entities: pos: 49.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12585 components: - type: Transform @@ -105160,7 +105182,7 @@ entities: pos: 47.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12694 components: - type: Transform @@ -105168,7 +105190,7 @@ entities: pos: 29.5,32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12792 components: - type: Transform @@ -105176,14 +105198,14 @@ entities: pos: 22.5,23.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12793 components: - type: Transform pos: 27.5,23.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12795 components: - type: Transform @@ -105191,7 +105213,7 @@ entities: pos: 10.5,13.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12797 components: - type: Transform @@ -105199,7 +105221,7 @@ entities: pos: 35.5,22.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12990 components: - type: Transform @@ -105207,7 +105229,7 @@ entities: pos: 20.5,17.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 12994 components: - type: Transform @@ -105215,7 +105237,7 @@ entities: pos: 26.5,17.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 13004 components: - type: Transform @@ -105223,7 +105245,7 @@ entities: pos: 31.5,41.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 13025 components: - type: Transform @@ -105231,7 +105253,7 @@ entities: pos: 46.5,39.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 13027 components: - type: Transform @@ -105239,7 +105261,7 @@ entities: pos: 32.5,18.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 13031 components: - type: Transform @@ -105247,7 +105269,7 @@ entities: pos: 27.5,40.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 13032 components: - type: Transform @@ -105255,7 +105277,7 @@ entities: pos: 37.5,42.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 13046 components: - type: Transform @@ -105263,7 +105285,7 @@ entities: pos: 28.5,49.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14160 components: - type: Transform @@ -105271,14 +105293,14 @@ entities: pos: -22.5,-25.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14575 components: - type: Transform pos: -14.5,-28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14623 components: - type: Transform @@ -105286,7 +105308,7 @@ entities: pos: -35.5,-32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14626 components: - type: Transform @@ -105294,7 +105316,7 @@ entities: pos: -29.5,-33.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14633 components: - type: Transform @@ -105302,14 +105324,14 @@ entities: pos: -10.5,-24.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14714 components: - type: Transform pos: -27.5,-31.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14739 components: - type: Transform @@ -105317,14 +105339,14 @@ entities: pos: -15.5,-36.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 14740 components: - type: Transform pos: -20.5,-35.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15232 components: - type: Transform @@ -105332,7 +105354,7 @@ entities: pos: -27.5,-51.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15233 components: - type: Transform @@ -105340,7 +105362,7 @@ entities: pos: -31.5,-51.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15264 components: - type: Transform @@ -105348,7 +105370,7 @@ entities: pos: -32.5,-46.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15306 components: - type: Transform @@ -105356,7 +105378,7 @@ entities: pos: -26.5,-46.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15316 components: - type: Transform @@ -105364,7 +105386,7 @@ entities: pos: -15.5,-41.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15318 components: - type: Transform @@ -105372,7 +105394,7 @@ entities: pos: -20.5,-42.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15344 components: - type: Transform @@ -105380,7 +105402,7 @@ entities: pos: -13.5,-50.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15345 components: - type: Transform @@ -105388,7 +105410,7 @@ entities: pos: -17.5,-50.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15529 components: - type: Transform @@ -105396,7 +105418,7 @@ entities: pos: -21.5,-56.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15530 components: - type: Transform @@ -105404,7 +105426,7 @@ entities: pos: -24.5,-55.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15531 components: - type: Transform @@ -105412,21 +105434,21 @@ entities: pos: -16.5,-58.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 15615 components: - type: Transform pos: -7.5,-31.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16393 components: - type: Transform pos: -42.5,-45.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16394 components: - type: Transform @@ -105434,7 +105456,7 @@ entities: pos: -53.5,-46.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16396 components: - type: Transform @@ -105442,7 +105464,7 @@ entities: pos: -53.5,-54.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16397 components: - type: Transform @@ -105450,7 +105472,7 @@ entities: pos: -53.5,-51.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 16398 components: - type: Transform @@ -105458,7 +105480,7 @@ entities: pos: -50.5,-55.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17267 components: - type: Transform @@ -105466,7 +105488,7 @@ entities: pos: -41.5,-7.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17473 components: - type: Transform @@ -105474,7 +105496,7 @@ entities: pos: -52.5,-28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17488 components: - type: Transform @@ -105482,7 +105504,7 @@ entities: pos: -43.5,-34.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17665 components: - type: Transform @@ -105490,7 +105512,7 @@ entities: pos: -31.5,-0.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17673 components: - type: Transform @@ -105498,7 +105520,7 @@ entities: pos: -30.5,-15.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 17674 components: - type: Transform @@ -105506,7 +105528,7 @@ entities: pos: -29.5,-9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 18358 components: - type: Transform @@ -105514,7 +105536,7 @@ entities: pos: -49.5,-9.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 19001 components: - type: Transform @@ -105522,7 +105544,7 @@ entities: pos: 55.5,32.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 19002 components: - type: Transform @@ -105530,21 +105552,21 @@ entities: pos: 56.5,35.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 19003 components: - type: Transform pos: 56.5,38.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 19004 components: - type: Transform pos: 50.5,36.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20658 components: - type: Transform @@ -105552,7 +105574,7 @@ entities: pos: -2.5,-26.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20741 components: - type: Transform @@ -105560,14 +105582,14 @@ entities: pos: 2.5,-40.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20778 components: - type: Transform pos: 11.5,-28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20779 components: - type: Transform @@ -105575,7 +105597,7 @@ entities: pos: 24.5,-29.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20780 components: - type: Transform @@ -105583,7 +105605,7 @@ entities: pos: 20.5,-30.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20781 components: - type: Transform @@ -105591,7 +105613,7 @@ entities: pos: 15.5,-35.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20782 components: - type: Transform @@ -105599,14 +105621,14 @@ entities: pos: 6.5,-40.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20783 components: - type: Transform pos: 2.5,-31.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20819 components: - type: Transform @@ -105614,14 +105636,14 @@ entities: pos: 23.5,-50.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20820 components: - type: Transform pos: 8.5,-49.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20821 components: - type: Transform @@ -105629,7 +105651,7 @@ entities: pos: 12.5,-46.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20857 components: - type: Transform @@ -105641,7 +105663,7 @@ entities: pos: 21.5,-37.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20860 components: - type: Transform @@ -105649,7 +105671,7 @@ entities: pos: 37.5,-42.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20887 components: - type: Transform @@ -105657,7 +105679,7 @@ entities: pos: 23.5,-55.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20898 components: - type: Transform @@ -105665,7 +105687,7 @@ entities: pos: 29.5,-59.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 20976 components: - type: Transform @@ -105673,7 +105695,7 @@ entities: pos: 12.5,-36.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21010 components: - type: Transform @@ -105681,7 +105703,7 @@ entities: pos: 8.5,-31.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21100 components: - type: Transform @@ -105689,14 +105711,14 @@ entities: pos: 21.5,-43.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21160 components: - type: Transform pos: 32.5,-41.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21607 components: - type: Transform @@ -105704,7 +105726,7 @@ entities: pos: 1.5,-68.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21609 components: - type: Transform @@ -105712,7 +105734,7 @@ entities: pos: -11.5,-73.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21610 components: - type: Transform @@ -105720,7 +105742,7 @@ entities: pos: -9.5,-73.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21611 components: - type: Transform @@ -105728,7 +105750,7 @@ entities: pos: -3.5,-73.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21638 components: - type: Transform @@ -105736,7 +105758,7 @@ entities: pos: -24.5,-71.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21639 components: - type: Transform @@ -105744,14 +105766,14 @@ entities: pos: -18.5,-73.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21640 components: - type: Transform pos: -24.5,-64.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21643 components: - type: Transform @@ -105759,14 +105781,14 @@ entities: pos: -5.5,-71.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 21644 components: - type: Transform pos: -7.5,-61.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 22018 components: - type: Transform @@ -105774,7 +105796,7 @@ entities: pos: -2.5,-55.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 22020 components: - type: Transform @@ -105782,7 +105804,7 @@ entities: pos: -2.5,-44.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 22022 components: - type: Transform @@ -105790,14 +105812,14 @@ entities: pos: -2.5,-34.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 22184 components: - type: Transform pos: 19.5,-49.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 23372 components: - type: Transform @@ -105807,14 +105829,14 @@ entities: deviceLists: - 23905 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 23379 components: - type: Transform pos: 50.5,28.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 23380 components: - type: Transform @@ -105825,7 +105847,7 @@ entities: deviceLists: - 23906 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 23385 components: - type: Transform @@ -105835,7 +105857,7 @@ entities: deviceLists: - 23905 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 23510 components: - type: Transform @@ -105843,21 +105865,29 @@ entities: pos: 70.5,8.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' + - uid: 24858 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,-73.5 + parent: 5350 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 25560 components: - type: Transform pos: 93.5,1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25675 components: - type: Transform pos: 104.5,19.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25677 components: - type: Transform @@ -105865,21 +105895,21 @@ entities: pos: 104.5,-19.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25891 components: - type: Transform pos: 99.5,1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25892 components: - type: Transform pos: 109.5,1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25916 components: - type: Transform @@ -105887,7 +105917,7 @@ entities: pos: 102.5,-3.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25917 components: - type: Transform @@ -105895,7 +105925,7 @@ entities: pos: 103.5,1.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25918 components: - type: Transform @@ -105903,7 +105933,7 @@ entities: pos: 105.5,4.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - uid: 25919 components: - type: Transform @@ -105911,7 +105941,7 @@ entities: pos: 104.5,-10.5 parent: 5350 - type: AtmosPipeColor - color: '#0335FCFF' + color: '#0055CCFF' - proto: GasVentScrubber entities: - uid: 755 From 81371b90d1e633fdd6d342a7c442345db47426e3 Mon Sep 17 00:00:00 2001 From: Preston Smith <92108534+thetolbean@users.noreply.github.com> Date: Sat, 10 Aug 2024 14:50:08 -0500 Subject: [PATCH 363/422] Updated Core boxing ring beacon (#30800) Updated boxing ring beacon to be correctly labeled --- Resources/Maps/core.yml | 96 +++++++++++++++++++++-------------------- 1 file changed, 49 insertions(+), 47 deletions(-) diff --git a/Resources/Maps/core.yml b/Resources/Maps/core.yml index 8719acd69b..a310be2dcc 100644 --- a/Resources/Maps/core.yml +++ b/Resources/Maps/core.yml @@ -878,8 +878,8 @@ entities: 6934: 65,19 6935: 65,21 6947: 26,19 - 6973: -29,-5 - 6974: -36,-5 + 6959: -29,-5 + 6960: -36,-5 - node: cleanable: True color: '#FFFFFFFF' @@ -1390,9 +1390,9 @@ entities: 6533: 7,-48 6534: 8,-48 6535: 9,-48 - 6985: -32,-3 - 6986: -31,-3 - 6987: -33,-3 + 6971: -32,-3 + 6972: -31,-3 + 6973: -33,-3 - node: color: '#FFFFFFFF' id: BrickTileDarkLineS @@ -1492,12 +1492,12 @@ entities: 6531: 8,-49 6532: 9,-49 6956: -29,-1 - 6971: -35,-1 - 6972: -30,-1 - 6988: -34,-5 - 6989: -32,-5 - 6990: -33,-5 - 6991: -31,-5 + 6957: -35,-1 + 6958: -30,-1 + 6974: -34,-5 + 6975: -32,-5 + 6976: -33,-5 + 6977: -31,-5 - node: cleanable: True color: '#FFFFFFFF' @@ -5551,9 +5551,9 @@ entities: 6905: 58,-24 6936: 78,-7 6944: 52,-23 - 7010: -34,-5 - 7011: -32,-3 - 7012: -34,-2 + 6996: -34,-5 + 6997: -32,-3 + 6998: -34,-2 - node: cleanable: True angle: 1.5707963267948966 rad @@ -6452,24 +6452,24 @@ entities: 6953: 3,-22 6954: 16,23 6955: 16,25 - 6975: -36,3 - 6976: -33,3 - 6977: -35,-1 - 6978: -36,-5 - 6979: -29,-5 - 6980: -34,3 - 6981: -34,2 - 6982: -34,1 - 6983: -30,1 - 6984: -38,2 - 6992: -33,-4 - 6993: -34,-4 - 6994: -32,-3 - 6995: -31,-3 - 6996: -34,-3 - 6997: -34,-2 - 6998: -31,-5 - 6999: -32,-5 + 6961: -36,3 + 6962: -33,3 + 6963: -35,-1 + 6964: -36,-5 + 6965: -29,-5 + 6966: -34,3 + 6967: -34,2 + 6968: -34,1 + 6969: -30,1 + 6970: -38,2 + 6978: -33,-4 + 6979: -34,-4 + 6980: -32,-3 + 6981: -31,-3 + 6982: -34,-3 + 6983: -34,-2 + 6984: -31,-5 + 6985: -32,-5 - node: cleanable: True angle: 1.5707963267948966 rad @@ -6528,12 +6528,12 @@ entities: 6915: 58,-23 6916: 57,-24 6946: 54,-23 - 7000: -33,-5 - 7001: -34,-3 - 7002: -32,-3 - 7003: -33,-4 - 7004: -32,-4 - 7005: -34,-5 + 6986: -33,-5 + 6987: -34,-3 + 6988: -32,-3 + 6989: -33,-4 + 6990: -32,-4 + 6991: -34,-5 - node: cleanable: True angle: 1.5707963267948966 rad @@ -6590,10 +6590,10 @@ entities: 6880: -12,-39 6917: 52,-21 6918: 57,-22 - 7006: -31,-5 - 7007: -33,-3 - 7008: -34,-3 - 7009: -34,-4 + 6992: -31,-5 + 6993: -33,-3 + 6994: -34,-3 + 6995: -34,-4 - node: cleanable: True angle: 1.5707963267948966 rad @@ -62011,11 +62011,6 @@ entities: - type: Transform pos: -15.5,-26.5 parent: 2 - - uid: 21457 - components: - - type: Transform - pos: -33.5,-28.5 - parent: 2 - proto: DefaultStationBeaconKitchen entities: - uid: 20848 @@ -62142,6 +62137,13 @@ entities: parent: 2 - type: WarpPoint location: Arcade + - uid: 21457 + components: + - type: Transform + pos: -33.5,-29.5 + parent: 2 + - type: NavMapBeacon + text: Boxing Ring - proto: DefaultStationBeaconSingularity entities: - uid: 17163 From 63967bec887a1e2ba3ef31a2102168eb07e854d8 Mon Sep 17 00:00:00 2001 From: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com> Date: Sat, 10 Aug 2024 19:51:00 +0000 Subject: [PATCH 364/422] tweak(Shuttle_honki): Replace clown spiders with honkbots (#30617) --- .../Maps/Shuttles/ShuttleEvent/honki.yml | 25 +++---------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/Resources/Maps/Shuttles/ShuttleEvent/honki.yml b/Resources/Maps/Shuttles/ShuttleEvent/honki.yml index 0fca6a8ba9..2fb0e85137 100644 --- a/Resources/Maps/Shuttles/ShuttleEvent/honki.yml +++ b/Resources/Maps/Shuttles/ShuttleEvent/honki.yml @@ -2223,39 +2223,22 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: SpawnClownSpider +- proto: SpawnHonkBot entities: - uid: 312 components: - type: Transform - pos: -4.5,-4.5 + pos: -2.5,-5.5 parent: 1 - uid: 313 components: - type: Transform - pos: -2.5,-5.5 + pos: -3.5,-6.5 parent: 1 - uid: 314 components: - type: Transform - pos: -3.5,-6.5 - parent: 1 -- proto: SpiderWebClown - entities: - - uid: 376 - components: - - type: Transform - pos: -4.5,-6.5 - parent: 1 - - uid: 377 - components: - - type: Transform - pos: -2.5,-4.5 - parent: 1 - - uid: 378 - components: - - type: Transform - pos: -2.5,-5.5 + pos: -4.5,-4.5 parent: 1 - proto: StatueBananiumClown entities: From a99900fcd81d374775f11645665047eaa1575b1f Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 10 Aug 2024 19:51:16 +0000 Subject: [PATCH 365/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 87d6f66552..b3651c245e 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: ShadowCommander - changes: - - message: Fixed screen freeze in some cases when getting gibbed or butchered. - type: Fix - id: 6584 - time: '2024-05-11T15:03:41.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27617 - author: DrSmugleaf changes: - message: Bullets no longer hit mobs that are in crit, unless they are directly @@ -3787,3 +3780,10 @@ id: 7083 time: '2024-08-10T19:31:32.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30755 +- author: thetolbean + changes: + - message: Updated Core's boxing ring beacon label to be correct + type: Tweak + id: 7084 + time: '2024-08-10T19:50:08.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30800 From 179534f18d7001ad0922561ea56e5fa17c44ccd3 Mon Sep 17 00:00:00 2001 From: Flareguy <78941145+Flareguy@users.noreply.github.com> Date: Sat, 10 Aug 2024 16:06:50 -0500 Subject: [PATCH 366/422] Vox Minor Clothing Update 2: Electric Boogaloo (#30838) * more vox masks n stuff * cluwne * fix * merc gas mask * bunny tail height fix --- .../Bandanas/brown.rsi/equipped-HELMET-vox.png | Bin 0 -> 449 bytes .../Bandanas/brown.rsi/equipped-MASK-vox.png | Bin 0 -> 362 bytes .../Clothing/Head/Bandanas/brown.rsi/meta.json | 10 +++++++++- .../Bandanas/merc.rsi/equipped-HELMET-vox.png | Bin 0 -> 395 bytes .../Head/Bandanas/merc.rsi/equipped-MASK-vox.png | Bin 0 -> 354 bytes .../Clothing/Head/Bandanas/merc.rsi/meta.json | 10 +++++++++- .../Head/Hoods/moth.rsi/equipped-HELMET-vox.png | Bin 0 -> 1256 bytes .../Clothing/Head/Hoods/moth.rsi/meta.json | 6 +++++- .../Head/Misc/bunny.rsi/equipped-HELMET-vox.png | Bin 0 -> 539 bytes .../Clothing/Head/Misc/bunny.rsi/meta.json | 6 +++++- .../flower-wreath.rsi/equipped-HELMET-vox.png | Bin 0 -> 427 bytes .../Head/Misc/flower-wreath.rsi/meta.json | 6 +++++- .../Misc/head_mirror.rsi/equipped-HELMET-vox.png | Bin 0 -> 251 bytes .../Clothing/Head/Misc/head_mirror.rsi/meta.json | 6 +++++- .../Misc/hides.rsi/corgi-equipped-HELMET-vox.png | Bin 0 -> 1559 bytes .../hides.rsi/corgi2-equipped-HELMET-vox.png | Bin 0 -> 1566 bytes .../Clothing/Head/Misc/hides.rsi/meta.json | 10 +++++++++- .../Mask/clown_banana.rsi/equipped-MASK-vox.png | Bin 0 -> 1094 bytes .../Clothing/Mask/clown_banana.rsi/meta.json | 14 +++++++++----- .../Mask/cluwne.rsi/equipped-MASK-vox.png | Bin 0 -> 1466 bytes .../Textures/Clothing/Mask/cluwne.rsi/meta.json | 6 +++++- .../Clothing/Mask/ert.rsi/equipped-MASK-vox.png | Bin 0 -> 867 bytes .../Textures/Clothing/Mask/ert.rsi/meta.json | 14 +++++++++----- .../Mask/gascentcom.rsi/equipped-MASK-vox.png | Bin 0 -> 686 bytes .../Clothing/Mask/gascentcom.rsi/meta.json | 14 +++++++++----- .../Clothing/Mask/joy.rsi/equipped-MASK-vox.png | Bin 0 -> 470 bytes .../Textures/Clothing/Mask/joy.rsi/meta.json | 6 +++++- .../Clothing/Mask/merc.rsi/equipped-MASK-vox.png | Bin 0 -> 1193 bytes .../Textures/Clothing/Mask/merc.rsi/meta.json | 14 +++++++++----- .../Mask/neckgaiterred.rsi/equipped-MASK-vox.png | Bin 0 -> 739 bytes .../Clothing/Mask/neckgaiterred.rsi/meta.json | 6 +++++- .../Mask/squadron.rsi/equipped-MASK-vox.png | Bin 0 -> 941 bytes .../Clothing/Mask/squadron.rsi/meta.json | 14 +++++++++----- 33 files changed, 107 insertions(+), 35 deletions(-) create mode 100644 Resources/Textures/Clothing/Head/Bandanas/brown.rsi/equipped-HELMET-vox.png create mode 100644 Resources/Textures/Clothing/Head/Bandanas/brown.rsi/equipped-MASK-vox.png create mode 100644 Resources/Textures/Clothing/Head/Bandanas/merc.rsi/equipped-HELMET-vox.png create mode 100644 Resources/Textures/Clothing/Head/Bandanas/merc.rsi/equipped-MASK-vox.png create mode 100644 Resources/Textures/Clothing/Head/Hoods/moth.rsi/equipped-HELMET-vox.png create mode 100644 Resources/Textures/Clothing/Head/Misc/bunny.rsi/equipped-HELMET-vox.png create mode 100644 Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/equipped-HELMET-vox.png create mode 100644 Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/equipped-HELMET-vox.png create mode 100644 Resources/Textures/Clothing/Head/Misc/hides.rsi/corgi-equipped-HELMET-vox.png create mode 100644 Resources/Textures/Clothing/Head/Misc/hides.rsi/corgi2-equipped-HELMET-vox.png create mode 100644 Resources/Textures/Clothing/Mask/clown_banana.rsi/equipped-MASK-vox.png create mode 100644 Resources/Textures/Clothing/Mask/cluwne.rsi/equipped-MASK-vox.png create mode 100644 Resources/Textures/Clothing/Mask/ert.rsi/equipped-MASK-vox.png create mode 100644 Resources/Textures/Clothing/Mask/gascentcom.rsi/equipped-MASK-vox.png create mode 100644 Resources/Textures/Clothing/Mask/joy.rsi/equipped-MASK-vox.png create mode 100644 Resources/Textures/Clothing/Mask/merc.rsi/equipped-MASK-vox.png create mode 100644 Resources/Textures/Clothing/Mask/neckgaiterred.rsi/equipped-MASK-vox.png create mode 100644 Resources/Textures/Clothing/Mask/squadron.rsi/equipped-MASK-vox.png diff --git a/Resources/Textures/Clothing/Head/Bandanas/brown.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Bandanas/brown.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..0cfe46ed28eb7e317f7b73c9b07c0ecc6dbfd842 GIT binary patch literal 449 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zt36#DLn`LH zy=Ca%>>$GaVZUgWf{GNIgv4FR8NXV8h{^sHt5Z~GD?i4UYA|Dhke4WXv2K&cj>(gc z{Lfd++*w_|zC89GbH~4}+A|#sUzqL7O{lkUw2_}5zvS7k*FPq+A6l^!S{W+4<2gH*5w2mF)@9vxlTumN~EPF z=dmf%kM~8%>^eK;XUft_*864x7HVa#y(a4gDyLnES^Y6w@7Si*kGWJLZ{E&%66vui zD9bLlK4yRF3#oIpf5kknPmNvzwBeS&5&|qT^jf;)eV0)2H?EF-4SG{2&A8&Qu`s>% z?rUL&hDSe^?b)!ff}zSV^pWQLhIfm~TzMaSR$+K0njH9Fcz?}<84UZ>qJMKT=*DN(`i?1jx-fZ|v{jJf?X?BgO*Pd=&n|bo< j57qU(9Wam~XveT9^2oBR36s|Xv-&&SpLKo^6-1YfVuDILeWuiabVcfi*DLaW{6-5eM1CJO$KWUx-$-n-8>*7|5M z_p)^Ux}!ZW1NEHbH!%MUJ6>LPz`vt){rf_}lyRFIq3){vDbb?KywtJaZ<9y=o75?R%T_mng}u0SS1z`njxgN@xNA D6;qj5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Bandanas/brown.rsi/meta.json b/Resources/Textures/Clothing/Head/Bandanas/brown.rsi/meta.json index ae74562560..5539c0fb7a 100644 --- a/Resources/Textures/Clothing/Head/Bandanas/brown.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Bandanas/brown.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by лазік#7305", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, modified by лазік#7305. equipped-MASK-vox & equipped-HELMET-vox states taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/bc095ad398790a2b718b2bab4f2157cdd80a51da/icons/mob/clothing/species/vox/mask.dmi and modified by Flareguy", "size": { "x": 32, "y": 32 @@ -17,10 +17,18 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, { "name": "equipped-MASK", "directions": 4 }, + { + "name": "equipped-MASK-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Bandanas/merc.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Bandanas/merc.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..00cd7d82d0e94ea74f0aa3703861b5995e56e4fb GIT binary patch literal 395 zcmV;60d)R}P)Px$MM*?KRCt{2+OclKAP|7zYn3gN2d@@uCd3=?=y?N_sVmBw!Bb{;y411aSU^pY z`hSZhJ8)-wWI05Df9)e@khR0qbw?S;yXf_Dxn|Av*YOXz!Hwy~nEvU0jYXKp7m>#` zH-6Fp?@!Y>-dCS@-BHfxuiX~G+F^3eNQ^g`=b;M{LQJlNqzc$7HEV|{WxiZm`o{E+ z#h6!PiqDiEZ>?^PEf7K!=giYR=Zu69v*xSz$Msv*w&C8}uSvDGT$8*%P4g=N00000 z0002MmZDbDtER-BX9cu1zEsi@%NnRJzSfbA@m8Ezt$4*1uuMvm(FSH|HE91&zx=Cs z)hj^c=jHW<)!rT2<+jrta^of+kx}}EYqzAA@w}I}r&hKU9g(SdFzTIoo4m?7ffoDn p)pBaNAK!9r000000002cgm3Z-u%s-pk?b$<z{x9NSQyrLMT!O6O9&n1W0}jNAS9{)-NC_P)Px(qDe$SRCt{2noVdMM-<2ZTgL=BD?tQaix{kYR7D`AAZv37hL|Q77iyP4LQx!fMu1^|F4^T*G>(*C=%52#Q8kUcV_kG^tj{CUV{R?>W(G?$lBxcBrK zZOguTiMjcBUybf2Uw!z9w&i~Mky}3V4Vi>$65%8ARn!fQD)IR@xq&;N-||1;5k3`L zY-*p1Ekb?x2$_Uxo^fkmXf@vc%`2bD0f1%f(CbI=j0{7sA0eBZ!N$ru zZr!;(C_Rx+$7y(Lm|pMuJM1*O$ZM5ZTcA2FWvhhwR} zZ-#cm{DB~3k4*av-N4TF7X8m6pLq%R13{+texmr4Hsb;7x$h4Iq4*T$F_|3Ta(mIJ zRdN5xV{ELf1F&ZQ{*%XO)T;DFWKfXt4c!2FF(SWtpxfglz3+jl=S8Nai= zHIVSP%MV3W9PaI6bbNxg8@d76BcrgEW0ubp0pVCm+S%ShWxqlrp;4=%vR@gv@dQIR zFgiX#Bf#Fy1GmEVP3b%gx62JhRRE_m4}fd-0pJp^BIjvzD~Ef#P3!$|Zf~u@XPN9azOFdw_lh5F!u3en`{8IAfi>@|AO~OOp-k^M#m@Ma(ijM zz;oj|3i;ANvc#E$Y8LV(cy3&$$M7z<7o+17D-5+0Ho!m6g6~iK90W+YP4`7 z1DO4)7sw=3lZ;z8G+Y~VV|gh>`{(B4+;X^<08y$nS8pf#>Lma;E}9_GWUojeoK+lg z9!sF3BII{u_C-g9dAaxW86vYU+T`>DM-I@+#irDB-Oy;EMEJ9>0l?9IK<*`DO~n?Q z3~!as1GfW6$c3URv~m%3L&J!Cl@>}2OG6ktK0su8lFJF1gla~nCoy(>fMIC}fK{A9 z>VmX#5hO$8WSMbog5*qI@hLEL1EHvj!decVKoCRTn@t52PPz8rQ~Yw*8f(aV6PHf@ zp~f4!0mY|KeR%Q%%n?8`#Qs3ADP0|ks)5rZu zN4MnO?m710*7q6DD{pemd%SADQQa2CeH_y-ot)kyZ*%Y-bDvJlmpw7BZ+!mtj&ZkW zfk|h~)c~uyOJWu7M;Nv-m?bepGe{dY=r;6991uI;#*@IEAUubC&djxH?%8v<_)Qg^ zpk2A(5m$lbq#aAWm~#$UrtyX5F+RxWdDeeCXyr8qYq{SyxEMb9%w1)sz>aFzv&Xz1 z?^y4Yf0%YrLSv~Mzv_7tb;Ub+1rlwcvaa{}e#kz9vBGBZ`@Iuv4uyT%*LUTf z!bt}66+x>4y-dw4noVWvLf=eGIZ!)Gj<-X%c)O-%=r6sf*Y&*w%+TeRj zwtBAUYQt|%tl9}@&w5|i{dc8xtLq;X{n+g{E=Cyormt%<&K72I6ku_*khRbIB)LXA TQT_=qwi!HK{an^LB{Ts5zW?Lz literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Misc/bunny.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/bunny.rsi/meta.json index a470e00944..2049d3a486 100644 --- a/Resources/Textures/Clothing/Head/Misc/bunny.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Misc/bunny.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e, vox edit by Flareguy", "size": { "x": 32, "y": 32 @@ -14,6 +14,10 @@ "name": "equipped-HELMET", "directions": 4 }, + { + "name": "equipped-HELMET-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..daa702cc700b4d88bfaa35f78c8c469106a9c568 GIT binary patch literal 427 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zQ$1ZALn`LH zy|v%#aDd41kNHB;UJIL#dMqp{`^YKc^6G-s4;HqA;wKbX7tUUs9e3cUU8BhElE680 zYTFk~;1g|`_RVU_4Y96S*LaTJPv50je{SdVG;4O3f2P_mxdSC;RO~GeOWD2W=wV;m zkL8yHo`>oD+ z8sAs%We&fn`!_S_y1EUQQ0;ZUNe6y!?!EotrT8+(V|#h7+U(&;FrR*}zu;$@&Ws$H zWwZO&GqNp@@bt6a_(Mc2Gd$<>-C99pFmbC`Yh&l{Pn)wF4tMXi&z>eXr#vWg&%a%^ z`#K&cdd13be>geUH=TWvfk9@@y^jWOyK?Qy)aJg(;TArxqm%uT$wE#|E@*~q*b8x{ zJ8kD5zvg@#mp1jzzDEo;yssIGH**xe3GLocX40*ogaDgb{Q0;l)skJKSb?F>;OXk; Jvd$@?2>|ACv-JP~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/meta.json index c3dc06f19c..9759b9c5ae 100644 --- a/Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Misc/flower-wreath.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-4.0", - "copyright": "Kevin Zheng 2022 | equipped-NECK and icon Drawn by Ubaser.", + "copyright": "Kevin Zheng 2022 | equipped-NECK and icon Drawn by Ubaser. Vox edit made by Flareguy", "size": { "x": 32, "y": 32 @@ -17,6 +17,10 @@ { "name": "equipped-HELMET", "directions": 4 + }, + { + "name": "equipped-HELMET-vox", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Misc/head_mirror.rsi/equipped-HELMET-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..f60f23da1ca672da3adccc2e769f4603752dc1ce GIT binary patch literal 251 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|wtBiahE&XX zd&`jTkO5EYL-s>^{kQw=4LUz5y7YDJuQmhMMM18a3I-qQi)E@mJX2?^e;X7%Bj}W% z;_X?>R{okFzx$e)Tg$I~;Vv~r^VaX4TWQ1NJZ;Ik*D2AbH=Wpatnke1U0#!(RpxEu zU0OeLVNSx!ySwax)TP)Px)(Md!>RCt{2noVmPM;OQdQ>tA%j#UYvtPx0dKm-ZrkV9_w_y}Y(Dp9CwY#!eMZzeQoGS{S zhk2?0<0kZ-698%FexC3<_a^Syn?FP46;6QDbLJf$gX4#D@d5nKJwQ*5Kh#qg7T)%G zBN*u+&_6x*9aQ>v{?Ffcqy?BpZ&y`L^F>+!{qd%+sq0@qnadCW0Q6r4-%B9u1Dttw zB@5tuRyvlg3_@4R5BqRqT;M5<9;IWkXD@~F6|w-crg0RpUX^ERP zO{fAQ*oPaOCyT=yuLC4T&qwLFeYhc%_e=rIn#Py++oPTb5-r=;*%^frBXO4Z+khew z+>JL1rFT8Ar`}!vy#e~KoNodd5rixtepW_r`*>>a191N9Z670kRu;)tir)6|@Q0q7 znDg1-AIAcmbbaXCPVcWCP5QfRWq?G>X4H5UL%}}W;8#{#N>u7BvVvLZ zg=c}F-Y2^Gm{2+yj6!Lw@vPH;;}1sgWD%^>aPDO+P*?yX`v8D{?-SX|z)7b9TJX3< z^)}w`Ii+_mn5HpP0IOLCUYk?D0KN22&lz5u$}E9q7a4+PD=)JIU`F-YS9_OkyqouA>p-yAW+}(H^J#EHvGur~pKbY05Lw~#(X#Rv&{vCL2I`2iH zw+m={7fwE`)4-M0o;nN&)@cYe9uU|N85}*K zxM;I1;DZtX7&hqgAjaKJZuN+RzBs+B(2q_4@(D{@>kwJ;e(*kE8X{kLB7ATbAj?N< z0jgLCaN8BQZ9aJcLPdtWcpZ&u=jrFjRFx5E0gSP+YZ~4dy=wf<2Z+{t7D|Qy?H$hJ zjDYI0A`3tjqD_jM6oK+)od#5ipv(#KWD&Wl4debJTwh-+7vcK)nj7~YAy>6$ZivVb zNdWh@IRIQ9!~i{obUGcmVqVheG@z%3WsFc^1yXxaejoFAutM8={qMken!A4BSJ*jjT!;;l(Gs5(SJ2PNGeGr0mgQH_0(KekDT+d z#z)mn=G;u%vEi6 zc@RT4Km0&Rv}`slb{7SAxT~9wAy>5{hu(k)0?3}kPz?n^qShm{0B^s~Ogy82gsL4| zHVzX zx2}7$rXgDyVD*Tjr)VM|Q>VsL1W46Etk43G1ESvV?E+ob{~~7zMDWWe(XyF^ItMUz zdL+!@Oj#e`c-}Q5gIv{Sz1`b6C+t2w64v~I2o^w2iKagwTo1^Stqfq+H1u}uVI3km zTw&Gdla@9hsP_SN<}QQ#;6yhc<6-v$7A#n>V8Ma~3l@B;{15EsV%S;hWXJ#j002ov JPDHLkV1j-v(~JNB literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Misc/hides.rsi/corgi2-equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Misc/hides.rsi/corgi2-equipped-HELMET-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..36ddbc1cb89feb06aae389b4dc8b9beec9fe29d6 GIT binary patch literal 1566 zcmV+(2I2XMP)Px)*hxe|RCt{2o6l?GMij@tQ)(&MY+M`T)w1Bk3uduN4}0h>5D31cuuy2vJ~UnO zN5tp&zepCE^A-w)1{Sjr$Z31*5>tGrZ7@-Bi0d@l*eXm9)>Fo|EX_ztQg8hML8Oc{ z?|t>=hvtm|4>;$pM{_U6z0Pm@P^sUKPkc*^(W+?tvGD}0ipJf}Z=0y=XI}ptSCA?L zfHSl0ToJ`J8c;GBD9wcaP6V$qe5Zii_Q^- zPlMdl|9%bnH%9={&iP%!A3T~kXCM9u^eklo`fuL@02^-}m)ndZ7Yk&B3jDz%Ku?Wc z)KeH*({{PT8|5YdpMGQ32qM5VW>T0S0=N!0`ireQ83q9W{d4bg1*8R_aaMn^* z(E=MZ4QoF;Dscb&<`^qy?PsN*D5BJ8fVoLzi6Jx{)t35@&Iz4MZe@=)93H-n?-=b#wgl0qCDQ za{?6+q#_`GTtaW-aO&F!h7r)s#n9V0MEtlU^H?Q%8;8R`^wh+d&jx=v5#W@Q#8ZG) zMdPHZ?Gyum<%7xoF0(s8qHZyAK8mJb?PvL!*;W#jUKT}xUwP?H(Ch6J-CRtnoC-$1 zIO06JIEB+6*zjZl?BdipSBXI7VbJaE6Peus^v&p|#q_~r)~e36ap&ExQ+e@&X&Sx) zn6)Z!)dD0ZI{mlr8LnC*Mu&k$7ZqrBz&;V$ALx^Mmd5zzXLnYAkP%{9;PC$!S9z*Wn+FC+}Oag1G@;>>JMZ3fOw zLxH5k_gxSf9DWYKc1(ew_laC?JLd6)_0G(B#<373;^PgHld)UAy zE@LwhNfV&8!@Jlc5OrOl1t5cHk>WN*pl7p-Q$!^~WSt;S7O+ybU_5<}PNx&O2%S!c z8&98OrEK{wh^P=s0CCwI0D9j7&{IgK(_!tJAe~MFdTLmQO%zd}^!+S$aO2Js+Sflz zKa)Bsm5y`p!~xh%PCztL#bBq75E)^SXavwxN(Q+(tRe#X z=hKs{S{jIw5v&vSB{$9;%-fM7#E;EF)h; zZ{rZ3{rJU1{eFb{7NAkUL=}m;#jZ~p9LRFG2&-ZgW6X7A5S(Y-T+DS8Qbnl=v??0s z$%0q*m0h1S(0?8Mexd&BEysDc|HqF@;K_pWydd-_VAiTg)Ga3*0kCPgyD*69E_+ot zk_2pE0eTyUFl$w;lr7fH#h6znR%wWnxW^Wpt&}Zh)~d?8LPP@h0rBG!{sz$8i}986 zaE+dGj>~N}lC_Bndge{K%R+N6#>tkTglYmb1d$(8musPZ^*@-GUy$W~{&hh;xAWE3oF?=tgOoy#zA2J*T-B zL%eLU9*(#;7YKq<6Ugiin3$8NA1d4@kBuic^O3QyLK#9u0KI)+GAVgmIQ5hn;;+DZ zXz*?>d|x01Eq;of9<@=wA36o8%kO#O;t1I_ODocI=FFKhXU?2CbMBLW0Zz1t6k_kP Q82|tP07*qoM6N<$f`V4!VE_OC literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Head/Misc/hides.rsi/meta.json b/Resources/Textures/Clothing/Head/Misc/hides.rsi/meta.json index b58f55cf05..10971a4a97 100644 --- a/Resources/Textures/Clothing/Head/Misc/hides.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Misc/hides.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e , bear pelt remade by Alekshhh", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e , bear pelt remade by Alekshhh. Vox edit made by Flareguy", "size": { "x": 32, "y": 32 @@ -52,6 +52,14 @@ { "name": "corgi2-equipped-HELMET", "directions": 4 + }, + { + "name": "corgi-equipped-HELMET-vox", + "directions": 4 + }, + { + "name": "corgi2-equipped-HELMET-vox", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/clown_banana.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/clown_banana.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..aa5da26ee0467d3fef0dab6c772f56b102a04f0d GIT binary patch literal 1094 zcmV-M1iAZ(P)Px(07*naRCt{2nonpOR}jX(H67{=sV3#HgeMK~w?>JrqnJ zx+&nCLcpM#PYLK~u)rbU+E4;L)EEjnh(f_ERH}nZU5W*@H;o~PdV>>L5+#?(L3*2A zd1dLX<+iEjcae7Xz4>Nl-@b*N1v(t1-f;2U7y-bQul~lw&F_w$eG!to+X8KMA5educ zI~HJDFQXjnvN;o!A3X&C_mm3D)R=*y%`VE&> zBIc)&05BNz+9#aqvn4Muj1uVKuFbZY-^02Nspa2HU!C}^p|9+{_id}775xJPOT_#H z03(4Hws#|^@X6*1bTw+)0@*Zv9t`7;%tO<*u2+BEB!7_pgJai_$z;ygkBvkkKfLp7 zPFmmb77&QZiI|^?PbvU_u?Y{9aRMzW(A6jc*))`^gsuD+SXir$={?bXsKgJ_A5a^Q z*V?SVkDL~!t$dVd5ww+$QXH@y=d>_2_wwJOtN9Q+-i-isHHu6yjZpxZU>dp_g?A&+ zbngFxoED}yK&t@F)qdl^OL_HOlheXx@^hV*ydbBAX|+?67j$&;48t%C!!QiPFbu;m zOea7@AgaCv6D?<}?PWx|FQ6z2mgYkQ088^BQk3>LU}RXD57EVQVs#oBplgtMdQUw6){dwzuYs*{&+O9$fe@<=r zM)9 zYikwUOonXZ0@*YG;O_Ve;(+T%L>!>I<103wf}6>Z*$x-+tn1YnWi+G)6A=_e!Szf1 zW>T@KA^3bA7)A*`pU3=OfEE>8yZU189Z4-~;pP@$`qb5^sbv@?EF?F~IkU?Px)bV)=(RCt{2nqO#BR~*Mbr&W{GD5P3PU0bYnmIjNKWDbU|iVwpU{6i-rW5^yh zVSA|z_prf+Zn8cMhWfBU*M}iuAGT3j=))*wb4p<@!D&WHM{Tv~EbZEq#{8|ecMr|I z&7UUCy{*FVd?2Lf+;e{4-|u(NJ-6g{1X+0X_Q%Oh1rTbZudYSc_-u3X)LyZEF6}ir z{7?Y#I5x{#^E$OnJQ@?KSYKU>CLE8(Fj>rsIyr5gKtIn!KUV?(l(pt{j1Bs=j?$`f z1>mE(*F?3uiGjI)`Ks_Y#bhxrIc|ky)ju*{Bih_htZ?h!~as(w=mH4cY1u;1fZyp|Ye zuCOKBG5QFkpxPZ9^wY=%x+_o9ID8@HdKNob^>eO(M}e7)iM{pbQi6wtWc1db%P^3b zzoHcYWF%MpEY(gQznp&71oYLl5DEmDoeX6dX!f?|Yy-?rhD0b3q_3_;*Be0928f0t zqO_`9*Ibp-s&b;C$g;`LwE`GEafSKFV*t@u>JaMPceyTUK{tC_ak(yOtDv#eApkKS zdCc&MD~6nhg(O(4MNAHj33G)FbA>Hsm8rg@_o-tihsK1(TC{BP^Io1lw;MpIaX4u9 zwsNud6xGgl2HY;K-S6=L2)om%Gu-S{{_r*c?`_=Au}uzbUr67BRIW{V#CO3P0D0X2 z-3j<})Q0Qmc3yscRJ-=a&tmRe5>F9s~-yEz|$bVjG12&;0JYG*qYwPgTQ)Rs~0Y{#nHWpwI^(G71|0>L0wi$x6j{V8`G z7K681EFusL>awfL;jWGj?)c`|Z7)TliD9DY}xd+zF9%vId`4t5X0r*lfb* zb{kHD&+TS|&BmkYX(bX0rD(KyvL->-c?7))NI^S=QJLDWI@<5?D1n*GGY0t*n3;h@ zK{l7Z(Goi7tPK`V7HG#-RPpZ0(;3A|wRAq{_tV)EVyEM(ZpU^yuF}~PV$knTv8hty zaL`?Onsk3uAM+*e1oYLlP&`$@;V$!%*VTfhdS0N}+sc{qQ966VioK>-R}ywQu41n# zrn4ukoH-v&v6-xu&fzXI#Zv{kHbGsFz)J&bxLqV z@W%cj&VKQ`?sG!E{(y4!(^vTM#&#~&qS;KQ#^Iowg;j8Q_!n`z#82J8COtC7N@KUK zUnd+6D=%!>lHv?Nd*=`UUw^YsE201OYde7W+w)dl_7kf`*>%7Lz=(I04?ma%z;$#x zkh%)SCni|Ge!bXRU#~kBLz`eY9L8iaiSdbv#kWGjp*@Lz1ulOHCqFS_eUTCGXu{UG z)~5zOJ~5&7nM@`T4u=hC=-LET4mLCpkH=wQ1qqYMBx13cdLm2!;+EGW_U?*_c;tcM zw?I7dK_OqfiIeermlgAENvWh4@bL?V$$Boc{4B9TZW63KJKe~b2# UoLR5dNdN!<07*qoM6N<$f*T3Ib^rhX literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/cluwne.rsi/meta.json b/Resources/Textures/Clothing/Mask/cluwne.rsi/meta.json index 245ae49644..bd410c6de9 100644 --- a/Resources/Textures/Clothing/Mask/cluwne.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/cluwne.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by brainfood1183 (github) for ss14. Reptilian edit by Nairod(Github)", + "copyright": "Made by brainfood1183 (github) for ss14. Reptilian edit by Nairod(Github), vox edit by Flareguy", "size": { "x": 32, "y": 32 @@ -17,6 +17,10 @@ { "name": "equipped-MASK-reptilian", "directions": 4 + }, + { + "name": "equipped-MASK-vox", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/ert.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/ert.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..b7f2ad7f68ffa9b69e2e0df8e3af483ba73e8bd6 GIT binary patch literal 867 zcmV-p1DyPcP)Px&9Z5t%RCt{2n!jt@NEF9EK2m5Q$7~u&!C~0KAUBJ(?>lcai{1m_|IOai z8<)#vKYYKsx|%%Cx3>Res`10a!||p5Yl^U3F8e&sna}5}R;wucKZV|)weDxL*cS4sgeo6Y?7+uK_JthF>vv$IUlTKCR5 zvMghq0mc~Gwk1iDVEaK^Kq=)7S!+>BVXXyVaBP<-rEt!9n*hcbKOPn*gdhQ|wS4~N zGb&Z6mx|`JLBH0#fAgOGbRT4o4MkDV zoHqWNb1vGU|Kh{XA1I1~EXzoe#DB6ZAnJ7om~K@bE%5ClOG1VIo4K@fzm z$X4FsK2#ar_UrLo*_hNHFh*&_=gIg*4k(hqB6i*i!o-SD7jcH0H~@e zW@^vH#RUL)o&!+Vwf`+ilIZy-3*emd!4E+jW2ozz?AHwaQUhRrpWZW|ltTTs-ct6h zrTt^woG}*T{sM#&+#@u`IY(KR7-LXMdB<+L8|+)l^{Z>zw*6NP@iC-n+P7`X^{ZPx%Xh}ptRCt{2+COXCKo|z_$0dczq9Rz!xql29BHu|Y#9)fi}?OPB5$`UL_3 z6Dah9bjcD(cZaxxX~ztq#$G~Q*VYh+pkjMy;X0(J%1N76(h1k)`GE(Y?bCbb_fDXD z0U}Dn_JvfhS;eqgTg!ayg)~31eIZX?JjCsai7(v|mhfH<>p>xFFtd<&0&HJM$8)iI z@DV|408uT&@mzF(xtxR>Nxp3RLY6ky`==|*{h&1f00gZ8PFI%urOoyJESE!Csg?i$ z6ioy79#qgf>gtT=TDC9b-u7;kWm|_eG#ZWQ^QSMLCC$gxzzD zM-!;_JeR?0ZB2$}AppQCSpa|q<0j5N52LnsJ8u(RKT!q@>p`Js8WKP>c&oCAachF! zQ8(AY13;(QhU2+-^=RkHb+!&`veRrQ?laLI0086BBvHFgd)vE(-wm?UY$Lur{#L4g zOl@{W(})H>k9UB~=5g02A|fIpA|fIpA|lc(kH_VCJ%UesGISkPFyVME!u<_x0f+k= z((zp6QIMhSG{^RZ6xA}q?m2*qv%{b@$b4dySHDW?~7lrBoy_{1?T=($DzxqRD;J~hH`_*yUgNn5vQ z;{tAptxBG^1WqP--kK1oJ?TEzW9$8AcYJ^He*Jl+$eQAp6)*mz*6AmGo&M9m$=!zk zRK=#b2J@Cl_+Pd^zUt5}hUX_af#~&HL520)lJshQXYy{!pqWN2~aMg9e*>BW$9r$SS_1607 zI%2u|e(5z`XJR-|wE1w281skC5xs`{XS&$$b7=Cf9PYdrmP{S$VHb>+HOs^@pWz^k|1-~E(NMv4kA1V$8tr>mdK II;Vst05(O};{X5v literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/joy.rsi/meta.json b/Resources/Textures/Clothing/Mask/joy.rsi/meta.json index 98e76beb9e..bcdae32f9b 100644 --- a/Resources/Textures/Clothing/Mask/joy.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/joy.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github)", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github). Vox edit by Flareguy", "size": { "x": 32, "y": 32 @@ -17,6 +17,10 @@ { "name": "equipped-MASK-reptilian", "directions": 4 + }, + { + "name": "equipped-MASK-vox", + "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/merc.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/merc.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..31647e95e2003b708e4ca698ac4c5c627eeb6df9 GIT binary patch literal 1193 zcmV;a1XlZrP)Px(V@X6oRCt{2nlW$NMij^YM;?!)bdXF4h=HV(2Lo;7!Gr-XL17?E(-r{=bZv($ z`3zZujL8^hi&G##yJXE5$Oj0L%8RBfCS1c!1yu%RQRI==K_X!}ZSAAfX2|^jLgF3y z?%m_NBXRc!G@4HuqIyFRv|(8$(lnDrnPr(IO*3@62g~*D9P8^>K&b&Ca>*Daz20x= zbgm*vgrw9ULgaY&?sp}dhRVf3(8ktw18JH`&#R+2(lnD>+YJOkTdDCX2$4(99oRO- z&6^$AHU;MngvjN^cYlad0JgRpc>DT9?(S{i*^9df!#G5=6(=r35VXO$14>OejztI| z#BrFM{#t}m6P!EBc9jB95RHz&xr0vU8aQ__&i*LtgvhFxypYw^CIHB0vj*F?z_|?o z;M|67TWB_G0HFK;lmqbS!7+aL`ezdWq9_Ic{P@i;c=X^HQ53^42-erHsG7ZyI8L#- z*~V~qDh-23DIq<*fu3$*hdt_@Vq((gAqKhjwp)J>m9=P zTR1&UWTW9KJ8}_@V_|>)0KVTsp67%RLZT=pgbUrBb+-3!#)5Y z4Erd~rx`FIv+=l8y4?ee#|Z$ClaujW-Rzvq>XoSUA(SN3Oh^(T8KWf6bGWVzLV#wo zhF7n8%8q<2D!n@a%uRHvUtb!HMx)VaG#ZUYqtR$I8jVKtv8cQ#3d}EzGDgAJ{5Hd~ zw#(0NxF(4xSEhl*7G*2#4Hiz#IxGQ5(=^Ke0Ho`(rR)?3K^v~i=4_vBi!r)TJCy=Z zG{_j0lp2IFN=(xzHzs|*h4DC%mSryFTp`97j}z(pt+L!S4apcKv$o|~pH!)w0hm4k z;y4Vo8Urxx`0m~Yo;<%(3MUq@4*;bY?_gArY{dSfaG8+s=007&rmZCw>hHX#hl)+$x1Q|a2{9D|+zY5Q*pI3xbp34@^ zfZ`~LMn{Mz?*U9RVlolR^FcB0ClgVoemr@PXmoTbA5>U01BwFx@bqzne)z`x?#n&1 z&<_>!fvWLh+!uDf-}woD9{!4_kE4I}p-Lwf;;d@S^Xg?e=T501nC&E!%f1$8*&>Vk zeZN(TF@WiiSe7zPNgwccbh`&d5XfLK`rt{Qb^Njjk%3aP+;Z>r4(Ieg%ar9UG6YJx z-2auP)`27^(h&I3T6OGHsziY_>JkY#z9?#t99E}Q`cg+rarRdDXib-s9F zmnBI=sRo&905d|V`JW3hH5!dZqtR$I8jVJy(P%W9Pk_Gw0u9e8RK)9o00000NkvXX Hu0mjfW4R^| literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/merc.rsi/meta.json b/Resources/Textures/Clothing/Mask/merc.rsi/meta.json index 77574344f3..5b745bcfd0 100644 --- a/Resources/Textures/Clothing/Mask/merc.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/merc.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "modified sprite from Jackal298 based on the sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github)", + "copyright": "modified sprite from Jackal298 based on the sprite from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Reptilian edit by Nairod(Github), equipped-MASK-vox state taken from /vg/station at commit https://github.com/vgstation-coders/vgstation13/commit/4638130fab5ff0e9faa220688811349d3297a33e and modified to look like mercenary gas mask by Flareguy", "size": { "x": 32, "y": 32 @@ -14,6 +14,14 @@ "name": "equipped-MASK", "directions": 4 }, + { + "name": "equipped-MASK-reptilian", + "directions": 4 + }, + { + "name": "equipped-MASK-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -21,10 +29,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-MASK-reptilian", - "directions": 4 } ] } diff --git a/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..078e73e5926f74a0fc5c0d4ee5a30340ca7be38c GIT binary patch literal 739 zcmV<90v!E`P)Px%ok>JNRCt{2n!k?IKoG{iML}mHq)6Ey;lwFoB_&Ys1oY|7-4$0*xJODJgp&Tc z(4~fFfHqMmh|m=zQJS+OJXGNS`sR@ff60iMW+i)#-!`5zivXJgJL%h*#s*C2F++E6<(h` zBmk=0eU96a$ru2z z%2EuP5xvM#V*#dU0CNEIZ7f8d4>rYy2PT6@*;-BW#gAq)R6W1giD{PNQ|-w~7e7=L z#fyzR9~xWp*_5HG7{@m<0D17Y`OYI3z@iq*rRj9We9TQ)WocplJil%;pV1?5>75nN z;51J`;AdLKv>}}E5h%UrejCH|D_}Ibrb7V0E7}mhh&Tgy2V8#=Pinyaf55+psR73C zfd36Kz_kF^hyktzxJC?cExqOMhtK*z%^ok?Tv9>pV##klu|nfljwjF9gwcKjOW+&R&hUH+mFNZ#-%Z)9Fzfr zW<)VhLN{G0N7~1zGD1Sl=wcWol-ci#o>Q0pMyf zMlTF^<}6pG+3fX=eOcZ*0|4Ot;<|ADy!Mp1OXJ<*T6H?l@Zt6jFM)$n^v&&^T0MG< z$+s`)H`>Id`Eu+-INDc$1(h=b*miB$bZ-3WKA!tnix&hz5ClOG1VIo4K@fy{$PZ6V V18aNgD8T>#002ovPDHLkV1h}0OaTA@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/meta.json b/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/meta.json index 9094fa918f..d5005eec9f 100644 --- a/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Originally sprited by belay5 (Discord) then recolored by Nairod (Github)", + "copyright": "Originally sprited by belay5 (Discord) then recolored by Nairod (Github). equipped-MASK-vox sprited by PuroSlavKing (Github) and recolored by Flareguy", "size": { "x": 32, "y": 32 @@ -18,6 +18,10 @@ "name": "equipped-MASK-reptilian", "directions": 4 }, + { + "name": "equipped-MASK-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/Clothing/Mask/squadron.rsi/equipped-MASK-vox.png b/Resources/Textures/Clothing/Mask/squadron.rsi/equipped-MASK-vox.png new file mode 100644 index 0000000000000000000000000000000000000000..c12b3308bbab228bca820e59ce0cdab2d015115c GIT binary patch literal 941 zcmV;e15*5nP)Px&XGugsRCt{2nn7zDM-<0@F}9h7$b)iNFCvT#ZqXqKYJ(7@1YvUOG3Olp1$uQp zKyvLD@X@DyfS!sEp*gx0K8du!cEGF`6R}Z1gALgpl-aDTQnIs>d&v9UG|SF^-v6y; zhkXx(Z<{;5H@4gD3`hZee0=OZPepwIs^~BKia&h!jxDA1AJ#&nYEVn^>u9c4pj% zQU+LSsdGRwd0LKMP-rwKfm_-^}(&K^~z2d zhMB7ryP%6^jBC4ug&qRmr@$DK6-)5NLTu3tx0WPHO6!#F5pq~->GgWVag5fQD2noI z)UOXnhARxuCp`qU&Arma)7s`*-_&rrzQMyB4nmGF3^Tj>BLM2^_o-{`_wP%+5!}vyeDB`WcyazJ zK^K|pVa0W8z?bd~m#MNFp*!`t4Bwo4PD>U9K@bE%5ClOG1VIplZ;gKdpdZ>7EwvSt P00000NkvXXu0mjf0F%IC literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/Mask/squadron.rsi/meta.json b/Resources/Textures/Clothing/Mask/squadron.rsi/meta.json index 9e9be3d62f..b8ea712aff 100644 --- a/Resources/Textures/Clothing/Mask/squadron.rsi/meta.json +++ b/Resources/Textures/Clothing/Mask/squadron.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Made by Nimfar11 (GitHub) for Space Station 14. Reptilian edit by Nairod(Github)", + "copyright": "Made by Nimfar11 (GitHub) for Space Station 14. Reptilian edit by Nairod(Github), vox edit by Flareguy", "size": { "x": 32, "y": 32 @@ -14,6 +14,14 @@ "name": "equipped-MASK", "directions": 4 }, + { + "name": "equipped-MASK-reptilian", + "directions": 4 + }, + { + "name": "equipped-MASK-vox", + "directions": 4 + }, { "name": "inhand-left", "directions": 4 @@ -21,10 +29,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "equipped-MASK-reptilian", - "directions": 4 } ] } From f76fa0e5ae15c6ef2d830495808f8f561fe6fe49 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sat, 10 Aug 2024 21:07:57 +0000 Subject: [PATCH 367/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index b3651c245e..fb364f7052 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: DrSmugleaf - changes: - - message: Bullets no longer hit mobs that are in crit, unless they are directly - clicked on while shooting. - type: Tweak - id: 6585 - time: '2024-05-11T15:42:11.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27905 - author: metalgearsloth changes: - message: Add a reset button to character setup. @@ -3787,3 +3779,10 @@ id: 7084 time: '2024-08-10T19:50:08.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30800 +- author: Flareguy + changes: + - message: Added vox sprites for most of the remaining common mask items. + type: Add + id: 7085 + time: '2024-08-10T21:06:50.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30838 From 09c8d4abd4f3a086d3521b92a37cdd9bc0cff347 Mon Sep 17 00:00:00 2001 From: beck-thompson <107373427+beck-thompson@users.noreply.github.com> Date: Sat, 10 Aug 2024 17:05:35 -0700 Subject: [PATCH 368/422] Torch no longer gives errors (#30884) First commit --- Resources/Prototypes/Entities/Objects/Misc/torch.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Misc/torch.yml b/Resources/Prototypes/Entities/Objects/Misc/torch.yml index 0efb753e0d..50e8f65890 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/torch.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/torch.yml @@ -25,6 +25,8 @@ color: "#FFFFFF" visible: false shader: unshaded + - map: [ enum.ExpendableLightVisualLayers.Overlay ] + state: torch_nocloth - type: Icon sprite: Objects/Misc/torch.rsi state: icon From 32e315c68f2c293b021048c4f77896a27cd512fc Mon Sep 17 00:00:00 2001 From: Mervill Date: Sat, 10 Aug 2024 18:45:37 -0700 Subject: [PATCH 369/422] Refactor LightBehaviorSystem to remove obsolete code (#30890) --- .../Components/LightBehaviourComponent.cs | 165 ++---------------- .../EntitySystems/ExpendableLightSystem.cs | 5 +- .../EntitySystems/LightBehaviorSystem.cs | 154 +++++++++++++++- Content.Client/Light/HandheldLightSystem.cs | 12 +- 4 files changed, 168 insertions(+), 168 deletions(-) diff --git a/Content.Client/Light/Components/LightBehaviourComponent.cs b/Content.Client/Light/Components/LightBehaviourComponent.cs index 7e8bf82a29..9df793ee93 100644 --- a/Content.Client/Light/Components/LightBehaviourComponent.cs +++ b/Content.Client/Light/Components/LightBehaviourComponent.cs @@ -1,4 +1,4 @@ -using System.Linq; +using System.Linq; using Content.Shared.Light.Components; using JetBrains.Annotations; using Robust.Client.Animations; @@ -68,7 +68,7 @@ namespace Content.Client.Light.Components if (MinDuration > 0) { - MaxTime = (float) _random.NextDouble() * (MaxDuration - MinDuration) + MinDuration; + MaxTime = (float)_random.NextDouble() * (MaxDuration - MinDuration) + MinDuration; } else { @@ -192,11 +192,11 @@ namespace Content.Client.Light.Components { if (interpolateValue < 0.5f) { - ApplyInterpolation(StartValue, EndValue, interpolateValue*2); + ApplyInterpolation(StartValue, EndValue, interpolateValue * 2); } else { - ApplyInterpolation(EndValue, StartValue, (interpolateValue-0.5f)*2); + ApplyInterpolation(EndValue, StartValue, (interpolateValue - 0.5f) * 2); } } else @@ -238,9 +238,9 @@ namespace Content.Client.Light.Components public override void OnInitialize() { - _randomValue1 = (float) InterpolateLinear(StartValue, EndValue, (float) _random.NextDouble()); - _randomValue2 = (float) InterpolateLinear(StartValue, EndValue, (float) _random.NextDouble()); - _randomValue3 = (float) InterpolateLinear(StartValue, EndValue, (float) _random.NextDouble()); + _randomValue1 = (float)InterpolateLinear(StartValue, EndValue, (float)_random.NextDouble()); + _randomValue2 = (float)InterpolateLinear(StartValue, EndValue, (float)_random.NextDouble()); + _randomValue3 = (float)InterpolateLinear(StartValue, EndValue, (float)_random.NextDouble()); } public override void OnStart() @@ -258,7 +258,7 @@ namespace Content.Client.Light.Components } _randomValue3 = _randomValue4; - _randomValue4 = (float) InterpolateLinear(StartValue, EndValue, (float) _random.NextDouble()); + _randomValue4 = (float)InterpolateLinear(StartValue, EndValue, (float) _random.NextDouble()); } public override (int KeyFrameIndex, float FramePlayingTime) AdvancePlayback( @@ -362,7 +362,7 @@ namespace Content.Client.Light.Components [Dependency] private readonly IEntityManager _entMan = default!; [Dependency] private readonly IRobustRandom _random = default!; - private const string KeyPrefix = nameof(LightBehaviourComponent); + public const string KeyPrefix = nameof(LightBehaviourComponent); public sealed class AnimationContainer { @@ -387,7 +387,7 @@ namespace Content.Client.Light.Components public readonly List Animations = new(); [ViewVariables(VVAccess.ReadOnly)] - private Dictionary _originalPropertyValues = new(); + public Dictionary OriginalPropertyValues = new(); void ISerializationHooks.AfterDeserialization() { @@ -397,155 +397,12 @@ namespace Content.Client.Light.Components { var animation = new Animation() { - AnimationTracks = {behaviour} + AnimationTracks = { behaviour } }; Animations.Add(new AnimationContainer(key, animation, behaviour)); key++; } } - - /// - /// If we disable all the light behaviours we want to be able to revert the light to its original state. - /// - private void CopyLightSettings(EntityUid uid, string property) - { - if (_entMan.TryGetComponent(uid, out PointLightComponent? light)) - { - var propertyValue = AnimationHelper.GetAnimatableProperty(light, property); - if (propertyValue != null) - { - _originalPropertyValues.Add(property, propertyValue); - } - } - else - { - Logger.Warning($"{_entMan.GetComponent(uid).EntityName} has a {nameof(LightBehaviourComponent)} but it has no {nameof(PointLightComponent)}! Check the prototype!"); - } - } - - /// - /// Start animating a light behaviour with the specified ID. If the specified ID is empty, it will start animating all light behaviour entries. - /// If specified light behaviours are already animating, calling this does nothing. - /// Multiple light behaviours can have the same ID. - /// - public void StartLightBehaviour(string id = "") - { - var uid = Owner; - if (!_entMan.TryGetComponent(uid, out AnimationPlayerComponent? animation)) - { - return; - } - - var animations = _entMan.System(); - - foreach (var container in Animations) - { - if (container.LightBehaviour.ID == id || id == string.Empty) - { - if (!animations.HasRunningAnimation(uid, animation, KeyPrefix + container.Key)) - { - CopyLightSettings(uid, container.LightBehaviour.Property); - container.LightBehaviour.UpdatePlaybackValues(container.Animation); - animations.Play(uid, animation, container.Animation, KeyPrefix + container.Key); - } - } - } - } - - /// - /// If any light behaviour with the specified ID is animating, then stop it. - /// If no ID is specified then all light behaviours will be stopped. - /// Multiple light behaviours can have the same ID. - /// - /// - /// Should the behaviour(s) also be removed permanently? - /// Should the light have its original settings applied? - public void StopLightBehaviour(string id = "", bool removeBehaviour = false, bool resetToOriginalSettings = false) - { - var uid = Owner; - if (!_entMan.TryGetComponent(uid, out AnimationPlayerComponent? animation)) - { - return; - } - - var toRemove = new List(); - var animations = _entMan.System(); - - foreach (var container in Animations) - { - if (container.LightBehaviour.ID == id || id == string.Empty) - { - if (animations.HasRunningAnimation(uid, animation, KeyPrefix + container.Key)) - { - animations.Stop(uid, animation, KeyPrefix + container.Key); - } - - if (removeBehaviour) - { - toRemove.Add(container); - } - } - } - - foreach (var container in toRemove) - { - Animations.Remove(container); - } - - if (resetToOriginalSettings && _entMan.TryGetComponent(uid, out PointLightComponent? light)) - { - foreach (var (property, value) in _originalPropertyValues) - { - AnimationHelper.SetAnimatableProperty(light, property, value); - } - } - - _originalPropertyValues.Clear(); - } - - /// - /// Checks if at least one behaviour is running. - /// - /// Whether at least one behaviour is running, false if none is. - public bool HasRunningBehaviours() - { - var uid = Owner; - if (!_entMan.TryGetComponent(uid, out AnimationPlayerComponent? animation)) - { - return false; - } - - var animations = _entMan.System(); - return Animations.Any(container => animations.HasRunningAnimation(uid, animation, KeyPrefix + container.Key)); - } - - /// - /// Add a new light behaviour to the component and start it immediately unless otherwise specified. - /// - public void AddNewLightBehaviour(LightBehaviourAnimationTrack behaviour, bool playImmediately = true) - { - var key = 0; - - while (Animations.Any(x => x.Key == key)) - { - key++; - } - - var animation = new Animation() - { - AnimationTracks = {behaviour} - }; - - behaviour.Initialize(Owner, _random, _entMan); - - var container = new AnimationContainer(key, animation, behaviour); - Animations.Add(container); - - if (playImmediately) - { - StartLightBehaviour(behaviour.ID); - } - } } } diff --git a/Content.Client/Light/EntitySystems/ExpendableLightSystem.cs b/Content.Client/Light/EntitySystems/ExpendableLightSystem.cs index 8077406730..4d52b0933d 100644 --- a/Content.Client/Light/EntitySystems/ExpendableLightSystem.cs +++ b/Content.Client/Light/EntitySystems/ExpendableLightSystem.cs @@ -11,6 +11,7 @@ public sealed class ExpendableLightSystem : VisualizerSystem(uid, ExpendableLightVisuals.Behavior, out var lightBehaviourID, args.Component) && TryComp(uid, out var lightBehaviour)) { - lightBehaviour.StopLightBehaviour(); + _lightBehavior.StopLightBehaviour((uid, lightBehaviour)); if (!string.IsNullOrEmpty(lightBehaviourID)) { - lightBehaviour.StartLightBehaviour(lightBehaviourID); + _lightBehavior.StartLightBehaviour((uid, lightBehaviour), lightBehaviourID); } else if (TryComp(uid, out var light)) { diff --git a/Content.Client/Light/EntitySystems/LightBehaviorSystem.cs b/Content.Client/Light/EntitySystems/LightBehaviorSystem.cs index ca19d8522c..5b823946f7 100644 --- a/Content.Client/Light/EntitySystems/LightBehaviorSystem.cs +++ b/Content.Client/Light/EntitySystems/LightBehaviorSystem.cs @@ -1,7 +1,9 @@ using System.Linq; using Content.Client.Light.Components; using Robust.Client.GameObjects; +using Robust.Client.Animations; using Robust.Shared.Random; +using Robust.Shared.Animations; namespace Content.Client.Light.EntitySystems; @@ -36,23 +38,163 @@ public sealed class LightBehaviorSystem : EntitySystem } } - private void OnLightStartup(EntityUid uid, LightBehaviourComponent component, ComponentStartup args) + private void OnLightStartup(Entity entity, ref ComponentStartup args) { // TODO: Do NOT ensure component here. And use eventbus events instead... - EnsureComp(uid); + EnsureComp(entity); - foreach (var container in component.Animations) + foreach (var container in entity.Comp.Animations) { - container.LightBehaviour.Initialize(uid, _random, EntityManager); + container.LightBehaviour.Initialize(entity, _random, EntityManager); } // we need to initialize all behaviours before starting any - foreach (var container in component.Animations) + foreach (var container in entity.Comp.Animations) { if (container.LightBehaviour.Enabled) { - component.StartLightBehaviour(container.LightBehaviour.ID); + StartLightBehaviour(entity, container.LightBehaviour.ID); } } } + + /// + /// If we disable all the light behaviours we want to be able to revert the light to its original state. + /// + private void CopyLightSettings(Entity entity, string property) + { + if (EntityManager.TryGetComponent(entity, out PointLightComponent? light)) + { + var propertyValue = AnimationHelper.GetAnimatableProperty(light, property); + if (propertyValue != null) + { + entity.Comp.OriginalPropertyValues.Add(property, propertyValue); + } + } + else + { + Log.Warning($"{EntityManager.GetComponent(entity).EntityName} has a {nameof(LightBehaviourComponent)} but it has no {nameof(PointLightComponent)}! Check the prototype!"); + } + } + + /// + /// Start animating a light behaviour with the specified ID. If the specified ID is empty, it will start animating all light behaviour entries. + /// If specified light behaviours are already animating, calling this does nothing. + /// Multiple light behaviours can have the same ID. + /// + public void StartLightBehaviour(Entity entity, string id = "") + { + if (!EntityManager.TryGetComponent(entity, out AnimationPlayerComponent? animation)) + { + return; + } + + foreach (var container in entity.Comp.Animations) + { + if (container.LightBehaviour.ID == id || id == string.Empty) + { + if (!_player.HasRunningAnimation(entity, animation, LightBehaviourComponent.KeyPrefix + container.Key)) + { + CopyLightSettings(entity, container.LightBehaviour.Property); + container.LightBehaviour.UpdatePlaybackValues(container.Animation); + _player.Play(entity, container.Animation, LightBehaviourComponent.KeyPrefix + container.Key); + } + } + } + } + + /// + /// If any light behaviour with the specified ID is animating, then stop it. + /// If no ID is specified then all light behaviours will be stopped. + /// Multiple light behaviours can have the same ID. + /// + /// + /// Should the behaviour(s) also be removed permanently? + /// Should the light have its original settings applied? + public void StopLightBehaviour(Entity entity, string id = "", bool removeBehaviour = false, bool resetToOriginalSettings = false) + { + if (!EntityManager.TryGetComponent(entity, out AnimationPlayerComponent? animation)) + { + return; + } + + var comp = entity.Comp; + + var toRemove = new List(); + + foreach (var container in comp.Animations) + { + if (container.LightBehaviour.ID == id || id == string.Empty) + { + if (_player.HasRunningAnimation(entity, animation, LightBehaviourComponent.KeyPrefix + container.Key)) + { + _player.Stop(entity, animation, LightBehaviourComponent.KeyPrefix + container.Key); + } + + if (removeBehaviour) + { + toRemove.Add(container); + } + } + } + + foreach (var container in toRemove) + { + comp.Animations.Remove(container); + } + + if (resetToOriginalSettings && EntityManager.TryGetComponent(entity, out PointLightComponent? light)) + { + foreach (var (property, value) in comp.OriginalPropertyValues) + { + AnimationHelper.SetAnimatableProperty(light, property, value); + } + } + + comp.OriginalPropertyValues.Clear(); + } + + /// + /// Checks if at least one behaviour is running. + /// + /// Whether at least one behaviour is running, false if none is. + public bool HasRunningBehaviours(Entity entity) + { + //var uid = Owner; + if (!EntityManager.TryGetComponent(entity, out AnimationPlayerComponent? animation)) + { + return false; + } + + return entity.Comp.Animations.Any(container => _player.HasRunningAnimation(entity, animation, LightBehaviourComponent.KeyPrefix + container.Key)); + } + + /// + /// Add a new light behaviour to the component and start it immediately unless otherwise specified. + /// + public void AddNewLightBehaviour(Entity entity, LightBehaviourAnimationTrack behaviour, bool playImmediately = true) + { + var key = 0; + var comp = entity.Comp; + + while (comp.Animations.Any(x => x.Key == key)) + { + key++; + } + + var animation = new Animation() + { + AnimationTracks = { behaviour } + }; + + behaviour.Initialize(entity.Owner, _random, EntityManager); + + var container = new LightBehaviourComponent.AnimationContainer(key, animation, behaviour); + comp.Animations.Add(container); + + if (playImmediately) + { + StartLightBehaviour(entity, behaviour.ID); + } + } } diff --git a/Content.Client/Light/HandheldLightSystem.cs b/Content.Client/Light/HandheldLightSystem.cs index 7f18223811..ddd99c7c48 100644 --- a/Content.Client/Light/HandheldLightSystem.cs +++ b/Content.Client/Light/HandheldLightSystem.cs @@ -3,15 +3,15 @@ using Content.Client.Light.Components; using Content.Shared.Light; using Content.Shared.Light.Components; using Content.Shared.Toggleable; -using Robust.Client.Animations; using Robust.Client.GameObjects; -using Robust.Shared.Animations; +using Content.Client.Light.EntitySystems; namespace Content.Client.Light; public sealed class HandheldLightSystem : SharedHandheldLightSystem { [Dependency] private readonly SharedAppearanceSystem _appearance = default!; + [Dependency] private readonly LightBehaviorSystem _lightBehavior = default!; public override void Initialize() { @@ -41,9 +41,9 @@ public sealed class HandheldLightSystem : SharedHandheldLightSystem if (TryComp(uid, out var lightBehaviour)) { // Reset any running behaviour to reset the animated properties back to the original value, to avoid conflicts between resets - if (lightBehaviour.HasRunningBehaviours()) + if (_lightBehavior.HasRunningBehaviours((uid, lightBehaviour))) { - lightBehaviour.StopLightBehaviour(resetToOriginalSettings: true); + _lightBehavior.StopLightBehaviour((uid, lightBehaviour), resetToOriginalSettings: true); } if (!enabled) @@ -56,10 +56,10 @@ public sealed class HandheldLightSystem : SharedHandheldLightSystem case HandheldLightPowerStates.FullPower: break; // We just needed to reset all behaviours case HandheldLightPowerStates.LowPower: - lightBehaviour.StartLightBehaviour(component.RadiatingBehaviourId); + _lightBehavior.StartLightBehaviour((uid, lightBehaviour), component.RadiatingBehaviourId); break; case HandheldLightPowerStates.Dying: - lightBehaviour.StartLightBehaviour(component.BlinkingBehaviourId); + _lightBehavior.StartLightBehaviour((uid, lightBehaviour), component.BlinkingBehaviourId); break; } } From 84217011a958b67605d69812139c8367fd23121a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 11 Aug 2024 11:45:49 +1000 Subject: [PATCH 370/422] Update Credits (#30891) Co-authored-by: PJBot --- Resources/Credits/GitHub.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt index c3b51ce777..563008c4d0 100644 --- a/Resources/Credits/GitHub.txt +++ b/Resources/Credits/GitHub.txt @@ -1 +1 @@ -0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aeshus, Aexxie, Afrokada, Agoichi, Ahion, Aidenkrz, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlexUm418, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, ArkiveDev, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, Baptr0b0t, BasedUser, beck-thompson, BellwetherLogic, BGare, bhenrich, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blueDev2, Boaz1111, BobdaBiscuit, BombasterDS, brainfood1183, Brandon-Huu, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CaasGit, Callmore, CaptainSqrBeard, Carbonhell, CatTheSystem, Centronias, chairbender, Charlese2, chavonadelal, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, Ciac32, clement-or, Clyybber, Cojoke-dot, ColdAutumnRain, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, Deeeeja, deepdarkdepths, deepy, Delete69, deltanedas, DerbyX, dffdff2423, diraven, Doctor-Cpu, DoctorBeard, DogZeroX, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FoLoKe, fooberticus, Fortune117, freeman2651, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, geraeumig, Ghagliiarghii, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, graevy, GreyMario, gusxyz, Gyrandola, h3half, Hanzdegloker, Hardly3D, harikattar, HerCoyote23, hitomishirichan, Hmeister-real, HoofedEar, Hoolny, hord-brayden, hubismal, Hugal31, Huxellberger, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, Interrobang01, IProduceWidgets, ItsMeThom, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JIPDawg, JoeHammad1844, joelsgp, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTrotter, K-Dynamic, KaiShibaa, kalane15, kalanosh, Keer-Sar, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, laok233, lapatison, Leander-0, LetterN, Level10Cybermancer, lever1209, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, luckyshotpictures, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, Mangohydra, marboww, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, MjrLandWhale, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, NakataRin, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, nuke-haus, NULL882, OctoRocket, OldDanceJacket, onoira, osjarw, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, pigeonpeas, pissdemon, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, PursuitInAshes, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, RamZ, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, RumiTiger, Saakra, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, ShadowCommander, Shadowtheprotogen546, shampunj, SignalWalker, Simyon264, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, snebl, Snowni, snowsignal, SonicHDC, SoulFN, SoulSloth, SpaceManiac, SpeltIncorrectyl, SphiraI, spoogemonster, ssdaniel24, stalengd, Stealthbomber16, StrawberryMoses, superjj18, SweptWasTaken, Szunti, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, Terraspark4941, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, Theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, TokenStyle, tom-leys, tomasalves8, Tomeno, Tornado-Technology, tosatur, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UBlueberry, UKNOWH, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Vermidia, Verslebas, VigersRay, Visne, volundr-, Voomra, Vordenburg, vulppine, wafehling, WarMechanic, waylon531, weaversam8, whateverusername0, Willhelm53, Winkarst-cpu, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zonespace27, Zumorica, Zymem +0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aeshus, Aexxie, Afrokada, Agoichi, Ahion, Aidenkrz, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlexUm418, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, ArkiveDev, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, Baptr0b0t, BasedUser, beck-thompson, BellwetherLogic, BGare, bhenrich, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, blueDev2, Boaz1111, BobdaBiscuit, BombasterDS, brainfood1183, Brandon-Huu, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CaasGit, CaptainSqrBeard, Carbonhell, CatTheSystem, Centronias, chairbender, Charlese2, chavonadelal, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, Ciac32, Clyybber, Cojoke-dot, ColdAutumnRain, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, Deeeeja, deepdarkdepths, deepy, Delete69, deltanedas, DerbyX, dffdff2423, diraven, Doctor-Cpu, DoctorBeard, DogZeroX, dontbetank, Doomsdrayk, Doru991, DoubleRiceEddiedd, DoutorWhite, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FoLoKe, fooberticus, Fortune117, freeman2651, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, geraeumig, Ghagliiarghii, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, graevy, GreyMario, gusxyz, Gyrandola, h3half, Hanzdegloker, Hardly3D, harikattar, HerCoyote23, hitomishirichan, Hmeister-real, HoofedEar, Hoolny, hord-brayden, hubismal, Hugal31, Huxellberger, iacore, IamVelcroboy, Ian321, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, Interrobang01, IProduceWidgets, ItsMeThom, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JIPDawg, JoeHammad1844, joelsgp, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTrotter, K-Dynamic, KaiShibaa, kalane15, kalanosh, Keer-Sar, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, laok233, lapatison, Leander-0, LetterN, Level10Cybermancer, lever1209, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, luckyshotpictures, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, Mangohydra, marboww, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, MerrytheManokit, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, MjrLandWhale, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, MureixloI, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, NakataRin, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, nuke-haus, NULL882, OctoRocket, OldDanceJacket, onoira, osjarw, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, pigeonpeas, pissdemon, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, PursuitInAshes, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, RamZ, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, RumiTiger, Saakra, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, ShadowCommander, Shadowtheprotogen546, shampunj, SignalWalker, Simyon264, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, slarticodefast, Slava0135, snebl, Snowni, snowsignal, SonicHDC, SoulFN, SoulSloth, SpaceManiac, SpeltIncorrectyl, SphiraI, spoogemonster, ssdaniel24, stalengd, Stealthbomber16, StrawberryMoses, superjj18, SweptWasTaken, Szunti, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, Terraspark4941, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, Theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, TokenStyle, tom-leys, tomasalves8, Tomeno, Tornado-Technology, tosatur, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UBlueberry, UKNOWH, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Vermidia, Verslebas, VigersRay, Visne, volundr-, Voomra, Vordenburg, vulppine, wafehling, WarMechanic, waylon531, weaversam8, whateverusername0, Willhelm53, Winkarst-cpu, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, Zealith-Gamer, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zonespace27, Zumorica, Zymem From 9be61bfaa5a4bee1ca4f3d5e5c40a69d66e4cc2a Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sun, 11 Aug 2024 12:26:32 +1000 Subject: [PATCH 371/422] Make followed session-specific (#30770) * Make followed session-specific * misimport --- .../Follower/Components/FollowedComponent.cs | 2 ++ Content.Shared/Follower/FollowerSystem.cs | 17 +++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/Content.Shared/Follower/Components/FollowedComponent.cs b/Content.Shared/Follower/Components/FollowedComponent.cs index 7c2ca0efbf..b06e445417 100644 --- a/Content.Shared/Follower/Components/FollowedComponent.cs +++ b/Content.Shared/Follower/Components/FollowedComponent.cs @@ -10,6 +10,8 @@ namespace Content.Shared.Follower.Components; [Access(typeof(FollowerSystem))] public sealed partial class FollowedComponent : Component { + public override bool SessionSpecific => true; + [DataField, AutoNetworkedField] public HashSet Following = new(); } diff --git a/Content.Shared/Follower/FollowerSystem.cs b/Content.Shared/Follower/FollowerSystem.cs index 8c35617e2c..0c7bc99c46 100644 --- a/Content.Shared/Follower/FollowerSystem.cs +++ b/Content.Shared/Follower/FollowerSystem.cs @@ -9,6 +9,7 @@ using Content.Shared.Movement.Pulling.Events; using Content.Shared.Tag; using Content.Shared.Verbs; using Robust.Shared.Containers; +using Robust.Shared.GameStates; using Robust.Shared.Map; using Robust.Shared.Map.Events; using Robust.Shared.Network; @@ -38,11 +39,27 @@ public sealed class FollowerSystem : EntitySystem SubscribeLocalEvent(OnPullStarted); SubscribeLocalEvent(OnFollowerTerminating); + SubscribeLocalEvent(OnFollowedAttempt); SubscribeLocalEvent(OnGotEquippedHand); SubscribeLocalEvent(OnFollowedTerminating); SubscribeLocalEvent(OnBeforeSave); } + private void OnFollowedAttempt(Entity ent, ref ComponentGetStateAttemptEvent args) + { + if (args.Cancelled) + return; + + // Clientside VV stay losing + var playerEnt = args.Player?.AttachedEntity; + + if (playerEnt == null || + !ent.Comp.Following.Contains(playerEnt.Value) && !HasComp(playerEnt.Value)) + { + args.Cancelled = true; + } + } + private void OnBeforeSave(BeforeSaveEvent ev) { // Some followers will not be map savable. This ensures that maps don't get saved with empty/invalid From d7c3ba84094c2814617481c4bd7813e0defc13f9 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sun, 11 Aug 2024 12:28:07 +1000 Subject: [PATCH 372/422] Add some container checks (#30896) Climbable container probably getting checked up the callstack so just check these ones. --- Content.Shared/Climbing/Systems/ClimbSystem.cs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Content.Shared/Climbing/Systems/ClimbSystem.cs b/Content.Shared/Climbing/Systems/ClimbSystem.cs index 635bf36049..9b77d039f4 100644 --- a/Content.Shared/Climbing/Systems/ClimbSystem.cs +++ b/Content.Shared/Climbing/Systems/ClimbSystem.cs @@ -14,6 +14,7 @@ using Content.Shared.Popups; using Content.Shared.Stunnable; using Content.Shared.Verbs; using Robust.Shared.Audio.Systems; +using Robust.Shared.Containers; using Robust.Shared.Physics; using Robust.Shared.Physics.Collision.Shapes; using Robust.Shared.Physics.Components; @@ -34,6 +35,7 @@ public sealed partial class ClimbSystem : VirtualController [Dependency] private readonly FixtureSystem _fixtureSystem = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private readonly SharedContainerSystem _containers = default!; [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!; [Dependency] private readonly SharedPopupSystem _popupSystem = default!; [Dependency] private readonly SharedPhysicsSystem _physics = default!; @@ -450,6 +452,12 @@ public sealed partial class ClimbSystem : VirtualController return false; } + if (_containers.IsEntityInContainer(user)) + { + reason = Loc.GetString("comp-climbable-cant-reach"); + return false; + } + reason = string.Empty; return true; } @@ -487,6 +495,12 @@ public sealed partial class ClimbSystem : VirtualController return false; } + if (_containers.IsEntityInContainer(user) || _containers.IsEntityInContainer(dragged)) + { + reason = Loc.GetString("comp-climbable-cant-reach"); + return false; + } + reason = string.Empty; return true; } From 2f77d0d4f380ab50c4b66dd2349949c0da184809 Mon Sep 17 00:00:00 2001 From: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> Date: Sat, 10 Aug 2024 19:29:44 -0700 Subject: [PATCH 373/422] Add a component that inserts the held item when no interaction happens on the stored item (#29823) * Insert when held item has no interaction with stored item * Decouple inserting on failure * Add component that stores the used entity when no interaction happened * Add prediction --- .../Interaction/SharedInteractionSystem.cs | 43 ++++++++++++++----- .../StoreAfterFailedInteractComponent.cs | 8 ++++ .../EntitySystems/SharedStorageSystem.cs | 40 ++++++++++------- .../StoreAfterFailedInteractSystem.cs | 21 +++++++++ .../Events/StorageInsertFailedEvent.cs | 6 +++ 5 files changed, 93 insertions(+), 25 deletions(-) create mode 100644 Content.Shared/Storage/Components/StoreAfterFailedInteractComponent.cs create mode 100644 Content.Shared/Storage/EntitySystems/StoreAfterFailedInteractSystem.cs create mode 100644 Content.Shared/Storage/Events/StorageInsertFailedEvent.cs diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs index 972fa389e4..e8cc831e49 100644 --- a/Content.Shared/Interaction/SharedInteractionSystem.cs +++ b/Content.Shared/Interaction/SharedInteractionSystem.cs @@ -918,11 +918,21 @@ namespace Content.Shared.Interaction } /// - /// Uses a item/object on an entity + /// Uses an item/object on an entity /// Finds components with the InteractUsing interface and calls their function /// NOTE: Does not have an InRangeUnobstructed check /// - public void InteractUsing( + /// User doing the interaction. + /// Item being used on the . + /// Entity getting interacted with by the using the + /// entity. + /// The location that the clicked. + /// Whether to check that the can interact with the + /// . + /// Whether to check that the can use the + /// entity. + /// True if the interaction was handled. Otherwise, false. + public bool InteractUsing( EntityUid user, EntityUid used, EntityUid target, @@ -931,10 +941,10 @@ namespace Content.Shared.Interaction bool checkCanUse = true) { if (checkCanInteract && !_actionBlockerSystem.CanInteract(user, target)) - return; + return false; if (checkCanUse && !_actionBlockerSystem.CanUseHeldEntity(user, used)) - return; + return false; _adminLogger.Add( LogType.InteractUsing, @@ -942,7 +952,7 @@ namespace Content.Shared.Interaction $"{ToPrettyString(user):user} interacted with {ToPrettyString(target):target} using {ToPrettyString(used):used}"); if (RangedInteractDoBefore(user, used, target, clickLocation, true)) - return; + return true; // all interactions should only happen when in range / unobstructed, so no range check is needed var interactUsingEvent = new InteractUsingEvent(user, used, target, clickLocation); @@ -951,15 +961,24 @@ namespace Content.Shared.Interaction DoContactInteraction(user, target, interactUsingEvent); // Contact interactions are currently only used for forensics, so we don't raise used -> target if (interactUsingEvent.Handled) - return; + return true; - InteractDoAfter(user, used, target, clickLocation, canReach: true); + if (InteractDoAfter(user, used, target, clickLocation, canReach: true)) + return true; + return false; } /// /// Used when clicking on an entity resulted in no other interaction. Used for low-priority interactions. /// - public void InteractDoAfter(EntityUid user, EntityUid used, EntityUid? target, EntityCoordinates clickLocation, bool canReach) + /// + /// + /// + /// + /// Whether the is in range of the . + /// + /// True if the interaction was handled. Otherwise, false. + public bool InteractDoAfter(EntityUid user, EntityUid used, EntityUid? target, EntityCoordinates clickLocation, bool canReach) { if (target is { Valid: false }) target = null; @@ -974,10 +993,10 @@ namespace Content.Shared.Interaction } if (afterInteractEvent.Handled) - return; + return true; if (target == null) - return; + return false; var afterInteractUsingEvent = new AfterInteractUsingEvent(user, used, target, clickLocation, canReach); RaiseLocalEvent(target.Value, afterInteractUsingEvent); @@ -988,6 +1007,10 @@ namespace Content.Shared.Interaction DoContactInteraction(user, target, afterInteractUsingEvent); // Contact interactions are currently only used for forensics, so we don't raise used -> target } + + if (afterInteractUsingEvent.Handled) + return true; + return false; } #region ActivateItemInWorld diff --git a/Content.Shared/Storage/Components/StoreAfterFailedInteractComponent.cs b/Content.Shared/Storage/Components/StoreAfterFailedInteractComponent.cs new file mode 100644 index 0000000000..578da52dfc --- /dev/null +++ b/Content.Shared/Storage/Components/StoreAfterFailedInteractComponent.cs @@ -0,0 +1,8 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.Storage.Components; + +[RegisterComponent, NetworkedComponent] +public sealed partial class StoreAfterFailedInteractComponent : Component +{ +} diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs index 8ee08f7e48..2689d7750d 100644 --- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs +++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs @@ -22,6 +22,7 @@ using Content.Shared.Popups; using Content.Shared.Stacks; using Content.Shared.Storage.Components; using Content.Shared.Timing; +using Content.Shared.Storage.Events; using Content.Shared.Verbs; using Content.Shared.Whitelist; using Robust.Shared.Audio; @@ -366,7 +367,7 @@ public abstract class SharedStorageSystem : EntitySystem if (HasComp(uid)) return; - PlayerInsertHeldEntity(uid, args.User, storageComp); + PlayerInsertHeldEntity((uid, storageComp), args.User); // Always handle it, even if insertion fails. // We don't want to trigger any AfterInteract logic here. // Example issue would be placing wires if item doesn't fit in backpack. @@ -606,7 +607,15 @@ public abstract class SharedStorageSystem : EntitySystem $"{ToPrettyString(player):player} is interacting with {ToPrettyString(item):item} while it is stored in {ToPrettyString(storage):storage} using {ToPrettyString(player.Comp.ActiveHandEntity):used}"); // Else, interact using the held item - _interactionSystem.InteractUsing(player, player.Comp.ActiveHandEntity.Value, item, Transform(item).Coordinates, checkCanInteract: false); + if (_interactionSystem.InteractUsing(player, + player.Comp.ActiveHandEntity.Value, + item, + Transform(item).Coordinates, + checkCanInteract: false)) + return; + + var failedEv = new StorageInsertFailedEvent((storage, storage.Comp), (player, player.Comp)); + RaiseLocalEvent(storage, ref failedEv); } private void OnSetItemLocation(StorageSetItemLocationEvent msg, EntitySessionEventArgs args) @@ -988,35 +997,36 @@ public abstract class SharedStorageSystem : EntitySystem /// /// Inserts an entity into storage from the player's active hand /// - /// - /// The player to insert an entity from - /// - /// true if inserted, false otherwise - public bool PlayerInsertHeldEntity(EntityUid uid, EntityUid player, StorageComponent? storageComp = null) + /// The storage entity and component to insert into. + /// The player and hands component to insert the held entity from. + /// True if inserted, otherwise false. + public bool PlayerInsertHeldEntity(Entity ent, Entity player) { - if (!Resolve(uid, ref storageComp) || !TryComp(player, out HandsComponent? hands) || hands.ActiveHandEntity == null) + if (!Resolve(ent.Owner, ref ent.Comp) + || !Resolve(player.Owner, ref player.Comp) + || player.Comp.ActiveHandEntity == null) return false; - var toInsert = hands.ActiveHandEntity; + var toInsert = player.Comp.ActiveHandEntity; - if (!CanInsert(uid, toInsert.Value, out var reason, storageComp)) + if (!CanInsert(ent, toInsert.Value, out var reason, ent.Comp)) { - _popupSystem.PopupClient(Loc.GetString(reason ?? "comp-storage-cant-insert"), uid, player); + _popupSystem.PopupClient(Loc.GetString(reason ?? "comp-storage-cant-insert"), ent, player); return false; } - if (!_sharedHandsSystem.CanDrop(player, toInsert.Value, hands)) + if (!_sharedHandsSystem.CanDrop(player, toInsert.Value, player.Comp)) { - _popupSystem.PopupClient(Loc.GetString("comp-storage-cant-drop", ("entity", toInsert.Value)), uid, player); + _popupSystem.PopupClient(Loc.GetString("comp-storage-cant-drop", ("entity", toInsert.Value)), ent, player); return false; } - return PlayerInsertEntityInWorld((uid, storageComp), player, toInsert.Value); + return PlayerInsertEntityInWorld((ent, ent.Comp), player, toInsert.Value); } /// /// Inserts an Entity () in the world into storage, informing if it fails. - /// is *NOT* held, see . + /// is *NOT* held, see . /// /// /// The player to insert an entity with diff --git a/Content.Shared/Storage/EntitySystems/StoreAfterFailedInteractSystem.cs b/Content.Shared/Storage/EntitySystems/StoreAfterFailedInteractSystem.cs new file mode 100644 index 0000000000..77f72806f4 --- /dev/null +++ b/Content.Shared/Storage/EntitySystems/StoreAfterFailedInteractSystem.cs @@ -0,0 +1,21 @@ +using Content.Shared.Storage.Components; +using Content.Shared.Storage.Events; + +namespace Content.Shared.Storage.EntitySystems; + +public sealed class StoreAfterFailedInteractSystem : EntitySystem +{ + [Dependency] private readonly SharedStorageSystem _storage = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnStorageInsertFailed); + } + + private void OnStorageInsertFailed(Entity ent, ref StorageInsertFailedEvent args) + { + _storage.PlayerInsertHeldEntity(args.Storage, args.Player); + } +} diff --git a/Content.Shared/Storage/Events/StorageInsertFailedEvent.cs b/Content.Shared/Storage/Events/StorageInsertFailedEvent.cs new file mode 100644 index 0000000000..50f759e43f --- /dev/null +++ b/Content.Shared/Storage/Events/StorageInsertFailedEvent.cs @@ -0,0 +1,6 @@ +using Content.Shared.Hands.Components; + +namespace Content.Shared.Storage.Events; + +[ByRefEvent] +public record struct StorageInsertFailedEvent(Entity Storage, Entity Player); From c25c5ec666e8b97f9e50c50a838f291ef73c489a Mon Sep 17 00:00:00 2001 From: Mervill Date: Sat, 10 Aug 2024 19:39:37 -0700 Subject: [PATCH 374/422] Remove uses of Component.Owner from AmbientSoundSystem (#30842) Remove Component.Owner from AmbientSoundSystem --- Content.Client/Audio/AmbientSoundSystem.cs | 41 ++++++++++++---------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/Content.Client/Audio/AmbientSoundSystem.cs b/Content.Client/Audio/AmbientSoundSystem.cs index 0206017bae..ca6336b91b 100644 --- a/Content.Client/Audio/AmbientSoundSystem.cs +++ b/Content.Client/Audio/AmbientSoundSystem.cs @@ -57,7 +57,7 @@ public sealed class AmbientSoundSystem : SharedAmbientSoundSystem /// private int MaxSingleSound => (int) (_maxAmbientCount / (16.0f / 6.0f)); - private readonly Dictionary _playingSounds = new(); + private readonly Dictionary, (EntityUid? Stream, SoundSpecifier Sound, string Path)> _playingSounds = new(); private readonly Dictionary _playingCount = new(); public bool OverlayEnabled @@ -107,7 +107,7 @@ public sealed class AmbientSoundSystem : SharedAmbientSoundSystem private void OnShutdown(EntityUid uid, AmbientSoundComponent component, ComponentShutdown args) { - if (!_playingSounds.Remove(component, out var sound)) + if (!_playingSounds.Remove((uid, component), out var sound)) return; _audio.Stop(sound.Stream); @@ -120,13 +120,13 @@ public sealed class AmbientSoundSystem : SharedAmbientSoundSystem { _ambienceVolume = SharedAudioSystem.GainToVolume(value); - foreach (var (comp, values) in _playingSounds) + foreach (var (ent, values) in _playingSounds) { if (values.Stream == null) continue; var stream = values.Stream; - _audio.SetVolume(stream, _params.Volume + comp.Volume + _ambienceVolume); + _audio.SetVolume(stream, _params.Volume + ent.Comp.Volume + _ambienceVolume); } } private void SetCooldown(float value) => _cooldown = value; @@ -165,7 +165,7 @@ public sealed class AmbientSoundSystem : SharedAmbientSoundSystem if (_gameTiming.CurTime < _targetTime) return; - _targetTime = _gameTiming.CurTime+TimeSpan.FromSeconds(_cooldown); + _targetTime = _gameTiming.CurTime + TimeSpan.FromSeconds(_cooldown); var player = _playerManager.LocalEntity; if (!EntityManager.TryGetComponent(player, out TransformComponent? xform)) @@ -190,7 +190,7 @@ public sealed class AmbientSoundSystem : SharedAmbientSoundSystem private readonly struct QueryState { - public readonly Dictionary> SourceDict = new(); + public readonly Dictionary)>> SourceDict = new(); public readonly Vector2 MapPos; public readonly TransformComponent Player; public readonly SharedTransformSystem TransformSystem; @@ -224,11 +224,11 @@ public sealed class AmbientSoundSystem : SharedAmbientSoundSystem if (ambientComp.Sound is SoundPathSpecifier path) key = path.Path.ToString(); else - key = ((SoundCollectionSpecifier) ambientComp.Sound).Collection ?? string.Empty; + key = ((SoundCollectionSpecifier)ambientComp.Sound).Collection ?? string.Empty; // Prioritize far away & loud sounds. var importance = range * (ambientComp.Volume + 32); - state.SourceDict.GetOrNew(key).Add((importance, ambientComp)); + state.SourceDict.GetOrNew(key).Add((importance, (value.Uid, ambientComp))); return true; } @@ -242,16 +242,18 @@ public sealed class AmbientSoundSystem : SharedAmbientSoundSystem var mapPos = _xformSystem.GetMapCoordinates(playerXform); // Remove out-of-range ambiences - foreach (var (comp, sound) in _playingSounds) + foreach (var (ent, sound) in _playingSounds) { - var entity = comp.Owner; + //var entity = comp.Owner; + var owner = ent.Owner; + var comp = ent.Comp; if (comp.Enabled && // Don't keep playing sounds that have changed since. sound.Sound == comp.Sound && - query.TryGetComponent(entity, out var xform) && + query.TryGetComponent(owner, out var xform) && xform.MapID == playerXform.MapID && - !metaQuery.GetComponent(entity).EntityPaused) + !metaQuery.GetComponent(owner).EntityPaused) { // TODO: This is just trydistance for coordinates. var distance = (xform.ParentUid == playerXform.ParentUid) @@ -263,7 +265,7 @@ public sealed class AmbientSoundSystem : SharedAmbientSoundSystem } _audio.Stop(sound.Stream); - _playingSounds.Remove(comp); + _playingSounds.Remove(ent); _playingCount[sound.Path] -= 1; if (_playingCount[sound.Path] == 0) _playingCount.Remove(sound.Path); @@ -278,7 +280,7 @@ public sealed class AmbientSoundSystem : SharedAmbientSoundSystem _treeSys.QueryAabb(ref state, Callback, mapPos.MapId, worldAabb); // Add in range ambiences - foreach (var (key, sources) in state.SourceDict) + foreach (var (key, sourceList) in state.SourceDict) { if (_playingSounds.Count >= _maxAmbientCount) break; @@ -286,13 +288,14 @@ public sealed class AmbientSoundSystem : SharedAmbientSoundSystem if (_playingCount.TryGetValue(key, out var playingCount) && playingCount >= MaxSingleSound) continue; - sources.Sort(static (a, b) => b.Importance.CompareTo(a.Importance)); + sourceList.Sort(static (a, b) => b.Importance.CompareTo(a.Importance)); - foreach (var (_, comp) in sources) + foreach (var (_, sourceEntity) in sourceList) { - var uid = comp.Owner; + var uid = sourceEntity.Owner; + var comp = sourceEntity.Comp; - if (_playingSounds.ContainsKey(comp) || + if (_playingSounds.ContainsKey(sourceEntity) || metaQuery.GetComponent(uid).EntityPaused) continue; @@ -303,7 +306,7 @@ public sealed class AmbientSoundSystem : SharedAmbientSoundSystem .WithMaxDistance(comp.Range); var stream = _audio.PlayEntity(comp.Sound, Filter.Local(), uid, false, audioParams); - _playingSounds[comp] = (stream.Value.Entity, comp.Sound, key); + _playingSounds[sourceEntity] = (stream.Value.Entity, comp.Sound, key); playingCount++; if (_playingSounds.Count >= _maxAmbientCount) From 220aff21eb51cb69ea12a209ec330e40a5e045db Mon Sep 17 00:00:00 2001 From: Scribbles0 <91828755+Scribbles0@users.noreply.github.com> Date: Sat, 10 Aug 2024 20:05:54 -0700 Subject: [PATCH 375/422] Melee Executions (#30104) * melee executions * fix damage bug * cleanup * address reviews hopefully * resistance bypass mechanic * component changes * self executions (not finished yet) * self execs part two * ok i fixed things (still not finished) * finish everything * review stuff * nuke if (kind = special) * more review stuffs * Make suicide system much less hardcoded and make much more use of events * Fix a dumb bug I introduced * self execution popups * Integration tests * Why did they even take 0.5 blunt damage? * More consistent integration tests * Destructive equals true * Allow it to dirty-dispose * IS THIS WHAT YOU WANT? * FRESH AND CLEAN * modifier to multiplier * don't jinx the integration tests * no file-scoped namespace * Move the rest of execution to shared, create SuicideGhostEvent * handled * Get rid of unused code and add a comment * ghost before suicide * stop cat suicides * popup fix + small suicide change * make it a bit better --------- Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com> --- .../Tests/Commands/SuicideCommandTests.cs | 365 ++++++++++++++++++ .../Chat/Commands/SuicideCommand.cs | 15 +- Content.Server/Chat/SuicideSystem.cs | 243 ++++++------ .../EntitySystems/TriggerSystem.Mobstate.cs | 14 +- .../EntitySystems/KitchenSpikeSystem.cs | 55 +-- .../Kitchen/EntitySystems/MicrowaveSystem.cs | 20 +- .../Materials/MaterialReclaimerSystem.cs | 14 +- .../BiomassReclaimerSystem.cs | 6 +- Content.Server/Morgue/CrematoriumSystem.cs | 6 +- Content.Shared/Chat/SharedSuicideSystem.cs | 67 ++++ Content.Shared/Execution/DoAfterEvent.cs | 9 + .../Execution/ExecutionComponent.cs | 77 ++++ .../Execution/SharedExecutionSystem.cs | 234 +++++++++++ .../Interaction/Events/SuicideEvent.cs | 79 ++-- Content.Shared/Mind/SharedMindSystem.cs | 8 +- .../Weapons/Melee/Events/MeleeHitEvent.cs | 2 +- .../Weapons/Melee/MeleeWeaponComponent.cs | 6 + .../Weapons/Melee/SharedMeleeWeaponSystem.cs | 16 +- .../Locale/en-US/execution/execution.ftl | 17 + .../Objects/Materials/crystal_shard.yml | 2 + .../Entities/Objects/Materials/shards.yml | 2 + .../Entities/Objects/Misc/broken_bottle.yml | 2 + .../Objects/Weapons/Melee/armblade.yml | 2 + .../Objects/Weapons/Melee/fireaxe.yml | 2 + .../Entities/Objects/Weapons/Melee/knife.yml | 2 + .../Entities/Objects/Weapons/Melee/sword.yml | 2 + 26 files changed, 1048 insertions(+), 219 deletions(-) create mode 100644 Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs create mode 100644 Content.Shared/Chat/SharedSuicideSystem.cs create mode 100644 Content.Shared/Execution/DoAfterEvent.cs create mode 100644 Content.Shared/Execution/ExecutionComponent.cs create mode 100644 Content.Shared/Execution/SharedExecutionSystem.cs create mode 100644 Resources/Locale/en-US/execution/execution.ftl diff --git a/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs b/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs new file mode 100644 index 0000000000..540e86c650 --- /dev/null +++ b/Content.IntegrationTests/Tests/Commands/SuicideCommandTests.cs @@ -0,0 +1,365 @@ +using System.Linq; +using Content.Shared.Damage; +using Content.Shared.Damage.Prototypes; +using Content.Shared.Execution; +using Content.Shared.FixedPoint; +using Content.Shared.Ghost; +using Content.Shared.Hands.Components; +using Content.Shared.Hands.EntitySystems; +using Content.Shared.Mind; +using Content.Shared.Mobs.Components; +using Content.Shared.Mobs.Systems; +using Content.Shared.Tag; +using Robust.Server.GameObjects; +using Robust.Server.Player; +using Robust.Shared.Console; +using Robust.Shared.GameObjects; +using Robust.Shared.Prototypes; + +namespace Content.IntegrationTests.Tests.Commands; + +[TestFixture] +public sealed class SuicideCommandTests +{ + + [TestPrototypes] + private const string Prototypes = @" +- type: entity + id: SharpTestObject + name: very sharp test object + components: + - type: Item + - type: MeleeWeapon + damage: + types: + Slash: 5 + - type: Execution + +- type: entity + id: MixedDamageTestObject + name: mixed damage test object + components: + - type: Item + - type: MeleeWeapon + damage: + types: + Slash: 5 + Blunt: 5 + - type: Execution + +- type: entity + id: TestMaterialReclaimer + name: test version of the material reclaimer + components: + - type: MaterialReclaimer"; + + /// + /// Run the suicide command in the console + /// Should successfully kill the player and ghost them + /// + [Test] + public async Task TestSuicide() + { + await using var pair = await PoolManager.GetServerClient(new PoolSettings + { + Connected = true, + Dirty = true, + DummyTicker = false + }); + var server = pair.Server; + var consoleHost = server.ResolveDependency(); + var entManager = server.ResolveDependency(); + var playerMan = server.ResolveDependency(); + var mindSystem = entManager.System(); + var mobStateSystem = entManager.System(); + + // We need to know the player and whether they can be hurt, killed, and whether they have a mind + var player = playerMan.Sessions.First().AttachedEntity!.Value; + var mind = mindSystem.GetMind(player); + + MindComponent mindComponent = default; + MobStateComponent mobStateComp = default; + await server.WaitPost(() => + { + if (mind != null) + mindComponent = entManager.GetComponent(mind.Value); + + mobStateComp = entManager.GetComponent(player); + }); + + + // Check that running the suicide command kills the player + // and properly ghosts them without them being able to return to their body + await server.WaitAssertion(() => + { + consoleHost.GetSessionShell(playerMan.Sessions.First()).ExecuteCommand("suicide"); + Assert.Multiple(() => + { + Assert.That(mobStateSystem.IsDead(player, mobStateComp)); + Assert.That(entManager.TryGetComponent(mindComponent.CurrentEntity, out var ghostComp) && + !ghostComp.CanReturnToBody); + }); + }); + + await pair.CleanReturnAsync(); + } + + /// + /// Run the suicide command while the player is already injured + /// This should only deal as much damage as necessary to get to the dead threshold + /// + [Test] + public async Task TestSuicideWhileDamaged() + { + await using var pair = await PoolManager.GetServerClient(new PoolSettings + { + Connected = true, + Dirty = true, + DummyTicker = false + }); + var server = pair.Server; + var consoleHost = server.ResolveDependency(); + var entManager = server.ResolveDependency(); + var playerMan = server.ResolveDependency(); + var protoMan = server.ResolveDependency(); + + var damageableSystem = entManager.System(); + var mindSystem = entManager.System(); + var mobStateSystem = entManager.System(); + + // We need to know the player and whether they can be hurt, killed, and whether they have a mind + var player = playerMan.Sessions.First().AttachedEntity!.Value; + var mind = mindSystem.GetMind(player); + + MindComponent mindComponent = default; + MobStateComponent mobStateComp = default; + MobThresholdsComponent mobThresholdsComp = default; + DamageableComponent damageableComp = default; + await server.WaitPost(() => + { + if (mind != null) + mindComponent = entManager.GetComponent(mind.Value); + + mobStateComp = entManager.GetComponent(player); + mobThresholdsComp = entManager.GetComponent(player); + damageableComp = entManager.GetComponent(player); + }); + + if (protoMan.TryIndex("Slash", out var slashProto)) + damageableSystem.TryChangeDamage(player, new DamageSpecifier(slashProto, FixedPoint2.New(46.5))); + + // Check that running the suicide command kills the player + // and properly ghosts them without them being able to return to their body + // and that all the damage is concentrated in the Slash category + await server.WaitAssertion(() => + { + consoleHost.GetSessionShell(playerMan.Sessions.First()).ExecuteCommand("suicide"); + var lethalDamageThreshold = mobThresholdsComp.Thresholds.Keys.Last(); + + Assert.Multiple(() => + { + Assert.That(mobStateSystem.IsDead(player, mobStateComp)); + Assert.That(entManager.TryGetComponent(mindComponent.CurrentEntity, out var ghostComp) && + !ghostComp.CanReturnToBody); + Assert.That(damageableComp.Damage.GetTotal(), Is.EqualTo(lethalDamageThreshold)); + }); + }); + + await pair.CleanReturnAsync(); + } + + /// + /// Run the suicide command in the console + /// Should only ghost the player but not kill them + /// + [Test] + public async Task TestSuicideWhenCannotSuicide() + { + await using var pair = await PoolManager.GetServerClient(new PoolSettings + { + Connected = true, + Dirty = true, + DummyTicker = false + }); + var server = pair.Server; + var consoleHost = server.ResolveDependency(); + var entManager = server.ResolveDependency(); + var playerMan = server.ResolveDependency(); + var mindSystem = entManager.System(); + var mobStateSystem = entManager.System(); + var tagSystem = entManager.System(); + + // We need to know the player and whether they can be hurt, killed, and whether they have a mind + var player = playerMan.Sessions.First().AttachedEntity!.Value; + var mind = mindSystem.GetMind(player); + MindComponent mindComponent = default; + MobStateComponent mobStateComp = default; + await server.WaitPost(() => + { + if (mind != null) + mindComponent = entManager.GetComponent(mind.Value); + mobStateComp = entManager.GetComponent(player); + }); + + tagSystem.AddTag(player, "CannotSuicide"); + + // Check that running the suicide command kills the player + // and properly ghosts them without them being able to return to their body + await server.WaitAssertion(() => + { + consoleHost.GetSessionShell(playerMan.Sessions.First()).ExecuteCommand("suicide"); + Assert.Multiple(() => + { + Assert.That(mobStateSystem.IsAlive(player, mobStateComp)); + Assert.That(entManager.TryGetComponent(mindComponent.CurrentEntity, out var ghostComp) && + !ghostComp.CanReturnToBody); + }); + }); + + await pair.CleanReturnAsync(); + } + + + /// + /// Run the suicide command while the player is holding an execution-capable weapon + /// + [Test] + public async Task TestSuicideByHeldItem() + { + await using var pair = await PoolManager.GetServerClient(new PoolSettings + { + Connected = true, + Dirty = true, + DummyTicker = false + }); + var server = pair.Server; + var consoleHost = server.ResolveDependency(); + var entManager = server.ResolveDependency(); + var playerMan = server.ResolveDependency(); + + var handsSystem = entManager.System(); + var mindSystem = entManager.System(); + var mobStateSystem = entManager.System(); + var transformSystem = entManager.System(); + + // We need to know the player and whether they can be hurt, killed, and whether they have a mind + var player = playerMan.Sessions.First().AttachedEntity!.Value; + var mind = mindSystem.GetMind(player); + + MindComponent mindComponent = default; + MobStateComponent mobStateComp = default; + MobThresholdsComponent mobThresholdsComp = default; + DamageableComponent damageableComp = default; + HandsComponent handsComponent = default; + await server.WaitPost(() => + { + if (mind != null) + mindComponent = entManager.GetComponent(mind.Value); + + mobStateComp = entManager.GetComponent(player); + mobThresholdsComp = entManager.GetComponent(player); + damageableComp = entManager.GetComponent(player); + handsComponent = entManager.GetComponent(player); + }); + + // Spawn the weapon of choice and put it in the player's hands + await server.WaitPost(() => + { + var item = entManager.SpawnEntity("SharpTestObject", transformSystem.GetMapCoordinates(player)); + Assert.That(handsSystem.TryPickup(player, item, handsComponent.ActiveHand!)); + entManager.TryGetComponent(item, out var executionComponent); + Assert.That(executionComponent, Is.Not.EqualTo(null)); + }); + + // Check that running the suicide command kills the player + // and properly ghosts them without them being able to return to their body + // and that all the damage is concentrated in the Slash category + await server.WaitAssertion(() => + { + consoleHost.GetSessionShell(playerMan.Sessions.First()).ExecuteCommand("suicide"); + var lethalDamageThreshold = mobThresholdsComp.Thresholds.Keys.Last(); + + Assert.Multiple(() => + { + Assert.That(mobStateSystem.IsDead(player, mobStateComp)); + Assert.That(entManager.TryGetComponent(mindComponent.CurrentEntity, out var ghostComp) && + !ghostComp.CanReturnToBody); + Assert.That(damageableComp.Damage.DamageDict["Slash"], Is.EqualTo(lethalDamageThreshold)); + }); + }); + + await pair.CleanReturnAsync(); + } + + /// + /// Run the suicide command while the player is holding an execution-capable weapon + /// with damage spread between slash and blunt + /// + [Test] + public async Task TestSuicideByHeldItemSpreadDamage() + { + await using var pair = await PoolManager.GetServerClient(new PoolSettings + { + Connected = true, + Dirty = true, + DummyTicker = false + }); + var server = pair.Server; + var consoleHost = server.ResolveDependency(); + var entManager = server.ResolveDependency(); + var playerMan = server.ResolveDependency(); + + var handsSystem = entManager.System(); + var mindSystem = entManager.System(); + var mobStateSystem = entManager.System(); + var transformSystem = entManager.System(); + + // We need to know the player and whether they can be hurt, killed, and whether they have a mind + var player = playerMan.Sessions.First().AttachedEntity!.Value; + var mind = mindSystem.GetMind(player); + + MindComponent mindComponent = default; + MobStateComponent mobStateComp = default; + MobThresholdsComponent mobThresholdsComp = default; + DamageableComponent damageableComp = default; + HandsComponent handsComponent = default; + await server.WaitPost(() => + { + if (mind != null) + mindComponent = entManager.GetComponent(mind.Value); + + mobStateComp = entManager.GetComponent(player); + mobThresholdsComp = entManager.GetComponent(player); + damageableComp = entManager.GetComponent(player); + handsComponent = entManager.GetComponent(player); + }); + + // Spawn the weapon of choice and put it in the player's hands + await server.WaitPost(() => + { + var item = entManager.SpawnEntity("MixedDamageTestObject", transformSystem.GetMapCoordinates(player)); + Assert.That(handsSystem.TryPickup(player, item, handsComponent.ActiveHand!)); + entManager.TryGetComponent(item, out var executionComponent); + Assert.That(executionComponent, Is.Not.EqualTo(null)); + }); + + // Check that running the suicide command kills the player + // and properly ghosts them without them being able to return to their body + // and that slash damage is split in half + await server.WaitAssertion(() => + { + consoleHost.GetSessionShell(playerMan.Sessions.First()).ExecuteCommand("suicide"); + var lethalDamageThreshold = mobThresholdsComp.Thresholds.Keys.Last(); + + Assert.Multiple(() => + { + Assert.That(mobStateSystem.IsDead(player, mobStateComp)); + Assert.That(entManager.TryGetComponent(mindComponent.CurrentEntity, out var ghostComp) && + !ghostComp.CanReturnToBody); + Assert.That(damageableComp.Damage.DamageDict["Slash"], Is.EqualTo(lethalDamageThreshold / 2)); + }); + }); + + await pair.CleanReturnAsync(); + } +} diff --git a/Content.Server/Chat/Commands/SuicideCommand.cs b/Content.Server/Chat/Commands/SuicideCommand.cs index 0db03fec79..ea45158e44 100644 --- a/Content.Server/Chat/Commands/SuicideCommand.cs +++ b/Content.Server/Chat/Commands/SuicideCommand.cs @@ -1,6 +1,7 @@ using Content.Server.GameTicking; using Content.Server.Popups; using Content.Shared.Administration; +using Content.Shared.Chat; using Content.Shared.Mind; using Robust.Shared.Console; using Robust.Shared.Enums; @@ -32,15 +33,13 @@ namespace Content.Server.Chat.Commands var minds = _e.System(); // This check also proves mind not-null for at the end when the mob is ghosted. - if (!minds.TryGetMind(player, out var mindId, out var mind) || - mind.OwnedEntity is not { Valid: true } victim) + if (!minds.TryGetMind(player, out var mindId, out var mindComp) || + mindComp.OwnedEntity is not { Valid: true } victim) { shell.WriteLine(Loc.GetString("suicide-command-no-mind")); return; } - - var gameTicker = _e.System(); var suicideSystem = _e.System(); if (_e.HasComponent(victim)) @@ -53,14 +52,6 @@ namespace Content.Server.Chat.Commands } if (suicideSystem.Suicide(victim)) - { - // Prevent the player from returning to the body. - // Note that mind cannot be null because otherwise victim would be null. - gameTicker.OnGhostAttempt(mindId, false, mind: mind); - return; - } - - if (gameTicker.OnGhostAttempt(mindId, true, mind: mind)) return; shell.WriteLine(Loc.GetString("ghost-command-denied")); diff --git a/Content.Server/Chat/SuicideSystem.cs b/Content.Server/Chat/SuicideSystem.cs index 131d19c523..884292b0fa 100644 --- a/Content.Server/Chat/SuicideSystem.cs +++ b/Content.Server/Chat/SuicideSystem.cs @@ -1,141 +1,154 @@ -using Content.Server.Administration.Logs; -using Content.Server.Popups; +using Content.Server.GameTicking; using Content.Shared.Damage; -using Content.Shared.Damage.Prototypes; using Content.Shared.Database; using Content.Shared.Hands.Components; using Content.Shared.Interaction.Events; using Content.Shared.Item; +using Content.Shared.Mind; using Content.Shared.Mobs.Components; using Content.Shared.Mobs.Systems; using Content.Shared.Popups; using Content.Shared.Tag; using Robust.Shared.Player; -using Robust.Shared.Prototypes; +using Content.Shared.Administration.Logs; +using Content.Shared.Chat; +using Content.Shared.Mind.Components; -namespace Content.Server.Chat +namespace Content.Server.Chat; + +public sealed class SuicideSystem : EntitySystem { - public sealed class SuicideSystem : EntitySystem + [Dependency] private readonly EntityLookupSystem _entityLookupSystem = default!; + [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; + [Dependency] private readonly TagSystem _tagSystem = default!; + [Dependency] private readonly MobStateSystem _mobState = default!; + [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private readonly GameTicker _gameTicker = default!; + [Dependency] private readonly SharedSuicideSystem _suicide = default!; + + public override void Initialize() { - [Dependency] private readonly DamageableSystem _damageableSystem = default!; - [Dependency] private readonly EntityLookupSystem _entityLookupSystem = default!; - [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly TagSystem _tagSystem = default!; - [Dependency] private readonly MobStateSystem _mobState = default!; - [Dependency] private readonly SharedPopupSystem _popup = default!; + base.Initialize(); - public bool Suicide(EntityUid victim) - { - // Checks to see if the CannotSuicide tag exits, ghosts instead. - if (_tagSystem.HasTag(victim, "CannotSuicide")) - return false; - - // Checks to see if the player is dead. - if (!TryComp(victim, out var mobState) || _mobState.IsDead(victim, mobState)) - return false; - - _adminLogger.Add(LogType.Mind, $"{EntityManager.ToPrettyString(victim):player} is attempting to suicide"); - - var suicideEvent = new SuicideEvent(victim); - - //Check to see if there were any systems blocking this suicide - if (SuicideAttemptBlocked(victim, suicideEvent)) - return false; - - bool environmentSuicide = false; - // If you are critical, you wouldn't be able to use your surroundings to suicide, so you do the default suicide - if (!_mobState.IsCritical(victim, mobState)) - { - environmentSuicide = EnvironmentSuicideHandler(victim, suicideEvent); - } - - if (suicideEvent.AttemptBlocked) - return false; - - DefaultSuicideHandler(victim, suicideEvent); - - ApplyDeath(victim, suicideEvent.Kind!.Value); - _adminLogger.Add(LogType.Mind, $"{EntityManager.ToPrettyString(victim):player} suicided{(environmentSuicide ? " (environment)" : "")}"); - return true; - } - - /// - /// If not handled, does the default suicide, which is biting your own tongue - /// - private void DefaultSuicideHandler(EntityUid victim, SuicideEvent suicideEvent) - { - if (suicideEvent.Handled) - return; - - var othersMessage = Loc.GetString("suicide-command-default-text-others", ("name", victim)); - _popup.PopupEntity(othersMessage, victim, Filter.PvsExcept(victim), true); - - var selfMessage = Loc.GetString("suicide-command-default-text-self"); - _popup.PopupEntity(selfMessage, victim, victim); - suicideEvent.SetHandled(SuicideKind.Bloodloss); - } - - /// - /// Checks to see if there are any other systems that prevent suicide - /// - /// Returns true if there was a blocked attempt - private bool SuicideAttemptBlocked(EntityUid victim, SuicideEvent suicideEvent) - { - RaiseLocalEvent(victim, suicideEvent, true); - - if (suicideEvent.AttemptBlocked) - return true; + SubscribeLocalEvent(OnDamageableSuicide); + SubscribeLocalEvent(OnEnvironmentalSuicide); + SubscribeLocalEvent(OnSuicideGhost); + } + /// + /// Calling this function will attempt to kill the user by suiciding on objects in the surrounding area + /// or by applying a lethal amount of damage to the user with the default method. + /// Used when writing /suicide + /// + public bool Suicide(EntityUid victim) + { + // Can't suicide if we're already dead + if (!TryComp(victim, out var mobState) || _mobState.IsDead(victim, mobState)) return false; - } - /// - /// Raise event to attempt to use held item, or surrounding entities to attempt to commit suicide - /// - private bool EnvironmentSuicideHandler(EntityUid victim, SuicideEvent suicideEvent) - { - var itemQuery = GetEntityQuery(); - - // Suicide by held item - if (EntityManager.TryGetComponent(victim, out HandsComponent? handsComponent) - && handsComponent.ActiveHandEntity is { } item) - { - RaiseLocalEvent(item, suicideEvent, false); - - if (suicideEvent.Handled) - return true; - } - - // Suicide by nearby entity (ex: Microwave) - foreach (var entity in _entityLookupSystem.GetEntitiesInRange(victim, 1, LookupFlags.Approximate | LookupFlags.Static)) - { - // Skip any nearby items that can be picked up, we already checked the active held item above - if (itemQuery.HasComponent(entity)) - continue; - - RaiseLocalEvent(entity, suicideEvent); - - if (suicideEvent.Handled) - return true; - } + var suicideGhostEvent = new SuicideGhostEvent(victim); + RaiseLocalEvent(victim, suicideGhostEvent); + // Suicide is considered a fail if the user wasn't able to ghost + // Suiciding with the CannotSuicide tag will ghost the player but not kill the body + if (!suicideGhostEvent.Handled || _tagSystem.HasTag(victim, "CannotSuicide")) return false; + + _adminLogger.Add(LogType.Mind, $"{EntityManager.ToPrettyString(victim):player} is attempting to suicide"); + var suicideEvent = new SuicideEvent(victim); + RaiseLocalEvent(victim, suicideEvent); + + _adminLogger.Add(LogType.Mind, $"{EntityManager.ToPrettyString(victim):player} suicided."); + return true; + } + + /// + /// Event subscription created to handle the ghosting aspect relating to suicides + /// Mainly useful when you can raise an event in Shared and can't call Suicide() directly + /// + private void OnSuicideGhost(Entity victim, ref SuicideGhostEvent args) + { + if (args.Handled) + return; + + if (victim.Comp.Mind == null) + return; + + if (!TryComp(victim.Comp.Mind, out var mindComponent)) + return; + + // CannotSuicide tag will allow the user to ghost, but also return to their mind + // This is kind of weird, not sure what it applies to? + if (_tagSystem.HasTag(victim, "CannotSuicide")) + args.CanReturnToBody = true; + + if (_gameTicker.OnGhostAttempt(victim.Comp.Mind.Value, args.CanReturnToBody, mind: mindComponent)) + args.Handled = true; + } + + /// + /// Raise event to attempt to use held item, or surrounding entities to attempt to commit suicide + /// + private void OnEnvironmentalSuicide(Entity victim, ref SuicideEvent args) + { + if (args.Handled || _mobState.IsCritical(victim)) + return; + + var suicideByEnvironmentEvent = new SuicideByEnvironmentEvent(victim); + + // Try to suicide by raising an event on the held item + if (EntityManager.TryGetComponent(victim, out HandsComponent? handsComponent) + && handsComponent.ActiveHandEntity is { } item) + { + RaiseLocalEvent(item, suicideByEnvironmentEvent); + if (suicideByEnvironmentEvent.Handled) + { + args.Handled = suicideByEnvironmentEvent.Handled; + return; + } } - private void ApplyDeath(EntityUid target, SuicideKind kind) + // Try to suicide by nearby entities, like Microwaves or Crematoriums, by raising an event on it + // Returns upon being handled by any entity + var itemQuery = GetEntityQuery(); + foreach (var entity in _entityLookupSystem.GetEntitiesInRange(victim, 1, LookupFlags.Approximate | LookupFlags.Static)) { - if (kind == SuicideKind.Special) - return; + // Skip any nearby items that can be picked up, we already checked the active held item above + if (itemQuery.HasComponent(entity)) + continue; - if (!_prototypeManager.TryIndex(kind.ToString(), out var damagePrototype)) - { - const SuicideKind fallback = SuicideKind.Blunt; - Log.Error($"{nameof(SuicideSystem)} could not find the damage type prototype associated with {kind}. Falling back to {fallback}"); - damagePrototype = _prototypeManager.Index(fallback.ToString()); - } - const int lethalAmountOfDamage = 200; // TODO: Would be nice to get this number from somewhere else - _damageableSystem.TryChangeDamage(target, new(damagePrototype, lethalAmountOfDamage), true, origin: target); + RaiseLocalEvent(entity, suicideByEnvironmentEvent); + if (!suicideByEnvironmentEvent.Handled) + continue; + + args.Handled = suicideByEnvironmentEvent.Handled; + return; } } + + /// + /// Default suicide behavior for any kind of entity that can take damage + /// + private void OnDamageableSuicide(Entity victim, ref SuicideEvent args) + { + if (args.Handled) + return; + + var othersMessage = Loc.GetString("suicide-command-default-text-others", ("name", victim)); + _popup.PopupEntity(othersMessage, victim, Filter.PvsExcept(victim), true); + + var selfMessage = Loc.GetString("suicide-command-default-text-self"); + _popup.PopupEntity(selfMessage, victim, victim); + + if (args.DamageSpecifier != null) + { + _suicide.ApplyLethalDamage(victim, args.DamageSpecifier); + args.Handled = true; + return; + } + + args.DamageType ??= "Bloodloss"; + _suicide.ApplyLethalDamage(victim, args.DamageType); + args.Handled = true; + } } diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.Mobstate.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.Mobstate.cs index 45198662ec..ccd2a6e3df 100644 --- a/Content.Server/Explosion/EntitySystems/TriggerSystem.Mobstate.cs +++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.Mobstate.cs @@ -38,16 +38,20 @@ public sealed partial class TriggerSystem Trigger(uid); } + /// + /// Checks if the user has any implants that prevent suicide to avoid some cheesy strategies + /// Prevents suicide by handling the event without killing the user + /// private void OnSuicide(EntityUid uid, TriggerOnMobstateChangeComponent component, SuicideEvent args) { if (args.Handled) return; - if (component.PreventSuicide) - { - _popupSystem.PopupEntity(Loc.GetString("suicide-prevented"), args.Victim, args.Victim); - args.BlockSuicideAttempt(component.PreventSuicide); - } + if (!component.PreventSuicide) + return; + + _popupSystem.PopupEntity(Loc.GetString("suicide-prevented"), args.Victim, args.Victim); + args.Handled = true; } private void OnSuicideRelay(EntityUid uid, TriggerOnMobstateChangeComponent component, ImplantRelayEvent args) diff --git a/Content.Server/Kitchen/EntitySystems/KitchenSpikeSystem.cs b/Content.Server/Kitchen/EntitySystems/KitchenSpikeSystem.cs index d89af7e94f..fec65430c1 100644 --- a/Content.Server/Kitchen/EntitySystems/KitchenSpikeSystem.cs +++ b/Content.Server/Kitchen/EntitySystems/KitchenSpikeSystem.cs @@ -2,6 +2,8 @@ using Content.Server.Administration.Logs; using Content.Server.Body.Systems; using Content.Server.Kitchen.Components; using Content.Server.Popups; +using Content.Shared.Chat; +using Content.Shared.Damage; using Content.Shared.Database; using Content.Shared.DoAfter; using Content.Shared.DragDrop; @@ -16,7 +18,6 @@ using Content.Shared.Nutrition.Components; using Content.Shared.Popups; using Content.Shared.Storage; using Robust.Server.GameObjects; -using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; using Robust.Shared.Player; using Robust.Shared.Random; @@ -36,6 +37,7 @@ namespace Content.Server.Kitchen.EntitySystems [Dependency] private readonly SharedAppearanceSystem _appearance = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] private readonly MetaDataSystem _metaData = default!; + [Dependency] private readonly SharedSuicideSystem _suicide = default!; public override void Initialize() { @@ -48,31 +50,38 @@ namespace Content.Server.Kitchen.EntitySystems //DoAfter SubscribeLocalEvent(OnDoAfter); - SubscribeLocalEvent(OnSuicide); + SubscribeLocalEvent(OnSuicideByEnvironment); SubscribeLocalEvent(OnButcherableCanDrop); } - private void OnButcherableCanDrop(EntityUid uid, ButcherableComponent component, ref CanDropDraggedEvent args) + private void OnButcherableCanDrop(Entity entity, ref CanDropDraggedEvent args) { args.Handled = true; - args.CanDrop |= component.Type != ButcheringType.Knife; + args.CanDrop |= entity.Comp.Type != ButcheringType.Knife; } - private void OnSuicide(EntityUid uid, KitchenSpikeComponent component, SuicideEvent args) + /// + /// TODO: Update this so it actually meatspikes the user instead of applying lethal damage to them. + /// + private void OnSuicideByEnvironment(Entity entity, ref SuicideByEnvironmentEvent args) { if (args.Handled) return; - args.SetHandled(SuicideKind.Piercing); - var victim = args.Victim; - var othersMessage = Loc.GetString("comp-kitchen-spike-suicide-other", ("victim", victim)); - _popupSystem.PopupEntity(othersMessage, victim); + + if (!TryComp(args.Victim, out var damageableComponent)) + return; + + _suicide.ApplyLethalDamage((args.Victim, damageableComponent), "Piercing"); + var othersMessage = Loc.GetString("comp-kitchen-spike-suicide-other", ("victim", args.Victim)); + _popupSystem.PopupEntity(othersMessage, args.Victim, Filter.PvsExcept(args.Victim), true); var selfMessage = Loc.GetString("comp-kitchen-spike-suicide-self"); - _popupSystem.PopupEntity(selfMessage, victim, victim); + _popupSystem.PopupEntity(selfMessage, args.Victim, args.Victim); + args.Handled = true; } - private void OnDoAfter(EntityUid uid, KitchenSpikeComponent component, DoAfterEvent args) + private void OnDoAfter(Entity entity, ref SpikeDoAfterEvent args) { if (args.Args.Target == null) return; @@ -82,49 +91,49 @@ namespace Content.Server.Kitchen.EntitySystems if (args.Cancelled) { - component.InUse = false; + entity.Comp.InUse = false; return; } if (args.Handled) return; - if (Spikeable(uid, args.Args.User, args.Args.Target.Value, component, butcherable)) - Spike(uid, args.Args.User, args.Args.Target.Value, component); + if (Spikeable(entity, args.Args.User, args.Args.Target.Value, entity.Comp, butcherable)) + Spike(entity, args.Args.User, args.Args.Target.Value, entity.Comp); - component.InUse = false; + entity.Comp.InUse = false; args.Handled = true; } - private void OnDragDrop(EntityUid uid, KitchenSpikeComponent component, ref DragDropTargetEvent args) + private void OnDragDrop(Entity entity, ref DragDropTargetEvent args) { if (args.Handled) return; args.Handled = true; - if (Spikeable(uid, args.User, args.Dragged, component)) - TrySpike(uid, args.User, args.Dragged, component); + if (Spikeable(entity, args.User, args.Dragged, entity.Comp)) + TrySpike(entity, args.User, args.Dragged, entity.Comp); } - private void OnInteractHand(EntityUid uid, KitchenSpikeComponent component, InteractHandEvent args) + private void OnInteractHand(Entity entity, ref InteractHandEvent args) { if (args.Handled) return; - if (component.PrototypesToSpawn?.Count > 0) + if (entity.Comp.PrototypesToSpawn?.Count > 0) { - _popupSystem.PopupEntity(Loc.GetString("comp-kitchen-spike-knife-needed"), uid, args.User); + _popupSystem.PopupEntity(Loc.GetString("comp-kitchen-spike-knife-needed"), entity, args.User); args.Handled = true; } } - private void OnInteractUsing(EntityUid uid, KitchenSpikeComponent component, InteractUsingEvent args) + private void OnInteractUsing(Entity entity, ref InteractUsingEvent args) { if (args.Handled) return; - if (TryGetPiece(uid, args.User, args.Used)) + if (TryGetPiece(entity, args.User, args.Used)) args.Handled = true; } diff --git a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs index 98c875e773..c05c679f17 100644 --- a/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs +++ b/Content.Server/Kitchen/EntitySystems/MicrowaveSystem.cs @@ -39,6 +39,8 @@ using Robust.Shared.Prototypes; using Robust.Shared.Timing; using Content.Shared.Stacks; using Content.Server.Construction.Components; +using Content.Shared.Chat; +using Content.Shared.Damage; namespace Content.Server.Kitchen.EntitySystems { @@ -65,6 +67,7 @@ namespace Content.Server.Kitchen.EntitySystems [Dependency] private readonly SharedStackSystem _stack = default!; [Dependency] private readonly IPrototypeManager _prototype = default!; [Dependency] private readonly IAdminLogManager _adminLogger = default!; + [Dependency] private readonly SharedSuicideSystem _suicide = default!; [ValidatePrototypeId] private const string MalfunctionSpark = "Spark"; @@ -83,7 +86,7 @@ namespace Content.Server.Kitchen.EntitySystems SubscribeLocalEvent(OnBreak); SubscribeLocalEvent(OnPowerChanged); SubscribeLocalEvent(OnAnchorChanged); - SubscribeLocalEvent(OnSuicide); + SubscribeLocalEvent(OnSuicideByEnvironment); SubscribeLocalEvent(OnSignalReceived); @@ -260,12 +263,22 @@ namespace Content.Server.Kitchen.EntitySystems _deviceLink.EnsureSinkPorts(ent, ent.Comp.OnPort); } - private void OnSuicide(Entity ent, ref SuicideEvent args) + /// + /// Kills the user by microwaving their head + /// TODO: Make this not awful, it keeps any items attached to your head still on and you can revive someone and cogni them so you have some dumb headless fuck running around. I've seen it happen. + /// + private void OnSuicideByEnvironment(Entity ent, ref SuicideByEnvironmentEvent args) { if (args.Handled) return; - args.SetHandled(SuicideKind.Heat); + // The act of getting your head microwaved doesn't actually kill you + if (!TryComp(args.Victim, out var damageableComponent)) + return; + + // The application of lethal damage is what kills you... + _suicide.ApplyLethalDamage((args.Victim, damageableComponent), "Heat"); + var victim = args.Victim; var headCount = 0; @@ -295,6 +308,7 @@ namespace Content.Server.Kitchen.EntitySystems ent.Comp.CurrentCookTimerTime = 10; Wzhzhzh(ent.Owner, ent.Comp, args.Victim); UpdateUserInterfaceState(ent.Owner, ent.Comp); + args.Handled = true; } private void OnSolutionChange(Entity ent, ref SolutionContainerChangedEvent args) diff --git a/Content.Server/Materials/MaterialReclaimerSystem.cs b/Content.Server/Materials/MaterialReclaimerSystem.cs index 0d6d27777a..b962af2b41 100644 --- a/Content.Server/Materials/MaterialReclaimerSystem.cs +++ b/Content.Server/Materials/MaterialReclaimerSystem.cs @@ -1,4 +1,4 @@ -using Content.Server.Chemistry.Containers.EntitySystems; +using Content.Server.Chemistry.Containers.EntitySystems; using Content.Server.Fluids.EntitySystems; using Content.Server.GameTicking; using Content.Server.Popups; @@ -48,7 +48,7 @@ public sealed class MaterialReclaimerSystem : SharedMaterialReclaimerSystem SubscribeLocalEvent(OnPowerChanged); SubscribeLocalEvent(OnInteractUsing, before: new []{typeof(WiresSystem), typeof(SolutionTransferSystem)}); - SubscribeLocalEvent(OnSuicide); + SubscribeLocalEvent(OnSuicideByEnvironment); SubscribeLocalEvent(OnActivePowerChanged); } private void OnStartup(Entity entity, ref ComponentStartup args) @@ -86,12 +86,11 @@ public sealed class MaterialReclaimerSystem : SharedMaterialReclaimerSystem args.Handled = TryStartProcessItem(entity.Owner, args.Used, entity.Comp, args.User); } - private void OnSuicide(Entity entity, ref SuicideEvent args) + private void OnSuicideByEnvironment(Entity entity, ref SuicideByEnvironmentEvent args) { if (args.Handled) return; - args.SetHandled(SuicideKind.Bloodloss); var victim = args.Victim; if (TryComp(victim, out ActorComponent? actor) && _mind.TryGetMind(actor.PlayerSession, out var mindId, out var mind)) @@ -103,12 +102,15 @@ public sealed class MaterialReclaimerSystem : SharedMaterialReclaimerSystem } } - _popup.PopupEntity(Loc.GetString("recycler-component-suicide-message-others", ("victim", Identity.Entity(victim, EntityManager))), + _popup.PopupEntity(Loc.GetString("recycler-component-suicide-message-others", + ("victim", Identity.Entity(victim, EntityManager))), victim, - Filter.PvsExcept(victim, entityManager: EntityManager), true); + Filter.PvsExcept(victim, entityManager: EntityManager), + true); _body.GibBody(victim, true); _appearance.SetData(entity.Owner, RecyclerVisuals.Bloody, true); + args.Handled = true; } private void OnActivePowerChanged(Entity entity, ref PowerChangedEvent args) diff --git a/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs b/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs index 5be93f7fbc..c5beed718e 100644 --- a/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs +++ b/Content.Server/Medical/BiomassReclaimer/BiomassReclaimerSystem.cs @@ -106,11 +106,11 @@ namespace Content.Server.Medical.BiomassReclaimer SubscribeLocalEvent(OnAfterInteractUsing); SubscribeLocalEvent(OnClimbedOn); SubscribeLocalEvent(OnPowerChanged); - SubscribeLocalEvent(OnSuicide); + SubscribeLocalEvent(OnSuicideByEnvironment); SubscribeLocalEvent(OnDoAfter); } - private void OnSuicide(Entity ent, ref SuicideEvent args) + private void OnSuicideByEnvironment(Entity ent, ref SuicideByEnvironmentEvent args) { if (args.Handled) return; @@ -123,7 +123,7 @@ namespace Content.Server.Medical.BiomassReclaimer _popup.PopupEntity(Loc.GetString("biomass-reclaimer-suicide-others", ("victim", args.Victim)), ent, PopupType.LargeCaution); StartProcessing(args.Victim, ent); - args.SetHandled(SuicideKind.Blunt); + args.Handled = true; } private void OnInit(EntityUid uid, ActiveBiomassReclaimerComponent component, ComponentInit args) diff --git a/Content.Server/Morgue/CrematoriumSystem.cs b/Content.Server/Morgue/CrematoriumSystem.cs index 54b47cff84..f6859b610a 100644 --- a/Content.Server/Morgue/CrematoriumSystem.cs +++ b/Content.Server/Morgue/CrematoriumSystem.cs @@ -38,7 +38,7 @@ public sealed class CrematoriumSystem : EntitySystem SubscribeLocalEvent(OnExamine); SubscribeLocalEvent>(AddCremateVerb); - SubscribeLocalEvent(OnSuicide); + SubscribeLocalEvent(OnSuicideByEnvironment); SubscribeLocalEvent(OnAttemptOpen); } @@ -146,11 +146,10 @@ public sealed class CrematoriumSystem : EntitySystem _audio.PlayPvs(component.CremateFinishSound, uid); } - private void OnSuicide(EntityUid uid, CrematoriumComponent component, SuicideEvent args) + private void OnSuicideByEnvironment(EntityUid uid, CrematoriumComponent component, SuicideByEnvironmentEvent args) { if (args.Handled) return; - args.SetHandled(SuicideKind.Heat); var victim = args.Victim; if (TryComp(victim, out ActorComponent? actor) && _minds.TryGetMind(victim, out var mindId, out var mind)) @@ -179,6 +178,7 @@ public sealed class CrematoriumSystem : EntitySystem } _entityStorage.CloseStorage(uid); Cremate(uid, component); + args.Handled = true; } public override void Update(float frameTime) diff --git a/Content.Shared/Chat/SharedSuicideSystem.cs b/Content.Shared/Chat/SharedSuicideSystem.cs new file mode 100644 index 0000000000..d341ea89a8 --- /dev/null +++ b/Content.Shared/Chat/SharedSuicideSystem.cs @@ -0,0 +1,67 @@ +using Content.Shared.Damage; +using Content.Shared.Damage.Prototypes; +using Content.Shared.Mobs.Components; +using Robust.Shared.Prototypes; +using System.Linq; + +namespace Content.Shared.Chat; + +public sealed class SharedSuicideSystem : EntitySystem +{ + [Dependency] private readonly DamageableSystem _damageableSystem = default!; + [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + + /// + /// Applies lethal damage spread out across the damage types given. + /// + public void ApplyLethalDamage(Entity target, DamageSpecifier damageSpecifier) + { + // Create a new damageSpecifier so that we don't make alterations to the original DamageSpecifier + // Failing to do this will permanently change a weapon's damage making it insta-kill people + var appliedDamageSpecifier = new DamageSpecifier(damageSpecifier); + if (!TryComp(target, out var mobThresholds)) + return; + + // Mob thresholds are sorted from alive -> crit -> dead, + // grabbing the last key will give us how much damage is needed to kill a target from zero + // The exact lethal damage amount is adjusted based on their current damage taken + var lethalAmountOfDamage = mobThresholds.Thresholds.Keys.Last() - target.Comp.TotalDamage; + var totalDamage = appliedDamageSpecifier.GetTotal(); + + // Removing structural because it causes issues against entities that cannot take structural damage, + // then getting the total to use in calculations for spreading out damage. + appliedDamageSpecifier.DamageDict.Remove("Structural"); + + // Split the total amount of damage needed to kill the target by every damage type in the DamageSpecifier + foreach (var (key, value) in appliedDamageSpecifier.DamageDict) + { + appliedDamageSpecifier.DamageDict[key] = Math.Ceiling((double) (value * lethalAmountOfDamage / totalDamage)); + } + + _damageableSystem.TryChangeDamage(target, appliedDamageSpecifier, true, origin: target); + } + + /// + /// Applies lethal damage in a single type, specified by a single damage type. + /// + public void ApplyLethalDamage(Entity target, ProtoId? damageType) + { + if (!TryComp(target, out var mobThresholds)) + return; + + // Mob thresholds are sorted from alive -> crit -> dead, + // grabbing the last key will give us how much damage is needed to kill a target from zero + // The exact lethal damage amount is adjusted based on their current damage taken + var lethalAmountOfDamage = mobThresholds.Thresholds.Keys.Last() - target.Comp.TotalDamage; + + // We don't want structural damage for the same reasons listed above + if (!_prototypeManager.TryIndex(damageType, out var damagePrototype) || damagePrototype.ID == "Structural") + { + Log.Error($"{nameof(SharedSuicideSystem)} could not find the damage type prototype associated with {damageType}. Falling back to Blunt"); + damagePrototype = _prototypeManager.Index("Blunt"); + } + + var damage = new DamageSpecifier(damagePrototype, lethalAmountOfDamage); + _damageableSystem.TryChangeDamage(target, damage, true, origin: target); + } +} diff --git a/Content.Shared/Execution/DoAfterEvent.cs b/Content.Shared/Execution/DoAfterEvent.cs new file mode 100644 index 0000000000..7854974527 --- /dev/null +++ b/Content.Shared/Execution/DoAfterEvent.cs @@ -0,0 +1,9 @@ +using Content.Shared.DoAfter; +using Robust.Shared.Serialization; + +namespace Content.Shared.Execution; + +[Serializable, NetSerializable] +public sealed partial class ExecutionDoAfterEvent : SimpleDoAfterEvent +{ +} diff --git a/Content.Shared/Execution/ExecutionComponent.cs b/Content.Shared/Execution/ExecutionComponent.cs new file mode 100644 index 0000000000..31477ead69 --- /dev/null +++ b/Content.Shared/Execution/ExecutionComponent.cs @@ -0,0 +1,77 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.Execution; + +/// +/// Added to entities that can be used to execute another target. +/// +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState] +public sealed partial class ExecutionComponent : Component +{ + /// + /// How long the execution duration lasts. + /// + [DataField, AutoNetworkedField] + public float DoAfterDuration = 5f; + + /// + /// Arbitrarily chosen number to multiply damage by, used to deal reasonable amounts of damage to a victim of an execution. + /// /// + [DataField, AutoNetworkedField] + public float DamageMultiplier = 9f; + + /// + /// Shown to the person performing the melee execution (attacker) upon starting a melee execution. + /// + [DataField] + public LocId InternalMeleeExecutionMessage = "execution-popup-melee-initial-internal"; + + /// + /// Shown to bystanders and the victim of a melee execution when a melee execution is started. + /// + [DataField] + public LocId ExternalMeleeExecutionMessage = "execution-popup-melee-initial-external"; + + /// + /// Shown to the attacker upon completion of a melee execution. + /// + [DataField] + public LocId CompleteInternalMeleeExecutionMessage = "execution-popup-melee-complete-internal"; + + /// + /// Shown to bystanders and the victim of a melee execution when a melee execution is completed. + /// + [DataField] + public LocId CompleteExternalMeleeExecutionMessage = "execution-popup-melee-complete-external"; + + /// + /// Shown to the person performing the self execution when starting one. + /// + [DataField] + public LocId InternalSelfExecutionMessage = "execution-popup-self-initial-internal"; + + /// + /// Shown to bystanders near a self execution when one is started. + /// + [DataField] + public LocId ExternalSelfExecutionMessage = "execution-popup-self-initial-external"; + + /// + /// Shown to the person performing a self execution upon completion of a do-after or on use of /suicide with a weapon that has the Execution component. + /// + [DataField] + public LocId CompleteInternalSelfExecutionMessage = "execution-popup-self-complete-internal"; + + /// + /// Shown to bystanders when a self execution is completed or a suicide via execution weapon happens nearby. + /// + [DataField] + public LocId CompleteExternalSelfExecutionMessage = "execution-popup-self-complete-external"; + + // Not networked because this is transient inside of a tick. + /// + /// True if it is currently executing for handlers. + /// + [DataField] + public bool Executing = false; +} diff --git a/Content.Shared/Execution/SharedExecutionSystem.cs b/Content.Shared/Execution/SharedExecutionSystem.cs new file mode 100644 index 0000000000..a1105dd644 --- /dev/null +++ b/Content.Shared/Execution/SharedExecutionSystem.cs @@ -0,0 +1,234 @@ +using Content.Shared.ActionBlocker; +using Content.Shared.Chat; +using Content.Shared.CombatMode; +using Content.Shared.Damage; +using Content.Shared.Database; +using Content.Shared.DoAfter; +using Content.Shared.Mobs.Components; +using Content.Shared.Mobs.Systems; +using Content.Shared.Popups; +using Content.Shared.Verbs; +using Content.Shared.Weapons.Melee; +using Content.Shared.Weapons.Melee.Events; +using Content.Shared.Interaction.Events; +using Content.Shared.Mind; +using Robust.Shared.Player; +using Robust.Shared.Audio.Systems; + +namespace Content.Shared.Execution; + +/// +/// Verb for violently murdering cuffed creatures. +/// +public sealed class SharedExecutionSystem : EntitySystem +{ + [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!; + [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; + [Dependency] private readonly MobStateSystem _mobState = default!; + [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private readonly SharedSuicideSystem _suicide = default!; + [Dependency] private readonly SharedCombatModeSystem _combat = default!; + [Dependency] private readonly SharedExecutionSystem _execution = default!; + [Dependency] private readonly SharedMeleeWeaponSystem _melee = default!; + [Dependency] private readonly SharedMindSystem _mind = default!; + [Dependency] private readonly SharedTransformSystem _transform = default!; + + /// + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent>(OnGetInteractionsVerbs); + SubscribeLocalEvent(OnGetMeleeDamage); + SubscribeLocalEvent(OnSuicideByEnvironment); + SubscribeLocalEvent(OnExecutionDoAfter); + } + + private void OnGetInteractionsVerbs(EntityUid uid, ExecutionComponent comp, GetVerbsEvent args) + { + if (args.Hands == null || args.Using == null || !args.CanAccess || !args.CanInteract) + return; + + var attacker = args.User; + var weapon = args.Using.Value; + var victim = args.Target; + + if (!CanBeExecuted(victim, attacker)) + return; + + UtilityVerb verb = new() + { + Act = () => TryStartExecutionDoAfter(weapon, victim, attacker, comp), + Impact = LogImpact.High, + Text = Loc.GetString("execution-verb-name"), + Message = Loc.GetString("execution-verb-message"), + }; + + args.Verbs.Add(verb); + } + + private void TryStartExecutionDoAfter(EntityUid weapon, EntityUid victim, EntityUid attacker, ExecutionComponent comp) + { + if (!CanBeExecuted(victim, attacker)) + return; + + if (attacker == victim) + { + ShowExecutionInternalPopup(comp.InternalSelfExecutionMessage, attacker, victim, weapon); + ShowExecutionExternalPopup(comp.ExternalSelfExecutionMessage, attacker, victim, weapon); + } + else + { + ShowExecutionInternalPopup(comp.InternalMeleeExecutionMessage, attacker, victim, weapon); + ShowExecutionExternalPopup(comp.ExternalMeleeExecutionMessage, attacker, victim, weapon); + } + + var doAfter = + new DoAfterArgs(EntityManager, attacker, comp.DoAfterDuration, new ExecutionDoAfterEvent(), weapon, target: victim, used: weapon) + { + BreakOnMove = true, + BreakOnDamage = true, + NeedHand = true + }; + + _doAfter.TryStartDoAfter(doAfter); + + } + + public bool CanBeExecuted(EntityUid victim, EntityUid attacker) + { + // No point executing someone if they can't take damage + if (!HasComp(victim)) + return false; + + // You can't execute something that cannot die + if (!TryComp(victim, out var mobState)) + return false; + + // You're not allowed to execute dead people (no fun allowed) + if (_mobState.IsDead(victim, mobState)) + return false; + + // You must be able to attack people to execute + if (!_actionBlocker.CanAttack(attacker, victim)) + return false; + + // The victim must be incapacitated to be executed + if (victim != attacker && _actionBlocker.CanInteract(victim, null)) + return false; + + // All checks passed + return true; + } + + private void OnGetMeleeDamage(Entity entity, ref GetMeleeDamageEvent args) + { + if (!TryComp(entity, out var melee) || !entity.Comp.Executing) + { + return; + } + + var bonus = melee.Damage * entity.Comp.DamageMultiplier - melee.Damage; + args.Damage += bonus; + args.ResistanceBypass = true; + } + + private void OnSuicideByEnvironment(Entity entity, ref SuicideByEnvironmentEvent args) + { + if (!TryComp(entity, out var melee)) + return; + + string? internalMsg = entity.Comp.CompleteInternalSelfExecutionMessage; + string? externalMsg = entity.Comp.CompleteExternalSelfExecutionMessage; + + if (!TryComp(args.Victim, out var damageableComponent)) + return; + + ShowExecutionInternalPopup(internalMsg, args.Victim, args.Victim, entity, false); + ShowExecutionExternalPopup(externalMsg, args.Victim, args.Victim, entity); + _audio.PlayPredicted(melee.HitSound, args.Victim, args.Victim); + _suicide.ApplyLethalDamage((args.Victim, damageableComponent), melee.Damage); + args.Handled = true; + } + + private void ShowExecutionInternalPopup(string locString, EntityUid attacker, EntityUid victim, EntityUid weapon, bool predict = true) + { + if (predict) + { + _popup.PopupClient( + Loc.GetString(locString, ("attacker", attacker), ("victim", victim), ("weapon", weapon)), + attacker, + attacker, + PopupType.MediumCaution + ); + } + else + { + _popup.PopupEntity( + Loc.GetString(locString, ("attacker", attacker), ("victim", victim), ("weapon", weapon)), + attacker, + attacker, + PopupType.MediumCaution + ); + } + } + + private void ShowExecutionExternalPopup(string locString, EntityUid attacker, EntityUid victim, EntityUid weapon) + { + _popup.PopupEntity( + Loc.GetString(locString, ("attacker", attacker), ("victim", victim), ("weapon", weapon)), + attacker, + Filter.PvsExcept(attacker), + true, + PopupType.MediumCaution + ); + } + + private void OnExecutionDoAfter(Entity entity, ref ExecutionDoAfterEvent args) + { + if (args.Handled || args.Cancelled || args.Used == null || args.Target == null) + return; + + if (!TryComp(entity, out var meleeWeaponComp)) + return; + + var attacker = args.User; + var victim = args.Target.Value; + var weapon = args.Used.Value; + + if (!_execution.CanBeExecuted(victim, attacker)) + return; + + // This is needed so the melee system does not stop it. + var prev = _combat.IsInCombatMode(attacker); + _combat.SetInCombatMode(attacker, true); + entity.Comp.Executing = true; + + var internalMsg = entity.Comp.CompleteInternalMeleeExecutionMessage; + var externalMsg = entity.Comp.CompleteExternalMeleeExecutionMessage; + + if (attacker == victim) + { + var suicideEvent = new SuicideEvent(victim); + RaiseLocalEvent(victim, suicideEvent); + + var suicideGhostEvent = new SuicideGhostEvent(victim); + RaiseLocalEvent(victim, suicideGhostEvent); + } + else + { + _melee.AttemptLightAttack(attacker, weapon, meleeWeaponComp, victim); + } + + _combat.SetInCombatMode(attacker, prev); + entity.Comp.Executing = false; + args.Handled = true; + + if (attacker != victim) + { + _execution.ShowExecutionInternalPopup(internalMsg, attacker, victim, entity); + _execution.ShowExecutionExternalPopup(externalMsg, attacker, victim, entity); + } + } +} diff --git a/Content.Shared/Interaction/Events/SuicideEvent.cs b/Content.Shared/Interaction/Events/SuicideEvent.cs index 7b9c1efe0d..bcd5df67ab 100644 --- a/Content.Shared/Interaction/Events/SuicideEvent.cs +++ b/Content.Shared/Interaction/Events/SuicideEvent.cs @@ -1,48 +1,41 @@ -namespace Content.Shared.Interaction.Events +using Content.Shared.Damage; +using Content.Shared.Damage.Prototypes; +using Robust.Shared.Prototypes; + +namespace Content.Shared.Interaction.Events; + +/// +/// Raised Directed at an entity to check whether they will handle the suicide. +/// +public sealed class SuicideEvent : HandledEntityEventArgs { - /// - /// Raised Directed at an entity to check whether they will handle the suicide. - /// - public sealed class SuicideEvent : EntityEventArgs + public SuicideEvent(EntityUid victim) { - public SuicideEvent(EntityUid victim) - { - Victim = victim; - } - public void SetHandled(SuicideKind kind) - { - if (Handled) - throw new InvalidOperationException("Suicide was already handled"); - - Kind = kind; - } - - public void BlockSuicideAttempt(bool suicideAttempt) - { - if (suicideAttempt) - AttemptBlocked = suicideAttempt; - } - - public SuicideKind? Kind { get; private set; } - public EntityUid Victim { get; private set; } - public bool AttemptBlocked { get; private set; } - public bool Handled => Kind != null; + Victim = victim; } - public enum SuicideKind - { - Special, //Doesn't damage the mob, used for "weird" suicides like gibbing - - //Damage type suicides - Blunt, - Slash, - Piercing, - Heat, - Shock, - Cold, - Poison, - Radiation, - Asphyxiation, - Bloodloss - } + public DamageSpecifier? DamageSpecifier; + public ProtoId? DamageType; + public EntityUid Victim { get; private set; } +} + +public sealed class SuicideByEnvironmentEvent : HandledEntityEventArgs +{ + public SuicideByEnvironmentEvent(EntityUid victim) + { + Victim = victim; + } + + public EntityUid Victim { get; set; } +} + +public sealed class SuicideGhostEvent : HandledEntityEventArgs +{ + public SuicideGhostEvent(EntityUid victim) + { + Victim = victim; + } + + public EntityUid Victim { get; set; } + public bool CanReturnToBody; } diff --git a/Content.Shared/Mind/SharedMindSystem.cs b/Content.Shared/Mind/SharedMindSystem.cs index ba365daf15..24b47b6412 100644 --- a/Content.Shared/Mind/SharedMindSystem.cs +++ b/Content.Shared/Mind/SharedMindSystem.cs @@ -168,15 +168,17 @@ public abstract class SharedMindSystem : EntitySystem args.PushMarkup($"[color=yellow]{Loc.GetString("comp-mind-examined-ssd", ("ent", uid))}[/color]"); } + /// + /// Checks to see if the user's mind prevents them from suicide + /// Handles the suicide event without killing the user if true + /// private void OnSuicide(EntityUid uid, MindContainerComponent component, SuicideEvent args) { if (args.Handled) return; if (TryComp(component.Mind, out MindComponent? mind) && mind.PreventSuicide) - { - args.BlockSuicideAttempt(true); - } + args.Handled = true; } public EntityUid? GetMind(EntityUid uid, MindContainerComponent? mind = null) diff --git a/Content.Shared/Weapons/Melee/Events/MeleeHitEvent.cs b/Content.Shared/Weapons/Melee/Events/MeleeHitEvent.cs index 55c01c1d6f..75c85790de 100644 --- a/Content.Shared/Weapons/Melee/Events/MeleeHitEvent.cs +++ b/Content.Shared/Weapons/Melee/Events/MeleeHitEvent.cs @@ -80,7 +80,7 @@ public sealed class MeleeHitEvent : HandledEntityEventArgs /// Raised on a melee weapon to calculate potential damage bonuses or decreases. /// [ByRefEvent] -public record struct GetMeleeDamageEvent(EntityUid Weapon, DamageSpecifier Damage, List Modifiers, EntityUid User); +public record struct GetMeleeDamageEvent(EntityUid Weapon, DamageSpecifier Damage, List Modifiers, EntityUid User, bool ResistanceBypass = false); /// /// Raised on a melee weapon to calculate the attack rate. diff --git a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs index fa5e0b3a90..212c03475c 100644 --- a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs +++ b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs @@ -67,6 +67,12 @@ public sealed partial class MeleeWeaponComponent : Component [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField] public bool AutoAttack; + /// + /// If true, attacks will bypass armor resistances. + /// + [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField] + public bool ResistanceBypass = false; + /// /// Base damage for this weapon. Can be modified via heavy damage or other means. /// diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs index ae0ebfe74c..bc19235cd3 100644 --- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs +++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs @@ -216,7 +216,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem if (!Resolve(uid, ref component, false)) return new DamageSpecifier(); - var ev = new GetMeleeDamageEvent(uid, new (component.Damage), new(), user); + var ev = new GetMeleeDamageEvent(uid, new(component.Damage), new(), user, component.ResistanceBypass); RaiseLocalEvent(uid, ref ev); return DamageSpecifier.ApplyModifierSets(ev.Damage, ev.Modifiers); @@ -244,6 +244,17 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem return ev.DamageModifier * ev.Multipliers; } + public bool GetResistanceBypass(EntityUid uid, EntityUid user, MeleeWeaponComponent? component = null) + { + if (!Resolve(uid, ref component)) + return false; + + var ev = new GetMeleeDamageEvent(uid, new(component.Damage), new(), user, component.ResistanceBypass); + RaiseLocalEvent(uid, ref ev); + + return ev.ResistanceBypass; + } + public bool TryGetWeapon(EntityUid entity, out EntityUid weaponUid, [NotNullWhen(true)] out MeleeWeaponComponent? melee) { weaponUid = default; @@ -441,6 +452,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem // If I do not come back later to fix Light Attacks being Heavy Attacks you can throw me in the spider pit -Errant var damage = GetDamage(meleeUid, user, component) * GetHeavyDamageModifier(meleeUid, user, component); var target = GetEntity(ev.Target); + var resistanceBypass = GetResistanceBypass(meleeUid, user, component); // For consistency with wide attacks stuff needs damageable. if (Deleted(target) || @@ -497,7 +509,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem RaiseLocalEvent(target.Value, attackedEvent); var modifiedDamage = DamageSpecifier.ApplyModifierSets(damage + hitEvent.BonusDamage + attackedEvent.BonusDamage, hitEvent.ModifiersList); - var damageResult = Damageable.TryChangeDamage(target, modifiedDamage, origin:user); + var damageResult = Damageable.TryChangeDamage(target, modifiedDamage, origin:user, ignoreResistances:resistanceBypass); if (damageResult is {Empty: false}) { diff --git a/Resources/Locale/en-US/execution/execution.ftl b/Resources/Locale/en-US/execution/execution.ftl new file mode 100644 index 0000000000..08f9a06dd4 --- /dev/null +++ b/Resources/Locale/en-US/execution/execution.ftl @@ -0,0 +1,17 @@ +execution-verb-name = Execute +execution-verb-message = Use your weapon to execute someone. + +# All the below localisation strings have access to the following variables +# attacker (the person committing the execution) +# victim (the person being executed) +# weapon (the weapon used for the execution) + +execution-popup-melee-initial-internal = You ready {THE($weapon)} against {$victim}'s throat. +execution-popup-melee-initial-external = {$attacker} readies {POSS-ADJ($attacker)} {$weapon} against the throat of {$victim}. +execution-popup-melee-complete-internal = You slit the throat of {$victim}! +execution-popup-melee-complete-external = {$attacker} slits the throat of {$victim}! + +execution-popup-self-initial-internal = You ready {THE($weapon)} against your own throat. +execution-popup-self-initial-external = {$attacker} readies {POSS-ADJ($attacker)} {$weapon} against their own throat. +execution-popup-self-complete-internal = You slit your own throat! +execution-popup-self-complete-external = {$attacker} slits their own throat! \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml b/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml index 8f522abce4..47828ed8f5 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/crystal_shard.yml @@ -6,6 +6,8 @@ description: A small piece of crystal. components: - type: Sharp + - type: Execution + doAfterDuration: 4.0 - type: Sprite layers: - sprite: Objects/Materials/Shards/crystal.rsi diff --git a/Resources/Prototypes/Entities/Objects/Materials/shards.yml b/Resources/Prototypes/Entities/Objects/Materials/shards.yml index fa6937dac3..5668661e08 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml @@ -5,6 +5,8 @@ description: It's a shard of some unknown material. components: - type: Sharp + - type: Execution + doAfterDuration: 4.0 - type: Sprite layers: - sprite: Objects/Materials/Shards/shard.rsi diff --git a/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml b/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml index 9d3ef6c424..b458f0ae21 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml @@ -5,6 +5,8 @@ description: In Space Glasgow this is called a conversation starter. components: - type: Sharp + - type: Execution + doAfterDuration: 4.0 - type: MeleeWeapon attackRate: 1.5 damage: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml index 49b22c000d..398c04aee6 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/armblade.yml @@ -5,6 +5,8 @@ description: A grotesque blade made out of bone and flesh that cleaves through people as a hot knife through butter. components: - type: Sharp + - type: Execution + doAfterDuration: 4.0 - type: Sprite sprite: Objects/Weapons/Melee/armblade.rsi state: icon diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml index 93765ec40c..f6a4749654 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml @@ -8,6 +8,8 @@ tags: - FireAxe - type: Sharp + - type: Execution + doAfterDuration: 4.0 - type: Sprite sprite: Objects/Weapons/Melee/fireaxe.rsi state: icon diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml index 39a04120e0..8270a50bd6 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml @@ -7,6 +7,8 @@ tags: - Knife - type: Sharp + - type: Execution + doAfterDuration: 4.0 - type: Utensil types: - Knife diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml index 838cde619f..c2449a6bcb 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml @@ -4,6 +4,8 @@ abstract: true components: - type: Sharp + - type: Execution + doAfterDuration: 4.0 - type: MeleeWeapon wideAnimationRotation: -135 - type: Sprite From ee922e37f6539a5c3da94e76a1a0efef4c8e2b59 Mon Sep 17 00:00:00 2001 From: beck-thompson <107373427+beck-thompson@users.noreply.github.com> Date: Sat, 10 Aug 2024 20:06:33 -0700 Subject: [PATCH 376/422] Replaced some AddMarkups with AddMarkupOrThrow (#30632) * First commit * Silly me * bruh --- Content.Client/Anomaly/Ui/AnomalyScannerMenu.xaml.cs | 2 +- Content.Server/Anomaly/AnomalySystem.Scanner.cs | 2 +- Content.Server/Body/Systems/BloodstreamSystem.cs | 6 +++--- Content.Shared/Armor/SharedArmorSystem.cs | 7 +++---- Content.Shared/Blocking/BlockingSystem.cs | 7 +++---- .../EntitySystems/SharedSolutionContainerSystem.cs | 8 ++++---- Content.Shared/Damage/Systems/DamageExamineSystem.cs | 6 +++--- 7 files changed, 18 insertions(+), 20 deletions(-) diff --git a/Content.Client/Anomaly/Ui/AnomalyScannerMenu.xaml.cs b/Content.Client/Anomaly/Ui/AnomalyScannerMenu.xaml.cs index 14726952d1..c012edb89e 100644 --- a/Content.Client/Anomaly/Ui/AnomalyScannerMenu.xaml.cs +++ b/Content.Client/Anomaly/Ui/AnomalyScannerMenu.xaml.cs @@ -31,7 +31,7 @@ public sealed partial class AnomalyScannerMenu : FancyWindow msg.PushNewline(); var time = NextPulseTime.Value - _timing.CurTime; var timestring = $"{time.Minutes:00}:{time.Seconds:00}"; - msg.AddMarkup(Loc.GetString("anomaly-scanner-pulse-timer", ("time", timestring))); + msg.AddMarkupOrThrow(Loc.GetString("anomaly-scanner-pulse-timer", ("time", timestring))); } TextDisplay.SetMarkup(msg.ToMarkup()); diff --git a/Content.Server/Anomaly/AnomalySystem.Scanner.cs b/Content.Server/Anomaly/AnomalySystem.Scanner.cs index 65d79de60c..9d81878cd8 100644 --- a/Content.Server/Anomaly/AnomalySystem.Scanner.cs +++ b/Content.Server/Anomaly/AnomalySystem.Scanner.cs @@ -217,7 +217,7 @@ public sealed partial class AnomalySystem msg.PushNewline(); if (secret != null && secret.Secret.Contains(AnomalySecretData.Behavior)) - msg.AddMarkup(Loc.GetString("anomaly-behavior-unknown")); + msg.AddMarkupOrThrow(Loc.GetString("anomaly-behavior-unknown")); else { if (anomalyComp.CurrentBehavior != null) diff --git a/Content.Server/Body/Systems/BloodstreamSystem.cs b/Content.Server/Body/Systems/BloodstreamSystem.cs index 9647634a9e..67246825fe 100644 --- a/Content.Server/Body/Systems/BloodstreamSystem.cs +++ b/Content.Server/Body/Systems/BloodstreamSystem.cs @@ -255,20 +255,20 @@ public sealed class BloodstreamSystem : EntitySystem if (ent.Comp.BleedAmount > ent.Comp.MaxBleedAmount / 2) { args.Message.PushNewline(); - args.Message.AddMarkup(Loc.GetString("bloodstream-component-profusely-bleeding", ("target", ent.Owner))); + args.Message.AddMarkupOrThrow(Loc.GetString("bloodstream-component-profusely-bleeding", ("target", ent.Owner))); } // Shows bleeding message when bleeding, but less than profusely. else if (ent.Comp.BleedAmount > 0) { args.Message.PushNewline(); - args.Message.AddMarkup(Loc.GetString("bloodstream-component-bleeding", ("target", ent.Owner))); + args.Message.AddMarkupOrThrow(Loc.GetString("bloodstream-component-bleeding", ("target", ent.Owner))); } // If the mob's blood level is below the damage threshhold, the pale message is added. if (GetBloodLevelPercentage(ent, ent) < ent.Comp.BloodlossThreshold) { args.Message.PushNewline(); - args.Message.AddMarkup(Loc.GetString("bloodstream-component-looks-pale", ("target", ent.Owner))); + args.Message.AddMarkupOrThrow(Loc.GetString("bloodstream-component-looks-pale", ("target", ent.Owner))); } } diff --git a/Content.Shared/Armor/SharedArmorSystem.cs b/Content.Shared/Armor/SharedArmorSystem.cs index 73cb6da2c2..010ee5e65b 100644 --- a/Content.Shared/Armor/SharedArmorSystem.cs +++ b/Content.Shared/Armor/SharedArmorSystem.cs @@ -53,15 +53,14 @@ public abstract class SharedArmorSystem : EntitySystem private FormattedMessage GetArmorExamine(DamageModifierSet armorModifiers) { var msg = new FormattedMessage(); - - msg.AddMarkup(Loc.GetString("armor-examine")); + msg.AddMarkupOrThrow(Loc.GetString("armor-examine")); foreach (var coefficientArmor in armorModifiers.Coefficients) { msg.PushNewline(); var armorType = Loc.GetString("armor-damage-type-" + coefficientArmor.Key.ToLower()); - msg.AddMarkup(Loc.GetString("armor-coefficient-value", + msg.AddMarkupOrThrow(Loc.GetString("armor-coefficient-value", ("type", armorType), ("value", MathF.Round((1f - coefficientArmor.Value) * 100, 1)) )); @@ -72,7 +71,7 @@ public abstract class SharedArmorSystem : EntitySystem msg.PushNewline(); var armorType = Loc.GetString("armor-damage-type-" + flatArmor.Key.ToLower()); - msg.AddMarkup(Loc.GetString("armor-reduction-value", + msg.AddMarkupOrThrow(Loc.GetString("armor-reduction-value", ("type", armorType), ("value", flatArmor.Value) )); diff --git a/Content.Shared/Blocking/BlockingSystem.cs b/Content.Shared/Blocking/BlockingSystem.cs index 3e1ff4284c..594d1baf6c 100644 --- a/Content.Shared/Blocking/BlockingSystem.cs +++ b/Content.Shared/Blocking/BlockingSystem.cs @@ -320,8 +320,7 @@ public sealed partial class BlockingSystem : EntitySystem var modifier = component.IsBlocking ? component.ActiveBlockDamageModifier : component.PassiveBlockDamageModifer; var msg = new FormattedMessage(); - - msg.AddMarkup(Loc.GetString("blocking-fraction", ("value", MathF.Round(fraction * 100, 1)))); + msg.AddMarkupOrThrow(Loc.GetString("blocking-fraction", ("value", MathF.Round(fraction * 100, 1)))); AppendCoefficients(modifier, msg); @@ -337,7 +336,7 @@ public sealed partial class BlockingSystem : EntitySystem foreach (var coefficient in modifiers.Coefficients) { msg.PushNewline(); - msg.AddMarkup(Robust.Shared.Localization.Loc.GetString("blocking-coefficient-value", + msg.AddMarkupOrThrow(Robust.Shared.Localization.Loc.GetString("blocking-coefficient-value", ("type", coefficient.Key), ("value", MathF.Round(coefficient.Value * 100, 1)) )); @@ -346,7 +345,7 @@ public sealed partial class BlockingSystem : EntitySystem foreach (var flat in modifiers.FlatReduction) { msg.PushNewline(); - msg.AddMarkup(Robust.Shared.Localization.Loc.GetString("blocking-reduction-value", + msg.AddMarkupOrThrow(Robust.Shared.Localization.Loc.GetString("blocking-reduction-value", ("type", flat.Key), ("value", flat.Value) )); diff --git a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs index ad9cd01fbf..9e5e24b3e4 100644 --- a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs +++ b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs @@ -903,11 +903,11 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem if (solution.Volume == 0) { - msg.AddMarkup(Loc.GetString("scannable-solution-empty-container")); + msg.AddMarkupOrThrow(Loc.GetString("scannable-solution-empty-container")); return msg; } - msg.AddMarkup(Loc.GetString("scannable-solution-main-text")); + msg.AddMarkupOrThrow(Loc.GetString("scannable-solution-main-text")); var reagentPrototypes = solution.GetReagentPrototypes(PrototypeManager); @@ -919,14 +919,14 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem foreach (var (proto, quantity) in sortedReagentPrototypes) { msg.PushNewline(); - msg.AddMarkup(Loc.GetString("scannable-solution-chemical" + msg.AddMarkupOrThrow(Loc.GetString("scannable-solution-chemical" , ("type", proto.LocalizedName) , ("color", proto.SubstanceColor.ToHexNoAlpha()) , ("amount", quantity))); } msg.PushNewline(); - msg.AddMarkup(Loc.GetString("scannable-solution-temperature", ("temperature", Math.Round(solution.Temperature)))); + msg.AddMarkupOrThrow(Loc.GetString("scannable-solution-temperature", ("temperature", Math.Round(solution.Temperature)))); return msg; } diff --git a/Content.Shared/Damage/Systems/DamageExamineSystem.cs b/Content.Shared/Damage/Systems/DamageExamineSystem.cs index fd1f191334..53436a920a 100644 --- a/Content.Shared/Damage/Systems/DamageExamineSystem.cs +++ b/Content.Shared/Damage/Systems/DamageExamineSystem.cs @@ -57,11 +57,11 @@ public sealed class DamageExamineSystem : EntitySystem if (string.IsNullOrEmpty(type)) { - msg.AddMarkup(Loc.GetString("damage-examine")); + msg.AddMarkupOrThrow(Loc.GetString("damage-examine")); } else { - msg.AddMarkup(Loc.GetString("damage-examine-type", ("type", type))); + msg.AddMarkupOrThrow(Loc.GetString("damage-examine-type", ("type", type))); } foreach (var damage in damageSpecifier.DamageDict) @@ -69,7 +69,7 @@ public sealed class DamageExamineSystem : EntitySystem if (damage.Value != FixedPoint2.Zero) { msg.PushNewline(); - msg.AddMarkup(Loc.GetString("damage-value", ("type", _prototype.Index(damage.Key).LocalizedName), ("amount", damage.Value))); + msg.AddMarkupOrThrow(Loc.GetString("damage-value", ("type", _prototype.Index(damage.Key).LocalizedName), ("amount", damage.Value))); } } From 0dc2d0acd05a0d054c7858961325833dc412ecdc Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 11 Aug 2024 03:07:02 +0000 Subject: [PATCH 377/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index fb364f7052..13d7d7ff00 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,17 +1,4 @@ Entries: -- author: metalgearsloth - changes: - - message: Add a reset button to character setup. - type: Add - - message: Actually get the import / export character buttons working. - type: Add - - message: Fix performance drop in the eye color picker. - type: Fix - - message: Fix instances where role timers don't load properly in character setup. - type: Fix - id: 6586 - time: '2024-05-11T23:18:21.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27576 - author: nikthechampiongr changes: - message: Fixed records consoles sometimes failing to show crew records. @@ -3786,3 +3773,12 @@ id: 7085 time: '2024-08-10T21:06:50.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30838 +- author: Scribbles0, Plykiya, nikthechampiongr + changes: + - message: You can now execute incapacitated/cuffed entities or yourself with certain + sharp weapons. Executions require a do-after, deal 9x the damage of a normal + attack, and ignore damage resistances. + type: Add + id: 7086 + time: '2024-08-11T03:05:54.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30104 From 8d72e7d93279242251fe8edc325e6d926340fa62 Mon Sep 17 00:00:00 2001 From: Plykiya <58439124+Plykiya@users.noreply.github.com> Date: Sat, 10 Aug 2024 20:12:26 -0700 Subject: [PATCH 378/422] Make head of department lockers use EntityTables (#30854) * EntityTables for head of department lockers * I hope this works * even smaller --------- Co-authored-by: plykiya --- .../Catalog/Fills/Lockers/heads.yml | 555 ++++++++++-------- .../Catalog/Fills/Lockers/suit_storage.yml | 50 +- 2 files changed, 327 insertions(+), 278 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index af45bdfc6a..a56c31566c 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -1,308 +1,365 @@ +- type: entityTable + id: LockerFillQuarterMaster + table: !type:AllSelector + children: + - id: BoxEncryptionKeyCargo + - id: BoxFolderQmClipboard + - id: CargoBountyComputerCircuitboard + - id: CargoRequestComputerCircuitboard + - id: CargoSaleComputerCircuitboard + - id: CargoShuttleComputerCircuitboard + - id: CargoShuttleConsoleCircuitboard + - id: CigPackGreen + prob: 0.50 + - id: ClothingHeadsetAltCargo + - id: DoorRemoteCargo + - id: RubberStampApproved + - id: RubberStampDenied + - id: RubberStampQm + - id: SalvageShuttleConsoleCircuitboard + - type: entity id: LockerQuarterMasterFilled suffix: Filled parent: LockerQuarterMaster components: - - type: StorageFill - contents: - - id: BoxFolderQmClipboard - - id: CargoRequestComputerCircuitboard - - id: CargoSaleComputerCircuitboard - - id: CargoShuttleComputerCircuitboard - - id: CargoShuttleConsoleCircuitboard - - id: SalvageShuttleConsoleCircuitboard - - id: CargoBountyComputerCircuitboard - - id: CigPackGreen - prob: 0.50 - - id: DoorRemoteCargo - - id: RubberStampQm - - id: RubberStampDenied - - id: RubberStampApproved - - id: ClothingHeadsetAltCargo - - id: BoxEncryptionKeyCargo + - type: EntityTableContainerFill + containers: + entity_storage: !type:NestedSelector + tableId: LockerFillQuarterMaster -- type: entity - id: LockerCaptainFilledHardsuit - suffix: Filled, Hardsuit - parent: LockerCaptain - components: - - type: StorageFill - contents: - - id: ClothingOuterArmorCaptainCarapace - - id: NukeDisk - - id: PinpointerNuclear - - id: CaptainIDCard - - id: ClothingOuterHardsuitCap - - id: ClothingMaskGasCaptain - - id: WeaponDisabler - - id: CommsComputerCircuitboard - - id: ClothingHeadsetAltCommand - - id: SpaceCash1000 - - id: PlushieNuke - prob: 0.1 - - id: CigarGoldCase - prob: 0.25 - - id: ClothingBeltSheathFilled - - id: DoorRemoteCommand - - id: RubberStampCaptain - - id: WeaponAntiqueLaser - - id: JetpackCaptainFilled - - id: MedalCase +# No laser table +- type: entityTable + id: LockerFillCaptainNoLaser + table: !type:AllSelector + children: + - id: CaptainIDCard + - id: CigarGoldCase + prob: 0.25 + - id: ClothingBeltSheathFilled + - id: ClothingHeadsetAltCommand + - id: ClothingOuterArmorCaptainCarapace + - id: CommsComputerCircuitboard + - id: DoorRemoteCommand + - id: MedalCase + - id: NukeDisk + - id: PinpointerNuclear + - id: PlushieNuke + prob: 0.1 + - id: RubberStampCaptain + - id: SpaceCash1000 + - id: WeaponDisabler -- type: entity - id: LockerCaptainFilled - suffix: Filled, AntiqueLaser - parent: LockerCaptain - components: - - type: StorageFill - contents: - - id: ClothingOuterArmorCaptainCarapace - - id: NukeDisk - - id: PinpointerNuclear - - id: CaptainIDCard - - id: WeaponDisabler - - id: CommsComputerCircuitboard - - id: ClothingHeadsetAltCommand - - id: SpaceCash1000 - - id: PlushieNuke - prob: 0.1 - - id: CigarGoldCase - prob: 0.25 - - id: ClothingBeltSheathFilled - - id: DoorRemoteCommand - - id: RubberStampCaptain - - id: WeaponAntiqueLaser - - id: JetpackCaptainFilled - - id: MedalCase +# No laser table + Laser table +- type: entityTable + id: LockerFillCaptainLaser + table: !type:AllSelector + children: + - !type:NestedSelector + tableId: LockerFillCaptainNoLaser + - id: WeaponAntiqueLaser +# Hardsuit table, used for suit storage as well +- type: entityTable + id: FillCaptainHardsuit + table: !type:AllSelector + children: + - id: ClothingOuterHardsuitCap + - id: ClothingMaskGasCaptain + - id: JetpackCaptainFilled + - id: OxygenTankFilled + +# No laser locker, used when the antique laser is placed in the special display crate - type: entity id: LockerCaptainFilledNoLaser suffix: Filled parent: LockerCaptain components: - - type: StorageFill - contents: - - id: ClothingOuterArmorCaptainCarapace - - id: NukeDisk - - id: PinpointerNuclear - - id: CaptainIDCard - - id: WeaponDisabler - - id: CommsComputerCircuitboard - - id: ClothingHeadsetAltCommand - - id: SpaceCash1000 - - id: PlushieNuke - prob: 0.1 - - id: CigarGoldCase - prob: 0.25 - - id: ClothingBeltSheathFilled - - id: DoorRemoteCommand - - id: RubberStampCaptain - - id: JetpackCaptainFilled - - id: MedalCase + - type: EntityTableContainerFill + containers: + entity_storage: !type:NestedSelector + tableId: LockerFillCaptainNoLaser + +# No Laser + Laser locker +- type: entity + id: LockerCaptainFilled + suffix: Filled, AntiqueLaser + parent: LockerCaptain + components: + - type: EntityTableContainerFill + containers: + entity_storage: !type:NestedSelector + tableId: LockerFillCaptainLaser + +# No Laser + Laser + Hardsuit locker +- type: entity + id: LockerCaptainFilledHardsuit + suffix: Filled, Hardsuit + parent: LockerCaptain + components: + - type: EntityTableContainerFill + containers: + entity_storage: !type:AllSelector + children: + - !type:NestedSelector + tableId: LockerFillCaptainLaser + - !type:NestedSelector + tableId: FillCaptainHardsuit + +- type: entityTable + id: LockerFillHeadOfPersonnel + table: !type:AllSelector + children: + - id: AccessConfigurator + - id: BoxEncryptionKeyPassenger + - id: BoxEncryptionKeyService + - id: BoxHeadset + - id: BoxID + - id: BoxPDA + - id: CigarGoldCase + prob: 0.25 + # Fuck the HoP they don't deserve fucking cigars. + # Yes they do fuck you. + - id: ClothingBackpackIan + prob: 0.5 + - id: ClothingHeadsetCommand + - id: ClothingNeckGoldmedal + - id: DoorRemoteService + - id: HoPIDCard + - id: IDComputerCircuitboard + - id: RubberStampApproved + - id: RubberStampDenied + - id: RubberStampHop + - id: WeaponDisabler - type: entity id: LockerHeadOfPersonnelFilled suffix: Filled parent: LockerHeadOfPersonnel components: - - type: StorageFill - contents: - - id: HoPIDCard - - id: ClothingHeadsetCommand - - id: BoxPDA - - id: BoxID - - id: BoxHeadset - - id: IDComputerCircuitboard - - id: WeaponDisabler - - id: CigarGoldCase - prob: 0.25 - # Fuck the HoP they don't deserve fucking cigars. - # Yes they do fuck you. - - id: DoorRemoteService - - id: ClothingNeckGoldmedal - - id: RubberStampHop - - id: RubberStampDenied - - id: RubberStampApproved - - id: BoxEncryptionKeyPassenger - - id: BoxEncryptionKeyService - - id: ClothingBackpackIan - prob: 0.5 - - id: AccessConfigurator + - type: EntityTableContainerFill + containers: + entity_storage: !type:NestedSelector + tableId: LockerFillHeadOfPersonnel -- type: entity - id: LockerChiefEngineerFilledHardsuit - suffix: Filled, Hardsuit - parent: LockerChiefEngineer - components: - - type: StorageFill - contents: - - id: ClothingOuterHardsuitEngineeringWhite - - id: ClothingMaskBreath - - id: ClothingEyesGlassesMeson - - id: ClothingBeltChiefEngineerFilled - - id: ClothingShoesBootsMagAdv - - id: ClothingHandsGlovesColorYellow - - id: CigarCase - prob: 0.15 - - id: DoorRemoteEngineering - - id: RubberStampCE - - id: JetpackVoidFilled - - id: ClothingHeadsetAltEngineering - - id: BoxEncryptionKeyEngineering - - id: AccessConfigurator - - id: RCD - - id: RCDAmmo +# No hardsuit table +- type: entityTable + id: LockerFillChiefEngineerNoHardsuit + table: !type:AllSelector + children: + - id: AccessConfigurator + - id: BoxEncryptionKeyEngineering + - id: CigarCase + prob: 0.15 + - id: ClothingBeltChiefEngineerFilled + - id: ClothingEyesGlassesMeson + - id: ClothingHandsGlovesColorYellow + - id: ClothingHeadsetAltEngineering + - id: DoorRemoteEngineering + - id: RCD + - id: RCDAmmo + - id: RubberStampCE +# Hardsuit table, used for suit storage as well +- type: entityTable + id: FillChiefEngineerHardsuit + table: !type:AllSelector + children: + - id: ClothingMaskBreath + - id: ClothingOuterHardsuitEngineeringWhite + - id: ClothingShoesBootsMagAdv + - id: JetpackVoidFilled + - id: OxygenTankFilled + +# No hardsuit locker - type: entity id: LockerChiefEngineerFilled suffix: Filled parent: LockerChiefEngineer components: - - type: StorageFill - contents: - - id: ClothingEyesGlassesMeson - - id: ClothingBeltChiefEngineerFilled - - id: ClothingHandsGlovesColorYellow - - id: CigarCase - prob: 0.15 - - id: DoorRemoteEngineering - - id: RubberStampCE - - id: ClothingHeadsetAltEngineering - - id: BoxEncryptionKeyEngineering - - id: AccessConfigurator - - id: RCD - - id: RCDAmmo + - type: EntityTableContainerFill + containers: + entity_storage: !type:NestedSelector + tableId: LockerFillChiefEngineerNoHardsuit +# No hardsuit + hardsuit locker - type: entity - id: LockerChiefMedicalOfficerFilledHardsuit + id: LockerChiefEngineerFilledHardsuit suffix: Filled, Hardsuit - parent: LockerChiefMedicalOfficer + parent: LockerChiefEngineer components: - - type: StorageFill - contents: - - id: MedkitFilled - - id: ClothingHandsGlovesNitrile - - id: ClothingEyesHudMedical - - id: ClothingHeadsetAltMedical - - id: ClothingCloakCmo - - id: ClothingBackpackDuffelSurgeryFilled - - id: ClothingMaskSterile - - id: ClothingHeadHatBeretCmo - - id: ClothingOuterHardsuitMedical - - id: Hypospray - - id: HandheldCrewMonitor - - id: DoorRemoteMedical - - id: RubberStampCMO - - id: MedicalTechFabCircuitboard - - id: BoxEncryptionKeyMedical + - type: EntityTableContainerFill + containers: + entity_storage: !type:AllSelector + children: + - !type:NestedSelector + tableId: LockerFillChiefEngineerNoHardsuit + - !type:NestedSelector + tableId: FillChiefEngineerHardsuit +# No hardsuit table +- type: entityTable + id: LockerFillChiefMedicalOfficerNoHardsuit + table: !type:AllSelector + children: + - id: BoxEncryptionKeyMedical + - id: ClothingBackpackDuffelSurgeryFilled + - id: ClothingCloakCmo + - id: ClothingEyesHudMedical + - id: ClothingHandsGlovesNitrile + - id: ClothingHeadHatBeretCmo + - id: ClothingHeadsetAltMedical + - id: ClothingMaskSterile + - id: DoorRemoteMedical + - id: HandheldCrewMonitor + - id: Hypospray + - id: MedicalTechFabCircuitboard + - id: MedkitFilled + - id: RubberStampCMO + +# Hardsuit table, used for suit storage as well +- type: entityTable + id: FillChiefMedicalOfficerHardsuit + table: !type:AllSelector + children: + - id: ClothingMaskBreathMedical + - id: ClothingOuterHardsuitMedical + - id: OxygenTankFilled + +# No hardsuit locker - type: entity id: LockerChiefMedicalOfficerFilled suffix: Filled parent: LockerChiefMedicalOfficer components: - - type: StorageFill - contents: - - id: MedkitFilled - - id: ClothingHandsGlovesNitrile - - id: ClothingEyesHudMedical - - id: ClothingHeadsetAltMedical - - id: ClothingBackpackDuffelSurgeryFilled - - id: ClothingMaskSterile - - id: Hypospray - - id: HandheldCrewMonitor - - id: DoorRemoteMedical - - id: RubberStampCMO - - id: MedicalTechFabCircuitboard - - id: BoxEncryptionKeyMedical + - type: EntityTableContainerFill + containers: + entity_storage: !type:NestedSelector + tableId: LockerFillChiefMedicalOfficerNoHardsuit +# No hardsuit + Hardsuit locker - type: entity - id: LockerResearchDirectorFilledHardsuit + id: LockerChiefMedicalOfficerFilledHardsuit suffix: Filled, Hardsuit - parent: LockerResearchDirector + parent: LockerChiefMedicalOfficer components: - - type: StorageFill - contents: - - id: ResearchComputerCircuitboard - - id: ProtolatheMachineCircuitboard - - id: CircuitImprinterMachineCircuitboard - - id: ClothingOuterHardsuitRd - - id: HandTeleporter - - id: DoorRemoteResearch - - id: ClothingBeltUtilityFilled - - id: RubberStampRd - - id: BoxEncryptionKeyScience - - id: ClothingHeadsetAltScience - - id: EncryptionKeyBinary + - type: EntityTableContainerFill + containers: + entity_storage: !type:AllSelector + children: + - !type:NestedSelector + tableId: LockerFillChiefMedicalOfficerNoHardsuit + - !type:NestedSelector + tableId: FillChiefMedicalOfficerHardsuit +# No hardsuit table +- type: entityTable + id: LockerFillResearchDirectorNoHardsuit + table: !type:AllSelector + children: + - id: BoxEncryptionKeyScience + - id: CircuitImprinterMachineCircuitboard + - id: ClothingBeltUtilityFilled + - id: ClothingHeadsetAltScience + - id: DoorRemoteResearch + - id: EncryptionKeyBinary + - id: HandTeleporter + - id: ProtolatheMachineCircuitboard + - id: ResearchComputerCircuitboard + - id: RubberStampRd + +# Hardsuit table, used for suit storage as well +- type: entityTable + id: FillResearchDirectorHardsuit + table: !type:AllSelector + children: + - id: ClothingMaskBreath + - id: ClothingOuterHardsuitRd + - id: OxygenTankFilled + +# No hardsuit locker - type: entity id: LockerResearchDirectorFilled suffix: Filled parent: LockerResearchDirector components: - - type: StorageFill - contents: - - id: ResearchComputerCircuitboard - - id: ProtolatheMachineCircuitboard - - id: CircuitImprinterMachineCircuitboard - - id: HandTeleporter - - id: DoorRemoteResearch - - id: ClothingBeltUtilityFilled - - id: RubberStampRd - - id: BoxEncryptionKeyScience - - id: ClothingHeadsetAltScience - - id: EncryptionKeyBinary + - type: EntityTableContainerFill + containers: + entity_storage: !type:NestedSelector + tableId: LockerFillResearchDirectorNoHardsuit +# No hardsuit + Hardsuit locker - type: entity - id: LockerHeadOfSecurityFilledHardsuit + id: LockerResearchDirectorFilledHardsuit suffix: Filled, Hardsuit - parent: LockerHeadOfSecurity + parent: LockerResearchDirector components: - - type: StorageFill - contents: - - id: WeaponDisabler - - id: ClothingOuterCoatHoSTrench - - id: ClothingMaskNeckGaiter - - id: ClothingOuterHardsuitSecurityRed - - id: ClothingMaskGasSwat - - id: ClothingBeltSecurityFilled - - id: ClothingHeadsetAltSecurity - - id: ClothingEyesGlassesSecurity - - id: ClothingShoesBootsJack - - id: CigarGoldCase - prob: 0.50 - - id: DoorRemoteSecurity - - id: RubberStampHos - - id: SecurityTechFabCircuitboard - - id: JetpackSecurityFilled - - id: BoxEncryptionKeySecurity - - id: HoloprojectorSecurity - - id: BookSecretDocuments - - id: BookSpaceLaw + - type: EntityTableContainerFill + containers: + entity_storage: !type:AllSelector + children: + - !type:NestedSelector + tableId: LockerFillResearchDirectorNoHardsuit + - !type:NestedSelector + tableId: FillResearchDirectorHardsuit +# No hardsuit table +- type: entityTable + id: LockerFillHeadOfSecurityNoHardsuit + table: !type:AllSelector + children: + - id: BookSecretDocuments + - id: BookSpaceLaw + - id: BoxEncryptionKeySecurity + - id: CigarGoldCase + prob: 0.50 + - id: ClothingBeltSecurityFilled + - id: ClothingEyesGlassesSecurity + - id: ClothingHeadsetAltSecurity + - id: ClothingMaskNeckGaiter + - id: ClothingOuterCoatHoSTrench + - id: ClothingShoesBootsJack + - id: DoorRemoteSecurity + - id: HoloprojectorSecurity + - id: RubberStampHos + - id: SecurityTechFabCircuitboard + - id: WeaponDisabler + +# Hardsuit table, used for suit storage as well +- type: entityTable + id: FillHeadOfSecurityHardsuit + table: !type:AllSelector + children: + - id: ClothingMaskGasSwat + - id: ClothingOuterHardsuitSecurityRed + - id: JetpackSecurityFilled + - id: OxygenTankFilled + +# No hardsuit locker - type: entity id: LockerHeadOfSecurityFilled suffix: Filled parent: LockerHeadOfSecurity components: - - type: StorageFill - contents: - - id: WeaponDisabler - - id: ClothingOuterCoatHoSTrench - - id: ClothingMaskNeckGaiter - - id: ClothingBeltSecurityFilled - - id: ClothingHeadsetAltSecurity - - id: ClothingEyesGlassesSecurity - - id: ClothingShoesBootsJack - - id: CigarGoldCase - prob: 0.50 - - id: DoorRemoteSecurity - - id: RubberStampHos - - id: SecurityTechFabCircuitboard - - id: BoxEncryptionKeySecurity - - id: HoloprojectorSecurity - - id: BookSecretDocuments - - id: BookSpaceLaw + - type: EntityTableContainerFill + containers: + entity_storage: !type:NestedSelector + tableId: LockerFillHeadOfSecurityNoHardsuit + +# No hardsuit + Hardsuit locker +- type: entity + id: LockerHeadOfSecurityFilledHardsuit + suffix: Filled, Hardsuit + parent: LockerHeadOfSecurity + components: + - type: EntityTableContainerFill + containers: + entity_storage: !type:AllSelector + children: + - !type:NestedSelector + tableId: LockerFillHeadOfSecurityNoHardsuit + - !type:NestedSelector + tableId: FillHeadOfSecurityHardsuit - type: entity id: LockerFreezerVaultFilled diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml index b9ce46878b..5d48f9efab 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml @@ -44,7 +44,7 @@ suffix: Prisoner EVA components: - type: StorageFill - contents: + contents: - id: OxygenTankFilled - id: ClothingOuterHardsuitEVAPrisoner - id: ClothingHeadHelmetEVALarge @@ -150,13 +150,10 @@ parent: SuitStorageBase suffix: Chief Engineer components: - - type: StorageFill - contents: - - id: OxygenTankFilled - - id: JetpackVoidFilled - - id: ClothingShoesBootsMagAdv - - id: ClothingOuterHardsuitEngineeringWhite - - id: ClothingMaskBreath + - type: EntityTableContainerFill + containers: + entity_storage: !type:NestedSelector + tableId: FillChiefEngineerHardsuit - type: AccessReader access: [["ChiefEngineer"]] @@ -166,11 +163,10 @@ parent: SuitStorageBase suffix: Chief Medical Officer components: - - type: StorageFill - contents: - - id: OxygenTankFilled - - id: ClothingOuterHardsuitMedical - - id: ClothingMaskBreathMedical + - type: EntityTableContainerFill + containers: + entity_storage: !type:NestedSelector + tableId: FillChiefMedicalOfficerHardsuit - type: AccessReader access: [ [ "ChiefMedicalOfficer" ] ] @@ -180,11 +176,10 @@ parent: SuitStorageBase suffix: Research Director components: - - type: StorageFill - contents: - - id: OxygenTankFilled - - id: ClothingOuterHardsuitRd - - id: ClothingMaskBreath + - type: EntityTableContainerFill + containers: + entity_storage: !type:NestedSelector + tableId: FillResearchDirectorHardsuit - type: AccessReader access: [ [ "ResearchDirector" ] ] @@ -194,12 +189,10 @@ parent: SuitStorageBase suffix: Head of Security components: - - type: StorageFill - contents: - - id: OxygenTankFilled - - id: JetpackSecurityFilled - - id: ClothingOuterHardsuitSecurityRed - - id: ClothingMaskGasSwat + - type: EntityTableContainerFill + containers: + entity_storage: !type:NestedSelector + tableId: FillHeadOfSecurityHardsuit - type: AccessReader access: [["HeadOfSecurity"]] @@ -223,11 +216,10 @@ parent: SuitStorageBase suffix: Captain components: - - type: StorageFill - contents: - - id: OxygenTankFilled - - id: ClothingOuterHardsuitCap - - id: ClothingMaskGasCaptain + - type: EntityTableContainerFill + containers: + entity_storage: !type:NestedSelector + tableId: FillCaptainHardsuit - type: AccessReader access: [["Captain"]] From d7b5ae061a604bcc2cf97b7cb02cb0ac7be9e131 Mon Sep 17 00:00:00 2001 From: Mervill Date: Sat, 10 Aug 2024 23:09:33 -0700 Subject: [PATCH 379/422] Don't show Station Event announcements to players in the lobby. (#30886) * Don't show Station Event announcements to players in the lobby. * fix pr --------- Co-authored-by: metalgearsloth --- Content.Server/Chat/Systems/ChatSystem.cs | 34 +++++++++++++++++-- .../GameTicking/GameTicker.Lobby.cs | 6 ++++ .../Events/StationEventSystem.cs | 20 +++++++---- 3 files changed, 52 insertions(+), 8 deletions(-) diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs index 88b306c6ad..4875aba0aa 100644 --- a/Content.Server/Chat/Systems/ChatSystem.cs +++ b/Content.Server/Chat/Systems/ChatSystem.cs @@ -330,11 +330,41 @@ public sealed partial class ChatSystem : SharedChatSystem _chatManager.ChatMessageToAll(ChatChannel.Radio, message, wrappedMessage, default, false, true, colorOverride); if (playSound) { - _audio.PlayGlobal(announcementSound?.GetSound() ?? DefaultAnnouncementSound, Filter.Broadcast(), true, AudioParams.Default.WithVolume(-2f)); + _audio.PlayGlobal(announcementSound == null ? DefaultAnnouncementSound : _audio.GetSound(announcementSound), Filter.Broadcast(), true, AudioParams.Default.WithVolume(-2f)); } _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Global station announcement from {sender}: {message}"); } + /// + /// Dispatches an announcement to players selected by filter. + /// + /// Filter to select players who will recieve the announcement + /// The contents of the message + /// The entity making the announcement (used to determine the station) + /// The sender (Communications Console in Communications Console Announcement) + /// Play the announcement sound + /// Sound to play + /// Optional color for the announcement message + public void DispatchFilteredAnnouncement( + Filter filter, + string message, + EntityUid? source = null, + string? sender = null, + bool playSound = true, + SoundSpecifier? announcementSound = null, + Color? colorOverride = null) + { + sender ??= Loc.GetString("chat-manager-sender-announcement"); + + var wrappedMessage = Loc.GetString("chat-manager-sender-announcement-wrap-message", ("sender", sender), ("message", FormattedMessage.EscapeText(message))); + _chatManager.ChatMessageToManyFiltered(filter, ChatChannel.Radio, message, wrappedMessage, source ?? default, false, true, colorOverride); + if (playSound) + { + _audio.PlayGlobal(announcementSound?.ToString() ?? DefaultAnnouncementSound, filter, true, AudioParams.Default.WithVolume(-2f)); + } + _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Station Announcement from {sender}: {message}"); + } + /// /// Dispatches an announcement on a specific station /// @@ -370,7 +400,7 @@ public sealed partial class ChatSystem : SharedChatSystem if (playDefaultSound) { - _audio.PlayGlobal(announcementSound?.GetSound() ?? DefaultAnnouncementSound, filter, true, AudioParams.Default.WithVolume(-2f)); + _audio.PlayGlobal(announcementSound?.ToString() ?? DefaultAnnouncementSound, filter, true, AudioParams.Default.WithVolume(-2f)); } _adminLogger.Add(LogType.Chat, LogImpact.Low, $"Station Announcement on {station} from {sender}: {message}"); diff --git a/Content.Server/GameTicking/GameTicker.Lobby.cs b/Content.Server/GameTicking/GameTicker.Lobby.cs index 82ef8c6012..61d9fd99ca 100644 --- a/Content.Server/GameTicking/GameTicker.Lobby.cs +++ b/Content.Server/GameTicking/GameTicker.Lobby.cs @@ -179,5 +179,11 @@ namespace Content.Server.GameTicking // update server info to reflect new ready count UpdateInfoText(); } + + public bool UserHasJoinedGame(ICommonSession session) + => UserHasJoinedGame(session.UserId); + + public bool UserHasJoinedGame(NetUserId userId) + => PlayerGameStatuses[userId] == PlayerGameStatus.JoinedGame; } } diff --git a/Content.Server/StationEvents/Events/StationEventSystem.cs b/Content.Server/StationEvents/Events/StationEventSystem.cs index c4c51afd2a..67643a8df5 100644 --- a/Content.Server/StationEvents/Events/StationEventSystem.cs +++ b/Content.Server/StationEvents/Events/StationEventSystem.cs @@ -1,5 +1,6 @@ using Content.Server.Administration.Logs; using Content.Server.Chat.Systems; +using Content.Server.GameTicking; using Content.Server.GameTicking.Rules; using Content.Server.Station.Systems; using Content.Server.StationEvents.Components; @@ -21,6 +22,7 @@ public abstract class StationEventSystem : GameRuleSystem where T : ICompo [Dependency] protected readonly ChatSystem ChatSystem = default!; [Dependency] protected readonly SharedAudioSystem Audio = default!; [Dependency] protected readonly StationSystem StationSystem = default!; + [Dependency] protected readonly GameTicker GameTicker = default!; protected ISawmill Sawmill = default!; @@ -41,10 +43,13 @@ public abstract class StationEventSystem : GameRuleSystem where T : ICompo AdminLogManager.Add(LogType.EventAnnounced, $"Event added / announced: {ToPrettyString(uid)}"); - if (stationEvent.StartAnnouncement != null) - ChatSystem.DispatchGlobalAnnouncement(Loc.GetString(stationEvent.StartAnnouncement), playSound: false, colorOverride: stationEvent.StartAnnouncementColor); + // we don't want to send to players who aren't in game (i.e. in the lobby) + Filter allPlayersInGame = Filter.Empty().AddWhere(GameTicker.UserHasJoinedGame); - Audio.PlayGlobal(stationEvent.StartAudio, Filter.Broadcast(), true); + if (stationEvent.StartAnnouncement != null) + ChatSystem.DispatchFilteredAnnouncement(allPlayersInGame, Loc.GetString(stationEvent.StartAnnouncement), playSound: false, colorOverride: stationEvent.StartAnnouncementColor); + + Audio.PlayGlobal(stationEvent.StartAudio, allPlayersInGame, true); } /// @@ -77,10 +82,13 @@ public abstract class StationEventSystem : GameRuleSystem where T : ICompo AdminLogManager.Add(LogType.EventStopped, $"Event ended: {ToPrettyString(uid)}"); - if (stationEvent.EndAnnouncement != null) - ChatSystem.DispatchGlobalAnnouncement(Loc.GetString(stationEvent.EndAnnouncement), playSound: false, colorOverride: stationEvent.EndAnnouncementColor); + // we don't want to send to players who aren't in game (i.e. in the lobby) + Filter allPlayersInGame = Filter.Empty().AddWhere(GameTicker.UserHasJoinedGame); - Audio.PlayGlobal(stationEvent.EndAudio, Filter.Broadcast(), true); + if (stationEvent.EndAnnouncement != null) + ChatSystem.DispatchFilteredAnnouncement(allPlayersInGame, Loc.GetString(stationEvent.EndAnnouncement), playSound: false, colorOverride: stationEvent.EndAnnouncementColor); + + Audio.PlayGlobal(stationEvent.EndAudio, allPlayersInGame, true); } /// From 6aed90ed758f386c178418c80fe6ff49740a9b69 Mon Sep 17 00:00:00 2001 From: Plykiya <58439124+Plykiya@users.noreply.github.com> Date: Sat, 10 Aug 2024 23:21:34 -0700 Subject: [PATCH 380/422] Rename cooking shelf, improve content whitelist (#30858) Rename cooking shelf to kitchen shelf Co-authored-by: plykiya --- .../Entities/Objects/Consumable/Drinks/drinks_cups.yml | 3 +++ .../Prototypes/Entities/Structures/Wallmounts/shelfs.yml | 8 ++++++-- Resources/Prototypes/Recipes/Construction/storage.yml | 2 +- Resources/Prototypes/tags.yml | 5 ++++- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml index f0103cc219..18e70d5d66 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml @@ -39,6 +39,9 @@ types: Blunt: 0 - type: DnaSubstanceTrace + - type: Tag + tags: + - DrinkCup - type: entity parent: DrinkBaseCup diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml index 793e7211a5..ef501b843e 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/shelfs.yml @@ -70,7 +70,7 @@ map: ["enum.StorageVisualLayers.Base"] - state: unlocked shader: unshaded - # used to keep the unlocked light visible while open. + # used to keep the unlocked light visible while open. - state: closed map: ["enum.StorageVisualLayers.Door"] - state: locked @@ -342,7 +342,7 @@ - type: entity id: ShelfKitchen parent: ShelfBase - name: cooking shelf + name: kitchen shelf description: Holds knifes, spice, and everything nice! components: - type: Sprite @@ -385,6 +385,9 @@ maxItemSize: Normal whitelist: tags: + - DrinkBottle + - DrinkCan + - DrinkCup - DrinkGlass - BoxCardboard - MonkeyCube @@ -397,6 +400,7 @@ - RollingPin - Ingredient - Trash + - Plastic - type: Construction graph: Shelf node: ShelfKitchen diff --git a/Resources/Prototypes/Recipes/Construction/storage.yml b/Resources/Prototypes/Recipes/Construction/storage.yml index 7128c79eee..48f6dd4d03 100644 --- a/Resources/Prototypes/Recipes/Construction/storage.yml +++ b/Resources/Prototypes/Recipes/Construction/storage.yml @@ -186,7 +186,7 @@ - type: construction id: ShelfKitchen - name: cooking shelf + name: kitchen shelf description: Holds your knifes, spice, and everything nice! graph: Shelf startNode: start diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index adf25cc71d..5e1b5cbe4d 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -545,13 +545,16 @@ - type: Tag id: DrinkCan +- type: Tag + id: DrinkCup + - type: Tag id: DrinkGlass - type: Tag id: DrinkSpaceGlue -- type: Tag +- type: Tag id: Dropper - type: Tag From c8f1c22ff2508a85f4fb909438e6fc5fd8481eaf Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 11 Aug 2024 06:22:41 +0000 Subject: [PATCH 381/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 13d7d7ff00..bacb65611d 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: nikthechampiongr - changes: - - message: Fixed records consoles sometimes failing to show crew records. - type: Fix - id: 6587 - time: '2024-05-12T15:07:54.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27883 - author: ShadowCommander changes: - message: Fixed cyborg laws window and other UIs breaking when the built in light @@ -3782,3 +3775,11 @@ id: 7086 time: '2024-08-11T03:05:54.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30104 +- author: Plykiya + changes: + - message: Cooking shelves have been renamed to Kitchen shelves, you can now put + more drinks and cutlery in them. + type: Tweak + id: 7087 + time: '2024-08-11T06:21:34.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30858 From 67253a3fe19e8da32c75cb416ecf1ef2b99555dc Mon Sep 17 00:00:00 2001 From: BombasterDS <115770678+BombasterDS@users.noreply.github.com> Date: Sun, 11 Aug 2024 19:04:42 +1000 Subject: [PATCH 382/422] Change suit sensors on other players (#29668) * Suit sensors can be turned off on other players * less doafter time + interaction (nostate) check * code cleanup * code cleanup 2 --- .../SuitSensors/SuitSensorComponent.cs | 20 ++++--- .../Medical/SuitSensors/SuitSensorSystem.cs | 60 ++++++++++++++++--- .../Medical/SuitSensor/SharedSuitSensor.cs | 14 +++++ 3 files changed, 78 insertions(+), 16 deletions(-) diff --git a/Content.Server/Medical/SuitSensors/SuitSensorComponent.cs b/Content.Server/Medical/SuitSensors/SuitSensorComponent.cs index 9079655c80..91039712e5 100644 --- a/Content.Server/Medical/SuitSensors/SuitSensorComponent.cs +++ b/Content.Server/Medical/SuitSensors/SuitSensorComponent.cs @@ -14,37 +14,43 @@ public sealed partial class SuitSensorComponent : Component /// /// Choose a random sensor mode when item is spawned. /// - [DataField("randomMode")] + [DataField] public bool RandomMode = true; /// /// If true user can't change suit sensor mode /// - [DataField("controlsLocked")] + [DataField] public bool ControlsLocked = false; + /// + /// How much time it takes to change another player's sensors + /// + [DataField] + public float SensorsTime = 1.75f; + /// /// Current sensor mode. Can be switched by user verbs. /// - [DataField("mode")] + [DataField] public SuitSensorMode Mode = SuitSensorMode.SensorOff; /// /// Activate sensor if user wear it in this slot. /// - [DataField("activationSlot")] + [DataField] public string ActivationSlot = "jumpsuit"; /// /// Activate sensor if user has this in a sensor-compatible container. /// - [DataField("activationContainer")] + [DataField] public string? ActivationContainer; /// /// How often does sensor update its owners status (in seconds). Limited by the system update rate. /// - [DataField("updateRate")] + [DataField] public TimeSpan UpdateRate = TimeSpan.FromSeconds(2f); /// @@ -56,7 +62,7 @@ public sealed partial class SuitSensorComponent : Component /// /// Next time when sensor updated owners status /// - [DataField("nextUpdate", customTypeSerializer:typeof(TimeOffsetSerializer))] + [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))] [AutoPausedField] public TimeSpan NextUpdate = TimeSpan.Zero; diff --git a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs index dc1bb1124d..2b412654d5 100644 --- a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs +++ b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs @@ -8,10 +8,13 @@ using Content.Server.GameTicking; using Content.Server.Medical.CrewMonitoring; using Content.Server.Popups; using Content.Server.Station.Systems; +using Content.Shared.ActionBlocker; using Content.Shared.Clothing; using Content.Shared.Damage; using Content.Shared.DeviceNetwork; +using Content.Shared.DoAfter; using Content.Shared.Examine; +using Content.Shared.Interaction; using Content.Shared.Medical.SuitSensor; using Content.Shared.Mobs.Components; using Content.Shared.Mobs.Systems; @@ -35,6 +38,9 @@ public sealed class SuitSensorSystem : EntitySystem [Dependency] private readonly StationSystem _stationSystem = default!; [Dependency] private readonly SingletonDeviceNetServerSystem _singletonServerSystem = default!; [Dependency] private readonly MobThresholdSystem _mobThresholdSystem = default!; + [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!; + [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; + [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!; public override void Initialize() { @@ -49,6 +55,7 @@ public sealed class SuitSensorSystem : EntitySystem SubscribeLocalEvent(OnRemove); SubscribeLocalEvent(OnEmpPulse); SubscribeLocalEvent(OnEmpFinished); + SubscribeLocalEvent(OnSuitSensorDoAfter); } public override void Update(float frameTime) @@ -205,7 +212,14 @@ public sealed class SuitSensorSystem : EntitySystem return; // standard interaction checks - if (!args.CanAccess || !args.CanInteract || args.Hands == null) + if (!args.CanInteract || args.Hands == null) + return; + + if (!_interactionSystem.InRangeUnobstructed(args.User, args.Target)) + return; + + // check if target is incapacitated (cuffed, dead, etc) + if (component.User != null && args.User != component.User && _actionBlocker.CanInteract(component.User.Value, null)) return; args.Verbs.UnionWith(new[] @@ -239,7 +253,7 @@ public sealed class SuitSensorSystem : EntitySystem args.Disabled = true; component.PreviousMode = component.Mode; - SetSensor(uid, SuitSensorMode.SensorOff, null, component); + SetSensor((uid, component), SuitSensorMode.SensorOff, null); component.PreviousControlsLocked = component.ControlsLocked; component.ControlsLocked = true; @@ -247,7 +261,7 @@ public sealed class SuitSensorSystem : EntitySystem private void OnEmpFinished(EntityUid uid, SuitSensorComponent component, ref EmpDisabledRemoved args) { - SetSensor(uid, component.PreviousMode, null, component); + SetSensor((uid, component), component.PreviousMode, null); component.ControlsLocked = component.PreviousControlsLocked; } @@ -259,7 +273,7 @@ public sealed class SuitSensorSystem : EntitySystem Disabled = component.Mode == mode, Priority = -(int) mode, // sort them in descending order Category = VerbCategory.SetSensor, - Act = () => SetSensor(uid, mode, userUid, component) + Act = () => TrySetSensor((uid, component), mode, userUid) }; } @@ -287,18 +301,46 @@ public sealed class SuitSensorSystem : EntitySystem return Loc.GetString(name); } - public void SetSensor(EntityUid uid, SuitSensorMode mode, EntityUid? userUid = null, - SuitSensorComponent? component = null) + public void TrySetSensor(Entity sensors, SuitSensorMode mode, EntityUid userUid) { - if (!Resolve(uid, ref component)) + var comp = sensors.Comp; + + if (!Resolve(sensors, ref comp)) return; - component.Mode = mode; + if (comp.User == null || userUid == comp.User) + SetSensor(sensors, mode, userUid); + else + { + var doAfterEvent = new SuitSensorChangeDoAfterEvent(mode); + var doAfterArgs = new DoAfterArgs(EntityManager, userUid, comp.SensorsTime, doAfterEvent, sensors) + { + BreakOnMove = true, + BreakOnDamage = true + }; + + _doAfterSystem.TryStartDoAfter(doAfterArgs); + } + } + + private void OnSuitSensorDoAfter(Entity sensors, ref SuitSensorChangeDoAfterEvent args) + { + if (args.Handled || args.Cancelled) + return; + + SetSensor(sensors, args.Mode, args.User); + } + + public void SetSensor(Entity sensors, SuitSensorMode mode, EntityUid? userUid = null) + { + var comp = sensors.Comp; + + comp.Mode = mode; if (userUid != null) { var msg = Loc.GetString("suit-sensor-mode-state", ("mode", GetModeName(mode))); - _popupSystem.PopupEntity(msg, uid, userUid.Value); + _popupSystem.PopupEntity(msg, sensors, userUid.Value); } } diff --git a/Content.Shared/Medical/SuitSensor/SharedSuitSensor.cs b/Content.Shared/Medical/SuitSensor/SharedSuitSensor.cs index 27539dd22b..f48e31756d 100644 --- a/Content.Shared/Medical/SuitSensor/SharedSuitSensor.cs +++ b/Content.Shared/Medical/SuitSensor/SharedSuitSensor.cs @@ -1,3 +1,4 @@ +using Content.Shared.DoAfter; using Robust.Shared.Map; using Robust.Shared.Serialization; @@ -67,3 +68,16 @@ public static class SuitSensorConstants ///Used by the CrewMonitoringServerSystem to send the status of all connected suit sensors to each crew monitor public const string NET_STATUS_COLLECTION = "suit-status-collection"; } + +[Serializable, NetSerializable] +public sealed partial class SuitSensorChangeDoAfterEvent : DoAfterEvent +{ + public SuitSensorMode Mode { get; private set; } = SuitSensorMode.SensorOff; + + public SuitSensorChangeDoAfterEvent(SuitSensorMode mode) + { + Mode = mode; + } + + public override DoAfterEvent Clone() => this; +} From aabaaf1fecb69c059d9ed7e9d7d9288f3200337a Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 11 Aug 2024 09:05:48 +0000 Subject: [PATCH 383/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index bacb65611d..17aeca488e 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: ShadowCommander - changes: - - message: Fixed cyborg laws window and other UIs breaking when the built in light - was on. - type: Fix - id: 6588 - time: '2024-05-12T22:14:35.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27956 - author: mirrorcult changes: - message: The open slot storage keybinds (V, shift+V) now close the window if it's @@ -3783,3 +3775,11 @@ id: 7087 time: '2024-08-11T06:21:34.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30858 +- author: BombasterDS + changes: + - message: You can now change the suit's sensors on incapacitated people without + taking it off + type: Tweak + id: 7088 + time: '2024-08-11T09:04:43.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29668 From b16e57ee9484d347c4ceda635c7240813972660d Mon Sep 17 00:00:00 2001 From: blueDev2 <89804215+blueDev2@users.noreply.github.com> Date: Sun, 11 Aug 2024 05:14:35 -0400 Subject: [PATCH 384/422] Add MinHealth Construction Condition (#30892) * Add Min Health Condition and associated Locale * Add Comment --- .../Construction/Conditions/MinHealth.cs | 92 +++++++++++++++++++ .../construction/conditions/min-health.ftl | 2 + 2 files changed, 94 insertions(+) create mode 100644 Content.Server/Construction/Conditions/MinHealth.cs create mode 100644 Resources/Locale/en-US/construction/conditions/min-health.ftl diff --git a/Content.Server/Construction/Conditions/MinHealth.cs b/Content.Server/Construction/Conditions/MinHealth.cs new file mode 100644 index 0000000000..980f6a49ca --- /dev/null +++ b/Content.Server/Construction/Conditions/MinHealth.cs @@ -0,0 +1,92 @@ +using Content.Server.Destructible; +using Content.Shared.Construction; +using Content.Shared.Damage; +using Content.Shared.Examine; +using Content.Shared.FixedPoint; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Content.Server.Construction.Conditions; + +/// +/// Requires that the structure has at least some amount of health +/// +[DataDefinition] +public sealed partial class MinHealth : IGraphCondition +{ + /// + /// If ByProportion is true, Threshold is a value less than or equal to 1, but more than 0, + /// which is compared to the percent of health remaining in the structure. + /// Else, Threshold is any positive value with at most 2 decimal points of percision, + /// which is compared to the current health of the structure. + /// + [DataField] + public FixedPoint2 Threshold = 1; + [DataField] + public bool ByProportion = false; + + [DataField] + public bool IncludeEquals = true; + + public bool Condition(EntityUid uid, IEntityManager entMan) + { + if (!entMan.TryGetComponent(uid, out DestructibleComponent? destructibleComp) || + !entMan.TryGetComponent(uid, out DamageableComponent? damageComp)) + { + return false; + } + + var destructionSys = entMan.System(); + var maxHealth = destructionSys.DestroyedAt(uid, destructibleComp); + var curHealth = maxHealth - damageComp.TotalDamage; + var proportionHealth = curHealth / maxHealth; + + if (IncludeEquals) + { + if (ByProportion) + { + return proportionHealth >= Threshold; + } + else + { + return curHealth >= Threshold; + } + } + else + { + if (ByProportion) + { + return proportionHealth > Threshold; + } + else + { + return curHealth > Threshold; + } + } + } + + public bool DoExamine(ExaminedEvent args) + { + var entMan = IoCManager.Resolve(); + var entity = args.Examined; + + if (Condition(entity, entMan)) + { + return false; + } + args.PushMarkup(Loc.GetString("construction-examine-condition-low-health")); + + return true; + } + + public IEnumerable GenerateGuideEntry() + { + yield return new ConstructionGuideEntry() + { + Localization = "construction-step-condition-low-health" + }; + } +} diff --git a/Resources/Locale/en-US/construction/conditions/min-health.ftl b/Resources/Locale/en-US/construction/conditions/min-health.ftl new file mode 100644 index 0000000000..daaddcf572 --- /dev/null +++ b/Resources/Locale/en-US/construction/conditions/min-health.ftl @@ -0,0 +1,2 @@ +construction-examine-condition-low-health = First, repair it. +construction-step-condition-low-health = It must be repaired. From f93fe05f4cec7ee52e010cda2a30800c4e485f91 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Sun, 11 Aug 2024 11:15:28 +0200 Subject: [PATCH 385/422] Make RCD ui activateable only in hand (#30861) --- Resources/Prototypes/Entities/Objects/Tools/tools.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index 67251c87ca..269e480c1d 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -334,6 +334,7 @@ enum.RcdUiKey.Key: type: RCDMenuBoundUserInterface - type: ActivatableUI + inHandsOnly: true key: enum.RcdUiKey.Key - type: entity From 93c9d49f9bdd5f3de8e966c5ec4c8242fe7a0033 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 11 Aug 2024 09:16:34 +0000 Subject: [PATCH 386/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 17aeca488e..f6b983fb05 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: mirrorcult - changes: - - message: The open slot storage keybinds (V, shift+V) now close the window if it's - already opened - type: Tweak - id: 6589 - time: '2024-05-13T00:03:07.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27962 - author: lzk228 changes: - message: Fixed color jumpskirts female mask. @@ -3783,3 +3775,10 @@ id: 7088 time: '2024-08-11T09:04:43.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29668 +- author: lzk228 + changes: + - message: RCD UI can be activated only in hand. + type: Tweak + id: 7089 + time: '2024-08-11T09:15:28.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30861 From b6d04f884c23fbdfded4be64c96114ae48b18f83 Mon Sep 17 00:00:00 2001 From: Plykiya <58439124+Plykiya@users.noreply.github.com> Date: Sun, 11 Aug 2024 02:16:46 -0700 Subject: [PATCH 387/422] EntityTables for sec belts and webbing (#30900) * EntityTables for sec belts and webbing * update name --------- Co-authored-by: plykiya --- .../Prototypes/Catalog/Fills/Items/belt.yml | 32 +++++++++++-------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml index 6915f321c9..d905350cde 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml @@ -41,31 +41,35 @@ - id: GasAnalyzer - id: trayScanner +- type: entityTable + id: BeltSecurityEntityTable + table: !type:AllSelector + children: + - id: Stunbaton + - id: GrenadeFlashBang + - id: TearGasGrenade + - id: Handcuffs + - id: Handcuffs + - type: entity id: ClothingBeltSecurityFilled parent: ClothingBeltSecurity suffix: Filled components: - - type: StorageFill - contents: - - id: GrenadeFlashBang - - id: TearGasGrenade - - id: Stunbaton - - id: Handcuffs - - id: Handcuffs + - type: EntityTableContainerFill + containers: + storagebase: !type:NestedSelector + tableId: BeltSecurityEntityTable - type: entity id: ClothingBeltSecurityWebbingFilled parent: ClothingBeltSecurityWebbing suffix: Filled components: - - type: StorageFill - contents: - - id: GrenadeFlashBang - - id: TearGasGrenade - - id: Stunbaton - - id: Handcuffs - - id: Handcuffs + - type: EntityTableContainerFill + containers: + storagebase: !type:NestedSelector + tableId: BeltSecurityEntityTable - type: entity id: ClothingBeltJanitorFilled From ad71d8cb2f05bfee5a762dc3c90ad1ac76ac7562 Mon Sep 17 00:00:00 2001 From: Token Date: Sun, 11 Aug 2024 14:19:00 +0500 Subject: [PATCH 388/422] Pax now refresh instead of stacking pacified forever (#30778) Pax refreshes instead of stacking pacified forever --- Resources/Prototypes/Reagents/toxins.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml index a83836c5ff..e53c767a7e 100644 --- a/Resources/Prototypes/Reagents/toxins.yml +++ b/Resources/Prototypes/Reagents/toxins.yml @@ -543,8 +543,8 @@ - !type:GenericStatusEffect key: Pacified component: Pacified - refresh: false type: Add + time: 4 - type: reagent id: Honk From 8c4e5c58487e666a1376db7665fbef5f7240de4c Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 11 Aug 2024 09:20:06 +0000 Subject: [PATCH 389/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index f6b983fb05..16497d0459 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: lzk228 - changes: - - message: Fixed color jumpskirts female mask. - type: Fix - id: 6590 - time: '2024-05-13T19:25:58.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27984 - author: aspiringLich changes: - message: Tweaked the Chemical, Booze, and Soda Dispenser UIs to aid readability. @@ -3782,3 +3775,12 @@ id: 7089 time: '2024-08-11T09:15:28.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30861 +- author: TokenStyle + changes: + - message: Pax reagent now refresh pacified. + type: Tweak + - message: Pax reagent pacified duration has been changed from 2 seconds to 4 seconds. + type: Tweak + id: 7090 + time: '2024-08-11T09:19:01.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30778 From 456410239ec5bf8eae758bbe99e2f5f0b33ceb10 Mon Sep 17 00:00:00 2001 From: osjarw <62134478+osjarw@users.noreply.github.com> Date: Sun, 11 Aug 2024 12:22:46 +0300 Subject: [PATCH 390/422] Reorder priorities in `MeleeCombatCompound` (#30066) Reordered MeleeCombatCompound to improve unpulling --- Resources/Prototypes/NPCs/Combat/melee.yml | 83 ++++++++++++---------- 1 file changed, 45 insertions(+), 38 deletions(-) diff --git a/Resources/Prototypes/NPCs/Combat/melee.yml b/Resources/Prototypes/NPCs/Combat/melee.yml index b0746e5679..9cbfbe7ca0 100644 --- a/Resources/Prototypes/NPCs/Combat/melee.yml +++ b/Resources/Prototypes/NPCs/Combat/melee.yml @@ -3,48 +3,55 @@ - type: htnCompound id: MeleeCombatCompound branches: - # Pickup weapon if we don't have one. - - preconditions: - - !type:ActiveHandComponentPrecondition - components: - # Just serializer things - - type: MeleeWeapon - damage: - types: - Blunt: 0 - invert: true - tasks: - - !type:HTNCompoundTask - task: PickupMeleeCompound - - - preconditions: - - !type:BuckledPrecondition - isBuckled: true - tasks: - - !type:HTNPrimitiveTask - operator: !type:UnbuckleOperator - shutdownState: TaskFinished - - - preconditions: - - !type:InContainerPrecondition - isInContainer: true - tasks: - - !type:HTNCompoundTask - task: EscapeCompound - - - preconditions: - - !type:PulledPrecondition - isPulled: true - tasks: - - !type:HTNPrimitiveTask - operator: !type:UnPullOperator - shutdownState: TaskFinished - - # Melee combat (unarmed or otherwise) - tasks: - !type:HTNPrimitiveTask operator: !type:UtilityOperator proto: NearbyMeleeTargets + - !type:HTNCompoundTask + task: BeforeMeleeAttackTargetCompound + +- type: htnCompound + id: BeforeMeleeAttackTargetCompound + branches: + - preconditions: + - !type:BuckledPrecondition + isBuckled: true + tasks: + - !type:HTNPrimitiveTask + operator: !type:UnbuckleOperator + shutdownState: TaskFinished + + - preconditions: + - !type:PulledPrecondition + isPulled: true + tasks: + - !type:HTNPrimitiveTask + operator: !type:UnPullOperator + shutdownState: TaskFinished + + - preconditions: + - !type:InContainerPrecondition + isInContainer: true + tasks: + - !type:HTNCompoundTask + task: EscapeCompound + + # Pickup weapon if we don't have one. + - preconditions: + - !type:ActiveHandComponentPrecondition + components: + # Just serializer things + - type: MeleeWeapon + damage: + types: + Blunt: 0 + invert: true + tasks: + - !type:HTNCompoundTask + task: PickupMeleeCompound + + # Melee combat (unarmed or otherwise) + - tasks: - !type:HTNCompoundTask task: MeleeAttackTargetCompound From bd5d4155757ae88d73c9c5468c985adfb879d33e Mon Sep 17 00:00:00 2001 From: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Date: Sun, 11 Aug 2024 11:23:14 +0200 Subject: [PATCH 391/422] Make the sentient plant mutation non-copyable to other plantholders (#29133) make the sentient plant mutation not propagate by clipping, using the seed extractor or cryoxadone --- .../Botany/Systems/MutationSystem.cs | 8 +++---- .../Botany/Systems/PlantHolderSystem.cs | 22 ++++++++++++++++--- .../Botany/Systems/SeedExtractorSystem.cs | 11 ++++++++-- 3 files changed, 32 insertions(+), 9 deletions(-) diff --git a/Content.Server/Botany/Systems/MutationSystem.cs b/Content.Server/Botany/Systems/MutationSystem.cs index 474859823a..c927237510 100644 --- a/Content.Server/Botany/Systems/MutationSystem.cs +++ b/Content.Server/Botany/Systems/MutationSystem.cs @@ -38,7 +38,7 @@ public sealed class MutationSystem : EntitySystem } // Add up everything in the bits column and put the number here. - const int totalbits = 275; + const int totalbits = 262; #pragma warning disable IDE0055 // disable formatting warnings because this looks more readable // Tolerances (55) @@ -65,10 +65,10 @@ public sealed class MutationSystem : EntitySystem // Kill the plant (30) MutateBool(ref seed.Viable , false, 30, totalbits, severity); - // Fun (90) + // Fun (72) MutateBool(ref seed.Seedless , true , 10, totalbits, severity); MutateBool(ref seed.Slip , true , 10, totalbits, severity); - MutateBool(ref seed.Sentient , true , 10, totalbits, severity); + MutateBool(ref seed.Sentient , true , 2 , totalbits, severity); MutateBool(ref seed.Ligneous , true , 10, totalbits, severity); MutateBool(ref seed.Bioluminescent, true , 10, totalbits, severity); MutateBool(ref seed.TurnIntoKudzu , true , 10, totalbits, severity); @@ -115,10 +115,10 @@ public sealed class MutationSystem : EntitySystem CrossFloat(ref result.Production, a.Production); CrossFloat(ref result.Potency, a.Potency); + // we do not transfer Sentient to another plant to avoid ghost role spam CrossBool(ref result.Seedless, a.Seedless); CrossBool(ref result.Viable, a.Viable); CrossBool(ref result.Slip, a.Slip); - CrossBool(ref result.Sentient, a.Sentient); CrossBool(ref result.Ligneous, a.Ligneous); CrossBool(ref result.Bioluminescent, a.Bioluminescent); CrossBool(ref result.TurnIntoKudzu, a.TurnIntoKudzu); diff --git a/Content.Server/Botany/Systems/PlantHolderSystem.cs b/Content.Server/Botany/Systems/PlantHolderSystem.cs index c8842e1493..53cee92a29 100644 --- a/Content.Server/Botany/Systems/PlantHolderSystem.cs +++ b/Content.Server/Botany/Systems/PlantHolderSystem.cs @@ -298,8 +298,17 @@ public sealed class PlantHolderSystem : EntitySystem { healthOverride = component.Health; } - component.Seed.Unique = false; - var seed = _botany.SpawnSeedPacket(component.Seed, Transform(args.User).Coordinates, args.User, healthOverride); + var packetSeed = component.Seed; + if (packetSeed.Sentient) + { + packetSeed = packetSeed.Clone(); // clone before modifying the seed + packetSeed.Sentient = false; + } + else + { + packetSeed.Unique = false; + } + var seed = _botany.SpawnSeedPacket(packetSeed, Transform(args.User).Coordinates, args.User, healthOverride); _randomHelper.RandomOffset(seed, 0.25f); var displayName = Loc.GetString(component.Seed.DisplayName); _popup.PopupCursor(Loc.GetString("plant-holder-component-take-sample-message", @@ -626,8 +635,15 @@ public sealed class PlantHolderSystem : EntitySystem } else if (component.Age < 0) // Revert back to seed packet! { + var packetSeed = component.Seed; + if (packetSeed.Sentient) + { + if (!packetSeed.Unique) // clone if necessary before modifying the seed + packetSeed = packetSeed.Clone(); + packetSeed.Sentient = false; // remove Sentient to avoid ghost role spam + } // will put it in the trays hands if it has any, please do not try doing this - _botany.SpawnSeedPacket(component.Seed, Transform(uid).Coordinates, uid); + _botany.SpawnSeedPacket(packetSeed, Transform(uid).Coordinates, uid); RemovePlant(uid, component); component.ForceUpdate = true; Update(uid, component); diff --git a/Content.Server/Botany/Systems/SeedExtractorSystem.cs b/Content.Server/Botany/Systems/SeedExtractorSystem.cs index 9a5e70762e..4a0d56bfe9 100644 --- a/Content.Server/Botany/Systems/SeedExtractorSystem.cs +++ b/Content.Server/Botany/Systems/SeedExtractorSystem.cs @@ -42,12 +42,19 @@ public sealed class SeedExtractorSystem : EntitySystem var amount = _random.Next(seedExtractor.BaseMinSeeds, seedExtractor.BaseMaxSeeds + 1); var coords = Transform(uid).Coordinates; + var packetSeed = seed; + if (packetSeed.Sentient) + { + if (!packetSeed.Unique) // clone if necessary before modifying the seed + packetSeed = packetSeed.Clone(); + packetSeed.Sentient = false; // remove Sentient to avoid ghost role spam + } if (amount > 1) - seed.Unique = false; + packetSeed.Unique = false; for (var i = 0; i < amount; i++) { - _botanySystem.SpawnSeedPacket(seed, coords, args.User); + _botanySystem.SpawnSeedPacket(packetSeed, coords, args.User); } } } From e0f292921f9d04ed3722d9346f6a2b05c04bcc45 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 11 Aug 2024 09:24:20 +0000 Subject: [PATCH 392/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 16497d0459..b1239a22d5 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,18 +1,4 @@ Entries: -- author: aspiringLich - changes: - - message: Tweaked the Chemical, Booze, and Soda Dispenser UIs to aid readability. - type: Tweak - id: 6591 - time: '2024-05-13T21:46:17.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27958 -- author: deltanedas - changes: - - message: Fixed fire spreading being insane. - type: Fix - id: 6592 - time: '2024-05-13T21:49:44.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27986 - author: DrSmugleaf changes: - message: Failing to fire a gun that requires wielding will no longer delay the @@ -3784,3 +3770,18 @@ id: 7090 time: '2024-08-11T09:19:01.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30778 +- author: osjarw + changes: + - message: You can once again pull and buckle pets. + type: Fix + id: 7091 + time: '2024-08-11T09:22:46.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30066 +- author: slarticodefast + changes: + - message: The sentient plant mutation can no longer be propagated to other trays + via seeds or swabs. It has also been made more rare. + type: Tweak + id: 7092 + time: '2024-08-11T09:23:14.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29133 From 31c5d3555ea97e6f6a317c5b208763e4f12a67c6 Mon Sep 17 00:00:00 2001 From: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com> Date: Sun, 11 Aug 2024 09:46:57 +0000 Subject: [PATCH 393/422] fix(Commands): Improve Localization of commands. Standardize some behaviors. (#30362) * I should be studying for school but that is sofucking boring, I will pass my class no matter, however getting an A might be a challenge. My gpa is important but is the tourture for 1 point of GPA worth it? The american government says yes but they are responsible for the majority of all genocides that have ever been conducted since the dawn of man * ugh * ugh --- .../Administration/Commands/BanPanelCommand.cs | 2 +- Content.Server/Administration/Commands/ControlMob.cs | 2 +- Content.Server/Administration/Commands/DSay.cs | 5 ++--- Content.Server/Administration/Commands/FaxUiCommand.cs | 5 ++--- Content.Server/Administration/Commands/FollowCommand.cs | 5 ++--- .../Administration/Commands/OpenAdminLogsCommand.cs | 2 +- .../Administration/Commands/OpenAdminNotesCommand.cs | 2 +- .../Commands/OpenUserVisibleNotesCommand.cs | 2 +- Content.Server/Administration/Commands/SetAdminOOC.cs | 2 +- Content.Server/Chat/Commands/LOOCCommand.cs | 2 +- Content.Server/Chat/Commands/SayCommand.cs | 2 +- Content.Server/Chat/Commands/SuicideCommand.cs | 2 +- Content.Server/Chat/Commands/WhisperCommand.cs | 2 +- Content.Server/Disposal/TubeConnectionsCommand.cs | 9 +++++++-- Content.Server/EntityList/SpawnEntityListCommand.cs | 4 ++-- Content.Server/GameTicking/Commands/ObserveCommand.cs | 1 + Content.Server/Mapping/MappingCommand.cs | 2 +- Content.Server/NPC/Commands/NPCCommand.cs | 1 + Content.Server/Salvage/SalvageRulerCommand.cs | 2 +- .../en-US/administration/commands/set-outfit-command.ftl | 2 +- Resources/Locale/en-US/shell.ftl | 1 - 21 files changed, 30 insertions(+), 27 deletions(-) diff --git a/Content.Server/Administration/Commands/BanPanelCommand.cs b/Content.Server/Administration/Commands/BanPanelCommand.cs index 9f9ec9e89f..b4faa6afef 100644 --- a/Content.Server/Administration/Commands/BanPanelCommand.cs +++ b/Content.Server/Administration/Commands/BanPanelCommand.cs @@ -17,7 +17,7 @@ public sealed class BanPanelCommand : LocalizedCommands { if (shell.Player is not { } player) { - shell.WriteError(Loc.GetString("cmd-banpanel-server")); + shell.WriteError(Loc.GetString("shell-cannot-run-command-from-server")); return; } diff --git a/Content.Server/Administration/Commands/ControlMob.cs b/Content.Server/Administration/Commands/ControlMob.cs index 9d39cb9dde..8613fafeae 100644 --- a/Content.Server/Administration/Commands/ControlMob.cs +++ b/Content.Server/Administration/Commands/ControlMob.cs @@ -17,7 +17,7 @@ namespace Content.Server.Administration.Commands { if (shell.Player is not { } player) { - shell.WriteLine("shell-server-cannot"); + shell.WriteError(Loc.GetString("shell-cannot-run-command-from-server")); return; } diff --git a/Content.Server/Administration/Commands/DSay.cs b/Content.Server/Administration/Commands/DSay.cs index f29e105909..8e7f0f4bf0 100644 --- a/Content.Server/Administration/Commands/DSay.cs +++ b/Content.Server/Administration/Commands/DSay.cs @@ -17,10 +17,9 @@ namespace Content.Server.Administration.Commands public void Execute(IConsoleShell shell, string argStr, string[] args) { - var player = shell.Player; - if (player == null) + if (shell.Player is not { } player) { - shell.WriteLine("shell-only-players-can-run-this-command"); + shell.WriteError(Loc.GetString("shell-cannot-run-command-from-server")); return; } diff --git a/Content.Server/Administration/Commands/FaxUiCommand.cs b/Content.Server/Administration/Commands/FaxUiCommand.cs index 8323278c58..c1103f47d8 100644 --- a/Content.Server/Administration/Commands/FaxUiCommand.cs +++ b/Content.Server/Administration/Commands/FaxUiCommand.cs @@ -15,10 +15,9 @@ public sealed class FaxUiCommand : IConsoleCommand public void Execute(IConsoleShell shell, string argStr, string[] args) { - var player = shell.Player; - if (player == null) + if (shell.Player is not { } player) { - shell.WriteLine("shell-only-players-can-run-this-command"); + shell.WriteError(Loc.GetString("shell-cannot-run-command-from-server")); return; } diff --git a/Content.Server/Administration/Commands/FollowCommand.cs b/Content.Server/Administration/Commands/FollowCommand.cs index 9f94f83b4d..b59a99b8b4 100644 --- a/Content.Server/Administration/Commands/FollowCommand.cs +++ b/Content.Server/Administration/Commands/FollowCommand.cs @@ -16,10 +16,9 @@ public sealed class FollowCommand : IConsoleCommand public void Execute(IConsoleShell shell, string argStr, string[] args) { - var player = shell.Player; - if (player == null) + if (shell.Player is not { } player) { - shell.WriteError(Loc.GetString("shell-only-players-can-run-this-command")); + shell.WriteError(Loc.GetString("shell-cannot-run-command-from-server")); return; } diff --git a/Content.Server/Administration/Commands/OpenAdminLogsCommand.cs b/Content.Server/Administration/Commands/OpenAdminLogsCommand.cs index 47ff3e1a1c..5572fa542b 100644 --- a/Content.Server/Administration/Commands/OpenAdminLogsCommand.cs +++ b/Content.Server/Administration/Commands/OpenAdminLogsCommand.cs @@ -16,7 +16,7 @@ public sealed class OpenAdminLogsCommand : IConsoleCommand { if (shell.Player is not { } player) { - shell.WriteLine("This does not work from the server console."); + shell.WriteError(Loc.GetString("shell-cannot-run-command-from-server")); return; } diff --git a/Content.Server/Administration/Commands/OpenAdminNotesCommand.cs b/Content.Server/Administration/Commands/OpenAdminNotesCommand.cs index e6ae4f7616..ae79aa52bb 100644 --- a/Content.Server/Administration/Commands/OpenAdminNotesCommand.cs +++ b/Content.Server/Administration/Commands/OpenAdminNotesCommand.cs @@ -17,7 +17,7 @@ public sealed class OpenAdminNotesCommand : IConsoleCommand { if (shell.Player is not { } player) { - shell.WriteError("This does not work from the server console."); + shell.WriteError(Loc.GetString("shell-cannot-run-command-from-server")); return; } diff --git a/Content.Server/Administration/Commands/OpenUserVisibleNotesCommand.cs b/Content.Server/Administration/Commands/OpenUserVisibleNotesCommand.cs index 507c7ab279..53651a8a8e 100644 --- a/Content.Server/Administration/Commands/OpenUserVisibleNotesCommand.cs +++ b/Content.Server/Administration/Commands/OpenUserVisibleNotesCommand.cs @@ -28,7 +28,7 @@ public sealed class OpenUserVisibleNotesCommand : IConsoleCommand if (shell.Player is not { } player) { - shell.WriteError("This does not work from the server console."); + shell.WriteError(Loc.GetString("shell-cannot-run-command-from-server")); return; } diff --git a/Content.Server/Administration/Commands/SetAdminOOC.cs b/Content.Server/Administration/Commands/SetAdminOOC.cs index c1f72f7666..b3e17c9622 100644 --- a/Content.Server/Administration/Commands/SetAdminOOC.cs +++ b/Content.Server/Administration/Commands/SetAdminOOC.cs @@ -16,7 +16,7 @@ namespace Content.Server.Administration.Commands { if (shell.Player == null) { - shell.WriteError(Loc.GetString("shell-only-players-can-run-this-command")); + shell.WriteError(Loc.GetString("shell-cannot-run-command-from-server")); return; } diff --git a/Content.Server/Chat/Commands/LOOCCommand.cs b/Content.Server/Chat/Commands/LOOCCommand.cs index 059d25df27..e303b9766d 100644 --- a/Content.Server/Chat/Commands/LOOCCommand.cs +++ b/Content.Server/Chat/Commands/LOOCCommand.cs @@ -18,7 +18,7 @@ namespace Content.Server.Chat.Commands { if (shell.Player is not { } player) { - shell.WriteError("This command cannot be run from the server."); + shell.WriteError(Loc.GetString("shell-cannot-run-command-from-server")); return; } diff --git a/Content.Server/Chat/Commands/SayCommand.cs b/Content.Server/Chat/Commands/SayCommand.cs index 273f908c9a..df6e548e5d 100644 --- a/Content.Server/Chat/Commands/SayCommand.cs +++ b/Content.Server/Chat/Commands/SayCommand.cs @@ -16,7 +16,7 @@ namespace Content.Server.Chat.Commands { if (shell.Player is not { } player) { - shell.WriteError("This command cannot be run from the server."); + shell.WriteError(Loc.GetString("shell-cannot-run-command-from-server")); return; } diff --git a/Content.Server/Chat/Commands/SuicideCommand.cs b/Content.Server/Chat/Commands/SuicideCommand.cs index ea45158e44..ec623b4a51 100644 --- a/Content.Server/Chat/Commands/SuicideCommand.cs +++ b/Content.Server/Chat/Commands/SuicideCommand.cs @@ -23,7 +23,7 @@ namespace Content.Server.Chat.Commands { if (shell.Player is not { } player) { - shell.WriteLine(Loc.GetString("shell-cannot-run-command-from-server")); + shell.WriteError(Loc.GetString("shell-cannot-run-command-from-server")); return; } diff --git a/Content.Server/Chat/Commands/WhisperCommand.cs b/Content.Server/Chat/Commands/WhisperCommand.cs index c88e2519ee..13effa3446 100644 --- a/Content.Server/Chat/Commands/WhisperCommand.cs +++ b/Content.Server/Chat/Commands/WhisperCommand.cs @@ -16,7 +16,7 @@ namespace Content.Server.Chat.Commands { if (shell.Player is not { } player) { - shell.WriteError("This command cannot be run from the server."); + shell.WriteError(Loc.GetString("shell-cannot-run-command-from-server")); return; } diff --git a/Content.Server/Disposal/TubeConnectionsCommand.cs b/Content.Server/Disposal/TubeConnectionsCommand.cs index 55e6465937..564c46be7a 100644 --- a/Content.Server/Disposal/TubeConnectionsCommand.cs +++ b/Content.Server/Disposal/TubeConnectionsCommand.cs @@ -17,8 +17,13 @@ namespace Content.Server.Disposal public void Execute(IConsoleShell shell, string argStr, string[] args) { - var player = shell.Player; - if (player?.AttachedEntity == null) + if (shell.Player is not { } player) + { + shell.WriteError(Loc.GetString("shell-cannot-run-command-from-server")); + return; + } + + if (player.AttachedEntity is not { } attached) { shell.WriteLine(Loc.GetString("shell-only-players-can-run-this-command")); return; diff --git a/Content.Server/EntityList/SpawnEntityListCommand.cs b/Content.Server/EntityList/SpawnEntityListCommand.cs index 027d25dc2c..127e1ec47c 100644 --- a/Content.Server/EntityList/SpawnEntityListCommand.cs +++ b/Content.Server/EntityList/SpawnEntityListCommand.cs @@ -23,13 +23,13 @@ namespace Content.Server.EntityList if (shell.Player is not { } player) { - shell.WriteError("You must be a player to run this command."); + shell.WriteError(Loc.GetString("shell-cannot-run-command-from-server")); return; } if (player.AttachedEntity is not {} attached) { - shell.WriteError("You must have an entity to run this command."); + shell.WriteError(Loc.GetString("shell-only-players-can-run-this-command")); return; } diff --git a/Content.Server/GameTicking/Commands/ObserveCommand.cs b/Content.Server/GameTicking/Commands/ObserveCommand.cs index 5a03503317..e13d70b972 100644 --- a/Content.Server/GameTicking/Commands/ObserveCommand.cs +++ b/Content.Server/GameTicking/Commands/ObserveCommand.cs @@ -19,6 +19,7 @@ namespace Content.Server.GameTicking.Commands { if (shell.Player is not { } player) { + shell.WriteError(Loc.GetString("shell-cannot-run-command-from-server")); return; } diff --git a/Content.Server/Mapping/MappingCommand.cs b/Content.Server/Mapping/MappingCommand.cs index 46534f7059..70647d3281 100644 --- a/Content.Server/Mapping/MappingCommand.cs +++ b/Content.Server/Mapping/MappingCommand.cs @@ -42,7 +42,7 @@ namespace Content.Server.Mapping { if (shell.Player is not { } player) { - shell.WriteError(Loc.GetString("cmd-savemap-server")); + shell.WriteError(Loc.GetString("shell-cannot-run-command-from-server")); return; } diff --git a/Content.Server/NPC/Commands/NPCCommand.cs b/Content.Server/NPC/Commands/NPCCommand.cs index 7f9e56b8ca..e1e432e1a4 100644 --- a/Content.Server/NPC/Commands/NPCCommand.cs +++ b/Content.Server/NPC/Commands/NPCCommand.cs @@ -16,6 +16,7 @@ public sealed class NPCCommand : IConsoleCommand { if (shell.Player is not { } playerSession) { + shell.WriteError(Loc.GetString("shell-cannot-run-command-from-server")); return; } diff --git a/Content.Server/Salvage/SalvageRulerCommand.cs b/Content.Server/Salvage/SalvageRulerCommand.cs index 49785e8f41..b445358c37 100644 --- a/Content.Server/Salvage/SalvageRulerCommand.cs +++ b/Content.Server/Salvage/SalvageRulerCommand.cs @@ -27,7 +27,7 @@ sealed class SalvageRulerCommand : IConsoleCommand if (shell.Player is not { } player) { - shell.WriteError(Loc.GetString("shell-only-players-can-run-this-command")); + shell.WriteError(Loc.GetString("shell-cannot-run-command-from-server")); return; } diff --git a/Resources/Locale/en-US/administration/commands/set-outfit-command.ftl b/Resources/Locale/en-US/administration/commands/set-outfit-command.ftl index 7d97963ba9..793c339c28 100644 --- a/Resources/Locale/en-US/administration/commands/set-outfit-command.ftl +++ b/Resources/Locale/en-US/administration/commands/set-outfit-command.ftl @@ -1,4 +1,4 @@ set-outfit-command-description = Sets the outfit of the specified entity. The entity must have {INDEFINITE($requiredComponent)} {$requiredComponent} set-outfit-command-help-text = Usage: {$command} | {$command} -set-outfit-command-is-not-player-error = This does not work from the server console. You must pass the outfit id aswell. +set-outfit-command-is-not-player-error = This command requires both arguments to work from the server console. set-outfit-command-invalid-outfit-id-error = Invalid outfit id diff --git a/Resources/Locale/en-US/shell.ftl b/Resources/Locale/en-US/shell.ftl index 34460f001a..957d3d3c02 100644 --- a/Resources/Locale/en-US/shell.ftl +++ b/Resources/Locale/en-US/shell.ftl @@ -2,7 +2,6 @@ ## General -shell-server-cannot = Server cannot do this. shell-command-success = Command successful shell-invalid-command = Invalid command. shell-invalid-command-specific = Invalid {$commandName} command. From 28efd76e8258f1fec6b0e13d40aa523363a1aded Mon Sep 17 00:00:00 2001 From: Moomoobeef <62638182+Moomoobeef@users.noreply.github.com> Date: Sun, 11 Aug 2024 03:26:37 -0700 Subject: [PATCH 394/422] adds a throngler plushie, and adds it to the grand lotto (#29978) * adds a throngler plushie, and adds it to the grand lotto * this was supposed to be in the initial commit but I apparently forgot to save so anyway here it is * make throngler plushie more rare how about I split the difference: original throngler: 0.0001 other plushies: 0.01 thongler plushie: 0.0005 * removed inheritied soundhit --- .../Prototypes/Catalog/Fills/Crates/cargo.yml | 5 ++++- .../Prototypes/Entities/Objects/Fun/toys.yml | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml index 7ef8a8262d..0ce625876f 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/cargo.yml @@ -305,6 +305,9 @@ - id: PlushieArachind prob: 0.01 orGroup: Plushies + - id: PlushieThrongler #hehe + prob: 0.0005 + orGroup: Plushies #useful - id: AmeJar prob: 0.01 @@ -396,4 +399,4 @@ orGroup: NotUseful - id: GrenadeFoamDart prob: 0.001 - orGroup: NotUseful \ No newline at end of file + orGroup: NotUseful diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index a2a6d2f51e..2bc6f27b60 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -53,6 +53,22 @@ - ReagentId: Fiber Quantity: 10 +- type: entity + parent: BasePlushie + id: PlushieThrongler + name: The Throngler Plushie + description: A stuffed toy to remind cargo techs of what they can no longer have. + components: + - type: Sprite + sprite: Objects/Weapons/Melee/Throngler2.rsi + state: icon + - type: MeleeWeapon + wideAnimationRotation: -135 + attackRate: 10 + - type: Item + size: Ginormous + sprite: Objects/Weapons/Melee/Throngler-in-hand.rsi + - type: entity parent: BasePlushie id: PlushieGhost From 6ec6a28aebcd7d5a3305e53acab5a24937d284f1 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 11 Aug 2024 10:27:43 +0000 Subject: [PATCH 395/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index b1239a22d5..27cf3131b5 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: DrSmugleaf - changes: - - message: Failing to fire a gun that requires wielding will no longer delay the - next shot. - type: Tweak - id: 6593 - time: '2024-05-14T04:53:47.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27973 - author: lzk228 changes: - message: Grill and hotplate can be anchored on the table. @@ -3785,3 +3777,10 @@ id: 7092 time: '2024-08-11T09:23:14.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29133 +- author: Moomoobeef + changes: + - message: Added The Throngler (Plushie) to the grand lottery!! + type: Add + id: 7093 + time: '2024-08-11T10:26:37.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/29978 From 58fd50c3690bbbc640c8a81f1ef77a66a0270226 Mon Sep 17 00:00:00 2001 From: Ubaser <134914314+UbaserB@users.noreply.github.com> Date: Sun, 11 Aug 2024 22:51:19 +1000 Subject: [PATCH 396/422] fix a capitalisation mistake (#30908) ad --- Resources/Prototypes/Entities/Objects/Fun/toys.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 2bc6f27b60..92baa1f86f 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -56,7 +56,7 @@ - type: entity parent: BasePlushie id: PlushieThrongler - name: The Throngler Plushie + name: The Throngler plushie description: A stuffed toy to remind cargo techs of what they can no longer have. components: - type: Sprite From e26e662023da11ea77c05e10ef46b77cee2041d0 Mon Sep 17 00:00:00 2001 From: mhamster <81412348+mhamsterr@users.noreply.github.com> Date: Sun, 11 Aug 2024 20:26:45 +0700 Subject: [PATCH 397/422] Small json files fixes (#30907) Small json fixes Resources/Textures/Interface/Default/meta.json: trailing comma Resources/Textures/Objects/Specific/Hydroponics/attribution.json: proper json Resources/Textures/Tiles/Planet/Snow/meta.json: trailing commas --- Resources/Textures/Interface/Default/meta.json | 2 +- .../Specific/Hydroponics/attribution.json | 4 +++- Resources/Textures/Tiles/Planet/Snow/meta.json | 18 +++++++++--------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Resources/Textures/Interface/Default/meta.json b/Resources/Textures/Interface/Default/meta.json index c6e9a63c2f..6111696883 100644 --- a/Resources/Textures/Interface/Default/meta.json +++ b/Resources/Textures/Interface/Default/meta.json @@ -8,7 +8,7 @@ "copyright": "Taken from https://github.com/goonstation/goonstation at commit e77d85d9c1d93aa32da7702737ceeac2b56738ac, slightly modified by PixelTK", "states": [ { - "name": "back", + "name": "back" }, { "name": "belt" diff --git a/Resources/Textures/Objects/Specific/Hydroponics/attribution.json b/Resources/Textures/Objects/Specific/Hydroponics/attribution.json index 8fd35f31f0..964028b0cc 100644 --- a/Resources/Textures/Objects/Specific/Hydroponics/attribution.json +++ b/Resources/Textures/Objects/Specific/Hydroponics/attribution.json @@ -1 +1,3 @@ -"copyright": "Seeds redone by Alekshhh. I couldn't be fucked to change each meta in each seed folder", +{ + "copyright": "Seeds redone by Alekshhh. I couldn't be fucked to change each meta in each seed folder" +} diff --git a/Resources/Textures/Tiles/Planet/Snow/meta.json b/Resources/Textures/Tiles/Planet/Snow/meta.json index 3ed950dd98..e1286c9b07 100644 --- a/Resources/Textures/Tiles/Planet/Snow/meta.json +++ b/Resources/Textures/Tiles/Planet/Snow/meta.json @@ -9,31 +9,31 @@ "name": "snow" }, { - "name": "snow_double_edge_south", + "name": "snow_double_edge_south" }, { - "name": "snow_double_edge_east", + "name": "snow_double_edge_east" }, { - "name": "snow_double_edge_north", + "name": "snow_double_edge_north" }, { - "name": "snow_double_edge_west", + "name": "snow_double_edge_west" }, { "name": "snow_dug" }, { - "name": "snow_dug_double_edge_south", + "name": "snow_dug_double_edge_south" }, { - "name": "snow_dug_double_edge_east", + "name": "snow_dug_double_edge_east" }, { - "name": "snow_dug_double_edge_north", + "name": "snow_dug_double_edge_north" }, { - "name": "snow_dug_double_edge_west", + "name": "snow_dug_double_edge_west" }, { "name": "plating" @@ -84,4 +84,4 @@ "name": "permafrost" } ] -} \ No newline at end of file +} From 65521696c83ad695244726a8d1a04fe93653db24 Mon Sep 17 00:00:00 2001 From: Killerqu00 <47712032+Killerqu00@users.noreply.github.com> Date: Sun, 11 Aug 2024 20:01:00 +0200 Subject: [PATCH 398/422] Remove rest of Geras files (#30912) remove remaining geras stuff --- Content.Server/Geras/GerasComponent.cs | 18 ------- Content.Server/Geras/GerasSystem.cs | 51 ------------------- Content.Shared/Geras/SharedGerasSystem.cs | 16 ------ Resources/Locale/en-US/geras/geras.ftl | 2 - Resources/Prototypes/Actions/types.yml | 16 ------ .../Prototypes/Entities/Mobs/NPCs/slimes.yml | 35 ------------- Resources/Prototypes/Polymorphs/polymorph.yml | 11 ---- 7 files changed, 149 deletions(-) delete mode 100644 Content.Server/Geras/GerasComponent.cs delete mode 100644 Content.Server/Geras/GerasSystem.cs delete mode 100644 Content.Shared/Geras/SharedGerasSystem.cs delete mode 100644 Resources/Locale/en-US/geras/geras.ftl diff --git a/Content.Server/Geras/GerasComponent.cs b/Content.Server/Geras/GerasComponent.cs deleted file mode 100644 index df1fccd718..0000000000 --- a/Content.Server/Geras/GerasComponent.cs +++ /dev/null @@ -1,18 +0,0 @@ -using Content.Shared.Actions; -using Content.Shared.Polymorph; -using Robust.Shared.Prototypes; - -namespace Content.Server.Geras; - -/// -/// This component assigns the entity with a polymorph action. -/// -[RegisterComponent] -public sealed partial class GerasComponent : Component -{ - [DataField] public ProtoId GerasPolymorphId = "SlimeMorphGeras"; - - [DataField] public EntProtoId GerasAction = "ActionMorphGeras"; - - [DataField] public EntityUid? GerasActionEntity; -} diff --git a/Content.Server/Geras/GerasSystem.cs b/Content.Server/Geras/GerasSystem.cs deleted file mode 100644 index f83f7c1999..0000000000 --- a/Content.Server/Geras/GerasSystem.cs +++ /dev/null @@ -1,51 +0,0 @@ -using Content.Server.Polymorph.Systems; -using Content.Shared.Zombies; -using Content.Server.Actions; -using Content.Server.Popups; -using Content.Shared.Geras; -using Robust.Shared.Player; - -namespace Content.Server.Geras; - -/// -public sealed class GerasSystem : SharedGerasSystem -{ - [Dependency] private readonly PolymorphSystem _polymorphSystem = default!; - [Dependency] private readonly ActionsSystem _actionsSystem = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - - /// - public override void Initialize() - { - SubscribeLocalEvent(OnMorphIntoGeras); - SubscribeLocalEvent(OnMapInit); - SubscribeLocalEvent(OnZombification); - } - - private void OnZombification(EntityUid uid, GerasComponent component, EntityZombifiedEvent args) - { - _actionsSystem.RemoveAction(uid, component.GerasActionEntity); - } - - private void OnMapInit(EntityUid uid, GerasComponent component, MapInitEvent args) - { - // try to add geras action - _actionsSystem.AddAction(uid, ref component.GerasActionEntity, component.GerasAction); - } - - private void OnMorphIntoGeras(EntityUid uid, GerasComponent component, MorphIntoGeras args) - { - if (HasComp(uid)) - return; // i hate zomber. - - var ent = _polymorphSystem.PolymorphEntity(uid, component.GerasPolymorphId); - - if (!ent.HasValue) - return; - - _popupSystem.PopupEntity(Loc.GetString("geras-popup-morph-message-others", ("entity", ent.Value)), ent.Value, Filter.PvsExcept(ent.Value), true); - _popupSystem.PopupEntity(Loc.GetString("geras-popup-morph-message-user"), ent.Value, ent.Value); - - args.Handled = true; - } -} diff --git a/Content.Shared/Geras/SharedGerasSystem.cs b/Content.Shared/Geras/SharedGerasSystem.cs deleted file mode 100644 index 8c998371b6..0000000000 --- a/Content.Shared/Geras/SharedGerasSystem.cs +++ /dev/null @@ -1,16 +0,0 @@ -using Content.Shared.Actions; - -namespace Content.Shared.Geras; - -/// -/// Geras is the god of old age, and A geras is the small morph of a slime. This system allows the slimes to have the morphing action. -/// -public abstract class SharedGerasSystem : EntitySystem -{ - -} - -public sealed partial class MorphIntoGeras : InstantActionEvent -{ - -} diff --git a/Resources/Locale/en-US/geras/geras.ftl b/Resources/Locale/en-US/geras/geras.ftl deleted file mode 100644 index 3cd3f101ff..0000000000 --- a/Resources/Locale/en-US/geras/geras.ftl +++ /dev/null @@ -1,2 +0,0 @@ -geras-popup-morph-message-user = You shift and morph into a small version of you! -geras-popup-morph-message-others = {CAPITALIZE(THE($entity))} shifts and morphs into a blob of slime! diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml index af1333e14c..4fa9ed3135 100644 --- a/Resources/Prototypes/Actions/types.yml +++ b/Resources/Prototypes/Actions/types.yml @@ -161,22 +161,6 @@ state: icon event: !type:UseDnaScramblerImplantEvent -- type: entity - id: ActionMorphGeras - name: Morph into Geras - description: Morphs you into a Geras - a miniature version of you which allows you to move fast, at the cost of your inventory. - components: - - type: ConfirmableAction - popup: gera-transformation-popup - - type: InstantAction - itemIconStyle: BigAction - useDelay: 10 # prevent spam - priority: -20 - icon: - sprite: Mobs/Aliens/slimes.rsi - state: blue_adult_slime - event: !type:MorphIntoGeras - - type: entity id: ActionToggleSuitPiece name: Toggle Suit Piece diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml index b5929620ee..9d8a851551 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml @@ -143,41 +143,6 @@ rootTask: task: SimpleHostileCompound -- type: entity - name: geras - description: A geras of a slime - the name is ironic, isn't it? - id: MobSlimesGeras - parent: BaseMobAdultSlimes - categories: [ HideSpawnMenu ] - components: - # they portable... - - type: MovementSpeedModifier - baseWalkSpeed: 3 - baseSprintSpeed: 5 # +.5 from normal movement speed - - type: MobThresholds - thresholds: - 0: Alive - 80: Dead # weak af tho - - type: NpcFactionMember - factions: - - NanoTrasen - - type: MultiHandedItem - - type: Item - size: Huge - - type: Sprite - color: "#FFFFFF55" - - type: MeleeWeapon - attackRate: 2 - damage: - types: - Blunt: 4 - - type: DamageStateVisuals - states: - Alive: - Base: blue_adult_slime - Dead: - Base: blue_adult_slime_dead - - type: entity name: blue slime id: MobAdultSlimesBlue diff --git a/Resources/Prototypes/Polymorphs/polymorph.yml b/Resources/Prototypes/Polymorphs/polymorph.yml index a1a805c74f..96739a50d3 100644 --- a/Resources/Prototypes/Polymorphs/polymorph.yml +++ b/Resources/Prototypes/Polymorphs/polymorph.yml @@ -75,17 +75,6 @@ inventory: Transfer revertOnDeath: true -- type: polymorph - id: SlimeMorphGeras - configuration: - entity: MobSlimesGeras - transferName: true - transferHumanoidAppearance: false - inventory: Drop - transferDamage: true - revertOnDeath: true - revertOnCrit: true - # this is a test for transferring some visual appearance stuff - type: polymorph id: TestHumanMorph From 46f631fa1187b304b1a973db091bb67e9667cad7 Mon Sep 17 00:00:00 2001 From: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com> Date: Sun, 11 Aug 2024 18:47:26 +0000 Subject: [PATCH 399/422] tweak(AgeRequirement): Make the requiredAge more sensible (#30913) --- Content.Shared/Roles/JobRequirement/AgeRequirement.cs | 4 ++-- Resources/Locale/en-US/job/role-requirements.ftl | 4 ++-- Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml | 2 +- Resources/Prototypes/Roles/Jobs/Command/captain.yml | 2 +- Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml | 2 +- .../Prototypes/Roles/Jobs/Engineering/chief_engineer.yml | 2 +- .../Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml | 2 +- Resources/Prototypes/Roles/Jobs/Science/research_director.yml | 2 +- Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Content.Shared/Roles/JobRequirement/AgeRequirement.cs b/Content.Shared/Roles/JobRequirement/AgeRequirement.cs index 2cdc8e001c..75a77ae155 100644 --- a/Content.Shared/Roles/JobRequirement/AgeRequirement.cs +++ b/Content.Shared/Roles/JobRequirement/AgeRequirement.cs @@ -33,7 +33,7 @@ public sealed partial class AgeRequirement : JobRequirement reason = FormattedMessage.FromMarkupPermissive(Loc.GetString("role-timer-age-to-young", ("age", RequiredAge))); - if (profile.Age <= RequiredAge) + if (profile.Age < RequiredAge) return false; } else @@ -41,7 +41,7 @@ public sealed partial class AgeRequirement : JobRequirement reason = FormattedMessage.FromMarkupPermissive(Loc.GetString("role-timer-age-to-old", ("age", RequiredAge))); - if (profile.Age >= RequiredAge) + if (profile.Age > RequiredAge) return false; } diff --git a/Resources/Locale/en-US/job/role-requirements.ftl b/Resources/Locale/en-US/job/role-requirements.ftl index 906a0470af..8c1af36c79 100644 --- a/Resources/Locale/en-US/job/role-requirements.ftl +++ b/Resources/Locale/en-US/job/role-requirements.ftl @@ -4,8 +4,8 @@ role-timer-overall-insufficient = You require [color=yellow]{TOSTRING($time, "0" role-timer-overall-too-high = You require [color=yellow]{TOSTRING($time, "0")}[/color] fewer minutes of playtime to play this role. (Are you trying to play a trainee role?) role-timer-role-insufficient = You require [color=yellow]{TOSTRING($time, "0")}[/color] more minutes with [color={$departmentColor}]{$job}[/color] to play this role. role-timer-role-too-high = You require[color=yellow] {TOSTRING($time, "0")}[/color] fewer minutes with [color={$departmentColor}]{$job}[/color] to play this role. (Are you trying to play a trainee role?) -role-timer-age-to-old = Your character must be under the age of [color=yellow]{$age}[/color] to play this role. -role-timer-age-to-young = Your character must be over the age of [color=yellow]{$age}[/color] to play this role. +role-timer-age-to-old = Your character's age must be at most [color=yellow]{$age}[/color] to play this role. +role-timer-age-to-young = Your character's age must be atleast [color=yellow]{$age}[/color] to play this role. role-timer-whitelisted-species = Your character must be one of the following species to play this role: role-timer-blacklisted-species = Your character must not be one of the following species to play this role: diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index 0197cd0daf..1beef052f8 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -16,7 +16,7 @@ - !type:OverallPlaytimeRequirement time: 144000 #40 hrs - !type:AgeRequirement - requiredAge: 20 + requiredAge: 21 weight: 10 startingGear: QuartermasterGear icon: "JobIconQuarterMaster" diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml index e2687dd653..e74c307204 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -17,7 +17,7 @@ department: Command time: 54000 # 15 hours - !type:AgeRequirement - requiredAge: 20 + requiredAge: 21 weight: 20 startingGear: CaptainGear icon: "JobIconCaptain" diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index c1b285303d..7cac1456d4 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -17,7 +17,7 @@ department: Command time: 36000 # 10 hours - !type:AgeRequirement - requiredAge: 20 + requiredAge: 21 weight: 20 startingGear: HoPGear icon: "JobIconHeadOfPersonnel" diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml index c0d9569c5d..f9f94d21bb 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -16,7 +16,7 @@ - !type:OverallPlaytimeRequirement time: 144000 #40 hrs - !type:AgeRequirement - requiredAge: 20 + requiredAge: 21 weight: 10 startingGear: ChiefEngineerGear icon: "JobIconChiefEngineer" diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml index 94248450cd..0d3b5bb805 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -18,7 +18,7 @@ - !type:OverallPlaytimeRequirement time: 144000 #40 hrs - !type:AgeRequirement - requiredAge: 20 + requiredAge: 21 weight: 10 startingGear: CMOGear icon: "JobIconChiefMedicalOfficer" diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index b66e89f420..48dffcb98c 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -10,7 +10,7 @@ - !type:OverallPlaytimeRequirement time: 144000 #40 hrs - !type:AgeRequirement - requiredAge: 20 + requiredAge: 21 weight: 10 startingGear: ResearchDirectorGear icon: "JobIconResearchDirector" diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index c02f1cee76..7a5f5b6dcd 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -16,7 +16,7 @@ - !type:OverallPlaytimeRequirement time: 144000 #40 hrs - !type:AgeRequirement - requiredAge: 20 + requiredAge: 21 weight: 10 startingGear: HoSGear icon: "JobIconHeadOfSecurity" From aa15a9a839b643b6079665e5cc2c89a59d3482d0 Mon Sep 17 00:00:00 2001 From: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com> Date: Sun, 11 Aug 2024 20:28:07 +0000 Subject: [PATCH 400/422] chrore(ageRequirement): fix grammar. atleast -> at least (#30914) --- Resources/Locale/en-US/job/role-requirements.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/job/role-requirements.ftl b/Resources/Locale/en-US/job/role-requirements.ftl index 8c1af36c79..f0fff98c09 100644 --- a/Resources/Locale/en-US/job/role-requirements.ftl +++ b/Resources/Locale/en-US/job/role-requirements.ftl @@ -5,7 +5,7 @@ role-timer-overall-too-high = You require [color=yellow]{TOSTRING($time, "0")}[/ role-timer-role-insufficient = You require [color=yellow]{TOSTRING($time, "0")}[/color] more minutes with [color={$departmentColor}]{$job}[/color] to play this role. role-timer-role-too-high = You require[color=yellow] {TOSTRING($time, "0")}[/color] fewer minutes with [color={$departmentColor}]{$job}[/color] to play this role. (Are you trying to play a trainee role?) role-timer-age-to-old = Your character's age must be at most [color=yellow]{$age}[/color] to play this role. -role-timer-age-to-young = Your character's age must be atleast [color=yellow]{$age}[/color] to play this role. +role-timer-age-to-young = Your character's age must be at least [color=yellow]{$age}[/color] to play this role. role-timer-whitelisted-species = Your character must be one of the following species to play this role: role-timer-blacklisted-species = Your character must not be one of the following species to play this role: From 7aaac2c1790389082d8b48672d040a3724c2290b Mon Sep 17 00:00:00 2001 From: Zachary Yona <58833995+Magicalus@users.noreply.github.com> Date: Sun, 11 Aug 2024 17:45:28 -0400 Subject: [PATCH 401/422] Minor sprite fix to inhand med hardsuits and HoS turtleneck jumpsuit (#30918) * Fixes inhand hardsuit cross color from https://github.com/space-wizards/space-station-14/issues/26516#issue-2213917971 * Fixed HoS Turtle not covering all butt pixels --------- Co-authored-by: Zachary Yona --- .../Hardsuits/medical.rsi/inhand-left.png | Bin 648 -> 847 bytes .../Hardsuits/medical.rsi/inhand-right.png | Bin 698 -> 819 bytes .../hos_alt.rsi/equipped-INNERCLOTHING.png | Bin 1377 -> 1406 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/inhand-left.png index e457d87938b3b4db5c90434cbcb4e25bec831e4e..8b11221d9a4ccfcfb503c5a7eb81050854095e1f 100644 GIT binary patch delta 825 zcmeBRJ|f)5S5QV$R!{h8@C=B5n7lcCjpy3-8e33gqTiJdvq+#4qQKj*bqW zjZ2F#tE-EP<3|S{`!=Db9~G{W$w+^Prps=cD`!Zwd4F*v4shi$6vG#&H2LkqszY!qa0 z{x9>^cqP*gv(xcnt$t~31}8Qyc7O7C`FWx9)7CZEUamL(Tgf(M>%$%A!}ISwoO@#5 zUgL_X3%MRd-M&9HP{e9xfpGfyIg{?Tr~SU!b(rhN*V4$aeYN3AH*zdarU$X!*=B9YmAfv^4>$<+{VSep9&+Jy&}h18*>{-h#AT2M z$-8FB%+s6gTe~DWM4f_VkDE delta 624 zcmV-$0+0RA28acaBYy%xD^Bm4x(TP4xxg@L4qLoH`JwrBD~NsE#-v{9h?FY9YQTHgwl?$L%4WtFHJ7* zn}oyXvxWEWo9CYU!Eq137-Nhv#u#IaF~%6nN=j*@l%`rPnSW7hi>PZ77ijtz|8|Zes&{~6tpp+UGu9PxSFG9cHM{Bi_DHA}ZrcKMU z**PvSF8Iy+k0;inUi5Fc0cM}NnN4wj(SI=};Xq{wKkGiBn%GxK}DH_V&`>jr48Q7xBDt=nrI>!D%AH|?BT(8xeV{d_E z=9jPE0RT5|6aWD0-`d{kZ8tXCi)%n!#N$T~asAf4k$+dfpC8-k{QQNjon1^)a9U>C zGvMvZr{?wAr^PlP7TsPl0Pya^XAlvz)_C=N1puJ-I#c~moLLM8SAgx=PU9>vetO3T z4GfwAjDPY^nmKJF&tv@_kR*gaF(^Rob-ZFwfDpoIrh^jCaDEE_gEMvdw~I`>3K?UJ zF~%5UjA=2(7|Sh}(`ct3Md!iwG&*+;a6OIA)tA;;Orx!bqx0r^8lAfaxSmGm>K2&A zG&)xe0NhWbbJu{Ft7&v@8{ldhoxAsdBp1`@++G2*m_{@9ANmW1-*SHl%Z7Xa0000< KMNUMnLSTZ$HYs)h diff --git a/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/inhand-right.png index 2ff04b1e7e2976593ada8577ee78ece6ee682d7d..299dc5972d0eb59fc572a1d783023df9be750ef6 100644 GIT binary patch delta 796 zcmdnRx|wZ)O8qZS7srr_Id5m$cL+O*w8wk7GCA^dA8pmXa>$8eQ8<_2#Y1k{+}+Il zf{uX!E-oS>{4OjXy}DoL95G5*+0LS))6yVxp;hatgVka#lrucSlTRF`R~KJJ+=Q8R8o4V*s@bSAq$eZ2hqr{Y}GV8#_$#~53$`m)>$e_8*2In$Ms z-{n{T3V-tF=H+VLxf8{>f8V+jpJtcO&B_;Raoy?w*6-m6v&Zk`KzE`5KsY+7ORR=yuju-L#7 zV~7aL)v=HdnQj^X_|4gCB?XNenbdxI@Vi@PFHc?8&t`CJ;!f|oj}nh@O$*g~C3ab# z!OCln-0P*rJv`Gy!^97JJ$L*r8gr+fOPSe~K`8y|&SjpHu4|_}UCFU3@iylIJ-z%e z3ByYhwn(<;sxzFtXt4CK*M8mgOlK?tcwfy)NLjFl!SmeIyuwH?*6drpCbEJ}M=I4F z0)J=D(iAnh?RZxq(}AZT^FDvDRt8JQ7xszWcax--Hkm~;X#D)L*XntJ(TlSxpadxT Y`jpq=0M4ei6%0V&>FVdQ&MBb@00Sm&!vFvP delta 674 zcmV;T0$u&H2D$~1B!7WPL_t(|obA~^XcJ)=$MJ7O1Vw}w4ILsLbaHSg9MxtF1jPg?D_N(Z4x2_hwk;vgBj>EI$R!SRKRsg#2b9fU%qNQY3%3!${*>kzJ{m&=<=ZOC1D zK3ne1U7q*f<+vXRA%qY@2qA<|trTW^I zR@YEU;dvfe83fma#STEdR;APF01yPh>4`xQSfvzx+h=cYk9w^-mVz%**zrNN<_4Vr z#I69p?f?7kH4Q+yT<*KhB<<|%*l+>?-n@Ll(&`$}U+dMl3n-=VeLttQwkykv1%9zy;My_=e5>0I;(H%pHH`Nx5mM>#%_Unt;*c&3>%wU>>sqxtblM-!*+m1 zvo*0TP$?B{^!J}V?M~jW-)#UE=AR6#wQmK4ou9sUmw$(k7h>-N#u)zm{K3ZN)RV0$-JH@;rs_T4||t^il9&Q65? z2w|t8I~b6@JAbdMNfOvJOEdsU(qdNvn`VgyAPh|FwW>2MzLfWXN~vhWwD`{bN6xhP%eU_n zPm4!2Qn6W0i(N)4I;&~1OQPq1URg|wUCy-yARBvWu@EBGU;3?n1LbP%Jpcdz07*qo IM6N<$g2Kc>&Hw-a diff --git a/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png index d034a9fbb8d9c4c5bbc4f7e9c0f0fc1f7ac510e4..fd5543f624efc717af81252860e84d0a5a7b9db8 100644 GIT binary patch delta 1387 zcmV-x1(f>X3jPX^B!5LoL_t(|ob8%DZzDw*$Dh2vJ5EdzD~aStC`}^WC!nXej)Dq_ z{t6^0I3XxO=qNyKEX*z6Cov15;-wW9OwOYd4A)Ju??~JSCGBTxs6e#cH;oWw6LFJ)+GNLy>r=931D z@kUsJXh*9)hLb3-8}+;i{&iUWjvWX$pU>xAlHd&h>b!5&Z`(nI0|ZI*N*5W(<$rSeSDXo45k>^bL%Cemzv6kBk8w&lK?mw?Ck9H@R|S`llMnVAOHjx78cys6hZS^ ztC2wOA$Rg06_A%&XvFfP;rXsoEB8ujR0U8U;@cA z{K1a^t%k zT(DBH9!Lz<7jMKTU#^fn}0e_O-%*Nzv1CweI;^naZ#_s>FKE) z9v+&`X<>GDHfa18{Os&ZMn^}rR)c@Z_xJZr`likpFg7-(wb}~n*8sm#$6)|kKIuxO zQvXeW8N?Ke0SGnDJ?0{T#bE$z58A9b9@ZpcU@eN(0FtE*@wg1&iZk+jvb13eBasn7 zn}2o^X#h7sJbzzpZpxQ)bMo}hb9s5%#rpw1`AjC`?!bKV z`n7vt0k{HjnBbH5Banw8eth!8X;-UNvk9R)g5HjDyR{gA7=@i0?#SHVjgh^*J<~a@ z%+1XOdKaj!$!-wwP>6>eVZAjLI)>04!5hHV^ZNR_+lNP(9a_*G+*n3{?*3}6_J6bp zNgo{@$;!%#+eVMo0Fw8c6x22OSVlmhP;iL@8zR(WGk~kk97KquF@X8V8ld+BV=+MQ zL)JCD0bCf?0Y*dD3}6xbV5s(hR8fVW>-=Z<6AW`wzlJELb6VjmSc{wg7{D}mq3b|i zF9iI0+26fIP={WC+l}ZIaRx9d;(we1Tx|?cJ#GCPMy19PI)>04L52Te08@Zb0C7$M z;Oa948tJM5Dja-qeyz1;*rR8!{=@8~EERW5=d`k!UkHAw9Mv^j`F3Q03(=$1P=xLX z7@&tH*so{!L#b3UiARALX6_%;VH)sEKr5CQLU;5KfF2xiC+{JKhfJ`>U}Wm-A%M4) zyoVTCO^6bM`2&D>YQVh#Jf^0?lt|}_3NdJLkIKC@1Ni<|QEjo$z5fa^=z*jAe;_p= tZUgjCCyMZ!;7!C~{=ol@)Br7s<}ZEw_HI^@=QjWV002ovPDHLkV1n9PpcDWA delta 1358 zcmV-U1+n`63gHTnB!4JLL_t(|ob8%1Z`(!`fIpKwS&St`c1*$0;sS+N|B#Fw3ba7b z%mIp`OM(JfgCa`<1V#4%K?-zev*aga$S>$%G_Zprl|_h>Nn0n8l-R-HMYa^%M_O{) z@B;*qNAljgckk}VcMl2*3JMAe3JN|^mabZXEHsftp%d;qPQJT$W^0Zt|0P6L+`W+q~^0Zt|W*O!@E^IZ&ags+tz{9OAMx)Wx zb<;Gtx3k0d)he#*Ub<(^Oa6s!bQ~wy+S&p@N=Y2Y0E|W>Ow$CwvMg-d24H7r=TeO@ zDL)7T0IJn0L4Oda|Fle3{<$}$!ljf9heMW^m(?{XrD`-l9LLHKmt}<0@=epETCJ*% zNadwQ(3O9oIiT0;5yvsE>jGfgwrcp~ajVs$-EPzC^)fZ~qVlDbC$6XGS>#)1U345L z+1S{?^E|>ZRKn7pHw;6ar-Wh1!NCC=8yf&g9xs?BKYxlM;QbItdp|ALm4B`Wc%BDv z!kui}R>NU99G(~k>3!*Qd6^~OvQGBf#*2j2DiBvMKY<9$^R zI~`t*j-SuNhvdg`jFb|~veaCVRlb&cI*yY#jsw8*^0FEV!{HDB*LCNz1WwAoapML6 zLI^C&B7cr!<^G*cM_azuix9wgJXXh(u0L5mFB**oH(M?@TQ1}An6LiaVLTqIvPPq! zU8j}-Zbf5E)8zK+H-urxAOExo!;ssr-(Z?1x1#wP!F64puU+T)+I6Iq{8Xdk%o(#z#?v zWm!Z~q}J#~VB5B8Y}(sGh!gXX4w(#)GEaA36uAuWe;~5~vW~gDoPG&Aulzi;C&8;E zj(=nIDSlR&4%!AdIy#yvi=s%qjm;C!^QPvUS!D$U1qB5K1qB5K1qB7?km*aR*=#1W z;sJYmdkgt8+uYoo$^(d^C{vPzc0lCLN+S_M@L+#mZH#7($K_#C_JjR>gb>_WX=o=% zXc^$nN+Wr(Zd0q(c)Y#M{oP%J5Gp7+tAA%Mo6XJ5Bn^xTA-KQ0%j4~BYPA|K)@^Mg zXc^#{2$j`+-{4IrhQ+Its5;QM|qMRf3ee<~{Nd0wW-u$JF^9hLYZ2p|Y(4F=p>Sy9(2 zmC8blV45bCN=0qSk47VY9t_xMw*mM)D)Ea(eOd;1v2OEg+DO}meqUu~8HO=4eeJRt zjYcPuA^QD3-`Y038w#~`8>R!-AAcnGzCfC)wurEJO6qAr&I}aLG=T5>{2)&?R37l8 zUgw*?_V}`XozHTsbT+S+EPmVlniUo94MXkxfYW7_N=3a1x~@C-4b#=t zRh6bArR4DNaOxf%9kf<~(-kke@u?1z`HGcF%2>2|xhmB>oB+s$o+Pksnwnz&9chgX#=^s(qsQ1Bn-Um{1$lV7sg QiU0rr07*qoM6N<$g2yhKTmS$7 From c688da00a0ff5ef41c1177410ddd520037d306db Mon Sep 17 00:00:00 2001 From: Plykiya <58439124+Plykiya@users.noreply.github.com> Date: Sun, 11 Aug 2024 15:12:31 -0700 Subject: [PATCH 402/422] Add execution component to all energy sword weapons (#30909) Co-authored-by: plykiya --- .../Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml index fead3f8c02..231e898727 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml @@ -18,6 +18,8 @@ - type: Sharp - type: DisarmMalus malus: 0.6 + - type: Execution + doAfterDuration: 4.0 - type: ItemToggleHot - type: ItemToggleSize activatedSize: Huge @@ -116,6 +118,8 @@ - type: Sharp - type: DisarmMalus malus: 0.4 + - type: Execution + doAfterDuration: 4.0 - type: Sprite sprite: Objects/Weapons/Melee/e_dagger_loud.rsi layers: @@ -282,6 +286,8 @@ - type: Sharp - type: DisarmMalus malus: 0.7 + - type: Execution + doAfterDuration: 4.0 - type: Wieldable wieldSound: null # esword light sound instead - type: MeleeWeapon From 86f4346c0595ce9947a7f40dde593ecfbce08f47 Mon Sep 17 00:00:00 2001 From: PJBot Date: Sun, 11 Aug 2024 22:13:37 +0000 Subject: [PATCH 403/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 27cf3131b5..0308588f07 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: lzk228 - changes: - - message: Grill and hotplate can be anchored on the table. - type: Fix - id: 6594 - time: '2024-05-14T23:57:23.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28026 - author: ShadowCommander changes: - message: Fixed salvage magnet UI opening multiple times when activated. @@ -3784,3 +3777,10 @@ id: 7093 time: '2024-08-11T10:26:37.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/29978 +- author: Plykiya + changes: + - message: Energy sword weapons are now execution-capable. + type: Add + id: 7094 + time: '2024-08-11T22:12:31.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30909 From dea9a637fb563287c3606fa3690e911d8e60727b Mon Sep 17 00:00:00 2001 From: Brandon Hu <103440971+Brandon-Huu@users.noreply.github.com> Date: Sun, 11 Aug 2024 22:25:45 +0000 Subject: [PATCH 404/422] chore(grammar): correct some mistakes (#30916) --- Resources/Prototypes/Entities/Clothing/Head/hoods.yml | 2 +- .../Prototypes/Entities/Clothing/OuterClothing/softsuits.yml | 2 +- Resources/Prototypes/Entities/Objects/Misc/chopsticks.yml | 2 +- Resources/ServerInfo/Guidebook/Engineering/Singularity.xml | 2 +- Resources/ServerInfo/Guidebook/Glossary.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml index de974f9d50..c9e19cb31b 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml @@ -354,7 +354,7 @@ parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterHOP categories: [ HideSpawnMenu ] - name: head of personel's winter coat hood + name: head of personnel's winter coat hood components: - type: Sprite sprite: Clothing/Head/Hoods/Coat/hoodhop.rsi diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml index c61d09ee21..8e90efafc1 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml @@ -37,7 +37,7 @@ parent: ClothingOuterEVASuitBase id: ClothingOuterSuitEmergency name: emergency EVA suit - description: An emergency EVA suit with a built-in helmet. It's horribly slow and lacking in temperature protection, but enough to buy you time from the harsh vaccuum of space. + description: An emergency EVA suit with a built-in helmet. It's horribly slow and lacking in temperature protection, but enough to buy you time from the harsh vacuum of space. components: - type: Sprite sprite: Clothing/OuterClothing/Suits/eva_emergency.rsi diff --git a/Resources/Prototypes/Entities/Objects/Misc/chopsticks.yml b/Resources/Prototypes/Entities/Objects/Misc/chopsticks.yml index ed49053f8a..f5b6a982b5 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/chopsticks.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/chopsticks.yml @@ -18,7 +18,7 @@ parent: BaseItem name: paired chopsticks id: PairedChopsticks - description: You should probably seperate them. + description: You should probably separate them. components: - type: SpawnItemsOnUse items: diff --git a/Resources/ServerInfo/Guidebook/Engineering/Singularity.xml b/Resources/ServerInfo/Guidebook/Engineering/Singularity.xml index 6881452278..3018196be0 100644 --- a/Resources/ServerInfo/Guidebook/Engineering/Singularity.xml +++ b/Resources/ServerInfo/Guidebook/Engineering/Singularity.xml @@ -81,7 +81,7 @@ The tesla coils connect to HV cables and provide a stream of power after being zapped by the ball lightning. However, tesla coils usually do not fully absorb the lightning strike, and the grounding rods are required to prevent lighting from arcing to and obliterating nearby machines. - Do note that one grounding rod is not a foolproof solution; get [color=#a4885c]atleast 4 rods[/color] around the containment field to make it mathematically unlikely for the tesla to escape. + Do note that one grounding rod is not a foolproof solution; get [color=#a4885c]at least 4 rods[/color] around the containment field to make it mathematically unlikely for the tesla to escape. As the ball lightning zaps tesla coils, they will degrade from wear; make sure to [color=#a4885c]weld them[/color] every now and then to keep generating power. ## Turing on the Engines diff --git a/Resources/ServerInfo/Guidebook/Glossary.xml b/Resources/ServerInfo/Guidebook/Glossary.xml index d7278c7f4b..eb1872983f 100644 --- a/Resources/ServerInfo/Guidebook/Glossary.xml +++ b/Resources/ServerInfo/Guidebook/Glossary.xml @@ -95,7 +95,7 @@ A portmanteau of "New" and "Nukie" used to refer to an inexperienced player in t A slang/shorthand term of a Nuclear Operative. May sometimes also appear as "Nuke Op". ## Perma -Short for Permanent Brig. This is for the most serious crime and means that a prisoner will never be released. Most stations have a dedicated, seperate area of security for the permanent brig. +Short for Permanent Brig. This is for the most serious crime and means that a prisoner will never be released. Most stations have a dedicated, separate area of security for the permanent brig. ## QM Short for Quartermaster, the head of the Cargo department. From bcd7085a3e1843b2ae96bf2a71bd6a201ee840a0 Mon Sep 17 00:00:00 2001 From: Alzore <140123969+Blackern5000@users.noreply.github.com> Date: Sun, 11 Aug 2024 20:49:09 -0500 Subject: [PATCH 405/422] Add diamond mining drills, buff regular mining drills (#30814) * why do I have to change so much just to add drills * diamon --- .../Locale/en-US/research/technologies.ftl | 2 +- .../Entities/Objects/Materials/materials.yml | 8 +- .../Entities/Objects/Weapons/Melee/mining.yml | 88 ++++++++++++++++++ .../Objects/Weapons/Melee/pickaxe.yml | 64 ------------- .../Entities/Structures/Machines/lathe.yml | 3 +- .../Reagents/Materials/materials.yml | 10 +- .../Prototypes/Recipes/Lathes/salvage.yml | 20 ++++ Resources/Prototypes/Recipes/Lathes/tools.yml | 9 -- Resources/Prototypes/Research/industrial.yml | 29 +++--- .../Tools/handdrilldiamond.rsi/handdrill.png | Bin 0 -> 416 bytes .../handdrilldiamond.rsi/inhand-left.png | Bin 0 -> 392 bytes .../handdrilldiamond.rsi/inhand-right.png | Bin 0 -> 392 bytes .../Tools/handdrilldiamond.rsi/meta.json | 22 +++++ 13 files changed, 161 insertions(+), 94 deletions(-) delete mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml create mode 100644 Resources/Textures/Objects/Tools/handdrilldiamond.rsi/handdrill.png create mode 100644 Resources/Textures/Objects/Tools/handdrilldiamond.rsi/inhand-left.png create mode 100644 Resources/Textures/Objects/Tools/handdrilldiamond.rsi/inhand-right.png create mode 100644 Resources/Textures/Objects/Tools/handdrilldiamond.rsi/meta.json diff --git a/Resources/Locale/en-US/research/technologies.ftl b/Resources/Locale/en-US/research/technologies.ftl index 70ca8d018a..4fbb0e1bd3 100644 --- a/Resources/Locale/en-US/research/technologies.ftl +++ b/Resources/Locale/en-US/research/technologies.ftl @@ -20,6 +20,7 @@ research-technology-super-powercells = Super Powercells research-technology-bluespace-storage = Bluespace Storage research-technology-portable-fission = Portable Fission research-technology-space-scanning = Space Scanning +research-technology-excavation = Mass Excavation research-technology-salvage-weapons = Salvage Weapons research-technology-draconic-munitions = Draconic Munitions @@ -43,7 +44,6 @@ research-technology-alternative-research = Alternative Research research-technology-magnets-tech = Localized Magnetism research-technology-advanced-parts = Advanced Parts research-technology-anomaly-harnessing = Anomaly Core Harnessing -research-technology-grappling = Grappling research-technology-abnormal-artifact-manipulation = Artifact Recycling research-technology-gravity-manipulation = Gravity Manipulation research-technology-quantum-leaping = Quantum Leaping diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml index e8d4094400..e00f3e65d3 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/materials.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/materials.yml @@ -360,10 +360,6 @@ layers: - state: diamond map: ["base"] - - type: StaticPrice - price: 0 - - type: StackPrice - price: 500 - type: Appearance - type: Item heldPrefix: diamond @@ -375,6 +371,10 @@ reagents: - ReagentId: Carbon Quantity: 20 + - type: Material + - type: PhysicalComposition + materialComposition: + Diamond: 100 - type: entity parent: MaterialDiamond diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml index 4eec90584c..87826aa8f0 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml @@ -1,3 +1,91 @@ +- type: entity + name: pickaxe + parent: BaseItem + id: Pickaxe + description: Notched to perfection, for jamming it into rocks. + components: + - type: Tag + tags: + - Pickaxe + - type: Sprite + sprite: Objects/Weapons/Melee/pickaxe.rsi + state: pickaxe + - type: MeleeWeapon + attackRate: 0.7 + wideAnimationRotation: -135 + soundHit: + path: "/Audio/Weapons/smash.ogg" + params: + volume: -3 + damage: + groups: + Brute: 5 + - type: Wieldable + - type: IncreaseDamageOnWield + damage: + groups: + Brute: 10 + types: + Structural: 30 + - type: Item + size: Normal + shape: + - 0,0,2,0 + - 1,1,1,2 + sprite: Objects/Weapons/Melee/pickaxe.rsi + storedRotation: -45 + - type: UseDelay + +- type: entity + name: mining drill + parent: BaseItem + id: MiningDrill + description: Powerful tool used to quickly drill through rocks. + components: + - type: Item + storedRotation: -90 + - type: Tag + tags: + - Pickaxe + - type: Sprite + sprite: Objects/Tools/handdrill.rsi + state: handdrill + - type: MeleeWeapon + autoAttack: true + angle: 0 + wideAnimationRotation: -90 + soundHit: + path: "/Audio/Items/drill_hit.ogg" + attackRate: 4 + damage: + groups: + Brute: 3 + types: + Structural: 15 + +- type: entity + name: diamond tipped mining drill + parent: MiningDrill + id: MiningDrillDiamond + description: A significantly more efficient mining drill tipped with diamond. + components: + - type: Sprite + sprite: Objects/Tools/handdrilldiamond.rsi + state: handdrill + - type: MeleeWeapon + autoAttack: true + angle: 0 + wideAnimationRotation: -90 + soundHit: + path: "/Audio/Items/drill_hit.ogg" + attackRate: 4 + damage: + groups: + Brute: 6 + types: + Structural: 30 + + - type: entity abstract: true parent: BaseItem diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml deleted file mode 100644 index e1c98f418b..0000000000 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml +++ /dev/null @@ -1,64 +0,0 @@ -- type: entity - name: pickaxe - parent: BaseItem - id: Pickaxe - description: Notched to perfection, for jamming it into rocks. - components: - - type: Tag - tags: - - Pickaxe - - type: Sprite - sprite: Objects/Weapons/Melee/pickaxe.rsi - state: pickaxe - - type: MeleeWeapon - attackRate: 0.7 - wideAnimationRotation: -135 - soundHit: - path: "/Audio/Weapons/smash.ogg" - params: - volume: -3 - damage: - groups: - Brute: 5 - - type: Wieldable - - type: IncreaseDamageOnWield - damage: - groups: - Brute: 10 - types: - Structural: 30 - - type: Item - size: Normal - shape: - - 0,0,2,0 - - 1,1,1,2 - sprite: Objects/Weapons/Melee/pickaxe.rsi - storedRotation: -45 - - type: UseDelay - -- type: entity - name: mining drill - parent: BaseItem - id: MiningDrill - description: Powerful tool used to quickly drill through rocks. - components: - - type: Item - storedRotation: -90 - - type: Tag - tags: - - Pickaxe - - type: Sprite - sprite: Objects/Tools/handdrill.rsi - state: handdrill - - type: MeleeWeapon - autoAttack: true - angle: 0 - wideAnimationRotation: -90 - soundHit: - path: "/Audio/Items/drill_hit.ogg" - attackRate: 3.5 - damage: - groups: - Brute: 3 - types: - Structural: 12 diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 38d287cce1..8f6fb16f04 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -16,7 +16,7 @@ mask: - MachineMask layer: - - MachineLayer + - MachineLayer - type: Lathe - type: MaterialStorage - type: Destructible @@ -277,6 +277,7 @@ dynamicRecipes: - PowerDrill - MiningDrill + - MiningDrillDiamond - AnomalyScanner - AnomalyLocator - AnomalyLocatorWide diff --git a/Resources/Prototypes/Reagents/Materials/materials.yml b/Resources/Prototypes/Reagents/Materials/materials.yml index 9446b9d27f..829ae46b93 100644 --- a/Resources/Prototypes/Reagents/Materials/materials.yml +++ b/Resources/Prototypes/Reagents/Materials/materials.yml @@ -123,4 +123,12 @@ unit: materials-unit-piece icon: { sprite: Objects/Misc/reagent_fillings.rsi, state: powderpile } color: "#A9A9A9" - price: 0 \ No newline at end of file + price: 0 + +- type: material + id: Diamond + name: materials-diamond + unit: materials-unit-piece + icon: { sprite: Objects/Materials/materials.rsi, state: diamond } + color: "#80ffff" + price: 20 # big diamond gaslit us so hard diamonds actually became extremely rare diff --git a/Resources/Prototypes/Recipes/Lathes/salvage.yml b/Resources/Prototypes/Recipes/Lathes/salvage.yml index 9b3cb08643..84047ae75d 100644 --- a/Resources/Prototypes/Recipes/Lathes/salvage.yml +++ b/Resources/Prototypes/Recipes/Lathes/salvage.yml @@ -14,3 +14,23 @@ Steel: 1000 Glass: 500 # If they get spammed make it cost silver. + +- type: latheRecipe + id: MiningDrill + result: MiningDrill + category: Tools + completetime: 3 + materials: + Steel: 500 + Plastic: 100 + +- type: latheRecipe + id: MiningDrillDiamond + result: MiningDrillDiamond + category: Tools + completetime: 3 + materials: + Steel: 600 + Plastic: 200 + Silver: 200 + Diamond: 100 diff --git a/Resources/Prototypes/Recipes/Lathes/tools.yml b/Resources/Prototypes/Recipes/Lathes/tools.yml index 67d412b571..3f5003d909 100644 --- a/Resources/Prototypes/Recipes/Lathes/tools.yml +++ b/Resources/Prototypes/Recipes/Lathes/tools.yml @@ -197,15 +197,6 @@ Glass: 50 Plastic: 50 -- type: latheRecipe - id: MiningDrill - result: MiningDrill - category: Tools - completetime: 3 - materials: - Steel: 500 - Plastic: 100 - - type: latheRecipe id: WelderExperimental result: WelderExperimental diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml index 4dc60314c4..373333ad43 100644 --- a/Resources/Prototypes/Research/industrial.yml +++ b/Resources/Prototypes/Research/industrial.yml @@ -11,9 +11,10 @@ cost: 7500 recipeUnlocks: - MiningDrill + - WeaponGrapplingGun - BorgModuleMining + - BorgModuleGrapplingGun - OreProcessorIndustrialMachineCircuitboard - - OreBagOfHolding - ClothingMaskWeldingGas - type: technology @@ -106,19 +107,6 @@ - RipleyPeripheralsElectronics - MechEquipmentGrabber -- type: technology - id: Grappling - name: research-technology-grappling - icon: - sprite: Objects/Weapons/Guns/Launchers/grappling_gun.rsi - state: base - discipline: Industrial - tier: 1 - cost: 5000 - recipeUnlocks: - - WeaponGrapplingGun - - BorgModuleGrapplingGun - # Tier 2 - type: technology @@ -180,6 +168,19 @@ - BorgModuleAdvancedTool - BorgModuleRCD +- type: technology + id: MassExcavation + name: research-technology-excavation + icon: + sprite: Objects/Tools/handdrilldiamond.rsi + state: handdrill + discipline: Industrial + tier: 2 + cost: 12500 + recipeUnlocks: + - OreBagOfHolding + - MiningDrillDiamond + # Tier 3 - type: technology diff --git a/Resources/Textures/Objects/Tools/handdrilldiamond.rsi/handdrill.png b/Resources/Textures/Objects/Tools/handdrilldiamond.rsi/handdrill.png new file mode 100644 index 0000000000000000000000000000000000000000..8b913e2bd9bd9304ab6aa7081c8f7e3a50aa9bf2 GIT binary patch literal 416 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCikF1AIbUm1Lxhv^ApqTq@H;W6iS`v?U$i(7nfNwyA|5-0)}S}&*Fee zI14-?iy0XBj({-ZRBb+Kpx{AI7sn6_|F`Gw@--Rous)bO?clNZ5;wlrhn$}y)ykc` z=j(=^lD`UbH}n5&o~7T=-0|Sc!OsU)7Kqz+x%0Lz%v7k^|CF!d-NmxG>;g&hzwNHM zF&;LUvB32;=bogFWSQfO-X+XhHZ%4IQ;5M))xMY-4~`%&;}FZEyEge3yw*SZ)m%X5 zsgB8Ots7hsWo6}lLH`BLIGu93kPvKsyjFkpIZpu&ohQCqcIKS3yw}9M@6IB%4W)%T l^VLn;Kh3dU@l$k0EaOX4pWU<0t^oxCgQu&X%Q~loCIDjpvgQB) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Tools/handdrilldiamond.rsi/inhand-left.png b/Resources/Textures/Objects/Tools/handdrilldiamond.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..db6873b739fc833b6287a5fb3387aa04cbac9b66 GIT binary patch literal 392 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1E1o(uwI$4@1$w=+-n!TVc$<)HJGCedbD!Jy+p-QWUhX4Qf|NjqE_(|c& zR3ODu666>B9|0JI?w>mc6z44Ph%9Dc;5!Jyj5{V~zXb|j^>lFziEw{A?X*y{0*@;* zBjeBi|8+|)MV(ptsw6qR$ZXQbqMDo?A@xUC)LzUuz%sX*OV87B#vC2Lg{)6@N;diE z-|E@x<#5Jsm+P|Lqpp#?8jebRl7CrGZIZa@9_%S{v95F3^H0sOW^0#9rZ}uAs$I;o zy6V`0g$lLz>wj=wH*DmzQZsNo&hlOK%+^9aL!c*oFm(Di%|&kE}U zF?~KSdR*=@?#s&NSgU?w1LJOHkt^HwuPBx)XV-a=so-!oQH{ZuvAlid1D$&P6<-k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`1E1o(uwI$4@1$w--6I4)>Q+T%4lEGoG&J+#uQq2|z`hX4Qf|NjqE7~E}l z3`p^m1o;L3M*s$)`{&L9#W@Q+B8wRq_zr?FN6AQTKWM zlZl>^y%lE?u1pF0Bb;EyF~ux7?VH>_6Nj?%8@~Ls?KX{kUB;tlYaAo+=iRac!f!cN zeRC_26YNk>ViI(5`QYJr|HiwJt9c#`AA<7(WaL{}E}W=)rTz3}od<(UZb+Y~_UyxV zCpa{;9dA0b?HVWNLNTk%-~iFtij8x4+qP(ChDa+WPLPheWu?NC Date: Mon, 12 Aug 2024 01:50:16 +0000 Subject: [PATCH 406/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 0308588f07..f9e51bf8db 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: ShadowCommander - changes: - - message: Fixed salvage magnet UI opening multiple times when activated. - type: Fix - id: 6595 - time: '2024-05-14T23:59:46.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28010 - author: Vermidia changes: - message: Shuttle roles get PDAs and headsets now @@ -3784,3 +3777,19 @@ id: 7094 time: '2024-08-11T22:12:31.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30909 +- author: Blackern5000 + changes: + - message: Added diamond-tipped mining drills, a science printed item found under + T2 industrial. + type: Add + - message: Standard mining drills now attack faster and break rocks in two hits. + type: Tweak + - message: Moved ore bags of holding to T2 industrial tech. + type: Tweak + - message: Grappling guns are now researched with Salvage Equipment. + type: Tweak + - message: Diamonds are now worth 2,000 spesos each. + type: Tweak + id: 7095 + time: '2024-08-12T01:49:09.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30814 From a0a1421da4c94e046a1a2f66b688240596227849 Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Sun, 11 Aug 2024 22:07:39 -0400 Subject: [PATCH 407/422] give trash a reusable entity table (#30921) --- .../Markers/Spawners/Random/trash.yml | 63 +++++++++++-------- 1 file changed, 36 insertions(+), 27 deletions(-) diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/trash.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/trash.yml index d19164e4fa..fb3d945b24 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/trash.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/trash.yml @@ -1,3 +1,31 @@ +- type: entityTable + id: GenericTrashItems + table: !type:GroupSelector + children: + - !type:GroupSelector + weight: 95 + children: + - id: FoodPacketBoritosTrash + - id: FoodPacketCheesieTrash + - id: FoodPacketChipsTrash + - id: FoodPacketChocolateTrash + - id: FoodPacketChowMeinTrash + - id: FoodPacketCnDsTrash + - id: FoodPacketDanDanTrash + - id: FoodPacketPistachioTrash + - id: FoodPacketEnergyTrash + - id: FoodPacketPopcornTrash + - id: FoodPacketRaisinsTrash + - id: FoodPacketSemkiTrash + - id: FoodPacketSusTrash + - id: FoodPacketSyndiTrash + - id: BrokenBottle + - !type:GroupSelector + weight: 5 + children: + - id: FoodPlateSmallTrash + - id: FoodBowlBigTrash + - type: entity name: Trash Spawner id: RandomSpawner @@ -9,32 +37,11 @@ - state: red - sprite: Objects/Consumable/Food/snacks.rsi state: pistachio-trash - - type: RandomSpawner - rarePrototypes: - - PuddleVomit - - FoodPlateSmallTrash - - FoodBowlBigTrash - rareChance: 0.03 - prototypes: -# - TrashCandy - - FoodPacketBoritosTrash - - FoodPacketCheesieTrash - - FoodPacketChipsTrash - - FoodPacketChocolateTrash - - FoodPacketChowMeinTrash - - FoodPacketCnDsTrash - - FoodPacketDanDanTrash - - FoodPacketEnergyTrash - - FoodPacketPistachioTrash -# - TrashPlasticBag - - FoodPacketPopcornTrash - - FoodPacketRaisinsTrash - - FoodPacketSemkiTrash - - FoodPacketSusTrash - - FoodPacketSyndiTrash - - BrokenBottle - chance: 0.5 + - type: EntityTableSpawner offset: 0.2 + table: !type:NestedSelector + tableId: GenericTrashItems + prob: 0.5 placement: mode: AlignTileAny @@ -45,5 +52,7 @@ placement: mode: AlignTileAny components: - - type: RandomSpawner - chance: 1 + - type: EntityTableSpawner + offset: 0.2 + table: !type:NestedSelector + tableId: GenericTrashItems From 9f180e4f622768d1845477198ac86dde3fe94e03 Mon Sep 17 00:00:00 2001 From: Mervill Date: Sun, 11 Aug 2024 19:13:28 -0700 Subject: [PATCH 408/422] Don't show the Meteor Swarm announcement to players in the lobby. (#30922) --- Content.Server/StationEvents/Events/MeteorSwarmSystem.cs | 8 ++++++-- Content.Server/StationEvents/Events/StationEventSystem.cs | 1 - 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Content.Server/StationEvents/Events/MeteorSwarmSystem.cs b/Content.Server/StationEvents/Events/MeteorSwarmSystem.cs index 3f51834e3a..948fedf6fc 100644 --- a/Content.Server/StationEvents/Events/MeteorSwarmSystem.cs +++ b/Content.Server/StationEvents/Events/MeteorSwarmSystem.cs @@ -28,9 +28,13 @@ public sealed class MeteorSwarmSystem : GameRuleSystem component.WaveCounter = component.Waves.Next(RobustRandom); + // we don't want to send to players who aren't in game (i.e. in the lobby) + Filter allPlayersInGame = Filter.Empty().AddWhere(GameTicker.UserHasJoinedGame); + if (component.Announcement is { } locId) - _chat.DispatchGlobalAnnouncement(Loc.GetString(locId), playSound: false, colorOverride: Color.Gold); - _audio.PlayGlobal(component.AnnouncementSound, Filter.Broadcast(), true); + _chat.DispatchFilteredAnnouncement(allPlayersInGame, Loc.GetString(locId), playSound: false, colorOverride: Color.Gold); + + _audio.PlayGlobal(component.AnnouncementSound, allPlayersInGame, true); } protected override void ActiveTick(EntityUid uid, MeteorSwarmComponent component, GameRuleComponent gameRule, float frameTime) diff --git a/Content.Server/StationEvents/Events/StationEventSystem.cs b/Content.Server/StationEvents/Events/StationEventSystem.cs index 67643a8df5..aaa48a482e 100644 --- a/Content.Server/StationEvents/Events/StationEventSystem.cs +++ b/Content.Server/StationEvents/Events/StationEventSystem.cs @@ -22,7 +22,6 @@ public abstract class StationEventSystem : GameRuleSystem where T : ICompo [Dependency] protected readonly ChatSystem ChatSystem = default!; [Dependency] protected readonly SharedAudioSystem Audio = default!; [Dependency] protected readonly StationSystem StationSystem = default!; - [Dependency] protected readonly GameTicker GameTicker = default!; protected ISawmill Sawmill = default!; From 485caa4553f3f96ad8b67501edb80d2ff9d85a51 Mon Sep 17 00:00:00 2001 From: Kara Date: Sun, 11 Aug 2024 22:57:49 -0500 Subject: [PATCH 409/422] Contraband marking & examining (#28688) * System & loc strings * pass over syndie contraband * fixes * grand theft pass * contrabandexamine -> contraband * examine text generation update * all composition parents necessary * bring back minor contra so it has a less confusing message * minor * weapon pass * jumpsuit pass * feet pass * AUUUUUUUUUGHHHHHHHHHHHHHHHHHH * head * AUUUUGH * ear * belt * back * fix * bro * rename for more clarity * do da review * add cvar for contraband examine --------- Co-authored-by: EmoGarbage404 Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> --- .../Medical/SuitSensors/SuitSensorSystem.cs | 2 +- .../Access/Components/IdCardComponent.cs | 5 +- .../Access/Systems/SharedIdCardSystem.cs | 2 +- Content.Shared/CCVar/CCVars.cs | 6 ++ .../Contraband/ContrabandComponent.cs | 26 ++++++ .../Contraband/ContrabandSeverityPrototype.cs | 26 ++++++ Content.Shared/Contraband/ContrabandSystem.cs | 81 ++++++++++++++++ .../en-US/contraband/contraband-severity.ftl | 8 ++ .../Catalog/Fills/Boxes/general.yml | 2 +- .../Catalog/Fills/Boxes/syndicate.yml | 8 +- .../Catalog/Fills/Items/briefcases.yml | 2 +- .../Entities/Clothing/Back/backpacks.yml | 8 +- .../Entities/Clothing/Back/duffel.yml | 8 +- .../Entities/Clothing/Back/satchel.yml | 6 +- .../Entities/Clothing/Belt/belts.yml | 8 +- .../Entities/Clothing/Ears/headsets.yml | 14 +-- .../Entities/Clothing/Ears/headsets_alt.yml | 12 +-- .../Entities/Clothing/Eyes/glasses.yml | 2 +- .../Prototypes/Entities/Clothing/Eyes/hud.yml | 10 +- .../Entities/Clothing/Hands/gloves.yml | 8 +- .../Entities/Clothing/Head/hats.yml | 16 ++-- .../Entities/Clothing/Head/helmets.yml | 6 +- .../Entities/Clothing/Masks/masks.yml | 6 +- .../Entities/Clothing/Neck/cloaks.yml | 16 ++-- .../Entities/Clothing/Neck/mantles.yml | 24 ++--- .../Entities/Clothing/Neck/scarfs.yml | 4 +- .../Entities/Clothing/OuterClothing/armor.yml | 6 +- .../Clothing/OuterClothing/hardsuits.yml | 36 +++---- .../Entities/Clothing/OuterClothing/vests.yml | 6 +- .../Clothing/OuterClothing/wintercoats.yml | 28 +++--- .../Entities/Clothing/Shoes/boots.yml | 8 +- .../Entities/Clothing/Shoes/magboots.yml | 6 +- .../Entities/Clothing/Uniforms/jumpskirts.yml | 36 +++---- .../Entities/Clothing/Uniforms/jumpsuits.yml | 52 +++++------ .../Prototypes/Entities/Mobs/NPCs/animals.yml | 2 +- .../Consumable/Food/Containers/box.yml | 2 +- .../Entities/Objects/Consumable/Food/meat.yml | 2 +- .../Smokeables/Cigarettes/packs.yml | 2 +- .../Devices/Circuitboards/computer.yml | 4 +- .../Syndicate_Gadgets/chimp_upgrade_kit.yml | 2 +- .../Syndicate_Gadgets/guardian_activators.yml | 6 +- .../reinforcement_teleporter.yml | 2 +- .../Syndicate_Gadgets/singularity_beacon.yml | 2 +- .../Objects/Devices/chameleon_projector.yml | 2 +- .../Objects/Devices/encryption_keys.yml | 4 +- .../Objects/Devices/hand_teleporter.yml | 2 +- .../Entities/Objects/Misc/briefcases.yml | 2 +- .../Entities/Objects/Misc/dat_fukken_disk.yml | 4 +- .../Entities/Objects/Misc/handcuffs.yml | 2 +- .../Objects/Misc/identification_cards.yml | 2 +- .../Entities/Objects/Misc/implanters.yml | 4 +- .../Entities/Objects/Misc/paper.yml | 2 +- .../Prototypes/Entities/Objects/Misc/pen.yml | 2 +- .../Entities/Objects/Misc/rubber_stamp.yml | 2 +- .../Objects/Misc/secret_documents.yml | 2 +- .../Entities/Objects/Power/powersink.yml | 2 +- .../Entities/Objects/Shields/shields.yml | 2 +- .../Objects/Specific/Chapel/bibles.yml | 2 +- .../Objects/Specific/Hydroponics/seeds.yml | 2 +- .../Objects/Specific/Janitorial/soap.yml | 2 +- .../Medical/handheld_crew_monitor.yml | 2 +- .../Objects/Specific/Medical/healing.yml | 4 +- .../Objects/Specific/Medical/hypospray.yml | 8 +- .../Specific/Robotics/borg_modules.yml | 4 +- .../Objects/Specific/chemistry-bottles.yml | 2 +- .../Objects/Specific/rehydrateable.yml | 2 +- .../Entities/Objects/Specific/syndicate.yml | 5 +- .../Entities/Objects/Tools/emag.yml | 2 +- .../Entities/Objects/Tools/jammer.yml | 2 +- .../Entities/Objects/Tools/jaws_of_life.yml | 2 +- .../Entities/Objects/Tools/jetpacks.yml | 4 +- .../Entities/Objects/Tools/lantern.yml | 2 +- .../Entities/Objects/Tools/toolbox.yml | 2 +- .../Entities/Objects/Weapons/Bombs/pen.yml | 2 +- .../Objects/Weapons/Bombs/plastic.yml | 2 +- .../Objects/Weapons/Guns/Basic/pka.yml | 2 +- .../Weapons/Guns/Battery/battery_guns.yml | 12 +-- .../Entities/Objects/Weapons/Guns/Bow/bow.yml | 2 +- .../Objects/Weapons/Guns/LMGs/lmgs.yml | 2 +- .../Weapons/Guns/Launchers/launchers.yml | 2 +- .../Objects/Weapons/Guns/Pistols/pistols.yml | 6 +- .../Weapons/Guns/Revolvers/revolvers.yml | 10 +- .../Objects/Weapons/Guns/Rifles/rifles.yml | 6 +- .../Objects/Weapons/Guns/SMGs/smgs.yml | 4 +- .../Weapons/Guns/Shotguns/shotguns.yml | 14 +-- .../Objects/Weapons/Guns/Snipers/snipers.yml | 8 +- .../Objects/Weapons/Guns/pneumatic_cannon.yml | 2 +- .../Entities/Objects/Weapons/Guns/turrets.yml | 2 +- .../Objects/Weapons/Melee/baseball_bat.yml | 2 +- .../Entities/Objects/Weapons/Melee/cane.yml | 2 +- .../Objects/Weapons/Melee/e_sword.yml | 4 +- .../Objects/Weapons/Melee/fireaxe.yml | 2 +- .../Entities/Objects/Weapons/Melee/knife.yml | 12 +-- .../Entities/Objects/Weapons/Melee/mining.yml | 2 +- .../Entities/Objects/Weapons/Melee/spear.yml | 2 +- .../Objects/Weapons/Melee/stunprod.yml | 2 +- .../Entities/Objects/Weapons/Melee/sword.yml | 12 +-- .../Objects/Weapons/Throwable/bola.yml | 2 +- .../Objects/Weapons/Throwable/clusterbang.yml | 12 +-- .../Objects/Weapons/Throwable/grenades.yml | 12 +-- .../Weapons/Throwable/throwing_stars.yml | 2 +- .../Entities/Objects/Weapons/security.yml | 8 +- .../Entities/Objects/base_contraband.yml | 93 +++++++++++++++++++ .../Entities/Structures/Machines/bombs.yml | 2 +- .../Prototypes/contraband_severities.yml | 22 +++++ 105 files changed, 566 insertions(+), 302 deletions(-) create mode 100644 Content.Shared/Contraband/ContrabandComponent.cs create mode 100644 Content.Shared/Contraband/ContrabandSeverityPrototype.cs create mode 100644 Content.Shared/Contraband/ContrabandSystem.cs create mode 100644 Resources/Locale/en-US/contraband/contraband-severity.ftl create mode 100644 Resources/Prototypes/Entities/Objects/base_contraband.yml create mode 100644 Resources/Prototypes/contraband_severities.yml diff --git a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs index 2b412654d5..b1b87ae981 100644 --- a/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs +++ b/Content.Server/Medical/SuitSensors/SuitSensorSystem.cs @@ -368,7 +368,7 @@ public sealed class SuitSensorSystem : EntitySystem userJobIcon = card.Comp.JobIcon; foreach (var department in card.Comp.JobDepartments) - userJobDepartments.Add(Loc.GetString(department)); + userJobDepartments.Add(Loc.GetString($"department-{department}")); } // get health mob state diff --git a/Content.Shared/Access/Components/IdCardComponent.cs b/Content.Shared/Access/Components/IdCardComponent.cs index 9879a02dbc..ccd4cccbe7 100644 --- a/Content.Shared/Access/Components/IdCardComponent.cs +++ b/Content.Shared/Access/Components/IdCardComponent.cs @@ -1,5 +1,6 @@ using Content.Shared.Access.Systems; using Content.Shared.PDA; +using Content.Shared.Roles; using Content.Shared.StatusIcon; using Robust.Shared.GameStates; using Robust.Shared.Prototypes; @@ -29,11 +30,11 @@ public sealed partial class IdCardComponent : Component public ProtoId JobIcon = "JobIconUnknown"; /// - /// The unlocalized names of the departments associated with the job + /// The proto IDs of the departments associated with the job /// [DataField] [AutoNetworkedField] - public List JobDepartments = new(); + public List> JobDepartments = new(); /// /// Determines if accesses from this card should be logged by diff --git a/Content.Shared/Access/Systems/SharedIdCardSystem.cs b/Content.Shared/Access/Systems/SharedIdCardSystem.cs index 762c146f36..06f9d66a61 100644 --- a/Content.Shared/Access/Systems/SharedIdCardSystem.cs +++ b/Content.Shared/Access/Systems/SharedIdCardSystem.cs @@ -147,7 +147,7 @@ public abstract class SharedIdCardSystem : EntitySystem foreach (var department in _prototypeManager.EnumeratePrototypes()) { if (department.Roles.Contains(job.ID)) - id.JobDepartments.Add("department-" + department.ID); + id.JobDepartments.Add(department.ID); } Dirty(uid, id); diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index 6c145d69da..3049df28ae 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -450,6 +450,12 @@ namespace Content.Shared.CCVar public static readonly CVarDef GameTabletopPlace = CVarDef.Create("game.tabletop_place", false, CVar.SERVERONLY); + /// + /// If true, contraband severity can be viewed in the examine menu + /// + public static readonly CVarDef ContrabandExamine = + CVarDef.Create("game.contraband_examine", true, CVar.SERVER | CVar.REPLICATED); + /* * Discord */ diff --git a/Content.Shared/Contraband/ContrabandComponent.cs b/Content.Shared/Contraband/ContrabandComponent.cs new file mode 100644 index 0000000000..883f503ba6 --- /dev/null +++ b/Content.Shared/Contraband/ContrabandComponent.cs @@ -0,0 +1,26 @@ +using Content.Shared.Roles; +using Robust.Shared.GameStates; +using Robust.Shared.Prototypes; + +namespace Content.Shared.Contraband; + +/// +/// This is used for marking entities that are considered 'contraband' IC and showing it clearly in examine. +/// +[RegisterComponent, NetworkedComponent, Access(typeof(ContrabandSystem))] +public sealed partial class ContrabandComponent : Component +{ + /// + /// The degree of contraband severity this item is considered to have. + /// + [DataField] + public ProtoId Severity = "Restricted"; + + /// + /// Which departments is this item restricted to? + /// By default, command and sec are assumed to be fine with contraband. + /// If null, no departments are allowed to use this. + /// + [DataField] + public HashSet>? AllowedDepartments = ["Security"]; +} diff --git a/Content.Shared/Contraband/ContrabandSeverityPrototype.cs b/Content.Shared/Contraband/ContrabandSeverityPrototype.cs new file mode 100644 index 0000000000..c1ab4b8292 --- /dev/null +++ b/Content.Shared/Contraband/ContrabandSeverityPrototype.cs @@ -0,0 +1,26 @@ +using Robust.Shared.Prototypes; + +namespace Content.Shared.Contraband; + +/// +/// This is a prototype for defining the degree of severity for a particular +/// +[Prototype] +public sealed partial class ContrabandSeverityPrototype : IPrototype +{ + /// + [IdDataField] + public string ID { get; } = default!; + + /// + /// Text shown for this severity level when the contraband is examined. + /// + [DataField] + public LocId ExamineText; + + /// + /// When examining the contraband, should this take into account the viewer's departments? + /// + [DataField] + public bool ShowDepartments; +} diff --git a/Content.Shared/Contraband/ContrabandSystem.cs b/Content.Shared/Contraband/ContrabandSystem.cs new file mode 100644 index 0000000000..22181ce99a --- /dev/null +++ b/Content.Shared/Contraband/ContrabandSystem.cs @@ -0,0 +1,81 @@ +using System.Linq; +using Content.Shared.Access.Systems; +using Content.Shared.CCVar; +using Content.Shared.Examine; +using Content.Shared.Localizations; +using Content.Shared.Roles; +using Robust.Shared.Configuration; +using Robust.Shared.Prototypes; + +namespace Content.Shared.Contraband; + +/// +/// This handles showing examine messages for contraband-marked items. +/// +public sealed class ContrabandSystem : EntitySystem +{ + [Dependency] private readonly IConfigurationManager _configuration = default!; + [Dependency] private readonly IPrototypeManager _proto = default!; + [Dependency] private readonly SharedIdCardSystem _id = default!; + + private bool _contrabandExamineEnabled; + + /// + public override void Initialize() + { + SubscribeLocalEvent(OnExamined); + + Subs.CVar(_configuration, CCVars.ContrabandExamine, SetContrabandExamine, true); + } + + private void SetContrabandExamine(bool val) + { + _contrabandExamineEnabled = val; + } + + private void OnExamined(Entity ent, ref ExaminedEvent args) + { + if (!_contrabandExamineEnabled) + return; + + // two strings: + // one, the actual informative 'this is restricted' + // then, the 'you can/shouldn't carry this around' based on the ID the user is wearing + + using (args.PushGroup(nameof(ContrabandComponent))) + { + var severity = _proto.Index(ent.Comp.Severity); + if (severity.ShowDepartments && ent.Comp is { AllowedDepartments: not null }) + { + // TODO shouldn't department prototypes have a localized name instead of just using the ID for this? + var list = ContentLocalizationManager.FormatList(ent.Comp.AllowedDepartments.Select(p => Loc.GetString($"department-{p.Id}")).ToList()); + + // department restricted text + args.PushMarkup(Loc.GetString("contraband-examine-text-Restricted-department", ("departments", list))); + } + else + { + args.PushMarkup(Loc.GetString(severity.ExamineText)); + } + + // text based on ID card + List>? departments = null; + if (_id.TryFindIdCard(args.Examiner, out var id)) + { + departments = id.Comp.JobDepartments; + } + + // either its fully restricted, you have no departments, or your departments dont intersect with the restricted departments + if (ent.Comp.AllowedDepartments is null + || departments is null + || !departments.Intersect(ent.Comp.AllowedDepartments).Any()) + { + args.PushMarkup(Loc.GetString("contraband-examine-text-avoid-carrying-around")); + return; + } + + // otherwise fine to use :tm: + args.PushMarkup(Loc.GetString("contraband-examine-text-in-the-clear")); + } + } +} diff --git a/Resources/Locale/en-US/contraband/contraband-severity.ftl b/Resources/Locale/en-US/contraband/contraband-severity.ftl new file mode 100644 index 0000000000..594a64f8b7 --- /dev/null +++ b/Resources/Locale/en-US/contraband/contraband-severity.ftl @@ -0,0 +1,8 @@ +contraband-examine-text-Minor = [color=yellow]This item is considered minor contraband.[/color] +contraband-examine-text-Restricted = [color=yellow]This item is departmentally restricted.[/color] +contraband-examine-text-Restricted-department = [color=yellow]This item is restricted to {$departments}, and may be considered contraband.[/color] +contraband-examine-text-GrandTheft = [color=red]This item is a highly valuable target for Syndicate agents![/color] +contraband-examine-text-Syndicate = [color=crimson]This item is highly illegal Syndicate contraband![/color] + +contraband-examine-text-avoid-carrying-around = [color=red][italic]You probably want to avoid visibly carrying this around without a good reason.[/italic][/color] +contraband-examine-text-in-the-clear = [color=green][italic]You should be in the clear to visibly carry this around.[/italic][/color] diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml index cadf413f47..15b187cd15 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml @@ -340,7 +340,7 @@ - type: entity name: syndicate encryption key box - parent: BoxEncryptionKeyPassenger + parent: [BoxEncryptionKeyPassenger, BaseRestrictedContraband] id: BoxEncryptionKeySyndie description: Two syndicate encryption keys for the price of one. Miniaturized for ease of use. components: diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml index b350b0b1cf..80c20a1a04 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml @@ -1,6 +1,6 @@ - type: entity id: ElectricalDisruptionKit - parent: BoxCardboard + parent: [BoxCardboard, BaseSyndicateContraband] name: electrical disruption kit suffix: Filled components: @@ -12,7 +12,7 @@ amount: 1 - type: entity - parent: BoxVial + parent: [BoxVial, BaseSyndicateContraband] id: ChemicalSynthesisKit name: chemical synthesis kit description: A starter kit for the aspiring chemist, includes toxin and vestine for all your criminal needs! @@ -33,7 +33,7 @@ - id: SyringeStimulants - type: entity - parent: BoxCardboard + parent: [BoxCardboard, BaseSyndicateContraband] id: ThrowingKnivesKit name: throwing knives kit description: A set of 4 syndicate branded throwing knives, perfect for embedding into the body of your victims. @@ -52,7 +52,7 @@ - type: entity name: deathrattle implant box - parent: BoxCardboard + parent: [BoxCardboard, BaseSyndicateContraband] id: BoxDeathRattleImplants description: Six deathrattle implants for the whole squad. components: diff --git a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml index 6764cb8496..f47cb49ea6 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml @@ -10,7 +10,7 @@ - type: entity id: BriefcaseSyndieSniperBundleFilled - parent: BriefcaseSyndie + parent: [BriefcaseSyndie, BaseSyndicateContraband] suffix: Syndicate, Sniper Bundle components: - type: Item diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index ceaa744295..2d5bf42466 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -56,7 +56,7 @@ collection: IanBark - type: entity - parent: ClothingBackpack + parent: [ClothingBackpack, BaseRestrictedContraband] id: ClothingBackpackSecurity name: security backpack description: It's a very robust backpack. @@ -65,7 +65,7 @@ sprite: Clothing/Back/Backpacks/security.rsi - type: entity - parent: ClothingBackpack + parent: [ClothingBackpack, BaseRestrictedContraband] id: ClothingBackpackBrigmedic name: brigmedic backpack description: It's a very sterile backpack. @@ -101,7 +101,7 @@ sprite: Clothing/Back/Backpacks/medical.rsi - type: entity - parent: ClothingBackpack + parent: [ClothingBackpack, BaseCommandContraband] id: ClothingBackpackCaptain name: captain's backpack description: It's a special backpack made exclusively for Nanotrasen officers. @@ -269,7 +269,7 @@ #Syndicate - type: entity - parent: ClothingBackpack + parent: [ClothingBackpack, BaseSyndicateContraband] id: ClothingBackpackSyndicate name: syndicate backpack description: diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml index 101599d5ad..76451f54f5 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml @@ -43,7 +43,7 @@ sprite: Clothing/Back/Duffels/medical.rsi - type: entity - parent: ClothingBackpackDuffel + parent: [ClothingBackpackDuffel, BaseCommandContraband] id: ClothingBackpackDuffelCaptain name: captain's duffel bag description: A large duffel bag for holding extra captainly goods. @@ -64,7 +64,7 @@ collection: BikeHorn - type: entity - parent: ClothingBackpackDuffel + parent: [ClothingBackpackDuffel, BaseRestrictedContraband] id: ClothingBackpackDuffelSecurity name: security duffel bag description: A large duffel bag for holding extra security related goods. @@ -73,7 +73,7 @@ sprite: Clothing/Back/Duffels/security.rsi - type: entity - parent: ClothingBackpackDuffel + parent: [ClothingBackpackDuffel, BaseRestrictedContraband] id: ClothingBackpackDuffelBrigmedic name: brigmedic duffel bag description: A large duffel bag for holding extra medical related goods. @@ -158,7 +158,7 @@ sprite: Clothing/Back/Duffels/salvage.rsi - type: entity - parent: ClothingBackpackDuffel + parent: [ClothingBackpackDuffel, BaseSyndicateContraband] id: ClothingBackpackDuffelSyndicate name: syndicate duffel bag description: A large duffel bag for holding various traitor goods. diff --git a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml index f598759056..78fde527d1 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml @@ -106,7 +106,7 @@ sprite: Clothing/Back/Satchels/science.rsi - type: entity - parent: ClothingBackpackSatchel + parent: [ClothingBackpackSatchel, BaseRestrictedContraband] id: ClothingBackpackSatchelSecurity name: security satchel description: A robust satchel for security related needs. @@ -115,7 +115,7 @@ sprite: Clothing/Back/Satchels/security.rsi - type: entity - parent: ClothingBackpackSatchel + parent: [ClothingBackpackSatchel, BaseRestrictedContraband] id: ClothingBackpackSatchelBrigmedic name: brigmedic satchel description: A sterile satchel for medical related needs. @@ -124,7 +124,7 @@ sprite: Clothing/Back/Satchels/brigmedic.rsi - type: entity - parent: ClothingBackpackSatchel + parent: [ClothingBackpackSatchel, BaseCommandContraband] id: ClothingBackpackSatchelCaptain name: captain's satchel description: An exclusive satchel for Nanotrasen officers. diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index 32170331ff..66b601b8c7 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -456,7 +456,7 @@ - type: Appearance - type: entity - parent: ClothingBeltStorageBase + parent: [ClothingBeltStorageBase, BaseRestrictedContraband] id: ClothingBeltSecurity name: security belt description: Can hold security gear like handcuffs and flashes. @@ -507,7 +507,7 @@ - type: Appearance - type: entity - parent: [ClothingBeltBase, ClothingSlotBase] + parent: [ClothingBeltBase, ClothingSlotBase, BaseCommandContraband] id: ClothingBeltSheath name: sabre sheath description: An ornate sheath designed to hold an officer's blade. @@ -541,7 +541,7 @@ # Belts without visualizers - type: entity - parent: ClothingBeltAmmoProviderBase + parent: [ClothingBeltAmmoProviderBase, BaseRestrictedContraband] id: ClothingBeltBandolier name: bandolier description: A bandolier for holding shotgun ammunition. @@ -588,7 +588,7 @@ - 0,0,3,1 - type: entity - parent: ClothingBeltStorageBase + parent: [ClothingBeltStorageBase, BaseSyndicateContraband] id: ClothingBeltSyndieHolster name: syndicate shoulder holster description: A deep shoulder holster capable of holding many types of ballistics. diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml index 04203cf357..d6cee89335 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets.yml @@ -63,7 +63,7 @@ sprite: Clothing/Ears/Headsets/mining.rsi - type: entity - parent: ClothingHeadsetCargo + parent: [ClothingHeadsetCargo, BaseCommandContraband] id: ClothingHeadsetQM name: qm headset description: A headset used by the quartermaster. @@ -92,7 +92,7 @@ sprite: Clothing/Ears/Headsets/centcom.rsi - type: entity - parent: ClothingHeadset + parent: [ClothingHeadset, BaseCommandContraband] id: ClothingHeadsetCommand name: command headset description: A headset with a commanding channel. @@ -123,7 +123,7 @@ sprite: Clothing/Ears/Headsets/engineering.rsi - type: entity - parent: ClothingHeadsetEngineering + parent: [ClothingHeadsetEngineering, BaseCommandContraband] id: ClothingHeadsetCE name: ce headset description: A headset for the chief engineer to ignore all emergency calls on. @@ -152,7 +152,7 @@ sprite: Clothing/Ears/Headsets/medical.rsi - type: entity - parent: ClothingHeadsetMedical + parent: [ClothingHeadsetMedical, BaseCommandContraband] id: ClothingHeadsetCMO name: cmo headset description: A headset used by the CMO. @@ -213,7 +213,7 @@ sprite: Clothing/Ears/Headsets/robotics.rsi - type: entity - parent: ClothingHeadsetScience + parent: [ClothingHeadsetScience, BaseCommandContraband] id: ClothingHeadsetRD name: rd headset description: Lamarr used to love chewing on this... @@ -226,7 +226,7 @@ - EncryptionKeyCommon - type: entity - parent: ClothingHeadset + parent: [ClothingHeadset, BaseRestrictedContraband] id: ClothingHeadsetSecurity name: security headset description: This is used by your elite security force. @@ -242,7 +242,7 @@ sprite: Clothing/Ears/Headsets/security.rsi - type: entity - parent: ClothingHeadset + parent: [ClothingHeadset, BaseRestrictedContraband] id: ClothingHeadsetBrigmedic name: brigmedic headset description: A headset that helps to hear the death cries. diff --git a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml index 0a1cf3fb88..7041f7c31e 100644 --- a/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml +++ b/Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml @@ -52,7 +52,7 @@ - EncryptionKeyCommon - type: entity - parent: ClothingHeadsetAlt + parent: [ClothingHeadsetAlt, BaseCommandContraband] id: ClothingHeadsetAltCommand name: command over-ear headset components: @@ -66,7 +66,7 @@ sprite: Clothing/Ears/Headsets/command.rsi - type: entity - parent: ClothingHeadsetAlt + parent: [ClothingHeadsetAlt, BaseCommandContraband] id: ClothingHeadsetAltEngineering name: chief engineer's over-ear headset components: @@ -82,7 +82,7 @@ sprite: Clothing/Ears/Headsets/engineering.rsi - type: entity - parent: ClothingHeadsetAlt + parent: [ClothingHeadsetAlt, BaseCommandContraband] id: ClothingHeadsetAltMedical name: chief medical officer's over-ear headset components: @@ -100,7 +100,7 @@ stealGroup: ClothingHeadsetAltMedical - type: entity - parent: ClothingHeadsetAlt + parent: [ClothingHeadsetAlt, BaseCommandContraband] id: ClothingHeadsetAltSecurity name: head of security's over-ear headset components: @@ -116,7 +116,7 @@ sprite: Clothing/Ears/Headsets/security.rsi - type: entity - parent: ClothingHeadsetAlt + parent: [ClothingHeadsetAlt, BaseCommandContraband] id: ClothingHeadsetAltScience name: research director's over-ear headset components: @@ -132,7 +132,7 @@ sprite: Clothing/Ears/Headsets/science.rsi - type: entity - parent: ClothingHeadsetAlt + parent: [ClothingHeadsetAlt, BaseSyndicateContraband] id: ClothingHeadsetAltSyndicate name: blood-red over-ear headset description: An updated, modular syndicate intercom that fits over the head and takes encryption keys (there are 5 key slots.). diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml index 0364d55cc5..20c1c74532 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml @@ -53,7 +53,7 @@ Blunt: 10 - type: entity - parent: ClothingEyesBase + parent: [ClothingEyesBase, BaseEngineeringContraband] id: ClothingEyesGlassesMeson name: engineering goggles #less confusion description: Green-tinted goggles using a proprietary polymer that provides protection from eye damage of all types. diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml index b22320a82f..e627cffc74 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml @@ -16,7 +16,7 @@ damageContainers: - Biological - type: ShowHealthIcons - damageContainers: + damageContainers: - Biological - type: entity @@ -49,7 +49,7 @@ - HudMedical - type: entity - parent: [ClothingEyesBase, ShowSecurityIcons] + parent: [ClothingEyesBase, ShowSecurityIcons, BaseSecurityCommandContraband] id: ClothingEyesHudSecurity name: security hud description: A heads-up display that scans the humanoids in view and provides accurate data about their ID status and security records. @@ -140,7 +140,7 @@ - type: ShowThirstIcons - type: entity - parent: [ClothingEyesBase, ShowSecurityIcons, ShowMedicalIcons] + parent: [ClothingEyesBase, ShowSecurityIcons, ShowMedicalIcons, BaseSecurityCommandContraband] id: ClothingEyesHudMedSec name: medsec hud description: An eye display that looks like a mixture of medical and security huds. @@ -188,7 +188,7 @@ - type: ShowSyndicateIcons - type: entity - parent: [ClothingEyesBase, ShowSecurityIcons] + parent: [ClothingEyesBase, ShowSecurityIcons, BaseSyndicateContraband] id: ClothingEyesHudSyndicate name: syndicate visor description: The syndicate's professional head-up display, designed for better detection of humanoids and their subsequent elimination. @@ -200,7 +200,7 @@ - type: ShowSyndicateIcons - type: entity - parent: [ClothingEyesBase, ShowSecurityIcons] + parent: [ClothingEyesBase, ShowSecurityIcons, BaseSyndicateContraband] id: ClothingEyesHudSyndicateAgent name: syndicate agent visor description: The Syndicate Agent's professional heads-up display, designed for quick diagnosis of their team's status. diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml index 53a165cd57..1bd858b4f7 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml @@ -79,7 +79,7 @@ - type: FingerprintMask - type: entity - parent: ClothingHandsGlovesBoxingBlue + parent: [ClothingHandsGlovesBoxingBlue, BaseSyndicateContraband] id: ClothingHandsGlovesBoxingRigged suffix: Rigged components: @@ -94,7 +94,7 @@ mustBeEquippedToUse: true - type: entity - parent: ClothingHandsBase + parent: [ClothingHandsBase, BaseCommandContraband] id: ClothingHandsGlovesCaptain name: captain gloves description: Regal blue gloves, with a nice gold trim. Swanky. @@ -255,7 +255,7 @@ - type: CriminalRecordsHacker - type: entity - parent: ClothingHandsGlovesColorBlack + parent: [ClothingHandsGlovesColorBlack, BaseMinorContraband] id: ClothingHandsGlovesCombat name: combat gloves description: These tactical gloves are fireproof and shock resistant. @@ -378,7 +378,7 @@ - type: Unremoveable - type: entity - parent: ClothingHandsButcherable + parent: [ClothingHandsButcherable, BaseSyndicateContraband] id: ClothingHandsGlovesNorthStar name: gloves of the north star description: These gloves allow you to punch incredibly fast. diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index ad0662251a..0ca55f7614 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -189,7 +189,7 @@ sprite: Clothing/Head/Hats/bowler_hat.rsi - type: entity - parent: ClothingHeadBase + parent: [ClothingHeadBase, BaseCommandContraband] id: ClothingHeadHatCaptain name: captain's hardhat description: It's good being the king. @@ -299,7 +299,7 @@ sprite: Clothing/Head/Hats/fez.rsi - type: entity - parent: ClothingHeadBase + parent: [ClothingHeadBase, BaseCommandContraband] id: ClothingHeadHatHopcap name: head of personnel's cap description: A grand, stylish head of personnel's cap. @@ -315,7 +315,7 @@ - WhitelistChameleon - type: entity - parent: ClothingHeadBase + parent: [ClothingHeadBase, BaseCommandContraband] id: ClothingHeadHatHoshat name: head of security cap description: The robust standard-issue cap of the Head of Security. For showing the officers who's in charge. @@ -609,7 +609,7 @@ sprite: Clothing/Head/Hats/truckershat.rsi - type: entity - parent: ClothingHeadBase + parent: [ ClothingHeadBase, BaseSyndicateContraband ] id: ClothingHeadPyjamaSyndicateBlack name: syndicate black pyjama hat description: For keeping that traitor head of yours warm. @@ -620,7 +620,7 @@ sprite: Clothing/Head/Hats/pyjamasyndicateblack.rsi - type: entity - parent: ClothingHeadBase + parent: [ ClothingHeadBase, BaseSyndicateContraband ] id: ClothingHeadPyjamaSyndicatePink name: syndicate pink pyjama hat description: For keeping that traitor head of yours warm. @@ -631,7 +631,7 @@ sprite: Clothing/Head/Hats/pyjamasyndicatepink.rsi - type: entity - parent: ClothingHeadBase + parent: [ ClothingHeadBase, BaseSyndicateContraband ] id: ClothingHeadPyjamaSyndicateRed name: syndicate red pyjama hat description: For keeping that traitor head of yours warm. @@ -735,7 +735,7 @@ sprite: Clothing/Head/Hats/jester2.rsi - type: entity - parent: ClothingHeadBase + parent: [ClothingHeadBase, BaseCommandContraband] id: ClothingHeadHatBeretCmo name: chief medical officer's beret description: Turquoise beret with a cross on the front. The sight of it calms you down and makes it clear that you will be cured. @@ -777,7 +777,7 @@ Blunt: 0.95 - type: entity - parent: ClothingHeadBase + parent: [ClothingHeadBase, BaseSyndicateContraband] id: ClothingHeadHatSyndie name: syndicate hat description: A souvenir hat from "Syndieland", their production has already been closed. diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index b44508d4a3..b2ae5b294e 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -3,7 +3,7 @@ #Basic Helmet (Security Helmet) - type: entity - parent: ClothingHeadBase + parent: [ClothingHeadBase, BaseRestrictedContraband] id: ClothingHeadHelmetBasic name: helmet description: Standard security gear. Protects the head from impacts. @@ -41,7 +41,7 @@ #SWAT Helmet - type: entity - parent: ClothingHeadBase + parent: [ClothingHeadBase, BaseRestrictedContraband] id: ClothingHeadHelmetSwat name: SWAT helmet description: An extremely robust helmet, commonly used by paramilitary forces. This one has the Nanotrasen logo emblazoned on the top. @@ -77,7 +77,7 @@ #Light Riot Helmet - type: entity - parent: ClothingHeadBase + parent: [ClothingHeadBase, BaseRestrictedContraband] id: ClothingHeadHelmetRiot name: light riot helmet description: It's a helmet specifically designed to protect against close range attacks. diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index 8e621ebcdb..25f9f28d09 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -21,7 +21,7 @@ hideOnToggle: true - type: entity - parent: ClothingMaskGas + parent: [ClothingMaskGas, BaseRestrictedContraband] id: ClothingMaskGasSecurity name: security gas mask description: A standard issue Security gas mask. @@ -41,7 +41,7 @@ Heat: 0.95 - type: entity - parent: ClothingMaskGas + parent: [ClothingMaskGas, BaseSyndicateContraband] id: ClothingMaskGasSyndicate name: syndicate gas mask description: A close-fitting tactical mask that can be connected to an air supply. @@ -76,7 +76,7 @@ Heat: 0.80 - type: entity - parent: ClothingMaskGasAtmos + parent: [ClothingMaskGasAtmos, BaseCommandContraband] id: ClothingMaskGasCaptain name: captain's gas mask description: Nanotrasen cut corners and repainted a spare atmospheric gas mask, but don't tell anyone. diff --git a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml index a329c4034b..555887b01d 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml @@ -10,7 +10,7 @@ stealGroup: HeadCloak # leaving this here because I suppose it might be interesting? - type: entity - parent: ClothingNeckBase + parent: [ClothingNeckBase, BaseCommandContraband] id: ClothingNeckCloakCap name: captain's cloak description: A pompous and comfy blue cloak with a nice gold trim, while not particularly valuable as your other possessions, it sure is fancy. @@ -21,7 +21,7 @@ stealGroup: HeadCloak - type: entity - parent: ClothingNeckBase + parent: [ClothingNeckBase, BaseCommandContraband] id: ClothingNeckCloakHos name: head of security's cloak description: An exquisite dark and red cloak fitting for those who can assert dominance over wrongdoers. Take a stab at being civil in prosecution! @@ -32,7 +32,7 @@ stealGroup: HeadCloak - type: entity - parent: ClothingNeckBase + parent: [ClothingNeckBase, BaseCommandContraband] id: ClothingNeckCloakCe name: chief engineer's cloak description: A dark green cloak with light blue ornaments, given to those who proved themselves to master the precise art of engineering. @@ -43,7 +43,7 @@ stealGroup: HeadCloak - type: entity - parent: ClothingNeckBase + parent: [ClothingNeckBase, BaseCommandContraband] id: ClothingCloakCmo name: chief medical officer's cloak description: A sterile blue cloak with a green cross, radiating with a sense of duty and willingness to help others. @@ -54,7 +54,7 @@ stealGroup: HeadCloak - type: entity - parent: ClothingNeckBase + parent: [ClothingNeckBase, BaseCommandContraband] id: ClothingNeckCloakRd name: research director's cloak description: A white cloak with violet stripes, showing your status as the arbiter of cutting-edge technology. @@ -65,7 +65,7 @@ stealGroup: HeadCloak - type: entity - parent: ClothingNeckBase + parent: [ClothingNeckBase, BaseCommandContraband] id: ClothingNeckCloakQm name: quartermaster's cloak description: A strong brown cloak with a reflective stripe, while not as fancy as others, it does show your managing skills. @@ -76,7 +76,7 @@ stealGroup: HeadCloak - type: entity - parent: ClothingNeckBase + parent: [ClothingNeckBase, BaseCommandContraband] id: ClothingNeckCloakHop name: head of personnel's cloak description: A blue cloak with red shoulders and gold buttons, proving you are the gatekeeper to any airlock on the station. @@ -105,7 +105,7 @@ sprite: Clothing/Neck/Cloaks/nanotrasen.rsi - type: entity - parent: ClothingNeckBase + parent: [ClothingNeckBase, BaseCommandContraband] id: ClothingNeckCloakCapFormal name: captain's formal cloak description: A lavish and decorated cloak for special occasions. diff --git a/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml b/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml index f9dee8ba7d..ba79ca4d46 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml @@ -1,5 +1,5 @@ - type: entity - parent: ClothingNeckBase + parent: [ClothingNeckBase, BaseCommandContraband] id: ClothingNeckMantleCap name: captain's mantle description: A comfortable and chique mantle befitting of only the most experienced captain. @@ -10,7 +10,7 @@ sprite: Clothing/Neck/mantles/capmantle.rsi - type: entity - parent: ClothingNeckBase + parent: [ClothingNeckBase, BaseCommandContraband] id: ClothingNeckMantleCE name: chief engineer's mantle description: High visibility, check. RIG system, check. High capacity cell, check. Everything a chief engineer could need in a stylish mantle. @@ -19,9 +19,9 @@ sprite: Clothing/Neck/mantles/cemantle.rsi - type: Clothing sprite: Clothing/Neck/mantles/cemantle.rsi - + - type: entity - parent: ClothingNeckBase + parent: [ClothingNeckBase, BaseCommandContraband] id: ClothingNeckMantleCMO name: chief medical officer's mantle description: For a CMO that has been in enough medbays to know that more PPE means less central command dry cleaning visits when the shift is over. @@ -30,9 +30,9 @@ sprite: Clothing/Neck/mantles/cmomantle.rsi - type: Clothing sprite: Clothing/Neck/mantles/cmomantle.rsi - + - type: entity - parent: ClothingNeckBase + parent: [ClothingNeckBase, BaseCommandContraband] id: ClothingNeckMantleHOP name: head of personnel's mantle description: A good HOP knows that paper pushing is only half the job... petting your dog and looking fashionable is the other half. @@ -41,9 +41,9 @@ sprite: Clothing/Neck/mantles/hopmantle.rsi - type: Clothing sprite: Clothing/Neck/mantles/hopmantle.rsi - + - type: entity - parent: ClothingNeckBase + parent: [ClothingNeckBase, BaseCommandContraband] id: ClothingNeckMantleHOS name: head of security's mantle description: Shootouts with nukies are just another Tuesday for this HoS. This mantle is a symbol of commitment to the station. @@ -52,9 +52,9 @@ sprite: Clothing/Neck/mantles/hosmantle.rsi - type: Clothing sprite: Clothing/Neck/mantles/hosmantle.rsi - + - type: entity - parent: ClothingNeckBase + parent: [ClothingNeckBase, BaseCommandContraband] id: ClothingNeckMantleRD name: research director's mantle description: For when long days in the office consist of explosives, poisonous gas, murder robots, and a fresh pizza from cargo; this mantle will keep you comfy. @@ -65,7 +65,7 @@ sprite: Clothing/Neck/mantles/rdmantle.rsi - type: entity - parent: ClothingNeckBase + parent: [ClothingNeckBase, BaseCommandContraband] id: ClothingNeckMantleQM name: quartermaster's mantle description: For the master of goods and materials to rule over the department, a befitting mantle to show off superiority! @@ -73,4 +73,4 @@ - type: Sprite sprite: Clothing/Neck/mantles/qmmantle.rsi - type: Clothing - sprite: Clothing/Neck/mantles/qmmantle.rsi + sprite: Clothing/Neck/mantles/qmmantle.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml b/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml index f8c9f1fc9d..e03ea02e68 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/scarfs.yml @@ -87,7 +87,7 @@ sprite: Clothing/Neck/Scarfs/purple.rsi - type: entity - parent: ClothingScarfBase + parent: [ ClothingScarfBase, BaseSyndicateContraband ] id: ClothingNeckScarfStripedSyndieGreen name: striped syndicate green scarf description: A stylish striped syndicate green scarf. The perfect winter accessory for those with a keen fashion sense, and those who are in the mood to steal something. @@ -98,7 +98,7 @@ sprite: Clothing/Neck/Scarfs/syndiegreen.rsi - type: entity - parent: ClothingScarfBase + parent: [ ClothingScarfBase, BaseSyndicateContraband ] id: ClothingNeckScarfStripedSyndieRed name: striped syndicate red scarf description: A stylish striped syndicate red scarf. The perfect winter accessory for those with a keen fashion sense, and those who are in the mood to steal something. diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index 413a41473b..101190faf3 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -3,7 +3,7 @@ #Basic armor vest - type: entity - parent: [ClothingOuterBaseMedium, AllowSuitStorageClothing] + parent: [ClothingOuterBaseMedium, AllowSuitStorageClothing, BaseRestrictedContraband] id: ClothingOuterArmorBasic name: armor vest description: A standard Type I armored vest that provides decent protection against most types of damage. @@ -36,7 +36,7 @@ sprite: Clothing/OuterClothing/Armor/security_slim.rsi - type: entity - parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing] + parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing, BaseRestrictedContraband] id: ClothingOuterArmorRiot name: riot suit description: A suit of semi-flexible polycarbonate body armor with heavy padding to protect against melee attacks. Perfect for fighting delinquents around the station. @@ -258,7 +258,7 @@ sprite: Clothing/OuterClothing/Armor/magusred.rsi - type: entity - parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing] + parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing, BaseCommandContraband] id: ClothingOuterArmorCaptainCarapace name: "captain's carapace" description: "An armored chestpiece that provides protection whilst still offering maximum mobility and flexibility. Issued only to the station's finest." diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 6d061ebc4d..314d6b3eae 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -30,7 +30,7 @@ #Atmospherics Hardsuit - type: entity - parent: ClothingOuterHardsuitBase + parent: [ClothingOuterHardsuitBase, BaseEngineeringContraband] id: ClothingOuterHardsuitAtmos name: atmos hardsuit description: A special suit that protects against hazardous, low pressure environments. Has thermal shielding. @@ -65,7 +65,7 @@ #Engineering Hardsuit - type: entity - parent: ClothingOuterHardsuitBase + parent: [ClothingOuterHardsuitBase, BaseEngineeringContraband] id: ClothingOuterHardsuitEngineering name: engineering hardsuit description: A special suit that protects against hazardous, low pressure environments. Has radiation shielding. @@ -97,7 +97,7 @@ #Spationaut Hardsuit - type: entity - parent: ClothingOuterHardsuitBase + parent: [ClothingOuterHardsuitBase, BaseCargoContraband] id: ClothingOuterHardsuitSpatio name: spationaut hardsuit description: A lightweight hardsuit designed for industrial EVA in zero gravity. @@ -126,7 +126,7 @@ #Salvage Hardsuit - type: entity - parent: ClothingOuterHardsuitBase + parent: [ClothingOuterHardsuitBase, BaseCargoContraband] id: ClothingOuterHardsuitSalvage name: mining hardsuit description: A special suit that protects against hazardous, low pressure environments. Has reinforced plating for wildlife encounters. @@ -156,7 +156,7 @@ clothingPrototype: ClothingHeadHelmetHardsuitSalvage - type: entity - parent: ClothingOuterHardsuitBase + parent: [ClothingOuterHardsuitBase, BaseCargoContraband] id: ClothingOuterHardsuitMaxim name: salvager maxim hardsuit description: Fire. Heat. These things forge great weapons, they also forge great salvagers. @@ -188,7 +188,7 @@ #Security Hardsuit - type: entity - parent: ClothingOuterHardsuitBase + parent: [ClothingOuterHardsuitBase, BaseRestrictedContraband] id: ClothingOuterHardsuitSecurity name: security hardsuit description: A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor. @@ -218,7 +218,7 @@ #Brigmedic Hardsuit - type: entity - parent: ClothingOuterHardsuitBase + parent: [ClothingOuterHardsuitBase, BaseRestrictedContraband] id: ClothingOuterHardsuitBrigmedic name: brigmedic hardsuit description: Special hardsuit of the guardian angel of the brig. It is the medical version of the security hardsuit. @@ -245,7 +245,7 @@ #Warden's Hardsuit - type: entity - parent: ClothingOuterHardsuitBase + parent: [ClothingOuterHardsuitBase, BaseRestrictedContraband] id: ClothingOuterHardsuitWarden name: warden's hardsuit description: A specialized riot suit geared to combat low pressure environments. @@ -275,7 +275,7 @@ #Captain's Hardsuit - type: entity - parent: ClothingOuterHardsuitBase + parent: [ClothingOuterHardsuitBase, BaseCommandContraband] id: ClothingOuterHardsuitCap name: captain's armored spacesuit description: A formal armored spacesuit, made for the station's captain. @@ -307,7 +307,7 @@ #Chief Engineer's Hardsuit - type: entity - parent: ClothingOuterHardsuitBase + parent: [ClothingOuterHardsuitBase, BaseCommandContraband] id: ClothingOuterHardsuitEngineeringWhite name: chief engineer's hardsuit description: A special hardsuit that protects against hazardous, low pressure environments, made for the chief engineer of the station. @@ -341,7 +341,7 @@ #Chief Medical Officer's Hardsuit - type: entity - parent: ClothingOuterHardsuitBase + parent: [ClothingOuterHardsuitBase, BaseCommandContraband] id: ClothingOuterHardsuitMedical name: chief medical officer's hardsuit description: A special suit that protects against hazardous, low pressure environments. Built with lightweight materials for easier movement. @@ -366,7 +366,7 @@ #Research Director's Hardsuit - type: entity - parent: ClothingOuterHardsuitBase + parent: [ClothingOuterHardsuitBase, BaseGrandTheftContraband] id: ClothingOuterHardsuitRd name: experimental research hardsuit description: A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor. @@ -410,7 +410,7 @@ #Head of Security's Hardsuit - type: entity - parent: ClothingOuterHardsuitSecurity + parent: [ClothingOuterHardsuitBase, BaseCommandContraband] id: ClothingOuterHardsuitSecurityRed name: head of security's hardsuit description: A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor. @@ -473,7 +473,7 @@ #ANTAG HARDSUITS #Blood-red Hardsuit - type: entity - parent: ClothingOuterHardsuitBase + parent: [ ClothingOuterHardsuitBase, BaseSyndicateContraband ] id: ClothingOuterHardsuitSyndie name: blood-red hardsuit description: A heavily armored hardsuit designed for work in special operations. Property of Gorlex Marauders. @@ -512,7 +512,7 @@ # Syndicate Medic Hardsuit - type: entity - parent: ClothingOuterHardsuitSyndie + parent: [ClothingOuterHardsuitSyndie, BaseSyndicateContraband] id: ClothingOuterHardsuitSyndieMedic name: blood-red medic hardsuit description: A heavily armored and agile advanced hardsuit specifically designed for field medic operations. @@ -530,7 +530,7 @@ #Syndicate Elite Hardsuit - type: entity - parent: ClothingOuterHardsuitBase + parent: [ClothingOuterHardsuitBase, BaseSyndicateContraband] id: ClothingOuterHardsuitSyndieElite name: syndicate elite hardsuit description: An elite version of the blood-red hardsuit, with improved mobility and fireproofing. Property of Gorlex Marauders. @@ -568,7 +568,7 @@ #Syndicate Commander Hardsuit - type: entity - parent: ClothingOuterHardsuitBase + parent: [ClothingOuterHardsuitBase, BaseSyndicateContraband] id: ClothingOuterHardsuitSyndieCommander name: syndicate commander hardsuit description: A bulked up version of the blood-red hardsuit, purpose-built for the commander of a syndicate operative squad. Has significantly improved armor for those deadly front-lines firefights. @@ -600,7 +600,7 @@ #Cybersun Juggernaut Hardsuit - type: entity - parent: ClothingOuterHardsuitBase + parent: [ClothingOuterHardsuitBase, BaseSyndicateContraband] id: ClothingOuterHardsuitJuggernaut name: cybersun juggernaut suit description: A suit made by the cutting edge R&D department at cybersun to be hyper resilient. diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml index 1fd46e8e76..545f46cc8c 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml @@ -1,6 +1,6 @@ #Web vest - type: entity - parent: [ClothingOuterStorageBase, AllowSuitStorageClothing] + parent: [ClothingOuterStorageBase, AllowSuitStorageClothing, BaseSyndicateContraband] id: ClothingOuterVestWeb name: web vest description: A synthetic armor vest. This one has added webbing and ballistic plates. @@ -21,7 +21,7 @@ #Mercenary web vest - type: entity - parent: ClothingOuterVestWeb #web vest so it should have some pockets for ammo + parent: [ClothingOuterVestWeb, BaseMinorContraband] #web vest so it should have some pockets for ammo id: ClothingOuterVestWebMerc name: merc web vest description: A high-quality armored vest made from a hard synthetic material. It's surprisingly flexible and light, despite formidable armor plating. @@ -42,7 +42,7 @@ #Detective's vest - type: entity - parent: ClothingOuterArmorBasic + parent: [ClothingOuterArmorBasic, BaseRestrictedContraband] id: ClothingOuterVestDetective name: detective's vest description: A hard-boiled private investigator's armored vest. diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index f4c960f31c..378e10d322 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -96,7 +96,7 @@ clothingPrototype: ClothingHeadHatHoodWinterBartender - type: entity - parent: ClothingOuterWinterCoatToggleable + parent: [ClothingOuterWinterCoatToggleable, BaseCommandContraband] id: ClothingOuterWinterCap name: captain's winter coat components: @@ -142,7 +142,7 @@ clothingPrototype: ClothingHeadHatHoodWinterCargo - type: entity - parent: ClothingOuterWinterCoatToggleable + parent: [ClothingOuterWinterCoatToggleable, BaseCommandContraband] id: ClothingOuterWinterCE name: chief engineer's winter coat components: @@ -240,7 +240,7 @@ clothingPrototype: ClothingHeadHatHoodWinterChem - type: entity - parent: ClothingOuterWinterCoatToggleable + parent: [ClothingOuterWinterCoatToggleable, BaseCommandContraband] id: ClothingOuterWinterCMO name: chief medical officer's winter coat components: @@ -333,7 +333,7 @@ clothingPrototype: ClothingHeadHatHoodWinterSci - type: entity - parent: ClothingOuterWinterCoatToggleable + parent: [ClothingOuterWinterCoatToggleable, BaseCommandContraband] id: ClothingOuterWinterHoP name: head of personnel's winter coat components: @@ -358,7 +358,7 @@ ########################################################## - type: entity - parent: [ClothingOuterArmorHoS, ClothingOuterWinterCoatToggleable] + parent: [ClothingOuterArmorHoS, ClothingOuterWinterCoatToggleable, BaseCommandContraband] id: ClothingOuterWinterHoS name: head of security's armored winter coat description: A sturdy, utilitarian winter coat designed to protect a head of security from any brig-bound threats and hypothermic events. @@ -372,7 +372,7 @@ ########################################################## - type: entity - parent: ClothingOuterWinterCoatToggleable + parent: [ClothingOuterWinterCoatToggleable, BaseCommandContraband] id: ClothingOuterWinterHoSUnarmored name: head of security's winter coat description: A sturdy coat, a warm coat, but not an armored coat. @@ -555,7 +555,7 @@ clothingPrototype: ClothingHeadHatHoodWinterPara - type: entity - parent: ClothingOuterWinterCoatToggleable + parent: [ClothingOuterWinterCoatToggleable, BaseCommandContraband] id: ClothingOuterWinterQM name: quartermaster's winter coat components: @@ -579,7 +579,7 @@ - type: entity - parent: ClothingOuterWinterCoatToggleable + parent: [ClothingOuterWinterCoatToggleable, BaseCommandContraband] id: ClothingOuterWinterRD name: research director's winter coat components: @@ -663,7 +663,7 @@ clothingPrototype: ClothingHeadHatHoodWinterSci - type: entity - parent: ClothingOuterWinterCoatToggleable + parent: [ClothingOuterWinterCoatToggleable, BaseRestrictedContraband] id: ClothingOuterWinterSec name: security winter coat components: @@ -717,7 +717,7 @@ ################################################################ - type: entity - parent: [ClothingOuterArmorWarden, ClothingOuterWinterCoatToggleable] + parent: [ClothingOuterArmorWarden, ClothingOuterWinterCoatToggleable, BaseRestrictedContraband] id: ClothingOuterWinterWarden name: warden's armored winter coat description: A sturdy, utilitarian winter coat designed to protect a warden from any brig-bound threats and hypothermic events. @@ -731,7 +731,7 @@ ################################################################ - type: entity - parent: ClothingOuterWinterCoatToggleable + parent: [ClothingOuterWinterCoatToggleable, BaseRestrictedContraband] id: ClothingOuterWinterWardenUnarmored name: warden's winter coat description: A sturdy coat, a warm coat, but not an armored coat. @@ -755,7 +755,7 @@ clothingPrototype: ClothingHeadHatHoodWinterWarden - type: entity - parent: ClothingOuterWinterCoatToggleable + parent: [ClothingOuterWinterCoatToggleable, BaseSyndicateContraband] id: ClothingOuterWinterSyndieCap name: syndicate's winter coat description: "The syndicate's winter coat is made of durable fabric, with gilded patterns, and coarse wool." @@ -780,7 +780,7 @@ ############################################################## - type: entity - parent: ClothingOuterWinterWarden + parent: [ClothingOuterWinterWarden, BaseSyndicateContraband] id: ClothingOuterWinterSyndieCapArmored name: syndicate's armored winter coat description: "The syndicate's armored winter coat is made of durable fabric, with gilded patterns, and coarse wool." @@ -794,7 +794,7 @@ ############################################################## - type: entity - parent: ClothingOuterWinterCoatToggleable + parent: [ClothingOuterWinterCoatToggleable, BaseSyndicateContraband] id: ClothingOuterWinterSyndie name: syndicate's winter coat description: Insulated winter coat, looks like a merch from "Syndieland". diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml index 8c5405d684..fddb5abb58 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml @@ -11,7 +11,7 @@ - type: Matchbox - type: entity - parent: ClothingShoesMilitaryBase + parent: [ClothingShoesMilitaryBase, BaseRestrictedContraband] id: ClothingShoesBootsJack name: jackboots description: Nanotrasen-issue Security combat boots for combat scenarios or combat situations. All combat, all the time. @@ -45,7 +45,7 @@ sprite: Clothing/Shoes/Boots/performer.rsi - type: entity - parent: ClothingShoesMilitaryBase + parent: [ClothingShoesMilitaryBase, BaseRestrictedContraband] id: ClothingShoesBootsCombat name: combat boots description: Robust combat boots for combat scenarios or combat situations. All combat, all the time. @@ -143,7 +143,7 @@ sprite: Clothing/Shoes/Boots/winterbootssci.rsi - type: entity - parent: [ClothingShoesBaseWinterBoots, ClothingShoesMilitaryBase] + parent: [ClothingShoesBaseWinterBoots, ClothingShoesMilitaryBase, BaseRestrictedContraband] id: ClothingShoesBootsWinterSec name: security winter boots components: @@ -153,7 +153,7 @@ sprite: Clothing/Shoes/Boots/winterbootssec.rsi - type: entity - parent: ClothingShoesBaseWinterBoots + parent: [ClothingShoesBaseWinterBoots, BaseSyndicateContraband] id: ClothingShoesBootsWinterSyndicate name: syndicate's winter boots description: Durable heavy boots, looks like merch from "Syndieland". diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml index 2d3c663612..9adf1ca888 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/magboots.yml @@ -1,5 +1,5 @@ - type: entity - parent: [ClothingShoesBase, BaseToggleClothing] + parent: [ClothingShoesBase, BaseToggleClothing, BaseEngineeringContraband] id: ClothingShoesBootsMag name: magboots description: Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. @@ -36,7 +36,7 @@ - WhitelistChameleon - type: entity - parent: ClothingShoesBootsMag + parent: [ClothingShoesBootsMag, BaseGrandTheftContraband] id: ClothingShoesBootsMagAdv name: advanced magboots description: State-of-the-art magnetic boots that do not slow down their wearer. @@ -80,7 +80,7 @@ price: 3000 - type: entity - parent: [ClothingShoesBootsMag, BaseJetpack] + parent: [ClothingShoesBootsMag, BaseJetpack, BaseSyndicateContraband] id: ClothingShoesBootsMagSyndie name: blood-red magboots description: Reverse-engineered magnetic boots that have a heavy magnetic pull and integrated thrusters. It can hold 0.75 L of gas. diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 18eae39f03..3a552cd91b 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -10,7 +10,7 @@ sprite: Clothing/Uniforms/Jumpskirt/bartender.rsi - type: entity - parent: ClothingUniformSkirtBase + parent: [ClothingUniformSkirtBase, BaseCommandContraband] id: ClothingUniformJumpskirtCaptain name: captain's jumpskirt description: It's a blue jumpskirt with some gold markings denoting the rank of "Captain". @@ -32,7 +32,7 @@ sprite: Clothing/Uniforms/Jumpskirt/cargotech.rsi - type: entity - parent: ClothingUniformSkirtBase + parent: [ClothingUniformSkirtBase, BaseCommandContraband] id: ClothingUniformJumpskirtChiefEngineer name: chief engineer's jumpskirt description: It's a high visibility jumpskirt given to those engineers insane enough to achieve the rank of Chief Engineer. @@ -43,7 +43,7 @@ sprite: Clothing/Uniforms/Jumpskirt/ce.rsi - type: entity - parent: ClothingUniformSkirtBase + parent: [ClothingUniformSkirtBase, BaseCommandContraband] id: ClothingUniformJumpskirtChiefEngineerTurtle name: chief engineer's turtleneck description: A yellow turtleneck designed specifically for work in conditions of the engineering department. @@ -109,7 +109,7 @@ sprite: Clothing/Uniforms/Jumpskirt/genetics.rsi - type: entity - parent: ClothingUniformSkirtBase + parent: [ClothingUniformSkirtBase, BaseCommandContraband] id: ClothingUniformJumpskirtCMO name: chief medical officer's jumpskirt description: It's a jumpskirt worn by those with the experience to be Chief Medical Officer. It provides minor biological protection. @@ -120,7 +120,7 @@ sprite: Clothing/Uniforms/Jumpskirt/cmo.rsi - type: entity - parent: ClothingUniformSkirtBase + parent: [ClothingUniformSkirtBase, BaseCommandContraband] id: ClothingUniformJumpskirtCMOTurtle name: chief medical officer's turtleneck jumpskirt description: It's a turtleneck worn by those with the experience to be Chief Medical Officer. It provides minor biological protection. @@ -164,7 +164,7 @@ sprite: Clothing/Uniforms/Jumpskirt/engineering.rsi - type: entity - parent: ClothingUniformSkirtBase + parent: [ClothingUniformSkirtBase, BaseCommandContraband] id: ClothingUniformJumpskirtHoP name: head of personnel's jumpskirt description: Rather bland and inoffensive. Perfect for vanishing off the face of the universe. @@ -175,7 +175,7 @@ sprite: Clothing/Uniforms/Jumpskirt/hop.rsi - type: entity - parent: ClothingUniformSkirtBase + parent: [ClothingUniformSkirtBase, BaseCommandContraband] id: ClothingUniformJumpskirtHoS name: head of security's jumpskirt description: It's bright red and rather crisp, much like security's victims tend to be. @@ -200,7 +200,7 @@ sprite: Clothing/Uniforms/Jumpsuit/hos.rsi - type: entity - parent: ClothingUniformSkirtBase + parent: [ClothingUniformSkirtBase, BaseCommandContraband] id: ClothingUniformJumpskirtHoSAlt name: head of security's turtleneck description: It's a turtleneck worn by those strong and disciplined enough to achieve the position of Head of Security. @@ -211,7 +211,7 @@ sprite: Clothing/Uniforms/Jumpskirt/hos_alt.rsi - type: entity - parent: ClothingUniformSkirtBase + parent: [ClothingUniformSkirtBase, BaseCommandContraband] id: ClothingUniformJumpskirtHoSParadeMale name: head of security's parade uniform description: A head of security's luxury-wear, for special occasions. @@ -327,7 +327,7 @@ - WhitelistChameleon - type: entity - parent: ClothingUniformSkirtBase + parent: [ClothingUniformSkirtBase, BaseCommandContraband] id: ClothingUniformJumpskirtQM name: quartermaster's jumpskirt description: 'What can brown do for you?' @@ -338,7 +338,7 @@ sprite: Clothing/Uniforms/Jumpskirt/qm.rsi - type: entity - parent: ClothingUniformSkirtBase + parent: [ClothingUniformSkirtBase, BaseCommandContraband] id: ClothingUniformJumpskirtQMTurtleneck name: quartermasters's turtleneck description: A sharp turtleneck made for the hardy work environment of supply. @@ -349,7 +349,7 @@ sprite: Clothing/Uniforms/Jumpskirt/qmturtleskirt.rsi - type: entity - parent: ClothingUniformSkirtBase + parent: [ClothingUniformSkirtBase, BaseCommandContraband] id: ClothingUniformJumpskirtResearchDirector name: research director's turtleneck description: It's a turtleneck worn by those with the know-how to achieve the position of Research Director. Its fabric provides minor protection from biological contaminants. @@ -382,7 +382,7 @@ sprite: Clothing/Uniforms/Jumpskirt/roboticist.rsi - type: entity - parent: ClothingUniformSkirtBase + parent: [ClothingUniformSkirtBase, BaseRestrictedContraband] id: ClothingUniformJumpskirtSec name: security jumpskirt description: A jumpskirt made of strong material, providing robust protection. @@ -408,7 +408,7 @@ - type: entity - parent: ClothingUniformSkirtBase + parent: [ClothingUniformSkirtBase, BaseRestrictedContraband] id: ClothingUniformJumpskirtWarden name: warden's uniform description: A formal security suit for officers complete with Nanotrasen belt buckle. @@ -489,7 +489,7 @@ sprite: Clothing/Uniforms/Jumpskirt/centcomformaldress.rsi - type: entity - parent: ClothingUniformSkirtBase + parent: [ClothingUniformSkirtBase, BaseCommandContraband] id: ClothingUniformJumpskirtHosFormal name: hos's formal dress description: A dress for special occasions. @@ -500,7 +500,7 @@ sprite: Clothing/Uniforms/Jumpskirt/hosformaldress.rsi - type: entity - parent: UnsensoredClothingUniformSkirtBase + parent: [UnsensoredClothingUniformSkirtBase, BaseSyndicateContraband] id: ClothingUniformJumpskirtOperative name: operative jumpskirt description: Uniform for elite syndicate operatives performing tactical operations in deep space. @@ -680,7 +680,7 @@ sprite: Clothing/Uniforms/Jumpskirt/senior_physician.rsi - type: entity - parent: ClothingUniformSkirtBase + parent: [ClothingUniformSkirtBase, BaseRestrictedContraband] id: ClothingUniformJumpskirtSeniorOfficer name: senior officer jumpskirt description: A sign of skill and prestige within the security department. @@ -691,7 +691,7 @@ sprite: Clothing/Uniforms/Jumpskirt/senior_officer.rsi - type: entity - parent: ClothingUniformSkirtBase + parent: [ClothingUniformSkirtBase, BaseRestrictedContraband] id: ClothingUniformJumpskirtSecGrey name: grey security jumpskirt description: A tactical relic of years past before Nanotrasen decided it was cheaper to dye the suits red instead of washing out the blood. diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 0bd8adc7ea..8a265c5811 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -58,7 +58,7 @@ sprite: Clothing/Uniforms/Jumpsuit/bartender_purple.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, BaseCommandContraband] id: ClothingUniformJumpsuitCaptain name: captain's jumpsuit description: It's a blue jumpsuit with some gold markings denoting the rank of "Captain". @@ -91,7 +91,7 @@ sprite: Clothing/Uniforms/Jumpsuit/salvage.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, BaseCommandContraband] id: ClothingUniformJumpsuitChiefEngineer name: chief engineer's jumpsuit description: It's a high visibility jumpsuit given to those engineers insane enough to achieve the rank of Chief Engineer. @@ -102,7 +102,7 @@ sprite: Clothing/Uniforms/Jumpsuit/ce.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, BaseCommandContraband] id: ClothingUniformJumpsuitChiefEngineerTurtle name: chief engineer's turtleneck description: A yellow turtleneck designed specifically for work in conditions of the engineering department. @@ -253,7 +253,7 @@ sprite: Clothing/Uniforms/Jumpsuit/jester2.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, BaseCommandContraband] id: ClothingUniformJumpsuitCMO name: chief medical officer's jumpsuit description: It's a jumpsuit worn by those with the experience to be Chief Medical Officer. It provides minor biological protection. @@ -264,7 +264,7 @@ sprite: Clothing/Uniforms/Jumpsuit/cmo.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, BaseCommandContraband] id: ClothingUniformJumpsuitCMOTurtle name: chief medical officer's turtleneck jumpsuit description: It's a turtleneck worn by those with the experience to be Chief Medical Officer. It provides minor biological protection. @@ -319,7 +319,7 @@ sprite: Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, BaseCommandContraband] id: ClothingUniformJumpsuitHoP name: head of personnel's jumpsuit description: Rather bland and inoffensive. Perfect for vanishing off the face of the universe. @@ -330,7 +330,7 @@ sprite: Clothing/Uniforms/Jumpsuit/hop.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, BaseCommandContraband] id: ClothingUniformJumpsuitHoS name: head of security's jumpsuit description: It's bright red and rather crisp, much like security's victims tend to be. @@ -353,7 +353,7 @@ - state: overlay-inhand-right - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, BaseCommandContraband] id: ClothingUniformJumpsuitHoSAlt name: head of security's turtleneck description: It's a turtleneck worn by those strong and disciplined enough to achieve the position of Head of Security. @@ -364,7 +364,7 @@ sprite: Clothing/Uniforms/Jumpsuit/hos_alt.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, BaseCommandContraband] id: ClothingUniformJumpsuitHoSBlue name: head of security's blue jumpsuit description: A blue jumpsuit of Head of Security. @@ -375,7 +375,7 @@ sprite: Clothing/Uniforms/Jumpsuit/hos_blue.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, BaseCommandContraband] id: ClothingUniformJumpsuitHoSGrey name: head of security's grey jumpsuit description: A grey jumpsuit of Head of Security, which make him look somewhat like a passenger. @@ -386,7 +386,7 @@ sprite: Clothing/Uniforms/Jumpsuit/hos_grey.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, BaseCommandContraband] id: ClothingUniformJumpsuitHoSParadeMale name: head of security's parade uniform description: A male head of security's luxury-wear, for special occasions. @@ -513,7 +513,7 @@ - WhitelistChameleon - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, BaseCommandContraband] id: ClothingUniformJumpsuitQM name: quartermaster's jumpsuit description: 'What can brown do for you?' @@ -524,7 +524,7 @@ sprite: Clothing/Uniforms/Jumpsuit/qm.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, BaseCommandContraband] id: ClothingUniformJumpsuitQMTurtleneck name: quartermasters's turtleneck description: A sharp turtleneck made for the hardy work environment of supply. @@ -535,7 +535,7 @@ sprite: Clothing/Uniforms/Jumpsuit/qmturtle.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, BaseCommandContraband] id: ClothingUniformJumpsuitQMFormal name: quartermasters's formal suit description: Inspired by the quartermasters of military's past, the perfect outfit for supplying a formal occasion. @@ -546,7 +546,7 @@ sprite: Clothing/Uniforms/Jumpsuit/qmformal.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, BaseCommandContraband] id: ClothingUniformJumpsuitResearchDirector name: research director's turtleneck description: It's a turtleneck worn by those with the know-how to achieve the position of Research Director. Its fabric provides minor protection from biological contaminants. @@ -590,7 +590,7 @@ sprite: Clothing/Uniforms/Jumpsuit/roboticist.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, BaseRestrictedContraband] id: ClothingUniformJumpsuitSec name: security jumpsuit description: A jumpsuit made of strong material, providing robust protection. @@ -624,7 +624,7 @@ sprite: Clothing/Uniforms/Jumpsuit/security_blue.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, BaseRestrictedContraband] id: ClothingUniformJumpsuitSecGrey name: grey security jumpsuit description: A tactical relic of years past before Nanotrasen decided it was cheaper to dye the suits red instead of washing out the blood. @@ -635,7 +635,7 @@ sprite: Clothing/Uniforms/Jumpsuit/security_grey.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, BaseRestrictedContraband] id: ClothingUniformJumpsuitWarden name: warden's uniform description: A formal security suit for officers complete with Nanotrasen belt buckle. @@ -746,7 +746,7 @@ sprite: Clothing/Uniforms/Jumpsuit/lawyergood.rsi - type: entity - parent: UnsensoredClothingUniformBase + parent: [UnsensoredClothingUniformBase, BaseSyndicateContraband] id: ClothingUniformJumpsuitPyjamaSyndicateBlack name: black syndicate pyjamas description: For those long nights in perma. @@ -757,7 +757,7 @@ sprite: Clothing/Uniforms/Jumpsuit/pyjamasyndicateblack.rsi - type: entity - parent: UnsensoredClothingUniformBase + parent: [UnsensoredClothingUniformBase, BaseSyndicateContraband] id: ClothingUniformJumpsuitPyjamaSyndicatePink name: pink syndicate pyjamas description: For those long nights in perma. @@ -768,7 +768,7 @@ sprite: Clothing/Uniforms/Jumpsuit/pyjamasyndicatepink.rsi - type: entity - parent: UnsensoredClothingUniformBase + parent: [UnsensoredClothingUniformBase, BaseSyndicateContraband] id: ClothingUniformJumpsuitPyjamaSyndicateRed name: red syndicate pyjamas description: For those long nights in perma. @@ -790,7 +790,7 @@ sprite: Clothing/Uniforms/Jumpsuit/nanotrasen.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, BaseCommandContraband] id: ClothingUniformJumpsuitCapFormal name: captain's formal suit description: A suit for special occasions. @@ -812,7 +812,7 @@ sprite: Clothing/Uniforms/Jumpsuit/centcomformal.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, BaseCommandContraband] id: ClothingUniformJumpsuitHosFormal name: hos's formal suit description: A suit for special occasions. @@ -823,7 +823,7 @@ sprite: Clothing/Uniforms/Jumpsuit/hosformal.rsi - type: entity - parent: UnsensoredClothingUniformBase + parent: [UnsensoredClothingUniformBase, BaseSyndicateContraband] id: ClothingUniformJumpsuitOperative name: operative jumpsuit description: Uniform for elite syndicate operatives performing tactical operations in deep space. @@ -1128,7 +1128,7 @@ sprite: Clothing/Uniforms/Jumpsuit/hawaiyellow.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, BaseSyndicateContraband] id: ClothingUniformJumpsuitSyndieFormal name: syndicate formal suit description: "The syndicate's uniform is made in an elegant style, it's even a pity to do dirty tricks in this." @@ -1183,7 +1183,7 @@ sprite: Clothing/Uniforms/Jumpsuit/senior_physician.rsi - type: entity - parent: ClothingUniformBase + parent: [ClothingUniformBase, BaseRestrictedContraband] id: ClothingUniformJumpsuitSeniorOfficer name: senior officer jumpsuit description: A sign of skill and prestige within the security department. diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 3131e7bf9d..7fa23cd2dc 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -2067,7 +2067,7 @@ - type: entity name: grenade penguin - parent: [ MobPenguin, MobCombat ] + parent: [ MobPenguin, MobCombat, BaseSyndicateContraband ] id: MobGrenadePenguin description: A small penguin with a grenade strapped around its neck. Harvested by the Syndicate from icy shit-hole planets. components: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml index bb80079d2e..9890023c3b 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/box.yml @@ -565,7 +565,7 @@ - type: entity id: HappyHonkNukie - parent: HappyHonk + parent: [HappyHonk, BaseSyndicateContraband] name: robust nukie meal description: A sus meal with a potentially explosive surprise. suffix: Toy Unsafe diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml index 885c483ad0..b9b4b90a08 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meat.yml @@ -337,7 +337,7 @@ - type: entity name: prime-cut corgi meat # can't rot since that would be very bad for syndies - parent: FoodMeatBase + parent: [FoodMeatBase, BaseGrandTheftContraband] id: FoodMeatCorgi description: The tainted gift of an evil crime. The meat may be delicious, but at what cost? components: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml index cb54b4c957..94add0ae2c 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml @@ -180,7 +180,7 @@ - type: entity id: CigPackSyndicate - parent: CigPackBase + parent: [CigPackBase, BaseSyndicateContraband] name: Interdyne herbals packet description: Elite cigarettes for elite syndicate agents. Infused with medicine for when you need to do more than calm your nerves. components: diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml index d3c58a0fe7..ed919edab5 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml @@ -229,7 +229,7 @@ prototype: ComputerCrewMonitoring - type: entity - parent: BaseComputerCircuitboard + parent: [BaseComputerCircuitboard, BaseGrandTheftContraband] id: IDComputerCircuitboard name: ID card computer board description: A computer printed circuit board for an ID card console. @@ -405,4 +405,4 @@ - type: Sprite state: cpu_science - type: ComputerBoard - prototype: ComputerRoboticsControl \ No newline at end of file + prototype: ComputerRoboticsControl diff --git a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/chimp_upgrade_kit.yml b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/chimp_upgrade_kit.yml index fc6c2ac787..aeacc3947a 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/chimp_upgrade_kit.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/chimp_upgrade_kit.yml @@ -1,6 +1,6 @@ - type: entity name: C.H.I.M.P. handcannon upgrade chip - parent: BaseItem + parent: [BaseItem, BaseSyndicateContraband] id: WeaponPistolCHIMPUpgradeKit description: An experimental upgrade kit for the C.H.I.M.P. components: diff --git a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/guardian_activators.yml b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/guardian_activators.yml index 823ee82862..259d36555e 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/guardian_activators.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/guardian_activators.yml @@ -1,7 +1,7 @@ - type: entity name: holoparasite injector id: HoloparasiteInjector - parent: BaseItem + parent: [BaseItem, BaseSyndicateContraband] description: A complex artwork of handheld machinery allowing the user to host a holoparasite guardian. components: - type: Sprite @@ -34,7 +34,7 @@ - type: entity name: holoparasite box - parent: BoxCardboard + parent: [BoxCardboard, BaseSyndicateContraband] id: BoxHoloparasite description: A box containing a holoparasite injector. components: @@ -50,7 +50,7 @@ - type: entity name: holoclown box - parent: BoxCardboard + parent: [BoxCardboard, BaseSyndicateContraband] id: BoxHoloclown description: A box containing a holoclown injector. components: diff --git a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml index e4bca77069..6d85c74fbf 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml @@ -1,5 +1,5 @@ - type: entity - parent: BaseItem + parent: [BaseItem, BaseSyndicateContraband] abstract: true id: ReinforcementRadio name: syndicate reinforcement radio diff --git a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/singularity_beacon.yml b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/singularity_beacon.yml index b2f159f463..96b3c4f4d8 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/singularity_beacon.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/singularity_beacon.yml @@ -1,6 +1,6 @@ - type: entity id: SingularityBeacon - parent: BaseMachinePowered + parent: [BaseMachinePowered, BaseSyndicateContraband] name: singularity beacon description: A syndicate device that attracts the singularity. If it's loose and you're seeing this, run. components: diff --git a/Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml b/Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml index bc17ed455a..41347e35c4 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml @@ -1,5 +1,5 @@ - type: entity - parent: BaseItem + parent: [BaseItem, BaseSyndicateContraband] id: ChameleonProjector name: chameleon projector description: Holoparasite technology used to create a hard-light replica of any object around you. Disguise is destroyed when picked up or deactivated. diff --git a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml index 08260acb88..66b40d0b40 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml @@ -200,7 +200,7 @@ - state: service_label - type: entity - parent: EncryptionKey + parent: [EncryptionKey, BaseRestrictedContraband] id: EncryptionKeySyndie name: blood-red encryption key description: An encryption key used by... wait... Who is the owner of this chip? @@ -215,7 +215,7 @@ - state: synd_label - type: entity - parent: EncryptionKey + parent: [EncryptionKey, BaseSyndicateContraband] id: EncryptionKeyBinary name: binary translator key description: An encryption key that translates binary signals used by silicons. diff --git a/Resources/Prototypes/Entities/Objects/Devices/hand_teleporter.yml b/Resources/Prototypes/Entities/Objects/Devices/hand_teleporter.yml index deac20e05e..397a2a8e03 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/hand_teleporter.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/hand_teleporter.yml @@ -1,6 +1,6 @@ - type: entity id: HandTeleporter - parent: BaseItem + parent: [BaseItem, BaseGrandTheftContraband] name: hand teleporter description: "A Nanotrasen signature item--only the finest bluespace tech. Instructions: Use once to create a portal which teleports at random. Use again to link it to a portal at your current location. Use again to clear all portals." components: diff --git a/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml b/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml index 762204701c..9a4ec3b592 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml @@ -25,7 +25,7 @@ sprite: Objects/Storage/Briefcases/briefcase_brown.rsi - type: entity - parent: BriefcaseBrown + parent: [BriefcaseBrown, BaseSyndicateContraband] id: BriefcaseSyndie suffix: Syndicate, Empty components: diff --git a/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml b/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml index e389bc6b37..90e975b93e 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml @@ -1,6 +1,6 @@ - type: entity name: nuclear authentication disk - parent: BaseItem + parent: [BaseItem, BaseGrandTheftContraband] id: NukeDisk description: A nuclear auth disk, capable of arming a nuke if used along with a code. Note from nanotrasen reads "THIS IS YOUR MOST IMPORTANT POSESSION, SECURE DAT FUKKEN DISK!" components: @@ -25,7 +25,7 @@ - type: entity name: nuclear authentication disk - parent: BaseItem + parent: [BaseItem, BaseGrandTheftContraband] id: NukeDiskFake suffix: Fake description: A nuclear auth disk, capable of arming a nuke if used along with a code. Note from nanotrasen reads "THIS IS YOUR MOST IMPORTANT POSESSION, SECURE DAT FUKKEN DISK!" diff --git a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml index b1ccef48e8..21905fa45a 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml @@ -2,7 +2,7 @@ name: handcuffs description: Used to detain criminals and other assholes. id: Handcuffs - parent: BaseItem + parent: [BaseItem, BaseRestrictedContraband] components: - type: Item size: Small diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 39a0a49113..3102dba109 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -100,7 +100,7 @@ - state: idintern-service - type: entity - parent: IDCardStandard + parent: [IDCardStandard, BaseGrandTheftContraband] id: CaptainIDCard name: captain ID card components: diff --git a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml index 532bcadeb5..a93472658e 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml @@ -4,7 +4,7 @@ name: implanter description: A syringe exclusively designed for the injection and extraction of subdermal implants. id: BaseImplanter - parent: BaseItem + parent: [BaseItem, BaseRestrictedContraband] abstract: true components: - type: ItemSlots @@ -94,7 +94,7 @@ - type: entity id: BaseImplantOnlyImplanterSyndi - parent: BaseImplantOnlyImplanter + parent: [BaseImplantOnlyImplanter, BaseSyndicateContraband] description: A compact disposable syringe exclusively designed for the injection of subdermal implants. abstract: true components: diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index adb5776ec7..478521bcfd 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -503,7 +503,7 @@ - type: entity id: BoxFolderQmClipboard - parent: BoxFolderClipboard + parent: [BoxFolderClipboard, BaseGrandTheftContraband] name: requisition digi-board description: A bulky electric clipboard, filled with shipping orders and financing details. With so many compromising documents, you ought to keep this safe. components: diff --git a/Resources/Prototypes/Entities/Objects/Misc/pen.yml b/Resources/Prototypes/Entities/Objects/Misc/pen.yml index 8680e414c3..2ff0a2258b 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/pen.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/pen.yml @@ -58,7 +58,7 @@ - type: entity name: Cybersun pen - parent: PenEmbeddable + parent: [PenEmbeddable, BaseSyndicateContraband] id: CyberPen description: A high-tech pen straight from Cybersun's legal department, capable of refracting hard-light at impossible angles through its diamond tip in order to write. So powerful, it's even able to rewrite officially stamped documents should the need arise. components: diff --git a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml index e9052fa60e..2edd17a5ce 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml @@ -211,7 +211,7 @@ - type: entity name: syndicate rubber stamp - parent: RubberStampBase + parent: [RubberStampBase, BaseSyndicateContraband] id: RubberStampSyndicate suffix: DO NOT MAP components: diff --git a/Resources/Prototypes/Entities/Objects/Misc/secret_documents.yml b/Resources/Prototypes/Entities/Objects/Misc/secret_documents.yml index ae6238d87c..257aea8268 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/secret_documents.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/secret_documents.yml @@ -1,5 +1,5 @@ - type: entity - parent: BaseItem + parent: [BaseItem, BaseGrandTheftContraband] id: BookSecretDocuments name: "emergency security orders" description: TOP SECRET. These documents specify the Emergency Orders that the HoS must carry out when ordered by Central Command. diff --git a/Resources/Prototypes/Entities/Objects/Power/powersink.yml b/Resources/Prototypes/Entities/Objects/Power/powersink.yml index c44a167bcd..40406209a7 100644 --- a/Resources/Prototypes/Entities/Objects/Power/powersink.yml +++ b/Resources/Prototypes/Entities/Objects/Power/powersink.yml @@ -1,6 +1,6 @@ - type: entity id: PowerSink - parent: BaseMachine + parent: [BaseMachine, BaseSyndicateContraband] name: power sink description: Drains immense amounts of electricity from the grid. components: diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml index 8182accfb6..71598a7ff9 100644 --- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml +++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml @@ -368,7 +368,7 @@ - type: entity name: energy shield - parent: BaseItem + parent: [BaseItem, BaseSyndicateContraband] id: EnergyShield description: Exotic energy shield, when folded, can even fit in your pocket. components: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml index 28d90f1a3b..f5e91e4fd8 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Chapel/bibles.yml @@ -49,7 +49,7 @@ stealGroup: Bible - type: entity - parent: Bible + parent: [Bible, BaseSyndicateContraband] name: necronomicon description: "There's a note: Klatuu, Verata, Nikto -- Don't forget it again!" id: BibleNecronomicon diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml index 5f6cf903aa..61da1a95fc 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -470,7 +470,7 @@ sprite: Objects/Specific/Hydroponics/fly_amanita.rsi - type: entity - parent: SeedBase + parent: [SeedBase, BaseSyndicateContraband] name: packet of gatfruit seeds description: "These are no peashooters." id: GatfruitSeeds diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml index 8056d1e909..3f605119d7 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/soap.yml @@ -117,7 +117,7 @@ - type: entity name: soap id: SoapSyndie - parent: Soap + parent: [Soap, BaseSyndicateContraband] description: An untrustworthy bar of soap. Smells of fear. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml index c9ab24274d..d7a362d725 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/handheld_crew_monitor.yml @@ -1,7 +1,7 @@ - type: entity name: handheld crew monitor suffix: DO NOT MAP - parent: BaseHandheldComputer + parent: [ BaseHandheldComputer, BaseGrandTheftContraband ] # CMO-only bud, don't add more. id: HandheldCrewMonitor description: A hand-held crew monitor displaying the status of suit sensors. diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml index 989fd57705..adb0378507 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml @@ -993,7 +993,7 @@ #this is where all the syringes are so i didn't know where to put it - type: entity name: romerol syringe - parent: PrefilledSyringe + parent: [PrefilledSyringe, BaseSyndicateContraband] id: SyringeRomerol components: - type: SolutionContainerManager @@ -1006,7 +1006,7 @@ - type: entity name: hyperzine syringe - parent: PrefilledSyringe + parent: [PrefilledSyringe, BaseSyndicateContraband] id: SyringeStimulants components: - type: SolutionContainerManager diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml index 6f684cafad..eb18893791 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml @@ -1,6 +1,6 @@ - type: entity name: hypospray - parent: BaseItem + parent: [BaseItem, BaseGrandTheftContraband] description: A sterile injector for rapid administration of drugs to patients. id: Hypospray components: @@ -319,7 +319,7 @@ - type: entity name: hyperzine injector - parent: ChemicalMedipen + parent: [ChemicalMedipen, BaseSyndicateContraband] id: Stimpack description: Contains enough hyperzine for you to have the chemical's effect for 30 seconds. Use it when you're sure you're ready to throw down. components: @@ -351,7 +351,7 @@ - type: entity name: hyperzine microinjector - parent: ChemicalMedipen + parent: [ChemicalMedipen, BaseSyndicateContraband] id: StimpackMini description: A microinjector of hyperzine that give you about fifteen seconds of the chemical's effects. components: @@ -378,7 +378,7 @@ - type: entity name: combat medipen - parent: ChemicalMedipen + parent: [ChemicalMedipen, BaseSyndicateContraband] id: CombatMedipen description: A single-use medipen containing chemicals that regenerate most types of damage. components: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml index cf8fe9c2f7..a49f08e28f 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -497,7 +497,7 @@ #syndicate modules - type: entity id: BorgModuleSyndicateWeapon - parent: [ BaseBorgModule, BaseProviderBorgModule ] + parent: [ BaseBorgModule, BaseProviderBorgModule, BaseSyndicateContraband ] name: weapon cyborg module components: - type: Sprite @@ -557,7 +557,7 @@ - type: entity id: BorgModuleMartyr - parent: [ BaseBorgModule, BaseProviderBorgModule ] + parent: [ BaseBorgModule, BaseProviderBorgModule, BaseSyndicateContraband ] name: martyr cyborg module description: "A module that comes with an explosive you probably don't want to handle yourself." components: diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml index f8f55cf8fc..e38401ad8a 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml @@ -220,7 +220,7 @@ id: NocturineChemistryBottle name: nocturine bottle description: This will make someone fall down almost immediately. Hard to overdose on. - parent: BaseChemistryBottleFilled + parent: [BaseChemistryBottleFilled, BaseSyndicateContraband] components: - type: SolutionContainerManager solutions: diff --git a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml index 2adce1e66b..1d0b7a4e09 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml @@ -151,7 +151,7 @@ - MobAbomination - type: entity - parent: PlushieCarp + parent: [PlushieCarp, BaseSyndicateContraband] id: DehydratedSpaceCarp name: dehydrated space carp description: Looks like a plush toy carp, but just add water and it becomes a real-life space carp! diff --git a/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml b/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml index 53d4f7953b..fcbd0ecc02 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml @@ -1,6 +1,7 @@ + - type: entity name: telecrystal - parent: BaseItem + parent: [BaseItem, BaseSyndicateContraband] id: Telecrystal suffix: 20 TC description: It seems to be pulsing with suspiciously enticing energies. @@ -48,7 +49,7 @@ # Uplinks - type: entity - parent: [ BaseItem, StorePresetUplink ] + parent: [BaseItem, StorePresetUplink, BaseSyndicateContraband] id: BaseUplinkRadio name: syndicate uplink description: Suspiciously looking old radio... diff --git a/Resources/Prototypes/Entities/Objects/Tools/emag.yml b/Resources/Prototypes/Entities/Objects/Tools/emag.yml index 0117d44d6d..28c007a63f 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/emag.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/emag.yml @@ -1,5 +1,5 @@ - type: entity - parent: BaseItem + parent: [BaseItem, BaseSyndicateContraband] id: EmagUnlimited suffix: Unlimited name: cryptographic sequencer diff --git a/Resources/Prototypes/Entities/Objects/Tools/jammer.yml b/Resources/Prototypes/Entities/Objects/Tools/jammer.yml index b456a23f1f..bcb6a435d0 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/jammer.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/jammer.yml @@ -1,6 +1,6 @@ - type: entity name: radio jammer - parent: BaseItem + parent: [BaseItem, BaseSyndicateContraband] id: RadioJammer description: This device will disrupt any nearby outgoing radio communication as well as suit sensors when activated. components: diff --git a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml index bd4c7aa7b5..202b7948e6 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml @@ -52,7 +52,7 @@ - type: entity name: syndicate jaws of life - parent: JawsOfLife + parent: [JawsOfLife, BaseSyndicateContraband] id: SyndicateJawsOfLife description: Useful for entering the station or its departments. components: diff --git a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml index 2c2fc795f2..d2b17dd019 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml @@ -107,7 +107,7 @@ #Empty black - type: entity id: JetpackBlack - parent: BaseJetpack + parent: [BaseJetpack, BaseSyndicateContraband] name: jetpack suffix: Empty components: @@ -140,7 +140,7 @@ #Empty captain - type: entity id: JetpackCaptain - parent: BaseJetpack + parent: [BaseJetpack, BaseGrandTheftContraband] name: captain's jetpack suffix: Empty components: diff --git a/Resources/Prototypes/Entities/Objects/Tools/lantern.yml b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml index 89101e34ff..801755a777 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/lantern.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml @@ -66,7 +66,7 @@ - Flashlight - type: entity - parent: Lantern + parent: [Lantern, BaseSyndicateContraband] id: LanternFlash suffix: Flash components: diff --git a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml index db31911857..b2ad5dec6b 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml @@ -114,7 +114,7 @@ - type: entity name: suspicious toolbox - parent: ToolboxBase + parent: [ToolboxBase, BaseSyndicateContraband] id: ToolboxSyndicate description: A sinister looking toolbox filled with elite syndicate tools. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml index 8bae55e1f4..2d641568d7 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/pen.yml @@ -24,7 +24,7 @@ handle: false # don't want the sound to stop the explosion from triggering - type: entity - parent: BaseItem + parent: [BaseItem, BaseSyndicateContraband] id: PenExplodingBox name: exploding pen box description: A small box containing an exploding pen. Packaging disintegrates when opened, leaving no evidence behind. diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml index 62f81fa546..772dd15ab8 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Bombs/plastic.yml @@ -38,7 +38,7 @@ - type: entity name: composition C-4 description: Used to put holes in specific areas without too much extra hole. A saboteur's favorite. - parent: BasePlasticExplosive + parent: [BasePlasticExplosive, BaseSyndicateContraband] id: C4 components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml index 226fa29164..409f622f89 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml @@ -1,7 +1,7 @@ - type: entity name: proto-kinetic accelerator id: WeaponProtoKineticAccelerator - parent: WeaponProtoKineticAcceleratorBase + parent: [WeaponProtoKineticAcceleratorBase, BaseCargoContraband] description: Fires low-damage kinetic bolts at a short range. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index c8e3279ac7..2f7aa653e7 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -408,7 +408,7 @@ - type: entity name: disabler - parent: BaseWeaponBatterySmall + parent: [ BaseWeaponBatterySmall, BaseSecurityCommandContraband ] id: WeaponDisabler description: A self-defense weapon that exhausts organic targets, weakening them until they collapse. components: @@ -449,7 +449,7 @@ - type: entity name: disabler SMG - parent: BaseWeaponBattery + parent: [ BaseWeaponBattery, BaseRestrictedContraband ] id: WeaponDisablerSMG description: Advanced weapon that exhausts organic targets, weakening them until they collapse. components: @@ -512,7 +512,7 @@ - type: entity name: taser - parent: BaseWeaponBatterySmall + parent: [ BaseWeaponBatterySmall, BaseRestrictedContraband ] id: WeaponTaser description: A low-capacity, energy-based stun gun used by security teams to subdue targets at range. components: @@ -548,7 +548,7 @@ - type: entity name: antique laser pistol - parent: BaseWeaponBatterySmall + parent: [BaseWeaponBatterySmall, BaseGrandTheftContraband] id: WeaponAntiqueLaser description: This is an antique laser pistol. All craftsmanship is of the highest quality. It is decorated with assistant leather and chrome. The object menaces with spikes of energy. components: @@ -623,7 +623,7 @@ - type: entity name: C.H.I.M.P. handcannon - parent: BaseWeaponBatterySmall + parent: [BaseWeaponBatterySmall, BaseScienceContraband] id: WeaponPistolCHIMP description: Just because it's a little C.H.I.M.P. doesn't mean it can't punch like an A.P.E. components: @@ -669,7 +669,7 @@ - type: entity name: experimental C.H.I.M.P. handcannon - parent: WeaponPistolCHIMP + parent: [WeaponPistolCHIMP, BaseSyndicateContraband] id: WeaponPistolCHIMPUpgraded description: This C.H.I.M.P. seems to have a greater punch than is usual... components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Bow/bow.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Bow/bow.yml index 32b4fc6075..13a52a6c14 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Bow/bow.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Bow/bow.yml @@ -1,6 +1,6 @@ - type: entity name: bow - parent: BaseItem + parent: [BaseItem, BaseMinorContraband] id: BaseBow description: The original rooty tooty point and shooty. abstract: true diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml index 79f2e7b45f..1a1514f48c 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml @@ -65,7 +65,7 @@ - type: entity name: L6 SAW id: WeaponLightMachineGunL6 - parent: BaseWeaponLightMachineGun + parent: [BaseWeaponLightMachineGun, BaseSyndicateContraband] description: A rather traditionally made LMG with a pleasantly lacquered wooden pistol grip. Uses .30 rifle ammo. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index 1b9d821e2b..696d507a63 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -22,7 +22,7 @@ - type: entity name: china lake - parent: [BaseWeaponLauncher, BaseGunWieldable] + parent: [BaseWeaponLauncher, BaseGunWieldable, BaseSyndicateContraband] id: WeaponLauncherChinaLake description: PLOOP. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 07d59aadfa..e778393710 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -70,7 +70,7 @@ - type: entity name: viper - parent: BaseWeaponPistol + parent: [BaseWeaponPistol, BaseSyndicateContraband] id: WeaponPistolViper description: A small, easily concealable, but somewhat underpowered gun. Retrofitted with a fully automatic receiver. Uses .35 auto ammo. components: @@ -187,7 +187,7 @@ - type: entity name: mk 58 - parent: BaseWeaponPistol + parent: [BaseWeaponPistol, BaseRestrictedContraband] id: WeaponPistolMk58 description: A cheap, ubiquitous sidearm, produced by a NanoTrasen subsidiary. Uses .35 auto ammo. components: @@ -209,7 +209,7 @@ - type: entity name: N1984 - parent: BaseWeaponPistol + parent: [BaseWeaponPistol, BaseRestrictedContraband] id: WeaponPistolN1984 # the spaces in description are for formatting. description: The sidearm of any self respecting officer. Comes in .45 magnum, the lord's caliber. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index 0df556a742..8a6e027b12 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -52,7 +52,7 @@ - type: entity name: Deckard - parent: BaseWeaponRevolver + parent: [BaseWeaponRevolver, BaseRestrictedContraband] id: WeaponRevolverDeckard description: A rare, custom-built revolver. Use when there is no time for Voight-Kampff test. Uses .45 magnum ammo. components: @@ -80,7 +80,7 @@ - type: entity name: Inspector - parent: BaseWeaponRevolver + parent: [BaseWeaponRevolver, BaseRestrictedContraband] id: WeaponRevolverInspector description: A detective's best friend. Uses .45 magnum ammo. components: @@ -95,7 +95,7 @@ - type: entity name: Mateba - parent: BaseWeaponRevolver + parent: [BaseWeaponRevolver, BaseMinorContraband] id: WeaponRevolverMateba description: The iconic sidearm of the dreaded death squads. Uses .45 magnum ammo. components: @@ -110,7 +110,7 @@ - type: entity name: Python - parent: BaseWeaponRevolver + parent: [BaseWeaponRevolver, BaseSyndicateContraband] id: WeaponRevolverPython description: A robust revolver favoured by Syndicate agents. Uses .45 magnum ammo. components: @@ -143,7 +143,7 @@ - type: entity name: pirate revolver - parent: BaseWeaponRevolver + parent: [BaseWeaponRevolver, BaseMinorContraband] id: WeaponRevolverPirate description: An odd, old-looking revolver, favoured by pirate crews. Uses .45 magnum ammo. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index f073d0cb74..d16afb5478 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -53,7 +53,7 @@ - type: entity name: AKMS - parent: BaseWeaponRifle + parent: [BaseWeaponRifle, BaseMinorContraband] id: WeaponRifleAk description: An iconic weapon of war. Uses .30 rifle ammo. components: @@ -102,7 +102,7 @@ - type: entity name: M-90gl - parent: BaseWeaponRifle + parent: [BaseWeaponRifle, BaseSyndicateContraband] id: WeaponRifleM90GrenadeLauncher description: An older bullpup carbine model, with an attached underbarrel grenade launcher. Uses .20 rifle ammo. components: @@ -146,7 +146,7 @@ - type: entity name: Lecter - parent: BaseWeaponRifle + parent: [BaseWeaponRifle, BaseRestrictedContraband] id: WeaponRifleLecter description: A high end military grade assault rifle. Uses .20 rifle ammo. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index e7f0ce4bff..cf1d77d94b 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -58,7 +58,7 @@ - type: entity name: Atreides - parent: BaseWeaponSubMachineGun + parent: [BaseWeaponSubMachineGun, BaseMinorContraband] id: WeaponSubMachineGunAtreides description: Pla-ket-ket-ket-ket! Uses .35 auto ammo. components: @@ -81,7 +81,7 @@ - type: entity name: C-20r sub machine gun - parent: BaseWeaponSubMachineGun + parent: [BaseWeaponSubMachineGun, BaseSyndicateContraband] id: WeaponSubMachineGunC20r description: A firearm that is often used by the infamous nuclear operatives. Uses .35 auto ammo. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index 6e81bc3be2..58cf9eaed3 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -46,7 +46,7 @@ - type: entity name: Bulldog # Don't parent to BaseWeaponShotgun because it differs significantly - parent: [BaseItem, BaseGunWieldable] + parent: [BaseItem, BaseGunWieldable, BaseSyndicateContraband] id: WeaponShotgunBulldog description: It's a magazine-fed shotgun designed for close quarters combat. Uses .50 shotgun shells. components: @@ -103,7 +103,7 @@ - type: entity name: double-barreled shotgun - parent: [BaseWeaponShotgun, BaseGunWieldable] + parent: [BaseWeaponShotgun, BaseGunWieldable, BaseMinorContraband] id: WeaponShotgunDoubleBarreled description: An immortal classic. Uses .50 shotgun shells. components: @@ -136,7 +136,7 @@ - type: entity name: Enforcer - parent: [BaseWeaponShotgun, BaseGunWieldable] + parent: [BaseWeaponShotgun, BaseGunWieldable, BaseRestrictedContraband] id: WeaponShotgunEnforcer description: A premium combat shotgun based on the Kammerer design, featuring an upgraded clip capacity. .50 shotgun shells. components: @@ -159,7 +159,7 @@ - type: entity name: Kammerer - parent: [BaseWeaponShotgun, BaseGunWieldable] + parent: [BaseWeaponShotgun, BaseGunWieldable, BaseRestrictedContraband] id: WeaponShotgunKammerer description: When an old Remington design meets modern materials, this is the result. A favourite weapon of militia forces throughout many worlds. Uses .50 shotgun shells. components: @@ -217,7 +217,7 @@ - type: entity name: handmade pistol - parent: BaseWeaponShotgun + parent: [BaseWeaponShotgun, BaseMinorContraband] id: WeaponShotgunHandmade description: Looks unreliable. Uses .50 shotgun shells. components: @@ -241,7 +241,7 @@ - type: entity name: blunderbuss - parent: [BaseWeaponShotgun, BaseGunWieldable] + parent: [BaseWeaponShotgun, BaseGunWieldable, BaseMinorContraband] id: WeaponShotgunBlunderbuss suffix: Pirate description: Deadly at close range. @@ -262,7 +262,7 @@ - type: entity name: improvised shotgun - parent: [BaseWeaponShotgun, BaseGunWieldable] + parent: [BaseWeaponShotgun, BaseGunWieldable, BaseMinorContraband] id: WeaponShotgunImprovised description: A shitty, hand-made shotgun that uses .50 shotgun shells. It can only hold one round in the chamber. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index f69cb4fd2d..4ea0061c96 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -40,7 +40,7 @@ - type: entity name: Kardashev-Mosin - parent: [BaseWeaponSniper, BaseGunWieldable] + parent: [BaseWeaponSniper, BaseGunWieldable, BaseSyndicateContraband] id: WeaponSniperMosin description: A weapon for hunting, or endless trench warfare. Uses .30 rifle ammo. components: @@ -49,7 +49,7 @@ - type: entity name: Hristov - parent: [BaseWeaponSniper, BaseGunWieldable] + parent: [BaseWeaponSniper, BaseGunWieldable, BaseSyndicateContraband] id: WeaponSniperHristov description: A portable anti-materiel rifle. Fires armor piercing 14.5mm shells. Uses .60 anti-materiel ammo. components: @@ -66,7 +66,7 @@ - type: entity name: musket - parent: [BaseWeaponSniper, BaseGunWieldable] + parent: [ BaseWeaponSniper, BaseGunWieldable, BaseMinorContraband ] id: Musket description: This should've been in a museum long before you were born. Uses .60 anti-materiel ammo. components: @@ -104,7 +104,7 @@ - type: entity name: flintlock pistol - parent: BaseWeaponSniper + parent: [BaseWeaponSniper, BaseMinorContraband] id: WeaponPistolFlintlock description: A pirate's companion. Yarrr! Uses .60 anti-materiel ammo. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml index 1251172946..1d18c2b050 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/pneumatic_cannon.yml @@ -1,6 +1,6 @@ - type: entity name: improvised pneumatic cannon - parent: BaseStorageItem + parent: [BaseStorageItem, BaseMinorContraband] id: WeaponImprovisedPneumaticCannon description: Improvised using nothing but a pipe, some zipties, and a pneumatic cannon. Doesn't accept tanks without enough gas. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml index 82177478fa..de0e92dd67 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/turrets.yml @@ -120,7 +120,7 @@ context: "human" - type: entity - parent: BaseWeaponTurret + parent: [BaseWeaponTurret, BaseSyndicateContraband] id: WeaponTurretSyndicate suffix: Syndicate components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml index 818c4bd676..551fedfd90 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml @@ -1,6 +1,6 @@ - type: entity name: baseball bat - parent: BaseItem + parent: [BaseItem, BaseMinorContraband] id: BaseBallBat description: A robust baseball bat. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cane.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cane.yml index 5c26020d72..cbf437d0b2 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cane.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cane.yml @@ -28,7 +28,7 @@ - type: entity name: cane blade - parent: BaseItem + parent: [BaseItem, BaseSyndicateContraband] id: CaneBlade description: A sharp blade with a cane shaped hilt. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml index 231e898727..53ddd96178 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml @@ -1,6 +1,6 @@ - type: entity name: energy sword - parent: BaseItem + parent: [BaseItem, BaseSyndicateContraband] id: EnergySword description: A very loud & dangerous sword with a beam made of pure, concentrated plasma. Cuts through unarmored targets like butter. components: @@ -198,7 +198,7 @@ - Write - type: entity - parent: BaseItem + parent: [BaseItem, BaseSyndicateContraband] id: EnergyDaggerBox name: e-dagger box suffix: E-Dagger diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml index f6a4749654..2af85fae4f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml @@ -1,6 +1,6 @@ - type: entity name: fireaxe - parent: BaseItem + parent: [BaseItem, BaseEngineeringContraband] id: FireAxe description: Truly, the weapon of a madman. Who would think to fight fire with an axe? components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml index 8270a50bd6..506a36d08a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml @@ -77,7 +77,7 @@ - type: entity name: combat knife - parent: BaseKnife + parent: [BaseKnife, BaseRestrictedContraband] id: CombatKnife description: A deadly knife intended for melee confrontations. components: @@ -108,7 +108,7 @@ - type: entity name: survival knife - parent: CombatKnife + parent: [CombatKnife, BaseSecurityCargoContraband] id: SurvivalKnife description: Weapon of first and last resort for combatting space carp. components: @@ -120,7 +120,7 @@ - type: entity name: kukri knife - parent: CombatKnife + parent: [CombatKnife, BaseMinorContraband] id: KukriKnife description: Professionals have standards. Be polite. Be efficient. Have a plan to kill everyone you meet. components: @@ -136,7 +136,7 @@ sprite: Objects/Weapons/Melee/kukri_knife.rsi - type: entity - parent: ClothingHeadHatGreyFlatcap + parent: [ClothingHeadHatGreyFlatcap, BaseSyndicateContraband] id: BladedFlatcapGrey name: grey flatcap description: Fashionable for both the working class and old man Jenkins. It has glass shards hidden in the brim. @@ -176,7 +176,7 @@ - type: entity name: shiv - parent: BaseKnife + parent: [BaseKnife, BaseMinorContraband] id: Shiv description: A crude weapon fashioned from a piece of cloth and a glass shard. components: @@ -261,7 +261,7 @@ - type: entity name: throwing knife - parent: BaseKnife + parent: [BaseKnife, BaseSyndicateContraband] id: ThrowingKnife description: This bloodred knife is very aerodynamic and easy to throw, but good luck trying to fight someone hand-to-hand. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml index 87826aa8f0..faebcaa734 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml @@ -101,7 +101,7 @@ radius: 4 - type: entity - parent: BaseWeaponCrusher + parent: [BaseWeaponCrusher, BaseSecurityCargoContraband] id: WeaponCrusher components: - type: Tag diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml index d6985c018d..1d010c0976 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml @@ -1,6 +1,6 @@ - type: entity name: spear - parent: BaseItem + parent: [BaseItem, BaseMinorContraband] id: Spear description: Definition of a Classic. Keeping murder affordable since 200,000 BCE. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml index 437cd8994e..7a3b298129 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/stunprod.yml @@ -1,6 +1,6 @@ - type: entity name: stun prod - parent: BaseItem + parent: [BaseItem, BaseMinorContraband] id: Stunprod description: A stun prod for illegal incapacitation. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml index c2449a6bcb..dd00c2054a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml @@ -18,7 +18,7 @@ - type: entity name: captain's sabre - parent: BaseSword + parent: [ BaseSword, BaseCommandContraband ] id: CaptainSabre description: A ceremonial weapon belonging to the captain of the station. components: @@ -43,7 +43,7 @@ - type: entity name: katana - parent: BaseSword + parent: [ BaseSword, BaseMinorContraband ] id: Katana description: Ancient craftwork made with not so ancient plasteel. components: @@ -93,7 +93,7 @@ - type: entity name: machete - parent: BaseSword + parent: [ BaseSword, BaseMinorContraband ] id: Machete description: A large, vicious looking blade. components: @@ -114,7 +114,7 @@ - type: entity name: claymore - parent: BaseSword + parent: [ BaseSword, BaseMinorContraband ] id: Claymore description: An ancient war blade. components: @@ -136,7 +136,7 @@ - type: entity name: cutlass - parent: BaseSword + parent: [ BaseSword, BaseMinorContraband ] id: Cutlass description: A wickedly curved blade, often seen in the hands of space pirates. components: @@ -157,7 +157,7 @@ - type: entity name: Throngler - parent: BaseSword + parent: [ BaseSword, BaseMinorContraband ] id: Throngler description: Why would you make this? components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml index fea9a8d5ea..a4441b18f7 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml @@ -1,6 +1,6 @@ - type: entity name: bola - parent: BaseItem + parent: [BaseItem, BaseRestrictedContraband] id: Bola description: Linked together with some spare cuffs and metal. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml index 99b50c558b..b4f540ae53 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/clusterbang.yml @@ -1,5 +1,5 @@ - type: entity - parent: BaseItem + parent: [BaseItem, BaseRestrictedContraband] id: ClusterBang name: clusterbang description: Can be used only with flashbangs. Explodes several times. @@ -50,7 +50,7 @@ cluster-payload: !type:Container - type: entity - parent: GrenadeBase + parent: [GrenadeBase, BaseSyndicateContraband] id: ClusterGrenade name: clustergrenade description: Why use one grenade when you can use three at once! @@ -79,7 +79,7 @@ cluster-payload: !type:Container - type: entity - parent: BaseItem + parent: [BaseItem, BaseSyndicateContraband] id: ClusterBananaPeel name: cluster banana peel description: Splits into 6 explosive banana peels after throwing, guaranteed fun! @@ -116,7 +116,7 @@ cluster-payload: !type:Container - type: entity - parent: GrenadeBase + parent: [GrenadeBase, BaseSyndicateContraband] id: GrenadeStinger name: stinger grenade description: Nothing to see here, please disperse. @@ -145,7 +145,7 @@ cluster-payload: !type:Container - type: entity - parent: GrenadeBase + parent: [GrenadeBase, BaseSyndicateContraband] id: GrenadeIncendiary name: incendiary grenade description: Guaranteed to light up the mood. @@ -174,7 +174,7 @@ cluster-payload: !type:Container - type: entity - parent: GrenadeBase + parent: [GrenadeBase, BaseSyndicateContraband] id: GrenadeShrapnel name: shrapnel grenade description: Releases a deadly spray of shrapnel that causes severe bleeding. diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml index 2986eb0457..97b9edf7a4 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml @@ -39,7 +39,7 @@ - type: entity name: explosive grenade description: Grenade that creates a small but devastating explosion. - parent: GrenadeBase + parent: [GrenadeBase, BaseSyndicateContraband] id: ExGrenade components: - type: ExplodeOnTrigger @@ -101,7 +101,7 @@ - type: entity name: syndicate minibomb description: A syndicate-manufactured explosive used to stow destruction and cause chaos. - parent: GrenadeBase + parent: [GrenadeBase, BaseSyndicateContraband] id: SyndieMiniBomb components: - type: Sprite @@ -148,7 +148,7 @@ - type: entity name: supermatter grenade description: Grenade that simulates delamination of the supermatter engine, pulling things in a heap and exploding after some time. - parent: GrenadeBase + parent: [GrenadeBase, BaseSyndicateContraband] id: SupermatterGrenade components: - type: Sprite @@ -333,7 +333,7 @@ - type: entity name: EMP grenade description: A grenade designed to wreak havoc on electronic systems. - parent: GrenadeBase + parent: [GrenadeBase, BaseSyndicateContraband] id: EmpGrenade components: - type: Sprite @@ -350,7 +350,7 @@ - type: entity name: holy hand grenade description: O Lord, bless this thy hand grenade, that with it thou mayst blow thine enemies to tiny bits, in thy mercy. - parent: GrenadeBase + parent: [GrenadeBase, BaseSyndicateContraband] id: HolyHandGrenade components: - type: Sprite @@ -462,7 +462,7 @@ - type: entity name: syndicate trickybomb description: A syndicate-manufactured explosive used to make an excellent distraction. - parent: GrenadeDummy + parent: [GrenadeDummy, BaseSyndicateContraband] id: SyndieTrickyBomb components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/throwing_stars.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/throwing_stars.yml index 0dfc9a0312..3cffe6e661 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/throwing_stars.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/throwing_stars.yml @@ -1,5 +1,5 @@ - type: entity - parent: BaseItem + parent: [BaseItem, BaseMinorContraband] id: ThrowingStar name: throwing star description: An ancient weapon still used to this day, due to its ease of lodging itself into its victim's body parts. diff --git a/Resources/Prototypes/Entities/Objects/Weapons/security.yml b/Resources/Prototypes/Entities/Objects/Weapons/security.yml index 8dc31e1fa6..edbe58f584 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/security.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/security.yml @@ -1,6 +1,6 @@ - type: entity name: stun baton - parent: BaseItem + parent: [BaseItem, BaseRestrictedContraband] id: Stunbaton description: A stun baton for incapacitating people with. Actively harming with this is considered bad tone. components: @@ -91,7 +91,7 @@ - type: entity name: truncheon - parent: BaseItem + parent: [BaseItem, BaseRestrictedContraband] id: Truncheon description: A rigid, steel-studded baton, meant to harm. components: @@ -128,7 +128,7 @@ - type: entity name: flash - parent: BaseItem + parent: [BaseItem, BaseSecurityScienceCommandContraband] id: Flash description: An ultrabright flashbulb with a trigger, which causes the victim to be dazed and lose their eyesight for a moment. Useless when burnt out. components: @@ -184,7 +184,7 @@ - type: entity name: portable flasher - parent: BaseMachine + parent: [BaseMachine, BaseRestrictedContraband] id: PortableFlasher description: An ultrabright flashbulb with a proximity trigger, useful for making an area security-only. components: diff --git a/Resources/Prototypes/Entities/Objects/base_contraband.yml b/Resources/Prototypes/Entities/Objects/base_contraband.yml new file mode 100644 index 0000000000..051c04b6e2 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/base_contraband.yml @@ -0,0 +1,93 @@ +# non-stealth syndicate stuff +- type: entity + id: BaseSyndicateContraband + abstract: true + components: + - type: Contraband + severity: Syndicate + # no one should be carrying this around visibly! + allowedDepartments: null + +# minor contraband not departmentally restricted -- improvised weapons etc +- type: entity + id: BaseMinorContraband + abstract: true + components: + - type: Contraband + severity: Minor + # according to space law no dept is authorized to have + allowedDepartments: null + +# minor contraband by default restricted to security only +- type: entity + id: BaseRestrictedContraband + abstract: true + components: + - type: Contraband + severity: Restricted + +# departmentally restricted contraband -- this covers every configuration currently listed in space law +- type: entity + id: BaseCommandContraband + parent: BaseRestrictedContraband + abstract: true + components: + - type: Contraband + allowedDepartments: [ Command ] + +- type: entity + id: BaseSecurityCommandContraband + parent: BaseRestrictedContraband + abstract: true + components: + - type: Contraband + allowedDepartments: [ Security, Command ] + +- type: entity + id: BaseSecurityScienceCommandContraband + parent: BaseRestrictedContraband + abstract: true + components: + - type: Contraband + allowedDepartments: [ Security, Science, Command ] + +- type: entity + id: BaseEngineeringContraband + parent: BaseRestrictedContraband + abstract: true + components: + - type: Contraband + allowedDepartments: [ Engineering ] + +- type: entity + id: BaseScienceContraband + parent: BaseRestrictedContraband + abstract: true + components: + - type: Contraband + allowedDepartments: [ Science ] + +- type: entity + id: BaseSecurityCargoContraband + parent: BaseRestrictedContraband + abstract: true + components: + - type: Contraband + allowedDepartments: [ Security, Cargo ] + +- type: entity + id: BaseCargoContraband + parent: BaseRestrictedContraband + abstract: true + components: + - type: Contraband + allowedDepartments: [ Cargo ] + +# for ~objective items +- type: entity + id: BaseGrandTheftContraband + abstract: true + components: + - type: Contraband + severity: GrandTheft + allowedDepartments: [ Command ] diff --git a/Resources/Prototypes/Entities/Structures/Machines/bombs.yml b/Resources/Prototypes/Entities/Structures/Machines/bombs.yml index 82c79496f2..3679127e3d 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/bombs.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/bombs.yml @@ -92,7 +92,7 @@ disposable: false - type: entity - parent: BaseHardBomb + parent: [BaseHardBomb, BaseSyndicateContraband] id: SyndicateBomb name: syndicate bomb description: A bomb for Syndicate operatives and agents alike. The real deal, no more training, get to it! diff --git a/Resources/Prototypes/contraband_severities.yml b/Resources/Prototypes/contraband_severities.yml new file mode 100644 index 0000000000..aad9916b25 --- /dev/null +++ b/Resources/Prototypes/contraband_severities.yml @@ -0,0 +1,22 @@ +# Improvised weapons/gear, etc. Not departmentally restricted per se, but you shouldn't really have it around +# as non-sec without a valid reason. +- type: contrabandSeverity + id: Minor + examineText: contraband-examine-text-Minor + +# Having this without a good reason might get you yelled at by security. (spears, shivs, etc). +# or, Having this as a regular crew member, not the department it was made for, is considered theft IC. (rcd, sec gear, etc) +- type: contrabandSeverity + id: Restricted + examineText: contraband-examine-text-Restricted + showDepartments: true + +# Having this as a regular crew member is considered grand theft. (nuke disk, captain's gear, objective items, etc) +- type: contrabandSeverity + id: GrandTheft + examineText: contraband-examine-text-GrandTheft + +# This is clear syndicate contraband and is illegal to own IC. +- type: contrabandSeverity + id: Syndicate + examineText: contraband-examine-text-Syndicate From 9f550002d196d6f82ac200a977c96ef5a0c88440 Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 12 Aug 2024 03:58:57 +0000 Subject: [PATCH 410/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index f9e51bf8db..5492d695b5 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Vermidia - changes: - - message: Shuttle roles get PDAs and headsets now - type: Fix - id: 6596 - time: '2024-05-15T10:30:54.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28045 - author: EdenTheLiznerd changes: - message: Removed the throngler from the grand lottery @@ -3793,3 +3786,12 @@ id: 7095 time: '2024-08-12T01:49:09.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30814 +- author: mirrorcult + changes: + - message: With space law being overhauled, you can now examine items to see their + contraband status, and whether with your current access you'd be accosted by + Security for owning it. This will also clearly show non-stealth syndicate items. + type: Add + id: 7096 + time: '2024-08-12T03:57:50.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/28688 From 6759d6a6142c411ac445a56d9623042383d034a9 Mon Sep 17 00:00:00 2001 From: DieselMohawk Date: Mon, 12 Aug 2024 01:20:56 -0500 Subject: [PATCH 411/422] Sec Vest & Helmet Resprite (Attempt 2) (#30291) * Sec Vest & Helmet Resprite * Made Helmet side sprites better * Vest Alterations In Line With Feedback * Feedback Based Alterations PT.2 (How did I miss that?) * Alterations in line with Art Director Feedback --- .../security.rsi/equipped-HELMET-vox.png | Bin 832 -> 776 bytes .../Helmets/security.rsi/equipped-HELMET.png | Bin 787 -> 662 bytes .../Clothing/Head/Helmets/security.rsi/icon.png | Bin 205 -> 252 bytes .../Head/Helmets/security.rsi/inhand-left.png | Bin 387 -> 394 bytes .../Head/Helmets/security.rsi/inhand-right.png | Bin 380 -> 393 bytes .../Head/Helmets/security.rsi/meta.json | 2 +- .../security.rsi/equipped-OUTERCLOTHING-vox.png | Bin 465 -> 702 bytes .../security.rsi/equipped-OUTERCLOTHING.png | Bin 343 -> 628 bytes .../OuterClothing/Armor/security.rsi/icon.png | Bin 252 -> 392 bytes .../Armor/security.rsi/inhand-left.png | Bin 286 -> 413 bytes .../Armor/security.rsi/inhand-right.png | Bin 291 -> 412 bytes .../OuterClothing/Armor/security.rsi/meta.json | 2 +- 12 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png index 47a6bfb145fc646fbcd7a39d6b676832281a8b94..519d82efe32f32af0c21384348f17146b594a23e 100644 GIT binary patch delta 740 zcmV@MJ>B*x{!{CX2wZK%g+7?7T*U#*qPn;ee-7C zT;2nS|C>9mA9OoC1pvN(*Ni2}1pwga+gE3Mt_UF%0C3+oV}Egy004%=p|d`7dAZx^ zsm=CNc%FwwqXEzJkftf7(<#z41prlL5QGpa2!d<%g%HX$2u=a0)&JU_PNxh1%kx!W z@A@izdp;|fJr+W!G)+z9>-D;so6TlsCp^!~briGcbKi&0IRL=(JTo^xeMsUMagsRc zXFdUpF*KV^$bYx*KW((1A1%+H9e?Q#-o1HY??{<2#!RmJoSQ{!^x_$FI@G9TeUWpH zR;y*6)n#peZ#&pkm$iL8)@rrD=Q~t3+U|K2A&Fy*$7AzL;uz;qwD4Y5oKheRLktFk zYrm0Fs?lgvSqcDG=>`CYhlfU^-|s5`CM{j`GoOI0Mt`eVytW&LA%Mlj+s|PbR;F)| zQYx46b!e~Chm}HW6TU%fojwo*K@bE%5ClOG1VIo4K@hiE>b0nO)%iW6J& z>X1#6Tomd{aH}L*=w1Qe_rW03>(qLSCr*Es^#6=z;Qzqj%P@@f~_H%PS?96sn zl3pi|xV`{(XFM&mh~yQsv~0~`VY9xhj0`aTe*rOoqp^qq9F0W`;Akvj07qjH12`Is z7{Jk3!~l-QA_j0Y7BPUMAQ+0H8yx&9`n((2&-?qX-wYx5H#YwGBHQU@tnCLe`D``| ze!m|gk$(s@n@#Qk__Vi2(JdoX;tw`Asf{Sje!mZeLcz8PwjRRd@rMdG*4D@XD{a1{ z{CRv#mzGXVz~u2Zcr_NIb~qfSs6YdL939#IafYM60w``Rxbj~Q4ya)AZh>Q|aZzJh z*9nexfLfJeu}Belwo};QD#2Iiwt4mCWgA;6@PwQo*T8Vr<5A}N8(V4%9csxGL<#JTF?!1M52u_2O z!Wakypi-%LYCtlX9QJxWs(Wp=HaIyf+;knU$9E04C;HzcE(n4k2!bF8f*=TjAPB-G b2NvKrw}o_e;_eG!00000NkvXXu0mjfRP}J; diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png index fd0c4dd25d592d8337bb365515a28ffa2ca4a513..e849900b9b0a9e3380f5d01485d09ec9efa4c6b6 100644 GIT binary patch delta 625 zcmV-%0*?KY29^boFn za{&6k-LW|->_yu1?v?E{{f_fbXI5j`kWy;j^U8LTrWlPzR)6sw(-Xp8q@%+S?RFck z>mtu{WLX9Px`{=QQtBWG*2cG4gu5nR4ttUAbPoUkS(a6UqtiV=*o(Aj0w$!CS_rW= zz7PUZO5^y(cfe#k#eLs{=XqEx765=WP4O*BO@}g8-1d2%!*$(q@_C-uj+-!Efaoy9 z)7NiLSNq?+dVe-J`*?1gfT=V|;Q4+z>1w|Xqeo!X$+38Tlk-hoEtj}jE|De)=JR>^ zNt2{JwsmnFuYJz`)W7N2{eEBf`~6z1qOXY@%0#YfHyQh;IavQ}RRa!(!^Zvt5D^g( z5fKp)5fKrQwT;vV6h2t)(VIG2vkPonqhMVh&}y~d`+q)?`lh7b_97ffsXN_n*)DQW zN&yx%3dZ#TyL&qT0HsuI@=7V}3$gaJa+eXjB6B(?*QQU{=8BO zpJy|hA*@|qT-4f+gP_dGhSdT9z^pRym#6P*^#Uiy!gkney;zC!X7FTC&}>Ywvo|`l^gb7zkcCu+1ztaopSztwm$I7J0ouORfWkXXPC+L`(|&A>TD5M zz5lJ4!{@bUeJ`gc=Wz5re*Wx$u-%`vLdng4epxNKoN3(Vqb4j76FYO?`P~oBo;#;A z|NQKKVFD7a=c;WNHy^BL*e5H0|Ni|l?gWO#7dh-|einK-bMxKXmzAjJF{~M~Y!(gb72?#teofNf#MBjxJ)H08#LRVa~t#{icU9YUgcSb$Ttsb&kar zdzBvqNgO;HzB<%nY0!kzPZKO;E~zub_xJ5-Z|J^%_x57th%<>+bDehI-Nt=zn_ffr z^ItYnZsPK73s>H{S6ce0>Gb0l^+!KE5}aPnGG`uRPDfX`?CtZDC%bmuQh(7H_eOed zH+R@}?fZ<#uVsu+{rvZRy z+qwrHJc{2}ktem!K=9~uYv%3ed+*uwzhK>X@TFo$SEusXG~r)=_g!bdZ`5`4(VDo7 z^|S5R6MhSnu$|qQXwT6U>i3kT+Uzopr0PRd$R{#J2 diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png index 325084b69fcf7afcbefa810c075063362a26e4f4..701dd659a5a8db84aee5012f5e96c8cf9dcfdefb 100644 GIT binary patch delta 236 zcmVm`pWVYpSXOz&Xe5>O!B2D_}E&S*||jjtyYDX z@2{GEl&xjeG5Z466SO=~bn&-+DJgU~|c8hMg#YI|LI(@O>_%)r2R7=#&**XOTD0g7Jmba4!caDO|^o3Gh`hxP1s#{2*G9X-au)Ep90 z8hCOu$HPRmq@%)rCy6XM;Ni&CGoNEgr>}2wyQ9Y1_51FB*e&MY{kpG2??s>glFeJ! zZen1$#J_592-C~Zb}McNgMB?4g&f2-ENFNzhgHCLX@+L-owWhmn3%Ti{G6kc%EwtU z@A-|l0ci^!aB6xqPHYm9(EQ!=~3S4cFjE6Wy3U0xBfl^L(B{S00000 z002PfhB!0O%W@EB2DWL{9F>MSGtfrswo(0pr)MY1vTP)M_utF1)aOSjNy^_Bduv14 z>buZ5A7JBqW}vR0-QPIdv-K6&rhfsff)%Q^s01nO< XRoIbs4150400000NkvXXu0mjf&~~u0 delta 364 zcmeBV{=+muvYwfNfno0U#y3EUu{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$g>fKQ04 ziII_}re3{fI;Z~ zxpP2q&H|6fVg?4j!ywFfygq+L3Q+WUH++Xa#$@!IyYsv(H-$9E0P5z3Fzk`@6It^7^ y?)`sa>9VJR$yDV^m3X6+kk;MR2@JvlcNq;ouK8Lo6OsV*6@#a%pUXO@geCwz>xU5l diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json b/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json index 20fb373db6..acafec0f30 100644 --- a/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json +++ b/Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d90c7e5de6f6d94596c164da78dbc8d3cd35bb99 and modified by Flareguy for SS14", + "copyright": "Made by DieselMohawk for use in SS14", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING-vox.png index 1d9b1d145965586bf68a08f1b5f872e0460b9174..413594691f9b9cae6cd4377fccc64597dbbc1fc3 100644 GIT binary patch delta 689 zcmV;i0#5zW1HJ{28Gi-<0063Kaozv`00DDSM?wIu&K&6g00MYPL_t(|obB4Xj^Z#B z2H>AfY}r5%G?qYA5mgG_|2ZhA5EWviG+11%T$C+#9EHow#(}UJ?fE2%NizOVjFTDZ z7$AfYLI@$`ztnNLIEtczbB^tHi#U$U-&IN#lgR{0l3=-9I)9D%uk-!77b>NS!C(LY zkWxY^Rm5@JQA!n3N(dn!geZ@@6wx%_o_i+WsZe{f)9Dlda5x+g1OWhGv)SNsxuA`k z|0=(#Y5p&li$7<+{P}o1R*Qp_(q%Yj)%?@xRDPbxul)!B0Amcs802|g9=lvF0Dv@2 z!5DKcz%}3M^?!Qbp0CSk0yyW$^Bh75aL%E%hLjRXlE4@P&be~|uKBlLfR(0cqkQM* zHHxCb^E@!dptZ(uI7FJJ$n(6_zW~+z(P(sce7D;*%6D1;*6j-LJg{arzfDg0<_jxuh*@;1V6_vhQr}qc2iF8fGCQtp10+4*NS%G|&0G|+7 zD@!{~P0i5IP)7%c;Gi&PC%5phsJy(q$jC?=D|=U0SD?a#TvHVw#ZwaG7yKUq7=-Sh zI|mf!EbxddW?+@Hn0Bx4@ba4!caDO}PHQylx9=A-vneYDIzh2i+xK{V$ zr{famCNXMSYwJXM{+_OLP^jU)kV+P>Ymj-Jgvz-Yjx%eWtwfogF1cqF<#31P?K{V( zJY8Mcj#I_2bTYIV3FmCRrYjaR>w%GQ!+BO~Q^zlRj->LYvAQ*g9AcT!RR3n8-vJJz z;{Vg^S^{?48Za3M$2^_IkSU^jHagnavv{ISL!UD|rdntqi<8 lhv!~0=QM^I%^TmPqgF4!^>+1?JYWbic)I$ztaD0e0swf>vbF#K diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/equipped-OUTERCLOTHING.png index 427c203b198f8124ab283106ea28c080a1f0a726..95cf642147e5593f2917ace70aea389464d798e8 100644 GIT binary patch delta 615 zcmV-t0+{{R0`vrs7=H)`00020X>r~F0004VQb$4nuFf3k0006mNkl_m2 zO_UjcF~%5UjQyVmE-#MbxDi5NzuzOvGV{Aisb)Hz;&?nFO@C9THNQJQeD;M(sb(^n z005+vP)arJb5cqW5r_y%sm3nuRr<V#JQD8hC0|0ir9jdBAA8-C% zzO8HiFP9g8?!5W_a5&h-K}zYeoHIMWEKBq7$$$D10Dvfpyq@=EuRk0PUy|>%0YV69 zt#Lk|&CjZ;0)GIUPA3Qu~A}UH9ITBxwM& z?Xh0w0`AqZTrN#lYQ0`x3`_JfA8>EsBuSdKKUfq6Hk(bao3L7~nsz3ks;Y}O|EShm zoLXa#*z*E?d3A=@1}qkfo7dqx`PSgv9kvM}-qsbiy>ceOYXg9fsf_j>kmtGYa!;{G zVQ#g`U0`@`z;~YjUrzUcIF2u_w=_)$*Yg7JV9z96&jnuB_{h^IAj`7BXf*n3@jTDb z_UnnrCA$+MLRpq~hat4qZ~vo=F~%5Uj4}4}{07724!Hxjrak}w002ovPDHLkV1n0h BA8Y^s delta 328 zcmV-O0k{721lIzP7=Hu<00013M{Ml?001gbOjJbx000;l86zSlDJdyBIX*l(KS4l1 zLqbMHMMYCmR#jD1S5{hCSy^swZg}atJpcdz0d!JMQvg8b*k%9#0NY7KK~zY`?bAI9 z!axuO;D;lm_XK)_g;9$I!B$%l4-iO^Dv&}XWsb7l66+MXL4Q~)TfK{=Gw}xmv5>s( z4If(!J3yarW@v!vn~rr1N|*P(%9#(MgB-}oUNlWEU!Wr|6xcVl2G#YVz^OynFgu%u^ceSs7=k2L=K3{k`*B4{y+8kv*_CeV9)BC6UeGVA!i^5W1tIw zK?j^ASUiBpoQ3Ycer6o_mkLF+OFCcxZF;A3E<_5e;KNEk5PWxgzZ aev=zDtvcEW$;fR000002BRSsnmrn&zYYM*{l3k8Rr$Lcn|fVnXjdAq3jC z%`#z@faj>Yu5v>}5D|bBcU|}L-V(As01!f8p69fFPU7)+WY>C2K+`no>&J0SG4LX6 z3E97)F($57E2^pj;Cj8XUawR0aU8MMF0T95{cVhibzM`}{{}cs6Vo(hH7^tjggy$QVH-0aRt&qz|YSwCMG5)C+Fzk;Ogoc7#J8D8X6fH znU|MWQ&V#zRpuj55o1Y^UoeBivm0qZPMfETV~EE2Fo<9*#v4-dPzLGnk7w gb}}4vI3~c%FzLC$%f(iEwt;-%>FVdQ&MBb@0P_({0ssI2 diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/inhand-left.png b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/inhand-left.png index aea0f39676c9a3df42501063df31031b33721268..c571e77c872fab7191e48677a2422fe5140efc5f 100644 GIT binary patch delta 399 zcmbQoG?#gTL_G%^0|UdV%))y>im^Dz-HBn{IhmJ0cDSdDV@SoEx3~7MYBrEy{czb^ z#8n`MsY$`YV)yTV>lH12a&*<7m@ASgte?5~`k|kW?R8s<+GaepW)Oq{Mu*VQQ)zYL z+jiEMIBPEDYGMdFHQj#Zv+@nk%+8kXlwa2Vw7zoR-yONPkJoLh+rRjEPmq^ro8q_4 zwuw~%_rIU`EOXgJ(Nl<(VczqFxwnIxc5ixiZj(=GY`clCVc%lI?cYQh8Z7!483ILe z=l}h)&gZ93@ng;pwep7z5+bMNn)wRX-2ZRzXy?4*@3r+aZdWk1C2p8?zcu&W;nQn0 zxKvvj1eiY8+a%9RH}NgL&0X+y?as~)ICyb7=B9kX#YBU3$L^Je)<2l5*U)#l^y1aO zjJJWTLhGE>>#|F?wA(l5iaQ+tsa=p-e_$K;g2!)I{%nN_a_-n<|6tMK2X8iMoeuhY kTy9=0gVG}YKTK2pAM_WWb!#Os#2Gj|UHx3vIVCg!0O!2AHUIzs delta 271 zcmbQsJdbIDL_G^L0|P^Zd(K-RB@y5g;tHfSH8mX_9D)J^LqkI&BO?&v6Xy0jT<2JSLr09Cm$O|%N3Iw!;OO75e~wg^!JF0KWJZU;3aRxM>^UU;d=Mwo+f$t5Pfgr&??nT+f@ zOPOwXakFp~iaY4)-nl5!vWSDho4bTnPlKuFq23FwQ`{S;ixo74Y49v_Vq(~@B5sqS T>lp_000W1otDnm{r-UW|%~4g# diff --git a/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/inhand-right.png b/Resources/Textures/Clothing/OuterClothing/Armor/security.rsi/inhand-right.png index cef6f162c719878faa0304435ed3aa68bb35ba13..830a503736a44ff430f13d05d1b9d67fcef34387 100644 GIT binary patch delta 398 zcmV;90dfAL0-OVo7=H)`00020X>r~F0004VQb$4nuFf3k00042Nkl9S7)Af`7rn+(v);0T=)tDFTcz z2PRJW6wyR8Y9^r_=U1DuJ|GLEvKsu%0jGDLvNy-w;(SQ}ENp<--=}nvl6?n|SU+La ziUlQLi~lB+`|;^IQD*@u*r`%J(2bX&a*lYtpv~*uBj`+eV0J*Av a@C0#A7e40000 Date: Mon, 12 Aug 2024 06:22:03 +0000 Subject: [PATCH 412/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 5492d695b5..38cc8ed9ed 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: EdenTheLiznerd - changes: - - message: Removed the throngler from the grand lottery - type: Tweak - id: 6597 - time: '2024-05-15T21:02:58.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28060 - author: deltanedas changes: - message: Fixed ninja criminal records hack not changing sechud icons. @@ -3795,3 +3788,10 @@ id: 7096 time: '2024-08-12T03:57:50.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/28688 +- author: DieselMohawk + changes: + - message: Resprited Security vest and helmet + type: Tweak + id: 7097 + time: '2024-08-12T06:20:56.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30291 From d220249902028b9ecd983e6556ec887b854ac0d5 Mon Sep 17 00:00:00 2001 From: Ubaser <134914314+UbaserB@users.noreply.github.com> Date: Mon, 12 Aug 2024 17:04:21 +1000 Subject: [PATCH 413/422] Hotfix #30291 (#30932) * add * Revert "add" This reverts commit 2b4ae87c4fbdd80d224ab19a655c9c547fcc43fd. * add --- .../security.rsi/equipped-HELMET-vox.png | Bin 776 -> 1823 bytes .../Helmets/security.rsi/equipped-HELMET.png | Bin 662 -> 1718 bytes .../Head/Helmets/security.rsi/icon.png | Bin 252 -> 1282 bytes .../Head/Helmets/security.rsi/inhand-left.png | Bin 394 -> 1509 bytes .../Head/Helmets/security.rsi/inhand-right.png | Bin 393 -> 1488 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png index 519d82efe32f32af0c21384348f17146b594a23e..815ba143e536f400648773405f84a31c91b6c300 100644 GIT binary patch literal 1823 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy zw18|5AO?X;!IOa`XMsm#F$06fED&ZCw^H21z`$IS84^(v;p=0SoS&h?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6 zGOr}DLN~8i8Da>`9GBGM~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fwU3rjN#3Q|*aJzRZ!T|;d2A&OBAfrz4-ZKIFH z88#r#TSW$?7U$=bf`Z@9$jrnB93&{Bh=_pbh`_1?SrlDIKt_H^J}_YwWhQ&(m82FG z6af<%#73xnxK*H=g|Iv{FSEqX2xi~sc3d|4@SJ7GrQY*`8<-E3JY5_^Dj46++TSnaC~~~LnL*khOU07c{ZZhA zg#5%m%4^nLK6c~Qji_JhHzFb=t-1fRNluiOVY{?Z$DN_NLC zjpt^vO%iKcb?5chIbXeRb-6O0lixaPQH)-9*49;@jwUHS`@GXZ?{d|Afd@5-hSeh@CaK6xWxqEfD{rGoTTWF7R zgPKU`j8~t}FkbRe6WDxj`5Z|Gm-ck!wSWH{p8oxpqu3L{T|ZyM)O~w*+5TJHe47fN zsvYYln?~N}?+|u+k!W;-?}u((eB87}`*zqnq~5p5VwPIMo_j{o`%@LWgTQ-6p=DDg zc-WFmq$+Q#RC`u#z8SOqcJ9?yB}V>z@l5Y^6Sz)=1{!EheS3AMiu$H4j?4?VTbm^K z+N)dN+W7A@ijb9+JjWKq_U3k7*Phzqd%|aL&)chhXEMHEZ2aGQAbyLRVM?5pzdERL N@^tlcS?83{1OOZVq5%K^ delta 740 zcmV@MJ>B*x{!{CX2wZK%g+7?7T*U#*qPn;ee-7C zT;2nS|C>9mA9OoC1pvN(*Ni2}1pwga+gE3Mt_UF%0C3+oV}Egy004%=p|d`7dAZx^ zsm=CNc%FwwqXEzJkftf7(<#z41prlL5QGpa2!d<%g%HX$2u=a0)&JU_PNxh1%kx!W z@A@izdp;|fJr+W!G)+z9>-D;so6TlsCp^!~briGcbKi&0IRL=(JTo^xeMsUMagsRc zXFdUpF*KV^$bYx*KW((1A1%+H9e?Q#-o1HY??{<2#!RmJoSQ{!^x_$FI@G9TeUWpH zR;y*6)n#peZ#&pkm$iL8)@rrD=Q~t3+U|K2A&Fy*$7AzL;uz;qwD4Y5oKheRLktFk zYrm0Fs?lgvSqcDG=>`CYhlfU^-|s5`CM{j`GoOI0Mt`eVytW&LA%Mlj+s|PbR;F)| zQYx46b!e~Chm}HW6TU%fojwo*K@bE%5ClOG1VIo4K@hiE>b0nO)%iW6J& z>X1#6Tomd{aH}L*=w1Qe_rWh?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6 zGOr}DLN~8i8Da>`9GBGM~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fwU3rjN#3Q|*aJzRZ!T|;d2A&OBAfrz4-ZKIFH z88#r#TSW$?7U$=bf`Z@9$jrnB93&{Bh=_pbh`_1?SrlDIKt_H^J}_YwWhQ&(m82FG z6af<%#73xnxK*H=g|Iv{FSEqX2xi~sc3d|4@SJ7GrQY*`n}LC8r>Bc!NCo5DSr@x5JBYNoYi~6a57Sw5d)b4s zg-heO?)~PlJFqUi>Sgcyhr$)gkD4ohd*1YQ z9E&}^R@timwO%=0*VLYJSsQlxYP;;`ZFXzR51f~GEu7qJ?$&k45s|~vU6r_Q#!u+w0A4_$-d){zZ{Bq)^+9jKIvY!ch%d@?K|Bd zCo6O8ZCP}D#3D`Q(la z4iCEwv*0kH!$mt=&hBzM_^LqUWVrmD>yHG^sP%t5{G`Y3{dLd9dlT9BEi9b7=3ARY zO3#g)Y>_qP3?WZz za{&6k-LW|->_yu1?v?E{{f_fbXI5j`kWy;j^U8LTrWlPzR)6sw(-Xp8q@%+S?RFck z>mtu{WLX9Px`{=QQtBWG*2cG4gu5nR4ttUAbPoUkS(a6UqtiV=*o(Aj0w$!CS_rW= zz7PUZO5^y(cfe#k#eLs{=XqEx765=WP4O*BO@}g8-1d2%!*$(q@_C-uj+-!Efaoy9 z)7NiLSNq?+dVe-J`*?1gfT=V|;Q4+z>1w|Xqeo!X$+38Tlk-hoEtj}jE|De)=JR>^ zNt2{JwsmnFuYJz`)W7N2{eEBf`~6z1qOXY@%0#YfHyQh;IavQ}RRa!(!^Zvt5D^g( z5fKp)5fKrQwT;vV6h2t)(VIG2vkPonqhMVh&}y~d`+q)?`lh7b_97ffsXN_n*)DQW zN&yx%3dZ#TyL&qT0HsuI@=7V}3$gaJa+eXjB6B(?*QQU{=8BO zpJy|hA*@|qT-4f+gP_dGhSdT9z^pRym#6P*^#Uiy!gkney;zC!X7FTCznTPbd0U|>$m42dX-@b$4u&d=3LOvz75)vL%Y z0PC`;umUo3Q%e#RDspr3imfVamB1>jfNYSkzLEl1NlCV?QiN}Sf^&XRs)CuGfu4bq z9hZWFf=y9MnpKdC8&o@xXRDM^Qc_^0uU}qXu2*iXmtT~wZ)j<0sc&GUZ)BtkRH0j3 znOBlnp_^B%3^4>|j!SBBa#3bMNoIbY0?6FNr2NtnTO}osMQ{LdXG${Mo`TY%9I!1Z z$@-}|sky0nCB^!NdWQPg^p#|$AzYYO3=Ixo!03ZyfZ7bOYV#~8Nj3q7lxqdhJy8Dv z9hwZbx40xlA4!3}k%57Qu7Q!Rk)=M|e?aHkq$FFFWR~Qlf&&ijA8-gd=9Hj{g4Bb8 zASV+PvQ{~XdFi%F6}l;@X^EvdB}#Ug$@zIU`VbYUIw7K{2HNOjvD*gZW2?xZ)Z+Y{ zQc#%N8JU^bfWrYr6cPFm9T8Y{Ad8~w2*}7U$p@yUqReE^ypq(Sf+Aqbg4hVP54Q?* zvk;bt=4F=H89@y|6Gqa76f;(iMJ46=McEVJ- UM`U3~DyaPNboFyt=akR{0OnYw>i_@% delta 211 zcmV;^04)E43j6_(F@Ls6L_t(oh3(M63BoWG#__)*vC$D!Xwp%7bO|?c2Pbd|kB(w1 zr~~w%slCLD7C{garMS9oG2u2dBuRo& zil%9(>l(nvln5$dQtRi78Ne&FJ)iU762U)kK3$khHCk(`s!RgFImhklLZ6B&U^9bR zu0H1FZcA|}g9{9UH{R?w>tEL6h?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6 zGOr}DLN~8i8Da>`9GBGM~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fv}^D+|iQgn+l(=$qJ^dTxyO@N4^8f>GF#SJzf zpIb!+r55Msl!C(E&dAKf1{@wJqKH_4=!n3o16dSZM?gk?Nj@-D6=f!S=9Q!t6%+we z7{o@XeYjPin}x7EG%vHn&IoD%nlO?sq!_YtEGj9_FUk%9#|COp;#3AT3KFbHDHW0p zz)=9q2Xt=`Ln;{G&f4pD*g)WT?2+Rk5{!&Nnn6nprmgXr zSix0xE$_`59UmLU{sZT#U7A=k5?Ry|IAXe_PkYML#{{(3FVXmR^ZWO^`X@`&S@Z-L z7_p-dY8&h&p0yXwspgiDnS4>B-};i7O!j`4lgl%sJm zeHAx$^6{B=dY#zIw_sr6er?(H2lNAZ;Eko%g;S8c-{IW?X9=t>e*j+ z?n*Ph_V??~UbowF&&@BZRT#|KTY0Pe{{+_8#jm#>?JvddZ$x-B9#wG&P1)M8Yerz1 zh^XrMi~Sco3$JXIKQL7={Xc_s!@9}SH|+Q&c;gqd#)i$SXV2MPr!RbM{-*kdH;R8b za^e|O*R%hO|2*Men5&Xe;lW&pUMXfh)Kt-<Dnm{r-UW|9P$OA delta 355 zcmV-p0i6Ej3yK4fFn<9=NklWvCFdTU%^or@4X4jtU4zaAyF8+(RjG=*=Ri6tAB9ItX-JA07;t97OJXB zX_~GIOp?USXNy*|>YQ2y#TSvHn>$I;)vZ>Am+!Bdew3|c)iL`5*5xlxoy=;~rbBDn zeP3B#{VnjAf-SSQ8CVCd7nH7Y$kskggRx<=0K;%iQv6V|@VVwO>4Ym33UJnqvR}002ovPDHLkV1f*l Br?db7 diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png index 31f0109985cc63ccbfc17398257d16c73fdc81a8..0dbc1447027e88afc12abe267380ad004d5bdce9 100644 GIT binary patch literal 1488 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy zw18|5AO?X;!IOa`XMsm#F$06fED&ZCw^H21z`$IV84^(v;p=0SoS&h?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6 zGOr}DLN~8i8Da>`9GBGM~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fv}^D+|iQgn+l(=$qJ^dTxyO@N4^8f>GF#SJzf zpIb!+r55Msl!C(E&dAKf1{@wJqKH_4=!n3o16dSZM?gk?Nj@-D6=f!S=9Q!t6%+we z7{o@XeYjPin}x7EG%vHn&IoD%nlO?sq!_YtEGj9_FUk%9#|COp;#3AT3KFbHDHW0p zz)=9q2XRX6vL!IaA+MB)U0!7ch*X%CrSLzGJART9z)#8vqxvtZ>x)S%l8jI`|Voaof|Rd zw_P@QTRCs~-InXq%|Cvzx%%tnqn(?AWw~Fgrt8`KKl}aGj%^pS|4erOJKx@)_1?Xu z$3CxfEb(2R9e0ACNr3?$+QzcW$T%Uo|Kprhy7!LGWQ73K`0A*+rEvf|%iEfUt`)CmGM=ihs#DdUyknDG>PqPY3#Yt1SiE2B8q2~i3z5Yl zo>}JS)7W-2EK6gnsGAk}KuRk5dG))W?{~GD%=M4t|N0<({U?XBZg$K8#ab=wz~FEE b@B4uJ%-yaP_RBM$gGy6RS3j3^P6YO%G-lk)rEcT}gjVE`NR2;w^U)*tIU18~*{nrB4qI;{C7QnT;{lJJa-i z2%Kl$Tp04p*LKZ3+GWEuO}G9&1VhXW000000000$=!Q5m(8~~K2DWL{9F>MSGtfrs zwo(0pr)MY1vRiB Date: Mon, 12 Aug 2024 17:14:45 +1000 Subject: [PATCH 414/422] Make mantles loadout only. (#30929) * remove cloaks and mantles from dresser * remove mantles from lathe * add role timer loadout thing * add back cloak dresser * fix test fail * potentially fix test fail (?) --- .../Catalog/Fills/Lockers/dressers.yml | 22 +++---- .../Entities/Structures/Machines/lathe.yml | 7 --- .../Loadouts/Jobs/Cargo/quartermaster.yml | 18 ++++++ .../Loadouts/Jobs/Command/captain.yml | 18 ++++++ .../Jobs/Command/head_of_personnel.yml | 18 ++++++ .../Jobs/Engineering/chief_engineer.yml | 18 ++++++ .../Jobs/Medical/chief_medical_officer.yml | 18 ++++++ .../Jobs/Science/research_director.yml | 20 ++++++- .../Jobs/Security/head_of_security.yml | 18 ++++++ .../Prototypes/Recipes/Lathes/clothing.yml | 60 ++----------------- 10 files changed, 138 insertions(+), 79 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml index d04b6aff60..febfe23ad1 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml @@ -7,13 +7,11 @@ contents: - id: ClothingHeadHatCaptain - id: ClothingHeadHatCapcap - - id: ClothingNeckCloakCap - - id: ClothingNeckCloakCapFormal - id: ClothingUniformJumpsuitCapFormal - id: ClothingUniformJumpskirtCapFormalDress - id: ClothingHandsGlovesCaptain - - id: ClothingNeckMantleCap - id: ClothingOuterWinterCap + - id: ClothingNeckCloakCap - type: entity id: DresserChiefEngineerFilled @@ -22,12 +20,11 @@ components: - type: StorageFill contents: - - id: ClothingNeckMantleCE - id: ClothingUniformJumpsuitChiefEngineerTurtle - id: ClothingUniformJumpskirtChiefEngineerTurtle - - id: ClothingNeckCloakCe - id: ClothingHeadHatBeretEngineering - id: ClothingOuterWinterCE + - id: ClothingNeckCloakCe - type: entity id: DresserChiefMedicalOfficerFilled @@ -36,8 +33,6 @@ components: - type: StorageFill contents: - - id: ClothingNeckMantleCMO - - id: ClothingCloakCmo - id: ClothingOuterCoatLabCmo - id: ClothingUniformJumpsuitCMOTurtle - id: ClothingUniformJumpskirtCMOTurtle @@ -45,6 +40,7 @@ - id: ClothingHeadMirror - id: ClothingEyesGlasses - id: ClothingOuterWinterCMO + - id: ClothingCloakCmo - type: entity id: DresserHeadOfPersonnelFilled @@ -53,11 +49,10 @@ components: - type: StorageFill contents: - - id: ClothingNeckMantleHOP - - id: ClothingNeckCloakHop - id: ClothingHeadHatHopcap - id: ClothingOuterWinterHoP - id: ClothingEyesGlasses + - id: ClothingNeckCloakHop - type: entity id: DresserHeadOfSecurityFilled @@ -66,15 +61,14 @@ components: - type: StorageFill contents: - - id: ClothingNeckMantleHOS - id: ClothingHeadHatBeretHoS - id: ClothingHeadHatHoshat - - id: ClothingNeckCloakHos - id: ClothingUniformJumpskirtHoSAlt - id: ClothingUniformJumpsuitHoSAlt - id: ClothingUniformJumpskirtHosFormal - id: ClothingUniformJumpsuitHosFormal - id: ClothingOuterWinterHoS + - id: ClothingNeckCloakHos - type: entity id: DresserQuarterMasterFilled @@ -83,14 +77,13 @@ components: - type: StorageFill contents: - - id: ClothingNeckCloakQm - id: ClothingHeadHatBeretQM - id: ClothingUniformJumpsuitQMFormal - id: ClothingUniformJumpsuitQMTurtleneck - id: ClothingUniformJumpskirtQMTurtleneck - id: ClothingHandsGlovesColorBrown - - id: ClothingNeckMantleQM - id: ClothingOuterWinterQM + - id: ClothingNeckCloakQm - type: entity id: DresserResearchDirectorFilled @@ -99,13 +92,12 @@ components: - type: StorageFill contents: - - id: ClothingNeckMantleRD - - id: ClothingNeckCloakRd - id: ClothingHeadHatBeretRND - id: ClothingHandsGlovesColorPurple - id: ClothingEyesGlasses - id: ClothingOuterWinterRD - id: ClothingOuterCoatRD + - id: ClothingNeckCloakRd - type: entity id: DresserWardenFilled diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 8f6fb16f04..98d5440e3e 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -1065,13 +1065,6 @@ - ClothingOuterWinterWardenUnarmored - ClothingOuterWinterQM - ClothingOuterWinterRD - - ClothingNeckMantleCap - - ClothingNeckMantleCE - - ClothingNeckMantleCMO - - ClothingNeckMantleHOP - - ClothingNeckMantleHOS - - ClothingNeckMantleRD - - ClothingNeckMantleQM - ClothingOuterWinterMusician - ClothingOuterWinterClown - ClothingOuterWinterMime diff --git a/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml index ecdf1e5ffe..60fc1834fb 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Cargo/quartermaster.yml @@ -1,3 +1,13 @@ +# For mantles +- type: loadoutEffectGroup + id: MasterQM + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobQuartermaster + time: 72000 #20 hrs + # Jumpsuit - type: loadout id: QuartermasterJumpsuit @@ -42,6 +52,14 @@ neck: ClothingNeckCloakQm - type: loadout + id: QuartermasterMantle + equipment: + neck: ClothingNeckMantleQM + effects: + - !type:GroupLoadoutEffect + proto: MasterQM + +- type: startingGear id: QuartermasterMantle equipment: neck: ClothingNeckMantleQM diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml index f665038ff2..9043354a31 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/captain.yml @@ -1,3 +1,13 @@ +# For mantles +- type: loadoutEffectGroup + id: MasterCap + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobCaptain + time: 72000 #20 hrs + # Jumpsuit - type: loadout id: CaptainJumpsuit @@ -45,6 +55,14 @@ id: CaptainMantle equipment: neck: ClothingNeckMantleCap + effects: + - !type:GroupLoadoutEffect + proto: MasterCap + +- type: startingGear + id: CaptainMantle + equipment: + neck: ClothingNeckMantleCap # Back - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml index 76c46d7d1a..45223bea14 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml @@ -1,3 +1,13 @@ +# For mantles +- type: loadoutEffectGroup + id: MasterHoP + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobHeadOfPersonnel + time: 72000 #20 hrs + # Professional HoP Time - type: loadoutEffectGroup id: ProfessionalHoP @@ -35,6 +45,14 @@ id: HoPMantle equipment: neck: ClothingNeckMantleHOP + effects: + - !type:GroupLoadoutEffect + proto: MasterHoP + +- type: startingGear + id: HoPMantle + equipment: + neck: ClothingNeckMantleHOP # Back - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml index 522f16d09e..13b72e0af4 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/chief_engineer.yml @@ -1,3 +1,13 @@ +# For mantles +- type: loadoutEffectGroup + id: MasterCE + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobChiefEngineer + time: 72000 #20 hrs + # Jumpsuit - type: loadout id: ChiefEngineerJumpsuit @@ -39,6 +49,14 @@ id: ChiefEngineerMantle equipment: neck: ClothingNeckMantleCE + effects: + - !type:GroupLoadoutEffect + proto: MasterCE + +- type: startingGear + id: ChiefEngineerMantle + equipment: + neck: ClothingNeckMantleCE # OuterClothing - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml index 12bde1be96..43bbc42f46 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/chief_medical_officer.yml @@ -1,3 +1,13 @@ +# For mantles +- type: loadoutEffectGroup + id: MasterCMO + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobChiefMedicalOfficer + time: 72000 #20 hrs + # Jumpsuit - type: loadout id: ChiefMedicalOfficerJumpsuit @@ -40,6 +50,14 @@ id: ChiefMedicalOfficerMantle equipment: neck: ClothingNeckMantleCMO + effects: + - !type:GroupLoadoutEffect + proto: MasterCMO + +- type: startingGear + id: ChiefMedicalOfficerMantle + equipment: + neck: ClothingNeckMantleCMO # Outer clothing - type: loadout diff --git a/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml b/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml index c1c644de2a..2e607aca69 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml @@ -1,15 +1,31 @@ -# Head +# For mantles +- type: loadoutEffectGroup + id: MasterRD + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobResearchDirector + time: 72000 #20 hrs +# Head - type: loadout id: ResearchDirectorBeret startingGear: ScientificBeret # Neck - - type: loadout id: ResearchDirectorMantle equipment: neck: ClothingNeckMantleRD + effects: + - !type:GroupLoadoutEffect + proto: MasterRD + +- type: startingGear + id: ResearchDirectorMantle + equipment: + neck: ClothingNeckMantleRD - type: loadout id: ResearchDirectorCloak diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml index ceecef6cc6..a393006d9c 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/head_of_security.yml @@ -1,3 +1,13 @@ +# For mantles +- type: loadoutEffectGroup + id: MasterHoS + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:RoleTimeRequirement + role: JobHeadOfSecurity + time: 72000 #20 hrs + # Jumpsuit - type: loadout id: HeadofSecurityJumpsuit @@ -50,6 +60,14 @@ id: HeadofSecurityMantle equipment: neck: ClothingNeckMantleHOS + effects: + - !type:GroupLoadoutEffect + proto: MasterHoS + +- type: startingGear + id: HeadofSecurityMantle + equipment: + neck: ClothingNeckMantleHOS # OuterClothing - type: loadout diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml index b7b6a5c1a1..100cbe8f38 100644 --- a/Resources/Prototypes/Recipes/Lathes/clothing.yml +++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml @@ -685,6 +685,7 @@ completetime: 4 materials: Cloth: 300 + # Command winter coats - type: latheRecipe id: ClothingOuterWinterCap @@ -757,62 +758,7 @@ materials: Cloth: 500 Durathread: 300 -# Mantles -- type: latheRecipe - id: ClothingNeckMantleCap - result: ClothingNeckMantleCap - completetime: 2.8 - materials: - Cloth: 200 - Durathread: 150 -- type: latheRecipe - id: ClothingNeckMantleCE - result: ClothingNeckMantleCE - completetime: 2.8 - materials: - Cloth: 200 - Durathread: 150 - -- type: latheRecipe - id: ClothingNeckMantleCMO - result: ClothingNeckMantleCMO - completetime: 2.8 - materials: - Cloth: 200 - Durathread: 150 - -- type: latheRecipe - id: ClothingNeckMantleHOP - result: ClothingNeckMantleHOP - completetime: 2.8 - materials: - Cloth: 200 - Durathread: 150 - -- type: latheRecipe - id: ClothingNeckMantleHOS - result: ClothingNeckMantleHOS - completetime: 2.8 - materials: - Cloth: 200 - Durathread: 150 - -- type: latheRecipe - id: ClothingNeckMantleRD - result: ClothingNeckMantleRD - completetime: 2.8 - materials: - Cloth: 200 - Durathread: 150 - -- type: latheRecipe - id: ClothingNeckMantleQM - result: ClothingNeckMantleQM - completetime: 2.8 - materials: - Cloth: 200 - Durathread: 150 # Winter coats - type: latheRecipe id: ClothingOuterWinterMusician @@ -989,6 +935,7 @@ materials: Cloth: 500 Durathread: 200 + # Hats - type: latheRecipe id: ClothingHeadHatCaptain @@ -1171,6 +1118,7 @@ completetime: 1 materials: Cloth: 100 + # Ties - type: latheRecipe id: ClothingNeckTieRed @@ -1192,6 +1140,7 @@ completetime: 2 materials: Cloth: 200 + # Scarfs - type: latheRecipe id: ClothingNeckScarfStripedGreen @@ -1248,6 +1197,7 @@ completetime: 2 materials: Cloth: 200 + # Carpets - type: latheRecipe id: Carpet From ca75d5a3e3a3634ab442fd46f382f6f14c750c86 Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 12 Aug 2024 07:15:52 +0000 Subject: [PATCH 415/422] Automatic changelog update --- Resources/Changelog/Changelog.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 38cc8ed9ed..d48ee26cf2 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: deltanedas - changes: - - message: Fixed ninja criminal records hack not changing sechud icons. - type: Fix - id: 6598 - time: '2024-05-16T20:51:06.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28021 - author: EmoGarbage404 changes: - message: Fixed a bug that would cause items in your inventory to get stuck to @@ -3795,3 +3788,14 @@ id: 7097 time: '2024-08-12T06:20:56.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30291 +- author: Ubaser + changes: + - message: Mantles are now available in loadouts, requiring 20 hours of that head + of department's time. + type: Add + - message: Mantles are no longer spawned in dressers or able to be printed at uniform + lathes. + type: Remove + id: 7098 + time: '2024-08-12T07:14:46.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30929 From 7e17063b86858794fe35e4eab2b3de8446c25148 Mon Sep 17 00:00:00 2001 From: Ubaser <134914314+UbaserB@users.noreply.github.com> Date: Mon, 12 Aug 2024 18:16:59 +1000 Subject: [PATCH 416/422] Removes variant cube migration (#30934) add --- Resources/migration.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/migration.yml b/Resources/migration.yml index 92b2ca6d3b..b20d7fc4f4 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -130,7 +130,6 @@ DrinkGoldschlagerGlass: DrinkGildlagerGlass # 2024-01-07 ClosetBase: ClosetSteelBase -MonkeyCubeBox: VariantCubeBox # 2024-01-08 SalvagePartsT4Spawner: SalvageLootSpawner @@ -355,7 +354,6 @@ ClothingOuterCoatInspector: ClothingOuterCoatJensen # 2024-06-23 FloorTileItemReinforced: PartRodMetal1 - #2024-06-25 BookChefGaming: BookHowToCookForFortySpaceman From 883dc998e6ccbb1a27e93d0ac372f8a6ee75aab8 Mon Sep 17 00:00:00 2001 From: Plykiya <58439124+Plykiya@users.noreply.github.com> Date: Mon, 12 Aug 2024 01:17:26 -0700 Subject: [PATCH 417/422] First Review Pass Contraband Fixes (#30930) * First pass contra fix * bam * More * Security crates are now marked as security restricted * Syndicate raid suit is contra * damn I forgot gatfruit --- .../en-US/contraband/contraband-severity.ftl | 1 + .../Catalog/Fills/Boxes/general.yml | 4 ++-- .../Catalog/Fills/Crates/armory.yml | 12 +++++------ .../Catalog/Fills/Crates/syndicate.yml | 4 ++-- .../Catalog/Fills/Items/briefcases.yml | 2 +- .../Entities/Clothing/Belt/belts.yml | 2 +- .../Entities/Clothing/Hands/gloves.yml | 2 +- .../Entities/Clothing/Head/eva-helmets.yml | 2 +- .../Entities/Clothing/Head/helmets.yml | 2 +- .../Entities/Clothing/Head/misc.yml | 2 +- .../Entities/Clothing/OuterClothing/armor.yml | 2 +- .../Clothing/OuterClothing/softsuits.yml | 2 +- .../Objects/Consumable/Food/produce.yml | 20 +++++++++---------- .../Objects/Devices/encryption_keys.yml | 2 +- .../Entities/Objects/Devices/radio.yml | 2 +- .../Prototypes/Entities/Objects/Fun/darts.yml | 2 +- .../Prototypes/Entities/Objects/Fun/pai.yml | 2 +- .../Prototypes/Entities/Objects/Fun/toys.yml | 2 +- .../Entities/Objects/Misc/briefcases.yml | 2 +- .../Entities/Objects/Misc/implanters.yml | 6 +++--- .../Entities/Objects/Shields/shields.yml | 6 +++--- .../Objects/Specific/Medical/hypospray.yml | 2 +- .../Entities/Objects/Tools/lantern.yml | 2 +- .../Entities/Objects/Tools/tools.yml | 2 +- .../Weapons/Guns/Battery/battery_guns.yml | 10 +++++----- .../Objects/Weapons/Guns/HMGs/hmgs.yml | 2 +- .../Weapons/Guns/Launchers/launchers.yml | 2 +- .../Objects/Weapons/Guns/Pistols/pistols.yml | 4 ++-- .../Weapons/Guns/Revolvers/revolvers.yml | 4 ++-- .../Objects/Weapons/Guns/SMGs/smgs.yml | 6 +++--- .../Entities/Objects/Weapons/Melee/mining.yml | 4 ++-- .../Objects/Weapons/Throwable/grenades.yml | 4 ++-- .../Entities/Objects/base_contraband.yml | 9 +++++++++ .../Structures/Storage/Crates/crates.yml | 16 +++++++-------- .../Prototypes/contraband_severities.yml | 5 +++++ 35 files changed, 84 insertions(+), 69 deletions(-) diff --git a/Resources/Locale/en-US/contraband/contraband-severity.ftl b/Resources/Locale/en-US/contraband/contraband-severity.ftl index 594a64f8b7..37d83c4575 100644 --- a/Resources/Locale/en-US/contraband/contraband-severity.ftl +++ b/Resources/Locale/en-US/contraband/contraband-severity.ftl @@ -1,6 +1,7 @@ contraband-examine-text-Minor = [color=yellow]This item is considered minor contraband.[/color] contraband-examine-text-Restricted = [color=yellow]This item is departmentally restricted.[/color] contraband-examine-text-Restricted-department = [color=yellow]This item is restricted to {$departments}, and may be considered contraband.[/color] +contraband-examine-text-Major = [color=red]This item is considered major contraband.[/color] contraband-examine-text-GrandTheft = [color=red]This item is a highly valuable target for Syndicate agents![/color] contraband-examine-text-Syndicate = [color=crimson]This item is highly illegal Syndicate contraband![/color] diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml index 15b187cd15..bc20d4a7cd 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml @@ -340,7 +340,7 @@ - type: entity name: syndicate encryption key box - parent: [BoxEncryptionKeyPassenger, BaseRestrictedContraband] + parent: [BoxEncryptionKeyPassenger, BaseSyndicateContraband] id: BoxEncryptionKeySyndie description: Two syndicate encryption keys for the price of one. Miniaturized for ease of use. components: @@ -445,4 +445,4 @@ - type: StorageFill contents: - id: Envelope - amount: 9 \ No newline at end of file + amount: 9 diff --git a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml index d5aab23717..bc5377fe81 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml @@ -1,6 +1,6 @@ - type: entity id: CrateArmorySMG - parent: CrateWeaponSecure + parent: [ CrateWeaponSecure, BaseRestrictedContraband ] name: SMG crate description: Contains two high-powered, semiautomatic rifles with four mags. Requires Armory access to open. components: @@ -13,7 +13,7 @@ - type: entity id: CrateArmoryShotgun - parent: CrateWeaponSecure + parent: [ CrateWeaponSecure, BaseRestrictedContraband ] name: shotgun crate description: For when the enemy absolutely needs to be replaced with lead. Contains two Enforcer Combat Shotguns, and some standard shotgun shells. Requires Armory access to open. components: @@ -26,7 +26,7 @@ - type: entity id: CrateTrackingImplants - parent: CrateWeaponSecure + parent: [ CrateWeaponSecure, BaseRestrictedContraband ] name: tracking implants description: Contains a handful of tracking implanters. Good for prisoners you'd like to release but still keep track of. components: @@ -36,7 +36,7 @@ amount: 5 - type: entity - parent: CrateWeaponSecure + parent: [ CrateWeaponSecure, BaseRestrictedContraband ] id: CrateTrainingBombs name: training bombs description: Contains three low-yield training bombs for security to learn defusal and safe ordnance disposal, EOD suit not included. Requires Armory access to open. @@ -48,7 +48,7 @@ - type: entity id: CrateArmoryLaser - parent: CrateWeaponSecure + parent: [ CrateWeaponSecure, BaseRestrictedContraband ] name: lasers crate description: Contains three standard-issue laser rifles. Requires Armory access to open. components: @@ -59,7 +59,7 @@ - type: entity id: CrateArmoryPistols - parent: CrateWeaponSecure + parent: [ CrateWeaponSecure, BaseRestrictedContraband ] name: pistols crate description: Contains two standard NT pistols with four mags. Requires Armory access to open. components: diff --git a/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml b/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml index ba97af3925..1b191d90f7 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml @@ -1,6 +1,6 @@ - type: entity id: CrateSyndicateSurplusBundle - parent: [ CrateSyndicate, StorePresetUplink ] + parent: [ CrateSyndicate, StorePresetUplink, BaseSyndicateContraband ] name: Syndicate surplus crate description: Contains 50 telecrystals worth of completely random Syndicate items. It can be useless junk or really good. components: @@ -24,7 +24,7 @@ - type: entity id: CrateSyndicateSuperSurplusBundle - parent: [ CrateSyndicate, StorePresetUplink ] + parent: [ CrateSyndicate, StorePresetUplink, BaseSyndicateContraband ] name: Syndicate super surplus crate description: Contains 125 telecrystals worth of completely random Syndicate items. components: diff --git a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml index f47cb49ea6..6764cb8496 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml @@ -10,7 +10,7 @@ - type: entity id: BriefcaseSyndieSniperBundleFilled - parent: [BriefcaseSyndie, BaseSyndicateContraband] + parent: BriefcaseSyndie suffix: Syndicate, Sniper Bundle components: - type: Item diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index 66b601b8c7..0613ec9726 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -643,7 +643,7 @@ sprite: Clothing/Belt/salvagewebbing.rsi - type: entity - parent: [ClothingBeltStorageBase, ContentsExplosionResistanceBase] + parent: [ClothingBeltStorageBase, ContentsExplosionResistanceBase, BaseSyndicateContraband] id: ClothingBeltMilitaryWebbing name: chest rig description: A set of tactical webbing worn by Syndicate boarding parties. diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml index 1bd858b4f7..684ef791ec 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml @@ -79,7 +79,7 @@ - type: FingerprintMask - type: entity - parent: [ClothingHandsGlovesBoxingBlue, BaseSyndicateContraband] + parent: ClothingHandsGlovesBoxingBlue id: ClothingHandsGlovesBoxingRigged suffix: Rigged components: diff --git a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml index dd1bfd91bc..827d28265a 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml @@ -28,7 +28,7 @@ #Syndicate EVA Helmet - type: entity - parent: ClothingHeadEVAHelmetBase + parent: [ ClothingHeadEVAHelmetBase, BaseSyndicateContraband ] id: ClothingHeadHelmetSyndicate name: syndicate EVA helmet description: A simple, stylish EVA helmet. Designed for maximum humble space-badassery. diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index b2ae5b294e..47fb4ad451 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -358,7 +358,7 @@ sprite: Clothing/Head/Helmets/ert_janitor.rsi - type: entity - parent: ClothingHeadHelmetBasic + parent: [ ClothingHeadHelmetBasic, BaseSyndicateContraband ] id: ClothingHeadHelmetRaid name: syndicate raid helmet description: An armored helmet for use with the syndicate raid suit. Very stylish. diff --git a/Resources/Prototypes/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/Entities/Clothing/Head/misc.yml index cdd6ee894e..1fb47c0439 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml @@ -170,7 +170,7 @@ accent: MobsterAccent - type: entity - parent: ClothingHeadBase + parent: [ ClothingHeadBase, BaseSyndicateContraband ] id: ClothingHeadHatCatEars name: cat ears description: "NYAH!" diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index 101190faf3..80588ba493 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -100,7 +100,7 @@ - Energy - type: entity - parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing] + parent: [ClothingOuterBaseLarge, AllowSuitStorageClothing, BaseSyndicateContraband ] id: ClothingOuterArmorRaid name: syndicate raid suit description: A somewhat flexible and well-armored suit with a powerful shoulder mounted flashlight manufactured in the Gorlex Marauder's iconic blood-red color scheme, it does not protect its wearer from space. diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml index 8e90efafc1..27ee1d5a6a 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml @@ -17,7 +17,7 @@ #Syndicate EVA - type: entity - parent: ClothingOuterEVASuitBase + parent: [ ClothingOuterEVASuitBase, BaseSyndicateContraband ] id: ClothingOuterHardsuitSyndicate # TODO: rename to ClothingOuterEVASuitSyndicate name: syndicate EVA suit description: "Has a tag on the back that reads: 'Totally not property of an enemy corporation, honest!'" diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index d980db0ca1..76256bb81e 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -261,7 +261,7 @@ flavors: - banana - type: Food - trash: + trash: - TrashBananaPeel - type: SolutionContainerManager solutions: @@ -304,7 +304,7 @@ - banana - nothing - type: Food - trash: + trash: - TrashMimanaPeel - type: SolutionContainerManager solutions: @@ -1091,7 +1091,7 @@ flavors: - corn - type: Food - trash: + trash: - FoodCornTrash - type: SolutionContainerManager solutions: @@ -1714,12 +1714,12 @@ name: glasstle parent: FoodProduceBase id: FoodGlasstle - description: A fragile crystal plant with lot of spiky thorns. + description: A fragile crystal plant with lot of spiky thorns. components: - type: Item size: Small sprite: Objects/Specific/Hydroponics/glasstle.rsi - heldPrefix: produce + heldPrefix: produce - type: FlavorProfile flavors: - sharp @@ -1736,7 +1736,7 @@ seedId: glasstle - type: Extractable grindableSolutionName: food - - type: Damageable + - type: Damageable damageContainer: Inorganic - type: ToolRefinable refineResult: @@ -1759,7 +1759,7 @@ max: 1 - !type:DoActsBehavior acts: [ "Destruction" ] - - type: DamageOnHit + - type: DamageOnHit damage: types: Blunt: 10 @@ -1816,7 +1816,7 @@ - type: entity name: gatfruit - parent: FoodProduceBase + parent: [ FoodProduceBase, BaseSyndicateContraband ] id: FoodGatfruit description: A delicious, gun-shaped fruit with a thick wooden stem. components: @@ -1837,7 +1837,7 @@ - type: Produce seedId: gatfruit - type: Food - trash: + trash: - WeaponRevolverPython - type: Tag tags: @@ -2152,7 +2152,7 @@ flavors: - bungo - type: Food - trash: + trash: - FoodBungoPit - type: SolutionContainerManager solutions: diff --git a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml index 66b40d0b40..d7b059f3d8 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml @@ -215,7 +215,7 @@ - state: synd_label - type: entity - parent: [EncryptionKey, BaseSyndicateContraband] + parent: [ EncryptionKey, BaseScienceContraband ] id: EncryptionKeyBinary name: binary translator key description: An encryption key that translates binary signals used by silicons. diff --git a/Resources/Prototypes/Entities/Objects/Devices/radio.yml b/Resources/Prototypes/Entities/Objects/Devices/radio.yml index 77b6cac2d3..e750e4dbc1 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/radio.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/radio.yml @@ -28,7 +28,7 @@ - type: entity name: security radio description: A handy security radio. - parent: RadioHandheld + parent: [ RadioHandheld, BaseRestrictedContraband ] id: RadioHandheldSecurity components: - type: RadioMicrophone diff --git a/Resources/Prototypes/Entities/Objects/Fun/darts.yml b/Resources/Prototypes/Entities/Objects/Fun/darts.yml index dfcb0c68f1..a127930fea 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/darts.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/darts.yml @@ -191,7 +191,7 @@ acts: [ "Destruction" ] - type: entity - parent: BaseItem + parent: [ BaseItem, BaseSyndicateContraband ] id: HypoDartBox name: hypodart box suffix: HypoDart diff --git a/Resources/Prototypes/Entities/Objects/Fun/pai.yml b/Resources/Prototypes/Entities/Objects/Fun/pai.yml index 77f16fcd41..4695f1c125 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/pai.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/pai.yml @@ -75,7 +75,7 @@ - type: StationMap - type: entity - parent: PersonalAI + parent: [ PersonalAI, BaseSyndicateContraband] id: SyndicatePersonalAI name: syndicate personal ai device description: Your Syndicate pal who's fun to be with! diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 92baa1f86f..e7fa993474 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -215,7 +215,7 @@ shader: unshaded - type: entity - parent: BasePlushie + parent: [ BasePlushie, BaseSyndicateContraband ] id: PlushieNuke name: nukie plushie description: A stuffed toy that resembles a syndicate nuclear operative. The tag claims operatives to be purely fictitious. diff --git a/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml b/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml index 9a4ec3b592..762204701c 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/briefcases.yml @@ -25,7 +25,7 @@ sprite: Objects/Storage/Briefcases/briefcase_brown.rsi - type: entity - parent: [BriefcaseBrown, BaseSyndicateContraband] + parent: BriefcaseBrown id: BriefcaseSyndie suffix: Syndicate, Empty components: diff --git a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml index a93472658e..4f92bcc265 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml @@ -4,7 +4,7 @@ name: implanter description: A syringe exclusively designed for the injection and extraction of subdermal implants. id: BaseImplanter - parent: [BaseItem, BaseRestrictedContraband] + parent: BaseItem abstract: true components: - type: ItemSlots @@ -153,7 +153,7 @@ - type: entity id: TrackingImplanter name: tracking implanter - parent: BaseImplantOnlyImplanter + parent: [ BaseImplantOnlyImplanter, BaseRestrictedContraband] components: - type: Implanter implant: TrackingImplant @@ -247,7 +247,7 @@ - type: entity id: MindShieldImplanter name: mindshield implanter - parent: BaseImplantOnlyImplanter + parent: [ BaseImplantOnlyImplanter, BaseSecurityCommandContraband] components: - type: Implanter implant: MindShieldImplant diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml index 71598a7ff9..e0e7eb1171 100644 --- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml +++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml @@ -64,7 +64,7 @@ - type: entity name: riot shield - parent: BaseShield + parent: [ BaseShield, BaseRestrictedContraband ] id: RiotShield description: A large tower shield. Good for controlling crowds. components: @@ -85,7 +85,7 @@ - type: entity name: riot laser shield - parent: BaseShield + parent: [ BaseShield, BaseRestrictedContraband ] id: RiotLaserShield description: A riot shield built for withstanding lasers, but not much else. components: @@ -105,7 +105,7 @@ - type: entity name: riot bullet shield - parent: BaseShield + parent: [ BaseShield, BaseRestrictedContraband ] id: RiotBulletShield description: A ballistic riot shield built for withstanding bullets, but not much else. components: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml index eb18893791..c81af6e128 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml @@ -436,7 +436,7 @@ handle: false # don't want the sound to stop the self-inject from triggering - type: entity - parent: BaseItem + parent: [ BaseItem, BaseSyndicateContraband ] id: HypopenBox name: hypopen box description: A small box containing a hypopen. Packaging disintegrates when opened, leaving no evidence behind. diff --git a/Resources/Prototypes/Entities/Objects/Tools/lantern.yml b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml index 801755a777..89101e34ff 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/lantern.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml @@ -66,7 +66,7 @@ - Flashlight - type: entity - parent: [Lantern, BaseSyndicateContraband] + parent: Lantern id: LanternFlash suffix: Flash components: diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index 269e480c1d..83cfb331be 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -284,7 +284,7 @@ - type: entity id: RCD - parent: BaseItem + parent: [ BaseItem, BaseEngineeringContraband ] name: RCD description: The rapid construction device can be used to quickly place and remove various station structures and fixtures. Requires compressed matter to function. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 2f7aa653e7..e60c955f4e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -104,7 +104,7 @@ - type: entity name: svalinn laser pistol - parent: BaseWeaponPowerCellSmall + parent: [ BaseWeaponPowerCellSmall, BaseRestrictedContraband ] id: WeaponLaserSvalinn description: A cheap and widely used laser pistol. components: @@ -125,7 +125,7 @@ - type: entity name: retro laser blaster - parent: BaseWeaponBatterySmall + parent: [ BaseWeaponBatterySmall, BaseMajorContraband ] id: WeaponLaserGun description: A weapon using light amplified by the stimulated emission of radiation. components: @@ -200,7 +200,7 @@ - type: entity name: laser rifle - parent: [BaseWeaponBattery, BaseGunWieldable] + parent: [BaseWeaponBattery, BaseGunWieldable, BaseRestrictedContraband] id: WeaponLaserCarbine description: Favoured by Nanotrasen Security for being cheap and easy to use. components: @@ -325,7 +325,7 @@ - type: entity name: laser cannon - parent: [BaseWeaponBattery, BaseGunWieldable] + parent: [BaseWeaponBattery, BaseGunWieldable, BaseRestrictedContraband] id: WeaponLaserCannon description: A heavy duty, high powered laser weapon. components: @@ -588,7 +588,7 @@ - type: entity name: advanced laser pistol - parent: BaseWeaponBatterySmall + parent: [ BaseWeaponBatterySmall, BaseRestrictedContraband] id: WeaponAdvancedLaser description: An experimental high-energy laser pistol with a self-charging nuclear battery. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml index aa1e7ec84d..ebcba7d5e4 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml @@ -24,7 +24,7 @@ - type: entity name: minigun id: WeaponMinigun - parent: BaseWeaponHeavyMachineGun + parent: [ BaseWeaponHeavyMachineGun, BaseMajorContraband ] description: Vzzzzzt! Rahrahrahrah! Vrrrrr! Uses .10 rifle ammo. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index 696d507a63..3abb32a37f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -55,7 +55,7 @@ - type: entity name: RPG-7 - parent: BaseWeaponLauncher + parent: [ BaseWeaponLauncher, BaseMajorContraband ] id: WeaponLauncherRocket description: A modified ancient rocket-propelled grenade launcher. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index e778393710..167e21e15f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -103,7 +103,7 @@ - type: entity name: echis - parent: BaseItem + parent: [ BaseItem, BaseSyndicateContraband ] id: WeaponPistolEchis description: A viper for use by cyborgs. Creates .35 ammo on the fly from an internal ammo fabricator, which slowly self-charges. components: @@ -138,7 +138,7 @@ - type: entity name: cobra - parent: BaseWeaponPistol + parent: [ BaseWeaponPistol, BaseSyndicateContraband ] id: WeaponPistolCobra description: A rugged, robust operator handgun with inbuilt silencer. Uses .25 caseless ammo. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index 8a6e027b12..309c2c502d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -52,7 +52,7 @@ - type: entity name: Deckard - parent: [BaseWeaponRevolver, BaseRestrictedContraband] + parent: [BaseWeaponRevolver, BaseSecurityCommandContraband] id: WeaponRevolverDeckard description: A rare, custom-built revolver. Use when there is no time for Voight-Kampff test. Uses .45 magnum ammo. components: @@ -95,7 +95,7 @@ - type: entity name: Mateba - parent: [BaseWeaponRevolver, BaseMinorContraband] + parent: [BaseWeaponRevolver, BaseMajorContraband] id: WeaponRevolverMateba description: The iconic sidearm of the dreaded death squads. Uses .45 magnum ammo. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index cf1d77d94b..a22be1da04 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -58,7 +58,7 @@ - type: entity name: Atreides - parent: [BaseWeaponSubMachineGun, BaseMinorContraband] + parent: [BaseWeaponSubMachineGun, BaseMajorContraband] id: WeaponSubMachineGunAtreides description: Pla-ket-ket-ket-ket! Uses .35 auto ammo. components: @@ -119,7 +119,7 @@ - type: entity name: Drozd - parent: BaseWeaponSubMachineGun + parent: [BaseWeaponSubMachineGun, BaseRestrictedContraband] id: WeaponSubMachineGunDrozd description: An excellent fully automatic Heavy SMG. components: @@ -221,7 +221,7 @@ - type: entity name: WT550 - parent: BaseWeaponSubMachineGun + parent: [ BaseWeaponSubMachineGun, BaseRestrictedContraband ] id: WeaponSubMachineGunWt550 description: An excellent SMG, produced by NanoTrasen's Small Arms Division. Uses .35 auto ammo. components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml index faebcaa734..337c7f07f7 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml @@ -153,7 +153,7 @@ - type: Prying - type: entity - parent: BaseWeaponCrusher + parent: [ BaseWeaponCrusher, BaseSecurityCargoContraband] id: WeaponCrusherDagger name: crusher dagger description: A scaled down version of a proto-kinetic crusher. Uses kinetic energy to vibrate the blade at high speeds. @@ -174,7 +174,7 @@ # Like a crusher... but better - type: entity - parent: WeaponCrusher + parent: [ WeaponCrusher, BaseSecurityCargoContraband] id: WeaponCrusherGlaive name: crusher glaive description: An early design of the proto-kinetic accelerator, in glaive form. diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml index 97b9edf7a4..e5627ea88d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml @@ -60,7 +60,7 @@ - type: entity name: flashbang description: Eeeeeeeeeeeeeeeeeeeeee. - parent: GrenadeBase + parent: [ GrenadeBase, BaseRestrictedContraband ] id: GrenadeFlashBang components: - type: Sprite @@ -373,7 +373,7 @@ path: /Audio/Effects/hallelujah.ogg - type: entity - parent: GrenadeBase + parent: [ GrenadeBase, BaseMinorContraband ] id: SmokeGrenade name: smoke grenade description: A tactical grenade that releases a large, long-lasting cloud of smoke when used. diff --git a/Resources/Prototypes/Entities/Objects/base_contraband.yml b/Resources/Prototypes/Entities/Objects/base_contraband.yml index 051c04b6e2..84783ccf7d 100644 --- a/Resources/Prototypes/Entities/Objects/base_contraband.yml +++ b/Resources/Prototypes/Entities/Objects/base_contraband.yml @@ -18,6 +18,15 @@ # according to space law no dept is authorized to have allowedDepartments: null +# major contraband, for things like guns or weaponry that don't belong to any department and aren't syndicate specific +- type: entity + id: BaseMajorContraband + abstract: true + components: + - type: Contraband + severity: Major + allowedDepartments: null + # minor contraband by default restricted to security only - type: entity id: BaseRestrictedContraband diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml index 171b664c83..9b0558a411 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml @@ -140,7 +140,7 @@ map: ["enum.StorageVisualLayers.Door"] - state: paper sprite: Structures/Storage/Crates/labels.rsi - map: ["enum.PaperLabelVisuals.Layer"] + map: ["enum.PaperLabelVisuals.Layer"] - type: Construction graph: WebStructures node: crate @@ -171,7 +171,7 @@ # Secure Crates - type: entity - parent: CrateBaseSecure + parent: [ CrateBaseSecure, BaseRestrictedContraband ] id: CrateSecgear name: secgear crate components: @@ -287,7 +287,7 @@ access: [["Armory"]] - type: entity - parent: CrateBaseSecure + parent: [ CrateBaseSecure, BaseRestrictedContraband ] suffix: Armory, Secure id: CrateContrabandStorageSecure name: contraband storage crate @@ -326,7 +326,7 @@ - state: paper sprite: Structures/Storage/Crates/labels.rsi offset: "-0.25,0.625" - map: ["enum.PaperLabelVisuals.Layer"] + map: ["enum.PaperLabelVisuals.Layer"] - type: Icon sprite: Structures/Storage/Crates/livestock.rsi state: base @@ -381,7 +381,7 @@ - state: paper sprite: Structures/Storage/Crates/labels.rsi offset: "0.0,0.125" - map: ["enum.PaperLabelVisuals.Layer"] + map: ["enum.PaperLabelVisuals.Layer"] - type: Icon sprite: Structures/Storage/Crates/cage.rsi - type: Destructible @@ -483,7 +483,7 @@ - state: closed map: ["enum.StorageVisualLayers.Door"] - state: paper - map: ["enum.PaperLabelVisuals.Layer"] + map: ["enum.PaperLabelVisuals.Layer"] - type: Icon sprite: Structures/Storage/Crates/coffin.rsi state: base @@ -525,7 +525,7 @@ - state: paper sprite: Structures/Storage/Crates/labels.rsi offset: "-0.28125,0.625" - map: ["enum.PaperLabelVisuals.Layer"] + map: ["enum.PaperLabelVisuals.Layer"] - type: Icon sprite: Structures/Storage/Crates/wooden_grave.rsi state: base @@ -573,7 +573,7 @@ - state: paper sprite: Structures/Storage/Crates/labels.rsi offset: "-0.3125,0.5625" - map: ["enum.PaperLabelVisuals.Layer"] + map: ["enum.PaperLabelVisuals.Layer"] - type: Icon sprite: Structures/Storage/Crates/stone_grave.rsi state: base diff --git a/Resources/Prototypes/contraband_severities.yml b/Resources/Prototypes/contraband_severities.yml index aad9916b25..54f5cd62ef 100644 --- a/Resources/Prototypes/contraband_severities.yml +++ b/Resources/Prototypes/contraband_severities.yml @@ -4,6 +4,11 @@ id: Minor examineText: contraband-examine-text-Minor +# Dangerous fucking shit that doesn't belong to CyberSun or NanoTrasen, RPGs, retro laser blasters, unholy things +- type: contrabandSeverity + id: Major + examineText: contraband-examine-text-Major + # Having this without a good reason might get you yelled at by security. (spears, shivs, etc). # or, Having this as a regular crew member, not the department it was made for, is considered theft IC. (rcd, sec gear, etc) - type: contrabandSeverity From c02aeebdf126f2b15492bdd5a50798acf8de0581 Mon Sep 17 00:00:00 2001 From: Ubaser <134914314+UbaserB@users.noreply.github.com> Date: Mon, 12 Aug 2024 19:06:55 +1000 Subject: [PATCH 418/422] Add conducting gloves to the maintenance loot table (#30904) * add * lower weight --- .../Prototypes/Entities/Markers/Spawners/Random/maintenance.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index f7e22ef62d..521dde5a65 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -242,6 +242,8 @@ weight: 0.5 - id: ClothingHandsGlovesColorYellow weight: 1 + - id: ClothingHandsGlovesConducting + weight: 0.1 # Uncommon Group - !type:GroupSelector weight: 23 From 691e37c0dbdaa53fa29794fb86a17dd2c1b6f21d Mon Sep 17 00:00:00 2001 From: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com> Date: Mon, 12 Aug 2024 04:58:20 -0500 Subject: [PATCH 419/422] Update space law for contraband upate (#30937) * update space law * missed a thing --- Resources/Prototypes/Guidebook/rules.yml | 21 ------------- .../SpaceLaw/SLControlledSubstances.xml | 14 --------- .../ServerRules/SpaceLaw/SLCrimeList.xml | 31 ++++++++----------- .../ServerRules/SpaceLaw/SLRestrictedGear.xml | 21 ------------- .../SpaceLaw/SLRestrictedWeapons.xml | 14 --------- .../ServerRules/SpaceLaw/SpaceLaw.xml | 9 +----- 6 files changed, 14 insertions(+), 96 deletions(-) delete mode 100644 Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLControlledSubstances.xml delete mode 100644 Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLRestrictedGear.xml delete mode 100644 Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLRestrictedWeapons.xml diff --git a/Resources/Prototypes/Guidebook/rules.yml b/Resources/Prototypes/Guidebook/rules.yml index a867ca2336..5f548fa094 100644 --- a/Resources/Prototypes/Guidebook/rules.yml +++ b/Resources/Prototypes/Guidebook/rules.yml @@ -392,9 +392,6 @@ text: "/ServerInfo/Guidebook/ServerRules/SpaceLaw/SpaceLaw.xml" children: - SpaceLawCrimeList - - SpaceLawControlledSubstances - - SpaceLawRestrictedGear - - SpaceLawRestrictedWeapons - type: guideEntry id: SpaceLawCrimeList @@ -402,24 +399,6 @@ priority: 5 text: "/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLCrimeList.xml" -- type: guideEntry - id: SpaceLawControlledSubstances - name: guide-entry-rules-sl-controlled-substances - priority: 20 - text: "/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLControlledSubstances.xml" - -- type: guideEntry - id: SpaceLawRestrictedGear - name: guide-entry-rules-sl-restricted-gear - priority: 30 - text: "/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLRestrictedGear.xml" - -- type: guideEntry - id: SpaceLawRestrictedWeapons - name: guide-entry-rules-sl-restricted-weapons - priority: 40 - text: "/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLRestrictedWeapons.xml" - - type: guideEntry id: BanTypes name: guide-entry-rules-ban-types diff --git a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLControlledSubstances.xml b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLControlledSubstances.xml deleted file mode 100644 index 40b9ee946f..0000000000 --- a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLControlledSubstances.xml +++ /dev/null @@ -1,14 +0,0 @@ - - # Space Law: Controlled Substances - - \[Chemists/Science\] Explosive and pyrotechnic compounds excluding welding fuel contained in welders or welding fuel storage vessels - - \[Science\] Toxins - - \[Medical\] Chloral hydrate, Impedrezene, Ipecac, and Pax - - \[Medical\] Desoxyephedrine and Ephedrine - - \[None\] Mindbreaker toxin - - \[None\] Mute toxin - - \[None\] Nocturine - - \[None\] Norepinephirc acid - - \[None\] Romerol - - \[None\] Space Mirage - - \[None\] Stimulants, excluding Desoxyephedrine and Ephedrine - diff --git a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLCrimeList.xml b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLCrimeList.xml index 4ece9150e0..b6ae2c3a28 100644 --- a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLCrimeList.xml +++ b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLCrimeList.xml @@ -1,7 +1,6 @@ # Space Law: Crime Listing - Crime codes are organized by a Category Code (_-xx) which is a collection of non-stackable crimes on a row, prefixed - by the Severity Number (X-__). + Crime codes are colored by linked crime groups, which are collections of non-stackable crimes. Suffixes are also included in the Quick Crime Guide to identify linked crimes. ## Quick Crime Guide @@ -67,17 +66,17 @@ - Possession: Substances (P) + Possession: Minor (P) - Possession: Gear (P) + Possession: Major (P) - Possession: Weaponry (P) + Possession: Syndicate (P) @@ -310,19 +309,17 @@ - Possession/Use of Controlled Substances + Possession/Use of Minor Contraband - To make, hold, or abuse restricted drugs or chemicals without authorization. + To make, hold, or use minor contraband without authorization. - Combat enhancing drugs are those that benefit stun times, or movement speed, and are restricted. Poisons are - restricted. Substances such as Ephedrine, Desoxyephedrine, and Hyperzine are restricted. The captain or highest - standing command staff may publicly restrict other harmful substances. + The Captain or Head of Security may authorize individual use of minor contraband. Any contraband which is restricted to a department other than command or security is minor contraband unless otherwise specified. @@ -464,19 +461,17 @@ - Possession of Restricted Gear + Possession/Use of Major Contraband - To hold or use non-lethal items or objects that are restricted or illegal. + To make, hold, or use major contraband without authorization. - This is mostly for syndicate contraband; EMAGs, syndicate gas masks, bloodred hardsuits, hijacked PDAs, or - syndicate implants, however can sometimes extend to things the individual shouldn't possess like kevlar vests - and security gear. + The Captain may authorize individual use of major contraband. Any contraband which is restricted to the command or security department is major contraband unless otherwise specified. @@ -575,17 +570,17 @@ - Possession of Restricted Weaponry + Possession/Use of Syndicate Contraband - To hold or use a weapon that is unlawful or contraband. + To make, hold, or use Syndicate contraband. - Everything from guns without a permit, deadly blades, explosives, syndicate firearms to explosive implants. + Syndicate contraband may only be used in emergencies, and only to prevent death or gross bodily harm. diff --git a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLRestrictedGear.xml b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLRestrictedGear.xml deleted file mode 100644 index bb63d45487..0000000000 --- a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLRestrictedGear.xml +++ /dev/null @@ -1,21 +0,0 @@ - - # Space Law: Restricted Gear - - \[ERT/Central Command\] ERT and central command clothing - - \[Command\] Command clothing - - \[Security\] Security clothing - - \[Security\] Less than lethal and non-lethal weapons, excluding disablers and beanbag shotguns - - \[Security/Command\] Disablers - - \[Security/Bartender/Zookeeper\] Nonlethal shotguns - - \[Security\] Flash technology, excluding handheld flashes - - \[Security/Science/Command\] Handheld flashes - - \[Security\] Helmets and shields - - \[Security/Command/Bartender\] Protective vests and chest rigs - - \[Security/Command\] Restraining gear - - \[Security/Command\] Security HUDs - - \[Engineering\] Engineering goggles - - \[None\] Improvised less lethal and non-lethal weaponry - - \[None\] Unauthorized PDA software - - \[None\] Syndicate clothing - - \[None\] Syndicate equipment, excluding communication equipment - - \[Security\] Syndicate communication equipment - diff --git a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLRestrictedWeapons.xml b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLRestrictedWeapons.xml deleted file mode 100644 index 0872683d1c..0000000000 --- a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SLRestrictedWeapons.xml +++ /dev/null @@ -1,14 +0,0 @@ - -# Space Law: Restricted Weapons -- \[Security\] Lethal firearms, excluding: syndicate firearms, proto kinetic accelerators, glaives, daggers, crushers, the captain's saber, antique laser guns, and deckards -- \[Security/Salvage\] Proto kinetic accelerators, glaives, daggers, and crushers -- \[Security/Command\] The captain's saber, antique laser guns, and deckards -- \[Salvage\] seismic charges -- \[Atmospherics\] Fire axes -- \[None\] Syndicate weapons -- \[None\] Explosive devices, excluding seismic charges -- \[None\] Swords -- \[None\] Improvised weaponry, including baseball bats -- \[None\] Lethal implants -- \[None\] Other lethal weapons - diff --git a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SpaceLaw.xml b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SpaceLaw.xml index b672e35204..a10e61c65a 100644 --- a/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SpaceLaw.xml +++ b/Resources/ServerInfo/Guidebook/ServerRules/SpaceLaw/SpaceLaw.xml @@ -39,7 +39,7 @@ [color=#a4885c]Stackable Crimes:[/color] Crimes are to be considered 'stackable' in the sense that if you charge someone with two or more different crimes, you should combine the times you would give them for each crime. Linked crimes, shown in matching colors and suffixes on the Quick Crime Guide, can not be stacked and instead override each other, you should pick the highest crime that matches the case. - - Example: A suspect has committed a 2-01 (possession of restricted gear) and a 3-01 (possession of restricted weapons). The maximum sentence here would be 10 minutes due to them being linked crimes, and 3-01 is the greater crime. + - Example: A suspect has committed a 2-01 (possession: major) and a 3-01 (possession: syndicate). The maximum sentence here would be 10 minutes due to them being linked crimes, and 3-01 is the greater crime. - Example 2: A suspect commits a 3-04 (Secure trespassing) and a 3-06 (manslaughter). Those crimes stack since they are not linked crimes. You could sentence for a maximum of 20 minutes, but context matters heavily, and maximum sentences should only be used for the worst offenders. [color=#a4885c]Repeater Offenders:[/color] Repeated crimes are when someone is released for a crime and then goes to commit the same crime within the same shift. Repeated crimes can be charged with tacked-on time; first repeat: 3:00, second repeat: 6:00, third repeat: permanent confinement. It should be noted each tacked-on time is directly linked to one type of crime, so for example, if someone does their first repeat of trespass and petty theft, you can charge them with an extra 6 minutes. @@ -55,13 +55,6 @@ [color=#a4885c]Permanent Confinement:[/color] Being held in the permanent brig for the entire duration of the shift. A person is eligible for permanent confinement if their timed sentence would exceed 15 minutes. Any persons subject to this punishment are required to be transported in cuffs to CentComm at the end of the shift. A permanent prisoner can not be deprived of anything covered by the section "Treatment Of Prisoners". [color=#a4885c]Execution:[/color] A humane way of dealing with extremely unruly crewmates. Within reason, a prisoner who has been given the death sentence may pick how they wish to be killed, common methods are firing line, lethal injection, exile, and high voltage electrocution. Another alternate method of "execution" is the process of placing a staff's mind into a borg, this is allowed so long as it is lawful. Execution can only be issued with the captain's or acting captain's approval; if the HoS is acting captain or there is no acting captain, all heads of staff are to hold a vote on the matter. - ## Restricted Items - Items in the lists are preceded by an indication of which department or job is legally allowed to use or possess the item on most stations. The station captain may modify these lists as they see fit so long as they exercise due care and provide reasonable notification to the station. Members of command who oversee a department that is permitted to use a restricted item may issue permits to specific people outside of their department to use those items. "None" indicates that there are no departments or roles authorized to use or possess the item. - - - [textlink="List of Controlled Substances" link="SpaceLawControlledSubstances"] - - [textlink="List of Restricted Gear" link="SpaceLawRestrictedGear"] - - [textlink="List of Restricted Weapons" link="SpaceLawRestrictedWeapons"] - ## Crime Listing - [textlink="Crime Listing" link="SpaceLawCrimeList"] From 47dc84e48ebf53f0ea72378be466d5263db9de16 Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Mon, 12 Aug 2024 13:56:27 +0300 Subject: [PATCH 420/422] Update debug.toml --- Resources/ConfigPresets/Build/debug.toml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Resources/ConfigPresets/Build/debug.toml b/Resources/ConfigPresets/Build/debug.toml index 3994c59c78..ed8d37e545 100644 --- a/Resources/ConfigPresets/Build/debug.toml +++ b/Resources/ConfigPresets/Build/debug.toml @@ -1,4 +1,7 @@ -[events] +[cp14] +arrivals_ship = false + +[events] # Annoying enabled = false From ff8d294af53e8d082371fc1e4ac6c30fefee60ab Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Mon, 12 Aug 2024 14:21:53 +0300 Subject: [PATCH 421/422] Update PostMapInitTest.cs --- Content.IntegrationTests/Tests/PostMapInitTest.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs index b7449ff56d..68f2d891d1 100644 --- a/Content.IntegrationTests/Tests/PostMapInitTest.cs +++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs @@ -235,6 +235,7 @@ namespace Content.IntegrationTests.Tests // Test all availableJobs have spawnPoints // This is done inside gamemap test because loading the map takes ages and we already have it. + /* var comp = entManager.GetComponent(station); var jobs = new HashSet>(comp.SetupAvailableJobs.Keys); @@ -244,6 +245,7 @@ namespace Content.IntegrationTests.Tests jobs.ExceptWith(spawnPoints); Assert.That(jobs, Is.Empty, $"There is no spawnpoints for {string.Join(", ", jobs)} on {mapProto}."); + */ //CP14 disable job spawners test } try From 5af5aaa651fa6384d787d371c1b4248bdd3409fb Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Mon, 12 Aug 2024 14:52:40 +0300 Subject: [PATCH 422/422] fix --- .../{StatusEffects => StatusIcon}/job.yml | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) rename Resources/Prototypes/_CP14/{StatusEffects => StatusIcon}/job.yml (73%) diff --git a/Resources/Prototypes/_CP14/StatusEffects/job.yml b/Resources/Prototypes/_CP14/StatusIcon/job.yml similarity index 73% rename from Resources/Prototypes/_CP14/StatusEffects/job.yml rename to Resources/Prototypes/_CP14/StatusIcon/job.yml index e0517aeafe..a57f8ee259 100644 --- a/Resources/Prototypes/_CP14/StatusEffects/job.yml +++ b/Resources/Prototypes/_CP14/StatusIcon/job.yml @@ -1,48 +1,54 @@ -- type: statusIcon +- type: jobIcon id: CP14JobIcon abstract: true priority: 1 locationPreference: Right isShaded: true -- type: statusIcon +- type: jobIcon parent: CP14JobIcon id: CP14JobIconAdventurer icon: sprite: /Textures/_CP14/Interface/Misc/job_icons.rsi state: Adventurer + jobName: cp14-job-name-adventurer -- type: statusIcon +- type: jobIcon parent: CP14JobIcon id: CP14JobIconAlchemist icon: sprite: /Textures/_CP14/Interface/Misc/job_icons.rsi state: Alchemist + jobName: cp14-job-name-alchemist -- type: statusIcon +- type: jobIcon parent: CP14JobIcon id: CP14JobIconInnkeeper icon: sprite: /Textures/_CP14/Interface/Misc/job_icons.rsi state: Innkeeper + jobName: cp14-job-name-innkeeper -- type: statusIcon +- type: jobIcon parent: CP14JobIcon id: CP14JobIconCaptain icon: sprite: /Textures/_CP14/Interface/Misc/job_icons.rsi state: Captain + jobName: cp14-job-name-captain -- type: statusIcon +- type: jobIcon parent: CP14JobIcon id: CP14JobIconGuardCommander icon: sprite: /Textures/_CP14/Interface/Misc/job_icons.rsi state: GuardCommander + jobName: cp14-job-name-guard-commander -- type: statusIcon +- type: jobIcon parent: CP14JobIcon id: CP14JobIconHouseKeeper icon: sprite: /Textures/_CP14/Interface/Misc/job_icons.rsi state: HouseKeeper + jobName: cp14-job-name-house-keeper