From 6b4cda7cc926a97421f13f627857352e7b90ef93 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Sat, 12 Oct 2024 12:52:43 -0400 Subject: [PATCH 1/6] Empress/wasp, brigmed access, AME, medsec door --- Resources/Maps/_NF/Shuttles/Nfsd/empress.yml | 23 +------------------ Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml | 2 +- .../Structures/Doors/Airlocks/airlocks.yml | 21 ++++++++++++++--- 3 files changed, 20 insertions(+), 26 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml b/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml index 1db1f256dc0..48b0d882cc5 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml @@ -1382,7 +1382,6 @@ entities: - uid: 972 components: - type: Transform - rot: 3.141592653589793 rad pos: 21.5,-8.5 parent: 1 - proto: AirlockEngineeringGlass @@ -1434,19 +1433,16 @@ entities: - uid: 652 components: - type: Transform - rot: 3.141592653589793 rad pos: -8.5,-1.5 parent: 1 - uid: 691 components: - type: Transform - rot: 3.141592653589793 rad pos: 5.5,-1.5 parent: 1 - uid: 692 components: - type: Transform - rot: 3.141592653589793 rad pos: 11.5,-1.5 parent: 1 - proto: AirlockFreezer @@ -1454,7 +1450,6 @@ entities: - uid: 123 components: - type: Transform - rot: -1.5707963267948966 rad pos: 16.5,5.5 parent: 1 - proto: AirlockGlassShuttle @@ -1467,13 +1462,11 @@ entities: - uid: 65 components: - type: Transform - rot: 3.141592653589793 rad pos: 5.5,10.5 parent: 1 - uid: 151 components: - type: Transform - rot: 3.141592653589793 rad pos: 7.5,10.5 parent: 1 - uid: 154 @@ -1498,19 +1491,16 @@ entities: - type: Transform pos: 24.5,2.5 parent: 1 -- proto: AirlockMedicalGlass +- proto: AirlockMedicalGlassSecurity entities: - uid: 678 components: - type: Transform pos: -20.5,-1.5 parent: 1 -- proto: AirlockMedicalGlassLocked - entities: - uid: 644 components: - type: Transform - rot: -1.5707963267948966 rad pos: -2.5,5.5 parent: 1 - proto: AirlockNfsdBrigGlassLocked @@ -1565,7 +1555,6 @@ entities: - uid: 12 components: - type: Transform - rot: 1.5707963267948966 rad pos: 7.5,5.5 parent: 1 - proto: AirlockNfsdLocked @@ -1642,10 +1631,6 @@ entities: injecting: True - type: ContainerContainer containers: - AmeFuel: !type:ContainerSlot - showEnts: False - occludes: True - ent: 135 fuelSlot: !type:ContainerSlot showEnts: False occludes: True @@ -1658,12 +1643,6 @@ entities: parent: 713 - type: Physics canCollide: False - - uid: 135 - components: - - type: Transform - parent: 713 - - type: Physics - canCollide: False - uid: 2546 components: - type: Transform diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml b/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml index dc300ce6665..550e253471b 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml @@ -897,7 +897,7 @@ entities: rot: 1.5707963267948966 rad pos: 13.5,5.5 parent: 1 -- proto: AirlockMedicalGlass +- proto: AirlockMedicalGlassSecurity entities: - uid: 16 components: diff --git a/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/airlocks.yml index 84aaa3deb3a..ee8453c37a6 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/airlocks.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/airlocks.yml @@ -1,3 +1,4 @@ +# region Standard - type: entity parent: Airlock id: AirlockMercenary @@ -15,8 +16,9 @@ components: - type: Sprite sprite: _NF/Structures/Doors/Airlocks/Standard/nfsd.rsi +# endregion -# Glass +# region Glass - type: entity parent: AirlockGlass id: AirlockMercenaryGlass @@ -29,7 +31,6 @@ - type: Wires layoutId: AirlockSecurity -#Glass - type: entity parent: AirlockGlass id: AirlockNfsdGlass @@ -43,6 +44,19 @@ - type: Wires layoutId: AirlockSecurity +- type: entity + parent: AirlockMedicalSecurity + id: AirlockMedicalGlassSecurity + suffix: Locked, Security + components: + - type: Wires + layoutId: AirlockSecurity + - type: ContainerFill + containers: + board: [ DoorElectronicsSecurity ] +# endregion + +# region External - type: entity parent: AirlockGlassShuttle id: AirlockExternalGlassShuttleTransit @@ -58,4 +72,5 @@ categories: [ HideSpawnMenu ] components: - type: Docking - name: McDrive Thru \ No newline at end of file + name: McDrive Thru +# endregion \ No newline at end of file From fe88a7e56becb33f24b493a0add7386eaf8dd736 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Sat, 12 Oct 2024 13:34:11 -0400 Subject: [PATCH 2/6] Empress & wasp fix: security, pipes, AME, intercom --- Resources/Maps/_NF/Shuttles/Nfsd/empress.yml | 42 ++++++++++--------- Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml | 4 +- .../Structures/Doors/Airlocks/airlocks.yml | 4 +- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml b/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml index 48b0d882cc5..5546bdffbb1 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml @@ -1491,7 +1491,7 @@ entities: - type: Transform pos: 24.5,2.5 parent: 1 -- proto: AirlockMedicalGlassSecurity +- proto: AirlockMedicalGlassLockedSecurity entities: - uid: 678 components: @@ -6129,13 +6129,6 @@ entities: - type: Transform pos: 26.70925,5.241996 parent: 1 -- proto: CloningPod - entities: - - uid: 585 - components: - - type: Transform - pos: 1.5,5.5 - parent: 1 - proto: ClosetWall entities: - uid: 530 @@ -6214,13 +6207,11 @@ entities: - type: Transform pos: -0.5,-14.5 parent: 1 -- proto: ComputerCloningConsole - entities: - - uid: 586 +- proto: ComputerFrame + - uid: 587 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,7.5 + pos: 1.5,6.5 parent: 1 - proto: ComputerPowerMonitoring entities: @@ -11354,6 +11345,13 @@ entities: - type: Transform pos: -1.0400991,8.540887 parent: 1 +- proto: IntercomCommon + entities: + - uid: 2664 + components: + - type: Transform + pos: -19.5,-1.5 + parent: 1 - proto: IntercomNfsd entities: - uid: 662 @@ -11660,6 +11658,17 @@ entities: parent: 1 - proto: MachineFrame entities: + - uid: 585 + components: + - type: Transform + pos: 1.5,5.5 + parent: 1 + - uid: 586 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,7.5 + parent: 1 - uid: 1161 components: - type: Transform @@ -11694,13 +11703,6 @@ entities: - type: Transform pos: -2.5,2.5 parent: 1 -- proto: MedicalScanner - entities: - - uid: 587 - components: - - type: Transform - pos: 1.5,6.5 - parent: 1 - proto: MedicalTechFab entities: - uid: 1233 diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml b/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml index 550e253471b..143f50aeb1d 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml @@ -897,7 +897,7 @@ entities: rot: 1.5707963267948966 rad pos: 13.5,5.5 parent: 1 -- proto: AirlockMedicalGlassSecurity +- proto: AirlockMedicalGlassLockedSecurity entities: - uid: 16 components: @@ -8091,7 +8091,7 @@ entities: - type: Transform pos: 8.5,-18.5 parent: 1 -- proto: hydroponicsTray +- proto: hydroponicsTrayAnchored entities: - uid: 1175 components: diff --git a/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/airlocks.yml b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/airlocks.yml index ee8453c37a6..d932bc94f66 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/airlocks.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/airlocks.yml @@ -45,8 +45,8 @@ layoutId: AirlockSecurity - type: entity - parent: AirlockMedicalSecurity - id: AirlockMedicalGlassSecurity + parent: AirlockMedicalGlass + id: AirlockMedicalGlassLockedSecurity suffix: Locked, Security components: - type: Wires From 402741f6ff03e480df9f718289e5d1f1025dbb71 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Fri, 18 Oct 2024 16:18:40 -0400 Subject: [PATCH 3/6] Empress and wasp rework --- Resources/Maps/_NF/Shuttles/Nfsd/empress.yml | 369 +++++++------------ Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml | 230 +++++------- 2 files changed, 220 insertions(+), 379 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml b/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml index 5546bdffbb1..c0d07b7f30b 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml @@ -64,7 +64,7 @@ entities: version: 6 0,-1: ind: 0,-1 - tiles: LgAAAAAAHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAATAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAHgAAAAAAfQAAAAAAfAAAAAAAfQAAAAAAIwAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAIwAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAAAHgAAAAAAeAAAAAAAfQAAAAAATAAAAAAAIwAAAAAATAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAATAAAAAAAIwAAAAAATAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAIwAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAfQAAAAAAIwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAIwAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAbwAAAAAAbwAAAAAAIwAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAA + tiles: LgAAAAAAHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAATAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAHgAAAAAAfQAAAAAAfAAAAAAAfQAAAAAAIwAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAIwAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAHgAAAAAAHgAAAAAAeAAAAAAAfQAAAAAATAAAAAAAIwAAAAAATAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAATAAAAAAAIwAAAAAATAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAIwAAAAAAfQAAAAAAfQAAAAAAHgAAAAAAfQAAAAAAIwAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAIwAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAbwAAAAAAbwAAAAAAIwAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAA version: 6 -2,-1: ind: -2,-1 @@ -1391,8 +1391,13 @@ entities: - type: Transform pos: -22.5,-1.5 parent: 1 -- proto: AirlockExternalGlassLocked +- proto: AirlockExternalGlassNfsdLocked entities: + - uid: 116 + components: + - type: Transform + pos: -14.5,-1.5 + parent: 1 - uid: 638 components: - type: Transform @@ -1403,6 +1408,11 @@ entities: - type: Transform pos: 5.5,8.5 parent: 1 + - uid: 652 + components: + - type: Transform + pos: -8.5,-1.5 + parent: 1 - uid: 679 components: - type: Transform @@ -1423,18 +1433,6 @@ entities: - type: Transform pos: 24.5,-8.5 parent: 1 -- proto: AirlockExternalLocked - entities: - - uid: 116 - components: - - type: Transform - pos: -14.5,-1.5 - parent: 1 - - uid: 652 - components: - - type: Transform - pos: -8.5,-1.5 - parent: 1 - uid: 691 components: - type: Transform @@ -1452,7 +1450,7 @@ entities: - type: Transform pos: 16.5,5.5 parent: 1 -- proto: AirlockGlassShuttle +- proto: AirlockGlassShuttleNfsdLocked entities: - uid: 53 components: @@ -1462,11 +1460,13 @@ entities: - uid: 65 components: - type: Transform + rot: 3.141592653589793 rad pos: 5.5,10.5 parent: 1 - uid: 151 components: - type: Transform + rot: 3.141592653589793 rad pos: 7.5,10.5 parent: 1 - uid: 154 @@ -1493,15 +1493,15 @@ entities: parent: 1 - proto: AirlockMedicalGlassLockedSecurity entities: - - uid: 678 + - uid: 644 components: - type: Transform - pos: -20.5,-1.5 + pos: -2.5,5.5 parent: 1 - - uid: 644 + - uid: 678 components: - type: Transform - pos: -2.5,5.5 + pos: -20.5,-1.5 parent: 1 - proto: AirlockNfsdBrigGlassLocked entities: @@ -1643,21 +1643,6 @@ entities: parent: 713 - type: Physics canCollide: False - - uid: 2546 - components: - - type: Transform - pos: -26.602339,-0.56223416 - parent: 1 - - uid: 2547 - components: - - type: Transform - pos: -26.430464,-0.48410916 - parent: 1 - - uid: 2548 - components: - - type: Transform - pos: -26.274214,-0.39035916 - parent: 1 - proto: AmeShielding entities: - uid: 287 @@ -1787,6 +1772,12 @@ entities: parent: 1 - proto: AtmosDeviceFanDirectional entities: + - uid: 135 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 16.5,5.5 + parent: 1 - uid: 456 components: - type: Transform @@ -1843,12 +1834,6 @@ entities: - type: Transform pos: 5.5,-3.5 parent: 1 - - uid: 657 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 16.5,5.5 - parent: 1 - proto: AtmosFixBlockerMarker entities: - uid: 1826 @@ -2785,13 +2770,6 @@ entities: - type: Transform pos: 7.5,9.5 parent: 1 -- proto: BookChemicalCompendium - entities: - - uid: 1637 - components: - - type: Transform - pos: -0.4742334,8.573275 - parent: 1 - proto: BookRandom entities: - uid: 881 @@ -6131,60 +6109,18 @@ entities: parent: 1 - proto: ClosetWall entities: - - uid: 530 + - uid: 535 components: - type: Transform rot: -1.5707963267948966 rad pos: -22.5,-3.5 parent: 1 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14923 - moles: - - 1.8856695 - - 7.0937095 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 811 - - 812 - proto: ClothingBeltUtilityEngineering entities: - uid: 811 components: - type: Transform - parent: 530 - - type: Physics - canCollide: False - - type: InsideEntityStorage - - uid: 812 - components: - - type: Transform - parent: 530 - - type: Physics - canCollide: False - - type: InsideEntityStorage -- proto: ClothingEyesGlassesChemical - entities: - - uid: 600 - components: - - type: Transform - pos: -0.48900163,7.9824142 + pos: -23.498436,-5.0277567 parent: 1 - proto: ComfyChair entities: @@ -6208,6 +6144,7 @@ entities: pos: -0.5,-14.5 parent: 1 - proto: ComputerFrame + entities: - uid: 587 components: - type: Transform @@ -6362,19 +6299,6 @@ entities: - type: Transform pos: 6.5,8.5 parent: 1 - - type: ContainerContainer - containers: - board: !type:Container - showEnts: False - occludes: True - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - - type: Physics - canCollide: False - - type: ItemSlots - proto: ConveyorBelt entities: - uid: 1145 @@ -6389,13 +6313,6 @@ entities: - type: Transform pos: -2.5,8.5 parent: 1 -- proto: CrateEngineeringAMEJar - entities: - - uid: 2488 - components: - - type: Transform - pos: -25.5,-0.5 - parent: 1 - proto: CrateFoodCooking entities: - uid: 929 @@ -6412,10 +6329,20 @@ entities: parent: 1 - proto: CrateFreezer entities: - - uid: 538 + - uid: 602 components: - type: Transform - pos: 20.5,6.5 + pos: 19.5,8.5 + parent: 1 + - uid: 657 + components: + - type: Transform + pos: 17.5,8.5 + parent: 1 + - uid: 812 + components: + - type: Transform + pos: 18.5,8.5 parent: 1 - proto: CrateHydroponicsTools entities: @@ -6424,11 +6351,6 @@ entities: - type: Transform pos: -19.5,3.5 parent: 1 - - uid: 1170 - components: - - type: Transform - pos: 17.5,6.5 - parent: 1 - proto: CrateMaterialSteel entities: - uid: 806 @@ -6443,13 +6365,6 @@ entities: - type: Transform pos: -1.5,4.5 parent: 1 -- proto: CrateNfsdBrigmedic - entities: - - uid: 2663 - components: - - type: Transform - pos: -1.5,6.5 - parent: 1 - proto: CrateNfsdSecure1 entities: - uid: 251 @@ -6471,10 +6386,10 @@ entities: parent: 1 - proto: CrateNfsdSupplies entities: - - uid: 559 + - uid: 1155 components: - type: Transform - pos: -0.5,-2.5 + pos: -1.5,-2.5 parent: 1 - proto: CrateServiceCustomSmokable entities: @@ -7101,21 +7016,17 @@ entities: parent: 1 - proto: EmpressMothershipComputer entities: + - uid: 559 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -4.5,2.5 + parent: 1 - uid: 617 components: - type: Transform - pos: -1.5,-2.5 + pos: 7.5,1.5 parent: 1 - - type: ContainerContainer - containers: - ShipyardConsole-targetId: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - board: !type:Container - showEnts: False - occludes: True - ents: [] - proto: FaxMachineShip entities: - uid: 1103 @@ -7182,26 +7093,6 @@ entities: - type: Transform pos: -24.5,4.5 parent: 1 - - uid: 844 - components: - - type: Transform - pos: -14.5,-1.5 - parent: 1 - - uid: 845 - components: - - type: Transform - pos: -8.5,-1.5 - parent: 1 - - uid: 846 - components: - - type: Transform - pos: 5.5,-1.5 - parent: 1 - - uid: 847 - components: - - type: Transform - pos: 11.5,-1.5 - parent: 1 - uid: 848 components: - type: Transform @@ -7282,16 +7173,6 @@ entities: - type: Transform pos: 7.5,5.5 parent: 1 - - uid: 864 - components: - - type: Transform - pos: 5.5,8.5 - parent: 1 - - uid: 865 - components: - - type: Transform - pos: 7.5,8.5 - parent: 1 - proto: Fireplace entities: - uid: 1045 @@ -11215,10 +11096,10 @@ entities: parent: 1 - proto: HandheldCrewMonitor entities: - - uid: 646 + - uid: 645 components: - type: Transform - pos: -1.5557241,8.587762 + pos: -0.9687482,6.687441 parent: 1 - proto: HandheldGPSBasic entities: @@ -11239,6 +11120,11 @@ entities: parent: 1 - proto: HandLabeler entities: + - uid: 536 + components: + - type: Transform + pos: -0.49652594,8.041608 + parent: 1 - uid: 1104 components: - type: Transform @@ -11311,18 +11197,6 @@ entities: parent: 1 - proto: hydroponicsTrayAnchored entities: - - uid: 535 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 18.5,8.5 - parent: 1 - - uid: 536 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 19.5,8.5 - parent: 1 - uid: 909 components: - type: Transform @@ -11338,13 +11212,6 @@ entities: - type: Transform pos: -17.5,4.5 parent: 1 -- proto: HypoBrigmedic - entities: - - uid: 645 - components: - - type: Transform - pos: -1.0400991,8.540887 - parent: 1 - proto: IntercomCommon entities: - uid: 2664 @@ -11352,6 +11219,8 @@ entities: - type: Transform pos: -19.5,-1.5 parent: 1 + - type: Fixtures + fixtures: {} - proto: IntercomNfsd entities: - uid: 662 @@ -11360,6 +11229,8 @@ entities: rot: -1.5707963267948966 rad pos: 2.5,-14.5 parent: 1 + - type: Fixtures + fixtures: {} - proto: JanitorialTrolley entities: - uid: 542 @@ -11397,17 +11268,12 @@ entities: - type: Transform pos: -14.5,7.5 parent: 1 - - uid: 1155 - components: - - type: Transform - pos: 13.5,8.5 - parent: 1 - proto: KitchenSpike entities: - uid: 537 components: - type: Transform - pos: 20.5,7.5 + pos: 20.5,6.5 parent: 1 - proto: LampGold entities: @@ -11639,6 +11505,22 @@ entities: - type: Transform pos: 19.5,-2.5 parent: 1 +- proto: LockerWallColorChemistryFilled + entities: + - uid: 530 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,5.5 + parent: 1 +- proto: LockerWallMaterialsFuelAmeJarFilled + entities: + - uid: 827 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -25.5,-1.5 + parent: 1 - proto: LuxuryPen entities: - uid: 1106 @@ -11656,6 +11538,20 @@ entities: - type: Transform pos: 29.692461,1.1016078 parent: 1 +- proto: MachineCentrifuge + entities: + - uid: 600 + components: + - type: Transform + pos: -1.5,6.5 + parent: 1 +- proto: MachineElectrolysisUnit + entities: + - uid: 824 + components: + - type: Transform + pos: -0.5,8.5 + parent: 1 - proto: MachineFrame entities: - uid: 585 @@ -11681,6 +11577,13 @@ entities: - type: Transform pos: -21.5,-9.5 parent: 1 +- proto: MedicalAssembler + entities: + - uid: 825 + components: + - type: Transform + pos: -1.5,8.5 + parent: 1 - proto: MedicalBed entities: - uid: 481 @@ -11742,13 +11645,6 @@ entities: rot: -1.5707963267948966 rad pos: -18.5,-4.5 parent: 1 -- proto: Multitool - entities: - - uid: 827 - components: - - type: Transform - pos: -23.718105,-4.6121206 - parent: 1 - proto: NfsdDeployableBarrier entities: - uid: 611 @@ -11778,6 +11674,20 @@ entities: - type: Transform pos: 20.5,4.5 parent: 1 + - type: ContainerContainer + containers: + machine_board: !type:Container + showEnts: False + occludes: True + ents: [] + machine_parts: !type:Container + showEnts: False + occludes: True + ents: [] + blueprint: !type:Container + showEnts: False + occludes: True + ents: [] - proto: NitrogenCanister entities: - uid: 744 @@ -12496,15 +12406,15 @@ entities: - type: Transform pos: 23.5,-1.5 parent: 1 - - uid: 1598 + - uid: 1143 components: - type: Transform - pos: 8.5,1.5 + pos: -4.5,1.5 parent: 1 - - uid: 1824 + - uid: 1598 components: - type: Transform - pos: -6.5,1.5 + pos: 8.5,1.5 parent: 1 - uid: 2340 components: @@ -12519,7 +12429,7 @@ entities: rot: -1.5707963267948966 rad pos: -23.5,-5.5 parent: 1 - - uid: 2505 + - uid: 1144 components: - type: Transform pos: 8.5,-1.5 @@ -12988,12 +12898,6 @@ entities: - type: Transform pos: -28.5,2.5 parent: 1 - - uid: 1212 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -26.5,-0.5 - parent: 1 - uid: 1219 components: - type: Transform @@ -13375,15 +13279,15 @@ entities: parent: 1 - proto: RemoteSignaller entities: - - uid: 824 + - uid: 646 components: - type: Transform - pos: -23.222767,-4.9790387 + pos: -23.665102,-4.3425713 parent: 1 - - uid: 825 + - uid: 735 components: - type: Transform - pos: -23.424572,-4.905655 + pos: -23.780844,-4.208312 parent: 1 - proto: RollerBedSpawnFolded entities: @@ -13987,13 +13891,6 @@ entities: rot: 3.141592653589793 rad pos: 22.5,-1.5 parent: 1 -- proto: SpawnPointSecurityCadet - entities: - - uid: 2571 - components: - - type: Transform - pos: 21.5,-5.5 - parent: 1 - proto: StationMap entities: - uid: 1736 @@ -14604,6 +14501,11 @@ entities: - type: Transform pos: 7.5,-1.5 parent: 1 + - uid: 538 + components: + - type: Transform + pos: -1.5,6.5 + parent: 1 - uid: 578 components: - type: Transform @@ -14631,11 +14533,6 @@ entities: - type: Transform pos: -0.5,6.5 parent: 1 - - uid: 602 - components: - - type: Transform - pos: -1.5,8.5 - parent: 1 - uid: 650 components: - type: Transform @@ -15160,13 +15057,6 @@ entities: - type: Transform pos: 1.5,-6.5 parent: 1 -- proto: VendingMachineChefvend - entities: - - uid: 1144 - components: - - type: Transform - pos: 17.5,7.5 - parent: 1 - proto: VendingMachineChemicals entities: - uid: 591 @@ -15237,11 +15127,6 @@ entities: - type: Transform pos: -16.5,8.5 parent: 1 - - uid: 1143 - components: - - type: Transform - pos: 17.5,8.5 - parent: 1 - proto: VendingMachineTankDispenserEVA entities: - uid: 772 @@ -17009,7 +16894,7 @@ entities: parent: 1 - proto: WeaponCapacitorRecharger entities: - - uid: 2337 + - uid: 925 components: - type: Transform pos: 7.5,-1.5 diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml b/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml index 143f50aeb1d..6247eb353cd 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml @@ -36,7 +36,7 @@ entities: chunks: 0,0: ind: 0,0 - tiles: TgAAAAAATgAAAAAATgAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIwAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAATgAAAAAATgAAAAAATgAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAIwAAAAAAIwAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIwAAAAAAfQAAAAAAIwAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAIwAAAAAAfQAAAAAAIwAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAHgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAIwAAAAAAfQAAAAAAIwAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAIwAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAIwAAAAAAfQAAAAAAIwAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAALgAAAAAAUgAAAAAAUgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAALgAAAAAAUgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAALgAAAAAAUgAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: TgAAAAAATgAAAAAATgAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIwAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAATgAAAAAATgAAAAAATgAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAIwAAAAAAIwAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAATgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIwAAAAAAfQAAAAAAIwAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAIwAAAAAAfQAAAAAAIwAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAHgAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAIwAAAAAAfQAAAAAAIwAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAIwAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAIwAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAIwAAAAAAfQAAAAAAIwAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAAAfQAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAXwAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAALgAAAAAAUgAAAAAAUgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAALgAAAAAAUgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAALgAAAAAAUgAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 0,-1: ind: 0,-1 @@ -1143,97 +1143,113 @@ entities: parent: 1 - type: Apc hasAccess: True -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - - uid: 57 + - uid: 661 components: - type: Transform - pos: 10.5,9.5 + rot: -1.5707963267948966 rad + pos: -3.5,-11.5 parent: 1 - - uid: 58 + - uid: 759 components: - type: Transform - pos: -3.5,-10.5 + rot: -1.5707963267948966 rad + pos: 9.5,1.5 parent: 1 - - uid: 59 + - uid: 761 components: - type: Transform - pos: -3.5,-11.5 + rot: 1.5707963267948966 rad + pos: 13.5,5.5 parent: 1 - - uid: 60 + - uid: 762 components: - type: Transform - pos: -3.5,-12.5 + rot: 1.5707963267948966 rad + pos: 13.5,7.5 parent: 1 - - uid: 61 + - uid: 763 components: - type: Transform - pos: 4.5,-10.5 + rot: 3.141592653589793 rad + pos: 12.5,9.5 parent: 1 - - uid: 62 + - uid: 764 components: - type: Transform - pos: 4.5,-11.5 + rot: 3.141592653589793 rad + pos: 10.5,9.5 + parent: 1 + - uid: 765 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -3.5,-12.5 parent: 1 - - uid: 63 + - uid: 767 components: - type: Transform + rot: 1.5707963267948966 rad pos: 4.5,-12.5 parent: 1 - - uid: 64 + - uid: 768 components: - type: Transform - pos: 12.5,9.5 + rot: 1.5707963267948966 rad + pos: 4.5,-11.5 parent: 1 - - uid: 65 + - uid: 769 components: - type: Transform - pos: 13.5,7.5 + rot: 1.5707963267948966 rad + pos: 4.5,-10.5 parent: 1 - - uid: 66 + - uid: 781 components: - type: Transform - pos: 13.5,5.5 + pos: 12.5,2.5 parent: 1 - - uid: 67 + - uid: 928 components: - type: Transform + rot: 3.141592653589793 rad pos: -9.5,9.5 parent: 1 - - uid: 68 + - uid: 957 components: - type: Transform + rot: 3.141592653589793 rad pos: -11.5,9.5 parent: 1 - - uid: 69 + - uid: 1065 components: - type: Transform - pos: -12.5,7.5 + rot: -1.5707963267948966 rad + pos: -3.5,-10.5 parent: 1 - - uid: 70 + - uid: 1188 components: - type: Transform - pos: -12.5,5.5 + rot: 1.5707963267948966 rad + pos: -8.5,1.5 parent: 1 - - uid: 71 + - uid: 1189 components: - type: Transform pos: -11.5,2.5 parent: 1 - - uid: 72 - components: - - type: Transform - pos: 12.5,2.5 - parent: 1 - - uid: 73 + - uid: 1213 components: - type: Transform - pos: -8.5,1.5 + rot: -1.5707963267948966 rad + pos: -12.5,7.5 parent: 1 - - uid: 74 + - uid: 1214 components: - type: Transform - pos: 9.5,1.5 + rot: -1.5707963267948966 rad + pos: -12.5,5.5 parent: 1 - proto: Autolathe entities: @@ -4230,12 +4246,12 @@ entities: - 0 - 0 - 0 -- proto: ClothingBeltUtilityFilled +- proto: ClothingBeltUtilityEngineering entities: - uid: 647 components: - type: Transform - pos: 2.6090956,1.2230597 + pos: 2.658847,1.278218 parent: 1 - proto: ClothingEyesGlassesChemical entities: @@ -4333,31 +4349,6 @@ entities: - type: Transform pos: 6.5,-16.5 parent: 1 -- proto: CrateEngineeringAMEJar - entities: - - uid: 661 - components: - - type: Transform - pos: 1.5,1.5 - parent: 1 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.14923 - moles: - - 1.7459903 - - 6.568249 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - proto: CrateEngineeringElectricalSupplies entities: - uid: 662 @@ -5179,61 +5170,16 @@ entities: - type: Transform pos: 1.5,-15.5 parent: 1 - - uid: 759 - components: - - type: Transform - pos: -11.5,2.5 - parent: 1 - uid: 760 components: - type: Transform pos: -8.5,7.5 parent: 1 - - uid: 761 - components: - - type: Transform - pos: -12.5,5.5 - parent: 1 - - uid: 762 - components: - - type: Transform - pos: -12.5,7.5 - parent: 1 - - uid: 763 - components: - - type: Transform - pos: -11.5,9.5 - parent: 1 - - uid: 764 - components: - - type: Transform - pos: -9.5,9.5 - parent: 1 - - uid: 765 - components: - - type: Transform - pos: 10.5,9.5 - parent: 1 - uid: 766 components: - type: Transform pos: 9.5,7.5 parent: 1 - - uid: 767 - components: - - type: Transform - pos: 12.5,9.5 - parent: 1 - - uid: 768 - components: - - type: Transform - pos: 13.5,7.5 - parent: 1 - - uid: 769 - components: - - type: Transform - pos: 13.5,5.5 - parent: 1 - uid: 770 components: - type: Transform @@ -5296,11 +5242,6 @@ entities: rot: 3.141592653589793 rad pos: 4.5,-8.5 parent: 1 - - uid: 781 - components: - - type: Transform - pos: 12.5,2.5 - parent: 1 - uid: 782 components: - type: Transform @@ -5346,7 +5287,7 @@ entities: - type: Transform pos: 2.1403456,1.8024313 parent: 1 -- proto: GasMixer +- proto: GasMixerOn entities: - uid: 789 components: @@ -5354,6 +5295,9 @@ entities: rot: 1.5707963267948966 rad pos: -0.5,1.5 parent: 1 + - type: GasMixer + inletTwoConcentration: 0.79 + inletOneConcentration: 0.21 - type: AtmosPipeColor color: '#0055CCFF' - proto: GasPassiveVent @@ -5374,6 +5318,8 @@ entities: rot: -1.5707963267948966 rad pos: -0.5,0.5 parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 792 components: - type: Transform @@ -7189,12 +7135,26 @@ entities: rot: 1.5707963267948966 rad pos: -1.5,1.5 parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 1029 components: - type: Transform rot: 1.5707963267948966 rad pos: -1.5,0.5 parent: 1 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasPressurePumpOnMax + entities: + - uid: 890 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 1.5,-0.5 + parent: 1 + - type: AtmosPipeColor + color: '#990000FF' - proto: GasVentPump entities: - uid: 1030 @@ -7466,16 +7426,6 @@ entities: parent: 1 - type: AtmosPipeColor color: '#990000FF' -- proto: GasVolumePump - entities: - - uid: 1065 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 1.5,-0.5 - parent: 1 - - type: AtmosPipeColor - color: '#990000FF' - proto: GravityGeneratorMini entities: - uid: 1066 @@ -8122,12 +8072,16 @@ entities: rot: 1.5707963267948966 rad pos: 2.5,-14.5 parent: 1 + - type: Fixtures + fixtures: {} - uid: 1180 components: - type: Transform rot: 3.141592653589793 rad pos: 1.5,12.5 parent: 1 + - type: Fixtures + fixtures: {} - proto: JetpackNfsdFilled entities: - uid: 1181 @@ -8370,6 +8324,14 @@ entities: - 0 - 0 - 0 +- proto: LockerWallMaterialsFuelAmeJarFilled + entities: + - uid: 1004 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,-1.5 + parent: 1 - proto: MedicalBed entities: - uid: 1206 @@ -8415,18 +8377,6 @@ entities: - type: Transform pos: -6.374452,-8.63802 parent: 1 -- proto: NfsdDeployableBarrier - entities: - - uid: 1213 - components: - - type: Transform - pos: -1.5,-9.5 - parent: 1 - - uid: 1214 - components: - - type: Transform - pos: 2.5,-9.5 - parent: 1 - proto: NfsdTechFab entities: - uid: 1215 @@ -8453,8 +8403,11 @@ entities: - uid: 1216 components: - type: Transform + anchored: True pos: -1.5,0.5 parent: 1 + - type: Physics + bodyType: Static - proto: OreBox entities: - uid: 1217 @@ -8489,8 +8442,11 @@ entities: - uid: 1222 components: - type: Transform + anchored: True pos: -1.5,1.5 parent: 1 + - type: Physics + bodyType: Static - proto: Paper entities: - uid: 1223 From 414cc1d9ecfe45db5b9485bd32b4f4b178b35357 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Fri, 18 Oct 2024 16:20:26 -0400 Subject: [PATCH 4/6] Replace airlocks with NFSD variants --- Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml b/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml index 6247eb353cd..78f711a6a1a 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml @@ -825,7 +825,7 @@ entities: - type: Transform pos: 0.5,3.5 parent: 1 -- proto: AirlockExternalGlass +- proto: AirlockExternalGlassNfsdLocked entities: - uid: 4 components: @@ -847,7 +847,7 @@ entities: - type: Transform pos: -8.5,1.5 parent: 1 -- proto: AirlockGlassShuttle +- proto: AirlockGlassShuttleNfsdLocked entities: - uid: 8 components: From 8a84f6ebc77cbd5ccd46e3fb4a6d6f383d152c45 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Fri, 18 Oct 2024 16:37:46 -0400 Subject: [PATCH 5/6] Medkit exchange --- Resources/Maps/_NF/Shuttles/Nfsd/empress.yml | 12 ++++--- Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml | 35 ++++++++++---------- 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml b/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml index c0d07b7f30b..aae3715950c 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml @@ -11613,17 +11613,19 @@ entities: - type: Transform pos: 0.5,4.5 parent: 1 -- proto: MedkitCombatFilled +- proto: MedkitAdvancedFilled entities: - - uid: 2553 + - uid: 845 components: - type: Transform - pos: -2.5074146,1.5536056 + pos: 1.5,1.5 parent: 1 - - uid: 2554 +- proto: MedkitFilled + entities: + - uid: 844 components: - type: Transform - pos: 1.5238354,1.5536056 + pos: -2.5,1.5 parent: 1 - proto: Morgue entities: diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml b/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml index 78f711a6a1a..a4bbae57f93 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/wasp.yml @@ -1476,13 +1476,6 @@ entities: parent: 116 - type: Physics canCollide: False -- proto: BookChemicalCompendium - entities: - - uid: 118 - components: - - type: Transform - pos: -5.0524554,-4.398542 - parent: 1 - proto: BoxBeaker entities: - uid: 119 @@ -4253,13 +4246,6 @@ entities: - type: Transform pos: 2.658847,1.278218 parent: 1 -- proto: ClothingEyesGlassesChemical - entities: - - uid: 648 - components: - - type: Transform - pos: -4.5055804,-4.226667 - parent: 1 - proto: ComfyChair entities: - uid: 649 @@ -7946,6 +7932,13 @@ entities: - type: Transform pos: 7.603577,-5.4169636 parent: 1 +- proto: HandLabeler + entities: + - uid: 59 + components: + - type: Transform + pos: -5.3707194,-4.4200716 + parent: 1 - proto: HighSecArmoryLocked entities: - uid: 1158 @@ -8324,6 +8317,14 @@ entities: - 0 - 0 - 0 +- proto: LockerWallColorChemistryFilled + entities: + - uid: 58 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -2.5,-3.5 + parent: 1 - proto: LockerWallMaterialsFuelAmeJarFilled entities: - uid: 1004 @@ -8370,12 +8371,12 @@ entities: - type: Transform pos: -9.576968,-5.6438694 parent: 1 -- proto: MedkitCombatFilled +- proto: MedkitFilled entities: - - uid: 1212 + - uid: 57 components: - type: Transform - pos: -6.374452,-8.63802 + pos: -6.358609,-8.515163 parent: 1 - proto: NfsdTechFab entities: From 6bec11e7cb526f40c6357552a980c8749fe73164 Mon Sep 17 00:00:00 2001 From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Date: Tue, 22 Oct 2024 09:03:00 +0300 Subject: [PATCH 6/6] empress weapon rack --- Resources/Maps/_NF/Shuttles/Nfsd/empress.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml b/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml index aae3715950c..ec49623df92 100644 --- a/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml +++ b/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml @@ -13993,22 +13993,13 @@ entities: params: volume: -5 path: /Audio/Machines/door_lock_off.ogg -- proto: StructureMeleeWeaponRackWallmountedNfsd +- proto: StructureMeleeWeaponRackNfsd entities: - uid: 323 components: - type: Transform pos: 20.5,1.5 parent: 1 - - type: Lock - lockingSound: !type:SoundPathSpecifier - params: - volume: -5 - path: /Audio/Machines/door_lock_on.ogg - unlockingSound: !type:SoundPathSpecifier - params: - volume: -5 - path: /Audio/Machines/door_lock_off.ogg - proto: StructurePistolRackWallmountedNfsd entities: - uid: 253