From f28e01df85a6e1f067d631857ae26086590c86f3 Mon Sep 17 00:00:00 2001 From: Emisse <99158783+Emisse@users.noreply.github.com> Date: Tue, 25 Jul 2023 02:51:59 -0600 Subject: [PATCH] bagel update (#18286) --- Resources/Maps/bagel.yml | 316 ++++++++++++++------------------------- 1 file changed, 116 insertions(+), 200 deletions(-) diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml index 9fcc777fea..0c8e6341d8 100644 --- a/Resources/Maps/bagel.yml +++ b/Resources/Maps/bagel.yml @@ -13146,9 +13146,9 @@ entities: type: Transform - proto: AnomalyVesselCircuitboard entities: - - uid: 14209 + - uid: 1808 components: - - pos: 24.428608,14.675939 + - pos: 22.542427,14.494933 parent: 60 type: Transform - proto: APCBasic @@ -13969,13 +13969,6 @@ entities: - pos: -40.5,-10.5 parent: 60 type: Transform -- proto: AutolatheMachineCircuitboard - entities: - - uid: 19157 - components: - - pos: 22.554735,14.489795 - parent: 60 - type: Transform - proto: BananaPhoneInstrument entities: - uid: 21478 @@ -62589,23 +62582,6 @@ entities: - pos: 6.7189946,-5.8832207 parent: 60 type: Transform -- proto: ClothingHeadHatHoodCulthood - entities: - - uid: 14454 - components: - - pos: -18.498913,16.619997 - parent: 60 - type: Transform - - uid: 14630 - components: - - pos: -18.498913,16.619997 - parent: 60 - type: Transform - - uid: 14631 - components: - - pos: -18.498913,16.619997 - parent: 60 - type: Transform - proto: ClothingHeadHatPaper entities: - uid: 13642 @@ -63402,23 +63378,6 @@ entities: - pos: 22.509872,-51.419544 parent: 60 type: Transform -- proto: ClothingOuterRobesCult - entities: - - uid: 14624 - components: - - pos: -18.483288,16.541872 - parent: 60 - type: Transform - - uid: 14625 - components: - - pos: -18.483288,16.541872 - parent: 60 - type: Transform - - uid: 14629 - components: - - pos: -18.483288,16.541872 - parent: 60 - type: Transform - proto: ClothingOuterSkub entities: - uid: 6793 @@ -63549,13 +63508,6 @@ entities: pos: -2.4945157,-42.736496 parent: 60 type: Transform -- proto: ClothingShoesCult - entities: - - uid: 11018 - components: - - pos: -18.509321,17.291143 - parent: 60 - type: Transform - proto: ClothingShoesFlippers entities: - uid: 3179 @@ -64007,6 +63959,13 @@ entities: pos: 24.5,-5.5 parent: 60 type: Transform +- proto: CommsComputerCircuitboard + entities: + - uid: 14209 + components: + - pos: 23.511177,14.526183 + parent: 60 + type: Transform - proto: ComputerAlert entities: - uid: 14726 @@ -64829,6 +64788,13 @@ entities: - 0 - 0 type: EntityStorage +- proto: CrateCoffin + entities: + - uid: 14213 + components: + - pos: -18.5,16.5 + parent: 60 + type: Transform - proto: CrateEmergencyRadiation entities: - uid: 18691 @@ -70895,6 +70861,21 @@ entities: - pos: 51.394554,17.7191 parent: 60 type: Transform + - uid: 14454 + components: + - pos: -26.766462,-13.446835 + parent: 60 + type: Transform + - uid: 14618 + components: + - pos: -26.953962,-13.46246 + parent: 60 + type: Transform + - uid: 14625 + components: + - pos: -26.860212,-13.30621 + parent: 60 + type: Transform - uid: 20082 components: - pos: 51.66018,17.672226 @@ -71862,9 +71843,9 @@ entities: - pos: -36.5,-34.5 parent: 60 type: Transform - - uid: 14223 + - uid: 11018 components: - - pos: -9.5,16.5 + - pos: -8.5,16.5 parent: 60 type: Transform - proto: filingCabinet @@ -103231,6 +103212,18 @@ entities: - pos: 29.5,3.5 parent: 60 type: Transform +- proto: GeneratorPlasmaMachineCircuitboard + entities: + - uid: 3595 + components: + - pos: 24.433052,14.635558 + parent: 60 + type: Transform + - uid: 14214 + components: + - pos: 24.589302,14.448058 + parent: 60 + type: Transform - proto: GeneratorUranium entities: - uid: 18679 @@ -103243,13 +103236,6 @@ entities: - pos: -120.5,19.5 parent: 60 type: Transform -- proto: GeneratorUraniumMachineCircuitboard - entities: - - uid: 18114 - components: - - pos: 24.615923,14.401744 - parent: 60 - type: Transform - proto: GeneratorWallmountAPU entities: - uid: 23917 @@ -111488,6 +111474,13 @@ entities: - pos: -28.5,0.5 parent: 60 type: Transform +- proto: GunSafeSubMachineGunDrozd + entities: + - uid: 14212 + components: + - pos: -28.5,-0.5 + parent: 60 + type: Transform - proto: Gyroscope entities: - uid: 23979 @@ -114185,29 +114178,18 @@ entities: - pos: 4.5,-44.5 parent: 60 type: Transform -- proto: MagazinePistol +- proto: MagazineLightRifle entities: - - uid: 21335 + - uid: 11282 components: - - pos: -28.71958,-0.18080005 + - pos: -24.328882,2.6569912 parent: 60 type: Transform - - unspawnedCount: 10 - type: BallisticAmmoProvider - - uid: 21336 + - uid: 13667 components: - - pos: -28.53208,-0.18080005 + - pos: -24.563257,2.6569912 parent: 60 type: Transform - - unspawnedCount: 10 - type: BallisticAmmoProvider - - uid: 21337 - components: - - pos: -28.31333,-0.19642505 - parent: 60 - type: Transform - - unspawnedCount: 10 - type: BallisticAmmoProvider - proto: MagazinePistolSubMachineGunTopMounted entities: - uid: 4515 @@ -116218,9 +116200,9 @@ entities: type: Transform - proto: PlushieNar entities: - - uid: 14514 + - uid: 9524 components: - - pos: -20.536625,15.515014 + - pos: -19.542223,18.606672 parent: 60 type: Transform - proto: PlushieNuke @@ -120458,14 +120440,6 @@ entities: type: Transform - powerLoad: 0 type: ApcPowerReceiver - - uid: 3595 - components: - - rot: 1.5707963267948966 rad - pos: 10.5,-43.5 - parent: 60 - type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - uid: 3633 components: - pos: 48.5,-34.5 @@ -120994,6 +120968,12 @@ entities: type: Transform - powerLoad: 0 type: ApcPowerReceiver + - uid: 13775 + components: + - rot: 1.5707963267948966 rad + pos: -20.5,15.5 + parent: 60 + type: Transform - uid: 14521 components: - pos: -18.5,21.5 @@ -121001,14 +120981,6 @@ entities: type: Transform - powerLoad: 0 type: ApcPowerReceiver - - uid: 14618 - components: - - rot: -1.5707963267948966 rad - pos: -18.5,16.5 - parent: 60 - type: Transform - - powerLoad: 0 - type: ApcPowerReceiver - uid: 14622 components: - pos: -20.5,21.5 @@ -121573,13 +121545,6 @@ entities: - pos: -42.5,-9.5 parent: 60 type: Transform -- proto: ProtolatheMachineCircuitboard - entities: - - uid: 19160 - components: - - pos: 22.398485,14.583545 - parent: 60 - type: Transform - proto: Rack entities: - uid: 958 @@ -121607,11 +121572,6 @@ entities: - pos: -31.5,-30.5 parent: 60 type: Transform - - uid: 1808 - components: - - pos: -28.5,-0.5 - parent: 60 - type: Transform - uid: 1819 components: - pos: -24.5,1.5 @@ -121868,11 +121828,6 @@ entities: - pos: 53.5,-4.5 parent: 60 type: Transform - - uid: 14627 - components: - - pos: -18.5,16.5 - parent: 60 - type: Transform - uid: 15183 components: - pos: -40.5,3.5 @@ -121993,13 +121948,6 @@ entities: - pos: -34.5,11.5 parent: 60 type: Transform -- proto: RadarConsoleCircuitboard - entities: - - uid: 19169 - components: - - pos: 23.342813,14.613101 - parent: 60 - type: Transform - proto: RadiationCollector entities: - uid: 15428 @@ -127525,14 +127473,6 @@ entities: - pos: -11.495448,-28.362686 parent: 60 type: Transform - - linkedPorts: - 7697: - - Pressed: Toggle - 914: - - Pressed: Toggle - 920: - - Pressed: Toggle - type: DeviceLinkSource - uid: 4898 components: - name: Cell 5 Shutters @@ -128084,7 +128024,6 @@ entities: parent: 60 type: Transform - links: - - 3017 - 1189 type: DeviceLinkSink - uid: 920 @@ -128093,7 +128032,6 @@ entities: parent: 60 type: Transform - links: - - 3017 - 1189 type: DeviceLinkSink - uid: 2307 @@ -128134,7 +128072,6 @@ entities: parent: 60 type: Transform - links: - - 3017 - 1189 type: DeviceLinkSink - uid: 11253 @@ -128952,13 +128889,6 @@ entities: - links: - 2313 type: DeviceLinkSink -- proto: ShuttleConsoleCircuitboard - entities: - - uid: 19168 - components: - - pos: 23.554735,14.458545 - parent: 60 - type: Transform - proto: ShuttleWindow entities: - uid: 21608 @@ -130628,6 +130558,11 @@ entities: type: Transform - proto: SignLaserMed entities: + - uid: 14624 + components: + - pos: -29.5,2.5 + parent: 60 + type: Transform - uid: 15553 components: - pos: -19.5,47.5 @@ -133520,6 +133455,23 @@ entities: - canCollide: False type: Physics - type: InsideEntityStorage +- proto: SpacemenFigureSpawner + entities: + - uid: 14510 + components: + - pos: -9.5,17.5 + parent: 60 + type: Transform + - uid: 14514 + components: + - pos: -8.5,17.5 + parent: 60 + type: Transform + - uid: 14523 + components: + - pos: -9.5,16.5 + parent: 60 + type: Transform - proto: SpaceVillainArcadeFilled entities: - uid: 5301 @@ -134169,18 +134121,6 @@ entities: - pos: -8.5,-28.5 parent: 60 type: Transform -- proto: SpeedLoaderMagnum - entities: - - uid: 24109 - components: - - pos: -28.41734,-0.67305577 - parent: 60 - type: Transform - - uid: 24111 - components: - - pos: -28.79234,-0.65743077 - parent: 60 - type: Transform - proto: Spoon entities: - uid: 23666 @@ -139466,11 +139406,6 @@ entities: - pos: 9.6670475,13.731877 parent: 60 type: Transform - - uid: 14214 - components: - - pos: -9.515039,17.51784 - parent: 60 - type: Transform - proto: ToyGygax entities: - uid: 5904 @@ -139492,13 +139427,6 @@ entities: - pos: 47.478683,-45.212933 parent: 60 type: Transform -- proto: ToyRipley - entities: - - uid: 14212 - components: - - pos: -8.499414,17.595964 - parent: 60 - type: Transform - proto: ToyRubberDuck entities: - uid: 18370 @@ -139506,13 +139434,6 @@ entities: - pos: -2.47266,-11.475237 parent: 60 type: Transform -- proto: ToySkeleton - entities: - - uid: 14213 - components: - - pos: -9.358789,16.79909 - parent: 60 - type: Transform - proto: ToySpawner entities: - uid: 5303 @@ -139576,6 +139497,13 @@ entities: - pos: -20.474174,-44.60662 parent: 60 type: Transform +- proto: TraversalDistorterMachineCircuitboard + entities: + - uid: 14223 + components: + - pos: 22.464302,14.619933 + parent: 60 + type: Transform - proto: trayScanner entities: - uid: 1674 @@ -156098,6 +156026,11 @@ entities: - pos: 3.5,-61.5 parent: 60 type: Transform + - uid: 11536 + components: + - pos: -28.5,-13.5 + parent: 60 + type: Transform - uid: 12272 components: - pos: 51.5,16.5 @@ -156263,28 +156196,26 @@ entities: - pos: -28.497345,1.8789513 parent: 60 type: Transform + - uid: 14627 + components: + - pos: -28.49841,2.1372187 + parent: 60 + type: Transform + - uid: 14629 + components: + - pos: -28.49841,2.6528437 + parent: 60 + type: Transform + - uid: 14630 + components: + - pos: -28.49841,2.4028437 + parent: 60 + type: Transform - uid: 21021 components: - pos: -28.497345,1.6445763 parent: 60 type: Transform -- proto: WeaponPistolMk58 - entities: - - uid: 16084 - components: - - pos: -28.578955,-0.36830005 - parent: 60 - type: Transform - - uid: 16091 - components: - - pos: -28.71958,-0.25892505 - parent: 60 - type: Transform - - uid: 19521 - components: - - pos: -28.40708,-0.5089251 - parent: 60 - type: Transform - proto: WeaponRevolverDeckard entities: - uid: 17379 @@ -156300,26 +156231,11 @@ entities: entities: - uid: 24110 components: + - name: Old War AKMS + type: MetaData - pos: -24.45179,2.5628066 parent: 60 type: Transform -- proto: WeaponSubMachineGunDrozd - entities: - - uid: 9524 - components: - - pos: -28.494457,2.634122 - parent: 60 - type: Transform - - uid: 11536 - components: - - pos: -28.510082,2.337247 - parent: 60 - type: Transform - - uid: 13667 - components: - - pos: -28.494457,2.493497 - parent: 60 - type: Transform - proto: WeaponSubMachineGunWt550 entities: - uid: 21074