From 8482767109f6a24f0922b3187c5d2b92478b7fb7 Mon Sep 17 00:00:00 2001 From: ToxicSonicFan04 <167356917+ToxicSonicFan04@users.noreply.github.com> Date: Tue, 4 Feb 2025 14:57:47 -0800 Subject: [PATCH] Omega Armory Restock (#34810) --- Resources/Maps/omega.yml | 226 +++++++++++++++++++++++++++++++++------ 1 file changed, 194 insertions(+), 32 deletions(-) diff --git a/Resources/Maps/omega.yml b/Resources/Maps/omega.yml index a048ce2483..ca48ac3b10 100644 --- a/Resources/Maps/omega.yml +++ b/Resources/Maps/omega.yml @@ -395,7 +395,6 @@ entities: 2109: -42,-13 2152: -37,22 2153: -36,22 - 2182: -34,20 2183: -38,15 2310: -51,8 2411: -60,1 @@ -420,6 +419,7 @@ entities: 2841: -48,6 2861: -42,-16 2862: -40,-16 + 2871: -36,20 - node: angle: 4.71238898038469 rad color: '#DE3A3AFF' @@ -1729,12 +1729,10 @@ entities: 515: -30,13 516: -30,15 517: -30,17 - 518: -30,19 525: -28,16 526: -28,19 543: -32,11 545: -32,18 - 546: -32,19 547: -32,20 592: -32,26 593: -32,27 @@ -2263,7 +2261,6 @@ entities: 523: -31,12 533: -26,16 534: -26,19 - 535: -29,18 536: -29,15 537: -29,13 614: -27,11 @@ -2411,7 +2408,6 @@ entities: 2166: -37,14 2172: -35,18 2176: -34,18 - 2177: -36,18 2180: -30,11 2184: -33,18 2717: 51,-5 @@ -2422,6 +2418,7 @@ entities: 2730: 29,-8 2731: 30,-8 2732: 31,-8 + 2876: -36,18 - node: color: '#EFB34196' id: QuarterTileOverlayGreyscale270 @@ -2593,8 +2590,8 @@ entities: 617: -27,10 2173: -35,18 2175: -34,18 - 2178: -36,18 2185: -33,18 + 2875: -36,18 - node: color: '#EFB34196' id: QuarterTileOverlayGreyscale90 @@ -2844,7 +2841,6 @@ entities: decals: 287: 31,4 431: -2,-25 - 2158: -34,16 - node: color: '#EFB34196' id: ThreeQuarterTileOverlayGreyscale90 @@ -3005,6 +3001,7 @@ entities: id: WarnEndS decals: 2142: -37,20 + 2868: -35,20 - node: color: '#52B4E996' id: WarnFullGreyscale @@ -3024,7 +3021,6 @@ entities: 1900: 26,15 2097: -60,0 2099: -60,2 - 2146: -35,20 2338: -47,-3 2339: -47,-2 2390: -55,4 @@ -3051,6 +3047,7 @@ entities: 2792: 6,15 2802: 8,17 2835: -53,8 + 2867: -35,20 - node: color: '#52B4E996' id: WarnLineGreyscaleE @@ -3155,11 +3152,9 @@ entities: 924: 21,8 2133: -59,4 2140: -59,5 - 2147: -35,20 2167: -37,14 2168: -37,15 2169: -37,16 - 2179: -36,18 2342: -43,-3 2343: -43,-2 2387: -53,4 @@ -3192,6 +3187,7 @@ entities: 2831: -46,7 2834: -46,8 2838: -46,5 + 2866: -35,20 - node: color: '#FFFFFFFF' id: WarnLineW @@ -4859,6 +4855,54 @@ entities: - type: Transform pos: -49.383278,-8.450993 parent: 4812 +- proto: ActionToggleBlock + entities: + - uid: 12052 + components: + - type: Transform + parent: 7935 + - type: InstantAction + originalIconColor: '#FFFFFFFF' + container: 7935 + - uid: 13922 + components: + - type: Transform + parent: 13921 + - type: InstantAction + originalIconColor: '#FFFFFFFF' + container: 13921 +- proto: ActionToggleInternals + entities: + - uid: 10945 + components: + - type: Transform + parent: 13680 + - type: InstantAction + originalIconColor: '#FFFFFFFF' + container: 13680 + - uid: 13919 + components: + - type: Transform + parent: 13917 + - type: InstantAction + originalIconColor: '#FFFFFFFF' + container: 13917 +- proto: ActionToggleJetpack + entities: + - uid: 8332 + components: + - type: Transform + parent: 13680 + - type: InstantAction + originalIconColor: '#FFFFFFFF' + container: 13680 + - uid: 13918 + components: + - type: Transform + parent: 13917 + - type: InstantAction + originalIconColor: '#FFFFFFFF' + container: 13917 - proto: ActionToggleLight entities: - uid: 6594 @@ -5918,6 +5962,11 @@ entities: - type: Transform pos: -34.5,13.5 parent: 4812 + - uid: 8043 + components: + - type: Transform + pos: -32.5,18.5 + parent: 4812 - uid: 10941 components: - type: Transform @@ -7584,11 +7633,6 @@ entities: - type: Transform pos: -30.5,25.5 parent: 4812 - - uid: 12052 - components: - - type: Transform - pos: -32.5,18.5 - parent: 4812 - proto: AirlockServiceLocked entities: - uid: 6675 @@ -21403,6 +21447,16 @@ entities: - type: Transform pos: -17.5,32.5 parent: 4812 + - uid: 13926 + components: + - type: Transform + pos: -36.5,10.5 + parent: 4812 + - uid: 13928 + components: + - type: Transform + pos: -36.5,9.5 + parent: 4812 - proto: CableApcStack entities: - uid: 6196 @@ -28096,6 +28150,16 @@ entities: - type: Transform pos: -40.5,8.5 parent: 4812 + - uid: 13929 + components: + - type: Transform + pos: -36.5,10.5 + parent: 4812 + - uid: 13930 + components: + - type: Transform + pos: -36.5,9.5 + parent: 4812 - proto: CableMVStack entities: - uid: 8586 @@ -60798,29 +60862,51 @@ entities: - uid: 12053 components: - type: Transform + anchored: True pos: -37.5,22.5 parent: 4812 + - type: Physics + bodyType: Static +- proto: GunSafePistolMk58 + entities: + - uid: 13920 + components: + - type: Transform + anchored: True + pos: -33.5,20.5 + parent: 4812 + - type: Physics + bodyType: Static - proto: GunSafeRifleLecter entities: - uid: 12215 components: - type: Transform + anchored: True pos: -37.5,20.5 parent: 4812 + - type: Physics + bodyType: Static - proto: GunSafeShotgunKammerer entities: - uid: 12054 components: - type: Transform + anchored: True pos: -34.5,22.5 parent: 4812 + - type: Physics + bodyType: Static - proto: GunSafeSubMachineGunDrozd entities: - uid: 8377 components: - type: Transform + anchored: True pos: -37.5,21.5 parent: 4812 + - type: Physics + bodyType: Static - proto: Handcuffs entities: - uid: 4865 @@ -61818,8 +61904,35 @@ entities: - uid: 13680 components: - type: Transform - pos: -33.539055,21.668404 + pos: -33.729538,21.689896 parent: 4812 + - type: GasTank + toggleActionEntity: 10945 + - type: Jetpack + toggleActionEntity: 8332 + - type: ActionsContainer + - type: ContainerContainer + containers: + actions: !type:Container + ents: + - 8332 + - 10945 + - uid: 13917 + components: + - type: Transform + pos: -33.3936,21.666458 + parent: 4812 + - type: GasTank + toggleActionEntity: 13919 + - type: Jetpack + toggleActionEntity: 13918 + - type: ActionsContainer + - type: ContainerContainer + containers: + actions: !type:Container + ents: + - 13918 + - 13919 - proto: KitchenKnife entities: - uid: 1642 @@ -62728,6 +62841,11 @@ entities: - type: Transform pos: -31.5,19.5 parent: 4812 + - uid: 13915 + components: + - type: Transform + pos: -31.5,17.5 + parent: 4812 - proto: LockerFreezer entities: - uid: 1538 @@ -64436,11 +64554,16 @@ entities: parent: 4812 - proto: PortableFlasher entities: - - uid: 11923 + - uid: 13914 components: - type: Transform - pos: -33.5,20.5 + anchored: False + pos: -35.5,20.5 parent: 4812 + - type: TriggerOnProximity + enabled: False + - type: Physics + bodyType: Dynamic - proto: PortableGeneratorJrPacman entities: - uid: 741 @@ -70911,12 +71034,50 @@ entities: - type: Transform pos: -33.720795,21.923859 parent: 4812 + - uid: 13923 + components: + - type: Transform + pos: -33.713516,21.77357 + parent: 4812 - proto: RiotLaserShield entities: - uid: 7935 components: - type: Transform - pos: -33.356216,21.923859 + pos: -33.463516,22.047007 + parent: 4812 + - type: Blocking + blockingToggleActionEntity: 12052 + - type: ActionsContainer + - type: ContainerContainer + containers: + actions: !type:Container + ents: + - 12052 + - uid: 13924 + components: + - type: Transform + pos: -33.44008,21.882944 + parent: 4812 +- proto: RiotShield + entities: + - uid: 13921 + components: + - type: Transform + pos: -33.244766,22.062632 + parent: 4812 + - type: Blocking + blockingToggleActionEntity: 13922 + - type: ActionsContainer + - type: ContainerContainer + containers: + actions: !type:Container + ents: + - 13922 + - uid: 13925 + components: + - type: Transform + pos: -33.19008,21.890757 parent: 4812 - proto: RobocopCircuitBoard entities: @@ -71073,10 +71234,10 @@ entities: parent: 4812 - proto: SecurityTechFab entities: - - uid: 10945 + - uid: 11923 components: - type: Transform - pos: -35.5,20.5 + pos: -36.5,18.5 parent: 4812 - proto: SeedExtractor entities: @@ -74150,6 +74311,12 @@ entities: rot: 1.5707963267948966 rad pos: 10.5,-7.5 parent: 4812 + - uid: 13927 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -36.5,9.5 + parent: 4812 - proto: Stool entities: - uid: 1752 @@ -74506,11 +74673,6 @@ entities: parent: 4812 - proto: SuitStorageSec entities: - - uid: 8043 - components: - - type: Transform - pos: -36.5,18.5 - parent: 4812 - uid: 8045 components: - type: Transform @@ -87695,6 +87857,12 @@ entities: rot: -1.5707963267948966 rad pos: -32.5,15.5 parent: 4812 + - uid: 13916 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -35.5,18.5 + parent: 4812 - proto: WindoorSecureAtmosphericsLocked entities: - uid: 7369 @@ -87880,12 +88048,6 @@ entities: rot: 1.5707963267948966 rad pos: -27.5,19.5 parent: 4812 - - uid: 8332 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -35.5,18.5 - parent: 4812 - proto: Window entities: - uid: 187 -- 2.51.2