diff --git a/Resources/Maps/_NF/Shuttles/mccargo.yml b/Resources/Maps/_NF/Shuttles/mccargo.yml index bee999752e7..b98bfffcd2d 100644 --- a/Resources/Maps/_NF/Shuttles/mccargo.yml +++ b/Resources/Maps/_NF/Shuttles/mccargo.yml @@ -880,6 +880,28 @@ entities: type: GridAtmosphere - type: GasTileOverlay - type: RadiationGridResistance +- proto: AirAlarm + entities: + - uid: 239 + components: + - rot: -1.5707963267948966 rad + pos: -2.5,8.5 + parent: 1 + type: Transform + - ShutdownSubscribers: + - 973 + type: DeviceNetwork + - devices: + - 8 + - 41 + - 407 + - 646 + - 171 + - 855 + - 974 + - 975 + - 973 + type: DeviceList - proto: AirCanister entities: - uid: 901 @@ -916,7 +938,7 @@ entities: parent: 1 type: Transform - links: - - 859 + - 730 type: DeviceLinkSink - uid: 301 components: @@ -1164,6 +1186,17 @@ entities: pos: 5.5,14.5 parent: 1 type: Transform +- proto: AirSensor + entities: + - uid: 973 + components: + - rot: 1.5707963267948966 rad + pos: -5.5,4.5 + parent: 1 + type: Transform + - ShutdownSubscribers: + - 239 + type: DeviceNetwork - proto: AmeController entities: - uid: 862 @@ -1278,6 +1311,33 @@ entities: - pos: 9.5,2.5 parent: 1 type: Transform +- proto: Ashtray + entities: + - uid: 781 + components: + - pos: -6.1505904,7.170422 + parent: 1 + type: Transform + - uid: 999 + components: + - pos: -5.4904265,-1.9804177 + parent: 1 + type: Transform + - uid: 1000 + components: + - pos: -1.4915584,-1.0051092 + parent: 1 + type: Transform + - uid: 1001 + components: + - pos: 2.5083408,-1.0062733 + parent: 1 + type: Transform + - uid: 1002 + components: + - pos: 6.5140495,-2.0174549 + parent: 1 + type: Transform - proto: AtmosDeviceFanTiny entities: - uid: 48 @@ -1715,7 +1775,7 @@ entities: entities: - uid: 755 components: - - pos: -6.444375,7.512438 + - pos: -6.5178742,7.5191875 parent: 1 type: Transform - uid: 756 @@ -2031,17 +2091,12 @@ entities: type: Transform - uid: 491 components: - - pos: 7.5,9.5 + - pos: 8.5,8.5 parent: 1 type: Transform - uid: 492 components: - - pos: 7.5,10.5 - parent: 1 - type: Transform - - uid: 493 - components: - - pos: 2.5,14.5 + - pos: 8.5,5.5 parent: 1 type: Transform - uid: 494 @@ -2074,16 +2129,6 @@ entities: - pos: 6.5,0.5 parent: 1 type: Transform - - uid: 502 - components: - - pos: 8.5,1.5 - parent: 1 - type: Transform - - uid: 503 - components: - - pos: 8.5,2.5 - parent: 1 - type: Transform - uid: 504 components: - pos: 5.5,0.5 @@ -2154,11 +2199,6 @@ entities: - pos: -7.5,0.5 parent: 1 type: Transform - - uid: 518 - components: - - pos: 1.5,14.5 - parent: 1 - type: Transform - uid: 523 components: - pos: 7.5,-5.5 @@ -2179,6 +2219,16 @@ entities: - pos: 7.5,-6.5 parent: 1 type: Transform + - uid: 579 + components: + - pos: 8.5,12.5 + parent: 1 + type: Transform + - uid: 580 + components: + - pos: 8.5,13.5 + parent: 1 + type: Transform - uid: 592 components: - pos: 9.5,2.5 @@ -2244,34 +2294,34 @@ entities: - pos: -4.5,4.5 parent: 1 type: Transform - - uid: 719 + - uid: 654 components: - - pos: -0.5,-3.5 + - pos: 8.5,14.5 parent: 1 type: Transform - - uid: 733 + - uid: 658 components: - - pos: 7.5,-4.5 + - pos: 9.5,1.5 parent: 1 type: Transform - - uid: 747 + - uid: 715 components: - - pos: 0.5,-3.5 + - pos: 9.5,0.5 parent: 1 type: Transform - - uid: 778 + - uid: 719 components: - - pos: 9.5,11.5 + - pos: -0.5,-3.5 parent: 1 type: Transform - - uid: 782 + - uid: 733 components: - - pos: 9.5,12.5 + - pos: 7.5,-4.5 parent: 1 type: Transform - - uid: 785 + - uid: 747 components: - - pos: 9.5,13.5 + - pos: 0.5,-3.5 parent: 1 type: Transform - uid: 796 @@ -2294,11 +2344,6 @@ entities: - pos: 6.5,-3.5 parent: 1 type: Transform - - uid: 802 - components: - - pos: 9.5,14.5 - parent: 1 - type: Transform - uid: 812 components: - pos: 7.5,14.5 @@ -2349,19 +2394,19 @@ entities: - pos: 3.5,14.5 parent: 1 type: Transform - - uid: 1033 + - uid: 1004 components: - - pos: 9.5,15.5 + - pos: 6.5,9.5 parent: 1 type: Transform - - uid: 1034 + - uid: 1005 components: - - pos: 8.5,15.5 + - pos: 6.5,10.5 parent: 1 type: Transform - - uid: 1035 + - uid: 1006 components: - - pos: 7.5,15.5 + - pos: 6.5,11.5 parent: 1 type: Transform - uid: 1074 @@ -2468,6 +2513,11 @@ entities: - pos: -2.5,10.5 parent: 1 type: Transform + - uid: 200 + components: + - pos: 5.5,3.5 + parent: 1 + type: Transform - uid: 264 components: - pos: -8.5,11.5 @@ -2518,29 +2568,29 @@ entities: - pos: 4.5,5.5 parent: 1 type: Transform - - uid: 577 + - uid: 493 components: - - pos: 9.5,2.5 + - pos: 6.5,3.5 parent: 1 type: Transform - - uid: 579 + - uid: 502 components: - - pos: 8.5,2.5 + - pos: 7.5,3.5 parent: 1 type: Transform - - uid: 580 + - uid: 503 components: - - pos: 7.5,2.5 + - pos: 8.5,3.5 parent: 1 type: Transform - - uid: 654 + - uid: 518 components: - - pos: 5.5,2.5 + - pos: 9.5,3.5 parent: 1 type: Transform - - uid: 658 + - uid: 577 components: - - pos: 4.5,2.5 + - pos: 9.5,2.5 parent: 1 type: Transform - uid: 659 @@ -2548,11 +2598,6 @@ entities: - pos: 4.5,3.5 parent: 1 type: Transform - - uid: 715 - components: - - pos: 6.5,2.5 - parent: 1 - type: Transform - uid: 807 components: - pos: -1.5,10.5 @@ -2593,12 +2638,6 @@ entities: - pos: -5.5,12.5 parent: 1 type: Transform - - uid: 122 - components: - - rot: 3.141592653589793 rad - pos: 7.5,16.5 - parent: 1 - type: Transform - uid: 124 components: - rot: -1.5707963267948966 rad @@ -2625,8 +2664,8 @@ entities: type: Transform - uid: 312 components: - - rot: 3.141592653589793 rad - pos: 6.5,16.5 + - rot: 1.5707963267948966 rad + pos: 5.5,16.5 parent: 1 type: Transform - uid: 324 @@ -2635,6 +2674,18 @@ entities: pos: -8.5,9.5 parent: 1 type: Transform + - uid: 349 + components: + - rot: 1.5707963267948966 rad + pos: 6.5,16.5 + parent: 1 + type: Transform + - uid: 429 + components: + - rot: 1.5707963267948966 rad + pos: 8.5,16.5 + parent: 1 + type: Transform - uid: 465 components: - pos: -6.5,7.5 @@ -2779,6 +2830,12 @@ entities: pos: 9.5,3.5 parent: 1 type: Transform + - uid: 1012 + components: + - rot: 1.5707963267948966 rad + pos: 7.5,16.5 + parent: 1 + type: Transform - uid: 1015 components: - pos: -5.5,5.5 @@ -2870,7 +2927,7 @@ entities: entities: - uid: 190 components: - - pos: -5.978369,7.652311 + - pos: -6.0092015,7.6889405 parent: 1 type: Transform - proto: CigPackRed @@ -2958,20 +3015,6 @@ entities: bank-ATM-cashSlot: !type:ContainerSlot {} type: ContainerContainer - type: ItemSlots -- proto: CrateFoodBarSupply - entities: - - uid: 106 - components: - - pos: 0.5,11.5 - parent: 1 - type: Transform -- proto: CrateFoodCooking - entities: - - uid: 349 - components: - - pos: 2.5,10.5 - parent: 1 - type: Transform - proto: CrateFreezer entities: - uid: 858 @@ -2981,7 +3024,7 @@ entities: type: Transform - proto: CrateFunParty entities: - - uid: 230 + - uid: 125 components: - pos: 4.5,10.5 parent: 1 @@ -3005,7 +3048,7 @@ entities: entities: - uid: 753 components: - - pos: -6.4547915,7.106188 + - pos: -6.5178742,7.0994344 parent: 1 type: Transform - uid: 754 @@ -3015,36 +3058,18 @@ entities: type: Transform - proto: DisposalBend entities: - - uid: 274 - components: - - rot: 1.5707963267948966 rad - pos: 6.5,2.5 - parent: 1 - type: Transform - uid: 283 components: - rot: 1.5707963267948966 rad pos: 7.5,14.5 parent: 1 type: Transform - - uid: 310 - components: - - rot: 3.141592653589793 rad - pos: 7.5,1.5 - parent: 1 - type: Transform - uid: 331 components: - rot: 3.141592653589793 rad pos: -3.5,6.5 parent: 1 type: Transform - - uid: 333 - components: - - rot: -1.5707963267948966 rad - pos: 6.5,1.5 - parent: 1 - type: Transform - uid: 336 components: - rot: -1.5707963267948966 rad @@ -3084,12 +3109,6 @@ entities: type: Transform - proto: DisposalJunctionFlipped entities: - - uid: 239 - components: - - rot: 3.141592653589793 rad - pos: 7.5,2.5 - parent: 1 - type: Transform - uid: 275 components: - rot: 3.141592653589793 rad @@ -3145,6 +3164,12 @@ entities: pos: 7.5,3.5 parent: 1 type: Transform + - uid: 274 + components: + - rot: 1.5707963267948966 rad + pos: 6.5,1.5 + parent: 1 + type: Transform - uid: 280 components: - pos: 7.5,11.5 @@ -3172,6 +3197,11 @@ entities: pos: -1.5,7.5 parent: 1 type: Transform + - uid: 310 + components: + - pos: 7.5,2.5 + parent: 1 + type: Transform - uid: 370 components: - pos: -1.5,5.5 @@ -3325,6 +3355,14 @@ entities: - pos: 6.5,5.5 parent: 1 type: Transform +- proto: DisposalYJunction + entities: + - uid: 333 + components: + - rot: 3.141592653589793 rad + pos: 7.5,1.5 + parent: 1 + type: Transform - proto: DogBed entities: - uid: 844 @@ -3609,55 +3647,32 @@ entities: - pos: 2.5,9.5 parent: 1 type: Transform + - ShutdownSubscribers: + - 8 + - 41 + - 966 + - 972 + - 971 + - 970 + - 969 + - 968 + - 967 + - 471 + type: DeviceNetwork - devices: - 39 - 41 - 70 - 646 - type: DeviceList - - uid: 978 - components: - - rot: -1.5707963267948966 rad - pos: 10.5,1.5 - parent: 1 - type: Transform - - ShutdownSubscribers: - - 972 - - 973 - - 974 - - 975 - - 976 - - 977 - type: DeviceNetwork - - devices: - - 972 - - 973 - - 974 - - 975 - - 976 - - 977 - type: DeviceList - - uid: 979 - components: - - rot: 1.5707963267948966 rad - pos: -9.5,1.5 - parent: 1 - type: Transform - - ShutdownSubscribers: + - 8 - 966 - - 967 - - 968 - - 969 - - 970 + - 972 - 971 - type: DeviceNetwork - - devices: - - 966 - - 967 - - 968 - - 969 - 970 - - 971 + - 969 + - 968 + - 967 + - 471 type: DeviceList - proto: Firelock entities: @@ -3667,6 +3682,9 @@ entities: pos: -2.5,4.5 parent: 1 type: Transform + - ShutdownSubscribers: + - 154 + type: DeviceNetwork - uid: 39 components: - pos: 3.5,9.5 @@ -3677,6 +3695,9 @@ entities: - pos: -0.5,9.5 parent: 1 type: Transform + - ShutdownSubscribers: + - 154 + type: DeviceNetwork - uid: 70 components: - rot: 1.5707963267948966 rad @@ -3705,119 +3726,100 @@ entities: pos: 6.5,9.5 parent: 1 type: Transform -- proto: FirelockGlass +- proto: FirelockEdge entities: - - uid: 57 - components: - - pos: 8.5,5.5 - parent: 1 - type: Transform - - uid: 340 - components: - - pos: 8.5,8.5 - parent: 1 - type: Transform - - uid: 635 - components: - - pos: 7.5,4.5 - parent: 1 - type: Transform - uid: 966 components: - - pos: -10.5,-0.5 + - rot: 3.141592653589793 rad + pos: -1.5,1.5 parent: 1 type: Transform - ShutdownSubscribers: - - 979 + - 154 type: DeviceNetwork - uid: 967 components: - - pos: -10.5,-1.5 + - rot: 3.141592653589793 rad + pos: 4.5,1.5 parent: 1 type: Transform - ShutdownSubscribers: - - 979 + - 154 type: DeviceNetwork - uid: 968 components: - - pos: -10.5,-2.5 + - rot: 3.141592653589793 rad + pos: 3.5,1.5 parent: 1 type: Transform - ShutdownSubscribers: - - 979 + - 154 type: DeviceNetwork - uid: 969 components: - - pos: -7.5,-6.5 + - rot: 3.141592653589793 rad + pos: 2.5,1.5 parent: 1 type: Transform - ShutdownSubscribers: - - 979 + - 154 type: DeviceNetwork - uid: 970 components: - - pos: -6.5,-6.5 + - rot: 3.141592653589793 rad + pos: 1.5,1.5 parent: 1 type: Transform - ShutdownSubscribers: - - 979 + - 154 type: DeviceNetwork - uid: 971 components: - - pos: -5.5,-6.5 + - rot: 3.141592653589793 rad + pos: 0.5,1.5 parent: 1 type: Transform - ShutdownSubscribers: - - 979 + - 154 type: DeviceNetwork - uid: 972 components: - - pos: 6.5,-6.5 + - rot: 3.141592653589793 rad + pos: -0.5,1.5 parent: 1 type: Transform - ShutdownSubscribers: - - 978 + - 154 type: DeviceNetwork - - uid: 973 + - uid: 974 components: - - pos: 7.5,-6.5 + - rot: 1.5707963267948966 rad + pos: -3.5,6.5 parent: 1 type: Transform - - ShutdownSubscribers: - - 978 - type: DeviceNetwork - - uid: 974 + - uid: 975 components: - - pos: 8.5,-6.5 + - rot: 1.5707963267948966 rad + pos: 0.5,12.5 parent: 1 type: Transform - - ShutdownSubscribers: - - 978 - type: DeviceNetwork - - uid: 975 +- proto: FirelockGlass + entities: + - uid: 57 components: - - pos: 11.5,-2.5 + - pos: 8.5,5.5 parent: 1 type: Transform - - ShutdownSubscribers: - - 978 - type: DeviceNetwork - - uid: 976 + - uid: 340 components: - - pos: 11.5,-1.5 + - pos: 8.5,8.5 parent: 1 type: Transform - - ShutdownSubscribers: - - 978 - type: DeviceNetwork - - uid: 977 + - uid: 635 components: - - pos: 11.5,-0.5 + - pos: 7.5,4.5 parent: 1 type: Transform - - ShutdownSubscribers: - - 978 - type: DeviceNetwork - proto: FloorDrain entities: - uid: 157 @@ -3837,6 +3839,22 @@ entities: type: Transform - canCollide: False type: Physics +- proto: FoodCartCold + entities: + - uid: 1013 + components: + - rot: 1.5707963267948966 rad + pos: 2.5,10.5 + parent: 1 + type: Transform +- proto: FoodCartHot + entities: + - uid: 140 + components: + - rot: -1.5707963267948966 rad + pos: 0.5,11.5 + parent: 1 + type: Transform - proto: FoodCondimentBottleBBQ entities: - uid: 986 @@ -3966,9 +3984,9 @@ entities: - pos: 2.642523,-0.23788351 parent: 1 type: Transform - - uid: 781 + - uid: 778 components: - - pos: 6.6272316,-1.2427661 + - pos: 6.6397305,-1.2314452 parent: 1 type: Transform - uid: 792 @@ -4446,6 +4464,9 @@ entities: pos: 4.5,5.5 parent: 1 type: Transform + - ShutdownSubscribers: + - 154 + type: DeviceNetwork - color: '#0055CCFF' type: AtmosPipeColor - uid: 657 @@ -4760,7 +4781,7 @@ entities: - type: ItemCooldown - uid: 710 components: - - pos: -5.5050435,7.2214174 + - pos: -5.438878,7.238323 parent: 1 type: Transform - proto: HappyHonkCargo @@ -4843,6 +4864,18 @@ entities: pos: 9.5,3.5 parent: 1 type: Transform +- proto: JugWeldingFuel + entities: + - uid: 686 + components: + - pos: -0.27437842,13.09 + parent: 1 + type: Transform + - uid: 1008 + components: + - pos: -0.73063827,13.09 + parent: 1 + type: Transform - proto: KitchenDeepFryer entities: - uid: 184 @@ -4893,29 +4926,29 @@ entities: type: Transform - proto: Lighter entities: - - uid: 828 + - uid: 782 components: - - pos: -6.071316,7.3206215 + - pos: -5.4965315,-1.1974946 parent: 1 type: Transform - - uid: 999 + - uid: 785 components: - - pos: -5.4959135,-1.4414308 + - pos: -1.5097241,-0.15119827 parent: 1 type: Transform - - uid: 1000 + - uid: 802 components: - - pos: -1.4959135,-0.4414308 + - pos: 2.4930682,-0.15119827 parent: 1 type: Transform - - uid: 1001 + - uid: 828 components: - - pos: 2.4964628,-0.4414308 + - pos: -6.1264853,7.516101 parent: 1 type: Transform - - uid: 1002 + - uid: 1003 components: - - pos: 6.491911,-1.4101808 + - pos: 6.497044,-1.1697168 parent: 1 type: Transform - proto: LockerJanitorFilled @@ -5215,6 +5248,11 @@ entities: - pos: 9.5,6.5 parent: 1 type: Transform + - uid: 1007 + components: + - pos: 7.5,8.5 + parent: 1 + type: Transform - proto: Rack entities: - uid: 23 @@ -5283,12 +5321,6 @@ entities: - pos: -5.5,12.5 parent: 1 type: Transform - - uid: 395 - components: - - rot: -1.5707963267948966 rad - pos: -0.5,13.5 - parent: 1 - type: Transform - uid: 884 components: - pos: -1.5,13.5 @@ -5310,7 +5342,19 @@ entities: type: Transform - proto: RailingCorner entities: - - uid: 125 + - uid: 106 + components: + - rot: 1.5707963267948966 rad + pos: 8.5,16.5 + parent: 1 + type: Transform + - uid: 122 + components: + - rot: 3.141592653589793 rad + pos: 5.5,16.5 + parent: 1 + type: Transform + - uid: 228 components: - rot: 3.141592653589793 rad pos: 0.5,10.5 @@ -5693,7 +5737,7 @@ entities: parent: 1 type: Transform - links: - - 859 + - 730 type: DeviceLinkSink - uid: 689 components: @@ -5899,16 +5943,6 @@ entities: 193: - Pressed: DoorBolt type: DeviceLinkSource - - uid: 362 - components: - - rot: 1.5707963267948966 rad - pos: 8.5,9.5 - parent: 1 - type: Transform - - linkedPorts: - 784: - - Pressed: Toggle - type: DeviceLinkSource - uid: 455 components: - pos: -4.5,15.5 @@ -5948,15 +5982,17 @@ entities: 789: - Pressed: Toggle type: DeviceLinkSource - - uid: 750 + - uid: 730 components: - - rot: 1.5707963267948966 rad - pos: 8.5,6.5 + - rot: -1.5707963267948966 rad + pos: 5.5,4.5 parent: 1 type: Transform - linkedPorts: - 344: + 684: - Pressed: Toggle + 300: + - Pressed: DoorBolt type: DeviceLinkSource - uid: 770 components: @@ -6003,8 +6039,6 @@ entities: - Pressed: Toggle 677: - Pressed: Toggle - 684: - - Pressed: Toggle 678: - Pressed: Toggle 679: @@ -6015,8 +6049,6 @@ entities: - Pressed: Toggle 682: - Pressed: Toggle - 300: - - Pressed: DoorBolt type: DeviceLinkSource - uid: 885 components: @@ -6114,6 +6146,28 @@ entities: 958: - Pressed: Toggle type: DeviceLinkSource +- proto: SignalButtonDirectional + entities: + - uid: 362 + components: + - rot: 1.5707963267948966 rad + pos: 8.5,9.5 + parent: 1 + type: Transform + - linkedPorts: + 784: + - Pressed: Toggle + type: DeviceLinkSource + - uid: 750 + components: + - rot: 1.5707963267948966 rad + pos: 8.5,6.5 + parent: 1 + type: Transform + - linkedPorts: + 344: + - Pressed: Toggle + type: DeviceLinkSource - proto: SignCargo entities: - uid: 474 @@ -6223,7 +6277,7 @@ entities: type: Transform - proto: SpawnMobCow entities: - - uid: 140 + - uid: 230 components: - rot: -1.5707963267948966 rad pos: 0.5,10.5 @@ -6334,9 +6388,9 @@ entities: - pos: -8.5,11.5 parent: 1 type: Transform -- proto: SuitStorageWallmountEVAEmergency +- proto: SuitStorageWallmountEVA entities: - - uid: 996 + - uid: 976 components: - pos: 3.5,15.5 parent: 1 @@ -6718,23 +6772,11 @@ entities: - pos: 4.5,16.5 parent: 1 type: Transform - - uid: 228 - components: - - rot: 1.5707963267948966 rad - pos: 8.5,16.5 - parent: 1 - type: Transform - uid: 313 components: - pos: 9.5,16.5 parent: 1 type: Transform - - uid: 429 - components: - - rot: -1.5707963267948966 rad - pos: 5.5,16.5 - parent: 1 - type: Transform - uid: 457 components: - rot: 3.141592653589793 rad @@ -6866,46 +6908,36 @@ entities: type: Transform - proto: VendingMachineRestockBooze entities: - - uid: 840 - components: - - pos: -2.598885,13.865319 - parent: 1 - type: Transform - - uid: 841 - components: - - pos: -2.3384683,13.781985 - parent: 1 - type: Transform - - uid: 894 + - uid: 768 components: - - pos: -2.606868,13.727668 + - pos: -2.3164067,11.644337 parent: 1 type: Transform - - uid: 895 + - uid: 769 components: - - pos: -2.356868,13.654751 + - pos: -2.3235443,11.800587 parent: 1 type: Transform - proto: VendingMachineRestockChefvend entities: - - uid: 748 + - uid: 851 components: - - pos: -0.56509566,13.911346 + - pos: -1.3805447,11.656897 parent: 1 type: Transform - - uid: 1065 + - uid: 852 components: - - pos: -0.5755123,13.734262 + - pos: -1.6409614,11.70898 parent: 1 type: Transform - - uid: 1066 + - uid: 894 components: - - pos: -0.3255123,13.828012 + - pos: -1.3909613,11.83398 parent: 1 type: Transform - - uid: 1067 + - uid: 895 components: - - pos: -0.30467892,13.671762 + - pos: -1.5888779,11.938147 parent: 1 type: Transform - proto: VendingMachineRestockClothes @@ -6934,44 +6966,34 @@ entities: entities: - uid: 839 components: - - pos: -3.5885057,13.942069 + - pos: -3.6409616,11.77148 parent: 1 type: Transform - - uid: 842 + - uid: 840 components: - - pos: -3.3593388,13.660819 + - pos: -3.4117947,11.70898 parent: 1 type: Transform - - uid: 851 + - uid: 841 components: - - pos: -3.3801723,13.848319 + - pos: -3.3805447,11.875647 parent: 1 type: Transform - - uid: 852 + - uid: 842 components: - - pos: -3.5989223,13.744152 + - pos: -3.5576282,11.948563 parent: 1 type: Transform - proto: VendingMachineRestockDinnerware entities: - - uid: 730 - components: - - pos: -2.3180861,11.673373 - parent: 1 - type: Transform - uid: 759 components: - pos: -2.5680861,11.912956 parent: 1 type: Transform - - uid: 768 - components: - - pos: -2.391003,11.819206 - parent: 1 - type: Transform - - uid: 769 + - uid: 1011 components: - - pos: -2.5680861,11.71504 + - pos: -2.61849,11.706837 parent: 1 type: Transform - proto: VendingMachineRestockHappyHonk @@ -7012,22 +7034,22 @@ entities: entities: - uid: 591 components: - - pos: -1.626555,11.732673 + - pos: -2.5784614,13.969397 parent: 1 type: Transform - uid: 626 components: - - pos: -1.3036382,11.68059 + - pos: -2.3701282,13.86523 parent: 1 type: Transform - uid: 672 components: - - pos: -1.3036382,11.83684 + - pos: -2.6305447,13.77148 parent: 1 type: Transform - uid: 685 components: - - pos: -1.5848882,11.920173 + - pos: -2.3388782,13.698563 parent: 1 type: Transform - proto: VendingMachineRestockSeeds @@ -7044,24 +7066,24 @@ entities: type: Transform - proto: VendingMachineRestockSmokes entities: - - uid: 686 - components: - - pos: -3.310824,11.640575 - parent: 1 - type: Transform - uid: 690 components: - - pos: -3.644157,11.723909 + - pos: -3.5784616,13.948563 parent: 1 type: Transform - uid: 695 components: - - pos: -3.3316572,11.813148 + - pos: -3.3701282,13.854813 parent: 1 type: Transform - uid: 711 components: - - pos: -3.581657,11.927731 + - pos: -3.6305447,13.761063 + parent: 1 + type: Transform + - uid: 748 + components: + - pos: -3.3492947,13.698563 parent: 1 type: Transform - proto: VendingMachineSeedsUnlocked @@ -7751,6 +7773,13 @@ entities: - pos: -3.5,7.5 parent: 1 type: Transform +- proto: WeldingFuelTankHighCapacity + entities: + - uid: 395 + components: + - pos: -0.5,13.5 + parent: 1 + type: Transform - proto: WindoorSecure entities: - uid: 32 diff --git a/Resources/Maps/_NF/Shuttles/mcdelivery.yml b/Resources/Maps/_NF/Shuttles/mcdelivery.yml index 9ba76d7c952..0ebdd9fec34 100644 --- a/Resources/Maps/_NF/Shuttles/mcdelivery.yml +++ b/Resources/Maps/_NF/Shuttles/mcdelivery.yml @@ -57,68 +57,68 @@ entities: color: '#FFFFFFFF' id: Delivery decals: - 11: 1,2 + 3: 1,2 - node: color: '#3C44AAFF' id: DeliveryGreyscale decals: - 10: 1,1 + 2: 1,1 - node: color: '#FFFFFFFF' id: StandClear decals: - 21: 0,0 + 13: 0,0 - node: color: '#A46106FF' id: WarnCornerNW decals: - 19: 0,4 + 11: 0,4 - node: color: '#A46106FF' id: WarnCornerSmallNE decals: - 16: 1,4 + 8: 1,4 - node: color: '#A46106FF' id: WarnCornerSmallNW decals: - 18: 1,4 - 20: 0,2 + 10: 1,4 + 12: 0,2 - node: color: '#A46106FF' id: WarnCornerSmallSE decals: - 15: 1,4 + 7: 1,4 - node: color: '#A46106FF' id: WarnEndE decals: - 13: 2,4 + 5: 2,4 - node: color: '#A46106FF' id: WarnEndN decals: - 17: 1,5 + 9: 1,5 - node: color: '#A46106FF' id: WarnLineE decals: - 14: 1,3 + 6: 1,3 - node: color: '#FFFFFFFF' id: WarnLineN decals: - 2: 0,-1 + 1: 0,-1 - node: color: '#A46106FF' id: WarnLineS decals: - 12: 0,3 + 4: 0,3 - node: color: '#FFFFFFFF' id: WarnLineW decals: - 1: 0,-1 + 0: 0,-1 type: DecalGrid - version: 2 data: @@ -276,52 +276,26 @@ entities: - pos: -0.5,6.5 parent: 1 type: Transform -- proto: BoxPaperOffice - entities: - - uid: 39 - components: - - flags: InContainer - type: MetaData - - parent: 71 - type: Transform - - canCollide: False - type: Physics - - type: InsideEntityStorage - proto: CableApcExtension entities: - uid: 20 components: - - pos: -0.5,4.5 - parent: 1 - type: Transform - - uid: 22 - components: - - pos: 2.5,3.5 + - pos: 1.5,1.5 parent: 1 type: Transform - - uid: 33 + - uid: 38 components: - - pos: 0.5,5.5 + - pos: 0.5,2.5 parent: 1 type: Transform - uid: 43 components: - - pos: -0.5,3.5 - parent: 1 - type: Transform - - uid: 48 - components: - - pos: 2.5,1.5 - parent: 1 - type: Transform - - uid: 51 - components: - - pos: -0.5,0.5 + - pos: 1.5,2.5 parent: 1 type: Transform - uid: 53 components: - - pos: -0.5,1.5 + - pos: 1.5,3.5 parent: 1 type: Transform - uid: 54 @@ -329,54 +303,9 @@ entities: - pos: -0.5,2.5 parent: 1 type: Transform - - uid: 79 - components: - - pos: -0.5,5.5 - parent: 1 - type: Transform - - uid: 80 - components: - - pos: 0.5,6.5 - parent: 1 - type: Transform - - uid: 81 - components: - - pos: 1.5,6.5 - parent: 1 - type: Transform - - uid: 82 - components: - - pos: 2.5,6.5 - parent: 1 - type: Transform - - uid: 83 - components: - - pos: 2.5,5.5 - parent: 1 - type: Transform - - uid: 84 - components: - - pos: 3.5,5.5 - parent: 1 - type: Transform - - uid: 85 - components: - - pos: 3.5,4.5 - parent: 1 - type: Transform - - uid: 86 - components: - - pos: 3.5,3.5 - parent: 1 - type: Transform - - uid: 88 - components: - - pos: 2.5,0.5 - parent: 1 - type: Transform - - uid: 94 + - uid: 62 components: - - pos: 2.5,2.5 + - pos: 1.5,4.5 parent: 1 type: Transform - proto: CableHV @@ -452,10 +381,9 @@ entities: showEnts: False occludes: True ents: - - 91 - - 108 - 67 - 89 + - 108 type: ContainerContainer - uid: 71 components: @@ -486,7 +414,8 @@ entities: showEnts: False occludes: True ents: - - 39 + - 44 + - 68 type: ContainerContainer - proto: ComputerTabletopShuttle entities: @@ -561,13 +490,6 @@ entities: - canCollide: False type: Physics - type: InsideEntityStorage -- proto: FirelockGlass - entities: - - uid: 9 - components: - - pos: 0.5,-0.5 - parent: 1 - type: Transform - proto: GasPassiveVent entities: - uid: 37 @@ -686,14 +608,26 @@ entities: pos: 3.5,5.5 parent: 1 type: Transform -- proto: Gyroscope +- proto: JugWeldingFuel entities: - - uid: 38 + - uid: 44 components: - - rot: -1.5707963267948966 rad - pos: 3.5,1.5 - parent: 1 + - flags: InContainer + type: MetaData + - parent: 71 type: Transform + - canCollide: False + type: Physics + - type: InsideEntityStorage + - uid: 68 + components: + - flags: InContainer + type: MetaData + - parent: 71 + type: Transform + - canCollide: False + type: Physics + - type: InsideEntityStorage - proto: NoticeBoardNF entities: - uid: 96 @@ -702,6 +636,34 @@ entities: pos: -0.5,3.5 parent: 1 type: Transform + - storageUsed: 2 + type: Storage + - containers: + storagebase: !type:Container + showEnts: False + occludes: True + ents: + - 9 + - 39 + type: ContainerContainer +- proto: PaperOffice + entities: + - uid: 9 + components: + - flags: InContainer + type: MetaData + - parent: 96 + type: Transform + - canCollide: False + type: Physics + - uid: 39 + components: + - flags: InContainer + type: MetaData + - parent: 96 + type: Transform + - canCollide: False + type: Physics - proto: PlasticFlapsAirtightClear entities: - uid: 52 @@ -709,20 +671,27 @@ entities: - pos: 1.5,-0.5 parent: 1 type: Transform -- proto: PortableGeneratorPacman +- proto: PortableGeneratorJrPacman entities: - - uid: 44 + - uid: 75 components: - anchored: True pos: 1.5,2.5 parent: 1 type: Transform - - storage: - Plasma: 3000 - type: MaterialStorage + - solutions: + tank: + temperature: 293.15 + canMix: False + canReact: True + maxVol: 50 + reagents: + - data: null + ReagentId: WeldingFuel + Quantity: 50 + type: SolutionContainerManager - bodyType: Static type: Physics - - type: InsertingMaterialStorage - proto: PosterContrabandEAT entities: - uid: 93 @@ -799,21 +768,6 @@ entities: pos: 2.5,1.5 parent: 1 type: Transform -- proto: SheetPlasma1 - entities: - - uid: 91 - components: - - flags: InContainer - type: MetaData - - parent: 23 - type: Transform - - count: 15 - type: Stack - - size: 15 - type: Item - - canCollide: False - type: Physics - - type: InsideEntityStorage - proto: ShuttersNormalOpen entities: - uid: 60 @@ -836,6 +790,39 @@ entities: 60: - Pressed: Toggle type: DeviceLinkSource +- proto: SmallGyroscope + entities: + - uid: 22 + components: + - rot: 1.5707963267948966 rad + pos: 3.5,1.5 + parent: 1 + type: Transform +- proto: SmallThruster + entities: + - uid: 29 + components: + - rot: -1.5707963267948966 rad + pos: 3.5,0.5 + parent: 1 + type: Transform + - uid: 33 + components: + - rot: 3.141592653589793 rad + pos: 3.5,-0.5 + parent: 1 + type: Transform + - uid: 48 + components: + - pos: 3.5,6.5 + parent: 1 + type: Transform + - uid: 51 + components: + - rot: 1.5707963267948966 rad + pos: -0.5,6.5 + parent: 1 + type: Transform - proto: SpawnPointLatejoin entities: - uid: 72 @@ -877,31 +864,6 @@ entities: - pos: 1.5,5.5 parent: 1 type: Transform -- proto: Thruster - entities: - - uid: 29 - components: - - rot: 3.141592653589793 rad - pos: 3.5,-0.5 - parent: 1 - type: Transform - - uid: 62 - components: - - rot: -1.5707963267948966 rad - pos: 3.5,0.5 - parent: 1 - type: Transform - - uid: 68 - components: - - pos: 3.5,6.5 - parent: 1 - type: Transform - - uid: 75 - components: - - rot: 1.5707963267948966 rad - pos: -0.5,6.5 - parent: 1 - type: Transform - proto: WallReinforced entities: - uid: 10 diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml index cce7ea83301..ed167d70a6f 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml @@ -392,3 +392,18 @@ reagents: - ReagentId: PlantBGone Quantity: 200 + +- type: entity + parent: Jug + name: jug (welding fuel) + id: JugWeldingFuel +# noSpawn: true # Frontier + components: + - type: Label + currentLabel: welding fuel + - type: SolutionContainerManager + solutions: + beaker: + reagents: + - ReagentId: WeldingFuel + Quantity: 200 diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml index 8b0f1f319f3..a7705c49640 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/portable_generator.yml @@ -272,7 +272,7 @@ - type: Machine board: PortableGeneratorJrPacmanMachineCircuitboard - type: FuelGenerator - targetPower: 2000 + targetPower: 4000 # Frontier - 2000<4000 minTargetPower: 1000 optimalPower: 5000 maxTargetPower: 15000 @@ -286,7 +286,7 @@ - type: SolutionContainerManager solutions: tank: - maxVol: 50 + maxVol: 100 # Frontier - 50<100 - type: RefillableSolution solution: tank - type: PortableGenerator diff --git a/Resources/Prototypes/_NF/Shipyard/mccargo.yml b/Resources/Prototypes/_NF/Shipyard/mccargo.yml index 2a0604b4256..6b01b0db481 100644 --- a/Resources/Prototypes/_NF/Shipyard/mccargo.yml +++ b/Resources/Prototypes/_NF/Shipyard/mccargo.yml @@ -9,7 +9,7 @@ id: McCargo name: DC McCargo description: "Your very own McCargo :tm: franchisee! comes fully stocked and ready for production of McCargo meals" - price: 68900 # 10% up from sell + price: 70000 # 10% up from sell category: Medium group: Civilian shuttlePath: /Maps/_NF/Shuttles/mccargo.yml diff --git a/Resources/Prototypes/_NF/Shipyard/mcdelivery.yml b/Resources/Prototypes/_NF/Shipyard/mcdelivery.yml index d60bb242643..903b76e14b5 100644 --- a/Resources/Prototypes/_NF/Shipyard/mcdelivery.yml +++ b/Resources/Prototypes/_NF/Shipyard/mcdelivery.yml @@ -9,7 +9,7 @@ id: McDelivery name: DC McDelivery description: "Fast food fast ship, bring the McCargo meals to the people" - price: 11300 + price: 8500 category: Small group: None shuttlePath: /Maps/_NF/Shuttles/mcdelivery.yml