From 8486b24db9ef078baaaee192de66f4f40f2dd522 Mon Sep 17 00:00:00 2001 From: Spessmann <156740760+Spessmann@users.noreply.github.com> Date: Mon, 19 Aug 2024 00:10:43 -0700 Subject: [PATCH 001/119] Cog update (#31188) buffed cog atmos so now its massive --- Resources/Maps/cog.yml | 2845 ++++++++++++++++++++++++---------------- 1 file changed, 1749 insertions(+), 1096 deletions(-) diff --git a/Resources/Maps/cog.yml b/Resources/Maps/cog.yml index dc69e6d6438..106998158c5 100644 --- a/Resources/Maps/cog.yml +++ b/Resources/Maps/cog.yml @@ -218,7 +218,7 @@ entities: version: 6 3,-1: ind: 3,-1 - tiles: YAAAAAABYAAAAAABYAAAAAADYAAAAAACYAAAAAAAYAAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAAgQAAAAAACwAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAADYAAAAAADYAAAAAADYAAAAAADYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAABYAAAAAABYAAAAAAAYAAAAAAAYAAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAAgQAAAAAACwAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAfQAAAAAAfQAAAAAAYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAAfQAAAAAAfQAAAAADYAAAAAAAYAAAAAADYAAAAAABYAAAAAADYAAAAAAAYAAAAAAAYAAAAAACYAAAAAABYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfQAAAAADfQAAAAABgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAACYAAAAAABYAAAAAACYAAAAAADgQAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAfQAAAAADgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAfQAAAAADfQAAAAACgQAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAfQAAAAABfQAAAAADgQAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA + tiles: YAAAAAABYAAAAAABYAAAAAADYAAAAAACYAAAAAAAYAAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAAgQAAAAAACwAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAADYAAAAAADYAAAAAADYAAAAAADYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAABYAAAAAABYAAAAAAAYAAAAAAAYAAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAAgQAAAAAACwAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAfQAAAAAAfQAAAAAAYAAAAAADYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAACwAAAAAACwAAAAAACwAAAAAACwAAAAAAfQAAAAAAfQAAAAADYAAAAAAAYAAAAAADYAAAAAABYAAAAAADYAAAAAAAYAAAAAAAYAAAAAACYAAAAAABYAAAAAABgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAfQAAAAADfQAAAAABgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAADYAAAAAABYAAAAAACYAAAAAABYAAAAAACYAAAAAADgQAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAfQAAAAADgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAfQAAAAADfQAAAAACgQAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAAAAAAAAAfQAAAAABfQAAAAADgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAYAAAAAAAYAAAAAAAIAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAA version: 6 4,-2: ind: 4,-2 @@ -238,7 +238,7 @@ entities: version: 6 4,-1: ind: 4,-1 - tiles: gQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAA + tiles: gQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgQAAAAAAgAAAAAAAgQAAAAAA version: 6 1,1: ind: 1,1 @@ -438,7 +438,7 @@ entities: version: 6 5,-1: ind: 5,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -4,-1: ind: -4,-1 @@ -468,7 +468,8 @@ entities: color: '#FFFFFFFF' id: Arrows decals: - 5196: 61,-2 + 5498: 61,-4 + 5499: 62,-4 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' @@ -567,6 +568,25 @@ entities: id: Bot decals: 5220: -51,-14 + - node: + angle: -1.5707963267948966 rad + color: '#FFFFFFFF' + id: Bot + decals: + 5475: 53,-7 + 5476: 54,-7 + 5477: 55,-7 + 5478: 56,-7 + 5479: 57,-7 + 5480: 58,-7 + 5481: 57,-4 + 5482: 58,-4 + 5483: 55,-5 + 5484: 54,-5 + 5485: 53,-5 + 5486: 53,-4 + 5487: 54,-4 + 5488: 55,-4 - node: color: '#FFFFFFFF' id: Bot @@ -578,12 +598,6 @@ entities: 649: -15,-18 651: -18,-29 652: -18,-28 - 940: 29,-5 - 941: 29,-4 - 942: 29,-3 - 943: 31,-3 - 944: 31,-4 - 945: 31,-5 1284: 42,-27 1285: 40,-27 1286: 44,-27 @@ -748,12 +762,6 @@ entities: 5279: -9,-7 5280: 56,-12 5281: 57,-12 - - node: - zIndex: 1 - color: '#FFFFFFFF' - id: Bot - decals: - 1531: 29,-2 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' @@ -780,7 +788,6 @@ entities: 1311: 62,-19 1312: 63,-19 2088: -31,9 - 5197: 61,-3 - node: angle: 3.141592653589793 rad color: '#FFFFFFFF' @@ -1244,10 +1251,6 @@ entities: id: Delivery decals: 650: -16,-18 - 946: 29,-1 - 947: 31,-1 - 948: 31,0 - 949: 29,0 1269: 52,-23 1270: 54,-23 1273: 62,-15 @@ -1637,7 +1640,6 @@ entities: 4284: 28,3 4285: 29,2 4286: 30,-4 - 4287: 29,-2 4288: 30,0 4289: 36,-2 4290: 36,-1 @@ -3511,6 +3513,7 @@ entities: 4632: 55,2 4633: 53,2 4634: 52,2 + 5489: 56,-4 - node: color: '#52B4E996' id: HalfTileOverlayGreyscale @@ -4217,6 +4220,7 @@ entities: 4636: 53,4 4637: 53,5 4638: 53,6 + 5492: 53,-6 - node: color: '#43990996' id: HalfTileOverlayGreyscale270 @@ -4488,6 +4492,8 @@ entities: 4639: 55,4 4640: 55,5 4641: 55,6 + 5490: 58,-6 + 5491: 58,-5 - node: color: '#43990996' id: HalfTileOverlayGreyscale90 @@ -4861,6 +4867,7 @@ entities: id: QuarterTileOverlayGreyscale decals: 4653: 56,2 + 5495: 57,-6 - node: color: '#474F52FF' id: QuarterTileOverlayGreyscale @@ -5067,6 +5074,7 @@ entities: 4650: 56,-1 4651: 56,-2 4652: 56,2 + 5494: 56,-5 - node: color: '#43990996' id: QuarterTileOverlayGreyscale180 @@ -5263,6 +5271,11 @@ entities: id: QuarterTileOverlayGreyscale180 decals: 201: -32,-45 + - node: + color: '#3EB38896' + id: QuarterTileOverlayGreyscale270 + decals: + 5496: 57,-5 - node: color: '#52B4E956' id: QuarterTileOverlayGreyscale270 @@ -5446,6 +5459,11 @@ entities: id: QuarterTileOverlayGreyscale270 decals: 202: -34,-45 + - node: + color: '#3EB38896' + id: QuarterTileOverlayGreyscale90 + decals: + 5497: 56,-6 - node: color: '#52B4E996' id: QuarterTileOverlayGreyscale90 @@ -7748,8 +7766,8 @@ entities: 0: 12607 2: 34816 12,-2: - 0: 3 - 2: 62472 + 0: 11 + 2: 62592 12,-1: 2: 1868 1: 28672 @@ -7971,22 +7989,19 @@ entities: 16,-7: 2: 1543 13,-3: - 0: 239 - 2: 36864 - 13,-2: - 0: 273 - 2: 63630 + 0: 4335 + 2: 57344 13,-1: - 0: 64257 - 2: 8 + 0: 64270 + 13,-2: + 0: 61152 14,-3: - 0: 119 - 2: 16384 + 0: 16503 + 2: 45056 14,-2: - 2: 62543 + 0: 65392 14,-1: - 2: 1 - 0: 65472 + 0: 65303 13,0: 0: 20472 14,0: @@ -7995,16 +8010,18 @@ entities: 2: 21840 0: 8736 15,-2: - 2: 21853 - 0: 8738 + 2: 13 + 0: 65282 15,-1: - 0: 65520 + 0: 65535 15,0: 0: 4095 16,-4: 0: 257 + 16,-2: + 0: 65280 16,-1: - 0: 65520 + 0: 65535 19,-8: 0: 61183 19,-9: @@ -8048,22 +8065,31 @@ entities: 2: 273 16,0: 0: 4095 + 17,-2: + 0: 65280 17,-1: - 0: 65520 + 0: 65535 17,0: 0: 4095 + 18,-2: + 0: 30464 18,-1: - 0: 30512 + 0: 30591 18,0: 0: 1919 + 19,-2: + 0: 20480 + 2: 35840 19,-1: - 2: 16624 - 0: 5120 + 0: 4113 + 2: 17612 19,0: 0: 273 2: 29764 + 20,-2: + 2: 4352 20,-1: - 2: 21872 + 2: 21873 4,5: 2: 25855 3,5: @@ -9393,6 +9419,18 @@ entities: container: 20873 - proto: ActionToggleInternals entities: + - uid: 3128 + components: + - type: Transform + parent: 5894 + - type: InstantAction + container: 5894 + - uid: 4142 + components: + - type: Transform + parent: 5895 + - type: InstantAction + container: 5895 - uid: 6214 components: - type: Transform @@ -9769,6 +9807,17 @@ entities: - 5255 - 10027 - 5305 + - uid: 8910 + components: + - type: Transform + pos: 55.5,-2.5 + parent: 12 + - type: DeviceList + devices: + - 26637 + - 5128 + - 26457 + - 27003 - uid: 8913 components: - type: Transform @@ -10513,6 +10562,7 @@ entities: - type: DeviceList devices: - 27162 + - 26780 - uid: 26938 components: - type: Transform @@ -10520,20 +10570,21 @@ entities: parent: 12 - type: DeviceList devices: - - 26639 - 26924 + - 26639 + - 26940 - 26979 - 26441 - - 26941 - - 26940 - - 27161 - 26928 - 26949 - - 26934 - - 26933 - - 26932 - - 26935 + - 20793 + - 26923 + - 26941 - 26931 + - 26935 + - 26932 + - 26933 + - 26934 - uid: 28270 components: - type: Transform @@ -10972,11 +11023,6 @@ entities: - type: Transform pos: 81.5,-30.5 parent: 12 - - uid: 9628 - components: - - type: Transform - pos: 29.5,-1.5 - parent: 12 - uid: 10375 components: - type: Transform @@ -11020,10 +11066,10 @@ entities: - type: Transform pos: -20.5,61.5 parent: 12 - - uid: 27237 + - uid: 26913 components: - type: Transform - pos: 69.5,-2.5 + pos: 55.5,-3.5 parent: 12 - uid: 28650 components: @@ -11080,6 +11126,27 @@ entities: parent: 12 - proto: AirlockAtmosphericsLocked entities: + - uid: 5886 + components: + - type: Transform + pos: 56.5,-2.5 + parent: 12 + - uid: 5891 + components: + - type: Transform + pos: 59.5,-5.5 + parent: 12 + - uid: 5892 + components: + - type: Transform + pos: 59.5,-4.5 + parent: 12 + - uid: 5921 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 75.5,-3.5 + parent: 12 - uid: 7129 components: - type: Transform @@ -12577,7 +12644,7 @@ entities: pos: -20.5,55.5 parent: 12 - type: Door - secondsUntilStateChange: -29017.6 + secondsUntilStateChange: -32014.494 state: Opening - type: DeviceLinkSink invokeCounter: 1 @@ -15087,15 +15154,20 @@ entities: - type: DeviceNetwork deviceLists: - 26938 + - uid: 27003 + components: + - type: Transform + pos: 56.5,-5.5 + parent: 12 + - type: DeviceNetwork + deviceLists: + - 8910 - uid: 27161 components: - type: Transform rot: 3.141592653589793 rad pos: 76.5,1.5 parent: 12 - - type: DeviceNetwork - deviceLists: - - 26938 - uid: 27162 components: - type: Transform @@ -15316,18 +15388,29 @@ entities: - uid: 5894 components: - type: Transform - pos: 29.47879,-23.491556 + pos: 29.66415,-23.535322 parent: 12 + - type: GasTank + toggleActionEntity: 3128 + - type: ActionsContainer + - type: ContainerContainer + containers: + actions: !type:Container + ents: + - 3128 - uid: 5895 components: - type: Transform - pos: 29.525665,-22.460306 - parent: 12 - - uid: 5896 - components: - - type: Transform - pos: 29.556915,-21.475931 + pos: 29.333408,-23.36321 parent: 12 + - type: GasTank + toggleActionEntity: 4142 + - type: ActionsContainer + - type: ContainerContainer + containers: + actions: !type:Container + ents: + - 4142 - uid: 6212 components: - type: Transform @@ -17806,11 +17889,11 @@ entities: rot: 3.141592653589793 rad pos: -27.5,-50.5 parent: 12 - - uid: 27204 + - uid: 26822 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 58.5,-2.5 + rot: -1.5707963267948966 rad + pos: 74.5,-5.5 parent: 12 - proto: BeachBall entities: @@ -21200,6 +21283,11 @@ entities: - type: Transform pos: 23.5,2.5 parent: 12 + - uid: 3127 + components: + - type: Transform + pos: 66.5,2.5 + parent: 12 - uid: 3196 components: - type: Transform @@ -22605,6 +22693,11 @@ entities: - type: Transform pos: -1.5,2.5 parent: 12 + - uid: 4976 + components: + - type: Transform + pos: 63.5,-5.5 + parent: 12 - uid: 5052 components: - type: Transform @@ -23630,6 +23723,11 @@ entities: - type: Transform pos: 9.5,2.5 parent: 12 + - uid: 5922 + components: + - type: Transform + pos: 67.5,2.5 + parent: 12 - uid: 5969 components: - type: Transform @@ -23765,6 +23863,11 @@ entities: - type: Transform pos: 14.5,-37.5 parent: 12 + - uid: 6707 + components: + - type: Transform + pos: 54.5,-5.5 + parent: 12 - uid: 6904 components: - type: Transform @@ -24130,6 +24233,26 @@ entities: - type: Transform pos: -42.5,52.5 parent: 12 + - uid: 7549 + components: + - type: Transform + pos: 56.5,2.5 + parent: 12 + - uid: 7554 + components: + - type: Transform + pos: 58.5,2.5 + parent: 12 + - uid: 7555 + components: + - type: Transform + pos: 60.5,2.5 + parent: 12 + - uid: 7556 + components: + - type: Transform + pos: 63.5,2.5 + parent: 12 - uid: 7720 components: - type: Transform @@ -27305,6 +27428,11 @@ entities: - type: Transform pos: 30.5,21.5 parent: 12 + - uid: 13169 + components: + - type: Transform + pos: 56.5,-4.5 + parent: 12 - uid: 13392 components: - type: Transform @@ -32600,6 +32728,11 @@ entities: - type: Transform pos: 48.5,60.5 parent: 12 + - uid: 18758 + components: + - type: Transform + pos: 68.5,2.5 + parent: 12 - uid: 18898 components: - type: Transform @@ -33860,6 +33993,11 @@ entities: - type: Transform pos: -33.5,64.5 parent: 12 + - uid: 20876 + components: + - type: Transform + pos: 64.5,2.5 + parent: 12 - uid: 20882 components: - type: Transform @@ -36650,11 +36788,71 @@ entities: - type: Transform pos: 59.5,-48.5 parent: 12 + - uid: 26442 + components: + - type: Transform + pos: 55.5,-5.5 + parent: 12 + - uid: 26446 + components: + - type: Transform + pos: 56.5,-2.5 + parent: 12 + - uid: 26453 + components: + - type: Transform + pos: 56.5,-5.5 + parent: 12 - uid: 26455 components: - type: Transform pos: 65.5,8.5 parent: 12 + - uid: 26458 + components: + - type: Transform + pos: 61.5,-5.5 + parent: 12 + - uid: 26459 + components: + - type: Transform + pos: 57.5,-4.5 + parent: 12 + - uid: 26460 + components: + - type: Transform + pos: 59.5,-5.5 + parent: 12 + - uid: 26461 + components: + - type: Transform + pos: 62.5,2.5 + parent: 12 + - uid: 26462 + components: + - type: Transform + pos: 57.5,2.5 + parent: 12 + - uid: 26463 + components: + - type: Transform + pos: 59.5,2.5 + parent: 12 + - uid: 26464 + components: + - type: Transform + pos: 66.5,-5.5 + parent: 12 + - uid: 26468 + components: + - type: Transform + pos: 55.5,2.5 + parent: 12 + - uid: 26470 + components: + - type: Transform + pos: 56.5,-3.5 + parent: 12 - uid: 26551 components: - type: Transform @@ -36745,101 +36943,6 @@ entities: - type: Transform pos: 54.5,5.5 parent: 12 - - uid: 26775 - components: - - type: Transform - pos: 55.5,1.5 - parent: 12 - - uid: 26776 - components: - - type: Transform - pos: 56.5,1.5 - parent: 12 - - uid: 26777 - components: - - type: Transform - pos: 57.5,1.5 - parent: 12 - - uid: 26778 - components: - - type: Transform - pos: 58.5,1.5 - parent: 12 - - uid: 26779 - components: - - type: Transform - pos: 59.5,1.5 - parent: 12 - - uid: 26780 - components: - - type: Transform - pos: 60.5,1.5 - parent: 12 - - uid: 26781 - components: - - type: Transform - pos: 61.5,1.5 - parent: 12 - - uid: 26782 - components: - - type: Transform - pos: 62.5,1.5 - parent: 12 - - uid: 26783 - components: - - type: Transform - pos: 63.5,1.5 - parent: 12 - - uid: 26784 - components: - - type: Transform - pos: 64.5,1.5 - parent: 12 - - uid: 26785 - components: - - type: Transform - pos: 65.5,1.5 - parent: 12 - - uid: 26786 - components: - - type: Transform - pos: 66.5,1.5 - parent: 12 - - uid: 26787 - components: - - type: Transform - pos: 67.5,1.5 - parent: 12 - - uid: 26788 - components: - - type: Transform - pos: 68.5,1.5 - parent: 12 - - uid: 26789 - components: - - type: Transform - pos: 69.5,1.5 - parent: 12 - - uid: 26790 - components: - - type: Transform - pos: 70.5,1.5 - parent: 12 - - uid: 26791 - components: - - type: Transform - pos: 71.5,1.5 - parent: 12 - - uid: 26792 - components: - - type: Transform - pos: 72.5,1.5 - parent: 12 - - uid: 26793 - components: - - type: Transform - pos: 73.5,1.5 - parent: 12 - uid: 26794 components: - type: Transform @@ -36860,75 +36963,10 @@ entities: - type: Transform pos: 72.5,2.5 parent: 12 - - uid: 26798 - components: - - type: Transform - pos: 73.5,-1.5 - parent: 12 - - uid: 26799 - components: - - type: Transform - pos: 62.5,-2.5 - parent: 12 - - uid: 26800 - components: - - type: Transform - pos: 59.5,-2.5 - parent: 12 - - uid: 26801 - components: - - type: Transform - pos: 64.5,-2.5 - parent: 12 - - uid: 26802 - components: - - type: Transform - pos: 63.5,-2.5 - parent: 12 - - uid: 26803 - components: - - type: Transform - pos: 73.5,-2.5 - parent: 12 - - uid: 26804 - components: - - type: Transform - pos: 72.5,-2.5 - parent: 12 - - uid: 26805 - components: - - type: Transform - pos: 71.5,-2.5 - parent: 12 - - uid: 26806 - components: - - type: Transform - pos: 70.5,-2.5 - parent: 12 - uid: 26807 components: - type: Transform - pos: 69.5,-2.5 - parent: 12 - - uid: 26808 - components: - - type: Transform - pos: 68.5,-2.5 - parent: 12 - - uid: 26809 - components: - - type: Transform - pos: 67.5,-2.5 - parent: 12 - - uid: 26810 - components: - - type: Transform - pos: 66.5,-2.5 - parent: 12 - - uid: 26811 - components: - - type: Transform - pos: 65.5,-2.5 + pos: 62.5,-5.5 parent: 12 - uid: 26812 components: @@ -36950,11 +36988,6 @@ entities: - type: Transform pos: 55.5,-1.5 parent: 12 - - uid: 26816 - components: - - type: Transform - pos: 61.5,-2.5 - parent: 12 - uid: 26817 components: - type: Transform @@ -36980,11 +37013,6 @@ entities: - type: Transform pos: 51.5,-0.5 parent: 12 - - uid: 26822 - components: - - type: Transform - pos: 55.5,0.5 - parent: 12 - uid: 26823 components: - type: Transform @@ -37020,21 +37048,41 @@ entities: - type: Transform pos: -41.5,52.5 parent: 12 - - uid: 26912 + - uid: 26886 components: - type: Transform - pos: 58.5,-2.5 + pos: 60.5,-5.5 parent: 12 - - uid: 26913 + - uid: 26887 components: - type: Transform - pos: 60.5,-2.5 + pos: 73.5,-5.5 + parent: 12 + - uid: 26889 + components: + - type: Transform + pos: 74.5,-4.5 + parent: 12 + - uid: 26891 + components: + - type: Transform + pos: 69.5,-5.5 + parent: 12 + - uid: 27000 + components: + - type: Transform + pos: 65.5,-5.5 parent: 12 - uid: 27109 components: - type: Transform pos: 41.5,22.5 parent: 12 + - uid: 27134 + components: + - type: Transform + pos: 70.5,-5.5 + parent: 12 - uid: 27158 components: - type: Transform @@ -37045,6 +37093,51 @@ entities: - type: Transform pos: 48.5,-7.5 parent: 12 + - uid: 27181 + components: + - type: Transform + pos: 74.5,-3.5 + parent: 12 + - uid: 27185 + components: + - type: Transform + pos: 75.5,-3.5 + parent: 12 + - uid: 27186 + components: + - type: Transform + pos: 67.5,-5.5 + parent: 12 + - uid: 27204 + components: + - type: Transform + pos: 74.5,-5.5 + parent: 12 + - uid: 27205 + components: + - type: Transform + pos: 71.5,-5.5 + parent: 12 + - uid: 27206 + components: + - type: Transform + pos: 72.5,-5.5 + parent: 12 + - uid: 27240 + components: + - type: Transform + pos: 58.5,-5.5 + parent: 12 + - uid: 27241 + components: + - type: Transform + pos: 58.5,-4.5 + parent: 12 + - uid: 27242 + components: + - type: Transform + pos: 64.5,-5.5 + parent: 12 - uid: 27257 components: - type: Transform @@ -37510,6 +37603,16 @@ entities: - type: Transform pos: -54.5,-16.5 parent: 12 + - uid: 27830 + components: + - type: Transform + pos: 76.5,-3.5 + parent: 12 + - uid: 27836 + components: + - type: Transform + pos: 68.5,-5.5 + parent: 12 - uid: 27847 components: - type: Transform @@ -38000,6 +38103,111 @@ entities: - type: Transform pos: 46.5,8.5 parent: 12 + - uid: 28858 + components: + - type: Transform + pos: 74.5,-2.5 + parent: 12 + - uid: 28859 + components: + - type: Transform + pos: 69.5,2.5 + parent: 12 + - uid: 28860 + components: + - type: Transform + pos: 70.5,2.5 + parent: 12 + - uid: 28861 + components: + - type: Transform + pos: 71.5,2.5 + parent: 12 + - uid: 28862 + components: + - type: Transform + pos: 73.5,2.5 + parent: 12 + - uid: 28863 + components: + - type: Transform + pos: 74.5,2.5 + parent: 12 + - uid: 28864 + components: + - type: Transform + pos: 73.5,-1.5 + parent: 12 + - uid: 28865 + components: + - type: Transform + pos: 72.5,-1.5 + parent: 12 + - uid: 28866 + components: + - type: Transform + pos: 71.5,-1.5 + parent: 12 + - uid: 28867 + components: + - type: Transform + pos: 70.5,-1.5 + parent: 12 + - uid: 28868 + components: + - type: Transform + pos: 69.5,-1.5 + parent: 12 + - uid: 28869 + components: + - type: Transform + pos: 68.5,-1.5 + parent: 12 + - uid: 28870 + components: + - type: Transform + pos: 67.5,-1.5 + parent: 12 + - uid: 28871 + components: + - type: Transform + pos: 66.5,-1.5 + parent: 12 + - uid: 28872 + components: + - type: Transform + pos: 64.5,-1.5 + parent: 12 + - uid: 28873 + components: + - type: Transform + pos: 63.5,-1.5 + parent: 12 + - uid: 28874 + components: + - type: Transform + pos: 62.5,-1.5 + parent: 12 + - uid: 28875 + components: + - type: Transform + pos: 61.5,-1.5 + parent: 12 + - uid: 28876 + components: + - type: Transform + pos: 65.5,-1.5 + parent: 12 + - uid: 28877 + components: + - type: Transform + pos: 59.5,-1.5 + parent: 12 + - uid: 28878 + components: + - type: Transform + pos: 60.5,-1.5 + parent: 12 - proto: CableApcStack entities: - uid: 16561 @@ -39345,6 +39553,11 @@ entities: - type: Transform pos: 28.5,-1.5 parent: 12 + - uid: 5129 + components: + - type: Transform + pos: 76.5,-2.5 + parent: 12 - uid: 5179 components: - type: Transform @@ -39570,6 +39783,11 @@ entities: - type: Transform pos: 26.5,-15.5 parent: 12 + - uid: 5923 + components: + - type: Transform + pos: 66.5,-5.5 + parent: 12 - uid: 5948 components: - type: Transform @@ -40270,11 +40488,6 @@ entities: - type: Transform pos: 47.5,-54.5 parent: 12 - - uid: 6707 - components: - - type: Transform - pos: 73.5,-1.5 - parent: 12 - uid: 6717 components: - type: Transform @@ -40315,6 +40528,26 @@ entities: - type: Transform pos: 1.5,14.5 parent: 12 + - uid: 7546 + components: + - type: Transform + pos: 71.5,-5.5 + parent: 12 + - uid: 7547 + components: + - type: Transform + pos: 70.5,-5.5 + parent: 12 + - uid: 7548 + components: + - type: Transform + pos: 60.5,-5.5 + parent: 12 + - uid: 7557 + components: + - type: Transform + pos: 61.5,-5.5 + parent: 12 - uid: 7724 components: - type: Transform @@ -40655,6 +40888,11 @@ entities: - type: Transform pos: 10.5,16.5 parent: 12 + - uid: 8937 + components: + - type: Transform + pos: 73.5,-5.5 + parent: 12 - uid: 9000 components: - type: Transform @@ -40990,6 +41228,11 @@ entities: - type: Transform pos: 4.5,21.5 parent: 12 + - uid: 9628 + components: + - type: Transform + pos: 74.5,-5.5 + parent: 12 - uid: 9631 components: - type: Transform @@ -41085,6 +41328,11 @@ entities: - type: Transform pos: 16.5,-4.5 parent: 12 + - uid: 10305 + components: + - type: Transform + pos: 67.5,-5.5 + parent: 12 - uid: 10319 components: - type: Transform @@ -46145,35 +46393,35 @@ entities: - type: Transform pos: -69.5,21.5 parent: 12 - - uid: 26543 + - uid: 26465 components: - type: Transform - pos: -9.5,-19.5 + pos: 72.5,-5.5 parent: 12 - - uid: 26615 + - uid: 26467 components: - type: Transform - pos: 55.5,-1.5 + pos: 62.5,-5.5 parent: 12 - - uid: 26621 + - uid: 26469 components: - type: Transform - pos: 69.5,-2.5 + pos: 69.5,-5.5 parent: 12 - - uid: 26622 + - uid: 26543 components: - type: Transform - pos: 65.5,-2.5 + pos: -9.5,-19.5 parent: 12 - - uid: 26631 + - uid: 26583 components: - type: Transform - pos: 59.5,-2.5 + pos: 30.5,-2.5 parent: 12 - - uid: 26632 + - uid: 26615 components: - type: Transform - pos: 62.5,-2.5 + pos: 55.5,-1.5 parent: 12 - uid: 26633 components: @@ -46190,160 +46438,135 @@ entities: - type: Transform pos: 74.5,0.5 parent: 12 - - uid: 26636 - components: - - type: Transform - pos: 60.5,-2.5 - parent: 12 - - uid: 26637 - components: - - type: Transform - pos: 76.5,-0.5 - parent: 12 - uid: 26638 components: - type: Transform pos: 76.5,0.5 parent: 12 - - uid: 26643 - components: - - type: Transform - pos: 58.5,-2.5 - parent: 12 - - uid: 26644 - components: - - type: Transform - pos: 58.5,-1.5 - parent: 12 - - uid: 26645 - components: - - type: Transform - pos: 57.5,-1.5 - parent: 12 - uid: 26646 components: - type: Transform pos: 56.5,-1.5 parent: 12 - - uid: 26647 + - uid: 26657 components: - type: Transform - pos: 70.5,-2.5 + pos: 55.5,-0.5 parent: 12 - - uid: 26648 + - uid: 26658 components: - type: Transform - pos: 72.5,-2.5 + pos: 54.5,-0.5 parent: 12 - - uid: 26649 + - uid: 26659 components: - type: Transform - pos: 71.5,-2.5 + pos: 53.5,-0.5 parent: 12 - - uid: 26650 + - uid: 26660 components: - type: Transform - pos: 73.5,-2.5 + pos: 52.5,-0.5 parent: 12 - - uid: 26651 + - uid: 26661 components: - type: Transform - pos: 68.5,-2.5 + pos: 51.5,-0.5 parent: 12 - - uid: 26652 + - uid: 26662 components: - type: Transform - pos: 66.5,-2.5 + pos: 50.5,-0.5 parent: 12 - - uid: 26653 + - uid: 26663 components: - type: Transform - pos: 67.5,-2.5 + pos: 48.5,-0.5 parent: 12 - - uid: 26654 + - uid: 26664 components: - type: Transform - pos: 63.5,-2.5 + pos: 47.5,-0.5 parent: 12 - - uid: 26655 + - uid: 26665 components: - type: Transform - pos: 61.5,-2.5 + pos: 49.5,-0.5 parent: 12 - - uid: 26656 + - uid: 26666 components: - type: Transform - pos: 64.5,-2.5 + pos: 46.5,-0.5 parent: 12 - - uid: 26657 + - uid: 26667 components: - type: Transform - pos: 55.5,-0.5 + pos: 45.5,-0.5 parent: 12 - - uid: 26658 + - uid: 26668 components: - type: Transform - pos: 54.5,-0.5 + pos: 44.5,-0.5 parent: 12 - - uid: 26659 + - uid: 26800 components: - type: Transform - pos: 53.5,-0.5 + pos: 56.5,-3.5 parent: 12 - - uid: 26660 + - uid: 26801 components: - type: Transform - pos: 52.5,-0.5 + pos: 56.5,-4.5 parent: 12 - - uid: 26661 + - uid: 26805 components: - type: Transform - pos: 51.5,-0.5 + pos: 31.5,-4.5 parent: 12 - - uid: 26662 + - uid: 26893 components: - type: Transform - pos: 50.5,-0.5 + pos: 30.5,-3.5 parent: 12 - - uid: 26663 + - uid: 26894 components: - type: Transform - pos: 48.5,-0.5 + pos: 30.5,-4.5 parent: 12 - - uid: 26664 + - uid: 26897 components: - type: Transform - pos: 47.5,-0.5 + pos: 63.5,-5.5 parent: 12 - - uid: 26665 + - uid: 26906 components: - type: Transform - pos: 49.5,-0.5 + pos: 75.5,0.5 parent: 12 - - uid: 26666 + - uid: 27002 components: - type: Transform - pos: 46.5,-0.5 + pos: 68.5,-5.5 parent: 12 - - uid: 26667 + - uid: 27042 components: - type: Transform - pos: 45.5,-0.5 + pos: 38.5,-2.5 parent: 12 - - uid: 26668 + - uid: 27133 components: - type: Transform - pos: 44.5,-0.5 + pos: 75.5,-3.5 parent: 12 - - uid: 26906 + - uid: 27235 components: - type: Transform - pos: 75.5,0.5 + pos: 56.5,-2.5 parent: 12 - - uid: 27042 + - uid: 27250 components: - type: Transform - pos: 38.5,-2.5 + pos: 74.5,-2.5 parent: 12 - uid: 27339 components: @@ -47235,6 +47458,26 @@ entities: - type: Transform pos: -37.5,-53.5 parent: 12 + - uid: 27893 + components: + - type: Transform + pos: 74.5,-3.5 + parent: 12 + - uid: 27904 + components: + - type: Transform + pos: 76.5,-3.5 + parent: 12 + - uid: 27905 + components: + - type: Transform + pos: 76.5,-4.5 + parent: 12 + - uid: 27907 + components: + - type: Transform + pos: 65.5,-5.5 + parent: 12 - uid: 28241 components: - type: Transform @@ -47985,6 +48228,36 @@ entities: - type: Transform pos: 42.5,8.5 parent: 12 + - uid: 28784 + components: + - type: Transform + pos: 74.5,-4.5 + parent: 12 + - uid: 28879 + components: + - type: Transform + pos: 59.5,-5.5 + parent: 12 + - uid: 28880 + components: + - type: Transform + pos: 64.5,-5.5 + parent: 12 + - uid: 28881 + components: + - type: Transform + pos: 58.5,-5.5 + parent: 12 + - uid: 28882 + components: + - type: Transform + pos: 57.5,-5.5 + parent: 12 + - uid: 28883 + components: + - type: Transform + pos: 56.5,-5.5 + parent: 12 - proto: CableHVStack entities: - uid: 16563 @@ -49694,6 +49967,16 @@ entities: - type: Transform pos: -41.5,65.5 parent: 12 + - uid: 5885 + components: + - type: Transform + pos: 75.5,-3.5 + parent: 12 + - uid: 5888 + components: + - type: Transform + pos: 74.5,-3.5 + parent: 12 - uid: 5965 components: - type: Transform @@ -51529,6 +51812,11 @@ entities: - type: Transform pos: 23.5,2.5 parent: 12 + - uid: 12931 + components: + - type: Transform + pos: 59.5,-4.5 + parent: 12 - uid: 13043 components: - type: Transform @@ -55734,11 +56022,6 @@ entities: - type: Transform pos: 59.5,14.5 parent: 12 - - uid: 22148 - components: - - type: Transform - pos: 79.5,-2.5 - parent: 12 - uid: 22149 components: - type: Transform @@ -56824,6 +57107,11 @@ entities: - type: Transform pos: 57.5,12.5 parent: 12 + - uid: 26564 + components: + - type: Transform + pos: 58.5,-7.5 + parent: 12 - uid: 26584 components: - type: Transform @@ -56839,6 +57127,26 @@ entities: - type: Transform pos: 57.5,14.5 parent: 12 + - uid: 26621 + components: + - type: Transform + pos: 58.5,-2.5 + parent: 12 + - uid: 26622 + components: + - type: Transform + pos: 59.5,-3.5 + parent: 12 + - uid: 26631 + components: + - type: Transform + pos: 59.5,-2.5 + parent: 12 + - uid: 26636 + components: + - type: Transform + pos: 57.5,-2.5 + parent: 12 - uid: 26640 components: - type: Transform @@ -56849,6 +57157,11 @@ entities: - type: Transform pos: 75.5,0.5 parent: 12 + - uid: 26650 + components: + - type: Transform + pos: 80.5,-5.5 + parent: 12 - uid: 26829 components: - type: Transform @@ -57067,107 +57380,17 @@ entities: - uid: 26879 components: - type: Transform - pos: 70.5,-3.5 - parent: 12 - - uid: 26880 - components: - - type: Transform - pos: 69.5,-3.5 - parent: 12 - - uid: 26881 - components: - - type: Transform - pos: 68.5,-3.5 - parent: 12 - - uid: 26882 - components: - - type: Transform - pos: 67.5,-3.5 - parent: 12 - - uid: 26883 - components: - - type: Transform - pos: 66.5,-3.5 - parent: 12 - - uid: 26884 - components: - - type: Transform - pos: 65.5,-3.5 + pos: 53.5,-7.5 parent: 12 - uid: 26885 components: - type: Transform - pos: 64.5,-3.5 - parent: 12 - - uid: 26886 - components: - - type: Transform - pos: 63.5,-3.5 - parent: 12 - - uid: 26887 - components: - - type: Transform - pos: 62.5,-3.5 - parent: 12 - - uid: 26888 - components: - - type: Transform - pos: 61.5,-3.5 - parent: 12 - - uid: 26889 - components: - - type: Transform - pos: 60.5,-3.5 - parent: 12 - - uid: 26890 - components: - - type: Transform - pos: 58.5,-3.5 - parent: 12 - - uid: 26891 - components: - - type: Transform - pos: 59.5,-3.5 - parent: 12 - - uid: 26892 - components: - - type: Transform - pos: 57.5,-3.5 - parent: 12 - - uid: 26893 - components: - - type: Transform - pos: 57.5,-2.5 - parent: 12 - - uid: 26894 - components: - - type: Transform - pos: 56.5,-2.5 - parent: 12 - - uid: 26895 - components: - - type: Transform - pos: 56.5,-1.5 - parent: 12 - - uid: 26896 - components: - - type: Transform - pos: 55.5,-1.5 - parent: 12 - - uid: 26897 - components: - - type: Transform - pos: 55.5,-0.5 - parent: 12 - - uid: 26898 - components: - - type: Transform - pos: 55.5,0.5 + pos: 57.5,-7.5 parent: 12 - uid: 26899 components: - type: Transform - pos: 55.5,1.5 + pos: 54.5,-7.5 parent: 12 - uid: 26900 components: @@ -57192,7 +57415,7 @@ entities: - uid: 26905 components: - type: Transform - pos: 76.5,-0.5 + pos: 80.5,-4.5 parent: 12 - uid: 26908 components: @@ -57202,7 +57425,7 @@ entities: - uid: 26914 components: - type: Transform - pos: 70.5,-2.5 + pos: 80.5,-3.5 parent: 12 - uid: 26915 components: @@ -57222,32 +57445,27 @@ entities: - uid: 26918 components: - type: Transform - pos: 71.5,-2.5 + pos: 79.5,-5.5 parent: 12 - - uid: 26919 - components: - - type: Transform - pos: 72.5,-2.5 - parent: 12 - - uid: 26920 + - uid: 26922 components: - type: Transform - pos: 73.5,-2.5 + pos: 74.5,-1.5 parent: 12 - - uid: 26921 + - uid: 26962 components: - type: Transform - pos: 73.5,-1.5 + pos: 78.5,-3.5 parent: 12 - - uid: 26922 + - uid: 27019 components: - type: Transform - pos: 74.5,-1.5 + pos: 54.5,-0.5 parent: 12 - - uid: 27019 + - uid: 27056 components: - type: Transform - pos: 54.5,-0.5 + pos: 55.5,-7.5 parent: 12 - uid: 27073 components: @@ -57359,6 +57577,11 @@ entities: - type: Transform pos: 52.5,-7.5 parent: 12 + - uid: 27128 + components: + - type: Transform + pos: 56.5,-7.5 + parent: 12 - uid: 27191 components: - type: Transform @@ -57414,6 +57637,21 @@ entities: - type: Transform pos: 67.5,4.5 parent: 12 + - uid: 27208 + components: + - type: Transform + pos: 78.5,-4.5 + parent: 12 + - uid: 27236 + components: + - type: Transform + pos: 78.5,-5.5 + parent: 12 + - uid: 27238 + components: + - type: Transform + pos: 59.5,-5.5 + parent: 12 - uid: 27253 components: - type: Transform @@ -57929,6 +58167,136 @@ entities: - type: Transform pos: 5.5,-47.5 parent: 12 + - uid: 28828 + components: + - type: Transform + pos: 59.5,-6.5 + parent: 12 + - uid: 28833 + components: + - type: Transform + pos: 59.5,-7.5 + parent: 12 + - uid: 28834 + components: + - type: Transform + pos: 60.5,-6.5 + parent: 12 + - uid: 28835 + components: + - type: Transform + pos: 61.5,-6.5 + parent: 12 + - uid: 28836 + components: + - type: Transform + pos: 62.5,-6.5 + parent: 12 + - uid: 28837 + components: + - type: Transform + pos: 63.5,-6.5 + parent: 12 + - uid: 28838 + components: + - type: Transform + pos: 64.5,-6.5 + parent: 12 + - uid: 28839 + components: + - type: Transform + pos: 65.5,-6.5 + parent: 12 + - uid: 28840 + components: + - type: Transform + pos: 66.5,-6.5 + parent: 12 + - uid: 28841 + components: + - type: Transform + pos: 67.5,-6.5 + parent: 12 + - uid: 28842 + components: + - type: Transform + pos: 68.5,-6.5 + parent: 12 + - uid: 28843 + components: + - type: Transform + pos: 69.5,-6.5 + parent: 12 + - uid: 28844 + components: + - type: Transform + pos: 70.5,-6.5 + parent: 12 + - uid: 28845 + components: + - type: Transform + pos: 72.5,-6.5 + parent: 12 + - uid: 28846 + components: + - type: Transform + pos: 73.5,-6.5 + parent: 12 + - uid: 28847 + components: + - type: Transform + pos: 74.5,-6.5 + parent: 12 + - uid: 28848 + components: + - type: Transform + pos: 71.5,-6.5 + parent: 12 + - uid: 28850 + components: + - type: Transform + pos: 74.5,-5.5 + parent: 12 + - uid: 28851 + components: + - type: Transform + pos: 74.5,-4.5 + parent: 12 + - uid: 28853 + components: + - type: Transform + pos: 76.5,-4.5 + parent: 12 + - uid: 28854 + components: + - type: Transform + pos: 76.5,-3.5 + parent: 12 + - uid: 28855 + components: + - type: Transform + pos: 76.5,-2.5 + parent: 12 + - uid: 28857 + components: + - type: Transform + pos: 74.5,-2.5 + parent: 12 + - uid: 28886 + components: + - type: Transform + pos: 50.5,0.5 + parent: 12 + - uid: 28887 + components: + - type: Transform + pos: 50.5,1.5 + parent: 12 + - uid: 28888 + components: + - type: Transform + pos: 54.5,1.5 + parent: 12 - proto: CableMVStack entities: - uid: 16562 @@ -58128,25 +58496,10 @@ entities: - type: Transform pos: 4.5,15.5 parent: 12 - - uid: 5125 - components: - - type: Transform - pos: 31.5,-3.5 - parent: 12 - - uid: 5126 - components: - - type: Transform - pos: 31.5,-2.5 - parent: 12 - - uid: 27236 - components: - - type: Transform - pos: 65.5,-2.5 - parent: 12 - - uid: 27309 + - uid: 22148 components: - type: Transform - pos: 65.5,6.5 + pos: 55.5,-4.5 parent: 12 - proto: Carpet entities: @@ -65810,6 +66163,11 @@ entities: - type: Transform pos: 21.5,-20.5 parent: 12 + - uid: 5896 + components: + - type: Transform + pos: 31.5,-3.5 + parent: 12 - uid: 5958 components: - type: Transform @@ -67033,6 +67391,28 @@ entities: rot: 1.5707963267948966 rad pos: 33.5,-43.5 parent: 12 + - uid: 26553 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 29.5,-4.5 + parent: 12 + - uid: 26884 + components: + - type: Transform + pos: 29.5,-2.5 + parent: 12 + - uid: 26896 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 29.5,-1.5 + parent: 12 + - uid: 27891 + components: + - type: Transform + pos: 29.5,0.5 + parent: 12 - uid: 28251 components: - type: Transform @@ -68867,21 +69247,6 @@ entities: canCollide: False - proto: ClothingHeadHelmetFire entities: - - uid: 5891 - components: - - type: Transform - pos: 29.35379,-23.335306 - parent: 12 - - uid: 5892 - components: - - type: Transform - pos: 29.306915,-22.397806 - parent: 12 - - uid: 5893 - components: - - type: Transform - pos: 29.306915,-21.319681 - parent: 12 - uid: 21075 components: - type: Transform @@ -69254,21 +69619,6 @@ entities: parent: 12 - proto: ClothingOuterSuitFire entities: - - uid: 5888 - components: - - type: Transform - pos: 29.35379,-23.569681 - parent: 12 - - uid: 5889 - components: - - type: Transform - pos: 29.338165,-22.647806 - parent: 12 - - uid: 5890 - components: - - type: Transform - pos: 29.306915,-21.616556 - parent: 12 - uid: 21074 components: - type: Transform @@ -70090,6 +70440,12 @@ entities: - type: Transform pos: 19.5,7.5 parent: 12 + - uid: 5889 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 31.5,-4.5 + parent: 12 - uid: 6685 components: - type: Transform @@ -72282,10 +72638,10 @@ entities: parent: 12 - proto: DefaultStationBeaconAtmospherics entities: - - uid: 20876 + - uid: 26883 components: - type: Transform - pos: 64.5,-0.5 + pos: 64.5,-1.5 parent: 12 - proto: DefaultStationBeaconBar entities: @@ -85142,43 +85498,14 @@ entities: - type: Transform pos: -54.5,35.5 parent: 12 - - uid: 27186 + - uid: 26920 components: - type: Transform - pos: 53.5,3.5 + rot: -1.5707963267948966 rad + pos: 75.5,-1.5 parent: 12 - proto: FireExtinguisher entities: - - uid: 5885 - components: - - type: Transform - pos: 29.775665,-23.569681 - parent: 12 - - uid: 5886 - components: - - type: Transform - pos: 29.85379,-22.679056 - parent: 12 - - uid: 5887 - components: - - type: Transform - pos: 29.85379,-21.632181 - parent: 12 - - uid: 5921 - components: - - type: Transform - pos: 32.308517,-23.554056 - parent: 12 - - uid: 5922 - components: - - type: Transform - pos: 32.683517,-23.616556 - parent: 12 - - uid: 5923 - components: - - type: Transform - pos: 32.511642,-23.288431 - parent: 12 - uid: 9762 components: - type: Transform @@ -85866,6 +86193,15 @@ entities: - type: DeviceNetwork deviceLists: - 447 + - uid: 5128 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 59.5,-4.5 + parent: 12 + - type: DeviceNetwork + deviceLists: + - 8910 - uid: 5579 components: - type: Transform @@ -88350,6 +88686,24 @@ entities: - type: DeviceNetwork deviceLists: - 921 + - uid: 26457 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 56.5,-2.5 + parent: 12 + - type: DeviceNetwork + deviceLists: + - 8910 + - uid: 26637 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 59.5,-5.5 + parent: 12 + - type: DeviceNetwork + deviceLists: + - 8910 - uid: 26639 components: - type: Transform @@ -88364,6 +88718,9 @@ entities: rot: -1.5707963267948966 rad pos: 54.5,3.5 parent: 12 + - type: DeviceNetwork + deviceLists: + - 26938 - uid: 26924 components: - type: Transform @@ -88496,6 +88853,16 @@ entities: - type: Transform pos: -12.4110565,5.6835365 parent: 12 + - uid: 26655 + components: + - type: Transform + pos: 29.65808,-22.442064 + parent: 12 + - uid: 26694 + components: + - type: Transform + pos: 29.33193,-22.287144 + parent: 12 - proto: FlippoLighter entities: - uid: 13633 @@ -89478,10 +89845,10 @@ entities: rot: 1.5707963267948966 rad pos: 59.5,8.5 parent: 12 - - uid: 26967 + - uid: 26781 components: - type: Transform - pos: 73.5,7.5 + pos: 71.5,7.5 parent: 12 - proto: GasPassiveVent entities: @@ -89509,11 +89876,6 @@ entities: rot: -1.5707963267948966 rad pos: 9.5,31.5 parent: 12 - - uid: 26442 - components: - - type: Transform - pos: 71.5,7.5 - parent: 12 - uid: 26749 components: - type: Transform @@ -89565,6 +89927,8 @@ entities: - type: Transform pos: -42.5,-27.5 parent: 12 + - type: AtmosPipeColor + color: '#990000FF' - uid: 988 components: - type: Transform @@ -89583,12 +89947,16 @@ entities: rot: 3.141592653589793 rad pos: -43.5,-27.5 parent: 12 + - type: AtmosPipeColor + color: '#990000FF' - uid: 996 components: - type: Transform rot: 3.141592653589793 rad pos: -42.5,-28.5 parent: 12 + - type: AtmosPipeColor + color: '#990000FF' - uid: 1013 components: - type: Transform @@ -90143,6 +90511,14 @@ entities: - type: Transform pos: 0.5,-46.5 parent: 12 + - uid: 4974 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 62.5,-6.5 + parent: 12 + - type: AtmosPipeColor + color: '#990000FF' - uid: 5141 components: - type: Transform @@ -92015,6 +92391,14 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 26654 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 61.5,-5.5 + parent: 12 + - type: AtmosPipeColor + color: '#947507FF' - uid: 26715 components: - type: Transform @@ -92056,6 +92440,14 @@ entities: parent: 12 - type: AtmosPipeColor color: '#990000FF' + - uid: 26810 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 52.5,-6.5 + parent: 12 + - type: AtmosPipeColor + color: '#990000FF' - uid: 26948 components: - type: Transform @@ -92102,21 +92494,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#990000FF' - - uid: 27016 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 52.5,-7.5 - parent: 12 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 27017 - components: - - type: Transform - pos: 61.5,-7.5 - parent: 12 - - type: AtmosPipeColor - color: '#990000FF' - uid: 27018 components: - type: Transform @@ -92176,14 +92553,8 @@ entities: - type: Transform pos: -37.5,-28.5 parent: 12 - - uid: 27905 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 61.5,-4.5 - parent: 12 - type: AtmosPipeColor - color: '#947507FF' + color: '#990000FF' - uid: 27924 components: - type: Transform @@ -92245,6 +92616,21 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 28884 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 53.5,-5.5 + parent: 12 + - type: AtmosPipeColor + color: '#947507FF' + - uid: 28885 + components: + - type: Transform + pos: 53.5,-4.5 + parent: 12 + - type: AtmosPipeColor + color: '#947507FF' - proto: GasPipeFourway entities: - uid: 2805 @@ -92421,6 +92807,8 @@ entities: - type: Transform pos: -37.5,-29.5 parent: 12 + - type: AtmosPipeColor + color: '#990000FF' - uid: 742 components: - type: Transform @@ -92484,6 +92872,8 @@ entities: - type: Transform pos: -37.5,-30.5 parent: 12 + - type: AtmosPipeColor + color: '#990000FF' - uid: 990 components: - type: Transform @@ -99275,14 +99665,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#990000FF' - - uid: 8910 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 58.5,-4.5 - parent: 12 - - type: AtmosPipeColor - color: '#947507FF' - uid: 9127 components: - type: Transform @@ -100121,13 +100503,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 10346 - components: - - type: Transform - pos: 61.5,-3.5 - parent: 12 - - type: AtmosPipeColor - color: '#947507FF' - uid: 11071 components: - type: Transform @@ -100483,6 +100858,8 @@ entities: rot: -1.5707963267948966 rad pos: -41.5,-28.5 parent: 12 + - type: AtmosPipeColor + color: '#990000FF' - uid: 11922 components: - type: Transform @@ -111245,6 +111622,30 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 26575 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 55.5,-6.5 + parent: 12 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 26577 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 54.5,-6.5 + parent: 12 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 26579 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 53.5,-6.5 + parent: 12 + - type: AtmosPipeColor + color: '#990000FF' - uid: 26606 components: - type: Transform @@ -111304,14 +111705,30 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 26669 + - uid: 26653 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 60.5,-7.5 + rot: 3.141592653589793 rad + pos: 62.5,-5.5 parent: 12 - type: AtmosPipeColor color: '#990000FF' + - uid: 26656 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 55.5,-5.5 + parent: 12 + - type: AtmosPipeColor + color: '#947507FF' + - uid: 26669 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 54.5,-5.5 + parent: 12 + - type: AtmosPipeColor + color: '#947507FF' - uid: 26671 components: - type: Transform @@ -111337,6 +111754,14 @@ entities: - type: Transform pos: 71.5,3.5 parent: 12 + - uid: 26697 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 56.5,-5.5 + parent: 12 + - type: AtmosPipeColor + color: '#947507FF' - uid: 26710 components: - type: Transform @@ -111494,6 +111919,62 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 26777 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 59.5,-5.5 + parent: 12 + - type: AtmosPipeColor + color: '#947507FF' + - uid: 26778 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 57.5,-5.5 + parent: 12 + - type: AtmosPipeColor + color: '#947507FF' + - uid: 26779 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 58.5,-5.5 + parent: 12 + - type: AtmosPipeColor + color: '#947507FF' + - uid: 26783 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 61.5,-7.5 + parent: 12 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 26799 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 60.5,-6.5 + parent: 12 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 26806 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 60.5,-5.5 + parent: 12 + - type: AtmosPipeColor + color: '#947507FF' + - uid: 26880 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 57.5,-6.5 + parent: 12 + - type: AtmosPipeColor + color: '#990000FF' - uid: 26925 components: - type: Transform @@ -111752,69 +112233,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#990000FF' - - uid: 27000 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 59.5,-7.5 - parent: 12 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 27001 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 58.5,-7.5 - parent: 12 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 27002 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 57.5,-7.5 - parent: 12 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 27003 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 56.5,-7.5 - parent: 12 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 27004 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 55.5,-7.5 - parent: 12 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 27005 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 54.5,-7.5 - parent: 12 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 27006 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 53.5,-7.5 - parent: 12 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 27007 - components: - - type: Transform - pos: 52.5,-6.5 - parent: 12 - - type: AtmosPipeColor - color: '#990000FF' - uid: 27008 components: - type: Transform @@ -111861,6 +112279,14 @@ entities: parent: 12 - type: AtmosPipeColor color: '#990000FF' + - uid: 27016 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 56.5,-6.5 + parent: 12 + - type: AtmosPipeColor + color: '#990000FF' - uid: 27020 components: - type: Transform @@ -111991,18 +112417,24 @@ entities: rot: -1.5707963267948966 rad pos: -40.5,-28.5 parent: 12 + - type: AtmosPipeColor + color: '#990000FF' - uid: 27606 components: - type: Transform rot: -1.5707963267948966 rad pos: -39.5,-28.5 parent: 12 + - type: AtmosPipeColor + color: '#990000FF' - uid: 27607 components: - type: Transform rot: -1.5707963267948966 rad pos: -38.5,-28.5 parent: 12 + - type: AtmosPipeColor + color: '#990000FF' - uid: 27736 components: - type: Transform @@ -112011,54 +112443,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 27830 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 59.5,-4.5 - parent: 12 - - type: AtmosPipeColor - color: '#947507FF' - - uid: 27836 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 57.5,-4.5 - parent: 12 - - type: AtmosPipeColor - color: '#947507FF' - - uid: 27860 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 56.5,-4.5 - parent: 12 - - type: AtmosPipeColor - color: '#947507FF' - - uid: 27891 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 55.5,-4.5 - parent: 12 - - type: AtmosPipeColor - color: '#947507FF' - - uid: 27892 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 54.5,-4.5 - parent: 12 - - type: AtmosPipeColor - color: '#947507FF' - - uid: 27893 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 53.5,-4.5 - parent: 12 - - type: AtmosPipeColor - color: '#947507FF' - uid: 27894 components: - type: Transform @@ -112139,14 +112523,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#947507FF' - - uid: 27904 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 60.5,-4.5 - parent: 12 - - type: AtmosPipeColor - color: '#947507FF' - uid: 27908 components: - type: Transform @@ -112575,6 +112951,22 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 28829 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 58.5,-6.5 + parent: 12 + - type: AtmosPipeColor + color: '#990000FF' + - uid: 28831 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 59.5,-6.5 + parent: 12 + - type: AtmosPipeColor + color: '#990000FF' - proto: GasPipeTJunction entities: - uid: 103 @@ -115210,6 +115602,13 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' + - uid: 28830 + components: + - type: Transform + pos: 61.5,-6.5 + parent: 12 + - type: AtmosPipeColor + color: '#990000FF' - proto: GasPort entities: - uid: 794 @@ -115445,11 +115844,11 @@ entities: rot: -1.5707963267948966 rad pos: 9.5,32.5 parent: 12 - - uid: 27206 + - uid: 26648 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 59.5,-2.5 + rot: 1.5707963267948966 rad + pos: 73.5,-5.5 parent: 12 - proto: GasPressurePump entities: @@ -115516,17 +115915,6 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 3127 - components: - - type: Transform - pos: 71.5,2.5 - parent: 12 - - uid: 3128 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 73.5,2.5 - parent: 12 - uid: 3129 components: - type: Transform @@ -115634,6 +116022,24 @@ entities: parent: 12 - type: AtmosPipeColor color: '#990000FF' + - uid: 26776 + components: + - type: Transform + pos: 61.5,-4.5 + parent: 12 + - type: AtmosPipeColor + color: '#947507FF' + - uid: 26808 + components: + - type: Transform + pos: 73.5,2.5 + parent: 12 + - uid: 26809 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 71.5,2.5 + parent: 12 - uid: 26978 components: - type: Transform @@ -115642,13 +116048,13 @@ entities: parent: 12 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 27906 + - uid: 27146 components: - type: Transform - pos: 61.5,-2.5 + pos: 62.5,-4.5 parent: 12 - type: AtmosPipeColor - color: '#947507FF' + color: '#990000FF' - proto: GasThermoMachineFreezer entities: - uid: 2501 @@ -115684,12 +116090,24 @@ entities: rot: 3.141592653589793 rad pos: -76.5,31.5 parent: 12 - - uid: 27235 + - uid: 26645 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 70.5,-2.5 + anchored: False + rot: 3.141592653589793 rad + pos: 67.5,-5.5 + parent: 12 + - type: Physics + bodyType: Dynamic + - uid: 26647 + components: + - type: Transform + anchored: False + rot: 3.141592653589793 rad + pos: 68.5,-5.5 parent: 12 + - type: Physics + bodyType: Dynamic - proto: GasThermoMachineFreezerEnabled entities: - uid: 15405 @@ -115702,18 +116120,6 @@ entities: targetTemperature: 243.15 - proto: GasThermoMachineHeater entities: - - uid: 10305 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 72.5,-2.5 - parent: 12 - - uid: 12931 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 71.5,-2.5 - parent: 12 - uid: 15784 components: - type: Transform @@ -115728,6 +116134,24 @@ entities: rot: 1.5707963267948966 rad pos: 4.5,17.5 parent: 12 + - uid: 26643 + components: + - type: Transform + anchored: False + rot: 3.141592653589793 rad + pos: 64.5,-5.5 + parent: 12 + - type: Physics + bodyType: Dynamic + - uid: 26644 + components: + - type: Transform + anchored: False + rot: 3.141592653589793 rad + pos: 65.5,-5.5 + parent: 12 + - type: Physics + bodyType: Dynamic - proto: GasValve entities: - uid: 789 @@ -116881,6 +117305,9 @@ entities: rot: -1.5707963267948966 rad pos: 55.5,5.5 parent: 12 + - type: DeviceNetwork + deviceLists: + - 26938 - type: AtmosPipeColor color: '#0055CCFF' - uid: 20983 @@ -118880,6 +119307,14 @@ entities: - 26938 - type: AtmosPipeColor color: '#990000FF' + - uid: 26780 + components: + - type: Transform + pos: 73.5,7.5 + parent: 12 + - type: DeviceNetwork + deviceLists: + - 26937 - uid: 26949 components: - type: Transform @@ -121094,6 +121529,16 @@ entities: rot: -1.5707963267948966 rad pos: 35.5,-21.5 parent: 12 + - uid: 5883 + components: + - type: Transform + pos: 59.5,-3.5 + parent: 12 + - uid: 5887 + components: + - type: Transform + pos: 58.5,-2.5 + parent: 12 - uid: 5904 components: - type: Transform @@ -121960,30 +122405,6 @@ entities: rot: 3.141592653589793 rad pos: 47.5,-6.5 parent: 12 - - uid: 7546 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 53.5,-9.5 - parent: 12 - - uid: 7547 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 54.5,-9.5 - parent: 12 - - uid: 7548 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 55.5,-9.5 - parent: 12 - - uid: 7549 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 56.5,-9.5 - parent: 12 - uid: 7551 components: - type: Transform @@ -126896,50 +127317,10 @@ entities: - type: Transform pos: -82.5,16.5 parent: 12 - - uid: 26459 - components: - - type: Transform - pos: 65.5,-3.5 - parent: 12 - - uid: 26460 - components: - - type: Transform - pos: 67.5,-3.5 - parent: 12 - - uid: 26462 - components: - - type: Transform - pos: 58.5,-3.5 - parent: 12 - - uid: 26463 - components: - - type: Transform - pos: 68.5,-3.5 - parent: 12 - - uid: 26464 - components: - - type: Transform - pos: 62.5,-3.5 - parent: 12 - - uid: 26465 - components: - - type: Transform - pos: 59.5,-3.5 - parent: 12 - - uid: 26467 - components: - - type: Transform - pos: 64.5,-3.5 - parent: 12 - - uid: 26468 - components: - - type: Transform - pos: 61.5,-3.5 - parent: 12 - - uid: 26469 + - uid: 26471 components: - type: Transform - pos: 63.5,-3.5 + pos: 78.5,-4.5 parent: 12 - uid: 26499 components: @@ -127086,31 +127467,6 @@ entities: - type: Transform pos: 56.5,6.5 parent: 12 - - uid: 26575 - components: - - type: Transform - pos: 57.5,-3.5 - parent: 12 - - uid: 26576 - components: - - type: Transform - pos: 57.5,-2.5 - parent: 12 - - uid: 26577 - components: - - type: Transform - pos: 56.5,-2.5 - parent: 12 - - uid: 26578 - components: - - type: Transform - pos: 69.5,-3.5 - parent: 12 - - uid: 26579 - components: - - type: Transform - pos: 70.5,-3.5 - parent: 12 - uid: 26581 components: - type: Transform @@ -127121,11 +127477,6 @@ entities: - type: Transform pos: 68.5,14.5 parent: 12 - - uid: 26583 - components: - - type: Transform - pos: 78.5,-1.5 - parent: 12 - uid: 26589 components: - type: Transform @@ -127157,6 +127508,11 @@ entities: - type: Transform pos: 66.5,14.5 parent: 12 + - uid: 26651 + components: + - type: Transform + pos: 80.5,-3.5 + parent: 12 - uid: 26686 components: - type: Transform @@ -127182,6 +127538,41 @@ entities: - type: Transform pos: 67.5,5.5 parent: 12 + - uid: 26787 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 56.5,-7.5 + parent: 12 + - uid: 26788 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 57.5,-7.5 + parent: 12 + - uid: 26793 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 55.5,-9.5 + parent: 12 + - uid: 26816 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 57.5,-2.5 + parent: 12 + - uid: 26881 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 54.5,-7.5 + parent: 12 + - uid: 26904 + components: + - type: Transform + pos: 70.5,-6.5 + parent: 12 - uid: 26910 components: - type: Transform @@ -127192,11 +127583,16 @@ entities: - type: Transform pos: 75.5,-0.5 parent: 12 - - uid: 27057 + - uid: 26967 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 52.5,-7.5 + pos: 80.5,-4.5 + parent: 12 + - uid: 27017 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 53.5,-7.5 parent: 12 - uid: 27058 components: @@ -127276,6 +127672,12 @@ entities: rot: 1.5707963267948966 rad pos: -59.5,-22.5 parent: 12 + - uid: 27203 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 53.5,-9.5 + parent: 12 - uid: 27337 components: - type: Transform @@ -127361,6 +127763,12 @@ entities: rot: 1.5707963267948966 rad pos: -51.5,-44.5 parent: 12 + - uid: 27860 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 54.5,-9.5 + parent: 12 - uid: 27926 components: - type: Transform @@ -127636,6 +128044,82 @@ entities: rot: 3.141592653589793 rad pos: 4.5,-14.5 parent: 12 + - uid: 28789 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 55.5,-7.5 + parent: 12 + - uid: 28790 + components: + - type: Transform + pos: 59.5,-7.5 + parent: 12 + - uid: 28791 + components: + - type: Transform + pos: 59.5,-6.5 + parent: 12 + - uid: 28792 + components: + - type: Transform + pos: 60.5,-6.5 + parent: 12 + - uid: 28793 + components: + - type: Transform + pos: 62.5,-6.5 + parent: 12 + - uid: 28794 + components: + - type: Transform + pos: 61.5,-6.5 + parent: 12 + - uid: 28795 + components: + - type: Transform + pos: 64.5,-6.5 + parent: 12 + - uid: 28796 + components: + - type: Transform + pos: 65.5,-6.5 + parent: 12 + - uid: 28797 + components: + - type: Transform + pos: 66.5,-6.5 + parent: 12 + - uid: 28798 + components: + - type: Transform + pos: 67.5,-6.5 + parent: 12 + - uid: 28799 + components: + - type: Transform + pos: 68.5,-6.5 + parent: 12 + - uid: 28800 + components: + - type: Transform + pos: 71.5,-6.5 + parent: 12 + - uid: 28801 + components: + - type: Transform + pos: 72.5,-6.5 + parent: 12 + - uid: 28802 + components: + - type: Transform + pos: 73.5,-6.5 + parent: 12 + - uid: 28803 + components: + - type: Transform + pos: 74.5,-6.5 + parent: 12 - proto: GrilleBroken entities: - uid: 9088 @@ -129587,6 +130071,16 @@ entities: - type: Transform pos: 35.5,12.5 parent: 12 + - uid: 27004 + components: + - type: Transform + pos: 31.5,0.5 + parent: 12 + - uid: 28849 + components: + - type: Transform + pos: 31.5,-0.5 + parent: 12 - proto: LootSpawnerMaterialsSupplementary entities: - uid: 5980 @@ -130203,18 +130697,6 @@ entities: - type: Transform pos: -33.443954,20.520542 parent: 12 -- proto: MaterialReclaimer - entities: - - uid: 763 - components: - - type: Transform - pos: 39.5,6.5 - parent: 12 - - uid: 8937 - components: - - type: Transform - pos: 46.5,-18.5 - parent: 12 - proto: MatterBinStockPart entities: - uid: 22242 @@ -130686,16 +131168,6 @@ entities: - type: Transform pos: -54.5,-32.5 parent: 12 - - uid: 5127 - components: - - type: Transform - pos: 29.5,-4.5 - parent: 12 - - uid: 5128 - components: - - type: Transform - pos: 31.5,-4.5 - parent: 12 - uid: 7165 components: - type: Transform @@ -130746,10 +131218,15 @@ entities: - type: Transform pos: -2.5,36.5 parent: 12 - - uid: 27242 + - uid: 26576 components: - type: Transform - pos: 67.5,-2.5 + pos: 53.5,-3.5 + parent: 12 + - uid: 26890 + components: + - type: Transform + pos: 53.5,-4.5 parent: 12 - uid: 27307 components: @@ -130768,6 +131245,13 @@ entities: - type: Transform pos: 29.894995,45.5396 parent: 12 +- proto: NitrousOxideCanister + entities: + - uid: 26811 + components: + - type: Transform + pos: 57.5,-3.5 + parent: 12 - proto: NitrousOxideTankFilled entities: - uid: 2921 @@ -130895,16 +131379,6 @@ entities: - type: Transform pos: -15.5,-61.5 parent: 12 - - uid: 5129 - components: - - type: Transform - pos: 29.5,-3.5 - parent: 12 - - uid: 5130 - components: - - type: Transform - pos: 29.5,-2.5 - parent: 12 - uid: 7125 components: - type: Transform @@ -130965,10 +131439,15 @@ entities: - type: Transform pos: -2.5,37.5 parent: 12 - - uid: 27238 + - uid: 27057 components: - type: Transform - pos: 68.5,-2.5 + pos: 54.5,-4.5 + parent: 12 + - uid: 27140 + components: + - type: Transform + pos: 54.5,-3.5 parent: 12 - uid: 27306 components: @@ -131664,10 +132143,10 @@ entities: parent: 12 - proto: PlaqueAtmos entities: - - uid: 26962 + - uid: 26895 components: - type: Transform - pos: 57.5,3.5 + pos: 59.5,-2.5 parent: 12 - proto: PlasmaCanister entities: @@ -131686,20 +132165,15 @@ entities: - type: Transform pos: -50.5,-34.5 parent: 12 - - uid: 4974 - components: - - type: Transform - pos: 31.5,0.5 - parent: 12 - - uid: 5121 + - uid: 26578 components: - type: Transform - pos: 31.5,-0.5 + pos: 58.5,-6.5 parent: 12 - - uid: 27243 + - uid: 27001 components: - type: Transform - pos: 64.5,-2.5 + pos: 57.5,-6.5 parent: 12 - uid: 27308 components: @@ -131954,18 +132428,11 @@ entities: parent: 12 - type: Physics bodyType: Static - - uid: 27205 + - uid: 27309 components: - type: Transform - anchored: True - pos: 73.5,-2.5 + pos: 76.5,-2.5 parent: 12 - - type: PowerSwitchable - activeIndex: 1 - - type: Physics - bodyType: Static - - type: PowerSupplier - voltage: Medium - proto: PortableGeneratorPacmanMachineCircuitboard entities: - uid: 9234 @@ -132044,6 +132511,16 @@ entities: - type: Transform pos: -18.5,59.5 parent: 12 + - uid: 26784 + components: + - type: Transform + pos: 76.5,-0.5 + parent: 12 + - uid: 26786 + components: + - type: Transform + pos: 56.5,2.5 + parent: 12 - proto: PosterBroken entities: - uid: 12227 @@ -132071,10 +132548,11 @@ entities: parent: 12 - proto: PosterContrabandAtmosiaDeclarationIndependence entities: - - uid: 27185 + - uid: 26696 components: - type: Transform - pos: 77.5,1.5 + rot: -1.5707963267948966 rad + pos: 53.5,3.5 parent: 12 - proto: PosterContrabandC20r entities: @@ -135102,6 +135580,28 @@ entities: rot: 1.5707963267948966 rad pos: 20.5,40.5 parent: 12 + - uid: 26547 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 63.5,-5.5 + parent: 12 + - uid: 26548 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 60.5,-2.5 + parent: 12 + - uid: 26549 + components: + - type: Transform + pos: 55.5,-3.5 + parent: 12 + - uid: 26632 + components: + - type: Transform + pos: 62.5,4.5 + parent: 12 - uid: 27131 components: - type: Transform @@ -135113,22 +135613,16 @@ entities: - type: Transform pos: 55.5,2.5 parent: 12 - - uid: 27133 + - uid: 27135 components: - type: Transform - rot: 3.141592653589793 rad - pos: 60.5,-2.5 + pos: 69.5,2.5 parent: 12 - - uid: 27134 + - uid: 27892 components: - type: Transform rot: 3.141592653589793 rad - pos: 66.5,-2.5 - parent: 12 - - uid: 27135 - components: - - type: Transform - pos: 69.5,2.5 + pos: 69.5,-5.5 parent: 12 - proto: PoweredlightBlue entities: @@ -136029,6 +136523,18 @@ entities: rot: 3.141592653589793 rad pos: 58.5,-49.5 parent: 12 + - uid: 26484 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 76.5,-3.5 + parent: 12 + - uid: 27005 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 72.5,6.5 + parent: 12 - uid: 27067 components: - type: Transform @@ -136053,12 +136559,6 @@ entities: rot: -1.5707963267948966 rad pos: 76.5,0.5 parent: 12 - - uid: 27140 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 71.5,7.5 - parent: 12 - uid: 27141 components: - type: Transform @@ -136084,18 +136584,6 @@ entities: - type: Transform pos: 59.5,8.5 parent: 12 - - uid: 27146 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 69.5,4.5 - parent: 12 - - uid: 27149 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 75.5,8.5 - parent: 12 - uid: 27151 components: - type: Transform @@ -136297,11 +136785,15 @@ entities: - type: Transform pos: 29.5,-22.5 parent: 12 - - uid: 5883 + - uid: 5890 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 32.5,-23.5 + pos: 31.5,0.5 + parent: 12 + - uid: 5893 + components: + - type: Transform + pos: 31.5,-0.5 parent: 12 - uid: 7332 components: @@ -137443,6 +137935,16 @@ entities: - type: Transform pos: 16.5,-28.5 parent: 12 + - uid: 26563 + components: + - type: Transform + pos: 29.5,-0.5 + parent: 12 + - uid: 26695 + components: + - type: Transform + pos: 13.5,-8.5 + parent: 12 - uid: 28253 components: - type: Transform @@ -137477,6 +137979,11 @@ entities: - type: Transform pos: 21.5,50.5 parent: 12 + - uid: 26562 + components: + - type: Transform + pos: 29.5,-3.5 + parent: 12 - proto: RandomPainting entities: - uid: 6984 @@ -138861,17 +139368,22 @@ entities: - uid: 5489 components: - type: Transform - pos: 26.08512,-23.561213 + pos: 25.898321,-23.49367 parent: 12 - uid: 5490 components: - type: Transform - pos: 25.783035,-23.582045 + pos: 25.539557,-23.379519 parent: 12 - uid: 5491 components: - type: Transform - pos: 25.480953,-23.571629 + pos: 25.254177,-23.061522 + parent: 12 + - uid: 26775 + components: + - type: Transform + pos: 29.510424,-21.430777 parent: 12 - proto: ReagentContainerFlour entities: @@ -140239,6 +140751,16 @@ entities: rot: 1.5707963267948966 rad pos: -29.5,3.5 parent: 12 + - uid: 5121 + components: + - type: Transform + pos: 58.5,-2.5 + parent: 12 + - uid: 5126 + components: + - type: Transform + pos: 59.5,-3.5 + parent: 12 - uid: 5133 components: - type: Transform @@ -140992,30 +141514,6 @@ entities: rot: 1.5707963267948966 rad pos: 59.5,-10.5 parent: 12 - - uid: 7554 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 53.5,-9.5 - parent: 12 - - uid: 7555 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 54.5,-9.5 - parent: 12 - - uid: 7556 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 55.5,-9.5 - parent: 12 - - uid: 7557 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 56.5,-9.5 - parent: 12 - uid: 7570 components: - type: Transform @@ -141864,6 +142362,11 @@ entities: - type: Transform pos: 29.5,-54.5 parent: 12 + - uid: 10346 + components: + - type: Transform + pos: 57.5,-2.5 + parent: 12 - uid: 10572 components: - type: Transform @@ -144438,31 +144941,6 @@ entities: - type: Transform pos: 74.5,6.5 parent: 12 - - uid: 26457 - components: - - type: Transform - pos: 57.5,-3.5 - parent: 12 - - uid: 26458 - components: - - type: Transform - pos: 57.5,-2.5 - parent: 12 - - uid: 26470 - components: - - type: Transform - pos: 70.5,-3.5 - parent: 12 - - uid: 26471 - components: - - type: Transform - pos: 69.5,-3.5 - parent: 12 - - uid: 26478 - components: - - type: Transform - pos: 58.5,-3.5 - parent: 12 - uid: 26479 components: - type: Transform @@ -144473,11 +144951,6 @@ entities: - type: Transform pos: 51.5,1.5 parent: 12 - - uid: 26484 - components: - - type: Transform - pos: 56.5,-2.5 - parent: 12 - uid: 26492 components: - type: Transform @@ -144603,51 +145076,47 @@ entities: - type: Transform pos: 56.5,6.5 parent: 12 - - uid: 26547 - components: - - type: Transform - pos: 59.5,-3.5 - parent: 12 - - uid: 26548 - components: - - type: Transform - pos: 63.5,-3.5 - parent: 12 - - uid: 26549 + - uid: 26641 components: - type: Transform - pos: 64.5,-3.5 + rot: 1.5707963267948966 rad + pos: -41.5,53.5 parent: 12 - - uid: 26550 + - uid: 26782 components: - type: Transform - pos: 65.5,-3.5 + rot: 3.141592653589793 rad + pos: 55.5,-9.5 parent: 12 - - uid: 26552 + - uid: 26789 components: - type: Transform - pos: 61.5,-3.5 + rot: 3.141592653589793 rad + pos: 55.5,-7.5 parent: 12 - - uid: 26553 + - uid: 26790 components: - type: Transform - pos: 62.5,-3.5 + rot: 3.141592653589793 rad + pos: 53.5,-7.5 parent: 12 - - uid: 26563 + - uid: 26791 components: - type: Transform - pos: 67.5,-3.5 + rot: 3.141592653589793 rad + pos: 56.5,-7.5 parent: 12 - - uid: 26564 + - uid: 26792 components: - type: Transform - pos: 68.5,-3.5 + rot: 3.141592653589793 rad + pos: 54.5,-7.5 parent: 12 - - uid: 26641 + - uid: 26798 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -41.5,53.5 + rot: 3.141592653589793 rad + pos: 54.5,-9.5 parent: 12 - uid: 26909 components: @@ -144659,6 +145128,12 @@ entities: - type: Transform pos: 75.5,1.5 parent: 12 + - uid: 27007 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 53.5,-9.5 + parent: 12 - uid: 27041 components: - type: Transform @@ -144891,6 +145366,107 @@ entities: - type: Transform pos: -9.5,-0.5 parent: 12 + - uid: 28785 + components: + - type: Transform + pos: 52.5,-6.5 + parent: 12 + - uid: 28786 + components: + - type: Transform + pos: 52.5,-5.5 + parent: 12 + - uid: 28787 + components: + - type: Transform + pos: 52.5,-4.5 + parent: 12 + - uid: 28788 + components: + - type: Transform + pos: 52.5,-3.5 + parent: 12 + - uid: 28813 + components: + - type: Transform + pos: 64.5,-6.5 + parent: 12 + - uid: 28814 + components: + - type: Transform + pos: 65.5,-6.5 + parent: 12 + - uid: 28815 + components: + - type: Transform + pos: 66.5,-6.5 + parent: 12 + - uid: 28816 + components: + - type: Transform + pos: 67.5,-6.5 + parent: 12 + - uid: 28817 + components: + - type: Transform + pos: 68.5,-6.5 + parent: 12 + - uid: 28818 + components: + - type: Transform + pos: 70.5,-6.5 + parent: 12 + - uid: 28819 + components: + - type: Transform + pos: 71.5,-6.5 + parent: 12 + - uid: 28820 + components: + - type: Transform + pos: 72.5,-6.5 + parent: 12 + - uid: 28821 + components: + - type: Transform + pos: 73.5,-6.5 + parent: 12 + - uid: 28822 + components: + - type: Transform + pos: 74.5,-6.5 + parent: 12 + - uid: 28823 + components: + - type: Transform + pos: 59.5,-7.5 + parent: 12 + - uid: 28824 + components: + - type: Transform + pos: 59.5,-6.5 + parent: 12 + - uid: 28825 + components: + - type: Transform + pos: 60.5,-6.5 + parent: 12 + - uid: 28826 + components: + - type: Transform + pos: 61.5,-6.5 + parent: 12 + - uid: 28827 + components: + - type: Transform + pos: 62.5,-6.5 + parent: 12 + - uid: 28832 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 57.5,-7.5 + parent: 12 - proto: ResearchAndDevelopmentServer entities: - uid: 785 @@ -145431,7 +146007,7 @@ entities: - uid: 27218 components: - type: Transform - pos: 74.5186,-1.4525614 + pos: 72.55791,-5.408911 parent: 12 - type: Stack count: 5 @@ -145530,13 +146106,20 @@ entities: - uid: 24481 components: - type: Transform - pos: 52.64822,2.4681635 + rot: -6.283185307179586 rad + pos: 71.515366,-5.329795 parent: 12 - uid: 25105 components: - type: Transform pos: 52.483116,2.4964337 parent: 12 + - uid: 26921 + components: + - type: Transform + rot: -6.283185307179586 rad + pos: 71.55885,-5.4439473 + parent: 12 - proto: SheetUranium1 entities: - uid: 27316 @@ -146747,12 +147330,6 @@ entities: parent: 12 - proto: SignCans entities: - - uid: 18758 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 29.5,1.5 - parent: 12 - uid: 21313 components: - type: Transform @@ -147031,6 +147608,12 @@ entities: parent: 12 - proto: SignElectricalMed entities: + - uid: 763 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 75.5,-6.5 + parent: 12 - uid: 16447 components: - type: Transform @@ -147070,11 +147653,11 @@ entities: rot: -1.5707963267948966 rad pos: -51.5,50.5 parent: 12 - - uid: 27056 + - uid: 26802 components: - type: Transform - rot: 1.5707963267948966 rad - pos: 52.5,-8.5 + rot: 3.141592653589793 rad + pos: 63.5,-6.5 parent: 12 - uid: 27097 components: @@ -150989,16 +151572,6 @@ entities: - type: Transform pos: -49.5,-29.5 parent: 12 - - uid: 4142 - components: - - type: Transform - pos: 29.5,0.5 - parent: 12 - - uid: 4976 - components: - - type: Transform - pos: 29.5,-0.5 - parent: 12 - uid: 7171 components: - type: Transform @@ -151014,25 +151587,35 @@ entities: bodyType: Static - type: Lock locked: True - - uid: 27240 + - uid: 26652 components: - type: Transform - pos: 62.5,-2.5 + pos: 65.5,6.5 parent: 12 - - uid: 27241 + - uid: 26785 components: - type: Transform - pos: 63.5,-2.5 + pos: 53.5,-6.5 parent: 12 - - uid: 27310 + - uid: 26804 components: - type: Transform - pos: 67.5,6.5 + pos: 54.5,-6.5 parent: 12 - - uid: 27907 + - uid: 26888 components: - type: Transform - pos: 60.5,-2.5 + pos: 55.5,-6.5 + parent: 12 + - uid: 27149 + components: + - type: Transform + pos: 56.5,-6.5 + parent: 12 + - uid: 27310 + components: + - type: Transform + pos: 67.5,6.5 parent: 12 - proto: StrangePill entities: @@ -151083,6 +151666,11 @@ entities: - type: Transform pos: -11.5,-19.5 parent: 12 + - uid: 5127 + components: + - type: Transform + pos: 76.5,-4.5 + parent: 12 - uid: 5177 components: - type: Transform @@ -151158,11 +151746,6 @@ entities: - type: Transform pos: 12.5,65.5 parent: 12 - - uid: 26904 - components: - - type: Transform - pos: 76.5,-0.5 - parent: 12 - uid: 27458 components: - type: Transform @@ -151674,16 +152257,6 @@ entities: - SurveillanceCameraEngineering nameSet: True id: Atmos entrance - - uid: 27250 - components: - - type: Transform - pos: 64.5,-2.5 - parent: 12 - - type: SurveillanceCamera - setupAvailableNetworks: - - SurveillanceCameraEngineering - nameSet: True - id: Atmos - uid: 27314 components: - type: Transform @@ -153249,6 +153822,12 @@ entities: rot: -1.5707963267948966 rad pos: -22.5,-4.5 parent: 12 + - uid: 5130 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 72.5,-5.5 + parent: 12 - uid: 5242 components: - type: Transform @@ -154627,17 +155206,26 @@ entities: - type: Transform pos: -5.5,-51.5 parent: 12 + - uid: 26550 + components: + - type: Transform + pos: 29.5,-3.5 + parent: 12 + - uid: 26552 + components: + - type: Transform + pos: 29.5,-0.5 + parent: 12 - uid: 27172 components: - type: Transform rot: 1.5707963267948966 rad pos: 53.5,6.5 parent: 12 - - uid: 27208 + - uid: 27243 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 74.5,-1.5 + pos: 71.5,-5.5 parent: 12 - uid: 27252 components: @@ -156337,21 +156925,30 @@ entities: - uid: 4727 components: - type: Transform + anchored: False rot: 1.5707963267948966 rad pos: 7.5,4.5 parent: 12 + - type: Physics + bodyType: Dynamic - uid: 4728 components: - type: Transform + anchored: False rot: 1.5707963267948966 rad pos: 7.5,6.5 parent: 12 + - type: Physics + bodyType: Dynamic - uid: 4729 components: - type: Transform + anchored: False rot: 1.5707963267948966 rad pos: 7.5,5.5 parent: 12 + - type: Physics + bodyType: Dynamic - proto: TintedWindow entities: - uid: 2873 @@ -158190,6 +158787,11 @@ entities: - type: Transform pos: 8.5,-16.5 parent: 12 + - uid: 27006 + components: + - type: Transform + pos: 32.5,-23.5 + parent: 12 - proto: VendingMachineGames entities: - uid: 2035 @@ -161704,6 +162306,11 @@ entities: - type: Transform pos: -27.5,8.5 parent: 12 + - uid: 5125 + components: + - type: Transform + pos: 59.5,-2.5 + parent: 12 - uid: 5139 components: - type: Transform @@ -169010,11 +169617,6 @@ entities: rot: 3.141592653589793 rad pos: 68.5,8.5 parent: 12 - - uid: 26446 - components: - - type: Transform - pos: 75.5,-2.5 - parent: 12 - uid: 26447 components: - type: Transform @@ -169035,16 +169637,6 @@ entities: - type: Transform pos: 75.5,3.5 parent: 12 - - uid: 26453 - components: - - type: Transform - pos: 74.5,-2.5 - parent: 12 - - uid: 26461 - components: - - type: Transform - pos: 66.5,-3.5 - parent: 12 - uid: 26472 components: - type: Transform @@ -169075,6 +169667,11 @@ entities: - type: Transform pos: 51.5,-1.5 parent: 12 + - uid: 26478 + components: + - type: Transform + pos: 79.5,-4.5 + parent: 12 - uid: 26481 components: - type: Transform @@ -169135,11 +169732,6 @@ entities: - type: Transform pos: 54.5,-1.5 parent: 12 - - uid: 26562 - components: - - type: Transform - pos: 60.5,-3.5 - parent: 12 - uid: 26586 components: - type: Transform @@ -169220,6 +169812,11 @@ entities: - type: Transform pos: 77.5,-0.5 parent: 12 + - uid: 26649 + components: + - type: Transform + pos: 79.5,-2.5 + parent: 12 - uid: 26670 components: - type: Transform @@ -169280,25 +169877,27 @@ entities: - type: Transform pos: 60.5,9.5 parent: 12 - - uid: 26694 + - uid: 26882 components: - type: Transform - pos: 74.5,-3.5 + pos: 56.5,-9.5 parent: 12 - - uid: 26695 + - uid: 26892 components: - type: Transform - pos: 73.5,-3.5 + rot: 3.141592653589793 rad + pos: 58.5,-7.5 parent: 12 - - uid: 26696 + - uid: 26898 components: - type: Transform - pos: 72.5,-3.5 + rot: 3.141592653589793 rad + pos: 52.5,-7.5 parent: 12 - - uid: 26697 + - uid: 26912 components: - type: Transform - pos: 71.5,-3.5 + pos: 80.5,-2.5 parent: 12 - uid: 27076 components: @@ -169381,17 +169980,16 @@ entities: rot: 1.5707963267948966 rad pos: -59.5,-24.5 parent: 12 - - uid: 27128 + - uid: 27147 components: - type: Transform rot: 1.5707963267948966 rad - pos: 52.5,-8.5 + pos: -57.5,-20.5 parent: 12 - - uid: 27147 + - uid: 27237 components: - type: Transform - rot: 1.5707963267948966 rad - pos: -57.5,-20.5 + pos: 79.5,-3.5 parent: 12 - uid: 27334 components: @@ -169685,6 +170283,63 @@ entities: rot: 1.5707963267948966 rad pos: 56.5,10.5 parent: 12 + - uid: 28804 + components: + - type: Transform + pos: 63.5,-6.5 + parent: 12 + - uid: 28805 + components: + - type: Transform + pos: 69.5,-6.5 + parent: 12 + - uid: 28806 + components: + - type: Transform + pos: 75.5,-6.5 + parent: 12 + - uid: 28807 + components: + - type: Transform + pos: 75.5,-5.5 + parent: 12 + - uid: 28808 + components: + - type: Transform + pos: 76.5,-5.5 + parent: 12 + - uid: 28809 + components: + - type: Transform + pos: 77.5,-5.5 + parent: 12 + - uid: 28810 + components: + - type: Transform + pos: 77.5,-4.5 + parent: 12 + - uid: 28811 + components: + - type: Transform + pos: 77.5,-3.5 + parent: 12 + - uid: 28812 + components: + - type: Transform + pos: 77.5,-2.5 + parent: 12 + - uid: 28852 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 75.5,-4.5 + parent: 12 + - uid: 28856 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 75.5,-2.5 + parent: 12 - proto: WallReinforcedDiagonal entities: - uid: 4721 @@ -177255,13 +177910,6 @@ entities: - type: Transform pos: -55.5,-31.5 parent: 12 -- proto: WarningCO2 - entities: - - uid: 27181 - components: - - type: Transform - pos: 65.5,9.5 - parent: 12 - proto: WarningN2 entities: - uid: 27182 @@ -177290,6 +177938,11 @@ entities: - type: Transform pos: 67.5,9.5 parent: 12 + - uid: 27906 + components: + - type: Transform + pos: 65.5,9.5 + parent: 12 - proto: WaterCooler entities: - uid: 2438 @@ -177488,15 +178141,15 @@ entities: parent: 12 - proto: WaterVaporCanister entities: - - uid: 13169 + - uid: 15785 components: - type: Transform - pos: 66.5,-2.5 + pos: 9.5,32.5 parent: 12 - - uid: 15785 + - uid: 26919 components: - type: Transform - pos: 9.5,32.5 + pos: 58.5,-3.5 parent: 12 - proto: WeaponCapacitorRecharger entities: @@ -177768,10 +178421,10 @@ entities: - type: Transform pos: 52.5,11.5 parent: 12 - - uid: 27203 + - uid: 26803 components: - type: Transform - pos: 56.5,-1.5 + pos: 70.5,-5.5 parent: 12 - uid: 27839 components: @@ -180753,7 +181406,7 @@ entities: - uid: 27207 components: - type: Transform - pos: 74.50637,-1.4770226 + pos: 72.52122,-5.3538737 parent: 12 - uid: 28277 components: From c3f42438f247265b670dc2c8dd9a6874571dfd5c Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Mon, 19 Aug 2024 09:54:34 +0200 Subject: [PATCH 002/119] Cheese tweaks (#31168) * Cheese tweaks * 22221241256247849` --- .../Entities/Objects/Consumable/Food/ingredients.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml index 6fb75711deb..6e481bb9618 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml @@ -565,13 +565,15 @@ id: FoodCheese description: A big wheel of delicious Cheddar. components: + - type: Item + size: Normal - type: FlavorProfile flavors: - cheesy - type: Sprite state: cheesewheel - type: SliceableFood - count: 3 + count: 4 slice: FoodCheeseSlice - type: entity @@ -591,7 +593,7 @@ maxVol: 6 reagents: - ReagentId: Nutriment - Quantity: 5 + Quantity: 3.75 - type: Tag tags: - Slice @@ -803,4 +805,4 @@ maxVol: 4 reagents: - ReagentId: Nutriment - Quantity: 3 \ No newline at end of file + Quantity: 3 From 61f756de8af21ae0bca2ebe2813fb79d69be484e Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 19 Aug 2024 07:55:41 +0000 Subject: [PATCH 003/119] Automatic changelog update --- Resources/Changelog/Changelog.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 1f5cf04a6b8..8d5b8e4f126 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: Beck Thompson - changes: - - message: ID computer will now select passenger as the default id icon instead - of atmospheric technician. - type: Fix - id: 6660 - time: '2024-06-01T17:29:46.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28462 - author: AJCM-git changes: - message: Machine parts are now stackable @@ -3857,3 +3849,10 @@ id: 7159 time: '2024-08-19T03:39:00.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30802 +- author: lzk228 + changes: + - message: Cheese wheel now Normal sized and slices in 4 slices instead of 3. + type: Tweak + id: 7160 + time: '2024-08-19T07:54:35.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31168 From d297852ba882e140022f0d97a4d569950c242fd6 Mon Sep 17 00:00:00 2001 From: beck-thompson <107373427+beck-thompson@users.noreply.github.com> Date: Mon, 19 Aug 2024 03:33:41 -0700 Subject: [PATCH 004/119] Seed vend restock price increase (Fix test fails) (#31185) First commit --- Resources/Prototypes/Catalog/Cargo/cargo_vending.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index a94a6b2189a..5dae53f8ede 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -174,7 +174,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockSeedsFilled - cost: 3470 + cost: 3600 category: cargoproduct-category-name-hydroponics group: market From 972bd566f541287b3b25fe098200dcf37a5b84b5 Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 19 Aug 2024 10:34:47 +0000 Subject: [PATCH 005/119] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 8d5b8e4f126..fbe2dea6ded 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: AJCM-git - changes: - - message: Machine parts are now stackable - type: Tweak - id: 6661 - time: '2024-06-01T17:49:28.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28434 - author: DrSmugleaf changes: - message: Disabled the seeing rainbows screen effect when reduced motion is enabled @@ -3856,3 +3849,10 @@ id: 7160 time: '2024-08-19T07:54:35.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31168 +- author: Beck Thompson + changes: + - message: Slightly increased the price of the seed restock. + type: Tweak + id: 7161 + time: '2024-08-19T10:33:41.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31185 From 2f923d88e4aa624f55dd7f4f7a2a57e5ff8d22c2 Mon Sep 17 00:00:00 2001 From: Boaz1111 <149967078+Boaz1111@users.noreply.github.com> Date: Mon, 19 Aug 2024 13:14:30 +0200 Subject: [PATCH 006/119] New head of security weapon:Energy Shotgun (#30643) * Reset hopefully? * removes the emergency security orders * Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml Rewrites the description based on review Co-authored-by: NakataRin <45946146+NakataRin@users.noreply.github.com> * 7 shots, recharge taking 42 seconds * minor renaming :godo: * please work * Revert "please work" This reverts commit e84a2618d95ec17f5fd608331176df2ab8b0966c. * please fix --------- Co-authored-by: NakataRin <45946146+NakataRin@users.noreply.github.com> --- .../Catalog/Fills/Lockers/heads.yml | 4 +- .../Objects/Misc/secret_documents.yml | 16 ---- .../Weapons/Guns/Battery/battery_guns.yml | 50 +++++++++++ .../Weapons/Guns/Projectiles/projectiles.yml | 85 ++++++++++++++++++ .../Prototypes/Objectives/objectiveGroups.yml | 2 +- .../Objectives/stealTargetGroups.yml | 16 ++-- Resources/Prototypes/Objectives/traitor.yml | 7 +- .../Guidebook/Antagonist/Traitors.xml | 4 +- .../Guns/Battery/energy_shotgun.rsi/base.png | Bin 0 -> 824 bytes .../energy_shotgun.rsi/equipped-BACKPACK.png | Bin 0 -> 873 bytes .../equipped-SUITSTORAGE.png | Bin 0 -> 873 bytes .../Guns/Battery/energy_shotgun.rsi/icon.png | Bin 0 -> 807 bytes .../energy_shotgun.rsi/mag-unshaded-1.png | Bin 0 -> 156 bytes .../energy_shotgun.rsi/mag-unshaded-2.png | Bin 0 -> 157 bytes .../energy_shotgun.rsi/mag-unshaded-3.png | Bin 0 -> 166 bytes .../energy_shotgun.rsi/mag-unshaded-4.png | Bin 0 -> 166 bytes .../Guns/Battery/energy_shotgun.rsi/meta.json | 37 ++++++++ .../inhands_64x.rsi/energy-inhand-left.png | Bin 0 -> 979 bytes .../inhands_64x.rsi/energy-inhand-right.png | Bin 0 -> 997 bytes .../Guns/Battery/inhands_64x.rsi/meta.json | 27 ++++++ .../inhands_64x.rsi/wielded-inhand-left.png | Bin 0 -> 1132 bytes .../inhands_64x.rsi/wielded-inhand-right.png | Bin 0 -> 1147 bytes .../projectiles_tg.rsi/heavylaser.png | Bin 0 -> 340 bytes .../Projectiles/projectiles_tg.rsi/meta.json | 3 + 24 files changed, 220 insertions(+), 31 deletions(-) delete mode 100644 Resources/Prototypes/Entities/Objects/Misc/secret_documents.yml create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/base.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/equipped-SUITSTORAGE.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/icon.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-1.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-2.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-3.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-4.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/energy-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/energy-inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/meta.json create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/wielded-inhand-right.png create mode 100644 Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/heavylaser.png diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index a56c31566c8..45935be0acb 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -308,7 +308,7 @@ id: LockerFillHeadOfSecurityNoHardsuit table: !type:AllSelector children: - - id: BookSecretDocuments + - id: WeaponEnergyShotgun - id: BookSpaceLaw - id: BoxEncryptionKeySecurity - id: CigarGoldCase @@ -375,4 +375,4 @@ - id: JetpackBlue - id: SpaceCash1000 - id: BeachBall - - id: BikeHorn + - id: BikeHorn \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Misc/secret_documents.yml b/Resources/Prototypes/Entities/Objects/Misc/secret_documents.yml deleted file mode 100644 index 257aea82683..00000000000 --- a/Resources/Prototypes/Entities/Objects/Misc/secret_documents.yml +++ /dev/null @@ -1,16 +0,0 @@ -- type: entity - parent: [BaseItem, BaseGrandTheftContraband] - id: BookSecretDocuments - name: "emergency security orders" - description: TOP SECRET. These documents specify the Emergency Orders that the HoS must carry out when ordered by Central Command. - components: - - type: Sprite - sprite: Objects/Misc/bureaucracy.rsi - layers: - - state: folder-sec-doc - - type: Tag - tags: - - Book - - HighRiskItem - - type: StealTarget - stealGroup: BookSecretDocuments diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 5b8130567b3..3ae9a2302dd 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -717,3 +717,53 @@ - type: Appearance - type: StaticPrice price: 750 + +- type: entity + name: energy shotgun + parent: [BaseWeaponBattery, BaseGunWieldable] + id: WeaponEnergyShotgun + description: A one-of-a-kind prototype energy weapon that uses various shotgun configurations. It offers the possibility of both lethal and non-lethal shots, making it a versatile weapon. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Battery/energy_shotgun.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Clothing + sprite: Objects/Weapons/Guns/Battery/energy_shotgun.rsi + - type: Gun + fireRate: 2 + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/laser_cannon.ogg + - type: ProjectileBatteryAmmoProvider + proto: BulletLaserSpread + fireCost: 150 + - type: BatteryWeaponFireModes + fireModes: + - proto: BulletLaserSpread + fireCost: 150 + - proto: BulletLaserHeavySpread + fireCost: 150 + - proto: BulletDisablerSmgSpread + fireCost: 150 + - type: Item + size: Large + shape: + - 0,0,3,1 + sprite: Objects/Weapons/Guns/Battery/inhands_64x.rsi + heldPrefix: energy + - type: Tag + tags: + - HighRiskItem + - type: StealTarget + stealGroup: WeaponEnergyShotgun + - type: GunRequiresWield #remove when inaccuracy on spreads is fixed + - type: Battery + maxCharge: 1050 + startingCharge: 1050 + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 25 #takes 42 seconds to fully recharge, the answer to life, the universe and everything \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 42217a88bba..57eb672848f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -981,3 +981,88 @@ - type: Tag tags: - HideContextMenu + +- type: entity + name: laser bolt + id: BulletLaser + parent: BaseBullet + categories: [ HideSpawnMenu ] + components: + - type: Reflective + reflective: + - Energy + - type: FlyBySound + sound: + collection: EnergyMiss + params: + volume: 5 + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi + layers: + - state: heavylaser + shader: unshaded + - type: Physics + - type: Fixtures + fixtures: + projectile: + shape: + !type:PhysShapeAabb + bounds: "-0.15,-0.3,0.15,0.3" + hard: false + mask: + - Impassable + - BulletImpassable + fly-by: *flybyfixture + - type: Ammo + - type: Projectile + impactEffect: BulletImpactEffectOrangeDisabler + damage: + types: + Heat: 10 + soundHit: + collection: WeakHit + forceSound: true + +- type: entity + name: wide laser barrage + id: BulletLaserSpread + noSpawn: true + parent: BulletLaser + components: + - type: ProjectileSpread + proto: BulletLaser + count: 5 #50 heat damage if you hit all your shots, but wide spread + spread: 30 + +- type: entity + name : heavy laser bolt + id: BulletLaserHeavy + parent: BulletLaser + categories: [ HideSpawnMenu ] + components: + - type: Projectile + damage: + types: + Heat: 15 + +- type: entity + name: narrow laser barrage + id: BulletLaserHeavySpread + noSpawn: true + parent: BulletLaser + components: + - type: ProjectileSpread + proto: BulletLaser + count: 3 #45 heat damage if you hit all your shots, but narrower spread + spread: 10 + +- type: entity + name: disabling laser barrage + id: BulletDisablerSmgSpread + noSpawn: true + parent: BulletDisablerSmg + components: + - type: ProjectileSpread + proto: BulletDisablerSmg + count: 3 #bit stronger than a disabler if you hit your shots you goober, still not a 2 hit stun though + spread: 9 \ No newline at end of file diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml index fe1d8e35285..b6d727f880a 100644 --- a/Resources/Prototypes/Objectives/objectiveGroups.yml +++ b/Resources/Prototypes/Objectives/objectiveGroups.yml @@ -21,7 +21,7 @@ CaptainGunStealObjective: 0.5 CaptainJetpackStealObjective: 0.5 HandTeleporterStealObjective: 0.5 - SecretDocumentsStealObjective: 0.5 + EnergyShotgunStealObjective: 0.5 - type: weightedRandom id: TraitorObjectiveGroupKill diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml index 08c08402769..a912a6ad8e7 100644 --- a/Resources/Prototypes/Objectives/stealTargetGroups.yml +++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml @@ -28,13 +28,6 @@ sprite: Objects/Devices/hand_teleporter.rsi state: icon -- type: stealTargetGroup - id: BookSecretDocuments - name: "emergency security orders" - sprite: - sprite: Objects/Misc/bureaucracy.rsi - state: folder-sec-doc - - type: stealTargetGroup id: ClothingShoesBootsMagAdv name: advanced magboots @@ -84,6 +77,13 @@ sprite: Objects/Misc/nukedisk.rsi state: icon +- type: stealTargetGroup + id: WeaponEnergyShotgun + name: energy shotgun + sprite: + sprite: Objects/Weapons/Guns/Battery/energy_shotgun.rsi + state: base + # Thief Collection - type: stealTargetGroup @@ -406,3 +406,5 @@ sprite: sprite: Mobs/Animals/crab.rsi state: crab + + diff --git a/Resources/Prototypes/Objectives/traitor.yml b/Resources/Prototypes/Objectives/traitor.yml index a686925c33e..419e7ac1092 100644 --- a/Resources/Prototypes/Objectives/traitor.yml +++ b/Resources/Prototypes/Objectives/traitor.yml @@ -195,16 +195,17 @@ ## hos - type: entity + noSpawn: true parent: BaseTraitorStealObjective - id: SecretDocumentsStealObjective + id: EnergyShotgunStealObjective components: - type: Objective - # hos has a gun ce does not, higher difficulty than most + # HoS will have this on them a lot of the time so.. difficulty: 3 - type: NotJobRequirement job: HeadOfSecurity - type: StealCondition - stealGroup: BookSecretDocuments + stealGroup: WeaponEnergyShotgun owner: job-name-hos ## ce diff --git a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml index 78b950c690c..3e48200e88e 100644 --- a/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml +++ b/Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml @@ -86,9 +86,9 @@ - - Stealing the [color=#cb0000]Head of Security[/color]'s [bold]secret documents[/bold]. + - Stealing the [color=#cb0000]Head of Security[/color]'s [bold]energy shotgun[/bold]. - + - Stealing the [color=#f39f27]Chief Engineer[/color]'s [bold]advanced magboots[/bold]. diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/base.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/base.png new file mode 100644 index 0000000000000000000000000000000000000000..1d7177f4eab5ce8e6ba5b97eb1f12bc6f079e936 GIT binary patch literal 824 zcmV-81IPS{P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0?kQ8K~z{r?Ucz+ z6LA#BzrPu}&>2b>Qb4vTEv+VEBrYd4VxlK6UWguyM&sE(!HbDEk8&{)ml#0}CR{zK zH!($Af`+YN*=(^R?NDgipTAjJ_EI2G5B(&Q-}}Aa^1koQn?Z>ZB})8jh%x>(q`)!C z^E{T9)0iCjKne;t-%>{-q6c+}IjkP5k}*UDH?rwCK7Jn4?r8G2QE(LD?*n8jTWV>e zqG*LsQGuDMp9l|!bOG)LiK^pzu6iPv+24Vhp`JBkHNjxeuyh_jd!h^I zi^{lE?=##hyc-)bEY>WnR%G29OM#-xn#MhAE&R>3hIf0y<6&?Xf~jzXXaZg`0auuS zsX#X@Z~Ng3b|RC>Vqrl6WiO|!jE7fhL|mSSqAVKMfUQxsXA!BStl8>ASS2f*l`tI| z#M0n#{A|4d&p zPl00>6OzWmM^Cjt$b$Je7La32uo2m{yK!CkzIOxF!0mXnzH z8q$KgYMbc%bXXVQ@-$P??ttAcz+|;xVscpZ=Q$t+aqet8-iN-SulE7*wjQNppZbZb zTB3sJ(#}zmMIxo-12hEMsFH{?Q4W@E9D>7U#88%(xlwW9HX9UcY*=vcAttZ7h4j(|myKSe^YEswD4*PqA9^(P+J&szMCco^X1a zHr%u2w{z?E9s0#&!~GvCO}AIn3KwL3rs_QR7_METmfkQ6qn4@Y%|)>5`}QiN*z?_& literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..a382ba66ba1a8d1a102d8fcfa21598c0a1142bae GIT binary patch literal 873 zcmV-v1D5=WP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0{%%vK~#8N?V3$* z577q=v+LqL#2461R{RCe90DcZn9=(`&@TJ^MP@@TrMh-2I zswJeB`cg45(RB2`nQ5skb(h^`ciZQeOm=42?DPEp^RP>pWduPG1kp+O#7Qo?t_NDW z=@}5mUEt(eeQjTu01d-K5i#mS)c|m3)Xx?hO;?*B#d|zrLWQmdJPe&?^QX?b(gft& zE2z92PE1<@u8%lUyad8~6%Py< z0A9X$zHP#MHfxCqQas|wl}9roTw>S&AWgWE%dxDsWrCC-VE`;)bH)g z>>R&-?J6r23anTx8ooBf=l+`dM7%42 z38G671VIo4K@bE%5dB8(yNRJ=(VM5Pzr;rT5rz#2F?1Xd{;2s)jI^Q4fcvXe(c3?m z@~5bq>B)dlv=94lI_Wj1o+|(WonS43S)l&9Nj;FN`sj000000NkvXXu0mjf&C8D) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 0000000000000000000000000000000000000000..a382ba66ba1a8d1a102d8fcfa21598c0a1142bae GIT binary patch literal 873 zcmV-v1D5=WP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0{%%vK~#8N?V3$* z577q=v+LqL#2461R{RCe90DcZn9=(`&@TJ^MP@@TrMh-2I zswJeB`cg45(RB2`nQ5skb(h^`ciZQeOm=42?DPEp^RP>pWduPG1kp+O#7Qo?t_NDW z=@}5mUEt(eeQjTu01d-K5i#mS)c|m3)Xx?hO;?*B#d|zrLWQmdJPe&?^QX?b(gft& zE2z92PE1<@u8%lUyad8~6%Py< z0A9X$zHP#MHfxCqQas|wl}9roTw>S&AWgWE%dxDsWrCC-VE`;)bH)g z>>R&-?J6r23anTx8ooBf=l+`dM7%42 z38G671VIo4K@bE%5dB8(yNRJ=(VM5Pzr;rT5rz#2F?1Xd{;2s)jI^Q4fcvXe(c3?m z@~5bq>B)dlv=94lI_Wj1o+|(WonS43S)l&9Nj;FN`sj000000NkvXXu0mjf&C8D) literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/icon.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..4cdf7dc401909bd9e4d0aa57df160ddbcdd2bb81 GIT binary patch literal 807 zcmV+?1K9kDP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0=!8?K~z{r?Uc`N z5+dGqGYym@bC7B)6EHvbyJ+rLI6c8m&w zfaT>C%uK!^4sLJA>F7RsTXoa=_O2q(Q?XvN9XixUxhukh2^x+KoBhr7NHjrZ$%&3m z9~@+jnXC$EJ(1c%^;{05arUzl&tj{!_WXns_lH(-<-HTPhAViH-V06B_>AUwy7W`{^4nG|NH(L}4#Z^`2y~ZpVK4q61M@LRV5SkX#Bp#1*&EnzXN7e?O=L)zG z8sO%2UQK=Cno%mFR)l@(SOmob&k9C8T^Q`|;?}K6PAB1LBgiDv#N5CWV*{6r4P;_t zXnXk@1MxekRMt=|mO=U9u-KyLwmKYY3>J$ESo~Embtc59W0JZfb3VH1U)!$-36bjAUbjevh0Q2shSxxak$qjN&JC+D*F^8 zkOY^f4XK$ge8}QJB#s}tj%;3so|z)O2NN_k@s{|55h}@ka~?HrbZM~+W@mGHVhLI< zE5qSVF|t(R7_XApl^n9_>XVdtXHOxFh4@eBt;7&9{6PuCzCrA>XX7Gh}K zeN^0|f(W!0U@KU>@3YB`z8#VEH(ezd8KAk)Al>YlZWlEW-muQ5Z|B;LoAjeg#Jz6| z+_HOEg`4tcrmSBTZrU-d^jvKYD^ttPEwJPDcDs>Q=Wls)s~3kDf9i&}w~p=jR%ywp lN;N!lvI6;>1s;*b3=DjSL74G){)!Z!prNOWV@QPi+hdAc3{xHE`!lvI6;>1s;*b3=DjSL74G){)!Z!ppmDGV@QPi+oKD4859K=HgKy{m?efi`}@R@ xLx80@$CtTbcHHUx|DtBeZ`IFdW;hTn$Sfkty77i@LIF@WgQu&X%Q~loCIF5>D=Gj0 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-3.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-3.png new file mode 100644 index 0000000000000000000000000000000000000000..2008e393d1d71ead1ee221a244aa7d9784c0478f GIT binary patch literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!ptYxqV@QPi+oKz~7z9KdE{cCm`{!bJ^;z)L zMJWjrp7ws%ac5w#SAAu%{^0txJN^d0`e$Vx%M8?L=At(57Dw;xOX636JO)o!KbLh* G2~7Yck2C)O literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-4.png b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/mag-unshaded-4.png new file mode 100644 index 0000000000000000000000000000000000000000..bd4685d5b0ad5582061fdd83a66b2f3fb2483d3a GIT binary patch literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!ptYxqV@QPi+oOtH3<^9B7aty2V=maA^?60p zf};mDz?KY7;PLqAvgm|hn=3)I)pe}YZu9CxPi^fP)uE`z75pUXO@ GgeCw2xib*} literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/meta.json new file mode 100644 index 00000000000..9ffc0030820 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/energy_shotgun.rsi/meta.json @@ -0,0 +1,37 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Icon sprite made by Papermaker48 for SS14, other sprites made by Boaz1111 with that sprite as reference.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "base" + }, + { + "name": "mag-unshaded-1" + }, + { + "name": "mag-unshaded-2" + }, + { + "name": "mag-unshaded-3" + }, + { + "name": "mag-unshaded-4" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/energy-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/energy-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..8f7c40c4f9d7d43c237ee95c20dc1d2d20891912 GIT binary patch literal 979 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qt-49ppxE{-7;ac}SX`wKft9RKJT=wQ(x;32%V zW1`2C1)cSJv*y_pe(_k;*_rOYk8#~T?)Xl%dtU<<8+Hirg-+0DYo3wubo;xc&0B7_ zm6XrF`L}M;vNzv07=N}gwvL@;!w0k$1$;8DtlPFSykf>moAr17)en`w&-gIkrcOle zsq=MxC!q@W=6#zsP5RBV~^!r-P!vKQZ{_{W9XdZ z@Rr+u;e9jqyTFlD&Ct-Eh7`^RGnOV)aQ?Z%fZ9}=G(|G7(O#^UO%wPD_OVxO1(?^lVn zUwL=hj2Om62XEiL&D}RqZZhWvi*Vk1*SD87l`lD-!gS@jSyOrZyWe)kyE*4bNb%&c z?o(^je`_|K;p%DgS;>ck^GZug7iefV{0gx*&H7Zh@uX-%P0gCueDU+mrFvt8U9P`h zI``H2OK+O0FaMBQlQm7~U<^~nhPLxPyXNorFZW^MKG?6K+IViY{Hy+7rOzKtRp9*h z#{6uJugUf!_txo}+V5GtJ3m_5@%Am=byFW~_sV*Hq-3k*{tYkg?W=pBmOgK1`22gj zv!`mB?R=ZD;gCJI>)%Up500K_Ik}g?Xn~5t50r?(!Z{FqtxH#=@#ZYYLasfpzAkPN zsd@Ef`jn=7QAYcME5$@6WWC?U7Vpt8Dd21F)yMt%zf~OSXWn7?6=8ZO{F#u0as1cs zr{!wa)_lCG&-+ZMVdj7RAFFgFL}&5%Pj?P#KV9_yxOliOw4$3J${}SbS-NZ&Ak6kuskNL*35kItTM1{glVS{{PDs&Q^L`>E-Kaf6o7=M+1|>57p%d+z-AtUBR;dz%Ewv^$#{H lpA86_@ber$Qi%RKymP;0Trb;ohO4b0VNX{-mvv4FO#q##z108! literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/energy-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/energy-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..9b45368663314b7ad36ae0e24e2872bff461d0e5 GIT binary patch literal 997 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qt-49r!YE{-7;ac}RQ_nzV?bNr*Bj%n+bLjqd5 zo>TU)TwQr1czK_!EsNuGzrW1?H1ArMy_$49PmsHDMuyzBKY^0mTib8_@Hu~AlkWL- zzimFhd1L%uT<7&?jUR8y?W~RMy5gCE_96p?F!6OdCSN`H3>hkW4z7H%Q~&%tyN%)# zWfnQC+WpEtU{}Z2ucc{CO{{_6ckZ_v+xKP^SkI zU)}zf#;wG#sC$=n^~#;*R<0a20kNU?uN|DehVjG}&YaRM+l@aJ<{YxIvd^46YmOUV zi2v2luc31%U*35_m*J69!JoZ}!n5bNv8`JC>Sgi=)$0r##*TG0`#u*>-1aYH?Wz#1 zKP3|aqyB!n!SKwEdCRKnufNR{XgQtDQ1-3=&F5END}VQVsNijg-oEPg?r#zgKZ-H% z?pyY6=EjRpcz!*s{`|a_?Z&NJQZuFYXFSWllO}(m^`61i%ahM4Wlz;)*cz3)s}`!QFW7|F7C(J@e;o(dYVq`N027 zlU}y}_qL`+t6%jl^p zdz-IHSf=fZKFIDp+ab5lDtE%EZ8}SGnHEnCo8q-JXxHtfcbx=+JoemY_gGwBUs`Q` zW46lQS4)@HX>dhO{<7$D)I4pD?%w&&?tGb1x%cNvlh-NB1$a_le_vBI^OH!^h5EuK z9zP+by4I*Ujqez5?W}&bx%}Pqcgve!d^KXWkgEB&XjzJ%5W~d>pSPE)I&)ko=D2e` z^8=^D$rA2^p6Og)@)OKeFR@vknyrc)x;qV?>BlbaJfZIX%?Bjz>FVdQ&MBb@063t* Ar~m)} literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/meta.json b/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/meta.json new file mode 100644 index 00000000000..2fcf294bc98 --- /dev/null +++ b/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Energy Shotgun inhands made by Boaz1111 based on the energy shotgun icon sprite made by Papermaker48 for SS14", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "energy-inhand-left", + "directions": 4 + }, + { + "name": "energy-inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..056e6026ac107802ca61d274e1be6aad0ecb67b8 GIT binary patch literal 1132 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucHH@Avjv*CsZ|~mEo*gQ2;G??zt(~gNblrBV z_4WL#m}t1+;=vewmi49KO(8EF1oYd=|1s`;A^%`$T!(^2PF47qZ9DGl;FSzrliZt| zdtKLe>BVDezROjP&%11{c>0#f?EFi6ZhmKe_~*pw*`Mcpp7UKb+#To=EMP~=aXs0> ztQVnI@7`5CniM!~vb|MRzDfIaJ=up}r>Oj?@n~Y)KS!=p`>yzAx6qs&b+NN|Tv+?) zy!@z1^FBmWJCfRx$m3w!T0^WI}wN?7w^OGpZa<%kR#P?~QpJX4U!ic;2<8_kWgc zRgIc8_p8{A()X5F(gJp&TMj?(R2Q@DGyUbU_p*#w{_dmqz8sc1{rtW-7whG9+qP~^ zJym0;KheWw)6F%R=0)e~cCQl8-&$f7+xb)Daqchv{y7`3Ed9v2`|F08GbK+xEm}6u zYw3|qI>Ga!qYP7b&llb^zv`o(zyIu@9r&I9?I%1uU#&re|UX2p?qhU^2e~>3y&67zulBt za?IRFGyna&e|{G-_RNZ__xJjd{3O0t<-5yzzn{2oy!GJqeZtmfFN^78glmS_ a#QzMkK{F5CPWvbVlJ#`;b6Mw<&;$TNav+HS literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Guns/Battery/inhands_64x.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..d5933b2f698b070a7724cce6b2071f83ef4f2907 GIT binary patch literal 1147 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucH3FV4jv*CsZ|~mEo*gQ2;G_D*umANzIMm0j~N<^Y;2Do z`Cl{NLbmem)oW|2_4oMP_%>_XEW5c@>&%YZiM+q`{gZQ6M2+42pQjJr$=hzJ<+c2> zQ2+7UpEL#d+Na)sZ$8mOM@;+v^VXH!ug;yfzq;rB$B%_uckH;a<o518zt;2Z3wZbc^299We~q z+1Y&Y4^*|^y_4Pa%cT8v{OYfBUI<>_x?aWp|4g5{zl;BT^K`lPSo_hNB9AQ9n-dyW zOn3M&<&=GxkPPps#IQec>2doOxUu=465qJ{QRvb7_otsfIkWO$n}}nq{tE5~VO7EF z=E!Y+H1){cn%bvey4|_Nx_}0C|;=BENO)+}u zN)z+n>z`EJzdg~vao0uGg4?zWnihV3_2aj9>2IZwpIFfXVMFVG5Sg-w4RrU1iid(l%MJ4Z?8JquK-9fj? zDSPd+OO{*DZI=G4eLzOe!~Wmb(=EK$Cv{n66!pK#V#ks`unH}h*!1w^r+vRe`*XMG z|KFUEx=;7+lEC*<-+!%Ao$7V+!i9HwkA4^Kz8e<3Q+@y4Dc}CfzOYI=s=9aY-e(!% zn?L2gOn9~TQ|auJDQlECSeU~8pE=WW^<8Q5zhx@#j^>6lEbXlSepb^{MJO!3^Z4V5 zFJEQ~+pd-TX;y0R)#1%uhDwz^zh_kEy;w5mcadY=-hX`-`t^D{^X;acDGQrtQ=>4i zG48hCzoMeMF08Fe_4+1?-zR7Pes=rmiCMy~Vq#)a^YSmVZ7~tJ_s2f;ez5rA#b??| zs(-m|xBdI~+LPOr_K9=9ul=$t#?n@;(*4}4=w5O4ZNi_|dhxrQvHjo^pJkQEUO4yr zTc>*mFZ`UfbBj{^^32(fCf(2G?cn5J!oD~->=1kFp6r)PYWQ8%_rxC!f4zNo+1c$+ pMYo&(^owV8*Nw*r(F+<%{~0#~HXL$x+kF)z>*?y}vd$@?2>=$cCIbKf literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/heavylaser.png b/Resources/Textures/Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi/heavylaser.png new file mode 100644 index 0000000000000000000000000000000000000000..4db201c77cb1642fc0edc27a878319a164e6d7ed GIT binary patch literal 340 zcmV-a0jvIrP)H-l5#UHSA2d zh#TS=Ok63Q(xws`I#bZi%!cxp_mu$CylEQo&&pG7-blID+eckLe+sa{+uf>w15&nB z2pXWnU9b>E4-poEMW6s)_!qzyK#+)Nz#!ZPtA2Z;B2r#LCH6-%s!HV}Fck$DnLUKR z4`(=^4G@^8FbS9n*QLi)MACm?j$!}<7{CAqFn|WAO6Y#B9bYeSY!Lvo)2^+$b)RXs zDsZ_zrx&R0{q~w?JrG26y+5;iX7=dtXuy&c4G292Hzv#;1qdQck;2h{076j1Nq{i~ mHJl9a5pGPZq^}?)*wzO;*Qe?u`>1080000 Date: Mon, 19 Aug 2024 11:15:36 +0000 Subject: [PATCH 007/119] Automatic changelog update --- Resources/Changelog/Changelog.yml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index fbe2dea6ded..33273acf37d 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,12 +1,4 @@ Entries: -- author: DrSmugleaf - changes: - - message: Disabled the seeing rainbows screen effect when reduced motion is enabled - in the options menu. - type: Tweak - id: 6662 - time: '2024-06-02T01:41:06.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28496 - author: Cojoke-dot changes: - message: Lasers now pass through Glass External Airlocks and Glass Shuttle Airlocks @@ -3856,3 +3848,14 @@ id: 7161 time: '2024-08-19T10:33:41.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31185 +- author: Boaz1111 + changes: + - message: The HoS has been given a new experimental weapon:An energy shotgun with + multiple fire modes. This experimental tech is highly wanted by the syndicate, + and agents will try to steal it. + type: Add + - message: Removed the Head of Security's Emergency Orders. + type: Remove + id: 7162 + time: '2024-08-19T11:14:30.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30643 From 055dfe6f0baa18d7ca462fc0f6a85621c812df69 Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Mon, 19 Aug 2024 14:42:55 +0300 Subject: [PATCH 008/119] No pacifist or blind sec (#30777) * no pacifist sec * also block blindness * Update warden.yml * Update security_officer.yml * Update head_of_security.yml * Update security_cadet.yml * Update detective.yml --- .../Roles/JobRequirement/TraitsRequirement.cs | 67 +++++++++++++++++++ .../Locale/en-US/job/role-requirements.ftl | 2 + .../Roles/Jobs/Security/detective.yml | 6 +- 3 files changed, 72 insertions(+), 3 deletions(-) create mode 100644 Content.Shared/Roles/JobRequirement/TraitsRequirement.cs diff --git a/Content.Shared/Roles/JobRequirement/TraitsRequirement.cs b/Content.Shared/Roles/JobRequirement/TraitsRequirement.cs new file mode 100644 index 00000000000..418afba1595 --- /dev/null +++ b/Content.Shared/Roles/JobRequirement/TraitsRequirement.cs @@ -0,0 +1,67 @@ +using System.Diagnostics.CodeAnalysis; +using System.Text; +using Content.Shared.Humanoid.Prototypes; +using Content.Shared.Preferences; +using Content.Shared.Traits; +using JetBrains.Annotations; +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization; +using Robust.Shared.Utility; + +namespace Content.Shared.Roles; + +/// +/// Requires a character to have, or not have, certain traits +/// +[UsedImplicitly] +[Serializable, NetSerializable] +public sealed partial class TraitsRequirement : JobRequirement +{ + [DataField(required: true)] + public HashSet> Traits = new(); + + public override bool Check(IEntityManager entManager, + IPrototypeManager protoManager, + HumanoidCharacterProfile? profile, + IReadOnlyDictionary playTimes, + [NotNullWhen(false)] out FormattedMessage? reason) + { + reason = new FormattedMessage(); + + if (profile is null) //the profile could be null if the player is a ghost. In this case we don't need to block the role selection for ghostrole + return true; + + var sb = new StringBuilder(); + sb.Append("[color=yellow]"); + foreach (var t in Traits) + { + sb.Append(Loc.GetString(protoManager.Index(t).Name) + " "); + } + + sb.Append("[/color]"); + + if (!Inverted) + { + reason = FormattedMessage.FromMarkupPermissive($"{Loc.GetString("role-timer-whitelisted-traits")}\n{sb}"); + //at least one of + foreach (var trait in Traits) + { + if (profile.TraitPreferences.Contains(trait)) + return true; + } + return false; + } + else + { + reason = FormattedMessage.FromMarkupPermissive($"{Loc.GetString("role-timer-blacklisted-traits")}\n{sb}"); + + foreach (var trait in Traits) + { + if (profile.TraitPreferences.Contains(trait)) + return false; + } + } + + return true; + } +} diff --git a/Resources/Locale/en-US/job/role-requirements.ftl b/Resources/Locale/en-US/job/role-requirements.ftl index f0fff98c09f..00281fa6cd5 100644 --- a/Resources/Locale/en-US/job/role-requirements.ftl +++ b/Resources/Locale/en-US/job/role-requirements.ftl @@ -8,6 +8,8 @@ role-timer-age-to-old = Your character's age must be at most [color=yellow]{$age role-timer-age-to-young = Your character's age must be at least [color=yellow]{$age}[/color] to play this role. role-timer-whitelisted-species = Your character must be one of the following species to play this role: role-timer-blacklisted-species = Your character must not be one of the following species to play this role: +role-timer-whitelisted-traits = Your character must have one of the following traits: +role-timer-blacklisted-traits = Your character must not have any of the following traits: role-timer-locked = Locked (hover for details) diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml index 22ef115d7cd..f44b424f405 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml @@ -4,9 +4,9 @@ description: job-description-detective playTimeTracker: JobDetective requirements: - - !type:DepartmentTimeRequirement - department: Security - time: 54000 # 15 hours + - !type:DepartmentTimeRequirement + department: Security + time: 54000 # 15 hours startingGear: DetectiveGear icon: "JobIconDetective" supervisors: job-supervisors-hos From 6c3dad433063c11617384f441f67840cd3f90d10 Mon Sep 17 00:00:00 2001 From: Cojoke <83733158+Cojoke-dot@users.noreply.github.com> Date: Mon, 19 Aug 2024 06:56:40 -0500 Subject: [PATCH 009/119] Fix Pacified Damage Dealing Thrown Objects (#31183) --- .../Damage/Systems/DamageOtherOnHitSystem.cs | 11 +++++++++++ Content.Shared/Projectiles/SharedProjectileSystem.cs | 9 --------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs b/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs index 8a7b3df0b24..8a35e471b4e 100644 --- a/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs +++ b/Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs @@ -1,6 +1,7 @@ using Content.Server.Administration.Logs; using Content.Server.Damage.Components; using Content.Server.Weapons.Ranged.Systems; +using Content.Shared.CombatMode.Pacification; using Content.Shared.Camera; using Content.Shared.Damage; using Content.Shared.Damage.Events; @@ -9,6 +10,7 @@ using Content.Shared.Effects; using Content.Shared.Mobs.Components; using Content.Shared.Throwing; +using Content.Shared.Wires; using Robust.Shared.Physics.Components; using Robust.Shared.Player; @@ -28,6 +30,7 @@ public override void Initialize() { SubscribeLocalEvent(OnDoHit); SubscribeLocalEvent(OnDamageExamine); + SubscribeLocalEvent(OnAttemptPacifiedThrow); } private void OnDoHit(EntityUid uid, DamageOtherOnHitComponent component, ThrowDoHitEvent args) @@ -58,5 +61,13 @@ private void OnDamageExamine(EntityUid uid, DamageOtherOnHitComponent component, { _damageExamine.AddDamageExamine(args.Message, component.Damage, Loc.GetString("damage-throw")); } + + /// + /// Prevent players with the Pacified status effect from throwing things that deal damage. + /// + private void OnAttemptPacifiedThrow(Entity ent, ref AttemptPacifiedThrowEvent args) + { + args.Cancel("pacified-cannot-throw"); + } } } diff --git a/Content.Shared/Projectiles/SharedProjectileSystem.cs b/Content.Shared/Projectiles/SharedProjectileSystem.cs index 1f6f2b6918f..1b7d6d6f991 100644 --- a/Content.Shared/Projectiles/SharedProjectileSystem.cs +++ b/Content.Shared/Projectiles/SharedProjectileSystem.cs @@ -38,7 +38,6 @@ public override void Initialize() SubscribeLocalEvent(OnEmbedThrowDoHit); SubscribeLocalEvent(OnEmbedActivate); SubscribeLocalEvent(OnEmbedRemove); - SubscribeLocalEvent(OnAttemptPacifiedThrow); } private void OnEmbedActivate(EntityUid uid, EmbeddableProjectileComponent component, ActivateInWorldEvent args) @@ -154,14 +153,6 @@ private sealed partial class RemoveEmbeddedProjectileEvent : DoAfterEvent { public override DoAfterEvent Clone() => this; } - - /// - /// Prevent players with the Pacified status effect from throwing embeddable projectiles. - /// - private void OnAttemptPacifiedThrow(Entity ent, ref AttemptPacifiedThrowEvent args) - { - args.Cancel("pacified-cannot-throw-embed"); - } } [Serializable, NetSerializable] From 84e55659184600b13a15f47dcf359065f106da92 Mon Sep 17 00:00:00 2001 From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Date: Mon, 19 Aug 2024 15:43:31 +0200 Subject: [PATCH 010/119] Fix shuttle walls rusting when initialized on station grid (#31162) * Initial commit * Also reinforced --- .../Entities/Structures/Walls/walls.yml | 62 ++++++++++++++++++- 1 file changed, 60 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml index 03593305eb5..51cdaa45767 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml @@ -801,11 +801,40 @@ node: diagonalshuttleWall - type: entity - parent: WallReinforced + parent: BaseWall id: WallShuttle name: shuttle wall suffix: Reinforced, Exterior components: + - type: Damageable + damageContainer: StructuralInorganic + damageModifierSet: StructuralMetallicStrong + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 600 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:PlaySoundBehavior + sound: + collection: MetalSlam + - trigger: + !type:DamageTrigger + damage: 400 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: MetalSlam + - !type:ChangeConstructionNodeBehavior + node: girder + - !type:DoActsBehavior + acts: ["Destruction"] + - type: StaticPrice + price: 150 + - type: RadiationBlocker + resistance: 5 - type: Sprite sprite: Structures/Walls/shuttle.rsi - type: Icon @@ -833,11 +862,40 @@ reflectProb: 1 - type: entity - parent: WallSolid + parent: BaseWall id: WallShuttleInterior name: shuttle wall suffix: Interior components: + - type: Tag + tags: + - Wall + - type: RCDDeconstructable + cost: 6 + delay: 8 + fx: EffectRCDDeconstruct8 + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 400 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:PlaySoundBehavior + sound: + collection: MetalSlam + - trigger: + !type:DamageTrigger + damage: 200 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: MetalSlam + - !type:ChangeConstructionNodeBehavior + node: girder + - !type:DoActsBehavior + acts: ["Destruction"] - type: Sprite sprite: Structures/Walls/shuttleinterior.rsi - type: Icon From 7a0ee1a074f4ef4287b930e49e80fb1ab8a991d1 Mon Sep 17 00:00:00 2001 From: Caconym27 Date: Mon, 19 Aug 2024 10:00:16 -0400 Subject: [PATCH 011/119] Added nose coverings on gaiters (#31116) Added 2 pixels on the front of the left and right views of the red and black gaiter sprites so that they would properly cover the nose of their wearers, as they do in reality. --- .../Mask/neckgaiter.rsi/equipped-MASK.png | Bin 522 -> 534 bytes .../Mask/neckgaiterred.rsi/equipped-MASK.png | Bin 409 -> 482 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Clothing/Mask/neckgaiter.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/neckgaiter.rsi/equipped-MASK.png index 572796b0303af3168a7226742b23ab3aaa6d65d5..63526a29d13a8ea5744f35a31c92b6e82c88a372 100644 GIT binary patch delta 488 zcmeBTnZ`0fMT)UF$lZxy-8q?;3=9k`>5jgR3=A9lx&I`xPE?erU+wAQ7*Y}Uc9y^Y zAqRn@+Y1DJ4)1Ti^5CG0?~b2;?OV7k5%pEC>h~?Dy><03>JHUUP}$e{ChOJp+`PDnzbr~Fx&PaC>w14)gHJWCmkE)ENd1-86Nmg4bY^oo{EN;?s1%V} zdRWNw`r(r%zI#uZGaEJs`L^Y!8SmHYI<)$mlHt$i)p8-b11+?|ogQbJI`-Z6=&Y|- zSZLevZ2kF{NaO&J$0^P-OIx^6<6~8F)dts{P8V^ wTBW4L&RhEmceDB**qQjAkW&MK=KN;#aeCGCa?j!=z^G*KboFyt=akR{03GMvy8r+H literal 522 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wk0|Vn8 zPZ!6KiaBp*8Rj=RNVLUoX}%#Kz`k&!^W<%v(f|LifAQ>wqtXruJ)R2(U0LnViuLy(|gb8zwU3Fq#Q9=pJ}>?pwoAqigHW>)%l2WV+AJ z@WgB38m}kE&+OdwkkwHlv;5h$?D%#0zxN;e$8g+Hz|AVob-&nlt3dW9gH=l(hqio~ zaP{?fxrB{9Tdj)=e_1gyyn9|8a#cN*{fXDr`P=U@Uc1lu)3Er|sv{*vM~ejcsy?3m zTDiw(P&iLm@zVq{s6`%WZw!d#abIyFW z`QPh((ls`DEVHZ^<)4YVUU6ql`GK{Dzvep<p|*?+Kg9KNHlXgk|EVB|7*y85}S Ib4q9e08&ESQvd(} diff --git a/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/equipped-MASK.png b/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/equipped-MASK.png index e34c9a995e155a3d0534937d13ed9f26168a208b..02870966aaf1fb9d537181c2ddd797a2b9afab38 100644 GIT binary patch delta 436 zcmV;l0Zaaw1L6aaBpLy8Qb$4nuFf3k00004XF*Lt006O%3;baPks%m=cS%G+RCr$P z+PzK!K@h<45gWx2B8|jgp~1pRYoEc!*!m21K83GgYixWFt?aarC^ja97_m@fHalcP z#qNEWga5DDT@r3)cklKR1_1y7OKZiqb31Fb#~0mwx$E`hu-SBs!kWZ?=~mnI%bdK?_`WNe$L)JRIezq)YzIDnf84lRuglx$`(N$= zU3`-ozvkPyX%G#zQCpSc%~q+CR~BCOZ zbww>eIC)d`MTjnpEE*QTw@WK(0cM}~+41Cz7+-GhPAj*0(`##g3_r|8^jpA6<6&`f zr_pe&{%4@bLZwxPPdXhpei;s3Yq_M9$&(V*ov`w>ErRyTsM3bzab-DZd-eJp9Xsg^ zu=2FgmDeORv7*`JHKwt}Pmy`I!X25M35D*y(Q_cLJ1+BEz!C`Wh@x4nq8~Q^00000 e0AS&W`~li1#%kCPu7>9T0000n6aE=_J4(>f>)<`Q({Vll@5Zz3ezbKoAP?@9mw;J@nBePHT` z#nt#k^DNWE^CU^BF$%jAdi}C?)A~*gPyMingRpUNe^*mKEbMh0gi4mV zbA6`?h%tm#@}OjVXVF zwkHq(0000000000z~AGP4#z?GC7e7O4kbzREZb>NX_MiL(MXc?xL!+A*^5g|?$qe@ z;c;Q(>9!9^d_N#zVtYu9(aqDt?&ERkGmfri^T{&T#PbyO`Yy}WVqZR4=H)&6@m)0D zt?G_k-ru#7(chk)6+bm`P7_dN8>mjiuGv}~iU0rr00000YWo1vJGBJGk23-Q0000< KMNUMnLSTZsOtRqs From 8eb4e4fa2dd90eceb3fbef29eb1db799472fff78 Mon Sep 17 00:00:00 2001 From: tosatur <63034378+tosatur@users.noreply.github.com> Date: Tue, 20 Aug 2024 00:03:07 +1000 Subject: [PATCH 012/119] added a few chatsan entries (#31085) * added a few chatsan entries * added 2 more * added 4 more and fixed errors * fixed error again * added allg * removed fullstops --- .../Chat/Managers/ChatSanitizationManager.cs | 6 +--- .../Locale/en-US/speech/speech-chatsan.ftl | 33 +++++++++++++++++++ .../Prototypes/Accents/word_replacements.yml | 11 +++++++ 3 files changed, 45 insertions(+), 5 deletions(-) diff --git a/Content.Server/Chat/Managers/ChatSanitizationManager.cs b/Content.Server/Chat/Managers/ChatSanitizationManager.cs index c9566244357..634d8cdefab 100644 --- a/Content.Server/Chat/Managers/ChatSanitizationManager.cs +++ b/Content.Server/Chat/Managers/ChatSanitizationManager.cs @@ -69,18 +69,14 @@ public sealed class ChatSanitizationManager : IChatSanitizationManager { ":/", "chatsan-uncertain" }, { ":\\", "chatsan-uncertain" }, { "lmao", "chatsan-laughs" }, - { "lmao.", "chatsan-laughs" }, + { "lmfao", "chatsan-laughs" }, { "lol", "chatsan-laughs" }, - { "lol.", "chatsan-laughs" }, { "lel", "chatsan-laughs" }, - { "lel.", "chatsan-laughs" }, { "kek", "chatsan-laughs" }, - { "kek.", "chatsan-laughs" }, { "rofl", "chatsan-laughs" }, { "o7", "chatsan-salutes" }, { ";_;7", "chatsan-tearfully-salutes"}, { "idk", "chatsan-shrugs" }, - { "idk.", "chatsan-shrugs" }, { ";)", "chatsan-winks" }, { ";]", "chatsan-winks" }, { "(;", "chatsan-winks" }, diff --git a/Resources/Locale/en-US/speech/speech-chatsan.ftl b/Resources/Locale/en-US/speech/speech-chatsan.ftl index 08edd6c204a..6e883fe1852 100644 --- a/Resources/Locale/en-US/speech/speech-chatsan.ftl +++ b/Resources/Locale/en-US/speech/speech-chatsan.ftl @@ -156,3 +156,36 @@ chatsan-replacement-55 = not gonna lie chatsan-word-56 = fml chatsan-replacement-56 = fuck my life + +chatsan-word-57 = wtaf +chatsan-replacement-57 = what the actual fuck + +chatsan-word-58 = wsg +chatsan-replacement-58 = what's good + +chatsan-word-59 = mb +chatsan-replacement-59 = my bad + +chatsan-word-60 = jfc +chatsan-replacement-60 = jesus fucking christ + +chatsan-word-61 = omw +chatsan-replacement-61 = on my way + +chatsan-word-62 = otw +chatsan-replacement-62 = on the way + +chatsan-word-63 = yk +chatsan-replacement-63 = you know + +chatsan-word-64 = istfg +chatsan-replacement-64 = i swear to fucking god + +chatsan-word-65 = idgaf +chatsan-replacement-65 = i don't give a fuck + +chatsan-word-66 = smth +chatsan-replacement-66 = something + +chatsan-word-67 = allg +chatsan-replacement-67 = all good diff --git a/Resources/Prototypes/Accents/word_replacements.yml b/Resources/Prototypes/Accents/word_replacements.yml index b93c2cfd5c9..067c8016b64 100644 --- a/Resources/Prototypes/Accents/word_replacements.yml +++ b/Resources/Prototypes/Accents/word_replacements.yml @@ -437,6 +437,17 @@ chatsan-word-54: chatsan-replacement-54 chatsan-word-55: chatsan-replacement-55 chatsan-word-56: chatsan-replacement-56 + chatsan-word-57: chatsan-replacement-57 + chatsan-word-58: chatsan-replacement-58 + chatsan-word-59: chatsan-replacement-59 + chatsan-word-60: chatsan-replacement-60 + chatsan-word-61: chatsan-replacement-61 + chatsan-word-62: chatsan-replacement-62 + chatsan-word-63: chatsan-replacement-63 + chatsan-word-64: chatsan-replacement-64 + chatsan-word-65: chatsan-replacement-65 + chatsan-word-66: chatsan-replacement-66 + chatsan-word-67: chatsan-replacement-67 - type: accent id: liar From e438b8b25ff1d3ace656251044397648a3c6fcd5 Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 19 Aug 2024 14:04:13 +0000 Subject: [PATCH 013/119] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 33273acf37d..a961b63abca 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Cojoke-dot - changes: - - message: Lasers now pass through Glass External Airlocks and Glass Shuttle Airlocks - type: Fix - id: 6663 - time: '2024-06-02T04:13:12.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28065 - author: slarticodefast changes: - message: Fixed the flash effect getting darker with each appearence. @@ -3859,3 +3852,10 @@ id: 7162 time: '2024-08-19T11:14:30.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30643 +- author: tosatur + changes: + - message: Added more words to chat sanitisation + type: Tweak + id: 7163 + time: '2024-08-19T14:03:07.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31085 From 05efea31180a45034e28d0579deb17ae63cc53f2 Mon Sep 17 00:00:00 2001 From: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Date: Mon, 19 Aug 2024 17:38:25 +0200 Subject: [PATCH 014/119] quick shuttle wall test fix (#31206) * quick shuttle wall fix * this time for real --- Resources/Prototypes/Entities/Structures/Walls/walls.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml index 51cdaa45767..0e98b0a803f 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml @@ -832,7 +832,7 @@ - !type:DoActsBehavior acts: ["Destruction"] - type: StaticPrice - price: 150 + price: 250 - type: RadiationBlocker resistance: 5 - type: Sprite @@ -867,9 +867,6 @@ name: shuttle wall suffix: Interior components: - - type: Tag - tags: - - Wall - type: RCDDeconstructable cost: 6 delay: 8 From fc33df0e49515d99c5d5de9df65522d66d694967 Mon Sep 17 00:00:00 2001 From: lzk <124214523+lzk228@users.noreply.github.com> Date: Mon, 19 Aug 2024 17:40:34 +0200 Subject: [PATCH 015/119] give guides for antags (#31208) * give sleeper traitor default traitor guidebook * guidebook for thief --- Resources/Prototypes/Roles/Antags/{Thief.yml => thief.yml} | 3 ++- Resources/Prototypes/Roles/Antags/traitor.yml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) rename Resources/Prototypes/Roles/Antags/{Thief.yml => thief.yml} (86%) diff --git a/Resources/Prototypes/Roles/Antags/Thief.yml b/Resources/Prototypes/Roles/Antags/thief.yml similarity index 86% rename from Resources/Prototypes/Roles/Antags/Thief.yml rename to Resources/Prototypes/Roles/Antags/thief.yml index f0d0c124709..993b866023b 100644 --- a/Resources/Prototypes/Roles/Antags/Thief.yml +++ b/Resources/Prototypes/Roles/Antags/thief.yml @@ -4,6 +4,7 @@ antagonist: true setPreference: true objective: roles-antag-thief-objective + guides: [ Thieves ] - type: startingGear id: ThiefGear @@ -11,4 +12,4 @@ back: - ToolboxThief - ClothingHandsChameleonThief - - ThiefBeacon \ No newline at end of file + - ThiefBeacon diff --git a/Resources/Prototypes/Roles/Antags/traitor.yml b/Resources/Prototypes/Roles/Antags/traitor.yml index 51c61e74c6d..6fc5314629c 100644 --- a/Resources/Prototypes/Roles/Antags/traitor.yml +++ b/Resources/Prototypes/Roles/Antags/traitor.yml @@ -12,6 +12,7 @@ antagonist: true setPreference: true objective: roles-antag-syndicate-agent-sleeper-objective + guides: [ Traitors ] # Syndicate Operative Outfit - Monkey - type: startingGear From fb686d687cfa74d8c7beacd36110ef3f248118ea Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Tue, 20 Aug 2024 03:41:49 +1000 Subject: [PATCH 016/119] Revert "Security Helmet Reshape" (#31198) Revert "Security Helmet Reshape (#30961)" This reverts commit 802d478e2173cfd8667b4ca986b6b793eacfc317. --- .../security.rsi/equipped-HELMET-vox.png | Bin 766 -> 1823 bytes .../Helmets/security.rsi/equipped-HELMET.png | Bin 621 -> 1718 bytes .../Head/Helmets/security.rsi/icon.png | Bin 244 -> 1282 bytes .../Head/Helmets/security.rsi/inhand-left.png | Bin 367 -> 1509 bytes .../Head/Helmets/security.rsi/inhand-right.png | Bin 366 -> 1488 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png index 02f2dded76918f7e19f9f00221510307eb93efc9..815ba143e536f400648773405f84a31c91b6c300 100644 GIT binary patch literal 1823 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy zw18|5AO?X;!IOa`XMsm#F$06fED&ZCw^H21z`$IS84^(v;p=0SoS&h?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6 zGOr}DLN~8i8Da>`9GBGM~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fwU3rjN#3Q|*aJzRZ!T|;d2A&OBAfrz4-ZKIFH z88#r#TSW$?7U$=bf`Z@9$jrnB93&{Bh=_pbh`_1?SrlDIKt_H^J}_YwWhQ&(m82FG z6af<%#73xnxK*H=g|Iv{FSEqX2xi~sc3d|4@SJ7GrQY*`8<-E3JY5_^Dj46++TSnaC~~~LnL*khOU07c{ZZhA zg#5%m%4^nLK6c~Qji_JhHzFb=t-1fRNluiOVY{?Z$DN_NLC zjpt^vO%iKcb?5chIbXeRb-6O0lixaPQH)-9*49;@jwUHS`@GXZ?{d|Afd@5-hSeh@CaK6xWxqEfD{rGoTTWF7R zgPKU`j8~t}FkbRe6WDxj`5Z|Gm-ck!wSWH{p8oxpqu3L{T|ZyM)O~w*+5TJHe47fN zsvYYln?~N}?+|u+k!W;-?}u((eB87}`*zqnq~5p5VwPIMo_j{o`%@LWgTQ-6p=DDg zc-WFmq$+Q#RC`u#z8SOqcJ9?yB}V>z@l5Y^6Sz)=1{!EheS3AMiu$H4j?4?VTbm^K z+N)dN+W7A@ijb9+JjWKq_U3k7*Phzqd%|aL&)chhXEMHEZ2aGQAbyLRVM?5pzdERL N@^tlcS?83{1OOZVq5%K^ delta 730 zcmV<00ww*Q4*ms@Fn?b3+;GlXW7I>cCy)M@qHkKowxhG zZ{E(#Vc!FY|C=kW542ky0|1_PEgg&F69B;em(R}r{v$aEy5E50Khpxj(uIPkz^%02h4#I93X=);Q=LroUKg94j?)Ur`FLfGCO}guvTpkDg@5Up-vf0k8uAQc4p= zky8LJ`j%s*MwaOIec5CU53tl0q5ON5>HO0$`cSB@&Kcnh9MDiG)a21UE%_gKQr4s-E{Y-!_wm)oV zZJTT5f_*;b@BRAIb(@fBB%*M2I1i;14tj@RjDax*TfMbxt~EAFMVI5_P7t8R7;22+ zpmzv$(HAf&6Yo#ktpxzLZr=oOelT^r-Ac>TQd3G}58Q8Gzo+Aq9)c5ZfvjNXUVEmM zS=$9Ni?%!`q?D%0GIiDdr^d7cy)+Xi2!bF8f*=TjAP9mW2;!gT7YFb+V1>^u0RR91 M07*qoM6N<$fh?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6 zGOr}DLN~8i8Da>`9GBGM~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fwU3rjN#3Q|*aJzRZ!T|;d2A&OBAfrz4-ZKIFH z88#r#TSW$?7U$=bf`Z@9$jrnB93&{Bh=_pbh`_1?SrlDIKt_H^J}_YwWhQ&(m82FG z6af<%#73xnxK*H=g|Iv{FSEqX2xi~sc3d|4@SJ7GrQY*`n}LC8r>Bc!NCo5DSr@x5JBYNoYi~6a57Sw5d)b4s zg-heO?)~PlJFqUi>Sgcyhr$)gkD4ohd*1YQ z9E&}^R@timwO%=0*VLYJSsQlxYP;;`ZFXzR51f~GEu7qJ?$&k45s|~vU6r_Q#!u+w0A4_$-d){zZ{Bq)^+9jKIvY!ch%d@?K|Bd zCo6O8ZCP}D#3D`Q(la z4iCEwv*0kH!$mt=&hBzM_^LqUWVrmD>yHG^sP%t5{G`Y3{dLd9dlT9BEi9b7=3ARY zO3#g)Y>_qP3?WZzmBDfL0%cI7;OH;3)vWbzMDQmL&jS zI++>AH@*XsgBZ`>ygRASzkhu+I{S2Px}32h&*AyL-gI@|#{G4YIX(DS|j}d%E!~wPU-{0G`&>>vF#DC?hokodhmT8`D#&8wtWc0G?n{< zfgY#Ivy|V=X5JIeMUI>BRAo%UoX@ANvP33M7sLcXEb@SNX*+RW; z_$S790B~K8cU>1k2z;5(ZI-aMxVTsuKM6yflMSl_0DyUA>U9|pF|-sxp6 z&fC$mk;)?o>|$E=2TUh3IF19yaS+~I0j15Jf%@8E80tKxlbO|;#xE@Oj6Hh12jKc8 zw5jTFmO*7wy@$Si{SKhr7M)wcRf)XI{(x%ydLA3qRU&`QhKY!Xh=_=Yh=_>(MZW;Q W)BAcR1JjKF0000znTPbd0U|>$m42dX-@b$4u&d=3LOvz75)vL%Y z0PC`;umUo3Q%e#RDspr3imfVamB1>jfNYSkzLEl1NlCV?QiN}Sf^&XRs)CuGfu4bq z9hZWFf=y9MnpKdC8&o@xXRDM^Qc_^0uU}qXu2*iXmtT~wZ)j<0sc&GUZ)BtkRH0j3 znOBlnp_^B%3^4>|j!SBBa#3bMNoIbY0?6FNr2NtnTO}osMQ{LdXG${Mo`TY%9I!1Z z$@-}|sky0nCB^!NdWQPg^p#|$AzYYO3=Ixo!03ZyfZ7bOYV#~8Nj3q7lxqdhJy8Dv z9hwZbx40xlA4!3}k%57Qu7Q!Rk)=M|e?aHkq$FFFWR~Qlf&&ijA8-gd=9Hj{g4Bb8 zASV+PvQ{~XdFi%F6}l;@X^EvdB}#Ug$@zIU`VbYUIw7K{2HNOjvD*gZW2?xZ)Z+Y{ zQc#%N8JU^bfWrYr6cPFm9T8Y{Ad8~w2*}7U$p@yUqReE^ypq(Sf+Aqbg4hVP54Q?* zvk;bt=4F=H89@y|6Gqa76f;(iMJ46=McEVJ- UM`U3~DyaPNboFyt=akR{0OnYw>i_@% delta 203 zcmV;+05t!C3iJVxF@LT}L_t(oh3(O?4Z<)G1<(&d#s^Ep&L}Rk1e>q}6R-p&qY$$M z*tjtbSdoyB&LF3`*F-t#{C^xk2qDDG7Bx$zvzcgJ-a~l6U&pGmRyEh?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6 zGOr}DLN~8i8Da>`9GBGM~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fv}^D+|iQgn+l(=$qJ^dTxyO@N4^8f>GF#SJzf zpIb!+r55Msl!C(E&dAKf1{@wJqKH_4=!n3o16dSZM?gk?Nj@-D6=f!S=9Q!t6%+we z7{o@XeYjPin}x7EG%vHn&IoD%nlO?sq!_YtEGj9_FUk%9#|COp;#3AT3KFbHDHW0p zz)=9q2Xt=`Ln;{G&f4pD*g)WT?2+Rk5{!&Nnn6nprmgXr zSix0xE$_`59UmLU{sZT#U7A=k5?Ry|IAXe_PkYML#{{(3FVXmR^ZWO^`X@`&S@Z-L z7_p-dY8&h&p0yXwspgiDnS4>B-};i7O!j`4lgl%sJm zeHAx$^6{B=dY#zIw_sr6er?(H2lNAZ;Eko%g;S8c-{IW?X9=t>e*j+ z?n*Ph_V??~UbowF&&@BZRT#|KTY0Pe{{+_8#jm#>?JvddZ$x-B9#wG&P1)M8Yerz1 zh^XrMi~Sco3$JXIKQL7={Xc_s!@9}SH|+Q&c;gqd#)i$SXV2MPr!RbM{-*kdH;R8b za^e|O*R%hO|2*Men5&Xe;lW&pUMXfh)Kt-<Dnm{r-UW|9P$OA delta 328 zcmV-O0k{6;3-1DuFn<9lNkl$JuUdc9gJrcb`vo?YFHfV)>eaqO>(KpFSxIeg z@RSW(W*uU7m^3ywT9)NW`IcD#000000001B+9uZ_uw>OC=w>npWbllX}41b$t zhrp~KAW65&$3b3Z`1@FO2+V$g)$`k6hta4y1gU2DqwEl*UOZKYpp&5%4tCsKp diff --git a/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png index 721de350112f85bb4867cb2e14ed033672a5ab40..0dbc1447027e88afc12abe267380ad004d5bdce9 100644 GIT binary patch literal 1488 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_);T0(|mmy zw18|5AO?X;!IOa`XMsm#F$06fED&ZCw^H21z`$IV84^(v;p=0SoS&h?X&sHg;q@=(~U%$M(T(8_%FTW^V-_X+1Qs2Nx-^fT8s6w~6 zGOr}DLN~8i8Da>`9GBGM~RsBTId_|A5Z7NlCUU$t=l91qU45Kj08_%qc+?1*r!G zK~5$pWUX=%^U`gVDs)p)(-KQ_N|fv}^D+|iQgn+l(=$qJ^dTxyO@N4^8f>GF#SJzf zpIb!+r55Msl!C(E&dAKf1{@wJqKH_4=!n3o16dSZM?gk?Nj@-D6=f!S=9Q!t6%+we z7{o@XeYjPin}x7EG%vHn&IoD%nlO?sq!_YtEGj9_FUk%9#|COp;#3AT3KFbHDHW0p zz)=9q2XRX6vL!IaA+MB)U0!7ch*X%CrSLzGJART9z)#8vqxvtZ>x)S%l8jI`|Voaof|Rd zw_P@QTRCs~-InXq%|Cvzx%%tnqn(?AWw~Fgrt8`KKl}aGj%^pS|4erOJKx@)_1?Xu z$3CxfEb(2R9e0ACNr3?$+QzcW$T%Uo|Kprhy7!LGWQ73K`0A*+rEvf|%iEfUt`)CmGM=ihs#DdUyknDG>PqPY3#Yt1SiE2B8q2~i3z5Yl zo>}JS)7W-2EK6gnsGAk}KuRk5dG))W?{~GD%=M4t|N0<({U?XBZg$K8#ab=wz~FEE b@B4uJ%-yaP_RBM$gGy6RS3j3^P642R5E2S3L5}LE(_HP68IUNLfCboq zf(ekAfih#H@jK{!q%@9ff3adW{v`ka00000An1Cx>&we+Z=GX` zMVUh#opV_)!ko+}u@^;gHmN-ab24v2jef<>FA6nHvyr5#s(<>f>-6>6Ns`)+L$I%v zxtUL618%QMl{a_VOFw>}_U%Q7_cm$xROV!kZh@it`7uGfzqL5Cb1ryr#M*O^JoE34 zIe)x2HS_2}HXNX?>#PpGm^Eew000000000WcWbN}SY(Yg17nW59QD>%Gce}pYa{EL zfzbRZMC$`WtUzl9{QS+sZL%>ZZGj=nnt}VLSDQ1(x@I7Y>v`*%fovARKUVWw%nJbj Z&NpI$jd5e299{qb002ovPDHLkV1gkunDhVu From b2a24f50dd7dff965a44ebeea3e7f67bf5a86976 Mon Sep 17 00:00:00 2001 From: tosatur <63034378+tosatur@users.noreply.github.com> Date: Tue, 20 Aug 2024 03:51:54 +1000 Subject: [PATCH 017/119] Change text for ghost visibility button (#30998) * add new text * changed loc names * fixes --- Content.Client/Ghost/GhostSystem.cs | 4 ++-- Resources/Locale/en-US/ghost/ghost-gui.ftl | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Content.Client/Ghost/GhostSystem.cs b/Content.Client/Ghost/GhostSystem.cs index 94872a58ef9..f4f7e3459fb 100644 --- a/Content.Client/Ghost/GhostSystem.cs +++ b/Content.Client/Ghost/GhostSystem.cs @@ -99,8 +99,8 @@ private void OnToggleGhosts(EntityUid uid, GhostComponent component, ToggleGhost if (args.Handled) return; - Popup.PopupEntity(Loc.GetString("ghost-gui-toggle-ghost-visibility-popup"), args.Performer); - + var locId = GhostVisibility ? "ghost-gui-toggle-ghost-visibility-popup-off" : "ghost-gui-toggle-ghost-visibility-popup-on"; + Popup.PopupEntity(Loc.GetString(locId), args.Performer); if (uid == _playerManager.LocalEntity) ToggleGhostVisibility(); diff --git a/Resources/Locale/en-US/ghost/ghost-gui.ftl b/Resources/Locale/en-US/ghost/ghost-gui.ftl index cd6c2f02706..cd4559e1482 100644 --- a/Resources/Locale/en-US/ghost/ghost-gui.ftl +++ b/Resources/Locale/en-US/ghost/ghost-gui.ftl @@ -1,7 +1,8 @@ ghost-gui-return-to-body-button = Return to body ghost-gui-ghost-warp-button = Ghost Warp ghost-gui-ghost-roles-button = Ghost Roles ({$count}) -ghost-gui-toggle-ghost-visibility-popup = Toggled visibility of ghosts. +ghost-gui-toggle-ghost-visibility-popup-on = Enabled visibility of ghosts. +ghost-gui-toggle-ghost-visibility-popup-off = Disabled visibility of ghosts. ghost-gui-toggle-lighting-manager-popup = Toggled all lighting. ghost-gui-toggle-fov-popup = Toggled field-of-view. From 4e67f46652b932fe5b2d8941a46afab0e01b11f2 Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 19 Aug 2024 17:53:02 +0000 Subject: [PATCH 018/119] Automatic changelog update --- Resources/Changelog/Changelog.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index a961b63abca..490c8b658b0 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,13 +1,4 @@ Entries: -- author: slarticodefast - changes: - - message: Fixed the flash effect getting darker with each appearence. - type: Fix - - message: Fixed short-sightedness making you immune to flashes. - type: Fix - id: 6664 - time: '2024-06-02T04:17:53.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27369 - author: AJCM-git changes: - message: Midround antags work again @@ -3859,3 +3850,10 @@ id: 7163 time: '2024-08-19T14:03:07.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31085 +- author: tosatur + changes: + - message: Changed text for ghost visibility toggle + type: Tweak + id: 7164 + time: '2024-08-19T17:51:55.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/30998 From 69540163e7d6dab9217ccfb082b5af9cb0d20808 Mon Sep 17 00:00:00 2001 From: themias <89101928+themias@users.noreply.github.com> Date: Mon, 19 Aug 2024 14:17:28 -0400 Subject: [PATCH 019/119] Allow lizards to eat meat dumplings (#31212) --- .../Entities/Objects/Consumable/Food/Baked/misc.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml index b2cdee82802..2f4b6009a9b 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml @@ -492,6 +492,13 @@ Quantity: 8 - ReagentId: Protein Quantity: 2 + - type: FlavorProfile + flavors: + - meaty + - bread + - type: Tag + tags: + - Meat - type: entity name: chèvre chaud From ccef5e72f65f85dba7daf876ec994c7c3a92debe Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 19 Aug 2024 18:18:35 +0000 Subject: [PATCH 020/119] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 490c8b658b0..554312951b1 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: AJCM-git - changes: - - message: Midround antags work again - type: Fix - id: 6665 - time: '2024-06-02T16:52:40.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28523 - author: Errant-4 changes: - message: Map labels no longer suddenly disappear for the rest of the round. @@ -3857,3 +3850,10 @@ id: 7164 time: '2024-08-19T17:51:55.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/30998 +- author: themias + changes: + - message: Lizards can now eat meat dumplings. + type: Fix + id: 7165 + time: '2024-08-19T18:17:28.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31212 From b81f099d7c0f2e9bbe854bd629f263ad9e564e6b Mon Sep 17 00:00:00 2001 From: Plykiya <58439124+Plykiya@users.noreply.github.com> Date: Mon, 19 Aug 2024 11:35:02 -0700 Subject: [PATCH 021/119] Replace NoSpawn: true with HideSpawnMenu (#31122) We don't do this anymore --- Resources/Prototypes/Alerts/alerts.yml | 2 +- .../Entities/Clothing/Head/hoods.yml | 22 +++++++++---------- .../Guns/Ammunition/Projectiles/shotgun.yml | 14 ++++++------ 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Resources/Prototypes/Alerts/alerts.yml b/Resources/Prototypes/Alerts/alerts.yml index ff66f2586b0..4ee4fdce0cb 100644 --- a/Resources/Prototypes/Alerts/alerts.yml +++ b/Resources/Prototypes/Alerts/alerts.yml @@ -27,7 +27,7 @@ - type: entity id: AlertSpriteView - categories: [ HideSpawnMenu ] + categories: [ HideSpawnMenu ] components: - type: Sprite layers: diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml index c9e19cb31b2..96c4197bdcc 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml @@ -529,7 +529,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterColorBlack - noSpawn: true + categories: [ HideSpawnMenu ] name: black winter coat hood components: - type: Sprite @@ -549,7 +549,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterColorPurple - noSpawn: true + categories: [ HideSpawnMenu ] name: purple winter coat hood components: - type: Sprite @@ -569,7 +569,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterColorRed - noSpawn: true + categories: [ HideSpawnMenu ] name: red winter coat hood components: - type: Sprite @@ -589,7 +589,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterColorBlue - noSpawn: true + categories: [ HideSpawnMenu ] name: blue winter coat hood components: - type: Sprite @@ -609,7 +609,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterColorBrown - noSpawn: true + categories: [ HideSpawnMenu ] name: brown winter coat hood components: - type: Sprite @@ -629,7 +629,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterColorGray - noSpawn: true + categories: [ HideSpawnMenu ] name: gray winter coat hood components: - type: Sprite @@ -649,7 +649,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterColorGreen - noSpawn: true + categories: [ HideSpawnMenu ] name: green winter coat hood components: - type: Sprite @@ -669,7 +669,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterColorLightBrown - noSpawn: true + categories: [ HideSpawnMenu ] name: light brown winter coat hood components: - type: Sprite @@ -689,7 +689,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterColorOrange - noSpawn: true + categories: [ HideSpawnMenu ] name: orange winter coat hood components: - type: Sprite @@ -709,7 +709,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterColorWhite - noSpawn: true + categories: [ HideSpawnMenu ] name: white winter coat hood components: - type: Sprite @@ -729,7 +729,7 @@ - type: entity parent: ClothingHeadHatHoodWinterBase id: ClothingHeadHatHoodWinterColorYellow - noSpawn: true + categories: [ HideSpawnMenu ] name: yellow winter coat hood components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml index ce79b6f4174..d8c465cf9e8 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml @@ -44,7 +44,7 @@ - type: entity id: PelletShotgunSpread - noSpawn: true + categories: [ HideSpawnMenu ] parent: PelletShotgun components: - type: ProjectileSpread @@ -71,7 +71,7 @@ - type: entity id: PelletShotgunIncendiarySpread - noSpawn: true + categories: [ HideSpawnMenu ] parent: PelletShotgunIncendiary components: - type: ProjectileSpread @@ -95,7 +95,7 @@ - type: entity id: PelletShotgunPracticeSpread - noSpawn: true + categories: [ HideSpawnMenu ] parent: PelletShotgunPractice components: - type: ProjectileSpread @@ -120,7 +120,7 @@ - type: entity id: PelletShotgunImprovisedSpread - noSpawn: true + categories: [ HideSpawnMenu ] parent: PelletShotgunImprovised components: - type: ProjectileSpread @@ -219,7 +219,7 @@ - type: entity id: PelletShotgunUraniumSpread - noSpawn: true + categories: [ HideSpawnMenu ] parent: PelletShotgunUranium components: - type: ProjectileSpread @@ -247,7 +247,7 @@ - type: entity id: PelletGrapeshotSpread - noSpawn: true + categories: [ HideSpawnMenu ] parent: PelletGrapeshot components: - type: ProjectileSpread @@ -278,7 +278,7 @@ - type: entity id: PelletGlassSpread parent: PelletGlass - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: ProjectileSpread proto: PelletGlass From ee4729fed3a5a2a2d2a29a024c5b8818431ae185 Mon Sep 17 00:00:00 2001 From: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Date: Mon, 19 Aug 2024 20:47:23 +0200 Subject: [PATCH 022/119] Revert "Tweaking things that restrict freedom (#31095) (#31197) * Revert "Tweaking things that restrict freedom (#31095)" This reverts commit 171884df8f8ef76027f1de76e46d488326fd0110. * keep the unequip time * keep alphabetical order --- Resources/Prototypes/Entities/Clothing/Eyes/misc.yml | 4 ++-- Resources/Prototypes/Entities/Clothing/Masks/masks.yml | 4 ++-- .../Prototypes/Entities/Structures/Machines/lathe.yml | 1 - Resources/Prototypes/Recipes/Lathes/security.yml | 8 -------- Resources/Prototypes/Research/arsenal.yml | 1 - 5 files changed, 4 insertions(+), 14 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/misc.yml b/Resources/Prototypes/Entities/Clothing/Eyes/misc.yml index 9599b11bb13..81de8a61bce 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/misc.yml @@ -8,8 +8,8 @@ sprite: Clothing/Eyes/Misc/blindfold.rsi - type: Clothing sprite: Clothing/Eyes/Misc/blindfold.rsi - equipDelay: 5 - unequipDelay: 5 + equipDelay: 3 + unequipDelay: 3 - type: Blindfold - type: Construction graph: Blindfold diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index 94351cc1261..7d270b8ee7a 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -315,8 +315,8 @@ sprite: Clothing/Mask/muzzle.rsi - type: Clothing sprite: Clothing/Mask/muzzle.rsi - equipDelay: 5 - unequipDelay: 5 + equipDelay: 3 + unequipDelay: 3 - type: IngestionBlocker - type: AddAccentClothing accent: ReplacementAccent diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 6c97f9fd5f2..bf4d4de7833 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -763,7 +763,6 @@ - BoxShotgunUranium - BoxShellTranquilizer - ClothingBackpackElectropack - - ClothingOuterStraightjacket - ExplosivePayload - FlashPayload - GrenadeBlast diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index 2e3d5c7fc64..a54d5b62356 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -710,11 +710,3 @@ Plastic: 1000 Plasma: 500 Glass: 500 - -- type: latheRecipe - id: ClothingOuterStraightjacket - result: ClothingOuterStraightjacket - completetime: 4 - materials: - Steel: 200 - Cloth: 500 diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 01198d7d766..553258fdb3f 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -126,7 +126,6 @@ cost: 5000 recipeUnlocks: - ClothingBackpackElectropack - - ClothingOuterStraightjacket # Tier 2 From ed34e4cbcd8db02ef7c9f32bd5f5c23cf7bea782 Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 19 Aug 2024 18:48:30 +0000 Subject: [PATCH 023/119] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 554312951b1..5f469bfd78c 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Errant-4 - changes: - - message: Map labels no longer suddenly disappear for the rest of the round. - type: Fix - id: 6666 - time: '2024-06-02T17:30:27.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28518 - author: Whisper changes: - message: Renamed the player-obtainable "admin cloak" to "weh cloak". @@ -3857,3 +3850,10 @@ id: 7165 time: '2024-08-19T18:17:28.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31212 +- author: slarticodefast + changes: + - message: Made the straitjacked non-printable again. + type: Remove + id: 7166 + time: '2024-08-19T18:47:24.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31197 From 6ba7d268b0918a4e3dc3dd0aa65d00d73319c79e Mon Sep 17 00:00:00 2001 From: themias <89101928+themias@users.noreply.github.com> Date: Mon, 19 Aug 2024 14:57:29 -0400 Subject: [PATCH 024/119] Uplink: Combat Bakery Kit (#31179) * save * sprites * mime survival kit has baguette * add weapon/uplink * cherry-pick croissant changes * uplink * Switch baguette to slashing damage * fixes * update attribution * fix typos * review comments * reduce TC cost * switch to regular box * fix regular baguette rotation --- .../en-US/preferences/loadout-groups.ftl | 1 + .../Locale/en-US/store/uplink-catalog.ftl | 3 ++ .../Catalog/Fills/Boxes/emergency.yml | 32 ++++++++++++++++++ .../Catalog/Fills/Boxes/syndicate.yml | 16 +++++++++ .../Prototypes/Catalog/uplink_catalog.yml | 16 +++++++++ .../Objects/Consumable/Food/Baked/bread.yml | 15 ++++++++ .../Objects/Consumable/Food/Baked/misc.yml | 4 +++ .../Objects/Weapons/Melee/baguette.yml | 17 ++++++++++ .../Objects/Weapons/Throwable/croissant.yml | 25 ++++++++++++++ .../Loadouts/Miscellaneous/survival.yml | 20 +++++++++++ .../Prototypes/Loadouts/loadout_groups.yml | 10 ++++++ .../Prototypes/Loadouts/role_loadouts.yml | 2 +- .../bread.rsi/baguette-equipped-BELT.png | Bin 0 -> 440 bytes .../Baked/bread.rsi/baguette-inhand-left.png | Bin 0 -> 454 bytes .../Baked/bread.rsi/baguette-inhand-right.png | Bin 0 -> 485 bytes .../Food/Baked/bread.rsi/baguette.png | Bin 393 -> 303 bytes .../Consumable/Food/Baked/bread.rsi/meta.json | 14 +++++++- .../Objects/Storage/boxes.rsi/france.png | Bin 0 -> 139 bytes .../Objects/Storage/boxes.rsi/meta.json | 3 ++ 19 files changed, 176 insertions(+), 2 deletions(-) create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Melee/baguette.yml create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Throwable/croissant.yml create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-equipped-BELT.png create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-inhand-left.png create mode 100644 Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-inhand-right.png create mode 100644 Resources/Textures/Objects/Storage/boxes.rsi/france.png diff --git a/Resources/Locale/en-US/preferences/loadout-groups.ftl b/Resources/Locale/en-US/preferences/loadout-groups.ftl index 84738eadec2..b7e8616da23 100644 --- a/Resources/Locale/en-US/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/preferences/loadout-groups.ftl @@ -15,6 +15,7 @@ loadout-group-survival-syndicate = Github is forcing me to write text that is li loadout-group-breath-tool = Species-dependent breath tools loadout-group-tank-harness = Species-specific survival equipment loadout-group-EVA-tank = Species-specific gas tank +loadout-group-survival-mime = Mime Survival Box # Command loadout-group-captain-head = Captain head diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index 47eb6716193..27ecdc98f03 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -439,3 +439,6 @@ uplink-barber-scissors-desc = A good tool to give your fellow agent a nice hairc uplink-backpack-syndicate-name = Syndicate backpack uplink-backpack-syndicate-desc = Lightweight explosion-proof а backpack for holding various traitor goods + +uplink-combat-bakery-name = Combat Bakery Kit +uplink-combat-bakery-desc = A kit of clandestine baked weapons. Contains a baguette which a skilled mime could use as a sword and a pair of throwing croissants. Once the job is done, eat the evidence. \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml index c2b0660dc07..540e05b453b 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/emergency.yml @@ -189,6 +189,38 @@ - type: Label currentLabel: reagent-name-nitrogen +- type: entity + parent: BoxSurvival + id: BoxMime + name: survival box + description: It's a box with basic internals inside. + suffix: Emergency + components: + - type: StorageFill + contents: + - id: ClothingMaskBreath + - id: EmergencyOxygenTankFilled + - id: EmergencyMedipen + - id: Flare + - id: FoodBreadBaguette + - id: DrinkWaterBottleFull + +- type: entity + parent: BoxSurvivalNitrogen + id: BoxMimeNitrogen + suffix: Emergency N2 + components: + - type: StorageFill + contents: + - id: ClothingMaskBreath + - id: EmergencyNitrogenTankFilled + - id: EmergencyMedipen + - id: Flare + - id: FoodBreadBaguette + - id: DrinkWaterBottleFull + - type: Label + currentLabel: reagent-name-nitrogen + - type: entity parent: BoxCardboard id: BoxSurvivalSyndicate diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml index 80c20a1a04d..27df984f25d 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/syndicate.yml @@ -67,3 +67,19 @@ contents: - id: DeathRattleImplanter amount: 6 + +- type: entity + parent: [BoxCardboard, BaseSyndicateContraband] + id: CombatBakeryKit + name: combat bakery kit + description: A kit of clandestine baked weapons. + components: + - type: Sprite + layers: + - state: box_of_doom + - state: france + - type: StorageFill + contents: + - id: WeaponCroissant + amount: 2 + - id: WeaponBaguette \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 5a92bc77f81..613b7bcdedb 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -1743,3 +1743,19 @@ blacklist: components: - SurplusBundle + +- type: listing + id: UplinkCombatBakery + name: uplink-combat-bakery-name + description: uplink-combat-bakery-desc + icon: { sprite: Objects/Consumable/Food/Baked/bread.rsi, state: baguette} + productEntity: CombatBakeryKit + cost: + Telecrystal: 3 + categories: + - UplinkJob + conditions: + - !type:BuyerJobCondition + whitelist: + - Chef + - Mime \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml index 51d94650731..31e92931dbd 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml @@ -624,6 +624,21 @@ Quantity: 1 - ReagentId: Blackpepper Quantity: 1 + - type: Clothing + slots: [ BELT ] + equippedPrefix: baguette + quickEquip: false + - type: Item + inhandVisuals: + left: + - state: baguette-inhand-left + right: + - state: baguette-inhand-right + - type: MeleeWeapon + wideAnimationRotation: -120 + damage: + types: + Blunt: 1 # bonk # Tastes like France. - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml index 2f4b6009a9b..8b455fe872c 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml @@ -682,3 +682,7 @@ Quantity: 2 - ReagentId: Vitamin Quantity: 1 + - type: DamageOtherOnHit + damage: + types: + Blunt: 0 # so the damage stats icon doesn't immediately give away the syndie ones \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baguette.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baguette.yml new file mode 100644 index 00000000000..46bd430e5ac --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baguette.yml @@ -0,0 +1,17 @@ +- type: entity + name: baguette + parent: FoodBreadBaguette + id: WeaponBaguette + description: Bon appétit! + suffix: Weapon + components: + - type: MeleeWeapon + wideAnimationRotation: -120 + damage: + types: + Slash: 16 + soundHit: + path: /Audio/Weapons/bladeslice.ogg + - type: Reflect + reflectProb: 0.05 + spread: 90 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/croissant.yml b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/croissant.yml new file mode 100644 index 00000000000..8ae52f4d735 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/croissant.yml @@ -0,0 +1,25 @@ +- type: entity + parent: FoodBakedCroissant + id: WeaponCroissant + name: croissant + description: Buttery, flaky goodness. + suffix: Weapon + components: + - type: Fixtures + fixtures: + fix1: + shape: !type:PhysShapeCircle + radius: 0.2 + density: 5 + mask: + - ItemMask + restitution: 0.3 + friction: 0.2 + - type: EmbeddableProjectile + sound: /Audio/Weapons/star_hit.ogg + - type: LandAtCursor + - type: DamageOtherOnHit + damage: + types: + Slash: 5 + Piercing: 10 \ No newline at end of file diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml b/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml index 2716310ecfb..c84caeb99da 100644 --- a/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml +++ b/Resources/Prototypes/Loadouts/Miscellaneous/survival.yml @@ -64,6 +64,26 @@ back: - BoxHugNitrogen +# Mime +- type: loadout + id: EmergencyOxygenMime + effects: + - !type:GroupLoadoutEffect + proto: OxygenBreather + storage: + back: + - BoxMime + +- type: loadout + id: EmergencyNitrogenMime + effects: + - !type:GroupLoadoutEffect + proto: NitrogenBreather + storage: + back: + - BoxMimeNitrogen + + # Engineering / Extended - type: loadout id: EmergencyOxygenExtended diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml index da49a16ed27..685b0c784fa 100644 --- a/Resources/Prototypes/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/Loadouts/loadout_groups.yml @@ -479,6 +479,16 @@ loadouts: - MimeWintercoat +- type: loadoutGroup + id: SurvivalMime + name: loadout-group-survival-mime + minLimit: 2 + hidden: true + loadouts: + - EmergencyNitrogenMime + - EmergencyOxygenMime + - LoadoutSpeciesVoxNitrogen + - type: loadoutGroup id: MusicianJumpsuit name: loadout-group-musician-jumpsuit diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 4a6ca604264..e4c5c0aafbd 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -169,7 +169,7 @@ - MimeBackpack - MimeOuterClothing - Glasses - - Survival + - SurvivalMime - Trinkets - type: roleLoadout diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-equipped-BELT.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette-equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..93437dd65872e15487bf635580772235480f2c51 GIT binary patch literal 440 zcmV;p0Z0CcP)Px$a!Eu%RCt{2+OcZGFc1ddzom;wp&hgZ(>?SJ`~Z2Qjv6}p6-pjQc>)(owqQCn ztuZ*WIs}!F#gZety5#?M!*O?#1$O`u5fKp)5s|m5gf&{(|BmBaw?jUvO4xak$Bsn~ zqm{L*nfU4h13I88VHe8`@8A0|;+foC=m%}508``n1vg^^G_{}(Fk0EgGCL&U8dW7O z=IlE`9WXC)thd=%u|)Ir_T*h8?*vpO?BmDJu!tt)-X5*G#^mGAUkoL&o7jcYwR?Q$F*dNeEt%NxALaBsltxkc7$uhu^SEg6|RaUXVz+^2d&o i5QWhy$qSE&qWA?bBDypyPSni+0000Px$fJsC_RCt{2+A(gzFcb#hKiv>W(8_DnwF?)3<8Y5ibmR`)g~gnJffYq;5h)U= zqdQQiRaL2q?U(Z4|8_(D{5M!H4Lg^bAK;dK2LS6`uStd`!3prP*||x=YCcw%gk&e?lkoQP zgvV*ACJE6A@O%>Xwp9I0h-M4pd>ZbS_MgV2HVZ@*BX<2?l05@{6MJLy>r^MoKNH%X z#_UpL0%$+TK`JQ=l@DB{XNOPpmPx$pGibPRCt{2+A(gzFcb#hpSBAE30irLx_03L_V05F`SEhjVb?ArE+nU3V+n#(UEW70d@2Yv_|_wCd|i!+A^W?Wb5u3Fq!c7aEIIB+WGjEGQdaAfXRf7 zUVD8z6yo#z(46u4_^-lzf3*CG!`deF3>+)<3}`~nfVC#|3>>>Ddf_ftNb+!7Vu^@| bh<^G6-nrk?cvltO00000NkvXXu0mjfI0N1X literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette.png b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/baguette.png index de137b2a6268b491d92530e467a51b7ee386593f..e5de3c0bc09387457d0a15996b29c9b41c38c7c0 100644 GIT binary patch delta 288 zcmV+*0pI?K1Fr&*7=Hu<0001iRAA~1T6&4(`l0000i|;Oy!{xO8#yEu00x%}sEUA`U`ZXrKyBEy!(yy?9k3agc;sXqz?>m-{W3 zUocpCyDpI830HY+?yu3RzC@N!3;+b@4L|J$sNXbkm4|x& ziX;b^pY(uTvv9;`&~AT?Lk=Nlz|7{z7Yo6?uH8Ys%BiM(<^Vn?TPbhwI;vQs(P(_W Y0pO&=5t%G(82|tP07*qoM6N<$f<6bbH~;_u diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json index 29bd53c9f0a..2761d79f986 100644 --- a/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/Baked/bread.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation and modified by potato1234x at https://github.com/tgstation/tgstation/commit/0631fe5bde73a68b4c12bdfa633c30b2cee442d5. Crostini created by Github user deathride58", + "copyright": "Taken from tgstation and modified by potato1234x at https://github.com/tgstation/tgstation/commit/0631fe5bde73a68b4c12bdfa633c30b2cee442d5. Crostini created by Github user deathride58, baguette taken from tgstation at commit https://github.com/tgstation/tgstation/commit/7ffd61b6fa6a6183daa8900f9a490f46f7a81955", "size": { "x": 32, "y": 32 @@ -34,6 +34,18 @@ { "name": "baguette" }, + { + "name": "baguette-equipped-BELT", + "directions": 4 + }, + { + "name": "baguette-inhand-left", + "directions": 4 + }, + { + "name": "baguette-inhand-right", + "directions": 4 + }, { "name": "banana" }, diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/france.png b/Resources/Textures/Objects/Storage/boxes.rsi/france.png new file mode 100644 index 0000000000000000000000000000000000000000..f18dd0ca93f8f72e9b872e378c5ef8e1f76fbbfb GIT binary patch literal 139 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}uAVNAArY-_ z&utWJP!M6ccvVP;sW^L~cemm(H4Vn>2mHqNH>ck}+oa+dv`Kl3Rw>h&e@qwFNjId| koUTvTNKj_J#H`|JpL&Cxt7^HsGtfW=Pgg&ebxsLQ0ADdHCjbBd literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json index cdae38099d9..32b23ef30a0 100644 --- a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json +++ b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json @@ -223,6 +223,9 @@ }, { "name": "envelope" + }, + { + "name": "france" } ] } From a4bbd133b2dc845f349966000f15ec73561f63cc Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 19 Aug 2024 18:58:36 +0000 Subject: [PATCH 025/119] Automatic changelog update --- Resources/Changelog/Changelog.yml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 5f469bfd78c..b478d66fc35 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Whisper - changes: - - message: Renamed the player-obtainable "admin cloak" to "weh cloak". - type: Tweak - id: 6667 - time: '2024-06-03T02:18:49.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/28540 - author: Vermidia changes: - message: Glass shards are no longer weldable with an unlit welder. @@ -3857,3 +3850,15 @@ id: 7166 time: '2024-08-19T18:47:24.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31197 +- author: themias + changes: + - message: Added the Combat Bakery Kit to the syndicate uplink. Includes a deadly + edible baguette sword and throwing star croissants for 3 TC. + type: Add + - message: Baguettes can be worn on the belt and normal ones do one blunt damage. + type: Tweak + - message: Mimes have a baguette instead of an MRE in their survival kits. + type: Tweak + id: 7167 + time: '2024-08-19T18:57:30.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31179 From 14ae5fd4287a7ea8d5c0c24a84b7113713c14d24 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Tue, 20 Aug 2024 05:50:03 +1000 Subject: [PATCH 026/119] Bandaid wire sounds (#31067) Issue was tools was predicted but wires aren't so this would exclude user from audio. For now we just do the non-predicted version and I or someone else will fully predict wires later. --- Content.Server/Wires/WiresSystem.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Content.Server/Wires/WiresSystem.cs b/Content.Server/Wires/WiresSystem.cs index e4439ae1da3..92dcbb504f8 100644 --- a/Content.Server/Wires/WiresSystem.cs +++ b/Content.Server/Wires/WiresSystem.cs @@ -725,7 +725,7 @@ private void UpdateWires(EntityUid used, EntityUid user, EntityUid toolEntity, i break; } - Tool.PlayToolSound(toolEntity, tool, user); + Tool.PlayToolSound(toolEntity, tool, null); if (wire.Action == null || wire.Action.Cut(user, wire)) { wire.IsCut = true; @@ -746,7 +746,7 @@ private void UpdateWires(EntityUid used, EntityUid user, EntityUid toolEntity, i break; } - Tool.PlayToolSound(toolEntity, tool, user); + Tool.PlayToolSound(toolEntity, tool, null); if (wire.Action == null || wire.Action.Mend(user, wire)) { wire.IsCut = false; From 6aada0dfad249e74259654b514f2d2acb86b0844 Mon Sep 17 00:00:00 2001 From: PJBot Date: Mon, 19 Aug 2024 19:51:09 +0000 Subject: [PATCH 027/119] Automatic changelog update --- Resources/Changelog/Changelog.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index b478d66fc35..e25ecbf8b8b 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: Vermidia - changes: - - message: Glass shards are no longer weldable with an unlit welder. - type: Fix - id: 6668 - time: '2024-06-03T03:28:53.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/27959 - author: AJCM-git changes: - message: Biomass reclaimers no longer act as a void to any unfortunate belongings @@ -3862,3 +3855,10 @@ id: 7167 time: '2024-08-19T18:57:30.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/31179 +- author: metalgearsloth + changes: + - message: Fix wire sounds not playing. + type: Fix + id: 7168 + time: '2024-08-19T19:50:03.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/31067 From 2742adb881d091582f603a2bf176dff9ef2085c6 Mon Sep 17 00:00:00 2001 From: Red Mushie <82113471+redmushie@users.noreply.github.com> Date: Mon, 19 Aug 2024 22:36:36 +0200 Subject: [PATCH 028/119] Add Communications Console button tooltips (#31217) * Finally, people can learn what the Broadcast button does! * Also add for Alert level * Add alert level and shuttle button tooltips * Fix dumdum, tweak Broadcast tooltip --- .../Communications/UI/CommunicationsConsoleMenu.xaml | 8 ++++---- .../communications/communications-console-component.ftl | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml b/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml index ea2f77d457d..83dc42c4a44 100644 --- a/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml +++ b/Content.Client/Communications/UI/CommunicationsConsoleMenu.xaml @@ -4,14 +4,14 @@ MinSize="400 225"> -