From 488d99082db2925e124c8e9122e0f2f1f355ef87 Mon Sep 17 00:00:00 2001 From: "Alice \"Arimah\" Heurlin" <30327355+arimah@users.noreply.github.com> Date: Thu, 7 Nov 2024 17:49:13 +0100 Subject: [PATCH] Hammer (Update): Directional fans + tweaks (#2323) * Update SBB Hammer * Lower Hammer price * I forgor --------- Co-authored-by: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> --- Resources/Maps/_NF/Shuttles/hammer.yml | 465 +++++++++---------- Resources/Prototypes/_NF/Shipyard/hammer.yml | 2 +- 2 files changed, 220 insertions(+), 247 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/hammer.yml b/Resources/Maps/_NF/Shuttles/hammer.yml index bb27c904dd3..84156083707 100644 --- a/Resources/Maps/_NF/Shuttles/hammer.yml +++ b/Resources/Maps/_NF/Shuttles/hammer.yml @@ -37,11 +37,11 @@ entities: version: 6 0,-1: ind: 0,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAARQAAAAAAggAAAAAAMQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAABTQAAAAACggAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATAAAAAADTAAAAAAAggAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAggAAAAAAggAAAAAAMQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATAAAAAAATAAAAAADbAAAAAADYQAAAAAAYQAAAAABYQAAAAADYQAAAAAAYQAAAAABggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAARQAAAAAAggAAAAAAYQAAAAADYQAAAAADYQAAAAAAYQAAAAACYQAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAARQAAAAAAggAAAAAAMQAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAggAAAAAAggAAAAAAggAAAAAAMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATQAAAAABTQAAAAACggAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAggAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATAAAAAADTAAAAAAAggAAAAAAcQAAAAAAcQAAAAAAcQAAAAAAggAAAAAAggAAAAAAMQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATAAAAAAATAAAAAADbAAAAAADYQAAAAAAYQAAAAABYQAAAAADYQAAAAAAYQAAAAABggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARQAAAAAARQAAAAAAggAAAAAAYQAAAAADYQAAAAADYQAAAAAAYQAAAAACYQAAAAAAggAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 -1,-1: ind: -1,-1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAADggAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAABggAAAAAAggAAAAAAggAAAAAAcAAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAggAAAAAATQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAADggAAAAAAggAAAAAAcAAAAAAAcAAAAAAAcAAAAAAATQAAAAAATAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAggAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAggAAAAAATAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAARQAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAADggAAAAAARQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAABggAAAAAAggAAAAAAggAAAAAAggAAAAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgQAAAAAAggAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAggAAAAAATQAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMQAAAAADggAAAAAAggAAAAAAcAAAAAAAcAAAAAAAcAAAAAAATQAAAAAATAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAggAAAAAAcAAAAAAAcAAAAAAAcAAAAAAAggAAAAAATAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAAggAAAAAARQAAAAAA version: 6 -1,0: ind: -1,0 @@ -83,7 +83,6 @@ entities: 47: -4,-2 48: -3,-2 49: -5,-4 - 51: -2,-5 57: -7,4 58: -7,3 59: -7,2 @@ -100,13 +99,22 @@ entities: decals: 29: 5,-3 30: 5,-4 - 31: 3,-4 - 50: -4,-4 60: -7,5 61: -6,5 67: -5,0 68: -4,0 69: -3,0 + 139: 3,-3 + - node: + color: '#0096FFFF' + id: BoxGreyscale + decals: + 141: -4,-4 + - node: + color: '#FF0000FF' + id: BoxGreyscale + decals: + 140: -3,-4 - node: color: '#AE6716BF' id: BrickCornerOverlayNE @@ -355,6 +363,8 @@ entities: 91: -1,0 92: 0,0 93: 1,0 + 137: -1,-6 + 138: 1,-6 - node: color: '#FFFFFFFF' id: WarnLineS @@ -405,10 +415,10 @@ entities: 2,1: 1: 4096 0,-2: - 0: 12800 + 0: 29184 1: 2048 -1,-2: - 0: 51200 + 0: 34816 1: 512 -1,-1: 0: 3067 @@ -479,7 +489,7 @@ entities: - type: RadiationGridResistance - proto: AirAlarm entities: - - uid: 91 + - uid: 172 components: - type: Transform pos: 7.5,6.5 @@ -490,7 +500,7 @@ entities: - 191 - 209 - 239 - - uid: 297 + - uid: 311 components: - type: Transform rot: 1.5707963267948966 rad @@ -503,7 +513,7 @@ entities: - 239 - 200 - 192 - - uid: 353 + - uid: 354 components: - type: Transform rot: -1.5707963267948966 rad @@ -511,12 +521,12 @@ entities: parent: 2 - type: DeviceList devices: - - 172 - 195 - - 222 - - 257 + - 215 + - 240 - 258 - - uid: 357 + - 265 + - uid: 358 components: - type: Transform rot: 1.5707963267948966 rad @@ -524,19 +534,11 @@ entities: parent: 2 - type: DeviceList devices: - - 84 - - 86 + - 54 + - 375 - 211 - proto: AirCanister entities: - - uid: 273 - components: - - type: Transform - anchored: True - pos: -3.5,-3.5 - parent: 2 - - type: Physics - bodyType: Static - uid: 274 components: - type: Transform @@ -580,12 +582,12 @@ entities: parent: 2 - proto: AirlockGlassShuttle entities: - - uid: 314 + - uid: 275 components: - type: Transform pos: -0.5,-5.5 parent: 2 - - uid: 315 + - uid: 314 components: - type: Transform pos: 1.5,-5.5 @@ -604,7 +606,7 @@ entities: - type: Transform pos: 6.5,1.5 parent: 2 -- proto: AtmosDeviceFanTiny +- proto: AtmosDeviceFanDirectional entities: - uid: 88 components: @@ -616,35 +618,41 @@ entities: - type: Transform pos: 1.5,-5.5 parent: 2 - - uid: 364 + - uid: 315 components: - type: Transform - pos: -3.5,5.5 + rot: 3.141592653589793 rad + pos: 0.5,5.5 parent: 2 - uid: 365 components: - type: Transform - pos: -2.5,5.5 + rot: 3.141592653589793 rad + pos: -3.5,5.5 parent: 2 - uid: 366 components: - type: Transform + rot: 3.141592653589793 rad pos: -1.5,5.5 parent: 2 - uid: 367 components: - type: Transform + rot: 3.141592653589793 rad pos: -0.5,5.5 parent: 2 - uid: 368 components: - type: Transform - pos: 0.5,5.5 + rot: 3.141592653589793 rad + pos: 1.5,5.5 parent: 2 - uid: 369 components: - type: Transform - pos: 1.5,5.5 + rot: 3.141592653589793 rad + pos: -2.5,5.5 parent: 2 - proto: AtmosFixBlockerMarker entities: @@ -752,92 +760,69 @@ entities: parent: 2 - proto: BlastDoor entities: - - uid: 312 + - uid: 348 components: - type: Transform rot: 1.5707963267948966 rad pos: 1.5,-0.5 parent: 2 - - type: DeviceLinkSink - links: - - 354 - - 355 - - uid: 348 + - uid: 349 components: - type: Transform rot: 1.5707963267948966 rad pos: -0.5,-0.5 parent: 2 - - type: DeviceLinkSink - links: - - 354 - - 355 - - uid: 349 + - uid: 351 components: - type: Transform rot: 1.5707963267948966 rad pos: 0.5,-0.5 parent: 2 - - type: DeviceLinkSink - links: - - 354 - - 355 - proto: BlastDoorOpen entities: - - uid: 358 + - uid: 359 components: - type: Transform rot: -1.5707963267948966 rad pos: -0.5,5.5 parent: 2 - - type: DeviceLinkSink - links: - - 265 - - uid: 359 + - uid: 360 components: - type: Transform rot: -1.5707963267948966 rad pos: 0.5,5.5 parent: 2 - - type: DeviceLinkSink - links: - - 265 - - uid: 360 + - uid: 361 components: - type: Transform rot: -1.5707963267948966 rad pos: 1.5,5.5 parent: 2 - - type: DeviceLinkSink - links: - - 265 - - uid: 361 + - uid: 362 components: - type: Transform rot: 1.5707963267948966 rad pos: -1.5,5.5 parent: 2 - - type: DeviceLinkSink - links: - - 265 - - uid: 362 + - uid: 363 components: - type: Transform rot: 1.5707963267948966 rad pos: -2.5,5.5 parent: 2 - - type: DeviceLinkSink - links: - - 265 - - uid: 363 + - uid: 364 components: - type: Transform rot: 1.5707963267948966 rad pos: -3.5,5.5 parent: 2 - - type: DeviceLinkSink - links: - - 265 +- proto: BoxLightMixed + entities: + - uid: 45 + components: + - type: Transform + pos: 7.6352596,0.25652 + parent: 2 - proto: ButtonFrameCaution entities: - uid: 176 @@ -854,7 +839,7 @@ entities: parent: 2 - proto: ButtonFrameCautionSecurity entities: - - uid: 311 + - uid: 312 components: - type: Transform pos: -4.5,5.5 @@ -1253,12 +1238,12 @@ entities: - uid: 317 components: - type: Transform - pos: 6.368444,0.7167682 + pos: 6.2498426,0.88195425 parent: 2 - uid: 426 components: - type: Transform - pos: 6.6041665,0.5521196 + pos: 6.364426,0.64220434 parent: 2 - proto: Catwalk entities: @@ -1320,20 +1305,12 @@ entities: parent: 2 - proto: ComputerWallmountWithdrawBankATM entities: - - uid: 243 + - uid: 374 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 2.5,-4.5 + rot: 1.5707963267948966 rad + pos: -1.5,-4.5 parent: 2 - - type: Physics - canCollide: False - - type: ContainerContainer - containers: - board: !type:Container - ents: [] - bank-ATM-cashSlot: !type:ContainerSlot {} - - type: ItemSlots - proto: CrateEngineeringCableBulk entities: - uid: 271 @@ -1444,22 +1421,14 @@ entities: parent: 2 - proto: FirelockGlass entities: - - uid: 172 - components: - - type: Transform - pos: 1.5,-0.5 - parent: 2 - - type: DeviceNetwork - deviceLists: - - 353 - uid: 195 components: - type: Transform - pos: 0.5,-0.5 + pos: 1.5,-0.5 parent: 2 - type: DeviceNetwork deviceLists: - - 353 + - 354 - uid: 209 components: - type: Transform @@ -1467,8 +1436,8 @@ entities: parent: 2 - type: DeviceNetwork deviceLists: - - 91 - - 297 + - 172 + - 311 - uid: 210 components: - type: Transform @@ -1476,7 +1445,7 @@ entities: parent: 2 - type: DeviceNetwork deviceLists: - - 297 + - 311 - uid: 211 components: - type: Transform @@ -1484,15 +1453,15 @@ entities: parent: 2 - type: DeviceNetwork deviceLists: - - 357 - - uid: 222 + - 358 + - uid: 215 components: - type: Transform - pos: -0.5,-0.5 + pos: 0.5,-0.5 parent: 2 - type: DeviceNetwork deviceLists: - - 353 + - 354 - uid: 239 components: - type: Transform @@ -1500,16 +1469,37 @@ entities: parent: 2 - type: DeviceNetwork deviceLists: - - 91 - - 297 -- proto: GasMixer + - 172 + - 311 + - uid: 240 + components: + - type: Transform + pos: -0.5,-0.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 354 +- proto: GasMixerFlipped entities: - uid: 43 components: - type: Transform - rot: -1.5707963267948966 rad - pos: 4.5,-3.5 + rot: 1.5707963267948966 rad + pos: 4.5,-2.5 + parent: 2 +- proto: GasMixerOn + entities: + - uid: 39 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -3.5,-2.5 parent: 2 + - type: GasMixer + inletTwoConcentration: 0.79 + inletOneConcentration: 0.21 + - type: AtmosPipeColor + color: '#0055CCFF' - proto: GasPassiveVent entities: - uid: 304 @@ -1521,12 +1511,27 @@ entities: color: '#990000FF' - proto: GasPipeBend entities: - - uid: 54 + - uid: 41 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 4.5,-3.5 + parent: 2 + - uid: 84 + components: + - type: Transform + pos: -2.5,-2.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 86 components: - type: Transform rot: 1.5707963267948966 rad - pos: 4.5,-2.5 + pos: -4.5,-1.5 parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 175 components: - type: Transform @@ -1559,7 +1564,7 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 247 + - uid: 257 components: - type: Transform rot: 1.5707963267948966 rad @@ -1592,7 +1597,7 @@ entities: color: '#990000FF' - proto: GasPipeFourway entities: - - uid: 351 + - uid: 352 components: - type: Transform pos: -0.5,-1.5 @@ -1601,7 +1606,7 @@ entities: color: '#0055CCFF' - proto: GasPipeStraight entities: - - uid: 1 + - uid: 18 components: - type: Transform rot: 3.141592653589793 rad @@ -1609,7 +1614,7 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 18 + - uid: 23 components: - type: Transform rot: 3.141592653589793 rad @@ -1617,7 +1622,7 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 23 + - uid: 91 components: - type: Transform rot: 3.141592653589793 rad @@ -1641,22 +1646,6 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 168 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -3.5,-2.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - - uid: 169 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -2.5,-2.5 - parent: 2 - - type: AtmosPipeColor - color: '#990000FF' - uid: 170 components: - type: Transform @@ -1850,7 +1839,7 @@ entities: parent: 2 - type: AtmosPipeColor color: '#990000FF' - - uid: 352 + - uid: 353 components: - type: Transform rot: 3.141592653589793 rad @@ -1866,12 +1855,8 @@ entities: rot: 3.141592653589793 rad pos: -3.5,-3.5 parent: 2 - - uid: 45 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: 3.5,-3.5 - parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' - uid: 53 components: - type: Transform @@ -1884,29 +1869,22 @@ entities: rot: -1.5707963267948966 rad pos: 5.5,-2.5 parent: 2 -- proto: GasPressurePumpOn - entities: - - uid: 103 + - uid: 168 components: - type: Transform rot: 3.141592653589793 rad - pos: -3.5,-2.5 + pos: -2.5,-3.5 parent: 2 - type: AtmosPipeColor color: '#0055CCFF' -- proto: GasVentPump - entities: - - uid: 86 + - uid: 278 components: - type: Transform rot: 1.5707963267948966 rad - pos: -4.5,-1.5 + pos: 3.5,-2.5 parent: 2 - - type: DeviceNetwork - deviceLists: - - 357 - - type: AtmosPipeColor - color: '#0055CCFF' +- proto: GasVentPump + entities: - uid: 191 components: - type: Transform @@ -1915,7 +1893,7 @@ entities: parent: 2 - type: DeviceNetwork deviceLists: - - 91 + - 172 - type: AtmosPipeColor color: '#0055CCFF' - uid: 192 @@ -1926,7 +1904,7 @@ entities: parent: 2 - type: DeviceNetwork deviceLists: - - 297 + - 311 - type: AtmosPipeColor color: '#0055CCFF' - uid: 193 @@ -1937,27 +1915,38 @@ entities: parent: 2 - type: AtmosPipeColor color: '#0055CCFF' - - uid: 258 + - uid: 265 components: - type: Transform pos: -0.5,0.5 parent: 2 - type: DeviceNetwork deviceLists: - - 353 + - 354 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 375 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -4.5,-2.5 + parent: 2 + - type: DeviceNetwork + deviceLists: + - 358 - type: AtmosPipeColor color: '#0055CCFF' - proto: GasVentScrubber entities: - - uid: 84 + - uid: 54 components: - type: Transform rot: 1.5707963267948966 rad - pos: -4.5,-2.5 + pos: -2.5,-2.5 parent: 2 - type: DeviceNetwork deviceLists: - - 357 + - 358 - type: AtmosPipeColor color: '#990000FF' - uid: 194 @@ -1975,7 +1964,7 @@ entities: parent: 2 - type: DeviceNetwork deviceLists: - - 297 + - 311 - type: AtmosPipeColor color: '#990000FF' - uid: 201 @@ -1985,10 +1974,10 @@ entities: parent: 2 - type: DeviceNetwork deviceLists: - - 91 + - 172 - type: AtmosPipeColor color: '#990000FF' - - uid: 257 + - uid: 258 components: - type: Transform rot: -1.5707963267948966 rad @@ -1996,7 +1985,7 @@ entities: parent: 2 - type: DeviceNetwork deviceLists: - - 353 + - 354 - type: AtmosPipeColor color: '#990000FF' - proto: GasVolumePumpOn @@ -2085,8 +2074,6 @@ entities: - type: Transform pos: -2.5,-1.5 parent: 2 - - type: Thruster - originalPowerLoad: 1500 - proto: LockerChiefEngineerFilled entities: - uid: 72 @@ -2094,6 +2081,14 @@ entities: - type: Transform pos: 3.5,-0.5 parent: 2 +- proto: LockerWallMaterialsFuelPlasmaFilled + entities: + - uid: 370 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -5.5,-1.5 + parent: 2 - proto: MachineFlatpacker entities: - uid: 246 @@ -2113,27 +2108,35 @@ entities: - uid: 422 components: - type: Transform - pos: 6.99888,0.73981714 + pos: 6.7915096,0.78813875 parent: 2 - uid: 425 components: - type: Transform - pos: 7.1655464,0.5834584 + pos: 6.937343,0.55881315 parent: 2 - proto: MicroManipulatorStockPart entities: - uid: 331 components: - type: Transform - pos: 7.6967964,0.57303476 + pos: 7.551926,0.62135637 parent: 2 - uid: 332 components: - type: Transform - pos: 7.6655464,0.73981714 + pos: 7.374843,0.8089867 parent: 2 - proto: NitrogenCanister entities: + - uid: 93 + components: + - type: Transform + anchored: True + pos: -2.5,-3.5 + parent: 2 + - type: Physics + bodyType: Static - uid: 342 components: - type: Transform @@ -2141,6 +2144,14 @@ entities: parent: 2 - proto: OxygenCanister entities: + - uid: 1 + components: + - type: Transform + anchored: True + pos: -3.5,-3.5 + parent: 2 + - type: Physics + bodyType: Static - uid: 267 components: - type: Transform @@ -2169,9 +2180,6 @@ entities: parent: 2 - type: FuelGenerator targetPower: 16000 - on: False - - type: Physics - bodyType: Static - proto: PosterContrabandHackingGuide entities: - uid: 417 @@ -2181,7 +2189,7 @@ entities: parent: 2 - proto: PosterContrabandTools entities: - - uid: 215 + - uid: 222 components: - type: Transform pos: -2.5,-0.5 @@ -2314,13 +2322,6 @@ entities: - type: Transform pos: -6.5,-1.5 parent: 2 -- proto: SheetPlasma - entities: - - uid: 275 - components: - - type: Transform - pos: -4.0456185,-2.5 - parent: 2 - proto: ShipyardHammerInfo entities: - uid: 316 @@ -2336,52 +2337,34 @@ entities: rot: 1.5707963267948966 rad pos: 2.5,4.5 parent: 2 - - type: DeviceLinkSink - links: - - 419 - uid: 320 components: - type: Transform pos: 6.5,6.5 parent: 2 - - type: DeviceLinkSink - links: - - 419 - uid: 323 components: - type: Transform pos: 4.5,6.5 parent: 2 - - type: DeviceLinkSink - links: - - 419 - uid: 324 components: - type: Transform rot: -1.5707963267948966 rad pos: 8.5,5.5 parent: 2 - - type: DeviceLinkSink - links: - - 419 - uid: 325 components: - type: Transform rot: -1.5707963267948966 rad pos: 8.5,4.5 parent: 2 - - type: DeviceLinkSink - links: - - 419 - uid: 326 components: - type: Transform rot: -1.5707963267948966 rad pos: 8.5,3.5 parent: 2 - - type: DeviceLinkSink - links: - - 419 - proto: ShuttersWindowOpen entities: - uid: 321 @@ -2390,17 +2373,11 @@ entities: rot: 1.5707963267948966 rad pos: 2.5,3.5 parent: 2 - - type: DeviceLinkSink - links: - - 419 - uid: 322 components: - type: Transform pos: 5.5,6.5 parent: 2 - - type: DeviceLinkSink - links: - - 419 - proto: ShuttleSecretDoor entities: - uid: 49 @@ -2473,26 +2450,26 @@ entities: parent: 2 - proto: SignalButtonDirectional entities: - - uid: 265 + - uid: 297 components: - type: Transform pos: -4.5,5.5 parent: 2 - type: DeviceLinkSource linkedPorts: + 364: + - Pressed: Toggle 363: - Pressed: Toggle 362: - Pressed: Toggle + 360: + - Pressed: Toggle 361: - Pressed: Toggle 359: - Pressed: Toggle - 360: - - Pressed: Toggle - 358: - - Pressed: Toggle - - uid: 354 + - uid: 355 components: - type: Transform rot: -1.5707963267948966 rad @@ -2500,13 +2477,13 @@ entities: parent: 2 - type: DeviceLinkSource linkedPorts: - 312: + 348: - Pressed: Toggle - 349: + 351: - Pressed: Toggle - 348: + 349: - Pressed: Toggle - - uid: 355 + - uid: 357 components: - type: Transform rot: 1.5707963267948966 rad @@ -2514,11 +2491,11 @@ entities: parent: 2 - type: DeviceLinkSource linkedPorts: - 348: - - Pressed: Toggle 349: - Pressed: Toggle - 312: + 351: + - Pressed: Toggle + 348: - Pressed: Toggle - uid: 419 components: @@ -2578,19 +2555,19 @@ entities: - type: Transform pos: 2.5,-5.5 parent: 2 - - uid: 370 + - uid: 371 components: - type: Transform pos: -5.5,6.5 parent: 2 - - uid: 371 + - uid: 372 components: - type: Transform pos: 3.5,6.5 parent: 2 - proto: SignSpace entities: - - uid: 240 + - uid: 247 components: - type: Transform pos: 2.5,5.5 @@ -2604,10 +2581,10 @@ entities: parent: 2 - proto: StorageCanister entities: - - uid: 80 + - uid: 373 components: - type: Transform - pos: 3.5,-3.5 + pos: 3.5,-2.5 parent: 2 - proto: SubstationBasic entities: @@ -2672,53 +2649,41 @@ entities: - type: Transform pos: -6.5,7.5 parent: 2 - - type: Thruster - originalPowerLoad: 1500 - uid: 28 components: - type: Transform rot: 3.141592653589793 rad pos: -6.5,-3.5 parent: 2 - - type: Thruster - originalPowerLoad: 1500 - uid: 76 components: - type: Transform rot: 3.141592653589793 rad pos: 7.5,-3.5 parent: 2 - - type: Thruster - originalPowerLoad: 1500 - uid: 77 components: - type: Transform pos: 7.5,7.5 parent: 2 - - type: Thruster - originalPowerLoad: 1500 - uid: 78 components: - type: Transform rot: -1.5707963267948966 rad pos: -5.5,7.5 parent: 2 - - type: Thruster - originalPowerLoad: 1500 - uid: 79 components: - type: Transform rot: 1.5707963267948966 rad pos: 6.5,7.5 parent: 2 - - type: Thruster - originalPowerLoad: 1500 - proto: VendingMachineTankDispenserEVA entities: - - uid: 39 + - uid: 169 components: - type: Transform - pos: -1.5,-4.5 + pos: 2.5,-4.5 parent: 2 - proto: WallShuttle entities: @@ -2932,11 +2897,6 @@ entities: - type: Transform pos: 2.5,-3.5 parent: 2 - - uid: 93 - components: - - type: Transform - pos: 2.5,-4.5 - parent: 2 - uid: 94 components: - type: Transform @@ -2982,6 +2942,11 @@ entities: - type: Transform pos: -4.5,5.5 parent: 2 + - uid: 243 + components: + - type: Transform + pos: -1.5,-4.5 + parent: 2 - proto: WallShuttleDiagonal entities: - uid: 20 @@ -3007,11 +2972,6 @@ entities: - type: Transform pos: 2.5,6.5 parent: 2 - - uid: 41 - components: - - type: Transform - pos: -2.5,-3.5 - parent: 2 - uid: 46 components: - type: Transform @@ -3041,15 +3001,28 @@ entities: rot: 3.141592653589793 rad pos: 8.5,-2.5 parent: 2 + - uid: 80 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,-3.5 + parent: 2 - uid: 82 components: - type: Transform rot: 1.5707963267948966 rad pos: -5.5,-4.5 parent: 2 -- proto: WarningAir +- proto: WarningN2 entities: - - uid: 278 + - uid: 103 + components: + - type: Transform + pos: -2.5,-4.5 + parent: 2 +- proto: WarningO2 + entities: + - uid: 273 components: - type: Transform pos: -3.5,-4.5 diff --git a/Resources/Prototypes/_NF/Shipyard/hammer.yml b/Resources/Prototypes/_NF/Shipyard/hammer.yml index 0e15d9c4d7c..78e17e5cc20 100644 --- a/Resources/Prototypes/_NF/Shipyard/hammer.yml +++ b/Resources/Prototypes/_NF/Shipyard/hammer.yml @@ -12,7 +12,7 @@ id: Hammer name: SBB Hammer description: A mobile engineering platform for deep-space repairs, upgrades and remodelling. - price: 40000 + price: 38000 # Appraises at 32,847, ~15% markup category: Medium group: Shipyard shuttlePath: /Maps/_NF/Shuttles/hammer.yml