From 9cf87687544824b91aa2272149fc15cfd0f7902a Mon Sep 17 00:00:00 2001 From: Swept Date: Tue, 16 Mar 2021 05:46:31 +0000 Subject: [PATCH] Saltern mapping updates (#3669) --- Resources/Maps/saltern.yml | 881 ++++++++++++------ Resources/Prototypes/AccessLevels/service.yml | 4 +- .../Fills/{Storage => }/Crates/armory.yml | 0 .../Fills/{Storage => }/Crates/botany.yml | 0 .../Fills/{Storage => }/Crates/emergency.yml | 0 .../{Storage => }/Crates/engineering.yml | 0 .../Fills/{Storage => }/Crates/engines.yml | 0 .../Fills/{Storage => }/Crates/food.yml | 0 .../Fills/{Storage => }/Crates/fun.yml | 0 .../Fills/{Storage => }/Crates/materials.yml | 0 .../Fills/{Storage => }/Crates/medical.yml | 0 .../Fills/{Storage => }/Crates/npc.yml | 0 .../Fills/{Storage => }/Crates/science.yml | 0 .../Fills/{Storage => }/Crates/security.yml | 0 .../Fills/{Storage => }/Crates/service.yml | 0 .../Fills/{Storage => }/Lockers/engineer.yml | 4 +- .../Fills/{Storage => }/Lockers/heads.yml | 1 + .../Fills/{Storage => }/Lockers/l3.yml | 0 .../Fills/{Storage => }/Lockers/medical.yml | 0 .../Fills/{Storage => }/Lockers/misc.yml | 0 .../Lockers/readmebeforeadding.txt | 0 .../Fills/{Storage => }/Lockers/security.yml | 0 .../Fills/{Storage => }/Lockers/service.yml | 0 .../{Storage => }/Lockers/wardrobe_colors.yml | 0 .../{Storage => }/Lockers/wardrobe_job.yml | 58 +- .../Constructible/Doors/airlock_access.yml | 16 + .../Storage/Closets/Secure/bar.yml | 2 +- .../Roles/Jobs/Civilian/bartender.yml | 1 + 28 files changed, 656 insertions(+), 311 deletions(-) rename Resources/Prototypes/Catalog/Fills/{Storage => }/Crates/armory.yml (100%) rename Resources/Prototypes/Catalog/Fills/{Storage => }/Crates/botany.yml (100%) rename Resources/Prototypes/Catalog/Fills/{Storage => }/Crates/emergency.yml (100%) rename Resources/Prototypes/Catalog/Fills/{Storage => }/Crates/engineering.yml (100%) rename Resources/Prototypes/Catalog/Fills/{Storage => }/Crates/engines.yml (100%) rename Resources/Prototypes/Catalog/Fills/{Storage => }/Crates/food.yml (100%) rename Resources/Prototypes/Catalog/Fills/{Storage => }/Crates/fun.yml (100%) rename Resources/Prototypes/Catalog/Fills/{Storage => }/Crates/materials.yml (100%) rename Resources/Prototypes/Catalog/Fills/{Storage => }/Crates/medical.yml (100%) rename Resources/Prototypes/Catalog/Fills/{Storage => }/Crates/npc.yml (100%) rename Resources/Prototypes/Catalog/Fills/{Storage => }/Crates/science.yml (100%) rename Resources/Prototypes/Catalog/Fills/{Storage => }/Crates/security.yml (100%) rename Resources/Prototypes/Catalog/Fills/{Storage => }/Crates/service.yml (100%) rename Resources/Prototypes/Catalog/Fills/{Storage => }/Lockers/engineer.yml (97%) rename Resources/Prototypes/Catalog/Fills/{Storage => }/Lockers/heads.yml (99%) rename Resources/Prototypes/Catalog/Fills/{Storage => }/Lockers/l3.yml (100%) rename Resources/Prototypes/Catalog/Fills/{Storage => }/Lockers/medical.yml (100%) rename Resources/Prototypes/Catalog/Fills/{Storage => }/Lockers/misc.yml (100%) rename Resources/Prototypes/Catalog/Fills/{Storage => }/Lockers/readmebeforeadding.txt (100%) rename Resources/Prototypes/Catalog/Fills/{Storage => }/Lockers/security.yml (100%) rename Resources/Prototypes/Catalog/Fills/{Storage => }/Lockers/service.yml (100%) rename Resources/Prototypes/Catalog/Fills/{Storage => }/Lockers/wardrobe_colors.yml (100%) rename Resources/Prototypes/Catalog/Fills/{Storage => }/Lockers/wardrobe_job.yml (53%) diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml index 2340e7c396..d680532398 100644 --- a/Resources/Maps/saltern.yml +++ b/Resources/Maps/saltern.yml @@ -85,7 +85,7 @@ grids: - ind: "-2,-2" tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAIQAAACEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAABEAAAARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEAAAARAAAAEQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAEQAAABEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAACEAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEAAAAbAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAGwAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAABsAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEAAAAbAAAAGwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAGwAAABsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAABsAAAAbAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAACEAAAAhAAAAGAAAAA== - ind: "-2,-1" - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAACAAAAAYAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAACEAAAAgAAAAIAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAhAAAAIAAAABgAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAFgAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACAAAAAYAAAAIQAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAGAAAACEAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAACAAAAAYAAAAGAAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAYAAAAIQAAACEAAAAhAAAAFgAAABYAAAAWAAAAIQAAACEAAAAWAAAAFgAAABYAAAAWAAAAIQAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAABYAAAAWAAAAFgAAACEAAAAhAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAYAAAAGAAAACEAAAAhAAAAIQAAACEAAAAhAAAAFgAAABYAAAAWAAAAFgAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAeAAAAHgAAAB4AAAAeAAAAHgAAABYAAAAWAAAAFgAAABYAAAAhAAAAFgAAABYAAAAWAAAAIQAAACAAAAAhAAAAHgAAAB4AAAAeAAAAHgAAACEAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAACEAAAAgAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAFgAAABYAAAAWAAAAFgAAACEAAAAhAAAAIQAAACEAAAAhAAAAFgAAACEAAAAeAAAAHgAAAB4AAAAeAAAAHgAAABYAAAAWAAAAFgAAABYAAAAhAAAADgAAAA4AAAAOAAAADgAAABYAAAAhAAAAHgAAAB4AAAAeAAAAHgAAACEAAAAWAAAAFgAAABYAAAAWAAAAIQAAAA4AAAAWAAAAFgAAABYAAAAWAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAFgAAABYAAAAWAAAAFgAAACEAAAAOAAAADgAAAA4AAAAWAAAAFgAAAA== + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAACAAAAAYAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAACEAAAAgAAAAIAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAhAAAAIAAAABgAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAFgAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACAAAAAYAAAAIQAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAIAAAACAAAAAgAAAAGAAAACEAAAAYAAAAGAAAABgAAAAYAAAAGAAAABgAAAAYAAAAGAAAACAAAAAYAAAAGAAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAYAAAAIQAAACEAAAAhAAAAFgAAABYAAAAWAAAAIQAAACEAAAAWAAAAFgAAABYAAAAWAAAAIQAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAABYAAAAWAAAAFgAAACEAAAAhAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAYAAAAGAAAACEAAAAhAAAAIQAAACEAAAAhAAAAFgAAABYAAAAWAAAAFgAAABYAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAeAAAAHgAAAB4AAAAeAAAAHgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAACAAAAAhAAAAHgAAAB4AAAAeAAAAHgAAACEAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAACEAAAAgAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAFgAAABYAAAAWAAAAFgAAACEAAAAhAAAAIQAAACEAAAAhAAAAFgAAACEAAAAeAAAAHgAAAB4AAAAeAAAAHgAAABYAAAAWAAAAFgAAABYAAAAhAAAADgAAAA4AAAAOAAAADgAAABYAAAAhAAAAHgAAAB4AAAAeAAAAHgAAACEAAAAWAAAAFgAAABYAAAAWAAAAIQAAAA4AAAAWAAAAFgAAABYAAAAWAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAFgAAABYAAAAWAAAAFgAAACEAAAAOAAAADgAAAA4AAAAWAAAAFgAAAA== - ind: "-3,0" tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAABYAAAAWAAAAFgAAACEAAAAgAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAIQAAACEAAAAWAAAAFgAAABYAAAAhAAAAIQAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAACEAAAAYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAACEAAAAhAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAYAAAAGAAAABYAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAIQAAACEAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEAAAAWAAAAFgAAABYAAAAWAAAAFgAAABYAAAAhAAAAIQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEAAAAhAAAAIQAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYAAAAGAAAABgAAAAWAAAAFgAAABYAAAAWAAAAFgAAABgAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAACEAAAAhAAAAFgAAABYAAAAWAAAAFgAAABYAAAAhAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAFgAAABYAAAAWAAAAFgAAABYAAAAWAAAAIQAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAACEAAAAhAAAAIQAAACEAAAAhAAAAIQAAACEAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIQAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACEAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhAAAAIQAAAA== - ind: "-4,0" @@ -192,14 +192,17 @@ entities: parent: 853 type: Transform - uid: 12 - type: AirlockServiceGlassLocked + type: ToolboxElectricalFilled components: - - name: Bar - type: MetaData - - rot: 4.371139006309477E-08 rad - pos: -7.5,-3.5 + - pos: -29.499815,8.100836 parent: 853 type: Transform + - canCollide: False + type: Physics + - containers: + storagebase: !type:Container + ents: [] + type: ContainerContainer - uid: 13 type: SuspicionShotgunSpawner components: @@ -477,12 +480,13 @@ entities: parent: 853 type: Transform - uid: 51 - type: BoneSaw + type: FirelockElectronics components: - - rot: 4.371139006309477E-08 rad - pos: 19.49593,-21.552101 + - pos: -29.42169,8.819586 parent: 853 type: Transform + - canCollide: False + type: Physics - uid: 52 type: ClothingUnderSocksCoder components: @@ -531,12 +535,13 @@ entities: parent: 853 type: Transform - uid: 58 - type: Scalpel + type: APCElectronics components: - - rot: 4.371139006309477E-08 rad - pos: 19.190952,-21.29313 + - pos: -29.406065,9.491461 parent: 853 type: Transform + - canCollide: False + type: Physics - uid: 59 type: DrinkBottleRum components: @@ -554,10 +559,9 @@ entities: parent: 853 type: Transform - uid: 61 - type: Retractor + type: Window components: - - rot: 4.371139006309477E-08 rad - pos: 19.482815,-21.853302 + - pos: 18.5,-18.5 parent: 853 type: Transform - uid: 62 @@ -568,19 +572,21 @@ entities: parent: 853 type: Transform - uid: 63 - type: SignSurgery + type: APCElectronics components: - - rot: 4.371139006309477E-08 rad - pos: 18.296293,-18.5 + - pos: -29.64044,9.647711 parent: 853 type: Transform + - canCollide: False + type: Physics - uid: 64 - type: Drill + type: FirelockElectronics components: - - rot: 4.371139006309477E-08 rad - pos: 19.515043,-22.566078 + - pos: -29.687315,9.038336 parent: 853 type: Transform + - canCollide: False + type: Physics - uid: 65 type: BedsheetMedical components: @@ -596,10 +602,9 @@ entities: parent: 853 type: Transform - uid: 67 - type: Hemostat + type: Table components: - - rot: 4.371139006309477E-08 rad - pos: 19.655668,-21.300453 + - pos: -5.5,-3.5 parent: 853 type: Transform - uid: 68 @@ -873,25 +878,17 @@ entities: parent: 853 type: Transform - uid: 104 - type: PowerCellSmallStandard + type: Table components: - - parent: 105 - type: Transform - - canCollide: False - type: Physics -- uid: 105 - type: TaserGun - components: - - pos: -14.332562,21.687702 + - pos: -6.5,-3.5 + parent: 853 + type: Transform +- uid: 105 + type: AirlockBarGlassLocked + components: + - pos: -7.5,-3.5 parent: 853 type: Transform - - canCollide: False - type: Physics - - containers: - BatteryBarrel-powercell-container: !type:ContainerSlot - ent: 104 - BatteryBarrel-ammo-container: !type:ContainerSlot {} - type: ContainerContainer - uid: 106 type: WeldingFuelTank components: @@ -960,36 +957,23 @@ entities: ents: [] type: ContainerContainer - uid: 115 - type: Stunbaton + type: Table components: - - pos: -14.563855,20.841572 + - pos: -3.5,-3.5 parent: 853 type: Transform - - canCollide: False - type: Physics - - containers: - cellslot_cell_container: !type:ContainerSlot {} - type: ContainerContainer - uid: 116 - type: PowerCellSmallStandard + type: Table components: - - parent: 117 - type: Transform - - canCollide: False - type: Physics -- uid: 117 - type: TaserGun - components: - - pos: -13.504437,21.656452 + - pos: -4.5,-3.5 + parent: 853 + type: Transform +- uid: 117 + type: TableR + components: + - pos: -13.5,16.5 parent: 853 type: Transform - - canCollide: False - type: Physics - - containers: - BatteryBarrel-powercell-container: !type:ContainerSlot - ent: 116 - BatteryBarrel-ammo-container: !type:ContainerSlot {} - type: ContainerContainer - uid: 118 type: MagazinePistolSmgTopMounted components: @@ -1055,15 +1039,16 @@ entities: ents: [] type: ContainerContainer - uid: 125 - type: Stunbaton + type: BoxFlashbang components: - - pos: -14.48573,20.388447 + - pos: -14.598621,18.594717 parent: 853 type: Transform - canCollide: False type: Physics - containers: - cellslot_cell_container: !type:ContainerSlot {} + storagebase: !type:Container + ents: [] type: ContainerContainer - uid: 126 type: ClothingHeadHatHardhatRed @@ -1111,26 +1096,31 @@ entities: cellslot_cell_container: !type:ContainerSlot {} type: ContainerContainer - uid: 130 - type: Table + type: VendingMachineCoffee components: - - rot: 4.371139006309477E-08 rad - pos: -14.5,20.5 + - pos: -11.5,-17.5 parent: 853 type: Transform - uid: 131 - type: Table + type: Pen components: - - rot: 4.371139006309477E-08 rad - pos: -13.5,21.5 + - pos: 12.830867,11.659111 parent: 853 type: Transform + - canCollide: False + type: Physics - uid: 132 - type: Table + type: ClothingBackpackDuffelSurgeryFilled components: - - rot: 4.371139006309477E-08 rad - pos: -14.5,21.5 + - pos: 19.505754,-21.401302 parent: 853 type: Transform + - canCollide: False + type: Physics + - containers: + storagebase: !type:Container + ents: [] + type: ContainerContainer - uid: 133 type: SignEngineering components: @@ -5350,14 +5340,17 @@ entities: parent: 853 type: Transform - uid: 585 - type: Airlock + type: LockerBoozeFilled components: - - name: Showers - type: MetaData - - rot: 4.371139006309477E-08 rad - pos: -21.5,-4.5 + - pos: -6.5,-6.5 parent: 853 type: Transform + - IsPlaceable: False + type: PlaceableSurface + - containers: + EntityStorageComponent: !type:Container + ents: [] + type: ContainerContainer - uid: 586 type: StoolBar components: @@ -5985,18 +5978,11 @@ entities: parent: 853 type: Transform - uid: 662 - type: WardrobeWhite + type: TableR components: - - rot: 4.371139006309477E-08 rad - pos: 17.5,-22.5 + - pos: -11.5,16.5 parent: 853 type: Transform - - IsPlaceable: False - type: PlaceableSurface - - containers: - EntityStorageComponent: !type:Container - ents: [] - type: ContainerContainer - uid: 663 type: Table components: @@ -6038,10 +6024,11 @@ entities: parent: 853 type: Transform - uid: 668 - type: Window + type: Airlock components: - - rot: 4.371139006309477E-08 rad - pos: 18.5,-18.5 + - name: Bathroom + type: MetaData + - pos: -20.5,-5.5 parent: 853 type: Transform - uid: 669 @@ -6680,17 +6667,19 @@ entities: parent: 853 type: Transform - uid: 757 - type: Table + type: HVWire components: - - rot: 4.371139006309477E-08 rad - pos: -5.5,-3.5 + - pos: 14.5,11.5 parent: 853 type: Transform + - visible: False + type: Sprite + - canCollide: False + type: Physics - uid: 758 - type: Table + type: VendingMachineCigs components: - - rot: 4.371139006309477E-08 rad - pos: -6.5,-3.5 + - pos: 12.5,7.5 parent: 853 type: Transform - uid: 759 @@ -6803,17 +6792,13 @@ entities: ents: [] type: ContainerContainer - uid: 768 - type: LockerEmergencyFilledRandom + type: WeaponCapacitorRecharger components: - - rot: 4.371139006309477E-08 rad - pos: -0.5,14.5 + - pos: -13.5,15.5 parent: 853 type: Transform - - IsPlaceable: False - type: PlaceableSurface - containers: - EntityStorageComponent: !type:Container - ents: [] + WeaponCapacitorCharger-powerCellContainer: !type:ContainerSlot {} type: ContainerContainer - uid: 769 type: PottedPlantRD @@ -6829,8 +6814,7 @@ entities: - uid: 770 type: LockerEmergencyFilledRandom components: - - rot: 4.371139006309477E-08 rad - pos: -21.5,-8.5 + - pos: 0.5,14.5 parent: 853 type: Transform - IsPlaceable: False @@ -6888,18 +6872,11 @@ entities: ents: [] type: ContainerContainer - uid: 775 - type: LockerBombFilled + type: TableWood components: - - rot: 4.371139006309477E-08 rad - pos: -17.5,-17.5 + - pos: 12.5,11.5 parent: 853 type: Transform - - IsPlaceable: False - type: PlaceableSurface - - containers: - EntityStorageComponent: !type:Container - ents: [] - type: ContainerContainer - uid: 776 type: LockerBombFilled components: @@ -7148,18 +7125,13 @@ entities: ents: [] type: ContainerContainer - uid: 795 - type: WardrobeCargoFilled + type: Paper components: - - rot: 4.371139006309477E-08 rad - pos: 23.5,7.5 + - pos: 13.518367,11.690361 parent: 853 type: Transform - - IsPlaceable: False - type: PlaceableSurface - - containers: - EntityStorageComponent: !type:Container - ents: [] - type: ContainerContainer + - canCollide: False + type: Physics - uid: 796 type: PottedPlantRandom components: @@ -7172,44 +7144,26 @@ entities: stash: !type:ContainerSlot {} type: ContainerContainer - uid: 797 - type: WardrobePrisonFilled + type: Table components: - - rot: 4.371139006309477E-08 rad - pos: 0.5,14.5 + - pos: -2.5,-3.5 parent: 853 type: Transform - - IsPlaceable: False - type: PlaceableSurface - - containers: - EntityStorageComponent: !type:Container - ents: [] - type: ContainerContainer - uid: 798 - type: LockerL3JanitorFilled + type: PottedPlantRandom components: - - rot: 4.371139006309477E-08 rad - pos: -19.5,9.5 + - pos: 16.5,7.5 parent: 853 type: Transform - - IsPlaceable: False - type: PlaceableSurface - containers: - EntityStorageComponent: !type:Container - ents: [] + stash: !type:ContainerSlot {} type: ContainerContainer - uid: 799 - type: LockerJanitorFilled + type: TableWood components: - - rot: 4.371139006309477E-08 rad - pos: -19.5,10.5 + - pos: 13.5,11.5 parent: 853 type: Transform - - IsPlaceable: False - type: PlaceableSurface - - containers: - EntityStorageComponent: !type:Container - ents: [] - type: ContainerContainer - uid: 800 type: LockerChefFilled components: @@ -7224,10 +7178,9 @@ entities: ents: [] type: ContainerContainer - uid: 801 - type: WardrobeWhiteFilled + type: LockerJanitorFilled components: - - rot: 4.371139006309477E-08 rad - pos: 7.5,-15.5 + - pos: -19.5,10.5 parent: 853 type: Transform - IsPlaceable: False @@ -7250,10 +7203,9 @@ entities: ents: [] type: ContainerContainer - uid: 803 - type: LockerL3VirologyFilled + type: LockerMedicalFilled components: - - rot: 4.371139006309477E-08 rad - pos: 24.5,-7.5 + - pos: 23.5,-7.5 parent: 853 type: Transform - IsPlaceable: False @@ -7302,18 +7254,11 @@ entities: ents: [] type: ContainerContainer - uid: 807 - type: WardrobeMedicalDoctorFilled + type: VendingMachineClothing components: - - rot: 4.371139006309477E-08 rad - pos: 23.5,-7.5 + - pos: -0.5,18.5 parent: 853 type: Transform - - IsPlaceable: False - type: PlaceableSurface - - containers: - EntityStorageComponent: !type:Container - ents: [] - type: ContainerContainer - uid: 808 type: LockerL3SecurityFilled components: @@ -7368,31 +7313,21 @@ entities: parent: 853 type: Transform - uid: 813 - type: WardrobeEngineeringFilled + type: Paper components: - - rot: 4.371139006309477E-08 rad - pos: 32.5,-4.5 + - pos: 13.315242,11.471611 parent: 853 type: Transform - - IsPlaceable: False - type: PlaceableSurface - - containers: - EntityStorageComponent: !type:Container - ents: [] - type: ContainerContainer + - canCollide: False + type: Physics - uid: 814 - type: WardrobeAtmosphericsFilled + type: Paper components: - - rot: 4.371139006309477E-08 rad - pos: 36.5,10.5 + - pos: -18.90388,-4.330493 parent: 853 type: Transform - - IsPlaceable: False - type: PlaceableSurface - - containers: - EntityStorageComponent: !type:Container - ents: [] - type: ContainerContainer + - canCollide: False + type: Physics - uid: 815 type: LockerAtmosphericsFilled components: @@ -7472,30 +7407,19 @@ entities: ents: [] type: ContainerContainer - uid: 821 - type: WardrobeScienceFilled + type: AirlockMaintBarLocked components: - - rot: 4.371139006309477E-08 rad - pos: -11.5,-17.5 + - pos: -8.5,-6.5 parent: 853 type: Transform - - IsPlaceable: False - type: PlaceableSurface - - containers: - EntityStorageComponent: !type:Container - ents: [] - type: ContainerContainer - uid: 822 - type: LockerL3JanitorFilled + type: ToiletDirtyWater components: - - rot: 4.371139006309477E-08 rad - pos: -13.5,-17.5 + - pos: -19.5,-4.5 parent: 853 type: Transform - - IsPlaceable: False - type: PlaceableSurface - containers: - EntityStorageComponent: !type:Container - ents: [] + stash: !type:ContainerSlot {} type: ContainerContainer - uid: 823 type: LockerGeneric @@ -12780,12 +12704,13 @@ entities: parent: 853 type: Transform - uid: 984 - type: VendingMachineCigs + type: PackPaperRolling components: - - rot: 4.371139006309477E-08 rad - pos: 6.5,23.5 + - pos: -20.454424,-2.014116 parent: 853 type: Transform + - canCollide: False + type: Physics - uid: 985 type: VendingMachineCoffee components: @@ -13319,10 +13244,9 @@ entities: parent: 853 type: Transform - uid: 1048 - type: VendingMachineCoffee + type: Table components: - - rot: 4.371139006309477E-08 rad - pos: -7.5,-17.5 + - pos: -2.5,-4.5 parent: 853 type: Transform - uid: 1049 @@ -14066,18 +13990,12 @@ entities: parent: 853 type: Transform - uid: 1133 - type: WardrobeWhiteFilled + type: PowerCellSmallStandard components: - - rot: 4.371139006309477E-08 rad - pos: 7.5,-14.5 - parent: 853 + - parent: 1566 type: Transform - - IsPlaceable: False - type: PlaceableSurface - - containers: - EntityStorageComponent: !type:Container - ents: [] - type: ContainerContainer + - canCollide: False + type: Physics - uid: 1134 type: LowWall components: @@ -14725,11 +14643,12 @@ entities: - bodyType: Dynamic type: Physics - uid: 1210 - type: Food4NoRaisins + type: PowerCellSmallStandard components: - - pos: -1.7489221,25.142187 - parent: 853 + - parent: 4734 type: Transform + - canCollide: False + type: Physics - uid: 1211 type: PoweredSmallLight components: @@ -14848,14 +14767,11 @@ entities: ents: [] type: ContainerContainer - uid: 1221 - type: Welder + type: ComfyChair components: - - rot: 4.371139006309477E-08 rad - pos: -29.434454,8.191761 + - pos: 12.5,12.5 parent: 853 type: Transform - - qualities: Welding - type: Welder - uid: 1222 type: ComputerPowerMonitoring components: @@ -14877,10 +14793,9 @@ entities: ents: [] type: ContainerContainer - uid: 1224 - type: Multitool + type: TableR components: - - rot: 4.371139006309477E-08 rad - pos: -29.340704,7.4573865 + - pos: -13.5,15.5 parent: 853 type: Transform - uid: 1225 @@ -17996,16 +17911,17 @@ entities: parent: 853 type: Transform - uid: 1566 - type: ShotgunSawn + type: TaserGun components: - - rot: 4.371139006309477E-08 rad - pos: -6.488487,-6.7298017 + - pos: -13.462238,16.135218 parent: 853 type: Transform + - canCollide: False + type: Physics - containers: - BoltActionBarrel-ammo-container: !type:Container - ents: [] - BoltActionBarrel-chamber-container: !type:ContainerSlot {} + BatteryBarrel-powercell-container: !type:ContainerSlot + ent: 1133 + BatteryBarrel-ammo-container: !type:ContainerSlot {} type: ContainerContainer - uid: 1567 type: Catwalk @@ -18393,12 +18309,17 @@ entities: parent: 853 type: Transform - uid: 1620 - type: Table + type: BoxFlashbang components: - - rot: 4.371139006309477E-08 rad - pos: -4.5,-3.5 + - pos: -14.364246,18.782217 parent: 853 type: Transform + - canCollide: False + type: Physics + - containers: + storagebase: !type:Container + ents: [] + type: ContainerContainer - uid: 1621 type: PoweredSmallLight components: @@ -22130,6 +22051,48 @@ entities: pos: 16.5,-0.5 parent: 853 type: Transform +- uid: 2148 + type: TableMetal + components: + - pos: -14.5,20.5 + parent: 853 + type: Transform +- uid: 2149 + type: TableMetal + components: + - pos: -14.5,21.5 + parent: 853 + type: Transform +- uid: 2150 + type: TableMetal + components: + - pos: -13.5,21.5 + parent: 853 + type: Transform +- uid: 2151 + type: SmgDrozd + components: + - pos: -14.411121,19.344717 + parent: 853 + type: Transform + - canCollide: False + type: Physics + - containers: + MagazineBarrel-chamber: !type:ContainerSlot {} + MagazineBarrel-magazine: !type:ContainerSlot + ent: 2152 + type: ContainerContainer +- uid: 2152 + type: MagazineMagnumSmg + components: + - parent: 2151 + type: Transform + - canCollide: False + type: Physics + - containers: + RangedMagazine-magazine: !type:Container + ents: [] + type: ContainerContainer - uid: 2153 type: solid_wall components: @@ -22207,6 +22170,46 @@ entities: pos: 5.5,-10.5 parent: 853 type: Transform +- uid: 2164 + type: SmgDrozd + components: + - pos: -14.442371,19.782217 + parent: 853 + type: Transform + - canCollide: False + type: Physics + - containers: + MagazineBarrel-chamber: !type:ContainerSlot {} + MagazineBarrel-magazine: !type:ContainerSlot + ent: 2165 + type: ContainerContainer +- uid: 2165 + type: MagazineMagnumSmg + components: + - parent: 2164 + type: Transform + - canCollide: False + type: Physics + - containers: + RangedMagazine-magazine: !type:Container + ents: [] + type: ContainerContainer +- uid: 2166 + type: ShellShotgunBeanbag + components: + - pos: -14.442371,21.532217 + parent: 853 + type: Transform + - canCollide: False + type: Physics +- uid: 2167 + type: ShellShotgunBeanbag + components: + - pos: -14.379871,21.500967 + parent: 853 + type: Transform + - canCollide: False + type: Physics - uid: 2168 type: LowWall components: @@ -22284,6 +22287,22 @@ entities: pos: 12.5,-6.5 parent: 853 type: Transform +- uid: 2179 + type: ShellShotgunBeanbag + components: + - pos: -14.286121,21.500967 + parent: 853 + type: Transform + - canCollide: False + type: Physics +- uid: 2180 + type: ShellShotgunBeanbag + components: + - pos: -14.317371,21.485342 + parent: 853 + type: Transform + - canCollide: False + type: Physics - uid: 2181 type: solid_wall components: @@ -23902,12 +23921,18 @@ entities: - canCollide: False type: Physics - uid: 2411 - type: Table + type: ShotgunGladstone components: - - rot: 4.371139006309477E-08 rad - pos: -3.5,-3.5 + - pos: -13.692371,21.641592 parent: 853 type: Transform + - canCollide: False + type: Physics + - containers: + PumpBarrel-ammo-container: !type:Container + ents: [] + PumpBarrel-chamber-container: !type:ContainerSlot {} + type: ContainerContainer - uid: 2412 type: BlockGameArcade components: @@ -24385,19 +24410,26 @@ entities: parent: 853 type: Transform - uid: 2477 - type: solid_wall + type: ShotgunGladstone components: - - rot: 4.371139006309477E-08 rad - pos: -21.5,-5.5 + - pos: -13.895496,21.438467 parent: 853 type: Transform + - canCollide: False + type: Physics + - containers: + PumpBarrel-ammo-container: !type:Container + ents: [] + PumpBarrel-chamber-container: !type:ContainerSlot {} + type: ContainerContainer - uid: 2478 - type: solid_wall + type: ShellShotgunSlug components: - - rot: 4.371139006309477E-08 rad - pos: -21.5,-6.5 + - pos: -14.661121,21.735569 parent: 853 type: Transform + - canCollide: False + type: Physics - uid: 2479 type: solid_wall components: @@ -24773,12 +24805,13 @@ entities: - drawRate: 2000 type: PowerConsumer - uid: 2521 - type: Table + type: ShellShotgunSlug components: - - rot: 4.371139006309477E-08 rad - pos: -2.5,-4.5 + - pos: -14.582996,21.735449 parent: 853 type: Transform + - canCollide: False + type: Physics - uid: 2522 type: SalternApc components: @@ -29925,6 +29958,14 @@ entities: type: Sprite - canCollide: False type: Physics +- uid: 3003 + type: ShellShotgunSlug + components: + - pos: -14.489246,21.735449 + parent: 853 + type: Transform + - canCollide: False + type: Physics - uid: 3004 type: ApcExtensionCable components: @@ -35684,14 +35725,11 @@ entities: - canCollide: False type: Physics - uid: 3579 - type: HVWire + type: ShellShotgunSlug components: - - rot: 4.371139006309477E-08 rad - pos: 14.5,11.5 + - pos: -14.457996,21.735449 parent: 853 type: Transform - - visible: False - type: Sprite - canCollide: False type: Physics - uid: 3580 @@ -39108,12 +39146,13 @@ entities: - startingCharge: 30000 type: Battery - uid: 3904 - type: Table + type: ShellShotgunSlug components: - - rot: 4.371139006309477E-08 rad - pos: -2.5,-3.5 + - pos: -14.395496,21.719717 parent: 853 type: Transform + - canCollide: False + type: Physics - uid: 3905 type: EmergencyLight components: @@ -39439,11 +39478,13 @@ entities: ents: [] type: ContainerContainer - uid: 3940 - type: Crowbar + type: ShellShotgunSlug components: - - pos: -29.463713,8.897233 + - pos: -14.332996,21.704092 parent: 853 type: Transform + - canCollide: False + type: Physics - uid: 3941 type: Crowbar components: @@ -39457,17 +39498,13 @@ entities: parent: 853 type: Transform - uid: 3943 - type: Poweredlight + type: ShellShotgunSlug components: - - rot: 4.71238902409608 rad - pos: -22.00058,-5.6251965 + - pos: -14.286121,21.704092 parent: 853 type: Transform - - powerLoad: 0 - type: PowerReceiver - - containers: - light_bulb: !type:ContainerSlot {} - type: ContainerContainer + - canCollide: False + type: Physics - uid: 3944 type: ApcExtensionCable components: @@ -39737,6 +39774,14 @@ entities: DisposalTransit: !type:Container ents: [] type: ContainerContainer +- uid: 3973 + type: ShellShotgunBeanbag + components: + - pos: -14.735261,21.532217 + parent: 853 + type: Transform + - canCollide: False + type: Physics - uid: 3974 type: ApcExtensionCable components: @@ -40144,6 +40189,14 @@ entities: type: Transform - airBlocked: False type: Airtight +- uid: 4020 + type: ShellShotgunBeanbag + components: + - pos: -14.692371,21.516592 + parent: 853 + type: Transform + - canCollide: False + type: Physics - uid: 4021 type: ApcExtensionCable components: @@ -40441,11 +40494,13 @@ entities: - airBlocked: False type: Airtight - uid: 4057 - type: PlushieCarp + type: ShellShotgunBeanbag components: - - pos: -4.134902,-3.2616267 + - pos: -14.598621,21.516592 parent: 853 type: Transform + - canCollide: False + type: Physics - uid: 4058 type: PianoInstrument components: @@ -40454,11 +40509,13 @@ entities: parent: 853 type: Transform - uid: 4059 - type: FoodMint + type: ShellShotgunFlash components: - - pos: -2.5880268,-3.3710017 + - pos: -14.73512,21.063467 parent: 853 type: Transform + - canCollide: False + type: Physics - uid: 4060 type: solid_wall components: @@ -40643,12 +40700,13 @@ entities: - startingCharge: 12224.357 type: Battery - uid: 4082 - type: AirlockMaint + type: Skub components: - - rot: 4.371139006309477E-08 rad - pos: -8.5,-6.5 + - pos: -40.49734,4.5469456 parent: 853 type: Transform + - canCollide: False + type: Physics - uid: 4083 type: Table components: @@ -42068,15 +42126,13 @@ entities: parent: 853 type: Transform - uid: 4261 - type: BoxFlashbang + type: ShellShotgunFlash components: - - pos: -14.43611,19.60069 + - pos: -14.567371,21.047842 parent: 853 type: Transform - - containers: - storagebase: !type:Container - ents: [] - type: ContainerContainer + - canCollide: False + type: Physics - uid: 4262 type: CarpetBlue components: @@ -45990,4 +46046,273 @@ entities: - pos: -36.5,4.5 parent: 853 type: Transform +- uid: 4724 + type: ShellShotgunFlash + components: + - pos: -14.426746,21.047842 + parent: 853 + type: Transform + - canCollide: False + type: Physics +- uid: 4725 + type: ShellShotgunFlash + components: + - pos: -14.270496,21.032217 + parent: 853 + type: Transform + - canCollide: False + type: Physics +- uid: 4726 + type: MagazinePistolSmgRubber + components: + - pos: -14.7352915,20.360342 + parent: 853 + type: Transform + - canCollide: False + type: Physics + - containers: + RangedMagazine-magazine: !type:Container + ents: [] + type: ContainerContainer +- uid: 4727 + type: MagazinePistolSmgRubber + components: + - pos: -14.457996,20.344717 + parent: 853 + type: Transform + - canCollide: False + type: Physics + - containers: + RangedMagazine-magazine: !type:Container + ents: [] + type: ContainerContainer +- uid: 4728 + type: MagazinePistolSmgRubber + components: + - pos: -14.239246,20.360342 + parent: 853 + type: Transform + - canCollide: False + type: Physics + - containers: + RangedMagazine-magazine: !type:Container + ents: [] + type: ContainerContainer +- uid: 4729 + type: Flash + components: + - pos: -4.959754,13.575671 + parent: 853 + type: Transform + - canCollide: False + type: Physics +- uid: 4730 + type: Stunbaton + components: + - pos: -11.587238,16.635218 + parent: 853 + type: Transform + - canCollide: False + type: Physics + - containers: + cellslot_cell_container: !type:ContainerSlot {} + type: ContainerContainer +- uid: 4731 + type: Stunbaton + components: + - pos: -11.305988,16.541468 + parent: 853 + type: Transform + - canCollide: False + type: Physics + - containers: + cellslot_cell_container: !type:ContainerSlot {} + type: ContainerContainer +- uid: 4732 + type: TaserGun + components: + - pos: -13.462238,16.735422 + parent: 853 + type: Transform + - canCollide: False + type: Physics + - containers: + BatteryBarrel-powercell-container: !type:ContainerSlot + ent: 4733 + BatteryBarrel-ammo-container: !type:ContainerSlot {} + type: ContainerContainer +- uid: 4733 + type: PowerCellSmallStandard + components: + - parent: 4732 + type: Transform + - canCollide: False + type: Physics +- uid: 4734 + type: TaserGun + components: + - pos: -13.462238,16.432093 + parent: 853 + type: Transform + - canCollide: False + type: Physics + - containers: + BatteryBarrel-powercell-container: !type:ContainerSlot + ent: 1210 + BatteryBarrel-ammo-container: !type:ContainerSlot {} + type: ContainerContainer +- uid: 4735 + type: solid_wall + components: + - pos: -20.5,-4.5 + parent: 853 + type: Transform +- uid: 4736 + type: TableWood + components: + - pos: -23.5,-6.5 + parent: 853 + type: Transform +- uid: 4737 + type: TableWood + components: + - pos: -23.5,-5.5 + parent: 853 + type: Transform +- uid: 4738 + type: TableWood + components: + - pos: -24.5,-6.5 + parent: 853 + type: Transform +- uid: 4739 + type: TableWood + components: + - pos: -24.5,-5.5 + parent: 853 + type: Transform +- uid: 4740 + type: Chair + components: + - pos: -24.5,-4.5 + parent: 853 + type: Transform +- uid: 4741 + type: Chair + components: + - rot: 3.141592653589793 rad + pos: -23.5,-7.5 + parent: 853 + type: Transform +- uid: 4742 + type: ChairWood + components: + - rot: -1.5707963267948966 rad + pos: -22.5,-6.5 + parent: 853 + type: Transform +- uid: 4743 + type: ChairOfficeLight + components: + - rot: 1.5707963267948966 rad + pos: -30.5,-8.5 + parent: 853 + type: Transform +- uid: 4744 + type: ChairOfficeLight + components: + - rot: 1.5707963267948966 rad + pos: -29.5,-8.5 + parent: 853 + type: Transform +- uid: 4745 + type: Paper + components: + - rot: 1.5707963267948966 rad + pos: -23.629866,-5.34983 + parent: 853 + type: Transform + - canCollide: False + type: Physics +- uid: 4746 + type: Paper + components: + - rot: 1.5707963267948966 rad + pos: -24.67674,-6.28733 + parent: 853 + type: Transform + - canCollide: False + type: Physics +- uid: 4747 + type: Paper + components: + - rot: 1.5707963267948966 rad + pos: -23.973616,-6.25608 + parent: 853 + type: Transform + - canCollide: False + type: Physics +- uid: 4748 + type: Pen + components: + - rot: 1.5707963267948966 rad + pos: -24.39549,-5.146705 + parent: 853 + type: Transform + - canCollide: False + type: Physics +- uid: 4749 + type: Pen + components: + - rot: 1.5707963267948966 rad + pos: -23.348616,-6.28733 + parent: 853 + type: Transform + - canCollide: False + type: Physics +- uid: 4750 + type: Pen + components: + - rot: 1.5707963267948966 rad + pos: -23.973616,-5.709205 + parent: 853 + type: Transform + - canCollide: False + type: Physics +- uid: 4751 + type: ToyFireRipley + components: + - rot: 1.5707963267948966 rad + pos: -24.567366,-5.66233 + parent: 853 + type: Transform + - canCollide: False + type: Physics +- uid: 4752 + type: ToyMarauder + components: + - rot: 1.5707963267948966 rad + pos: -23.39549,-5.740455 + parent: 853 + type: Transform + - canCollide: False + type: Physics +- uid: 4753 + type: d10 + components: + - rot: 1.5707963267948966 rad + pos: -24.33299,-6.459205 + parent: 853 + type: Transform + - canCollide: False + type: Physics +- uid: 4754 + type: d20 + components: + - rot: 1.5707963267948966 rad + pos: -23.92674,-5.302955 + parent: 853 + type: Transform + - canCollide: False + type: Physics ... diff --git a/Resources/Prototypes/AccessLevels/service.yml b/Resources/Prototypes/AccessLevels/service.yml index c509e8df6f..e1c4883bbc 100644 --- a/Resources/Prototypes/AccessLevels/service.yml +++ b/Resources/Prototypes/AccessLevels/service.yml @@ -1,5 +1,5 @@ -#- type: accessLevel -# id: Bar +- type: accessLevel + id: Bar #- type: accessLevel # id: Kitchen diff --git a/Resources/Prototypes/Catalog/Fills/Storage/Crates/armory.yml b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml similarity index 100% rename from Resources/Prototypes/Catalog/Fills/Storage/Crates/armory.yml rename to Resources/Prototypes/Catalog/Fills/Crates/armory.yml diff --git a/Resources/Prototypes/Catalog/Fills/Storage/Crates/botany.yml b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml similarity index 100% rename from Resources/Prototypes/Catalog/Fills/Storage/Crates/botany.yml rename to Resources/Prototypes/Catalog/Fills/Crates/botany.yml diff --git a/Resources/Prototypes/Catalog/Fills/Storage/Crates/emergency.yml b/Resources/Prototypes/Catalog/Fills/Crates/emergency.yml similarity index 100% rename from Resources/Prototypes/Catalog/Fills/Storage/Crates/emergency.yml rename to Resources/Prototypes/Catalog/Fills/Crates/emergency.yml diff --git a/Resources/Prototypes/Catalog/Fills/Storage/Crates/engineering.yml b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml similarity index 100% rename from Resources/Prototypes/Catalog/Fills/Storage/Crates/engineering.yml rename to Resources/Prototypes/Catalog/Fills/Crates/engineering.yml diff --git a/Resources/Prototypes/Catalog/Fills/Storage/Crates/engines.yml b/Resources/Prototypes/Catalog/Fills/Crates/engines.yml similarity index 100% rename from Resources/Prototypes/Catalog/Fills/Storage/Crates/engines.yml rename to Resources/Prototypes/Catalog/Fills/Crates/engines.yml diff --git a/Resources/Prototypes/Catalog/Fills/Storage/Crates/food.yml b/Resources/Prototypes/Catalog/Fills/Crates/food.yml similarity index 100% rename from Resources/Prototypes/Catalog/Fills/Storage/Crates/food.yml rename to Resources/Prototypes/Catalog/Fills/Crates/food.yml diff --git a/Resources/Prototypes/Catalog/Fills/Storage/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml similarity index 100% rename from Resources/Prototypes/Catalog/Fills/Storage/Crates/fun.yml rename to Resources/Prototypes/Catalog/Fills/Crates/fun.yml diff --git a/Resources/Prototypes/Catalog/Fills/Storage/Crates/materials.yml b/Resources/Prototypes/Catalog/Fills/Crates/materials.yml similarity index 100% rename from Resources/Prototypes/Catalog/Fills/Storage/Crates/materials.yml rename to Resources/Prototypes/Catalog/Fills/Crates/materials.yml diff --git a/Resources/Prototypes/Catalog/Fills/Storage/Crates/medical.yml b/Resources/Prototypes/Catalog/Fills/Crates/medical.yml similarity index 100% rename from Resources/Prototypes/Catalog/Fills/Storage/Crates/medical.yml rename to Resources/Prototypes/Catalog/Fills/Crates/medical.yml diff --git a/Resources/Prototypes/Catalog/Fills/Storage/Crates/npc.yml b/Resources/Prototypes/Catalog/Fills/Crates/npc.yml similarity index 100% rename from Resources/Prototypes/Catalog/Fills/Storage/Crates/npc.yml rename to Resources/Prototypes/Catalog/Fills/Crates/npc.yml diff --git a/Resources/Prototypes/Catalog/Fills/Storage/Crates/science.yml b/Resources/Prototypes/Catalog/Fills/Crates/science.yml similarity index 100% rename from Resources/Prototypes/Catalog/Fills/Storage/Crates/science.yml rename to Resources/Prototypes/Catalog/Fills/Crates/science.yml diff --git a/Resources/Prototypes/Catalog/Fills/Storage/Crates/security.yml b/Resources/Prototypes/Catalog/Fills/Crates/security.yml similarity index 100% rename from Resources/Prototypes/Catalog/Fills/Storage/Crates/security.yml rename to Resources/Prototypes/Catalog/Fills/Crates/security.yml diff --git a/Resources/Prototypes/Catalog/Fills/Storage/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml similarity index 100% rename from Resources/Prototypes/Catalog/Fills/Storage/Crates/service.yml rename to Resources/Prototypes/Catalog/Fills/Crates/service.yml diff --git a/Resources/Prototypes/Catalog/Fills/Storage/Lockers/engineer.yml b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml similarity index 97% rename from Resources/Prototypes/Catalog/Fills/Storage/Lockers/engineer.yml rename to Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml index b1ca35303e..a9f292ddb6 100644 --- a/Resources/Prototypes/Catalog/Fills/Storage/Lockers/engineer.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml @@ -89,7 +89,9 @@ - name: ClothingOuterHardsuitEngineering - name: ClothingMaskBreath - name: OxygenTankFilled - + - name: ClothingShoesBootsMag + prob: 0.15 + - type: entity id: LockerRadiationSuitFilled parent: LockerRadiationSuit diff --git a/Resources/Prototypes/Catalog/Fills/Storage/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml similarity index 99% rename from Resources/Prototypes/Catalog/Fills/Storage/Lockers/heads.yml rename to Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index 613c3fd52a..2bbf865a85 100644 --- a/Resources/Prototypes/Catalog/Fills/Storage/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -104,6 +104,7 @@ - name: ClothingEyesGlassesMeson - name: ClothingBeltChiefEngineerFilled - name: ClothingHeadHatBeretEngineering + - name: ClothingShoesBootsMag - name: CigarCase prob: 0.15 diff --git a/Resources/Prototypes/Catalog/Fills/Storage/Lockers/l3.yml b/Resources/Prototypes/Catalog/Fills/Lockers/l3.yml similarity index 100% rename from Resources/Prototypes/Catalog/Fills/Storage/Lockers/l3.yml rename to Resources/Prototypes/Catalog/Fills/Lockers/l3.yml diff --git a/Resources/Prototypes/Catalog/Fills/Storage/Lockers/medical.yml b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml similarity index 100% rename from Resources/Prototypes/Catalog/Fills/Storage/Lockers/medical.yml rename to Resources/Prototypes/Catalog/Fills/Lockers/medical.yml diff --git a/Resources/Prototypes/Catalog/Fills/Storage/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml similarity index 100% rename from Resources/Prototypes/Catalog/Fills/Storage/Lockers/misc.yml rename to Resources/Prototypes/Catalog/Fills/Lockers/misc.yml diff --git a/Resources/Prototypes/Catalog/Fills/Storage/Lockers/readmebeforeadding.txt b/Resources/Prototypes/Catalog/Fills/Lockers/readmebeforeadding.txt similarity index 100% rename from Resources/Prototypes/Catalog/Fills/Storage/Lockers/readmebeforeadding.txt rename to Resources/Prototypes/Catalog/Fills/Lockers/readmebeforeadding.txt diff --git a/Resources/Prototypes/Catalog/Fills/Storage/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml similarity index 100% rename from Resources/Prototypes/Catalog/Fills/Storage/Lockers/security.yml rename to Resources/Prototypes/Catalog/Fills/Lockers/security.yml diff --git a/Resources/Prototypes/Catalog/Fills/Storage/Lockers/service.yml b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml similarity index 100% rename from Resources/Prototypes/Catalog/Fills/Storage/Lockers/service.yml rename to Resources/Prototypes/Catalog/Fills/Lockers/service.yml diff --git a/Resources/Prototypes/Catalog/Fills/Storage/Lockers/wardrobe_colors.yml b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_colors.yml similarity index 100% rename from Resources/Prototypes/Catalog/Fills/Storage/Lockers/wardrobe_colors.yml rename to Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_colors.yml diff --git a/Resources/Prototypes/Catalog/Fills/Storage/Lockers/wardrobe_job.yml b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml similarity index 53% rename from Resources/Prototypes/Catalog/Fills/Storage/Lockers/wardrobe_job.yml rename to Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml index 10f3b1e93f..9391765f7d 100644 --- a/Resources/Prototypes/Catalog/Fills/Storage/Lockers/wardrobe_job.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/wardrobe_job.yml @@ -1,7 +1,7 @@ -- type: entity - id: WardrobePrisonFilled - suffix: Filled - parent: WardrobePrison +# - type: entity +# id: WardrobePrisonFilled +# suffix: Filled +# parent: WardrobePrison #- type: entity # id: WardrobePajamaFilled @@ -29,25 +29,25 @@ # suffix: Filled # parent: WardrobeVirology -- type: entity - id: WardrobeScienceFilled - suffix: Filled - parent: WardrobeScience +# - type: entity +# id: WardrobeScienceFilled +# suffix: Filled +# parent: WardrobeScience # - type: entity # id: WardrobeBotanistFilled # suffix: Filled # parent: WardrobeBotanist -- type: entity - id: WardrobeMedicalDoctorFilled - suffix: Filled - parent: WardrobeMedicalDoctor - components: - - type: StorageFill - contents: - - name: ClothingHandsGlovesLatex - prob: 0.4 +# - type: entity +# id: WardrobeMedicalDoctorFilled +# suffix: Filled +# parent: WardrobeMedicalDoctor +# components: +# - type: StorageFill +# contents: +# - name: ClothingHandsGlovesLatex +# prob: 0.4 # - type: entity # id: WardrobeChapelFilled @@ -59,17 +59,17 @@ # suffix: Filled # parent: WardrobeSecurity -- type: entity - id: WardrobeCargoFilled - suffix: Filled - parent: WardrobeCargo +# - type: entity +# id: WardrobeCargoFilled +# suffix: Filled +# parent: WardrobeCargo -- type: entity - id: WardrobeAtmosphericsFilled - suffix: Filled - parent: WardrobeAtmospherics +# - type: entity +# id: WardrobeAtmosphericsFilled +# suffix: Filled +# parent: WardrobeAtmospherics -- type: entity - id: WardrobeEngineeringFilled - suffix: Filled - parent: WardrobeEngineering +# - type: entity +# id: WardrobeEngineeringFilled +# suffix: Filled +# parent: WardrobeEngineering diff --git a/Resources/Prototypes/Entities/Constructible/Doors/airlock_access.yml b/Resources/Prototypes/Entities/Constructible/Doors/airlock_access.yml index d477478015..a917721474 100644 --- a/Resources/Prototypes/Entities/Constructible/Doors/airlock_access.yml +++ b/Resources/Prototypes/Entities/Constructible/Doors/airlock_access.yml @@ -96,6 +96,14 @@ - type: AccessReader access: [["Service"]] +- type: entity + parent: AirlockGlass + id: AirlockBarGlassLocked + suffix: Bar, Locked + components: + - type: AccessReader + access: [["Bar"]] + - type: entity parent: AirlockEngineeringGlass id: AirlockEngineeringGlassLocked @@ -185,6 +193,14 @@ - type: AccessReader access: [["Engineering"]] +- type: entity + parent: AirlockMaint + id: AirlockMaintBarLocked + suffix: Bar, Locked + components: + - type: AccessReader + access: [["Bar"]] + - type: entity parent: AirlockMaint id: AirlockMaintIntLocked diff --git a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/bar.yml b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/bar.yml index 2977b66400..9eb47b1d76 100644 --- a/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/bar.yml +++ b/Resources/Prototypes/Entities/Constructible/Storage/Closets/Secure/bar.yml @@ -9,4 +9,4 @@ - type: StorageVisualizer state: cabinet - type: AccessReader - access: [["Service"]] + access: [["Bar"]] diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml index 4801cbc799..9e1323e879 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml @@ -9,6 +9,7 @@ access: - Service - Maintenance + - Bar - type: startingGear id: BartenderGear