From 25efbc7f52e907eb4ac14866225dc8a31f2de3fd Mon Sep 17 00:00:00 2001 From: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com> Date: Mon, 10 Jun 2024 20:42:28 -0500 Subject: [PATCH] Map Edits: Clerk Kant Edition (#1347) * Map Edits: Clerk Kant Edition * Hammu DetDrobe --------- Co-authored-by: Velcroboy --- Resources/Maps/arena.yml | 72 ++++++++---- Resources/Maps/hammurabi.yml | 208 +++++++++++++++++++++++++---------- Resources/Maps/tortuga.yml | 10 +- 3 files changed, 203 insertions(+), 87 deletions(-) diff --git a/Resources/Maps/arena.yml b/Resources/Maps/arena.yml index 3de0d188207..58ee8c8b2b5 100644 --- a/Resources/Maps/arena.yml +++ b/Resources/Maps/arena.yml @@ -19515,11 +19515,10 @@ entities: parent: 6747 - proto: BookHowToSurvive entities: - - uid: 27968 + - uid: 27969 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -5.426454,-62.401287 + pos: -9.688801,-61.33911 parent: 6747 - proto: BookLeafLoversSecret entities: @@ -19611,11 +19610,10 @@ entities: parent: 6747 - proto: BookSecurity entities: - - uid: 27967 + - uid: 27970 components: - type: Transform - rot: -1.5707963267948966 rad - pos: -5.551454,-62.505527 + pos: -9.574218,-61.485046 parent: 6747 - proto: Bookshelf entities: @@ -55585,12 +55583,6 @@ entities: rot: -1.5707963267948966 rad pos: -45.5,-35.5 parent: 6747 - - uid: 12530 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -6.270204,-62.56807 - parent: 6747 - uid: 15038 components: - type: Transform @@ -55647,6 +55639,12 @@ entities: rot: 1.5707963267948966 rad pos: 26.90749,-95.5 parent: 6747 + - uid: 21169 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -6.313801,-62.47532 + parent: 6747 - uid: 23558 components: - type: Transform @@ -58271,6 +58269,12 @@ entities: - type: Transform pos: -20.5,7.5 parent: 6747 + - uid: 27967 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,-62.5 + parent: 6747 - proto: ComputerFrame entities: - uid: 6273 @@ -60044,11 +60048,14 @@ entities: parent: 6747 - proto: CrewMonitoringServer entities: - - uid: 21169 + - uid: 27966 components: - type: Transform pos: -21.5,-62.5 parent: 6747 + - type: SingletonDeviceNetServer + active: False + available: False - proto: CriminalRecordsComputerCircuitboard entities: - uid: 17737 @@ -73314,6 +73321,11 @@ entities: - type: Transform pos: -18.5,-48.5 parent: 6747 + - uid: 27971 + components: + - type: Transform + pos: -9.5,-61.5 + parent: 6747 - proto: FaxMachineBase entities: - uid: 1404 @@ -148473,6 +148485,11 @@ entities: rot: -1.5707963267948966 rad pos: -15.140228,-65.43973 parent: 6747 + - uid: 27972 + components: + - type: Transform + pos: -0.5251713,-59.187206 + parent: 6747 - proto: SeashellInstrument entities: - uid: 11194 @@ -153686,6 +153703,11 @@ entities: - type: Transform pos: -45.5,-35.5 parent: 6747 + - uid: 12530 + components: + - type: Transform + pos: -6.5,-62.5 + parent: 6747 - uid: 22500 components: - type: Transform @@ -153716,11 +153738,6 @@ entities: - type: Transform pos: -31.5,17.5 parent: 6747 - - uid: 27966 - components: - - type: Transform - pos: -6.5,-62.5 - parent: 6747 - proto: SpawnPointMedicalDoctor entities: - uid: 367 @@ -158576,11 +158593,6 @@ entities: - type: Transform pos: 4.5,-61.5 parent: 6747 - - uid: 4752 - components: - - type: Transform - pos: -5.5,-62.5 - parent: 6747 - uid: 4762 components: - type: Transform @@ -176853,6 +176865,20 @@ entities: - type: Transform pos: -18.5,-43.5 parent: 6747 +- proto: WindoorSecureClerkLocked + entities: + - uid: 4752 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,-61.5 + parent: 6747 + - uid: 27968 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -5.5,-62.5 + parent: 6747 - proto: WindoorSecureCommandLocked entities: - uid: 3355 diff --git a/Resources/Maps/hammurabi.yml b/Resources/Maps/hammurabi.yml index 5544314f346..e31eeba8fab 100644 --- a/Resources/Maps/hammurabi.yml +++ b/Resources/Maps/hammurabi.yml @@ -290,7 +290,7 @@ entities: version: 6 -5,1: ind: -5,1 - tiles: ewAAAAABfwAAAAAAaQAAAAAAaQAAAAAAUAAAAAAAawAAAAABawAAAAACawAAAAABfwAAAAAAIAAAAAACIAAAAAABIAAAAAADIAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAewAAAAADfwAAAAAAaQAAAAAAaQAAAAAAaQAAAAADawAAAAACawAAAAABawAAAAACfwAAAAAAIAAAAAADIAAAAAACIAAAAAACIAAAAAACfwAAAAAAfwAAAAAAfwAAAAAAewAAAAAAfwAAAAAAaQAAAAAAaQAAAAABUAAAAAAAawAAAAACawAAAAADawAAAAADfwAAAAAAIAAAAAACIAAAAAADfwAAAAAAIAAAAAACfwAAAAAAIAAAAAACfwAAAAAAewAAAAACfwAAAAAAaQAAAAACaQAAAAABUAAAAAAAawAAAAABawAAAAADawAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAADIAAAAAADIAAAAAABIAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAawAAAAAAawAAAAABawAAAAACawAAAAACfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAABIAAAAAACIAAAAAADIAAAAAADfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAawAAAAAAawAAAAAAawAAAAABawAAAAACfwAAAAAAIAAAAAABIAAAAAABIAAAAAABIAAAAAADIAAAAAABIAAAAAADfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAawAAAAAAawAAAAADawAAAAABawAAAAACUAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAADIAAAAAACIAAAAAADfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAawAAAAAAawAAAAADawAAAAABawAAAAACfwAAAAAAIAAAAAABIAAAAAABIAAAAAAAIAAAAAAAIAAAAAADIAAAAAADUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAawAAAAABawAAAAAAawAAAAACfwAAAAAAfwAAAAAAIAAAAAABfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAaQAAAAACaQAAAAABaQAAAAACUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAQwAAAAAAIgAAAAADQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAUAAAAAAAaQAAAAAAaQAAAAADaQAAAAABUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAIgAAAAADIgAAAAACIgAAAAACIgAAAAABIgAAAAADIgAAAAACQwAAAAAAUAAAAAAAaQAAAAABaQAAAAAAaQAAAAABUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAIgAAAAADIgAAAAADIgAAAAACIgAAAAABIgAAAAADIgAAAAADQwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAIgAAAAACQwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAawAAAAADawAAAAACawAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIQAAAAABfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAawAAAAADawAAAAAAawAAAAADUAAAAAAAIQAAAAADIQAAAAAAIQAAAAAAIQAAAAACIQAAAAACIQAAAAAAIQAAAAADfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAawAAAAAAawAAAAACawAAAAAAIQAAAAABIQAAAAABIQAAAAAAIQAAAAADIQAAAAABIQAAAAABIQAAAAACIQAAAAAA + tiles: ewAAAAABfwAAAAAAaQAAAAAAaQAAAAAAUAAAAAAAawAAAAABawAAAAACawAAAAABfwAAAAAAIAAAAAACIAAAAAABIAAAAAADIAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAewAAAAADfwAAAAAAaQAAAAAAaQAAAAAAaQAAAAADawAAAAACawAAAAABawAAAAACfwAAAAAAIAAAAAADIAAAAAACIAAAAAACIAAAAAACfwAAAAAAfwAAAAAAfwAAAAAAJQAAAAAAfwAAAAAAaQAAAAAAaQAAAAABUAAAAAAAawAAAAACawAAAAADawAAAAADfwAAAAAAIAAAAAACIAAAAAADfwAAAAAAIAAAAAACfwAAAAAAIAAAAAACfwAAAAAAJQAAAAAAfwAAAAAAaQAAAAACaQAAAAABUAAAAAAAawAAAAABawAAAAADawAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIAAAAAADIAAAAAADIAAAAAABIAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAawAAAAAAawAAAAABawAAAAACawAAAAACfwAAAAAAIAAAAAAAIAAAAAAAIAAAAAABIAAAAAACIAAAAAADIAAAAAADfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAawAAAAAAawAAAAAAawAAAAABawAAAAACfwAAAAAAIAAAAAABIAAAAAABIAAAAAABIAAAAAADIAAAAAABIAAAAAADfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAawAAAAAAawAAAAADawAAAAABawAAAAACUAAAAAAAIAAAAAAAIAAAAAAAIAAAAAAAIAAAAAADIAAAAAACIAAAAAADfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAawAAAAAAawAAAAADawAAAAABawAAAAACfwAAAAAAIAAAAAABIAAAAAABIAAAAAAAIAAAAAAAIAAAAAADIAAAAAADUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAawAAAAABawAAAAAAawAAAAACfwAAAAAAfwAAAAAAIAAAAAABfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAaQAAAAACaQAAAAABaQAAAAACUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAQwAAAAAAIgAAAAADQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAUAAAAAAAaQAAAAAAaQAAAAADaQAAAAABUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAIgAAAAADIgAAAAACIgAAAAACIgAAAAABIgAAAAADIgAAAAACQwAAAAAAUAAAAAAAaQAAAAABaQAAAAAAaQAAAAABUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAIgAAAAADIgAAAAADIgAAAAACIgAAAAABIgAAAAADIgAAAAADQwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAIgAAAAACQwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAawAAAAADawAAAAACawAAAAABfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAIQAAAAABfwAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAawAAAAADawAAAAAAawAAAAADUAAAAAAAIQAAAAADIQAAAAAAIQAAAAAAIQAAAAACIQAAAAACIQAAAAAAIQAAAAADfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAawAAAAAAawAAAAACawAAAAAAIQAAAAABIQAAAAABIQAAAAAAIQAAAAADIQAAAAABIQAAAAABIQAAAAACIQAAAAAA version: 6 -5,0: ind: -5,0 @@ -346,7 +346,7 @@ entities: version: 6 -6,1: ind: -6,1 - tiles: AgAAAAACAgAAAAAAAgAAAAACAgAAAAACUAAAAAAAewAAAAACewAAAAACewAAAAADewAAAAABewAAAAADewAAAAADewAAAAAAewAAAAADewAAAAABewAAAAACewAAAAADfwAAAAAAfwAAAAAAfwAAAAAAAgAAAAADfwAAAAAAewAAAAADewAAAAAAewAAAAABewAAAAADewAAAAACewAAAAAAewAAAAAAewAAAAADewAAAAAAewAAAAACewAAAAABIQAAAAABIQAAAAAAIQAAAAACIQAAAAAAIQAAAAACewAAAAAAewAAAAACewAAAAAAewAAAAAAewAAAAABewAAAAACewAAAAACewAAAAACewAAAAAAewAAAAACewAAAAADIQAAAAADIQAAAAACIQAAAAACIQAAAAACfwAAAAAAewAAAAAAewAAAAABewAAAAABewAAAAADewAAAAAAewAAAAAAewAAAAAAewAAAAADewAAAAADewAAAAABewAAAAADfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAbQAAAAAAbQAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAbQAAAAAAbQAAAAAAQwAAAAAAfwAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAaQAAAAABaQAAAAABaQAAAAABUAAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAaQAAAAADaQAAAAAAaQAAAAAAaQAAAAACUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAaQAAAAABaQAAAAABaQAAAAADUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAATwAAAAABXgAAAAACTwAAAAABXgAAAAACTwAAAAABXgAAAAABTwAAAAADXgAAAAACXgAAAAAAXgAAAAADXgAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAXgAAAAACTwAAAAAAXgAAAAABTwAAAAABXgAAAAADTwAAAAABXgAAAAAATwAAAAABXgAAAAADXgAAAAABXgAAAAABfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATwAAAAABXgAAAAAATwAAAAABXgAAAAACTwAAAAAAXgAAAAADTwAAAAACXgAAAAACfwAAAAAAXgAAAAAAXgAAAAABfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAA + tiles: AgAAAAACAgAAAAAAAgAAAAACAgAAAAACUAAAAAAAewAAAAACewAAAAACewAAAAADewAAAAABewAAAAADewAAAAADewAAAAAAewAAAAADewAAAAABewAAAAACewAAAAADfwAAAAAAfwAAAAAAfwAAAAAAAgAAAAADfwAAAAAAewAAAAADewAAAAAAewAAAAABewAAAAADewAAAAACewAAAAAAewAAAAAAewAAAAADewAAAAAAewAAAAACewAAAAABIQAAAAABIQAAAAAAIQAAAAACIQAAAAAAIQAAAAACewAAAAAAewAAAAACewAAAAAAewAAAAAAewAAAAABewAAAAACewAAAAACewAAAAACewAAAAAAewAAAAACJQAAAAAAIQAAAAADIQAAAAACIQAAAAACIQAAAAACfwAAAAAAewAAAAAAewAAAAABewAAAAABewAAAAADewAAAAAAewAAAAAAewAAAAAAewAAAAADewAAAAADewAAAAABJQAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAbQAAAAAAbQAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAQwAAAAAAbQAAAAAAbQAAAAAAQwAAAAAAfwAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAaQAAAAABaQAAAAABaQAAAAABUAAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAQwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAaQAAAAADaQAAAAAAaQAAAAAAaQAAAAACUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAaQAAAAABaQAAAAABaQAAAAADUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAUAAAAAAAfwAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAATwAAAAABXgAAAAACTwAAAAABXgAAAAACTwAAAAABXgAAAAABTwAAAAADXgAAAAACXgAAAAAAXgAAAAADXgAAAAAAfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfwAAAAAAXgAAAAACTwAAAAAAXgAAAAABTwAAAAABXgAAAAADTwAAAAABXgAAAAAATwAAAAABXgAAAAADXgAAAAABXgAAAAABfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATwAAAAABXgAAAAAATwAAAAABXgAAAAACTwAAAAAAXgAAAAADTwAAAAACXgAAAAACfwAAAAAAXgAAAAAAXgAAAAABfwAAAAAAfwAAAAAAUAAAAAAAUAAAAAAAfwAAAAAA version: 6 -7,-1: ind: -7,-1 @@ -14213,7 +14213,8 @@ entities: -14,-12: 0: 61412 -14,-11: - 0: 57308 + 0: 53212 + 4: 4096 -14,-10: 0: 57308 -14,-13: @@ -15459,7 +15460,7 @@ entities: -27,-13: 0: 57344 3: 48 - 4: 136 + 5: 136 -26,-12: 0: 4095 -26,-11: @@ -15468,8 +15469,8 @@ entities: 0: 61168 -26,-13: 0: 61440 - 4: 17 - 5: 204 + 5: 17 + 6: 204 -25,-13: 0: 62702 -40,-1: @@ -16031,7 +16032,7 @@ entities: -28,-17: 0: 65391 -28,-15: - 6: 7 + 7: 7 3: 1792 -28,-14: 3: 7 @@ -16945,6 +16946,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: @@ -20377,6 +20393,13 @@ entities: - type: Transform pos: -86.5,-20.5 parent: 1 +- proto: AirlockClerkGlassLocked + entities: + - uid: 1701 + components: + - type: Transform + pos: -90.5,-7.5 + parent: 1 - proto: AirlockClownLocked entities: - uid: 5846 @@ -22494,13 +22517,6 @@ entities: - type: Transform pos: -20.5,32.5 parent: 1 -- proto: AirlockJusticeGlassLocked - entities: - - uid: 1701 - components: - - type: Transform - pos: -90.5,-7.5 - parent: 1 - proto: AirlockKitchenGlassLocked entities: - uid: 620 @@ -30455,18 +30471,18 @@ entities: parent: 1 - proto: BookSecurity entities: - - uid: 43046 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -96.58763,-4.498027 - parent: 1 - uid: 43049 components: - type: Transform rot: 3.141592653589793 rad pos: -87.50218,-11.319665 parent: 1 + - uid: 43062 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -96.54678,-4.3647137 + parent: 1 - proto: BookshelfFilled entities: - uid: 2602 @@ -30911,8 +30927,10 @@ entities: - uid: 29508 components: - type: Transform - pos: -56.320763,-40.27422 - parent: 1 + parent: 29452 + - type: Physics + canCollide: False + - type: InsideEntityStorage - proto: BoxInflatable entities: - uid: 8150 @@ -31050,11 +31068,13 @@ entities: - type: Transform pos: -16.49164,-15.313523 parent: 1 - - uid: 29509 + - uid: 29462 components: - type: Transform - pos: -56.633263,-40.305492 - parent: 1 + parent: 29452 + - type: Physics + canCollide: False + - type: InsideEntityStorage - proto: BoxMRE entities: - uid: 30363 @@ -83987,6 +84007,12 @@ entities: - type: Transform pos: 36.49209,-29.611696 parent: 1 + - uid: 43058 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -90.341606,19.747074 + parent: 1 - proto: ChairOfficeLight entities: - uid: 2644 @@ -87434,16 +87460,6 @@ entities: rot: 1.5707963267948966 rad pos: -49.5,-56.5 parent: 1 - - uid: 5060 - components: - - type: Transform - pos: -91.5,-4.5 - parent: 1 - - uid: 5085 - components: - - type: Transform - pos: -90.5,-4.5 - parent: 1 - uid: 6939 components: - type: Transform @@ -87641,6 +87657,18 @@ entities: rot: 3.141592653589793 rad pos: 19.5,-56.5 parent: 1 + - uid: 43060 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -89.5,-6.5 + parent: 1 + - uid: 43061 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -88.5,-6.5 + parent: 1 - proto: ComputerAlert entities: - uid: 5532 @@ -87850,6 +87878,12 @@ entities: - type: Transform pos: -8.5,-9.5 parent: 1 + - uid: 43046 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -89.5,19.5 + parent: 1 - proto: ComputerFrame entities: - uid: 30358 @@ -87910,6 +87944,11 @@ entities: - type: Transform pos: -54.5,-17.5 parent: 1 + - uid: 30464 + components: + - type: Transform + pos: -92.5,19.5 + parent: 1 - proto: ComputerMassMedia entities: - uid: 14502 @@ -111111,6 +111150,13 @@ entities: parent: 1 - proto: FaxMachineBase entities: + - uid: 5085 + components: + - type: Transform + pos: -96.5,-3.5 + parent: 1 + - type: FaxMachine + name: 'Defense Attorney ' - uid: 7254 components: - type: Transform @@ -193636,6 +193682,36 @@ entities: - type: Transform pos: -55.48569,-40.326447 parent: 1 + - type: EntityStorage + air: + volume: 200 + immutable: False + temperature: 293.14673 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - type: ContainerContainer + containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 29462 + - 29508 + paper_label: !type:ContainerSlot + showEnts: False + occludes: True + ent: null - proto: LockerElectricalSuppliesFilled entities: - uid: 30896 @@ -194870,11 +194946,6 @@ entities: - type: Transform pos: -13.5,22.5 parent: 1 - - uid: 11843 - components: - - type: Transform - pos: -91.5,-4.5 - parent: 1 - uid: 13720 components: - type: Transform @@ -208120,7 +208191,7 @@ entities: - uid: 5059 components: - type: Transform - pos: -91.5,-6.5 + pos: -91.5,-4.5 parent: 1 - uid: 5663 components: @@ -208167,11 +208238,6 @@ entities: - type: Transform pos: -70.5,33.5 parent: 1 - - uid: 7842 - components: - - type: Transform - pos: -90.5,19.5 - parent: 1 - uid: 7909 components: - type: Transform @@ -214507,12 +214573,6 @@ entities: - type: Transform pos: -16.5,-21.5 parent: 1 - - uid: 29462 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -56.5,-40.5 - parent: 1 - uid: 29541 components: - type: Transform @@ -247478,6 +247538,11 @@ entities: - type: Transform pos: -18.5,32.5 parent: 1 + - uid: 11843 + components: + - type: Transform + pos: -96.5,-3.5 + parent: 1 - uid: 16373 components: - type: Transform @@ -248868,6 +248933,13 @@ entities: - type: Transform pos: 20.5,-56.5 parent: 1 +- proto: VendingMachineDetDrobe + entities: + - uid: 29509 + components: + - type: Transform + pos: -56.5,-40.5 + parent: 1 - proto: VendingMachineDinnerware entities: - uid: 9614 @@ -248956,10 +249028,10 @@ entities: parent: 1 - proto: VendingMachineLawDrobe entities: - - uid: 11801 + - uid: 5060 components: - type: Transform - pos: -96.5,-3.5 + pos: -90.5,-4.5 parent: 1 - proto: VendingMachineMedical entities: @@ -249076,11 +249148,6 @@ entities: - type: Transform pos: 29.5,-20.5 parent: 1 - - uid: 30464 - components: - - type: Transform - pos: -92.5,19.5 - parent: 1 - proto: VendingMachineSovietSoda entities: - uid: 6099 @@ -272973,6 +273040,11 @@ entities: parent: 1 - proto: WaterCooler entities: + - uid: 7842 + components: + - type: Transform + pos: -91.5,-6.5 + parent: 1 - uid: 8241 components: - type: Transform @@ -273943,6 +274015,13 @@ entities: rot: 1.5707963267948966 rad pos: -65.5,-24.5 parent: 1 +- proto: WindoorSecureClerkLocked + entities: + - uid: 43059 + components: + - type: Transform + pos: -90.5,19.5 + parent: 1 - proto: WindoorSecureCommandLocked entities: - uid: 8281 @@ -277486,6 +277565,12 @@ entities: rot: 3.141592653589793 rad pos: -5.5,-53.5 parent: 1 + - uid: 11801 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -88.5,19.5 + parent: 1 - uid: 12449 components: - type: Transform @@ -277791,6 +277876,11 @@ entities: rot: 1.5707963267948966 rad pos: -80.5,-4.5 parent: 1 + - uid: 43057 + components: + - type: Transform + pos: -89.5,19.5 + parent: 1 - proto: WindowTintedDirectional entities: - uid: 4126 diff --git a/Resources/Maps/tortuga.yml b/Resources/Maps/tortuga.yml index d299d78583a..0d8de080596 100644 --- a/Resources/Maps/tortuga.yml +++ b/Resources/Maps/tortuga.yml @@ -80127,11 +80127,6 @@ entities: - type: Transform pos: 13.5,6.5 parent: 33 - - uid: 6673 - components: - - type: Transform - pos: -24.5,37.5 - parent: 33 - uid: 12919 components: - type: Transform @@ -180060,6 +180055,11 @@ entities: - type: Transform pos: 14.5,4.5 parent: 33 + - uid: 6673 + components: + - type: Transform + pos: -24.5,37.5 + parent: 33 - proto: VendingMachineMedical entities: - uid: 4264