From a35c3a8666ea6f6f23d59f164a73095130e86d87 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Sun, 21 Jan 2024 20:52:29 +0200 Subject: [PATCH 1/4] McDelivery Shuttle with McCargo shipyard (#843) * McDelivery * McCargo * Update mcdelivery.yml * McCargo McFast Meals * Update mcdelivery.yml * Update mcdelivery.yml * Update mcdelivery.yml * Update mcdelivery.yml * Update mcdelivery.yml * McCargo * Compters * McCargo Notice Boards * Update mccargo.yml * Update mcdelivery.yml * Missing wires * McUpdate * Update mccargo.yml * Update mccargo.yml * The fries --- Resources/Maps/_NF/Shuttles/mccargo.yml | 2331 ++++++++++------- Resources/Maps/_NF/Shuttles/mcdelivery.yml | 963 +++++++ .../VendingMachines/Inventories/happyhonk.yml | 4 +- .../_NF/Entities/Clothing/Head/hats.yml | 14 + .../Consumable/Food/Containers/box.yml | 19 + .../Computers/mothership-computers.yml | 10 + Resources/Prototypes/_NF/Shipyard/mccargo.yml | 8 +- .../Prototypes/_NF/Shipyard/mcdelivery.yml | 33 + .../mccargocrown.rsi/equipped-HELMET.png | Bin 0 -> 494 bytes .../Head/Hoods/mccargocrown.rsi/icon.png | Bin 0 -> 504 bytes .../Hoods/mccargocrown.rsi/inhand-left.png | Bin 0 -> 444 bytes .../Hoods/mccargocrown.rsi/inhand-right.png | Bin 0 -> 446 bytes .../Head/Hoods/mccargocrown.rsi/meta.json | 26 + .../Happyhonk/cargo.rsi/box-inhand-left.png | Bin 0 -> 536 bytes .../Happyhonk/cargo.rsi/box-inhand-right.png | Bin 0 -> 541 bytes .../Storage/Happyhonk/cargo.rsi/box-open.png | Bin 0 -> 3125 bytes .../Storage/Happyhonk/cargo.rsi/box.png | Bin 0 -> 3207 bytes .../Storage/Happyhonk/cargo.rsi/meta.json | 25 + 18 files changed, 2446 insertions(+), 987 deletions(-) create mode 100644 Resources/Maps/_NF/Shuttles/mcdelivery.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/box.yml create mode 100644 Resources/Prototypes/_NF/Shipyard/mcdelivery.yml create mode 100644 Resources/Textures/_NF/Clothing/Head/Hoods/mccargocrown.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hoods/mccargocrown.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hoods/mccargocrown.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hoods/mccargocrown.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hoods/mccargocrown.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Storage/Happyhonk/cargo.rsi/box-inhand-left.png create mode 100644 Resources/Textures/_NF/Objects/Storage/Happyhonk/cargo.rsi/box-inhand-right.png create mode 100644 Resources/Textures/_NF/Objects/Storage/Happyhonk/cargo.rsi/box-open.png create mode 100644 Resources/Textures/_NF/Objects/Storage/Happyhonk/cargo.rsi/box.png create mode 100644 Resources/Textures/_NF/Objects/Storage/Happyhonk/cargo.rsi/meta.json diff --git a/Resources/Maps/_NF/Shuttles/mccargo.yml b/Resources/Maps/_NF/Shuttles/mccargo.yml index 66f0f231d06..546ecb74b40 100644 --- a/Resources/Maps/_NF/Shuttles/mccargo.yml +++ b/Resources/Maps/_NF/Shuttles/mccargo.yml @@ -28,7 +28,7 @@ entities: version: 6 -1,0: ind: -1,0 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAagAAAAAAagAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAOwAAAAAAOwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAOwAAAAAAOwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAOwAAAAAAOwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAOwAAAAAAOwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAOwAAAAAAOwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAOwAAAAAAOwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAagAAAAAAagAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAOwAAAAAAOwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAOwAAAAAAOwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAOwAAAAAAOwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAOwAAAAAAOwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAOwAAAAAAOwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAOwAAAAAAOwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAYQAAAAAA version: 6 -1,-1: ind: -1,-1 @@ -40,7 +40,7 @@ entities: version: 6 -1,1: ind: -1,1 - tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA version: 6 0,1: ind: 0,1 @@ -70,558 +70,566 @@ entities: color: '#FFFFFFFF' id: Box decals: - 337: -9,14 - 338: -9,13 - 339: -9,12 - 340: -8,12 - 341: -8,13 - 342: -8,14 - 343: -7,14 - 344: -7,13 - 345: -7,12 + 309: -9,14 + 310: -9,13 + 311: -9,12 + 312: -8,12 + 313: -8,13 + 314: -8,14 + 315: -7,14 + 316: -7,13 + 317: -7,12 - node: color: '#A4610696' id: CheckerNWSE decals: - 289: 6,9 - 290: 7,9 - 291: 9,9 - 292: 6,8 - 293: 7,8 - 294: 6,7 - 295: 7,7 - 296: 9,7 - 297: 6,6 - 298: 7,6 - 299: 6,5 - 300: 7,5 - 301: 9,5 - 302: 8,5 - 303: 7,4 - 304: 8,7 - 305: 8,9 + 266: 6,9 + 267: 7,9 + 268: 9,9 + 269: 6,8 + 270: 7,8 + 271: 6,7 + 272: 7,7 + 273: 9,7 + 274: 6,6 + 275: 7,6 + 276: 6,5 + 277: 7,5 + 278: 9,5 + 279: 8,5 + 280: 7,4 + 281: 8,7 + 282: 8,9 - node: cleanable: True color: '#FFFFFFFF' id: DirtHeavy decals: - 205: -4,3 - 206: -6,3 - 208: -8,3 - 212: -8,8 - 216: -6,8 - 219: -5,10 - 222: -5,12 - 225: -2,12 - 226: 0,12 - 236: -5,15 - 286: 7,14 - 287: 6,11 - 288: -1,10 - 330: -5,3 - 331: -7,3 + 190: -4,3 + 191: -6,3 + 193: -8,3 + 196: -8,8 + 200: -6,8 + 203: -5,10 + 206: -5,12 + 209: -2,12 + 210: 0,12 + 263: 7,14 + 264: 6,11 + 265: -1,10 + 305: -5,3 + 306: -7,3 + 351: -1,11 - node: cleanable: True color: '#FFFFFFFF' id: DirtHeavyMonotile decals: - 4: 7,13 - 5: 7,12 - 215: -7,8 - 221: -3,10 - 224: -3,12 - 229: 0,14 - 232: -3,14 - 239: 0,15 - 240: 0,13 - 282: 6,12 - 327: -5,4 - 329: -8,5 + 3: 7,13 + 4: 7,12 + 199: -7,8 + 205: -3,10 + 208: -3,12 + 212: 0,14 + 214: -3,14 + 218: 0,15 + 219: 0,13 + 259: 6,12 + 302: -5,4 + 304: -8,5 + 348: -4,6 + 349: -5,6 + 350: -4,5 + 353: -1,14 - node: cleanable: True color: '#FFFFFFFF' id: DirtLight decals: 0: -8,3 - 1: -1,12 - 207: -4,4 - 209: -4,5 - 210: -8,6 - 213: -8,9 - 228: 0,13 - 231: -2,14 - 233: -4,14 - 237: -1,15 - 332: -6,3 - 333: -5,4 + 192: -4,4 + 194: -8,6 + 197: -8,9 + 211: 0,13 + 213: -2,14 + 215: -4,14 + 216: -1,15 + 307: -6,3 + 308: -5,4 + 347: -5,5 - node: cleanable: True color: '#FFFFFFFF' id: DirtMedium decals: - 2: 7,12 - 3: 9,11 - 211: -8,7 - 214: -7,9 - 217: -6,9 - 218: -5,9 - 220: -4,10 - 223: -4,12 - 227: -1,13 - 230: -1,14 - 234: -5,14 - 235: -4,15 - 238: -2,15 - 283: 6,14 - 284: 6,13 - 285: 7,11 - 328: -8,4 - 334: -5,5 + 1: 7,12 + 2: 9,11 + 195: -8,7 + 198: -7,9 + 201: -6,9 + 202: -5,9 + 204: -4,10 + 207: -4,12 + 217: -2,15 + 260: 6,14 + 261: 6,13 + 262: 7,11 + 303: -8,4 + 352: -1,12 - node: color: '#A46106FF' id: MiniTileWhiteCornerNe decals: - 252: 4,8 - 264: 4,12 + 231: 4,8 + 243: 4,12 - node: color: '#A46106FF' id: MiniTileWhiteCornerNw decals: - 253: -2,8 - 265: 2,12 + 232: -2,8 + 244: 2,12 - node: color: '#A46106FF' id: MiniTileWhiteCornerSe decals: - 255: 4,3 - 266: 4,10 + 234: 4,3 + 245: 4,10 - node: color: '#A46106FF' id: MiniTileWhiteCornerSw decals: - 254: -2,3 - 267: 2,10 + 233: -2,3 + 246: 2,10 - node: color: '#A46106FF' id: MiniTileWhiteInnerNe decals: - 193: 4,-4 - 194: 0,-3 - 195: -4,-3 - 196: -8,-4 + 178: 4,-4 + 179: 0,-3 + 180: -4,-3 + 181: -8,-4 - node: color: '#A46106FF' id: MiniTileWhiteInnerNw decals: - 197: -4,-4 - 198: 0,-3 - 199: 4,-3 - 200: 8,-4 + 182: -4,-4 + 183: 0,-3 + 184: 4,-3 + 185: 8,-4 - node: color: '#A46106FF' id: MiniTileWhiteInnerSe decals: - 201: 4,-1 - 202: 0,0 - 203: -4,0 - 204: -8,-1 + 186: 4,-1 + 187: 0,0 + 188: -4,0 + 189: -8,-1 - node: color: '#A46106FF' id: MiniTileWhiteInnerSw decals: - 189: -4,-1 - 190: 0,0 - 191: 4,0 - 192: 8,-1 + 174: -4,-1 + 175: 0,0 + 176: 4,0 + 177: 8,-1 - node: color: '#A46106FF' id: MiniTileWhiteLineE decals: - 161: 4,-3 - 162: 4,-2 - 163: 0,-1 - 164: 0,-2 - 165: -4,-1 - 166: -4,-2 - 167: -8,-2 - 168: -8,-3 - 256: 4,4 - 257: 4,5 - 258: 4,6 - 259: 4,7 - 271: 4,11 + 146: 4,-3 + 147: 4,-2 + 148: 0,-1 + 149: 0,-2 + 150: -4,-1 + 151: -4,-2 + 152: -8,-2 + 153: -8,-3 + 235: 4,4 + 236: 4,5 + 237: 4,6 + 238: 4,7 + 250: 4,11 - node: color: '#A46106FF' id: MiniTileWhiteLineN decals: - 149: -5,-4 - 150: -6,-4 - 151: -7,-4 - 152: -3,-3 - 153: -2,-3 - 154: -1,-3 - 155: 1,-3 - 156: 2,-3 - 157: 3,-3 - 158: 5,-4 - 159: 6,-4 - 160: 7,-4 - 242: -1,8 - 243: 0,8 - 244: 1,8 - 245: 2,8 - 246: 3,8 - 270: 3,12 + 134: -5,-4 + 135: -6,-4 + 136: -7,-4 + 137: -3,-3 + 138: -2,-3 + 139: -1,-3 + 140: 1,-3 + 141: 2,-3 + 142: 3,-3 + 143: 5,-4 + 144: 6,-4 + 145: 7,-4 + 221: -1,8 + 222: 0,8 + 223: 1,8 + 224: 2,8 + 225: 3,8 + 249: 3,12 - node: color: '#A46106FF' id: MiniTileWhiteLineS decals: - 169: -7,-1 - 170: -6,-1 - 171: -5,-1 - 172: -3,0 - 173: -2,0 - 174: -1,0 - 175: 1,0 - 176: 2,0 - 177: 3,0 - 178: 5,-1 - 179: 6,-1 - 180: 7,-1 - 247: -1,3 - 248: 0,3 - 249: 1,3 - 250: 2,3 - 251: 3,3 - 269: 3,10 + 154: -7,-1 + 155: -6,-1 + 156: -5,-1 + 157: -3,0 + 158: -2,0 + 159: -1,0 + 160: 1,0 + 161: 2,0 + 162: 3,0 + 163: 5,-1 + 164: 6,-1 + 165: 7,-1 + 226: -1,3 + 227: 0,3 + 228: 1,3 + 229: 2,3 + 230: 3,3 + 248: 3,10 - node: color: '#A46106FF' id: MiniTileWhiteLineW decals: - 181: 8,-2 - 182: 8,-3 - 183: 4,-1 - 184: 4,-2 - 185: 0,-1 - 186: 0,-2 - 187: -4,-2 - 188: -4,-3 - 260: -2,4 - 261: -2,5 - 262: -2,6 - 263: -2,7 - 268: 2,11 + 166: 8,-2 + 167: 8,-3 + 168: 4,-1 + 169: 4,-2 + 170: 0,-1 + 171: 0,-2 + 172: -4,-2 + 173: -4,-3 + 239: -2,4 + 240: -2,5 + 241: -2,6 + 242: -2,7 + 247: 2,11 + - node: + color: '#FFFFFFFF' + id: StandClear + decals: + 332: -3,15 - node: color: '#D381C996' id: WarnCornerGreyscaleNE decals: - 277: 7,14 + 254: 7,14 - node: color: '#D381C996' id: WarnCornerGreyscaleNW decals: - 276: 6,14 + 253: 6,14 - node: color: '#D381C996' id: WarnCornerGreyscaleSE decals: - 274: 7,11 + 251: 7,11 - node: color: '#D381C996' id: WarnCornerGreyscaleSW decals: - 275: 6,11 + 252: 6,11 - node: color: '#A4610696' id: WarnCornerNE decals: - 116: -4,5 - 144: 0,15 + 130: 0,15 + 343: -4,6 - node: color: '#A4610696' id: WarnCornerNW decals: - 109: -8,9 - 143: -5,15 + 104: -8,9 + 328: -5,14 + 331: -4,15 - node: color: '#A4610696' id: WarnCornerSE decals: - 98: -4,3 - 99: -1,10 - 100: 0,12 + 94: -4,3 + 95: -1,10 + 96: 0,12 - node: color: '#9FED5896' id: WarnCornerSW decals: - 142: -8,3 + 129: -8,3 - node: color: '#9FED5896' id: WarnCornerSmallNE decals: - 324: -8,4 + 300: -8,4 - node: color: '#A4610696' id: WarnCornerSmallNE decals: - 126: -5,10 - 127: -5,12 - 326: -5,5 + 118: -5,10 + 119: -5,12 + 344: -5,6 - node: color: '#9FED5896' id: WarnCornerSmallNW decals: - 325: -5,4 + 301: -5,4 - node: color: '#A4610696' id: WarnCornerSmallNW decals: - 128: -1,10 - 129: -1,12 - 138: -5,9 + 120: -1,10 + 125: -5,9 + 330: -4,14 + 335: 0,12 - node: color: '#A4610696' id: WarnCornerSmallSE decals: - 130: -8,8 - 131: -5,12 - 132: -5,14 - 136: -1,12 - 137: -5,10 + 121: -8,8 + 122: -5,12 + 124: -5,10 + 329: -5,14 + 334: -1,12 - node: color: '#A4610696' id: WarnCornerSmallSW decals: - 133: -1,14 - 134: -1,12 - 135: -5,8 + 123: -5,8 + 333: -1,12 + 336: 0,14 - node: color: '#B02E26FF' id: WarnFullGreyscale decals: - 241: 4,12 + 220: 4,12 - node: color: '#9FED5896' id: WarnLineE decals: - 321: -8,5 + 297: -8,5 - node: color: '#A4610696' id: WarnLineE decals: - 72: -6,-8 - 73: 8,-8 - 89: -5,9 - 90: -5,8 - 91: -5,7 - 92: -5,6 - 93: -4,4 - 94: -5,11 - 95: -5,13 - 96: 0,13 - 97: 0,14 - 110: -8,6 - 111: -8,7 - 123: -1,11 + 69: -6,-8 + 70: 8,-8 + 86: -5,9 + 87: -5,8 + 88: -5,7 + 89: -4,4 + 90: -5,11 + 91: -5,13 + 92: 0,13 + 93: 0,14 + 105: -8,6 + 106: -8,7 + 116: -1,11 + 342: -4,5 - node: color: '#FFFFFFFF' id: WarnLineE decals: - 23: 11,-1 - 24: 11,-2 - 25: 11,-3 - 26: -11,-1 - 27: -11,-2 - 34: -13,-1 - 35: -13,-2 - 36: -13,-3 - 37: 13,-1 - 38: 13,-2 - 39: 13,-3 - 65: -3,3 - 66: 5,3 - 67: 8,3 - 68: 5,14 - 69: 1,14 - 309: 8,5 - 310: 8,7 - 311: 8,9 - 315: -11,-3 + 22: 11,-1 + 23: 11,-2 + 24: 11,-3 + 25: -11,-1 + 26: -11,-2 + 33: -13,-1 + 34: -13,-2 + 35: -13,-3 + 36: 13,-1 + 37: 13,-2 + 38: 13,-3 + 63: 5,3 + 64: 8,3 + 65: 5,14 + 66: 1,14 + 286: 8,5 + 287: 8,7 + 288: 8,9 + 292: -11,-3 + 341: -3,4 - node: color: '#D381C996' id: WarnLineGreyscaleE decals: - 278: 7,13 - 279: 7,12 + 255: 7,13 + 256: 7,12 - node: color: '#D381C996' id: WarnLineGreyscaleW decals: - 280: 6,12 - 281: 6,13 + 257: 6,12 + 258: 6,13 - node: color: '#9FED5896' id: WarnLineN decals: - 141: -6,3 - 317: -7,3 - 319: -5,3 + 128: -6,3 + 294: -7,3 + 296: -5,3 - node: color: '#A4610696' id: WarnLineN decals: - 78: 12,-3 - 79: -12,-3 - 80: -4,14 - 81: -3,14 - 82: -2,14 - 83: -4,12 - 84: -3,12 - 85: -2,12 - 86: -4,10 - 87: -3,10 - 88: -2,10 - 112: -7,8 - 113: -6,8 + 75: 12,-3 + 76: -12,-3 + 77: -4,14 + 78: -3,14 + 79: -2,14 + 80: -4,12 + 81: -3,12 + 82: -2,12 + 83: -4,10 + 84: -3,10 + 85: -2,10 + 107: -7,8 + 108: -6,8 + 338: -1,14 - node: color: '#FFFFFFFF' id: WarnLineN decals: - 17: -8,-7 - 18: -7,-7 - 19: -6,-7 - 20: 6,-7 - 21: 7,-7 - 22: 8,-7 - 40: -4,2 - 41: 6,10 - 47: 6,15 - 52: 3,9 - 59: -8,-9 - 60: -7,-9 - 61: -6,-9 - 62: 6,-9 - 63: 7,-9 - 64: 8,-9 - 70: -1,9 - 313: 7,4 + 16: -8,-7 + 17: -7,-7 + 18: -6,-7 + 19: 6,-7 + 20: 7,-7 + 21: 8,-7 + 39: -4,2 + 40: 6,10 + 45: 6,15 + 50: 3,9 + 57: -8,-9 + 58: -7,-9 + 59: -6,-9 + 60: 6,-9 + 61: 7,-9 + 62: 8,-9 + 67: -1,9 + 290: 7,4 + 327: -3,16 - node: color: '#9FED5896' id: WarnLineS decals: - 320: -5,5 - 322: -8,5 - 323: -8,4 + 298: -8,5 + 299: -8,4 + 346: -5,5 - node: color: '#A4610696' id: WarnLineS decals: - 76: -8,-8 - 77: 6,-8 - 101: -8,6 - 102: -8,7 - 103: -8,8 - 104: -5,10 - 105: -5,11 - 106: -5,12 - 107: -5,13 - 108: -5,14 - 114: -5,7 - 115: -5,6 - 124: -1,11 - 125: -1,13 + 73: -8,-8 + 74: 6,-8 + 97: -8,6 + 98: -8,7 + 99: -8,8 + 100: -5,10 + 101: -5,11 + 102: -5,12 + 103: -5,13 + 109: -5,7 + 117: -1,11 + 337: 0,13 + 345: -5,6 - node: color: '#FFFFFFFF' id: WarnLineS decals: - 6: -11,-1 - 7: -11,-2 - 8: 11,-1 - 9: 11,-2 - 10: 11,-3 - 28: 13,-3 - 29: 13,-2 - 30: 13,-1 - 31: -13,-3 - 32: -13,-2 - 33: -13,-1 - 42: -3,3 - 43: 5,3 - 44: 8,3 - 45: 1,14 - 46: 5,14 - 306: 8,9 - 307: 8,7 - 308: 8,5 - 314: -11,-3 + 5: -11,-1 + 6: -11,-2 + 7: 11,-1 + 8: 11,-2 + 9: 11,-3 + 27: 13,-3 + 28: 13,-2 + 29: 13,-1 + 30: -13,-3 + 31: -13,-2 + 32: -13,-1 + 41: 5,3 + 42: 8,3 + 43: 1,14 + 44: 5,14 + 283: 8,9 + 284: 8,7 + 285: 8,5 + 291: -11,-3 + 340: -3,4 - node: color: '#9FED5896' id: WarnLineW decals: - 316: -6,4 - 318: -7,4 + 293: -6,4 + 295: -7,4 - node: color: '#A4610696' id: WarnLineW decals: - 74: -12,-1 - 75: 12,-1 - 117: -4,12 - 118: -3,12 - 119: -2,12 - 120: -2,10 - 121: -3,10 - 122: -4,10 - 139: -7,9 - 140: -6,9 - 145: -4,15 - 146: -3,15 - 147: -2,15 - 148: -1,15 + 71: -12,-1 + 72: 12,-1 + 110: -4,12 + 111: -3,12 + 112: -2,12 + 113: -2,10 + 114: -3,10 + 115: -4,10 + 126: -7,9 + 127: -6,9 + 131: -3,15 + 132: -2,15 + 133: -1,15 + 339: -1,12 - node: color: '#FFFFFFFF' id: WarnLineW decals: - 11: 6,-7 - 12: 7,-7 - 13: 8,-7 - 14: -8,-7 - 15: -7,-7 - 16: -6,-7 - 48: 6,15 - 49: -4,2 - 50: 6,10 - 51: 3,9 - 53: 8,-9 - 54: 7,-9 - 55: 6,-9 - 56: -8,-9 - 57: -7,-9 - 58: -6,-9 - 71: -1,9 - 312: 7,4 + 10: 6,-7 + 11: 7,-7 + 12: 8,-7 + 13: -8,-7 + 14: -7,-7 + 15: -6,-7 + 46: 6,15 + 47: -4,2 + 48: 6,10 + 49: 3,9 + 51: 8,-9 + 52: 7,-9 + 53: 6,-9 + 54: -8,-9 + 55: -7,-9 + 56: -6,-9 + 68: -1,9 + 289: 7,4 + 326: -3,16 - node: angle: -1.5707963267948966 rad color: '#A4610696' id: food decals: - 352: -12,-1 - 353: -12,-3 + 324: -12,-1 + 325: -12,-3 - node: color: '#A4610696' id: food decals: - 346: 6,-8 - 347: 8,-8 - 350: -8,-8 - 351: -6,-8 + 318: 6,-8 + 319: 8,-8 + 322: -8,-8 + 323: -6,-8 - node: angle: 1.5707963267948966 rad color: '#A4610696' id: food decals: - 348: 12,-1 - 349: 12,-3 + 320: 12,-1 + 321: 12,-3 type: DecalGrid - version: 2 data: @@ -633,26 +641,32 @@ entities: 0,1: 0: 65535 0,2: - 0: 65535 + 0: 13311 + 1: 52224 0,3: - 0: 65535 + 0: 65523 + 1: 12 1,0: 0: 65535 1,1: 0: 65535 1,2: - 0: 65535 + 0: 61183 + 1: 4352 1,3: - 0: 65535 + 1: 1 + 0: 65534 2,0: - 0: 30719 + 0: 30591 + 2: 128 2,1: 0: 30583 2,2: - 0: 30583 + 0: 14199 + 2: 16384 2,3: - 1: 17 - 0: 30566 + 0: 13107 + 2: 17476 -2,0: 0: 65535 -2,1: @@ -678,38 +692,45 @@ entities: 2,-1: 0: 65535 -3,0: - 0: 52463 + 0: 52431 + 2: 32 -3,1: 0: 52428 -3,2: - 0: 50380 - 1: 2048 - -3,3: 0: 52428 + -3,3: + 0: 36044 + 2: 16384 -3,-2: - 0: 60616 + 2: 8256 + 0: 52360 -3,-1: 0: 65535 -2,-2: 0: 65535 -1,-2: - 0: 65296 + 2: 16 + 0: 65280 0,-2: 0: 65280 1,-2: - 0: 65534 + 2: 16 + 0: 65518 2,-2: - 0: 63347 + 0: 30515 + 2: 32832 -2,4: - 0: 12 + 0: 4 + 2: 8 -1,4: 0: 15 0,4: - 0: 15 + 0: 1 + 2: 14 1,4: - 0: 15 + 2: 15 2,4: - 0: 7 + 2: 7 3,0: 0: 3 -4,0: @@ -743,10 +764,25 @@ entities: - 0 - 0 - volume: 2500 - temperature: 293.14996 + temperature: 235 + moles: + - 21.824879 + - 82.10312 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - volume: 2500 + temperature: 293.15 moles: - - 20.078888 - - 75.53487 + - 0 + - 0 - 0 - 0 - 0 @@ -773,18 +809,13 @@ entities: type: Physics - proto: AirlockCargo entities: - - uid: 8 - components: - - pos: -2.5,3.5 - parent: 1 - type: Transform - uid: 27 components: - pos: 1.5,14.5 parent: 1 type: Transform - links: - - 691 + - 805 type: DeviceLinkSink - uid: 193 components: @@ -793,7 +824,7 @@ entities: parent: 1 type: Transform - links: - - 675 + - 173 type: DeviceLinkSink - uid: 300 components: @@ -802,13 +833,19 @@ entities: parent: 1 type: Transform - links: - - 675 + - 859 type: DeviceLinkSink - uid: 301 components: - pos: -0.5,9.5 parent: 1 type: Transform + - uid: 843 + components: + - rot: -1.5707963267948966 rad + pos: -2.5,4.5 + parent: 1 + type: Transform - proto: AirlockExternalGlass entities: - uid: 838 @@ -999,6 +1036,12 @@ entities: - pos: 7.5,-8.5 parent: 1 type: Transform + - uid: 819 + components: + - rot: 3.141592653589793 rad + pos: -2.5,16.5 + parent: 1 + type: Transform - uid: 923 components: - pos: 8.5,-8.5 @@ -1138,15 +1181,15 @@ entities: type: Transform - proto: APCBasic entities: - - uid: 392 + - uid: 123 components: - - rot: -1.5707963267948966 rad - pos: -2.5,6.5 + - pos: 0.5,9.5 parent: 1 type: Transform - - uid: 405 + - uid: 186 components: - - pos: 1.5,9.5 + - rot: 3.141592653589793 rad + pos: -2.5,9.5 parent: 1 type: Transform - uid: 406 @@ -1232,6 +1275,11 @@ entities: - pos: 3.5,9.5 parent: 1 type: Transform + - uid: 702 + components: + - pos: -2.5,16.5 + parent: 1 + type: Transform - uid: 905 components: - rot: 1.5707963267948966 rad @@ -1244,30 +1292,190 @@ entities: pos: 6.5,-8.5 parent: 1 type: Transform -- proto: BannerCargo +- proto: AtmosFixBlockerMarker entities: - - uid: 14 + - uid: 890 components: - - pos: 4.5,-4.5 + - pos: 1.5,16.5 parent: 1 type: Transform - - uid: 258 + - uid: 891 components: - - pos: -3.5,-4.5 + - pos: 2.5,16.5 + parent: 1 + type: Transform + - uid: 892 + components: + - pos: 3.5,16.5 + parent: 1 + type: Transform + - uid: 893 + components: + - pos: 4.5,16.5 + parent: 1 + type: Transform + - uid: 1040 + components: + - pos: 5.5,16.5 + parent: 1 + type: Transform + - uid: 1041 + components: + - pos: 6.5,16.5 + parent: 1 + type: Transform + - uid: 1042 + components: + - pos: 7.5,16.5 + parent: 1 + type: Transform + - uid: 1043 + components: + - pos: 8.5,16.5 + parent: 1 + type: Transform + - uid: 1044 + components: + - pos: 9.5,16.5 + parent: 1 + type: Transform + - uid: 1045 + components: + - pos: 10.5,16.5 + parent: 1 + type: Transform + - uid: 1046 + components: + - pos: 10.5,15.5 + parent: 1 + type: Transform + - uid: 1047 + components: + - pos: 10.5,14.5 + parent: 1 + type: Transform + - uid: 1048 + components: + - pos: 10.5,13.5 + parent: 1 + type: Transform + - uid: 1049 + components: + - pos: 10.5,12.5 + parent: 1 + type: Transform + - uid: 1050 + components: + - pos: 10.5,11.5 + parent: 1 + type: Transform + - uid: 1051 + components: + - pos: -3.5,-6.5 + parent: 1 + type: Transform + - uid: 1052 + components: + - pos: -10.5,-4.5 + parent: 1 + type: Transform + - uid: 1053 + components: + - pos: -9.5,-6.5 + parent: 1 + type: Transform + - uid: 1054 + components: + - pos: -10.5,1.5 parent: 1 type: Transform -- proto: Bed + - uid: 1055 + components: + - pos: 4.5,-6.5 + parent: 1 + type: Transform + - uid: 1056 + components: + - pos: 10.5,-6.5 + parent: 1 + type: Transform + - uid: 1057 + components: + - pos: 11.5,-4.5 + parent: 1 + type: Transform + - uid: 1058 + components: + - pos: 11.5,1.5 + parent: 1 + type: Transform + - uid: 1059 + components: + - pos: -4.5,16.5 + parent: 1 + type: Transform + - uid: 1060 + components: + - pos: -9.5,15.5 + parent: 1 + type: Transform +- proto: AtmosFixFreezerMarker entities: - - uid: 555 + - uid: 404 components: - - pos: -8.5,8.5 + - pos: 3.5,12.5 + parent: 1 + type: Transform + - uid: 866 + components: + - pos: 2.5,12.5 + parent: 1 + type: Transform + - uid: 874 + components: + - pos: 4.5,12.5 + parent: 1 + type: Transform + - uid: 1014 + components: + - pos: 4.5,11.5 + parent: 1 + type: Transform + - uid: 1016 + components: + - pos: 3.5,11.5 + parent: 1 + type: Transform + - uid: 1023 + components: + - pos: 2.5,11.5 parent: 1 type: Transform -- proto: BedsheetQM + - uid: 1028 + components: + - pos: 2.5,10.5 + parent: 1 + type: Transform + - uid: 1063 + components: + - pos: 3.5,10.5 + parent: 1 + type: Transform + - uid: 1064 + components: + - pos: 4.5,10.5 + parent: 1 + type: Transform +- proto: BannerCargo entities: - - uid: 729 + - uid: 14 components: - - pos: -8.5,8.5 + - pos: 4.5,-4.5 + parent: 1 + type: Transform + - uid: 258 + components: + - pos: -3.5,-4.5 parent: 1 type: Transform - proto: BenchSofaLeft @@ -1416,33 +1624,45 @@ entities: components: - flags: InContainer type: MetaData - - parent: 123 + - parent: 405 type: Transform - canCollide: False type: Physics - type: InsideEntityStorage +- proto: BoxPaperOffice + entities: + - uid: 729 + components: + - pos: -8.511633,9.621821 + parent: 1 + type: Transform - proto: BrbSign entities: - uid: 755 components: - - pos: -6.0586023,7.0368977 + - pos: -6.444375,7.512438 parent: 1 type: Transform - uid: 756 components: - - pos: -6.2252693,6.8702307 + - pos: -6.6110415,7.6791043 parent: 1 type: Transform - proto: Bucket entities: - - uid: 768 + - uid: 17 components: - - pos: -3.7585487,6.0110874 + - pos: -3.4331908,7.0847335 parent: 1 type: Transform - - uid: 769 + - uid: 1070 + components: + - pos: -3.6727743,7.15765 + parent: 1 + type: Transform + - uid: 1073 components: - - pos: -3.2481322,6.0215044 + - pos: -3.2248573,7.1680665 parent: 1 type: Transform - proto: ButchCleaver @@ -1479,6 +1699,21 @@ entities: - pos: -5.5,-3.5 parent: 1 type: Transform + - uid: 80 + components: + - pos: -3.5,10.5 + parent: 1 + type: Transform + - uid: 86 + components: + - pos: -2.5,9.5 + parent: 1 + type: Transform + - uid: 94 + components: + - pos: -2.5,10.5 + parent: 1 + type: Transform - uid: 120 components: - pos: -0.5,12.5 @@ -1579,16 +1814,6 @@ entities: - pos: 4.5,14.5 parent: 1 type: Transform - - uid: 449 - components: - - pos: -2.5,6.5 - parent: 1 - type: Transform - - uid: 450 - components: - - pos: -3.5,6.5 - parent: 1 - type: Transform - uid: 451 components: - pos: -4.5,6.5 @@ -1631,7 +1856,7 @@ entities: type: Transform - uid: 467 components: - - pos: 1.5,9.5 + - pos: 0.5,9.5 parent: 1 type: Transform - uid: 468 @@ -1659,21 +1884,6 @@ entities: - pos: 3.5,8.5 parent: 1 type: Transform - - uid: 473 - components: - - pos: 1.5,10.5 - parent: 1 - type: Transform - - uid: 474 - components: - - pos: 1.5,11.5 - parent: 1 - type: Transform - - uid: 475 - components: - - pos: 2.5,11.5 - parent: 1 - type: Transform - uid: 476 components: - pos: 3.5,11.5 @@ -2094,6 +2304,16 @@ entities: - pos: 7.5,15.5 parent: 1 type: Transform + - uid: 1074 + components: + - pos: 3.5,9.5 + parent: 1 + type: Transform + - uid: 1075 + components: + - pos: 3.5,10.5 + parent: 1 + type: Transform - proto: CableHV entities: - uid: 196 @@ -2128,69 +2348,74 @@ entities: type: Transform - proto: CableMV entities: + - uid: 19 + components: + - pos: -2.5,9.5 + parent: 1 + type: Transform - uid: 25 components: - pos: 4.5,7.5 parent: 1 type: Transform - - uid: 159 + - uid: 34 components: - - pos: -4.5,9.5 + - pos: -0.5,6.5 parent: 1 type: Transform - - uid: 169 + - uid: 38 components: - - pos: -4.5,10.5 + - pos: -0.5,9.5 parent: 1 type: Transform - - uid: 264 + - uid: 67 components: - - pos: -8.5,11.5 + - pos: -0.5,8.5 parent: 1 type: Transform - - uid: 267 + - uid: 79 components: - - pos: -8.5,10.5 + - pos: -0.5,7.5 parent: 1 type: Transform - - uid: 393 + - uid: 85 components: - - pos: -4.5,6.5 + - pos: -0.5,10.5 parent: 1 type: Transform - - uid: 394 + - uid: 99 components: - - pos: -7.5,10.5 + - pos: -3.5,10.5 parent: 1 type: Transform - - uid: 395 + - uid: 105 components: - - pos: -4.5,7.5 + - pos: 0.5,9.5 parent: 1 type: Transform - - uid: 396 + - uid: 169 components: - - pos: -3.5,6.5 + - pos: -4.5,10.5 parent: 1 type: Transform - - uid: 397 + - uid: 183 components: - - pos: -2.5,6.5 + - pos: -2.5,10.5 parent: 1 type: Transform - - uid: 398 + - uid: 264 components: - - pos: 1.5,9.5 + - pos: -8.5,11.5 parent: 1 type: Transform - - uid: 399 + - uid: 267 components: - - pos: 1.5,8.5 + - pos: -8.5,10.5 parent: 1 type: Transform - - uid: 400 + - uid: 394 components: - - pos: 1.5,7.5 + - pos: -7.5,10.5 parent: 1 type: Transform - uid: 401 @@ -2203,16 +2428,6 @@ entities: - pos: 0.5,6.5 parent: 1 type: Transform - - uid: 403 - components: - - pos: -0.5,6.5 - parent: 1 - type: Transform - - uid: 404 - components: - - pos: -1.5,6.5 - parent: 1 - type: Transform - uid: 410 components: - pos: 5.5,9.5 @@ -2278,9 +2493,9 @@ entities: - pos: 6.5,2.5 parent: 1 type: Transform - - uid: 1028 + - uid: 807 components: - - pos: -4.5,8.5 + - pos: -1.5,10.5 parent: 1 type: Transform - uid: 1029 @@ -2329,6 +2544,12 @@ entities: pos: 7.5,16.5 parent: 1 type: Transform + - uid: 124 + components: + - rot: -1.5707963267948966 rad + pos: 0.5,11.5 + parent: 1 + type: Transform - uid: 197 components: - rot: 1.5707963267948966 rad @@ -2341,6 +2562,12 @@ entities: pos: -5.5,11.5 parent: 1 type: Transform + - uid: 269 + components: + - rot: -1.5707963267948966 rad + pos: -0.5,13.5 + parent: 1 + type: Transform - uid: 312 components: - rot: 3.141592653589793 rad @@ -2502,11 +2729,6 @@ entities: - pos: -5.5,5.5 parent: 1 type: Transform - - uid: 1016 - components: - - pos: -3.5,6.5 - parent: 1 - type: Transform - uid: 1017 components: - pos: -3.5,7.5 @@ -2537,11 +2759,6 @@ entities: - pos: -1.5,11.5 parent: 1 type: Transform - - uid: 1023 - components: - - pos: 0.5,11.5 - parent: 1 - type: Transform - uid: 1024 components: - pos: 0.5,10.5 @@ -2598,7 +2815,7 @@ entities: entities: - uid: 190 components: - - pos: -5.9440193,7.422314 + - pos: -5.978369,7.652311 parent: 1 type: Transform - proto: CigPackRed @@ -2607,7 +2824,7 @@ entities: components: - flags: InContainer type: MetaData - - parent: 703 + - parent: 1081 type: Transform - canCollide: False type: Physics @@ -2636,45 +2853,64 @@ entities: - 0 - 0 type: EntityStorage -- proto: ClosetWallFireFilledRandom - entities: - - uid: 249 - components: - - rot: 3.141592653589793 rad - pos: -2.5,9.5 - parent: 1 - type: Transform - proto: ClothingBeltPlantFilled entities: - uid: 765 components: - - pos: -5.817134,6.56853 + - pos: -5.5230618,6.6331215 parent: 1 type: Transform - proto: ClothingBeltUtilityEngineering entities: - uid: 192 components: - - pos: -5.533075,6.638674 + - pos: -5.8251452,6.872705 parent: 1 type: Transform -- proto: ComputerShuttle +- proto: ClothingHeadHatMcCrown entities: - - uid: 873 + - uid: 128 + components: + - pos: 4.4425836,2.6006465 + parent: 1 + type: Transform + - uid: 705 + components: + - pos: 4.61538,2.741904 + parent: 1 + type: Transform + - uid: 708 + components: + - pos: 4.220203,2.741904 + parent: 1 + type: Transform + - uid: 1079 + components: + - pos: 4.6165376,2.4320714 + parent: 1 + type: Transform + - uid: 1080 + components: + - pos: 4.213417,2.4443965 + parent: 1 + type: Transform +- proto: ComputerTabletopShuttle + entities: + - uid: 1061 components: - pos: -6.5,10.5 parent: 1 type: Transform -- proto: ComputerStationRecords +- proto: ComputerTabletopStationRecords entities: - - uid: 872 + - uid: 1062 components: - pos: -5.5,10.5 parent: 1 type: Transform -- proto: ComputerSurveillanceCameraMonitor +- proto: ComputerTabletopSurveillanceCameraMonitor entities: - - uid: 874 + - uid: 1082 components: - pos: -7.5,10.5 parent: 1 @@ -2706,16 +2942,16 @@ entities: - type: ItemSlots - proto: CrateFoodBarSupply entities: - - uid: 195 + - uid: 106 components: - - pos: 0.5805821,10.414998 + - pos: 0.5,11.5 parent: 1 type: Transform - proto: CrateFoodCooking entities: - - uid: 748 + - uid: 349 components: - - pos: 0.5849985,11.125421 + - pos: 2.5,10.5 parent: 1 type: Transform - proto: CrateFreezer @@ -2725,13 +2961,6 @@ entities: - pos: 4.5,11.5 parent: 1 type: Transform -- proto: CrateFunMysteryFigurines - entities: - - uid: 1014 - components: - - pos: 0.58529973,11.835589 - parent: 1 - type: Transform - proto: CrateFunParty entities: - uid: 230 @@ -2739,13 +2968,6 @@ entities: - pos: 4.5,10.5 parent: 1 type: Transform -- proto: CrateHydroponicsTools - entities: - - uid: 105 - components: - - pos: -5.5,5.5 - parent: 1 - type: Transform - proto: CrateTrashCartJani entities: - uid: 671 @@ -2783,12 +3005,12 @@ entities: entities: - uid: 753 components: - - pos: -6.4043546,7.0158014 + - pos: -6.4547915,7.106188 parent: 1 type: Transform - uid: 754 components: - - pos: -6.6647716,7.067885 + - pos: -6.7047915,7.2103543 parent: 1 type: Transform - proto: DisposalBend @@ -3061,9 +3283,9 @@ entities: type: Transform - proto: DogBed entities: - - uid: 804 + - uid: 844 components: - - pos: -8.5,9.5 + - pos: -3.5,5.5 parent: 1 type: Transform - proto: DrinkGlass @@ -3108,44 +3330,130 @@ entities: - pos: 1.7190523,4.7299657 parent: 1 type: Transform - - uid: 106 + - uid: 131 components: - - pos: -7.36764,1.8236554 + - pos: 1.291969,4.584132 parent: 1 type: Transform - - uid: 131 + - uid: 231 components: - - pos: 1.291969,4.584132 + - pos: -7.91405,1.8492602 parent: 1 type: Transform - - uid: 269 + - uid: 304 components: - - pos: -7.6488905,1.8132387 + - pos: -7.6328,1.8492602 parent: 1 type: Transform - - uid: 759 + - uid: 403 components: - - pos: -7.9197235,1.8028221 + - pos: -7.361967,1.8492602 parent: 1 type: Transform -- proto: DrinkSodaWaterCan - entities: - - uid: 705 + - uid: 1083 components: - flags: InContainer + desc: A sweet, carbonated soft drink. Caffeine free. + name: cola glass type: MetaData - - parent: 703 + - parent: 1081 type: Transform + - solutions: + drink: + temperature: 293.15 + canMix: False + canReact: True + maxVol: 30 + reagents: + - data: null + ReagentId: Cola + Quantity: 30 + type: SolutionContainerManager + - transformed: True + currentReagent: + metamorphicSprite: null + footstepSound: !type:SoundCollectionSpecifier + params: + variation: null + playoffset: 0 + loop: False + referenceDistance: 1 + rolloffFactor: 1 + maxdistance: 25 + busname: Master + pitchscale: 1 + volume: 0 + attenuation: Default + collection: FootstepWater + flavor: soda + flavorMinimum: 0.1 + slippery: True + viscosity: 0 + metabolisms: + Drink: + effects: + - !type:SatiateThirst + shouldLog: False + logImpact: Low + factor: 2 + probability: 1 + conditions: null + metabolismRate: 0.5 + reactiveEffects: + Extinguish: + effects: + - !type:ExtinguishReaction + shouldLog: False + logImpact: Low + probability: 1 + conditions: null + methods: + - Touch + tileReactions: + - !type:ExtinguishTileReaction + coolingTemperature: 2 + - !type:SpillIfPuddlePresentTileReaction {} + plantMetabolism: + - !type:PlantAdjustNutrition + shouldLog: False + logImpact: Low + prob: 1 + amount: 0.1 + probability: 1 + conditions: null + - !type:PlantAdjustWater + shouldLog: False + logImpact: Low + prob: 1 + amount: 0.1 + probability: 1 + conditions: null + - !type:PlantAdjustHealth + shouldLog: False + logImpact: Low + prob: 1 + amount: -0.1 + probability: 1 + conditions: null + pricePerUnit: 0 + id: Cola + meltingPoint: null + name: reagent-name-cola + group: Drinks + parent: + - BaseSoda + abstract: False + desc: reagent-desc-cola + physicalDesc: reagent-physical-desc-fizzy + color: '#422912FF' + specificHeat: 1 + boilingPoint: null + recognizable: True + type: TransformableContainer - canCollide: False type: Physics - proto: EmergencyLight entities: - - uid: 67 - components: - - rot: -1.5707963267948966 rad - pos: -3.5,4.5 - parent: 1 - type: Transform - uid: 208 components: - rot: 1.5707963267948966 rad @@ -3173,6 +3481,12 @@ entities: - pos: 5.5,1.5 parent: 1 type: Transform + - uid: 396 + components: + - rot: -1.5707963267948966 rad + pos: -3.5,5.5 + parent: 1 + type: Transform - uid: 425 components: - rot: -1.5707963267948966 rad @@ -3219,9 +3533,15 @@ entities: - pos: 8.5,2.5 parent: 1 type: Transform - - uid: 194 + - uid: 392 components: - - pos: 0.5,9.5 + - rot: -1.5707963267948966 rad + pos: 1.5,11.5 + parent: 1 + type: Transform + - uid: 473 + components: + - pos: 1.5,9.5 parent: 1 type: Transform - uid: 714 @@ -3238,9 +3558,9 @@ entities: type: Transform - proto: FaxMachineShip entities: - - uid: 232 + - uid: 873 components: - - pos: -6.5,7.5 + - pos: -8.5,10.5 parent: 1 type: Transform - proto: FireAlarm @@ -3254,7 +3574,6 @@ entities: - 39 - 41 - 70 - - 79 - 646 - 647 - 644 @@ -3314,6 +3633,12 @@ entities: type: DeviceList - proto: Firelock entities: + - uid: 8 + components: + - rot: -1.5707963267948966 rad + pos: -2.5,4.5 + parent: 1 + type: Transform - uid: 39 components: - pos: 3.5,9.5 @@ -3330,12 +3655,6 @@ entities: pos: 5.5,3.5 parent: 1 type: Transform - - uid: 79 - components: - - rot: 1.5707963267948966 rad - pos: -2.5,3.5 - parent: 1 - type: Transform - uid: 171 components: - rot: 1.5707963267948966 rad @@ -3476,7 +3795,7 @@ entities: components: - flags: InContainer type: MetaData - - parent: 703 + - parent: 1081 type: Transform - canCollide: False type: Physics @@ -3507,7 +3826,7 @@ entities: components: - flags: InContainer type: MetaData - - parent: 703 + - parent: 1081 type: Transform - canCollide: False type: Physics @@ -3565,6 +3884,16 @@ entities: - pos: -0.10305256,2.6391692 parent: 1 type: Transform +- proto: FoodMealFries + entities: + - uid: 902 + components: + - flags: InContainer + type: MetaData + - parent: 1081 + type: Transform + - canCollide: False + type: Physics - proto: FoodPlatePlastic entities: - uid: 89 @@ -3577,16 +3906,6 @@ entities: - pos: 9.511152,1.7718108 parent: 1 type: Transform - - uid: 124 - components: - - pos: 9.507014,1.948894 - parent: 1 - type: Transform - - uid: 125 - components: - - pos: -5.5395737,1.917644 - parent: 1 - type: Transform - uid: 763 components: - pos: -5.529157,1.605144 @@ -4339,21 +4658,11 @@ entities: - pos: 7.5,15.5 parent: 1 type: Transform - - uid: 642 - components: - - pos: -4.5,16.5 - parent: 1 - type: Transform - uid: 643 components: - pos: -3.5,16.5 parent: 1 type: Transform - - uid: 696 - components: - - pos: -2.5,16.5 - parent: 1 - type: Transform - uid: 697 components: - pos: -1.5,16.5 @@ -4423,11 +4732,14 @@ entities: type: Transform - proto: GunSafeShuttleCaptain entities: - - uid: 123 + - uid: 405 components: - - pos: -8.5,10.5 + - anchored: True + pos: -8.5,8.5 parent: 1 type: Transform + - bodyType: Static + type: Physics - air: volume: 200 immutable: False @@ -4469,76 +4781,67 @@ entities: entities: - uid: 147 components: - - pos: 0.61389744,5.578879 + - pos: 0.63235265,5.615782 parent: 1 type: Transform + - assignedLabel: McMeal + type: HandLabeler + - type: ItemCooldown - uid: 710 components: - - pos: -5.5434914,7.0192184 + - pos: -5.5050435,7.2214174 parent: 1 type: Transform -- proto: HappyHonk +- proto: HappyHonkCargo entities: - - uid: 128 - components: - - pos: 0.70903397,4.7924657 - parent: 1 - type: Transform - uid: 129 components: - - pos: 0.36528397,4.938299 + - pos: 0.362599,4.8363476 parent: 1 type: Transform - uid: 130 components: - - pos: 0.70903397,4.9487157 + - pos: 0.38343233,4.9509306 parent: 1 type: Transform - uid: 136 components: - - pos: 0.35486734,4.8028827 + - pos: 0.6959323,4.9509306 parent: 1 type: Transform - uid: 137 components: - - pos: 0.33403397,4.657049 + - pos: 0.7271823,4.815514 parent: 1 type: Transform - uid: 176 components: - - pos: 0.69861734,4.657049 + - pos: 0.33134896,4.7321806 parent: 1 type: Transform - uid: 703 components: - - name: happy honk meal (McCargo Meal) - type: MetaData - - pos: -1.4680494,4.705127 + - pos: 0.74801564,4.721764 + parent: 1 + type: Transform + - uid: 1081 + components: + - pos: -1.4760247,3.7039404 parent: 1 type: Transform - - storageUsed: 21 + - storageUsed: 25 type: Storage - containers: storagebase: !type:Container showEnts: False occludes: True ents: - - 704 - - 705 - - 706 - 707 - - 708 + - 706 + - 704 + - 1083 + - 902 type: ContainerContainer - - originalName: happy honk meal - currentLabel: McCargo Meal - type: Label -- proto: HospitalCurtainsOpen - entities: - - uid: 902 - components: - - pos: -8.5,8.5 - parent: 1 - type: Transform - proto: hydroponicsTrayAnchored entities: - uid: 62 @@ -4619,17 +4922,9 @@ entities: type: Transform - proto: Lighter entities: - - uid: 708 - components: - - flags: InContainer - type: MetaData - - parent: 703 - type: Transform - - canCollide: False - type: Physics - uid: 828 components: - - pos: -5.829664,7.266064 + - pos: -6.071316,7.3206215 parent: 1 type: Transform - proto: MaterialReclaimer @@ -4639,6 +4934,23 @@ entities: - pos: 8.5,14.5 parent: 1 type: Transform +- proto: McCargoMothershipComputer + entities: + - uid: 806 + components: + - pos: -3.5,15.5 + parent: 1 + type: Transform + - containers: + ShipyardConsole-targetId: !type:ContainerSlot + showEnts: False + occludes: True + ent: null + board: !type:Container + showEnts: False + occludes: True + ents: [] + type: ContainerContainer - proto: Mirror entities: - uid: 865 @@ -4665,11 +4977,19 @@ entities: pos: 5.5,8.5 parent: 1 type: Transform -- proto: OilJarGhee +- proto: NoticeBoardNF entities: - - uid: 45 + - uid: 872 components: - - pos: 4.7203918,4.6294155 + - rot: 1.5707963267948966 rad + pos: -9.5,9.5 + parent: 1 + type: Transform +- proto: OilJarGhee + entities: + - uid: 45 + components: + - pos: 4.7203918,4.6294155 parent: 1 type: Transform - uid: 160 @@ -4687,13 +5007,6 @@ entities: - pos: 4.3558083,4.650249 parent: 1 type: Transform -- proto: PaperBin10 - entities: - - uid: 341 - components: - - pos: -5.5,7.5 - parent: 1 - type: Transform - proto: PartRodMetal entities: - uid: 861 @@ -4705,14 +5018,14 @@ entities: entities: - uid: 204 components: - - pos: -5.9083214,7.6910467 + - pos: -8.387869,10.03673 parent: 1 type: Transform - stampedName: Unknown type: Stamp - uid: 205 components: - - pos: -5.91171,7.5681477 + - pos: -8.625716,10.012696 parent: 1 type: Transform - stampedName: Unknown @@ -4721,7 +5034,18 @@ entities: entities: - uid: 9 components: - - pos: 4.5,12.5 + - anchored: True + pos: 4.5,12.5 + parent: 1 + type: Transform + - canCollide: True + bodyType: Static + type: Physics +- proto: PosterContrabandEAT + entities: + - uid: 1076 + components: + - pos: -2.5,7.5 parent: 1 type: Transform - proto: PosterContrabandSpaceUp @@ -4741,10 +5065,10 @@ entities: type: Transform - proto: Poweredlight entities: - - uid: 60 + - uid: 33 components: - - rot: 3.141592653589793 rad - pos: 9.5,9.5 + - rot: 1.5707963267948966 rad + pos: -8.5,3.5 parent: 1 type: Transform - uid: 110 @@ -4753,27 +5077,15 @@ entities: pos: -1.5,10.5 parent: 1 type: Transform - - uid: 173 - components: - - rot: 1.5707963267948966 rad - pos: -8.5,10.5 - parent: 1 - type: Transform - - uid: 200 - components: - - pos: 7.5,9.5 - parent: 1 - type: Transform - uid: 207 components: - - rot: 3.141592653589793 rad - pos: 3.5,14.5 + - rot: 1.5707963267948966 rad + pos: 6.5,12.5 parent: 1 type: Transform - uid: 227 components: - - rot: 1.5707963267948966 rad - pos: 6.5,2.5 + - pos: 9.5,1.5 parent: 1 type: Transform - uid: 262 @@ -4790,20 +5102,14 @@ entities: type: Transform - uid: 287 components: - - rot: 1.5707963267948966 rad - pos: 6.5,12.5 - parent: 1 - type: Transform - - uid: 304 - components: - - rot: -1.5707963267948966 rad - pos: 0.5,13.5 + - rot: 3.141592653589793 rad + pos: 3.5,14.5 parent: 1 type: Transform - - uid: 333 + - uid: 397 components: - - rot: 3.141592653589793 rad - pos: 9.5,7.5 + - rot: 1.5707963267948966 rad + pos: -8.5,8.5 parent: 1 type: Transform - uid: 428 @@ -4817,21 +5123,15 @@ entities: - pos: 3.5,12.5 parent: 1 type: Transform - - uid: 445 - components: - - rot: 3.141592653589793 rad - pos: 9.5,5.5 - parent: 1 - type: Transform - uid: 448 components: - pos: -8.5,1.5 parent: 1 type: Transform - - uid: 688 + - uid: 691 components: - rot: -1.5707963267948966 rad - pos: -3.5,6.5 + pos: -3.5,8.5 parent: 1 type: Transform - uid: 720 @@ -4858,6 +5158,12 @@ entities: pos: 9.5,3.5 parent: 1 type: Transform + - uid: 804 + components: + - rot: -1.5707963267948966 rad + pos: 0.5,11.5 + parent: 1 + type: Transform - uid: 833 components: - rot: 3.141592653589793 rad @@ -4888,23 +5194,41 @@ entities: pos: 12.5,-2.5 parent: 1 type: Transform -- proto: Rack +- proto: PoweredlightColoredBlack entities: - - uid: 64 + - uid: 60 components: - - pos: 0.5,4.5 + - rot: 3.141592653589793 rad + pos: 9.5,9.5 parent: 1 type: Transform - - uid: 80 + - uid: 200 components: - - rot: 1.5707963267948966 rad - pos: -1.5,4.5 + - pos: 7.5,9.5 parent: 1 type: Transform - - uid: 86 + - uid: 333 components: - - rot: -1.5707963267948966 rad - pos: -3.5,7.5 + - rot: 3.141592653589793 rad + pos: 9.5,7.5 + parent: 1 + type: Transform + - uid: 445 + components: + - rot: 3.141592653589793 rad + pos: 9.5,5.5 + parent: 1 + type: Transform +- proto: Rack + entities: + - uid: 23 + components: + - pos: -5.5,5.5 + parent: 1 + type: Transform + - uid: 64 + components: + - pos: 0.5,4.5 parent: 1 type: Transform - uid: 87 @@ -4937,6 +5261,12 @@ entities: - pos: 2.5,4.5 parent: 1 type: Transform + - uid: 145 + components: + - rot: -1.5707963267948966 rad + pos: -1.5,3.5 + parent: 1 + type: Transform - uid: 152 components: - pos: -1.5,11.5 @@ -4957,6 +5287,12 @@ 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 @@ -4978,10 +5314,10 @@ entities: type: Transform - proto: RailingCorner entities: - - uid: 730 + - uid: 125 components: - - rot: 1.5707963267948966 rad - pos: 2.5,10.5 + - rot: 3.141592653589793 rad + pos: 0.5,10.5 parent: 1 type: Transform - proto: RandomArcade @@ -5093,21 +5429,11 @@ entities: pos: -2.5,-5.5 parent: 1 type: Transform - - uid: 700 - components: - - pos: -4.5,16.5 - parent: 1 - type: Transform - uid: 701 components: - pos: -3.5,16.5 parent: 1 type: Transform - - uid: 702 - components: - - pos: -2.5,16.5 - parent: 1 - type: Transform - uid: 745 components: - pos: -1.5,16.5 @@ -5214,6 +5540,22 @@ entities: - links: - 751 type: DeviceLinkSink + - uid: 151 + components: + - pos: -3.5,2.5 + parent: 1 + type: Transform + - links: + - 173 + type: DeviceLinkSink + - uid: 170 + components: + - pos: 0.5,16.5 + parent: 1 + type: Transform + - links: + - 455 + type: DeviceLinkSink - uid: 336 components: - pos: 10.5,7.5 @@ -5264,6 +5606,38 @@ entities: - links: - 885 type: DeviceLinkSink + - uid: 475 + components: + - pos: 1.5,14.5 + parent: 1 + type: Transform + - links: + - 805 + type: DeviceLinkSink + - uid: 560 + components: + - pos: -2.5,16.5 + parent: 1 + type: Transform + - links: + - 455 + type: DeviceLinkSink + - uid: 640 + components: + - pos: -1.5,16.5 + parent: 1 + type: Transform + - links: + - 455 + type: DeviceLinkSink + - uid: 642 + components: + - pos: -0.5,16.5 + parent: 1 + type: Transform + - links: + - 455 + type: DeviceLinkSink - uid: 669 components: - pos: 9.5,12.5 @@ -5286,7 +5660,7 @@ entities: parent: 1 type: Transform - links: - - 675 + - 859 type: DeviceLinkSink - uid: 677 components: @@ -5294,7 +5668,7 @@ entities: parent: 1 type: Transform - links: - - 675 + - 859 type: DeviceLinkSink - uid: 678 components: @@ -5302,7 +5676,7 @@ entities: parent: 1 type: Transform - links: - - 675 + - 859 type: DeviceLinkSink - uid: 679 components: @@ -5310,7 +5684,7 @@ entities: parent: 1 type: Transform - links: - - 675 + - 859 type: DeviceLinkSink - uid: 680 components: @@ -5318,7 +5692,7 @@ entities: parent: 1 type: Transform - links: - - 675 + - 859 type: DeviceLinkSink - uid: 681 components: @@ -5326,7 +5700,7 @@ entities: parent: 1 type: Transform - links: - - 675 + - 859 type: DeviceLinkSink - uid: 682 components: @@ -5334,15 +5708,7 @@ entities: parent: 1 type: Transform - links: - - 675 - type: DeviceLinkSink - - uid: 683 - components: - - pos: -3.5,2.5 - parent: 1 - type: Transform - - links: - - 675 + - 859 type: DeviceLinkSink - uid: 684 components: @@ -5350,7 +5716,7 @@ entities: parent: 1 type: Transform - links: - - 675 + - 859 type: DeviceLinkSink - uid: 689 components: @@ -5360,6 +5726,14 @@ entities: - links: - 885 type: DeviceLinkSink + - uid: 696 + components: + - pos: -3.5,16.5 + parent: 1 + type: Transform + - links: + - 455 + type: DeviceLinkSink - uid: 758 components: - pos: 8.5,15.5 @@ -5432,54 +5806,6 @@ entities: - links: - 885 type: DeviceLinkSink - - uid: 839 - components: - - pos: -4.5,16.5 - parent: 1 - type: Transform - - links: - - 116 - type: DeviceLinkSink - - uid: 840 - components: - - pos: -3.5,16.5 - parent: 1 - type: Transform - - links: - - 116 - type: DeviceLinkSink - - uid: 841 - components: - - pos: -2.5,16.5 - parent: 1 - type: Transform - - links: - - 116 - type: DeviceLinkSink - - uid: 842 - components: - - pos: -1.5,16.5 - parent: 1 - type: Transform - - links: - - 116 - type: DeviceLinkSink - - uid: 843 - components: - - pos: -0.5,16.5 - parent: 1 - type: Transform - - links: - - 116 - type: DeviceLinkSink - - uid: 844 - components: - - pos: 0.5,16.5 - parent: 1 - type: Transform - - links: - - 116 - type: DeviceLinkSink - uid: 854 components: - pos: 9.5,11.5 @@ -5560,33 +5886,26 @@ entities: type: DeviceLinkSink - proto: SignalButton entities: - - uid: 116 + - uid: 150 components: - - pos: -5.5,15.5 + - pos: 9.5,6.5 parent: 1 type: Transform - linkedPorts: - 839: - - Pressed: Toggle - 840: - - Pressed: Toggle - 841: - - Pressed: Toggle - 842: - - Pressed: Toggle - 843: - - Pressed: Toggle - 844: + 337: - Pressed: Toggle type: DeviceLinkSource - - uid: 150 + - uid: 173 components: - - pos: 9.5,6.5 + - rot: -1.5707963267948966 rad + pos: -2.5,3.5 parent: 1 type: Transform - linkedPorts: - 337: + 151: - Pressed: Toggle + 193: + - Pressed: DoorBolt type: DeviceLinkSource - uid: 331 components: @@ -5597,45 +5916,22 @@ entities: 336: - Pressed: Toggle type: DeviceLinkSource - - uid: 675 + - uid: 455 components: - - rot: 1.5707963267948966 rad - pos: -2.5,4.5 + - pos: -4.5,15.5 parent: 1 type: Transform - linkedPorts: - 683: - - Pressed: Toggle - 676: - - Pressed: Toggle - 677: - - Pressed: Toggle - 678: + 696: - Pressed: Toggle - 679: - - Pressed: Toggle - 680: + 560: - Pressed: Toggle - 681: + 640: - Pressed: Toggle - 682: + 642: - Pressed: Toggle - 684: + 170: - Pressed: Toggle - 193: - - Pressed: DoorBolt - 300: - - Pressed: DoorBolt - type: DeviceLinkSource - - uid: 691 - components: - - rot: -1.5707963267948966 rad - pos: 1.4849963,15.219261 - parent: 1 - type: Transform - - linkedPorts: - 27: - - Pressed: DoorBolt type: DeviceLinkSource - uid: 749 components: @@ -5695,6 +5991,44 @@ entities: 777: - Pressed: Toggle type: DeviceLinkSource + - uid: 805 + components: + - rot: -1.5707963267948966 rad + pos: 1.5,13.5 + parent: 1 + type: Transform + - linkedPorts: + 27: + - Pressed: DoorBolt + 475: + - Pressed: Toggle + type: DeviceLinkSource + - uid: 859 + components: + - rot: 1.5707963267948966 rad + pos: -2.5,3.5 + parent: 1 + type: Transform + - linkedPorts: + 676: + - Pressed: Toggle + 677: + - Pressed: Toggle + 684: + - Pressed: Toggle + 678: + - Pressed: Toggle + 679: + - Pressed: Toggle + 680: + - Pressed: Toggle + 681: + - Pressed: Toggle + 682: + - Pressed: Toggle + 300: + - Pressed: DoorBolt + type: DeviceLinkSource - uid: 885 components: - rot: 1.5707963267948966 rad @@ -5791,6 +6125,13 @@ entities: 958: - Pressed: Toggle type: DeviceLinkSource +- proto: SignCargo + entities: + - uid: 474 + components: + - pos: 1.5,10.5 + parent: 1 + type: Transform - proto: SignDirectionalFood entities: - uid: 738 @@ -5819,10 +6160,10 @@ entities: type: Transform - proto: SignDirectionalHydro entities: - - uid: 740 + - uid: 159 components: - rot: -1.5707963267948966 rad - pos: -2.4910388,4.210334 + pos: -2.5,5.5 parent: 1 type: Transform - proto: SignDirectionalJanitor @@ -5892,23 +6233,23 @@ entities: type: Transform - proto: soda_dispenser entities: - - uid: 231 + - uid: 232 components: - - rot: 1.5707963267948966 rad - pos: -1.5,6.5 + - pos: -8.5,1.5 parent: 1 type: Transform - - uid: 608 + - uid: 449 components: - - pos: -8.5,1.5 + - rot: 1.5707963267948966 rad + pos: -1.5,5.5 parent: 1 type: Transform - proto: SpawnMobCow entities: - - uid: 859 + - uid: 140 components: - - rot: 1.5707963267948966 rad - pos: 2.5,10.5 + - rot: -1.5707963267948966 rad + pos: 0.5,10.5 parent: 1 type: Transform - proto: SpawnPointBorg @@ -5932,16 +6273,16 @@ entities: type: Transform - proto: SpawnPointCargoTechnician entities: - - uid: 17 + - uid: 793 components: - - pos: 0.5,8.5 + - pos: -5.5,8.5 parent: 1 type: Transform - proto: SpawnPointChef entities: - - uid: 23 + - uid: 1071 components: - - pos: 2.5,8.5 + - pos: 2.5,6.5 parent: 1 type: Transform - proto: SpawnPointJanitor @@ -5953,16 +6294,16 @@ entities: type: Transform - proto: SpawnPointLatejoin entities: - - uid: 177 + - uid: 81 components: - - pos: 1.5,8.5 + - pos: 0.5,6.5 parent: 1 type: Transform - proto: SpawnPointQuartermaster entities: - - uid: 800 + - uid: 177 components: - - pos: -6.5,9.5 + - pos: -6.5,8.5 parent: 1 type: Transform - proto: StoolBar @@ -6028,27 +6369,27 @@ entities: nameSet: True id: Storage 2 type: SurveillanceCamera - - uid: 636 + - uid: 393 components: - - rot: 3.141592653589793 rad - pos: 8.5,14.5 + - rot: 1.5707963267948966 rad + pos: -3.5,5.5 parent: 1 type: Transform - setupAvailableNetworks: - SurveillanceCameraSupply nameSet: True - id: Janitor + id: Storage 1 type: SurveillanceCamera - - uid: 723 + - uid: 636 components: - - rot: 1.5707963267948966 rad - pos: -3.5,4.5 + - rot: 3.141592653589793 rad + pos: 8.5,14.5 parent: 1 type: Transform - setupAvailableNetworks: - SurveillanceCameraSupply nameSet: True - id: Storage 1 + id: Janitor type: SurveillanceCamera - uid: 724 components: @@ -6106,52 +6447,24 @@ entities: - pos: -0.5,2.5 parent: 1 type: Transform - - uid: 4 - components: - - pos: 0.5,2.5 - parent: 1 - type: Transform - - uid: 5 - components: - - pos: 1.5,2.5 - parent: 1 - type: Transform - - uid: 6 - components: - - pos: 2.5,2.5 - parent: 1 - type: Transform - - uid: 7 - components: - - pos: 3.5,2.5 - parent: 1 - type: Transform - - uid: 19 - components: - - rot: -1.5707963267948966 rad - pos: 0.5,7.5 - parent: 1 - type: Transform - - uid: 32 + - uid: 4 components: - - pos: 1.5,7.5 + - pos: 0.5,2.5 parent: 1 type: Transform - - uid: 33 + - uid: 5 components: - - rot: -1.5707963267948966 rad - pos: 0.5,5.5 + - pos: 1.5,2.5 parent: 1 type: Transform - - uid: 38 + - uid: 6 components: - - pos: 1.5,5.5 + - pos: 2.5,2.5 parent: 1 type: Transform - - uid: 44 + - uid: 7 components: - - rot: -1.5707963267948966 rad - pos: 2.5,7.5 + - pos: 3.5,2.5 parent: 1 type: Transform - uid: 100 @@ -6160,19 +6473,8 @@ entities: pos: 4.5,2.5 parent: 1 type: Transform - - uid: 145 - components: - - rot: -1.5707963267948966 rad - pos: 2.5,5.5 - parent: 1 - type: Transform - proto: TableReinforced entities: - - uid: 94 - components: - - pos: -5.5,7.5 - parent: 1 - type: Transform - uid: 121 components: - pos: -5.5,6.5 @@ -6190,23 +6492,6 @@ entities: pos: 4.5,6.5 parent: 1 type: Transform - - uid: 140 - components: - - pos: -2.5,5.5 - parent: 1 - type: Transform - - uid: 183 - components: - - rot: 1.5707963267948966 rad - pos: -1.5,7.5 - parent: 1 - type: Transform - - uid: 186 - components: - - rot: -1.5707963267948966 rad - pos: -1.5,6.5 - parent: 1 - type: Transform - uid: 187 components: - pos: -6.5,1.5 @@ -6222,6 +6507,11 @@ entities: - pos: -8.5,1.5 parent: 1 type: Transform + - uid: 194 + components: + - pos: -8.5,9.5 + parent: 1 + type: Transform - uid: 233 components: - pos: 9.5,1.5 @@ -6232,15 +6522,31 @@ entities: - pos: -5.5,1.5 parent: 1 type: Transform + - uid: 249 + components: + - pos: -6.5,10.5 + parent: 1 + type: Transform + - uid: 277 + components: + - rot: 1.5707963267948966 rad + pos: -2.5,6.5 + parent: 1 + type: Transform - uid: 307 components: - rot: 1.5707963267948966 rad pos: 6.5,6.5 parent: 1 type: Transform + - uid: 341 + components: + - pos: -5.5,10.5 + parent: 1 + type: Transform - uid: 343 components: - - pos: -6.5,7.5 + - pos: -7.5,10.5 parent: 1 type: Transform - uid: 389 @@ -6248,11 +6554,62 @@ entities: - pos: 6.5,5.5 parent: 1 type: Transform + - uid: 399 + components: + - pos: -8.5,10.5 + parent: 1 + type: Transform + - uid: 400 + components: + - pos: -5.5,7.5 + parent: 1 + type: Transform + - uid: 450 + components: + - rot: -1.5707963267948966 rad + pos: 2.5,7.5 + parent: 1 + type: Transform + - uid: 555 + components: + - pos: -6.5,7.5 + parent: 1 + type: Transform + - uid: 576 + components: + - rot: -1.5707963267948966 rad + pos: 1.5,7.5 + parent: 1 + type: Transform + - uid: 581 + components: + - rot: -1.5707963267948966 rad + pos: 0.5,5.5 + parent: 1 + type: Transform + - uid: 608 + components: + - rot: -1.5707963267948966 rad + pos: 1.5,5.5 + parent: 1 + type: Transform - uid: 649 components: - pos: -6.5,6.5 parent: 1 type: Transform + - uid: 675 + components: + - rot: -1.5707963267948966 rad + pos: 0.5,7.5 + parent: 1 + type: Transform + - uid: 683 + components: + - rot: -1.5707963267948966 rad + pos: 2.5,5.5 + parent: 1 + type: Transform - uid: 692 components: - rot: 3.141592653589793 rad @@ -6265,6 +6622,12 @@ entities: pos: 6.5,8.5 parent: 1 type: Transform + - uid: 723 + components: + - rot: -1.5707963267948966 rad + pos: -1.5,5.5 + parent: 1 + type: Transform - proto: TableWood entities: - uid: 11 @@ -6424,6 +6787,20 @@ entities: pos: 9.5,9.5 parent: 1 type: Transform +- proto: ToyFigurineCargoTech + entities: + - uid: 1077 + components: + - pos: -5.64046,7.7318344 + parent: 1 + type: Transform +- proto: ToyFigurineQuartermaster + entities: + - uid: 1078 + components: + - pos: -5.35921,7.836001 + parent: 1 + type: Transform - proto: ToySpawner entities: - uid: 764 @@ -6454,23 +6831,23 @@ entities: type: Transform - proto: VendingMachineChefvend entities: - - uid: 81 + - uid: 740 components: - - pos: 4.5,8.5 + - pos: 4.5,7.5 parent: 1 type: Transform - proto: VendingMachineCigs entities: - - uid: 455 + - uid: 700 components: - - pos: -4.5,15.5 + - pos: -1.5,15.5 parent: 1 type: Transform - proto: VendingMachineColaBlack entities: - - uid: 851 + - uid: 826 components: - - pos: -1.5,15.5 + - pos: -0.5,15.5 parent: 1 type: Transform - proto: VendingMachineCondiments @@ -6480,25 +6857,11 @@ entities: - pos: -1.5,2.5 parent: 1 type: Transform -- proto: VendingMachineCuddlyCritterVend - entities: - - uid: 852 - components: - - pos: -0.5,15.5 - parent: 1 - type: Transform - proto: VendingMachineDinnerware entities: - - uid: 146 - components: - - pos: 4.5,7.5 - parent: 1 - type: Transform -- proto: VendingMachineDonut - entities: - - uid: 819 + - uid: 398 components: - - pos: -2.5,15.5 + - pos: 4.5,8.5 parent: 1 type: Transform - proto: VendingMachineHappyHonk @@ -6529,15 +6892,18 @@ entities: - pos: -8.5,3.5 parent: 1 type: Transform -- proto: VendingMachinePride +- proto: VendingMachineRestockBooze entities: - - uid: 866 + - uid: 840 components: - - pos: 0.5,13.5 + - pos: -2.598885,13.865319 + parent: 1 + type: Transform + - uid: 841 + components: + - pos: -2.3384683,13.781985 parent: 1 type: Transform -- proto: VendingMachineRestockBooze - entities: - uid: 894 components: - pos: -2.606868,13.727668 @@ -6550,86 +6916,90 @@ entities: type: Transform - proto: VendingMachineRestockChefvend entities: - - uid: 349 + - uid: 748 components: - - pos: -3.3606324,7.799815 + - pos: -0.56509566,13.911346 parent: 1 type: Transform - - uid: 581 + - uid: 1065 components: - - pos: -3.589799,7.9143987 + - pos: -0.5755123,13.734262 parent: 1 type: Transform -- proto: VendingMachineRestockCondimentStation - entities: - - uid: 892 + - uid: 1066 components: - - pos: -2.5964513,13.863084 + - pos: -0.3255123,13.828012 parent: 1 type: Transform - - uid: 893 + - uid: 1067 components: - - pos: -2.325618,13.769334 + - pos: -0.30467892,13.671762 parent: 1 type: Transform -- proto: VendingMachineRestockCostumes +- proto: VendingMachineRestockClothes entities: - uid: 91 components: - - pos: -3.6016417,8.945648 + - pos: -3.6114817,8.886418 parent: 1 type: Transform - - uid: 793 + - uid: 146 components: - - pos: -3.3099751,8.851898 + - pos: -3.3718984,8.803084 parent: 1 type: Transform -- proto: VendingMachineRestockCuddlyCritterVend - entities: - - uid: 806 + - uid: 800 components: - - pos: -2.3244715,11.857673 + - pos: -3.4031484,8.678085 parent: 1 type: Transform - - uid: 826 + - uid: 1072 components: - - pos: -2.5848882,11.96184 + - pos: -3.6531487,8.730168 parent: 1 type: Transform -- proto: VendingMachineRestockDinnerware +- proto: VendingMachineRestockCondimentStation entities: - - uid: 306 + - uid: 839 components: - - pos: -3.631466,7.695648 + - pos: -3.5885057,13.942069 parent: 1 type: Transform - - uid: 576 + - uid: 842 components: - - pos: -3.3397992,7.633148 + - pos: -3.3593388,13.660819 parent: 1 type: Transform -- proto: VendingMachineRestockDonut - entities: - - uid: 170 + - uid: 851 components: - - pos: -3.5964513,13.915168 + - pos: -3.3801723,13.848319 parent: 1 type: Transform - - uid: 889 + - uid: 852 components: - - pos: -3.325618,13.811001 + - pos: -3.5989223,13.744152 parent: 1 type: Transform -- proto: VendingMachineRestockGetmoreChocolateCorp +- proto: VendingMachineRestockDinnerware entities: - - uid: 890 + - uid: 730 components: - - pos: -3.6277013,13.717251 + - pos: -2.3180861,11.673373 parent: 1 type: Transform - - uid: 891 + - 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 components: - - pos: -3.325618,13.633918 + - pos: -2.5680861,11.71504 parent: 1 type: Transform - proto: VendingMachineRestockHappyHonk @@ -6658,19 +7028,12 @@ entities: entities: - uid: 563 components: - - pos: -3.3308084,8.643565 - parent: 1 - type: Transform -- proto: VendingMachineRestockPride - entities: - - uid: 805 - components: - - pos: -2.6369717,11.753507 + - pos: -5.3109856,5.773668 parent: 1 type: Transform - - uid: 807 + - uid: 1069 components: - - pos: -2.3244715,11.670173 + - pos: -5.290152,5.6590843 parent: 1 type: Transform - proto: VendingMachineRestockRobustSoftdrinks @@ -6699,7 +7062,12 @@ entities: entities: - uid: 562 components: - - pos: -3.6433086,8.758148 + - pos: -5.6443186,5.8882513 + parent: 1 + type: Transform + - uid: 1068 + components: + - pos: -5.6859856,5.711168 parent: 1 type: Transform - proto: VendingMachineRestockSmokes @@ -6731,13 +7099,6 @@ entities: - pos: -8.5,4.5 parent: 1 type: Transform -- proto: VendingMachineSnackGreen - entities: - - uid: 560 - components: - - pos: -3.5,15.5 - parent: 1 - type: Transform - proto: WallmountTelevisionFrame entities: - uid: 737 @@ -7020,6 +7381,11 @@ entities: pos: -10.5,0.5 parent: 1 type: Transform + - uid: 889 + components: + - pos: -4.5,15.5 + parent: 1 + type: Transform - uid: 903 components: - pos: 9.5,-8.5 @@ -7062,11 +7428,6 @@ entities: - pos: -4.5,2.5 parent: 1 type: Transform - - uid: 34 - components: - - pos: -2.5,6.5 - parent: 1 - type: Transform - uid: 37 components: - pos: -2.5,9.5 @@ -7140,10 +7501,10 @@ entities: - pos: -8.5,2.5 parent: 1 type: Transform - - uid: 151 + - uid: 195 components: - rot: -1.5707963267948966 rad - pos: -2.5,4.5 + pos: -2.5,3.5 parent: 1 type: Transform - uid: 224 @@ -7263,6 +7624,12 @@ entities: - pos: 4.5,9.5 parent: 1 type: Transform + - uid: 688 + components: + - rot: -1.5707963267948966 rad + pos: -2.5,5.5 + parent: 1 + type: Transform - uid: 694 components: - rot: 3.141592653589793 rad @@ -7301,6 +7668,11 @@ entities: - pos: 9.5,-5.5 parent: 1 type: Transform + - uid: 116 + components: + - pos: -4.5,16.5 + parent: 1 + type: Transform - uid: 256 components: - rot: 3.141592653589793 rad @@ -7393,11 +7765,6 @@ entities: - pos: -9.5,15.5 parent: 1 type: Transform - - uid: 640 - components: - - pos: -5.5,16.5 - parent: 1 - type: Transform - uid: 736 components: - rot: 3.141592653589793 rad @@ -7413,23 +7780,23 @@ entities: type: Transform - proto: WaterTankHighCapacity entities: - - uid: 277 + - uid: 306 components: - - pos: -3.5,6.5 + - pos: -3.5,7.5 parent: 1 type: Transform - proto: WindoorSecure entities: - - uid: 85 + - uid: 32 components: - rot: -1.5707963267948966 rad - pos: -2.5,5.5 + pos: -2.5,6.5 parent: 1 type: Transform - - uid: 99 + - uid: 44 components: - rot: 1.5707963267948966 rad - pos: -2.5,5.5 + pos: -2.5,6.5 parent: 1 type: Transform - uid: 141 diff --git a/Resources/Maps/_NF/Shuttles/mcdelivery.yml b/Resources/Maps/_NF/Shuttles/mcdelivery.yml new file mode 100644 index 00000000000..385ae8232c9 --- /dev/null +++ b/Resources/Maps/_NF/Shuttles/mcdelivery.yml @@ -0,0 +1,963 @@ +meta: + format: 6 + postmapinit: false +tilemap: + 0: Space + 97: FloorTechMaint + 113: Lattice + 114: Plating +entities: +- proto: "" + entities: + - uid: 1 + components: + - name: grid + type: MetaData + - pos: -0.5104167,-0.46875 + parent: invalid + type: Transform + - chunks: + 0,0: + ind: 0,0 + tiles: YQAAAAAAYQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYQAAAAAAYQAAAAAAYQAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAYQAAAAAAcgAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + 0,-1: + ind: 0,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAcgAAAAAAcQAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + -1,0: + ind: -1,0 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + -1,-1: + ind: -1,-1 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcQAAAAAA + version: 6 + type: MapGrid + - type: Broadphase + - bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + type: Physics + - fixtures: {} + type: Fixtures + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + type: Gravity + - chunkCollection: + version: 2 + nodes: + - node: + color: '#FFFFFFFF' + id: Delivery + decals: + 11: 1,2 + - node: + color: '#3C44AAFF' + id: DeliveryGreyscale + decals: + 10: 1,1 + - node: + angle: 3.141592653589793 rad + color: '#FFFFFFFF' + id: LoadingArea + decals: + 0: 0,0 + - node: + color: '#A4610696' + id: WarnCornerNE + decals: + 8: 2,4 + - node: + color: '#A4610696' + id: WarnCornerNW + decals: + 4: 0,4 + - node: + color: '#A4610696' + id: WarnCornerSmallNE + decals: + 6: 1,4 + - node: + color: '#A4610696' + id: WarnCornerSmallNW + decals: + 7: 1,4 + 9: 0,2 + - node: + color: '#A4610696' + id: WarnEndN + decals: + 5: 1,5 + - node: + color: '#FFFFFFFF' + id: WarnLineN + decals: + 2: 0,-1 + - node: + color: '#A4610696' + id: WarnLineS + decals: + 3: 0,3 + - node: + color: '#FFFFFFFF' + id: WarnLineW + decals: + 1: 0,-1 + type: DecalGrid + - version: 2 + data: + tiles: + 0,0: + 0: 30583 + 1: 34952 + 0,-1: + 0: 28672 + 1: 32768 + -1,0: + 0: 34952 + -1,-1: + 0: 32768 + 0,1: + 0: 2047 + 1: 2048 + -1,1: + 0: 136 + 1: 2048 + uniqueMixes: + - volume: 2500 + temperature: 293.15 + moles: + - 21.824879 + - 82.10312 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - volume: 2500 + temperature: 293.15 + moles: + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + chunkSize: 4 + type: GridAtmosphere + - type: GasTileOverlay + - type: RadiationGridResistance +- proto: AirCanister + entities: + - uid: 32 + components: + - anchored: True + pos: 1.5,1.5 + parent: 1 + type: Transform + - bodyType: Static + type: Physics +- proto: AirlockGlassShuttle + entities: + - uid: 8 + components: + - pos: 0.5,-0.5 + parent: 1 + type: Transform +- proto: APCBasic + entities: + - uid: 49 + components: + - rot: 1.5707963267948966 rad + pos: -0.5,2.5 + parent: 1 + type: Transform +- proto: AtmosDeviceFanTiny + entities: + - uid: 7 + components: + - rot: 1.5707963267948966 rad + pos: 0.5,-0.5 + parent: 1 + type: Transform +- proto: AtmosFixBlockerMarker + entities: + - uid: 2 + components: + - pos: 3.5,-0.5 + parent: 1 + type: Transform + - uid: 41 + components: + - pos: 3.5,3.5 + parent: 1 + type: Transform + - uid: 102 + components: + - pos: 3.5,0.5 + parent: 1 + type: Transform + - uid: 103 + components: + - pos: 3.5,1.5 + parent: 1 + type: Transform + - uid: 104 + components: + - pos: 3.5,2.5 + parent: 1 + type: Transform + - uid: 105 + components: + - pos: 3.5,6.5 + parent: 1 + type: Transform + - uid: 106 + components: + - 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 + parent: 1 + type: Transform + - uid: 33 + components: + - pos: 0.5,5.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 + parent: 1 + type: Transform + - uid: 53 + components: + - pos: -0.5,1.5 + parent: 1 + type: Transform + - uid: 54 + components: + - 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 + components: + - pos: 2.5,2.5 + parent: 1 + type: Transform +- proto: CableHV + entities: + - uid: 21 + components: + - pos: 2.5,2.5 + parent: 1 + type: Transform + - uid: 95 + components: + - pos: 1.5,2.5 + parent: 1 + type: Transform +- proto: CableMV + entities: + - uid: 4 + components: + - pos: 0.5,2.5 + parent: 1 + type: Transform + - uid: 19 + components: + - pos: -0.5,2.5 + parent: 1 + type: Transform + - uid: 98 + components: + - pos: 2.5,2.5 + parent: 1 + type: Transform + - uid: 99 + components: + - pos: 1.5,2.5 + parent: 1 + type: Transform +- proto: ChairPilotSeat + entities: + - uid: 56 + components: + - rot: 3.141592653589793 rad + pos: 1.5,4.5 + parent: 1 + type: Transform +- proto: ClosetWall + entities: + - uid: 23 + components: + - rot: -1.5707963267948966 rad + pos: 2.5,0.5 + parent: 1 + type: Transform + - air: + volume: 200 + immutable: False + temperature: 293.1496 + moles: + - 1.8856695 + - 7.0937095 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + type: EntityStorage + - containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 91 + - 89 + - 67 + type: ContainerContainer + - uid: 71 + components: + - rot: -1.5707963267948966 rad + pos: 2.5,3.5 + parent: 1 + type: Transform + - air: + volume: 200 + immutable: False + temperature: 293.1496 + moles: + - 1.7459903 + - 6.568249 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + type: EntityStorage + - containers: + entity_storage: !type:Container + showEnts: False + occludes: True + ents: + - 39 + type: ContainerContainer +- proto: ComputerTabletopShuttle + entities: + - uid: 13 + components: + - pos: 1.5,5.5 + parent: 1 + type: Transform +- proto: ComputerTabletopStationRecords + entities: + - uid: 36 + components: + - rot: -1.5707963267948966 rad + pos: 2.5,4.5 + parent: 1 + type: Transform +- proto: ComputerWallmountWithdrawBankATM + entities: + - uid: 63 + components: + - pos: -0.5,-0.5 + parent: 1 + type: Transform + - containers: + board: !type:Container + ents: [] + bank-ATM-cashSlot: !type:ContainerSlot {} + type: ContainerContainer + - type: ItemSlots +- proto: CrowbarRed + entities: + - uid: 89 + components: + - flags: InContainer + type: MetaData + - parent: 23 + type: Transform + - canCollide: False + type: Physics + - type: InsideEntityStorage +- proto: DefibrillatorCabinetFilled + entities: + - uid: 34 + components: + - rot: 1.5707963267948966 rad + pos: -0.5,1.5 + parent: 1 + type: Transform +- proto: EmergencyLight + entities: + - uid: 50 + components: + - rot: -1.5707963267948966 rad + pos: 1.5,2.5 + parent: 1 + type: Transform +- proto: ExtinguisherCabinetFilled + entities: + - uid: 108 + components: + - rot: 1.5707963267948966 rad + pos: -0.5,0.5 + parent: 1 + type: Transform +- proto: FaxMachineShip + entities: + - uid: 55 + components: + - pos: 0.5,4.5 + parent: 1 + type: Transform +- proto: FirelockGlass + entities: + - uid: 9 + components: + - pos: 0.5,-0.5 + parent: 1 + type: Transform +- proto: GasPassiveVent + entities: + - uid: 37 + components: + - rot: -1.5707963267948966 rad + pos: 3.5,2.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor +- proto: GasPipeStraight + entities: + - uid: 27 + components: + - rot: 1.5707963267948966 rad + pos: 2.5,2.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor +- proto: GasPort + entities: + - uid: 65 + components: + - pos: 1.5,1.5 + parent: 1 + type: Transform + - color: '#0055CCFF' + type: AtmosPipeColor +- proto: GasVentPump + entities: + - uid: 45 + components: + - rot: 3.141592653589793 rad + pos: 1.5,0.5 + parent: 1 + type: Transform + - color: '#0055CCFF' + type: AtmosPipeColor +- proto: GasVentScrubber + entities: + - uid: 3 + components: + - rot: 1.5707963267948966 rad + pos: 1.5,2.5 + parent: 1 + type: Transform + - color: '#990000FF' + type: AtmosPipeColor +- proto: GravityGeneratorMini + entities: + - uid: 90 + components: + - pos: 3.5,2.5 + parent: 1 + type: Transform +- proto: Grille + entities: + - uid: 6 + components: + - rot: 1.5707963267948966 rad + pos: -0.5,5.5 + parent: 1 + type: Transform + - uid: 17 + components: + - rot: 1.5707963267948966 rad + pos: -0.5,4.5 + parent: 1 + type: Transform + - uid: 28 + components: + - rot: 1.5707963267948966 rad + pos: 2.5,5.5 + parent: 1 + type: Transform + - uid: 30 + components: + - rot: -1.5707963267948966 rad + pos: 2.5,1.5 + parent: 1 + type: Transform + - uid: 31 + components: + - rot: 1.5707963267948966 rad + pos: 1.5,6.5 + parent: 1 + type: Transform + - uid: 57 + components: + - rot: 1.5707963267948966 rad + pos: 0.5,6.5 + parent: 1 + type: Transform + - uid: 61 + components: + - rot: -1.5707963267948966 rad + pos: 3.5,4.5 + parent: 1 + type: Transform + - uid: 64 + components: + - rot: 1.5707963267948966 rad + pos: 0.5,5.5 + parent: 1 + type: Transform + - uid: 70 + components: + - rot: 1.5707963267948966 rad + pos: 2.5,6.5 + parent: 1 + type: Transform + - uid: 76 + components: + - rot: 1.5707963267948966 rad + pos: 3.5,5.5 + parent: 1 + type: Transform +- proto: Gyroscope + entities: + - uid: 38 + components: + - rot: -1.5707963267948966 rad + pos: 3.5,1.5 + parent: 1 + type: Transform +- proto: NoticeBoardNF + entities: + - uid: 96 + components: + - rot: 1.5707963267948966 rad + pos: -0.5,3.5 + parent: 1 + type: Transform +- proto: PlasticFlapsAirtightClear + entities: + - uid: 52 + components: + - pos: 1.5,-0.5 + parent: 1 + type: Transform +- proto: PortableGeneratorPacman + entities: + - uid: 44 + components: + - anchored: True + pos: 1.5,2.5 + parent: 1 + type: Transform + - storage: + Plasma: 3000 + type: MaterialStorage + - bodyType: Static + type: Physics + - type: InsertingMaterialStorage +- proto: PosterContrabandEAT + entities: + - uid: 93 + components: + - pos: 2.5,-0.5 + parent: 1 + type: Transform +- proto: Poweredlight + entities: + - uid: 18 + components: + - rot: -1.5707963267948966 rad + pos: 1.5,1.5 + parent: 1 + type: Transform +- proto: ReinforcedWindow + entities: + - uid: 5 + components: + - rot: 1.5707963267948966 rad + pos: 3.5,5.5 + parent: 1 + type: Transform + - uid: 25 + components: + - rot: 1.5707963267948966 rad + pos: 0.5,6.5 + parent: 1 + type: Transform + - uid: 35 + components: + - rot: 1.5707963267948966 rad + pos: 2.5,6.5 + parent: 1 + type: Transform + - uid: 40 + components: + - rot: 1.5707963267948966 rad + pos: -0.5,4.5 + parent: 1 + type: Transform + - uid: 42 + components: + - rot: 1.5707963267948966 rad + pos: 1.5,6.5 + parent: 1 + type: Transform + - uid: 58 + components: + - rot: 1.5707963267948966 rad + pos: 0.5,5.5 + parent: 1 + type: Transform + - uid: 69 + components: + - rot: 1.5707963267948966 rad + pos: 2.5,5.5 + parent: 1 + type: Transform + - uid: 74 + components: + - pos: 3.5,4.5 + parent: 1 + type: Transform + - uid: 77 + components: + - rot: 1.5707963267948966 rad + pos: -0.5,5.5 + parent: 1 + type: Transform + - uid: 100 + components: + - rot: -1.5707963267948966 rad + 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 + components: + - pos: 0.5,-0.5 + parent: 1 + type: Transform + - links: + - 24 + type: DeviceLinkSink +- proto: SignalButton + entities: + - uid: 24 + components: + - rot: 1.5707963267948966 rad + pos: -0.5,0.5 + parent: 1 + type: Transform + - linkedPorts: + 60: + - Pressed: Toggle + type: DeviceLinkSource +- proto: SpawnPointLatejoin + entities: + - uid: 72 + components: + - rot: -1.5707963267948966 rad + pos: 0.5,3.5 + parent: 1 + type: Transform +- proto: SubstationWallBasic + entities: + - uid: 97 + components: + - rot: -1.5707963267948966 rad + pos: 2.5,2.5 + parent: 1 + type: Transform +- proto: Table + entities: + - uid: 46 + components: + - pos: 1.5,-0.5 + parent: 1 + type: Transform +- proto: TableReinforced + entities: + - uid: 16 + components: + - rot: -1.5707963267948966 rad + pos: 0.5,4.5 + parent: 1 + type: Transform + - uid: 78 + components: + - pos: 2.5,4.5 + parent: 1 + type: Transform + - uid: 101 + components: + - 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 + components: + - pos: 2.5,-0.5 + parent: 1 + type: Transform + - uid: 12 + components: + - pos: -0.5,0.5 + parent: 1 + type: Transform + - uid: 14 + components: + - pos: -0.5,1.5 + parent: 1 + type: Transform + - uid: 15 + components: + - pos: -0.5,2.5 + parent: 1 + type: Transform + - uid: 47 + components: + - rot: 3.141592653589793 rad + pos: 2.5,0.5 + parent: 1 + type: Transform + - uid: 59 + components: + - rot: 3.141592653589793 rad + pos: 2.5,2.5 + parent: 1 + type: Transform + - uid: 66 + components: + - pos: 2.5,3.5 + parent: 1 + type: Transform + - uid: 87 + components: + - pos: -0.5,-0.5 + parent: 1 + type: Transform + - uid: 107 + components: + - pos: -0.5,3.5 + parent: 1 + type: Transform +- proto: WallSolidDiagonal + entities: + - uid: 73 + components: + - rot: 3.141592653589793 rad + pos: 3.5,3.5 + parent: 1 + type: Transform +- proto: WarpPointShip + entities: + - uid: 26 + components: + - rot: -1.5707963267948966 rad + pos: 1.5,3.5 + parent: 1 + type: Transform +- proto: WindoorSecure + entities: + - uid: 11 + components: + - pos: 1.5,-0.5 + parent: 1 + type: Transform + - links: + - 92 + type: DeviceLinkSink + - linkedPorts: + 92: + - DoorStatus: Close + type: DeviceLinkSource + - uid: 92 + components: + - rot: 3.141592653589793 rad + pos: 1.5,-0.5 + parent: 1 + type: Transform + - links: + - 11 + type: DeviceLinkSink + - linkedPorts: + 11: + - DoorStatus: Close + type: DeviceLinkSource +- proto: Wrench + entities: + - uid: 67 + components: + - flags: InContainer + type: MetaData + - parent: 23 + type: Transform + - canCollide: False + type: Physics + - type: InsideEntityStorage +... diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/happyhonk.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/happyhonk.yml index df1432611ba..98c986fef13 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/happyhonk.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/happyhonk.yml @@ -3,7 +3,9 @@ startingInventory: HappyHonk: 10 HappyHonkMime: 4 - MysteryFigureBoxBulk: 5 + HappyHonkCargo: 10 # Frontier + ClothingHeadHatMcCrown: 10 # Frontier + MysteryFigureBoxBulk: 5 # Frontier emaggedInventory: HappyHonkCluwne: 1 HappyHonkNukie: 1 diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml index 99fc5758056..606ba5a530e 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml @@ -109,6 +109,20 @@ tags: - WhitelistChameleon +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatMcCrown + name: mccargo crown + description: 'Crowns and tiaras, McCargo King.' + components: + - type: Sprite + sprite: _NF/Clothing/Head/Hoods/mccargocrown.rsi + - type: Clothing + sprite: _NF/Clothing/Head/Hoods/mccargocrown.rsi + - type: Tag + tags: + - WhitelistChameleon + - type: entity parent: ClothingHeadBase id: ClothingHeadHatPilot diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/box.yml new file mode 100644 index 00000000000..10538c960c5 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/box.yml @@ -0,0 +1,19 @@ +- type: entity + id: HappyHonkCargo + parent: HappyHonk + name: mccargo meal + components: + - type: Sprite + sprite: _NF/Objects/Storage/Happyhonk/cargo.rsi + state: box + - type: Item + sprite: _NF/Objects/Storage/Happyhonk/cargo.rsi + heldPrefix: box + - type: StorageFill + contents: + - id: MysteryFigureBox + orGroup: GiftPool + - id: ClothingHeadHatMcCrown + orGroup: GiftPool + - type: StaticPrice + price: 40 diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/mothership-computers.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/mothership-computers.yml index 356b4a065c6..71dd1a4b2e7 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/mothership-computers.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/Computers/mothership-computers.yml @@ -20,6 +20,16 @@ - Fighter - Cleric - Rogue + +# The mccargo console +- type: entity + id: McCargoMothershipComputer + name: McCargo delivery ship console + parent: BaseMothershipComputer + components: + - type: ShipyardListing + shuttles: + - McDelivery # The caduceus console - type: entity diff --git a/Resources/Prototypes/_NF/Shipyard/mccargo.yml b/Resources/Prototypes/_NF/Shipyard/mccargo.yml index 05a92d396d3..87d35fe561b 100644 --- a/Resources/Prototypes/_NF/Shipyard/mccargo.yml +++ b/Resources/Prototypes/_NF/Shipyard/mccargo.yml @@ -6,21 +6,21 @@ # - type: vessel - id: mccargo + id: McCargo name: DC McCargo description: "Your very own McCargo :tm: franchisee! comes fully stocked and ready for production of McCargo meals" - price: 72000 # 10% up from sell + price: 68900 # 10% up from sell category: Medium group: Civilian shuttlePath: /Maps/_NF/Shuttles/mccargo.yml - type: gameMap - id: mccargo + id: McCargo mapName: 'DC McCargo' mapPath: /Maps/_NF/Shuttles/mccargo.yml minPlayers: 0 stations: - mccargo: + McCargo: stationProto: StandardFrontierVessel components: - type: StationNameSetup diff --git a/Resources/Prototypes/_NF/Shipyard/mcdelivery.yml b/Resources/Prototypes/_NF/Shipyard/mcdelivery.yml new file mode 100644 index 00000000000..d60bb242643 --- /dev/null +++ b/Resources/Prototypes/_NF/Shipyard/mcdelivery.yml @@ -0,0 +1,33 @@ +# Maintainer Info +# GitHub: dvir001 +# Discord: dvir01 (84770870936997888) + +# Shuttle Notes: +# + +- type: vessel + id: McDelivery + name: DC McDelivery + description: "Fast food fast ship, bring the McCargo meals to the people" + price: 11300 + category: Small + group: None + shuttlePath: /Maps/_NF/Shuttles/mcdelivery.yml + +- type: gameMap + id: McDelivery + mapName: 'DC McDelivery' + mapPath: /Maps/_NF/Shuttles/mcdelivery.yml + minPlayers: 0 + stations: + McDelivery: + stationProto: StandardFrontierVessel + components: + - type: StationNameSetup + mapNameTemplate: 'McDelivery {1}' + nameGenerator: + !type:NanotrasenNameGenerator + prefixCreator: '14' + - type: StationJobs + overflowJobs: [] + availableJobs: {} diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/mccargocrown.rsi/equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hoods/mccargocrown.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..b1081f212cf9fbc7ab881bd9d15e63463f8ed88b GIT binary patch literal 494 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zS9rQOhE&XX zd&}P2DNus#!}D49{xCc4Fxz5b&eHqvj(SGV355dftZwd$0aqlAgC4&*55tpJtdFZjUxp>m{PJhV7sl({7rAtn1c$!K zJ$8|ERYjet$1S!KJyRV^_w8tSw6VM7(yVr3wl{I*e@KzrL2%q zd!;mU$@!Pn*OwOD_A$GaadFLj$wfIrj}Bk_deybKZi0hV>cWdAwb^HRKTg>@>y>I} z>#b=g&mCt=GoQt_TRr#AJ=?Bl-TN6;kGH)pkN>{T)cnY7aj)&d)t{ZN+$qRto0Q!B zUHCr#jl!mV-!I<$<9@+y_vg;d*@bKqA6?`Y`Y3tkR%c^1lM6C1xg>t^=b^&M>__Z? P5y;@_>gTe~DWM4fnyBFW literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/mccargocrown.rsi/icon.png b/Resources/Textures/_NF/Clothing/Head/Hoods/mccargocrown.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..16460121610ab3f5ebf0c5aca0cba8632167242f GIT binary patch literal 504 zcmVPx$vPnciR9J=Wl(B0QVHn1LmnPWKq%@>wz#=HrQK!zDp+iw9I244^$wjwl5dz(u zViEQ4uuH+E;{}}j4^pdOf;H!T*Nb=8yUShfK8K*Fi(f#|;eN}@_r5O=4-en>K~7Fi zPR>6@Q(ZI+)i0w)U<5IBPT-f8Kz6*OHz7x|STbWO(K<^v2(3iW;O{(dDDFU`P*XW%Lr!t@%)%#ahrCz_lC_7J0Uxu-RE&9}!E<&-2 zZGGfi;WI)wT)z26SywrM>imc-@gcP#>XOAKyH7rm#U?~uNNuvjXK{AA1e6U3VUvw4 zN_-(pT(+7=0Bkjn$P#zbA6W=t{~ZH6dj-`7p({7&Og)#1FA7KqhV~3qR zWy$F<41VhMl^6`?4m(PF;$_Nq=Kim%siOzeD{Q0uP_=YXG~?9>|4- u3YBsh&-Za%k9&`wD_^{voSdAT|BA2ZVa3 z%B0r;7ZO&__;Sqo#ed!DEay%>oG@F)gFy)b7MUi$@cU6zzT#bay4!IXy;#NrpKTZ% z1X#E~+8-@Fv+$PHj;nF`&gF+Jqz?Mlurgf#tIW!f_h_|+)L-wKz-8}R5~nE6mCCS8 zo>S&~W?8b0jpmJMOt-X;g*#L;SBWb|ZEJnI?Qf-?U(lXq!9055-Rqma*>25=um67A z_bvalb7I9?bw{ZB62?n67+x|h*~oZ_Rb=Dzxf%)o_#Nx+mgjlZTV4BCxNH{Emo)5Ogmiavc5=5ug?fGb8pdp`Wype=Vec%^=S&~+R2i=}%D zE|@IKRLin|`tG#y#(l-pPwW@d-*HZ2Ryqg64!hgJ3=1mT3g#C63=e2r^YdxN!7`;E zjV*b{4}ElSlZdFO5(^Mz{GxR>u50PfU=^u?lDx&MwQjsvdEfN<=a0|WCE~)w_voDd zwA}NKaOU^Wz*0NrP0u`Rm~XZ5W>`5~zR|FZ*<|fkUXL2~l+df%@76!p`*kbtFJA)l zESQ@^_QxFdTd;@GYjXV*hJXA&_A-X{oC@=NC%fV9PSFE7a`yZ4T-jeH-w>U;o3VLv zb;dl!LkFTF7!!&&{m-8@VK-yAGwU{M>v{3&Wi8_BTFTM7Mdw-h+Pgo0TQB*i+Tf_k kp94pIALf9ACuFXFE63`+?^jQ62Sx~kr>mdKI;Vst0G(gO-T(jq literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/mccargocrown.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Hoods/mccargocrown.rsi/meta.json new file mode 100644 index 00000000000..3111bdb74b2 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Head/Hoods/mccargocrown.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by gentlebutter", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Storage/Happyhonk/cargo.rsi/box-inhand-left.png b/Resources/Textures/_NF/Objects/Storage/Happyhonk/cargo.rsi/box-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..b32610fd2954783fd183480df1be1a2cfcd1046e GIT binary patch literal 536 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zcX+xuhE&XX zd&|(9DN%y`!++P}Mj1ELxycJ0b8}lKO%kYOxW257jorSfc^z+U)3#$A$~oCtCo(cJ zd6ZhBvZ|#IE%p|CfA9HM!@vI>_BhV3{!{(_ZsB`w0YMm0P3Sq8UVXl#NZa7pioK6! z6;E(|@p@T~+_mtl`|P>=S4}WvJL|Raz5b28?<!+gE=r zVrTfUr@}tdE->BMW`AwV?Z*8IG3R&1$g4Xq2=s2f?Qi{CuT0U+rom0OHEXXlr=yqR zZne1J8jg_HcR$1?ar{|#@s&-~_21qm4M0O1`9;LeGcv6G&iuMcsFqi`j)lRY`tz6c z$G;A_Rt7Gb?#OULKi^|&kLt_R3om;w)E{8jB7NZ)VZ!V)qeZ2f#?tRIPA{El&m_@M z#(Zm;62t7wl8ciQHV2t3t&uwLVdWc7B`Jq|t>`4b0+ESdId-nuxkjXM#$?+hMwzMG z98%;TzI$$SZpNSDldUt%b#_GQdx93Skt~HQpeeo=G9+R-2^7FO!`8j`g&Y$wH`R_lQ zUMB7WDa%c>nd3P>t9%gIFq`>(;CGP+3uXsKHe^N|GU@R0zV703rSf*)JRQZaNmt7+ zZjR1<`mgamgVLfi4_{wD^)K#7#L1UC{G)zr=L;s*c`TVLaLSpdTzp2lMuRnjxyS+8 z25GJbdd$szRe{NHxLl?;9MUNhQMy?*}Ct7BkrahY$M`1bSOiCtd6aOO*m@J#ddWzYh$ VVL^W>crqvkJYD@<);T3K0RY|{uJ@VVD_U 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 P00000NkvXXu0mjfwMPG| literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Storage/Happyhonk/cargo.rsi/box.png b/Resources/Textures/_NF/Objects/Storage/Happyhonk/cargo.rsi/box.png new file mode 100644 index 0000000000000000000000000000000000000000..cea221cb920a52c5ffff9b4a258ed9f232e5d1ca GIT binary patch literal 3207 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 t7KT~H0000EWmrjOO-%qQ00008000000002eQ Date: Sun, 21 Jan 2024 18:52:53 +0000 Subject: [PATCH 2/4] Automatic Changelog (#843) --- Resources/Changelog/Changelog.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 4b2c0fc1e3b..f459d367d39 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -2870,3 +2870,11 @@ Entries: message: Altered the SLI ships to bring them into line with mapping standards id: 4753 time: '2024-01-18T23:24:51.0000000+00:00' +- author: dvir01 + changes: + - type: Add + message: >- + Added the McDelivery to the McCargo on ship shipyard, now you can do + your fast food delivery with your very own fast food delivery ship. + id: 4754 + time: '2024-01-21T18:52:29.0000000+00:00' From 51f42e51662e747d2ddfc907e104c4b5297286b5 Mon Sep 17 00:00:00 2001 From: Maxtone <124747282+MagnusCrowe@users.noreply.github.com> Date: Mon, 22 Jan 2024 06:14:42 -0600 Subject: [PATCH 3/4] Adds plasteel arming sword (#887) * Adds plasteel broadsword * Fixed strap * I guess it's more of an arming sword * Based on cap sabre * remove sword tag * Grid Inventory moment, its using the parent 15 size anyway --------- Co-authored-by: Dvir <39403717+dvir001@users.noreply.github.com> Co-authored-by: Dvir --- .../Entities/Objects/Weapons/Melee/sword.yml | 34 ++++++++++++++++++ .../armingsword.rsi/equipped-BACKPACK.png | Bin 0 -> 3653 bytes .../Melee/armingsword.rsi/equipped-BELT.png | Bin 0 -> 3435 bytes .../Weapons/Melee/armingsword.rsi/icon.png | Bin 0 -> 3158 bytes .../Melee/armingsword.rsi/inhand-left.png | Bin 0 -> 3251 bytes .../Melee/armingsword.rsi/inhand-right.png | Bin 0 -> 3258 bytes .../Weapons/Melee/armingsword.rsi/meta.json | 30 ++++++++++++++++ 7 files changed, 64 insertions(+) create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/sword.yml create mode 100644 Resources/Textures/_NF/Objects/Weapons/Melee/armingsword.rsi/equipped-BACKPACK.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Melee/armingsword.rsi/equipped-BELT.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Melee/armingsword.rsi/icon.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Melee/armingsword.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Melee/armingsword.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Melee/armingsword.rsi/meta.json diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/sword.yml new file mode 100644 index 00000000000..091e5c57a72 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/sword.yml @@ -0,0 +1,34 @@ +- type: entity + name: plasteel arming sword + parent: CaptainSabre + id: PlasteelArmingSword + description: An ancient design manufactured with modern materials and machines for a very specific target demographic. + components: + - type: Sharp + - type: Sprite + sprite: _NF/Objects/Weapons/Melee/armingsword.rsi + state: icon + - type: MeleeWeapon + wideAnimationRotation: -135 + attackRate: 1.5 + damage: + types: + Slash: 15 + soundHit: + path: /Audio/Weapons/bladeslice.ogg + - type: Reflect + enabled: true + reflectProb: .1 + spread: 90 + - type: Item + sprite: _NF/Objects/Weapons/Melee/armingsword.rsi + - type: Tag + tags: + - WeaponMelee + - type: DisarmMalus + - type: Clothing + quickEquip: false + slots: + - back + - suitStorage + - belt diff --git a/Resources/Textures/_NF/Objects/Weapons/Melee/armingsword.rsi/equipped-BACKPACK.png b/Resources/Textures/_NF/Objects/Weapons/Melee/armingsword.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000000000000000000000000000000000..67f678b3ffb0e1256f8097d63040c25ce410dd13 GIT binary patch literal 3653 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 QSP4Qc0k2k2 zL{!)ULmj3p-cTt#CB;Ziry!?OrpAOyva}lKV$H9~Sz=}=o8`{})AQ?;$^Jnm`v(Dc zH>r2@8Gs)4F|8Wb-?1b~wjvop)7iviU{Yds)bKmZT`1ONd*01yBK00BS% z5CDuni`&8i8Wn=x21|3JYpC8+Y+^#B(!uiS5Wl?ulun2A`0SSjPR(>ky<-3Y-~m^Z z*WNtmS{opzK`OozOm7b#3CI9wawJh0k_awtR2-Et;~iq@{f+f?@$AYL9hV9RTv1I! z5~MZF5D^0IZa&-m&v=SE#a5)PvA!;LI+|4B>$wMAX;8Viqs6JKJ#Iu4>r-pST3QDv znzyn&Ug~ycKrmDYDI+q+wa2Z1VAKK)SAxYcz-kDst*!OV0>=eGH3_)8IVI=tdU><1 z?W0;UOWlKDHM9J0N?{#zPaHzNNF&QFpbTB7KmZT`1ONd*01yD|D}M(7 XtGKLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=00004XF*Lt006O$eEU(80000WV@Og>004R=004l4008;_004mL004C` z008P>0026e000+nl3&F}0007pNklAJF_ zbKv4H>2mzjImhSfe@)DcJlg_tZUR662mk>f00e*l5C8%|00;m9AOHkF4s9{+i5DmP zJUrS101Cdp>@@Qc0mGv`)apI}j34us0<^ugPPMwv@3y|+J3aycKj{>(UcX`hc=@6* z`9b{??|k0Gr4JBIWCW(&b9{LGWA=9CP3UA-*8>1R_xCwPBEZbrBka7vkM~?!UE*q` z$d4U2ZO$lun)p7GuH~6i~@D_X9a-L)&@<6vrgY3iy;9Z00e*l5C8%|03==w&Z3Et2oL}QAX_!S zw572ylN1mD0zd!=0F!pwDDnBvug1&y#mPROd1an^0JXZ0zp}Ye3#!p3P3xwp=Xn#a z9mfe>3k2tjx>nHf#kDQoJ?Ii}FUu`EO$zf>`T3-3!0thpT-)NC;}2%iA*z}>O`(mW z{6_WVp&FfJBx;3&dcD%;VNewPm#IS7JRVSat-z^9Kw6{GXaE2e5(_k26=M z`v4`umDdU!SBKOB5L9JnwNW7{1hqLMs)D=_B~|{1S{o;IzYRwd`x2rQU~K?um&U9% zDwvK0qX2@tG}K0gY0XmF5OiyT7J%TF&q`s`O;wWr4$E>_0OZ>K3;?+g=DW>;(Q5zz N002ovPDHLkV1gH7TE_qY literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Weapons/Melee/armingsword.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/Melee/armingsword.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..9d4538c052b4a6a015d586380e27d9b13e553b14 GIT binary patch literal 3158 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Weapons/Melee/armingsword.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Weapons/Melee/armingsword.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..bd5fe17307c33cd21cf5c1c20df72748c15acdff GIT binary patch literal 3251 zcmV;k3{3NhP)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=00004XF*Lt006O$eEU(80000WV@Og>004R=004l4008;_004mL004C` z008P>0026e000+nl3&F}0005bNklp8{sDuF zi!-{h`#byxvaq?ZnlKS2!Vbv7QYas?Bg=8I2{DC~a!*_Bdy*!EkGAK@y|*cEjff!4 zl|jmj00bZa0SG_<0uX=z1Rwwb2tWV=q_2)_@9@)klXbU-%lmh8$bKe`^6$6g`1T2> zxd)Tz5n!YF&3bw5c`wbnTTA{F@N0h3D2MsuQT!18)Ee-7cP(EZj{*S3n7uXtIJwD+ z2eE-*w?ss3TMa7GY<0wO=d$l_9d|CxR!3HYifEpr+6b65%ChXaC>HYQ4@VeJ7lEh2 zc)F1OaD-wZk7dsdJB0$3i6R%+Z0PFZ%-H&FA}@n}_0x#-ha&)xZH-0Ud}IJY5aMV) zQh;3uaWx+~fFA+?#MOLci{Q5T?gN9=0Pt>*00bZa0SG_<0uX=z1Rwwb2tWV=5P$## z_+J2;ahA5!1Yp`^PJ5M}@= z5fC^M4oY3l%l+;^!<0@@M*v)p1; zBP<<3jN-yx86hoL$ayRviDAsCf}*?>^oDV~h4U=toeVlUBwPapal}bUVJ}(C#i$b~ zzmTo-zDdTtThf$Y9ZZdq0?ChiNHyys_GrS4zhMY6fjLi4mwQoI;3vIUeawta_ou1qKG>D zQ|}s)hcN@qpd?5M(9|UgLuU(Gf&voYIPBuQ2JVRiN1+$rra>6`Bqx{%*uCOqAu31( zJWOtJ+Q35vRE^(H&;f8M!0c|+qXfQ)11SS*cYRRX1Ukm(spMOQ=%&{ zheIY@j_&K>2ml4CELUm|&jZG2YsSVDk}$Lm;@h7{FZrCE*Df~3D}AnlTk#K_ybzOY z;0#kC4fDQudwY+>;~`bSUxY;WdOFQUP_VUNedzPAH#&tW*!lU5_4O}?JrFymA?uI} zM3+N{_4(u9p{i$uoIV~ z!bO?a%o%-?v~yn`$`td(L()WgZ%=|lAUi(`lM{z|M6QgZF84Lg^$Ko-Fn5DAUjQCz3rN6*8Z`RJ0njc87p>LeI_hK> z>ma?+c^%(Lb>^rL1rg}!g3v=KUBhnpIf_(8K!jsPYq>=oB|mF&%XOH0#H9PsN_1I$ zq*e2w`{P8O-znT0PC=qIK+fdEyAVg@oB-!fB4^8qKH=@uCt*w!;2Df#Hs>=+mDiWH zNPzKJ>2n{b`CU_rwbyM5oa;2deX1L>&?|ZQ#V4fWs00px^Jl_T>YhUlUWP$ zCj35ds=ZVw+?=TNpj${*hxSW#d}k+D8^cY%=$G-_5RhY7pirbBjxz5O;!7_x`XJcM@VkfI zSw=b*t}n(v%b3h0Ngo^s?NJn9jEBkyVN)92(*A6#(t zswY!=CB}1SAbK6W-n}ln&b7{aU`L5|*7SXMV!0}8G4#lgV}pJ}ZiCb8H;*l2lKU%HX*816z^J(TZN@aG2b%}M^Zj@KW`@O#o2FS4)>Fe< zdf&6Y6Ca_dX<}F+`{NM89C_?y>Jvbmp`-&snNBPwOlKw_?%g3Re`>@W65QSC|4_Y%SaOj*Pw?oz0QYQ|t7; zMB6Ia6vM4-A2jGzqpNSvwp6#2GL&LX(@iV$XA#}CKQV)t@+OYjjW49Q8jLq4#0lZd zhG^=o>E26kOAl!d`TJarj3#!TwvyYHJM`%XKW63o%1gOpulF=UdXF- z!?nWguAQC)J?H(Dq@j#+`&B=`tM#$~tHq*~98n#y(OJ#wG4La$nwPMdJ(fD=NgI7H z^!w}tnbS9?#O_dPq3GCX>llqBpEx+@q;!@%Y7!59x~%<2J5zfp4b^eWX_Fk80dzyqJa!m+NS z=u*~l2}UvHOiklB)4Q+!(V`bEV|{u1fC+Uwi88Q@y9>c5IjJxi_XTP%deihkU(_Th z?MG^>e4s$DY_Zq|HcF^GrPY|mcri~opEdUxkGG7Pa+`EyT55_fq=MHZ9fR0Ld~<&` zT;&#Bf6@CSu}Sh~2HBujLrT?k8*xeuq~tryR(MX7tRCTJ?fz*ren=^^GXKu#?nuKB zE=BS6{+r8P#xBN{G)!@fk+nEC{99YqBc*y(-#{GY8q4)NG51NUR6izQM7?LsDtE23 zYC_utgG{`_A9fB!bT$%s?NC`!ZbXOd;OBN9n877&mK&Y^#Gtvh9Fm~m`bEHAzY z;{!IhVv$3ia`3M{lvnm(UB}(0+_%0hiRatVW>#c<%c6ZkGr#bGX8Hby-Q!<6ILWM0 zVO&cj28u2Er24Vdt#oi~R7C^!4t50l15?#}(ZAOYX-E&aRbku0Gg~ zvm&xGnQ@8}EpFiwWLz z8C!lthum+b_g|UPxlG(tX;m4sKltc>P>d)t3o^&)-RtiR=TOKuI; z-V3`I)Ycg6PT1ngR~%bBY76|ydO16jucWrvb{K>t^b(GjSr4Qy9@l6ef*0@9jJoCNxU9`G&*wpBK0_#4thN~CwVxACT1u9uDX)a zs)pbB)>$cZ+;v`U41v( z2LoiKA0FL5-R(r-QQZ4Q%XDVz&v{-5UwZtmJGPuCJx%9GProD~&OSVIkrl^X-J2u` zEfXyO>XM$Hnx|jQJTCecCIAH81|TdFfZvx_yam8tQUGi_0-&4?02?yRp;s3Gq8S5i zEm*+9k9jq-u6xX+UkM6-UjTVgP9|3UMQ(OHhrK=C*M)%ks2oq6M^&j3NvuM`%3APz zfUaZXZnl>uj_(M={HNW3X{zMb=9ak0zBylnTt8$83a-(I0TLcSM6UVYc8U#$>@K)} z)@JytX3sYuv^33rLT}$nor}fw$?~gIhJQ}*pEYI>MQJB0&4xdRK@S!07I@f8_ef_s z-pokk`uppER>DjNI>LL_gLIf4ZVvp2O|fYa2%pL}T2Xel4o)#EtwJX969hcG{x#R>U^eB?p(1dlbv`^EuT&UMc^t z@_z(hWBeSXkRd$IK&jc3zork{tnaeF7Xpi6u1IB*j27K4@)IDRZHD?S_^+(D+l@C5 z((AC=9-GXatkE}1GrD<+Ct=XszkpWt<~ued2@hq|T`ml!oHz#(*J9_LrwWHhp*?2^ q_`2_y;2WpjN8%kwqHB*)?W7 Date: Mon, 22 Jan 2024 12:15:11 +0000 Subject: [PATCH 4/4] Automatic Changelog (#887) --- Resources/Changelog/Changelog.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index f459d367d39..c70d1e74232 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -2878,3 +2878,9 @@ Entries: your fast food delivery with your very own fast food delivery ship. id: 4754 time: '2024-01-21T18:52:29.0000000+00:00' +- author: MagnusCrowe + changes: + - type: Add + message: Added plasteel arming sword! + id: 4755 + time: '2024-01-22T12:14:42.0000000+00:00'