From 379cc7d7f1245a4bd30bd551bca0a31d658e2a82 Mon Sep 17 00:00:00 2001 From: BIGZi0348 Date: Tue, 17 Dec 2024 23:09:14 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=B0=D1=80=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Maps/_Honk/Stations/DryDock.yml | 111 +++---- Resources/Maps/_Honk/Stations/Meta.yml | 119 +++++--- Resources/Maps/_Honk/Stations/Polaris.yml | 305 +++++--------------- Resources/Maps/_Honk/Stations/Triumph.yml | 37 ++- Resources/Maps/_Honk/Stations/WhiteBox.yml | 50 +++- Resources/Maps/_Honk/Stations/WonderBox.yml | 65 ++++- Resources/Prototypes/Maps/Polaris.yml | 1 + Resources/Prototypes/Maps/Triumph.yml | 1 + Resources/Prototypes/Maps/meta.yml | 1 + 9 files changed, 318 insertions(+), 372 deletions(-) diff --git a/Resources/Maps/_Honk/Stations/DryDock.yml b/Resources/Maps/_Honk/Stations/DryDock.yml index cc44c41367..e0cca0461c 100644 --- a/Resources/Maps/_Honk/Stations/DryDock.yml +++ b/Resources/Maps/_Honk/Stations/DryDock.yml @@ -12743,6 +12743,11 @@ entities: rot: -1.5707963267948966 rad pos: -93.5,3.5 parent: 2 + - uid: 338 + components: + - type: Transform + pos: -141.5,4.5 + parent: 2 - proto: AirlockDetectiveGlassLocked entities: - uid: 124 @@ -13978,13 +13983,6 @@ entities: - type: Transform pos: -138.5,3.5 parent: 2 -- proto: AirlockSecurityLawyerLocked - entities: - - uid: 338 - components: - - type: Transform - pos: -141.5,4.5 - parent: 2 - proto: AirlockShuttle entities: - uid: 339 @@ -47972,15 +47970,6 @@ entities: - type: Transform pos: -170.68552,14.30678 parent: 2 -- proto: ClothingOuterHardsuitBrigmedic - entities: - - uid: 6687 - components: - - type: Transform - parent: 6686 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: ClothingOuterHardsuitEngineering entities: - uid: 6621 @@ -79921,7 +79910,7 @@ entities: - type: PointLight color: '#D56C6CFF' enabled: True -- proto: LockerBrigmedicFilled +- proto: LockerBrigmedicFilledHardsuit entities: - uid: 6686 components: @@ -79931,43 +79920,6 @@ entities: - type: PointLight color: '#D56C6CFF' enabled: True - - 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 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 6687 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: LockerCaptainFilledNoLaser entities: - uid: 11374 @@ -80468,9 +80420,9 @@ entities: - type: PointLight color: '#D56C6CFF' enabled: True -- proto: LockerInspectorFilled +- proto: LockerInspectorFilledHardsuit entities: - - uid: 11401 + - uid: 6687 components: - type: Transform pos: -142.5,5.5 @@ -92183,6 +92135,13 @@ entities: - type: Transform pos: -93.5,-7.5 parent: 2 +- proto: SpawnMobAlexander + entities: + - uid: 13299 + components: + - type: Transform + pos: -111.5,-13.5 + parent: 2 - proto: SpawnMobBandito entities: - uid: 9524 @@ -92198,13 +92157,6 @@ entities: - type: Transform pos: -186.5,-8.5 parent: 2 -- proto: SpawnMobCatFloppa - entities: - - uid: 13297 - components: - - type: Transform - pos: -43.5,-16.5 - parent: 2 - proto: SpawnMobCatKitten entities: - uid: 13298 @@ -92212,13 +92164,6 @@ entities: - type: Transform pos: -114.5,-11.5 parent: 2 -- proto: SpawnMobCatSpace - entities: - - uid: 13299 - components: - - type: Transform - pos: -64.5,20.5 - parent: 2 - proto: SpawnMobCorgi entities: - uid: 13300 @@ -92228,6 +92173,11 @@ entities: parent: 2 - proto: SpawnMobCrabAtmos entities: + - uid: 13297 + components: + - type: Transform + pos: -64.5,20.5 + parent: 2 - uid: 13301 components: - type: Transform @@ -92304,6 +92254,20 @@ entities: rot: 3.141592653589793 rad pos: -157.5,17.5 parent: 2 +- proto: SpawnMobSlothPaperwork + entities: + - uid: 11401 + components: + - type: Transform + pos: -43.5,-16.5 + parent: 2 +- proto: SpawnMobSmile + entities: + - uid: 16873 + components: + - type: Transform + pos: -196.5,2.5 + parent: 2 - proto: SpawnMobSpiderSalvage entities: - uid: 13312 @@ -92316,6 +92280,13 @@ entities: - type: Transform pos: -53.5,50.5 parent: 2 +- proto: SpawnMobWalter + entities: + - uid: 16874 + components: + - type: Transform + pos: -189.5,-25.5 + parent: 2 - proto: SpawnPointAtmos entities: - uid: 13314 diff --git a/Resources/Maps/_Honk/Stations/Meta.yml b/Resources/Maps/_Honk/Stations/Meta.yml index 826979e56e..401e1699c7 100644 --- a/Resources/Maps/_Honk/Stations/Meta.yml +++ b/Resources/Maps/_Honk/Stations/Meta.yml @@ -6464,7 +6464,8 @@ entities: -6,7: 0: 65535 -5,7: - 0: 65535 + 0: 65023 + 2: 512 0,7: 0: 65535 1,6: @@ -6963,18 +6964,18 @@ entities: 0: 65535 12,-8: 0: 30591 - 2: 34944 + 3: 34944 13,-8: 0: 17487 - 2: 13104 - 3: 34944 + 3: 13104 + 4: 34944 13,-7: 0: 65535 13,-6: 0: 65535 14,-8: 0: 52431 - 3: 13104 + 4: 13104 14,-7: 0: 65535 14,-6: @@ -6995,44 +6996,44 @@ entities: 0: 65535 16,-4: 0: 32631 - 4: 136 - 5: 32768 + 5: 136 + 6: 32768 16,-3: 0: 32631 - 5: 32904 + 6: 32904 16,-2: 0: 65399 - 5: 136 + 6: 136 16,-1: 0: 13299 17,-4: - 4: 51 + 5: 51 0: 53196 - 5: 12288 + 6: 12288 17,-3: - 5: 12339 + 6: 12339 0: 53196 17,-2: - 5: 51 + 6: 51 0: 65484 16,-7: 0: 65522 16,-6: 0: 32767 - 5: 32768 + 6: 32768 16,-5: 0: 32631 - 5: 136 - 4: 32768 + 6: 136 + 5: 32768 17,-7: 0: 65527 17,-6: 0: 53247 - 5: 12288 + 6: 12288 17,-5: - 5: 51 + 6: 51 0: 53196 - 4: 12288 + 5: 12288 12,-9: 0: 61941 13,-9: @@ -7165,12 +7166,12 @@ entities: 0: 8930 16,-8: 0: 60395 - 5: 4 + 6: 4 17,-8: 0: 65535 18,-8: 0: 12914 - 5: 137 + 6: 137 18,-7: 0: 47858 18,-6: @@ -7195,19 +7196,19 @@ entities: 0: 3983 16,-9: 0: 59951 - 5: 1216 + 6: 1216 17,-9: 0: 65375 - 5: 160 + 6: 160 17,-10: 0: 40960 - 5: 24560 + 6: 24560 18,-10: 0: 4096 - 5: 8976 + 6: 8976 18,-9: 0: 12896 - 5: 35227 + 6: 35227 10,-10: 0: 63249 10,-9: @@ -7676,7 +7677,7 @@ entities: 0: 65535 3,-14: 0: 61713 - 5: 3822 + 6: 3822 3,-13: 0: 65535 -2,-16: @@ -8186,11 +8187,11 @@ entities: 20,7: 0: 4369 19,-8: - 5: 51 + 6: 51 16,-10: - 5: 60608 + 6: 60608 19,-9: - 5: 13107 + 6: 13107 uniqueMixes: - volume: 2500 temperature: 293.15 @@ -8238,6 +8239,29 @@ entities: - 0 - 0 - 0 + - volume: 2500 + temperature: 293.14975 + moles: + - 20.078888 + - 75.53487 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 - volume: 2500 temperature: 293.15 moles: @@ -57897,8 +57921,10 @@ entities: - uid: 9457 components: - type: Transform - pos: 1.5189121,50.574677 + pos: 1.4678519,50.569218 parent: 2 + - type: Foldable + folded: True - uid: 9458 components: - type: Transform @@ -118088,6 +118114,16 @@ entities: - type: PointLight color: '#D56C6CFF' enabled: True +- proto: LockerBrigmedicFilledHardsuit + entities: + - uid: 17988 + components: + - type: Transform + pos: -18.5,30.5 + parent: 2 + - type: PointLight + color: '#D56C6CFF' + enabled: True - proto: LockerCaptainFilled entities: - uid: 17946 @@ -119450,14 +119486,6 @@ entities: - 0 - 0 - 0 - - uid: 17988 - components: - - type: Transform - pos: -18.5,30.5 - parent: 2 - - type: PointLight - color: '#D56C6CFF' - enabled: True - proto: LockerParamedicFilled entities: - uid: 17989 @@ -130524,14 +130552,14 @@ entities: pos: 43.381737,8.657005 parent: 2 - type: RCDAmmo - charges: 757 + charges: 1135 - uid: 19552 components: - type: Transform pos: 43.631737,8.657005 parent: 2 - type: RCDAmmo - charges: 757 + charges: 1135 - proto: ReagentContainerFlour entities: - uid: 19553 @@ -139697,7 +139725,7 @@ entities: - type: Transform pos: 26.5,-1.5 parent: 2 -- proto: SpawnMobCat +- proto: SpawnMobCatRuntime entities: - uid: 21154 components: @@ -139931,6 +139959,13 @@ entities: - type: Transform pos: 35.5,-22.5 parent: 2 +- proto: SpawnPointBrigmedic + entities: + - uid: 26812 + components: + - type: Transform + pos: -17.5,30.5 + parent: 2 - proto: SpawnPointCaptain entities: - uid: 21188 diff --git a/Resources/Maps/_Honk/Stations/Polaris.yml b/Resources/Maps/_Honk/Stations/Polaris.yml index e470bc556b..f0357a5557 100644 --- a/Resources/Maps/_Honk/Stations/Polaris.yml +++ b/Resources/Maps/_Honk/Stations/Polaris.yml @@ -138720,15 +138720,6 @@ entities: - type: Transform pos: -53.477573,83.88844 parent: 2 -- proto: ClothingBackpackSecurity - entities: - - uid: 21646 - components: - - type: Transform - parent: 21645 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: ClothingBeltChiefEngineerFilled entities: - uid: 14405 @@ -138970,13 +138961,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage - - uid: 21647 - components: - - type: Transform - parent: 21645 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: ClothingBeltUtility entities: - uid: 22005 @@ -139466,15 +139450,6 @@ entities: - type: InsideEntityStorage - proto: ClothingEyesGlassesSunglasses entities: - - uid: 21648 - components: - - type: MetaData - name: очки авиаторы - - type: Transform - parent: 21645 - - type: Physics - canCollide: False - - type: InsideEntityStorage - uid: 22229 components: - type: Transform @@ -140059,13 +140034,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage - - uid: 22347 - components: - - type: Transform - parent: 22346 - - type: Physics - canCollide: False - - type: InsideEntityStorage - uid: 22355 components: - type: Transform @@ -140322,13 +140290,6 @@ entities: parent: 2 - proto: ClothingHeadHatBeret entities: - - uid: 21649 - components: - - type: Transform - parent: 21645 - - type: Physics - canCollide: False - - type: InsideEntityStorage - uid: 22432 components: - type: Transform @@ -141877,13 +141838,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage - - uid: 22348 - components: - - type: Transform - parent: 22346 - - type: Physics - canCollide: False - - type: InsideEntityStorage - uid: 22356 components: - type: Transform @@ -142355,13 +142309,6 @@ entities: - type: InsideEntityStorage - proto: ClothingOuterCoatBomber entities: - - uid: 21650 - components: - - type: Transform - parent: 21645 - - type: Physics - canCollide: False - - type: InsideEntityStorage - uid: 22621 components: - type: Transform @@ -143435,13 +143382,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage - - uid: 22349 - components: - - type: Transform - parent: 22346 - - type: Physics - canCollide: False - - type: InsideEntityStorage - uid: 22357 components: - type: Transform @@ -143889,13 +143829,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage - - uid: 21651 - components: - - type: Transform - parent: 21645 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: ClothingShoesBootsMag entities: - uid: 21700 @@ -144150,13 +144083,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage - - uid: 22350 - components: - - type: Transform - parent: 22346 - - type: Physics - canCollide: False - - type: InsideEntityStorage - uid: 22358 components: - type: Transform @@ -145417,15 +145343,6 @@ entities: - type: Transform pos: -144.45511,107.34856 parent: 2 -- proto: ClothingUniformJumpsuitSec - entities: - - uid: 21652 - components: - - type: Transform - parent: 21645 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: ClothingUniformJumpsuitSerafimSalvageSpecialist entities: - uid: 22683 @@ -162170,13 +162087,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage - - uid: 21653 - components: - - type: Transform - parent: 21645 - - type: Physics - canCollide: False - - type: InsideEntityStorage - proto: Floodlight entities: - uid: 24882 @@ -200399,13 +200309,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage - - uid: 22351 - components: - - type: Transform - parent: 22346 - - type: Physics - canCollide: False - - type: InsideEntityStorage - uid: 22359 components: - type: Transform @@ -201141,6 +201044,16 @@ entities: - type: PointLight color: '#D56C6CFF' enabled: True +- proto: LockerBrigmedicFilledHardsuit + entities: + - uid: 21645 + components: + - type: Transform + pos: 19.5,61.5 + parent: 2 + - type: PointLight + color: '#D56C6CFF' + enabled: True - proto: LockerCaptainFilled entities: - uid: 22660 @@ -203963,63 +203876,6 @@ entities: - type: PointLight color: '#D56C6CFF' enabled: True -- proto: LockerSecurity - entities: - - uid: 21645 - components: - - type: MetaData - name: шкаф пилота службы безопасности - - type: Transform - pos: 19.5,62.5 - parent: 2 - - type: PointLight - color: '#D56C6CFF' - enabled: True - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 1.8856695 - - 7.0937095 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 21647 - - 21649 - - 21650 - - 21651 - - 21654 - - 21648 - - 21653 - - 21646 - - 21652 - paper_label: !type:ContainerSlot - showEnts: False - occludes: True - ent: null - proto: LockerSecurityFilled entities: - uid: 22448 @@ -206396,13 +206252,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage - - uid: 22352 - components: - - type: Transform - parent: 22346 - - type: Physics - canCollide: False - - type: InsideEntityStorage - uid: 22360 components: - type: Transform @@ -207463,13 +207312,6 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage - - uid: 22353 - components: - - type: Transform - parent: 22346 - - type: Physics - canCollide: False - - type: InsideEntityStorage - uid: 22361 components: - type: Transform @@ -214828,7 +214670,7 @@ entities: - type: Transform parent: 14513 - type: RCDAmmo - charges: 100 + charges: 150 - type: Physics canCollide: False - type: InsideEntityStorage @@ -214837,7 +214679,7 @@ entities: - type: Transform parent: 14513 - type: RCDAmmo - charges: 100 + charges: 150 - type: Physics canCollide: False - type: InsideEntityStorage @@ -214846,7 +214688,7 @@ entities: - type: Transform parent: 14523 - type: RCDAmmo - charges: 100 + charges: 150 - type: Physics canCollide: False - type: InsideEntityStorage @@ -214855,7 +214697,7 @@ entities: - type: Transform parent: 14523 - type: RCDAmmo - charges: 100 + charges: 150 - type: Physics canCollide: False - type: InsideEntityStorage @@ -214865,21 +214707,21 @@ entities: pos: -22.732092,25.594849 parent: 2 - type: RCDAmmo - charges: 100 + charges: 150 - uid: 31952 components: - type: Transform pos: -22.560217,25.594849 parent: 2 - type: RCDAmmo - charges: 100 + charges: 150 - uid: 31953 components: - type: Transform pos: -22.388342,25.594849 parent: 2 - type: RCDAmmo - charges: 100 + charges: 150 - proto: Recycler entities: - uid: 31954 @@ -221400,6 +221242,20 @@ entities: - type: Transform pos: -105.5,-105.5 parent: 2 +- proto: SpawnMobAlexander + entities: + - uid: 21652 + components: + - type: Transform + pos: -33.5,58.5 + parent: 2 +- proto: SpawnMobBandito + entities: + - uid: 21651 + components: + - type: Transform + pos: -47.5,64.5 + parent: 2 - proto: SpawnMobBear entities: - uid: 32860 @@ -221820,6 +221676,13 @@ entities: - type: Transform pos: -31.5,58.5 parent: 2 +- proto: SpawnMobCrabAtmos + entities: + - uid: 21650 + components: + - type: Transform + pos: -50.5,9.5 + parent: 2 - proto: SpawnMobDrone entities: - uid: 32939 @@ -221896,6 +221759,13 @@ entities: rot: -1.5707963267948966 rad pos: -198.5,120.5 parent: 2 +- proto: SpawnMobMcGriff + entities: + - uid: 21649 + components: + - type: Transform + pos: -14.5,62.5 + parent: 2 - proto: SpawnMobMedibot entities: - uid: 32951 @@ -221930,6 +221800,13 @@ entities: rot: -1.5707963267948966 rad pos: -21.5,26.5 parent: 2 +- proto: SpawnMobPossumMorty + entities: + - uid: 21647 + components: + - type: Transform + pos: 15.5,35.5 + parent: 2 - proto: SpawnMobShiva entities: - uid: 32956 @@ -222023,6 +221900,21 @@ entities: parent: 2 - proto: SpawnPointBomzh entities: + - uid: 21648 + components: + - type: Transform + pos: -41.5,-10.5 + parent: 2 + - uid: 21653 + components: + - type: Transform + pos: -52.5,77.5 + parent: 2 + - uid: 21654 + components: + - type: Transform + pos: -56.5,55.5 + parent: 2 - uid: 93688 components: - type: Transform @@ -222050,6 +221942,13 @@ entities: - type: Transform pos: -21.5,58.5 parent: 2 +- proto: SpawnPointBrigmedic + entities: + - uid: 21646 + components: + - type: Transform + pos: 19.5,62.5 + parent: 2 - proto: SpawnPointCaptain entities: - uid: 32972 @@ -222579,11 +222478,6 @@ entities: - type: Transform pos: 11.5,57.5 parent: 2 - - uid: 33063 - components: - - type: Transform - pos: 20.5,61.5 - parent: 2 - uid: 33064 components: - type: Transform @@ -224119,50 +224013,6 @@ entities: - 22340 - 22341 - 22343 - - uid: 22346 - components: - - type: Transform - pos: 19.5,61.5 - parent: 2 - - type: EntityStorage - air: - volume: 200 - immutable: False - temperature: 293.1496 - moles: - - 1.8856695 - - 7.0937095 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - type: ContainerContainer - containers: - entity_storage: !type:Container - showEnts: False - occludes: True - ents: - - 22347 - - 22349 - - 22351 - - 22350 - - 22348 - - 22352 - - 22353 - uid: 22354 components: - type: Transform @@ -526393,13 +526243,6 @@ entities: parent: 2 - proto: WeaponDisabler entities: - - uid: 21654 - components: - - type: Transform - parent: 21645 - - type: Physics - canCollide: False - - type: InsideEntityStorage - uid: 21714 components: - type: Transform diff --git a/Resources/Maps/_Honk/Stations/Triumph.yml b/Resources/Maps/_Honk/Stations/Triumph.yml index bd6b656586..ac59274da6 100644 --- a/Resources/Maps/_Honk/Stations/Triumph.yml +++ b/Resources/Maps/_Honk/Stations/Triumph.yml @@ -26547,16 +26547,6 @@ entities: parent: 2 - proto: AirlockBrigLocked entities: - - uid: 470 - components: - - type: Transform - pos: -8.5,96.5 - parent: 2 - - uid: 471 - components: - - type: Transform - pos: -8.5,93.5 - parent: 2 - uid: 472 components: - type: Transform @@ -26869,6 +26859,16 @@ entities: parent: 2 - proto: AirlockCommandLocked entities: + - uid: 470 + components: + - type: Transform + pos: -8.5,93.5 + parent: 2 + - uid: 471 + components: + - type: Transform + pos: -8.5,96.5 + parent: 2 - uid: 523 components: - type: Transform @@ -223047,6 +223047,16 @@ entities: - type: PointLight color: '#D56C6CFF' enabled: True +- proto: LockerBrigmedicFilledHardsuit + entities: + - uid: 70067 + components: + - type: Transform + pos: -71.5,101.5 + parent: 2 + - type: PointLight + color: '#D56C6CFF' + enabled: True - proto: LockerCaptainFilled entities: - uid: 32577 @@ -262973,6 +262983,13 @@ entities: - type: Transform pos: -25.5,-3.5 parent: 2 +- proto: SpawnPointBrigmedic + entities: + - uid: 70068 + components: + - type: Transform + pos: -70.5,101.5 + parent: 2 - proto: SpawnPointCaptain entities: - uid: 39134 diff --git a/Resources/Maps/_Honk/Stations/WhiteBox.yml b/Resources/Maps/_Honk/Stations/WhiteBox.yml index e8fbc7254d..7a9f4599e5 100644 --- a/Resources/Maps/_Honk/Stations/WhiteBox.yml +++ b/Resources/Maps/_Honk/Stations/WhiteBox.yml @@ -128918,7 +128918,7 @@ entities: - type: PointLight color: '#D56C6CFF' enabled: True -- proto: LockerBrigmedicFilled +- proto: LockerBrigmedicFilledHardsuit entities: - uid: 11023 components: @@ -142865,7 +142865,7 @@ entities: - type: Transform parent: 1288 - type: RCDAmmo - charges: 3829 + charges: 5743 - type: Physics canCollide: False - type: InsideEntityStorage @@ -142874,7 +142874,7 @@ entities: - type: Transform parent: 1288 - type: RCDAmmo - charges: 3829 + charges: 5743 - type: Physics canCollide: False - type: InsideEntityStorage @@ -142883,7 +142883,7 @@ entities: - type: Transform parent: 1298 - type: RCDAmmo - charges: 3829 + charges: 5743 - type: Physics canCollide: False - type: InsideEntityStorage @@ -142892,7 +142892,7 @@ entities: - type: Transform parent: 1298 - type: RCDAmmo - charges: 3829 + charges: 5743 - type: Physics canCollide: False - type: InsideEntityStorage @@ -142901,7 +142901,7 @@ entities: - type: Transform parent: 1308 - type: RCDAmmo - charges: 3829 + charges: 5743 - type: Physics canCollide: False - type: InsideEntityStorage @@ -142910,7 +142910,7 @@ entities: - type: Transform parent: 1308 - type: RCDAmmo - charges: 3829 + charges: 5743 - type: Physics canCollide: False - type: InsideEntityStorage @@ -142920,21 +142920,21 @@ entities: pos: 4.166244,-61.42392 parent: 2 - type: RCDAmmo - charges: 3829 + charges: 5743 - uid: 20753 components: - type: Transform pos: 4.173121,-61.326607 parent: 2 - type: RCDAmmo - charges: 3829 + charges: 5743 - uid: 20754 components: - type: Transform pos: 4.166244,-61.51767 parent: 2 - type: RCDAmmo - charges: 3829 + charges: 5743 - proto: ReagentContainerFlourSmall entities: - uid: 20755 @@ -152036,6 +152036,13 @@ entities: parent: 2 - type: SpamEmitSound enabled: False +- proto: SpawnMobAlexander + entities: + - uid: 11024 + components: + - type: Transform + pos: 37.5,-5.5 + parent: 2 - proto: SpawnMobBandito entities: - uid: 22294 @@ -152052,7 +152059,7 @@ entities: parent: 2 - proto: SpawnMobCatKitten entities: - - uid: 22296 + - uid: 11028 components: - type: Transform pos: 69.5,-26.5 @@ -152078,6 +152085,13 @@ entities: - type: Transform pos: -10.5,-27.5 parent: 2 +- proto: SpawnMobCrabAtmos + entities: + - uid: 11027 + components: + - type: Transform + pos: 18.5,-44.5 + parent: 2 - proto: SpawnMobDrone entities: - uid: 22300 @@ -152177,6 +152191,13 @@ entities: - type: Transform pos: -21.5,50.5 parent: 2 +- proto: SpawnMobPossumMorty + entities: + - uid: 11025 + components: + - type: Transform + pos: 44.5,-19.5 + parent: 2 - proto: SpawnMobRaccoonMorticia entities: - uid: 22317 @@ -152184,6 +152205,13 @@ entities: - type: Transform pos: -33.5,-30.5 parent: 2 +- proto: SpawnMobShiva + entities: + - uid: 11026 + components: + - type: Transform + pos: 15.5,38.5 + parent: 2 - proto: SpawnMobSlothPaperwork entities: - uid: 22318 diff --git a/Resources/Maps/_Honk/Stations/WonderBox.yml b/Resources/Maps/_Honk/Stations/WonderBox.yml index 15c7bbf6e2..0a09d7cc3b 100644 --- a/Resources/Maps/_Honk/Stations/WonderBox.yml +++ b/Resources/Maps/_Honk/Stations/WonderBox.yml @@ -121692,7 +121692,7 @@ entities: - type: PointLight color: '#D56C6CFF' enabled: True -- proto: LockerBrigmedicFilled +- proto: LockerBrigmedicFilledHardsuit entities: - uid: 12016 components: @@ -132869,49 +132869,49 @@ entities: pos: 6.7808495,-46.50002 parent: 2 - type: RCDAmmo - charges: 1135 + charges: 1702 - uid: 19599 components: - type: Transform pos: 6.7808495,-46.030556 parent: 2 - type: RCDAmmo - charges: 1135 + charges: 1702 - uid: 19600 components: - type: Transform pos: 6.7808495,-45.564182 parent: 2 - type: RCDAmmo - charges: 1135 + charges: 1702 - uid: 19601 components: - type: Transform pos: 6.4999847,-46.441338 parent: 2 - type: RCDAmmo - charges: 1135 + charges: 1702 - uid: 19602 components: - type: Transform pos: 6.4999847,-45.968784 parent: 2 - type: RCDAmmo - charges: 1135 + charges: 1702 - uid: 19603 components: - type: Transform pos: 6.4999847,-45.502415 parent: 2 - type: RCDAmmo - charges: 1135 + charges: 1702 - uid: 19604 components: - type: Transform pos: 4.636591,-46.013115 parent: 2 - type: RCDAmmo - charges: 1135 + charges: 1702 - proto: ReagentContainerFlour entities: - uid: 19605 @@ -144037,6 +144037,13 @@ entities: parent: 2 - type: SpamEmitSound enabled: False +- proto: SpawnMobAlexander + entities: + - uid: 26767 + components: + - type: Transform + pos: 20.5,-0.5 + parent: 2 - proto: SpawnMobBandito entities: - uid: 21236 @@ -144128,6 +144135,13 @@ entities: - type: Transform pos: -38.5,-28.5 parent: 2 +- proto: SpawnMobCrabAtmos + entities: + - uid: 26766 + components: + - type: Transform + pos: 21.5,-27.5 + parent: 2 - proto: SpawnMobFoxRenault entities: - uid: 21255 @@ -144180,6 +144194,13 @@ entities: - type: Transform pos: -32.5,-28.5 parent: 2 +- proto: SpawnMobMcGriff + entities: + - uid: 26771 + components: + - type: Transform + pos: -11.5,50.5 + parent: 2 - proto: SpawnMobMedibot entities: - uid: 21263 @@ -144319,6 +144340,13 @@ entities: - type: Transform pos: 63.5,-3.5 parent: 2 +- proto: SpawnMobPossumMorty + entities: + - uid: 26768 + components: + - type: Transform + pos: 50.5,-0.5 + parent: 2 - proto: SpawnMobShiva entities: - uid: 21288 @@ -144326,6 +144354,27 @@ entities: - type: Transform pos: -1.5,57.5 parent: 2 +- proto: SpawnMobSlothPaperwork + entities: + - uid: 26772 + components: + - type: Transform + pos: 20.5,13.5 + parent: 2 +- proto: SpawnMobSmile + entities: + - uid: 26770 + components: + - type: Transform + pos: 68.5,-21.5 + parent: 2 +- proto: SpawnMobWalter + entities: + - uid: 26769 + components: + - type: Transform + pos: 56.5,-7.5 + parent: 2 - proto: SpawnPointAtmos entities: - uid: 21289 diff --git a/Resources/Prototypes/Maps/Polaris.yml b/Resources/Prototypes/Maps/Polaris.yml index 798b8fc076..0636e9419d 100644 --- a/Resources/Prototypes/Maps/Polaris.yml +++ b/Resources/Prototypes/Maps/Polaris.yml @@ -62,3 +62,4 @@ SeniorEngineer: [ 1, 1 ] Bomzh: [ 1, 0 ] # Amour Maid: [ 1, 1 ] # Amour + Brigmedic: [ 1, 1 ] # Amour diff --git a/Resources/Prototypes/Maps/Triumph.yml b/Resources/Prototypes/Maps/Triumph.yml index cdd697f933..4ea5bf03b5 100644 --- a/Resources/Prototypes/Maps/Triumph.yml +++ b/Resources/Prototypes/Maps/Triumph.yml @@ -63,3 +63,4 @@ Borg: [ 3, 2 ] Maid: [ 1, 1 ] Bomzh: [ 1, 0 ] + Brigmedic: [ 1, 1 ] # Amour diff --git a/Resources/Prototypes/Maps/meta.yml b/Resources/Prototypes/Maps/meta.yml index 11216b00f5..d55f116ebe 100644 --- a/Resources/Prototypes/Maps/meta.yml +++ b/Resources/Prototypes/Maps/meta.yml @@ -57,6 +57,7 @@ Detective: [ 1, 1 ] SecurityCadet: [ 3, 6 ] Lawyer: [ 2, 2 ] + Brigmedic: [ 1, 1 ] # Amour #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 3, 3 ]