From: Southbridge <7013162+southbridge-fur@users.noreply.github.com> Date: Fri, 4 Oct 2024 01:12:59 +0000 (-0500) Subject: Box Station - Connected Recycler, rerouted power for Singlo Substation, added law... X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=c0d67429ab8e7996dc6b7426cae226d42fde4bf8;p=space-station-14.git Box Station - Connected Recycler, rerouted power for Singlo Substation, added law boards to AI upload room (#32608) * Fixed #32443 and #30375 * Fixed duplicate ID issue, and added lawboards to resolve #32581 * Removed Overlord board and added Crewsimov * Removed invalid UserInterface component --- diff --git a/Resources/Maps/box.yml b/Resources/Maps/box.yml index 098a523940..3adc976783 100644 --- a/Resources/Maps/box.yml +++ b/Resources/Maps/box.yml @@ -11579,7 +11579,7 @@ entities: pos: 24.5,16.5 parent: 8364 - type: Door - secondsUntilStateChange: -15146.963 + secondsUntilStateChange: -16708.217 state: Opening - type: DeviceLinkSource lastSignals: @@ -14682,6 +14682,13 @@ entities: rot: 1.5707963267948966 rad pos: 8.5,-46.5 parent: 8364 +- proto: ArtistCircuitBoard + entities: + - uid: 27915 + components: + - type: Transform + pos: -4.5121183,-14.413322 + parent: 8364 - proto: Ash entities: - uid: 13307 @@ -14689,6 +14696,13 @@ entities: - type: Transform pos: -36.5,20.5 parent: 8364 +- proto: AsimovCircuitBoard + entities: + - uid: 27912 + components: + - type: Transform + pos: 3.2198467,-12.066172 + parent: 8364 - proto: AsteroidRock entities: - uid: 2042 @@ -39720,12 +39734,12 @@ entities: - uid: 3869 components: - type: Transform - pos: 13.5,-74.5 + pos: 15.5,-77.5 parent: 8364 - uid: 4050 components: - type: Transform - pos: 8.5,-74.5 + pos: 10.5,-80.5 parent: 8364 - uid: 4519 components: @@ -39735,7 +39749,7 @@ entities: - uid: 4553 components: - type: Transform - pos: 15.5,-74.5 + pos: 11.5,-80.5 parent: 8364 - uid: 4585 components: @@ -39785,7 +39799,7 @@ entities: - uid: 4973 components: - type: Transform - pos: 7.5,-74.5 + pos: 9.5,-80.5 parent: 8364 - uid: 4988 components: @@ -41467,11 +41481,6 @@ entities: - type: Transform pos: 23.5,23.5 parent: 8364 - - uid: 8185 - components: - - type: Transform - pos: 5.5,-74.5 - parent: 8364 - uid: 8434 components: - type: Transform @@ -42860,7 +42869,7 @@ entities: - uid: 10762 components: - type: Transform - pos: 6.5,-74.5 + pos: 8.5,-80.5 parent: 8364 - uid: 10783 components: @@ -44167,6 +44176,16 @@ entities: - type: Transform pos: -6.5,-50.5 parent: 8364 + - uid: 15804 + components: + - type: Transform + pos: 10.5,-81.5 + parent: 8364 + - uid: 15810 + components: + - type: Transform + pos: -0.5,-79.5 + parent: 8364 - uid: 15815 components: - type: Transform @@ -44965,12 +44984,7 @@ entities: - uid: 17602 components: - type: Transform - pos: 14.5,-74.5 - parent: 8364 - - uid: 17697 - components: - - type: Transform - pos: 12.5,-74.5 + pos: 15.5,-76.5 parent: 8364 - uid: 17698 components: @@ -46147,15 +46161,10 @@ entities: - type: Transform pos: 25.5,-109.5 parent: 8364 - - uid: 23221 - components: - - type: Transform - pos: 11.5,-74.5 - parent: 8364 - uid: 23223 components: - type: Transform - pos: 10.5,-74.5 + pos: 12.5,-80.5 parent: 8364 - uid: 23238 components: @@ -46172,6 +46181,11 @@ entities: - type: Transform pos: 23.5,-109.5 parent: 8364 + - uid: 24687 + components: + - type: Transform + pos: 13.5,-80.5 + parent: 8364 - uid: 25012 components: - type: Transform @@ -46805,17 +46819,17 @@ entities: - uid: 26589 components: - type: Transform - pos: 9.5,-81.5 + pos: 14.5,-80.5 parent: 8364 - uid: 26591 components: - type: Transform - pos: 9.5,-80.5 + pos: 15.5,-80.5 parent: 8364 - uid: 26608 components: - type: Transform - pos: 9.5,-79.5 + pos: 15.5,-79.5 parent: 8364 - uid: 26627 components: @@ -47000,7 +47014,7 @@ entities: - uid: 27230 components: - type: Transform - pos: 7.5,-81.5 + pos: 15.5,-78.5 parent: 8364 - uid: 27461 components: @@ -47192,6 +47206,31 @@ entities: - type: Transform pos: 9.5,-68.5 parent: 8364 + - uid: 27905 + components: + - type: Transform + pos: 9.5,-71.5 + parent: 8364 + - uid: 27906 + components: + - type: Transform + pos: 9.5,-72.5 + parent: 8364 + - uid: 27907 + components: + - type: Transform + pos: 9.5,-70.5 + parent: 8364 + - uid: 27908 + components: + - type: Transform + pos: 9.5,-69.5 + parent: 8364 + - uid: 27909 + components: + - type: Transform + pos: 9.5,-73.5 + parent: 8364 - proto: CableHVStack entities: - uid: 1683 @@ -64174,6 +64213,11 @@ entities: - type: Transform pos: 1.5,28.5 parent: 8364 + - uid: 27919 + components: + - type: Transform + pos: 2.7203026,-11.488351 + parent: 8364 - proto: ChairOfficeLight entities: - uid: 5220 @@ -69939,6 +69983,13 @@ entities: rot: 3.141592653589793 rad pos: 22.5,-3.5 parent: 8364 +- proto: CommandmentCircuitBoard + entities: + - uid: 27910 + components: + - type: Transform + pos: -4.600172,-11.893632 + parent: 8364 - proto: CommsComputerCircuitboard entities: - uid: 16499 @@ -70504,65 +70555,87 @@ entities: rot: -1.5707963267948966 rad pos: -60.5,-15.5 parent: 8364 + - type: DeviceLinkSink + invokeCounter: 4 - uid: 6227 components: - type: Transform rot: -1.5707963267948966 rad pos: -59.5,-15.5 parent: 8364 + - type: DeviceLinkSink + invokeCounter: 4 - uid: 6228 components: - type: Transform pos: -57.5,-15.5 parent: 8364 + - type: DeviceLinkSink + invokeCounter: 4 - uid: 6229 components: - type: Transform rot: -1.5707963267948966 rad pos: -57.5,-16.5 parent: 8364 + - type: DeviceLinkSink + invokeCounter: 4 - uid: 6230 components: - type: Transform rot: -1.5707963267948966 rad pos: -58.5,-16.5 parent: 8364 + - type: DeviceLinkSink + invokeCounter: 4 - uid: 6231 components: - type: Transform rot: -1.5707963267948966 rad pos: -59.5,-16.5 parent: 8364 + - type: DeviceLinkSink + invokeCounter: 4 - uid: 6232 components: - type: Transform rot: -1.5707963267948966 rad pos: -60.5,-16.5 parent: 8364 + - type: DeviceLinkSink + invokeCounter: 4 - uid: 6233 components: - type: Transform rot: 3.141592653589793 rad pos: -61.5,-16.5 parent: 8364 + - type: DeviceLinkSink + invokeCounter: 4 - uid: 6234 components: - type: Transform rot: 3.141592653589793 rad pos: -61.5,-17.5 parent: 8364 + - type: DeviceLinkSink + invokeCounter: 4 - uid: 6235 components: - type: Transform rot: 3.141592653589793 rad pos: -61.5,-18.5 parent: 8364 + - type: DeviceLinkSink + invokeCounter: 4 - uid: 6236 components: - type: Transform rot: 3.141592653589793 rad pos: -61.5,-19.5 parent: 8364 + - type: DeviceLinkSink + invokeCounter: 4 - uid: 7162 components: - type: Transform @@ -70647,6 +70720,8 @@ entities: rot: 3.141592653589793 rad pos: -61.5,-20.5 parent: 8364 + - type: DeviceLinkSink + invokeCounter: 4 - uid: 17202 components: - type: Transform @@ -70724,6 +70799,13 @@ entities: - type: Transform pos: 90.5,-27.5 parent: 8364 +- proto: CorporateCircuitBoard + entities: + - uid: 27914 + components: + - type: Transform + pos: -4.441743,-12.321369 + parent: 8364 - proto: CowToolboxFilled entities: - uid: 13853 @@ -81392,6 +81474,13 @@ entities: - type: Transform pos: -33.51487,5.3832693 parent: 8364 +- proto: DrinkHotCoffee + entities: + - uid: 27918 + components: + - type: Transform + pos: 3.3560345,-11.363264 + parent: 8364 - proto: DrinkMugBlack entities: - uid: 18382 @@ -81446,6 +81535,13 @@ entities: - type: Transform pos: 74.3515,-18.443996 parent: 8364 +- proto: DungeonMasterCircuitBoard + entities: + - uid: 27917 + components: + - type: Transform + pos: 3.5477152,-12.389968 + parent: 8364 - proto: EmergencyLight entities: - uid: 21308 @@ -84322,7 +84418,7 @@ entities: pos: -34.5,-14.5 parent: 8364 - type: Door - secondsUntilStateChange: -9335.5 + secondsUntilStateChange: -10896.755 state: Closing - uid: 15010 components: @@ -84814,6 +84910,9 @@ entities: - type: Transform pos: -4.5,-71.5 parent: 8364 + - type: Door + secondsUntilStateChange: -2644.4858 + state: Closing - proto: Fireplace entities: - uid: 11559 @@ -119851,6 +119950,12 @@ entities: - type: Transform pos: 15.5,-41.5 parent: 8364 + - uid: 21746 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 10.5,-80.5 + parent: 8364 - uid: 21751 components: - type: Transform @@ -120086,6 +120191,12 @@ entities: - type: Transform pos: 17.5,-52.5 parent: 8364 + - uid: 23221 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 10.5,-81.5 + parent: 8364 - uid: 23222 components: - type: Transform @@ -124581,6 +124692,13 @@ entities: - type: Transform pos: 32.5,-6.5 parent: 8364 +- proto: NTDefaultCircuitBoard + entities: + - uid: 27913 + components: + - type: Transform + pos: -4.5442195,-11.268198 + parent: 8364 - proto: NuclearBomb entities: - uid: 12086 @@ -124595,6 +124713,13 @@ entities: - type: Transform pos: 8.5,-27.5 parent: 8364 +- proto: NutimovCircuitBoard + entities: + - uid: 27916 + components: + - type: Transform + pos: 3.6621494,-11.814552 + parent: 8364 - proto: OperatingTable entities: - uid: 2385 @@ -124868,6 +124993,13 @@ entities: - type: Transform pos: 58.5,-11.5 parent: 8364 +- proto: PaladinCircuitBoard + entities: + - uid: 27911 + components: + - type: Transform + pos: -4.443845,-11.67473 + parent: 8364 - proto: Paper entities: - uid: 1779 @@ -137083,6 +137215,12 @@ entities: - type: Transform pos: -3.5,-20.5 parent: 8364 + - uid: 8185 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 10.5,-81.5 + parent: 8364 - uid: 8207 components: - type: Transform @@ -137907,6 +138045,12 @@ entities: - type: Transform pos: 25.5,-75.5 parent: 8364 + - uid: 17697 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 10.5,-80.5 + parent: 8364 - uid: 17787 components: - type: Transform @@ -138440,6 +138584,13 @@ entities: - type: Transform pos: 0.2510581,39.68831 parent: 8364 +- proto: RobocopCircuitBoard + entities: + - uid: 22443 + components: + - type: Transform + pos: 3.4364183,-14.443886 + parent: 8364 - proto: RobustHarvestChemistryBottle entities: - uid: 13505 @@ -143986,6 +144137,13 @@ entities: - type: Transform pos: -20.5,-74.5 parent: 8364 +- proto: StationEfficiencyCircuitBoard + entities: + - uid: 27536 + components: + - type: Transform + pos: -4.631007,-12.460042 + parent: 8364 - proto: StationMap entities: - uid: 27690 @@ -151539,8 +151697,12 @@ entities: - Right: Reverse - Middle: Off 6120: + - Right: Reverse - Left: Forward + - Middle: Off + 16588: - Right: Reverse + - Left: Forward - Middle: Off - uid: 16780 components: @@ -161682,16 +161844,6 @@ entities: - type: Transform pos: 10.5,-79.5 parent: 8364 - - uid: 15804 - components: - - type: Transform - pos: 10.5,-81.5 - parent: 8364 - - uid: 15810 - components: - - type: Transform - pos: 10.5,-80.5 - parent: 8364 - uid: 15813 components: - type: Transform @@ -172478,7 +172630,7 @@ entities: rot: 1.5707963267948966 rad pos: 8.5,-18.5 parent: 8364 - - uid: 21746 + - uid: 31746 components: - type: Transform rot: 3.141592653589793 rad