From 4da7b42d913da02345eccd74438564ddb25cd2bb Mon Sep 17 00:00:00 2001 From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Date: Sat, 18 May 2024 14:35:07 +0300 Subject: [PATCH 01/14] Loadout Hotfix (#1385) * Fixes and tweaks * salvager rig fix * typo --- .../_NF/Catalog/Fills/Items/belt.yml | 18 +++++-- .../_NF/Catalog/Fills/Items/misc.yml | 6 +-- .../_NF/Entities/Clothing/Belt/belts.yml | 47 ++++++++++++------- .../_NF/Entities/Clothing/Neck/misc.yml | 3 ++ .../_NF/Loadouts/Jobs/Contractor/belt.yml | 4 +- .../_NF/Loadouts/Jobs/Contractor/jumpsuit.yml | 13 +++++ .../Loadouts/contractor_loadout_groups.yml | 2 +- .../_NF/Loadouts/mercenary_loadout_groups.yml | 7 ++- .../_NF/Loadouts/pilot_loadout_groups.yml | 2 +- 9 files changed, 73 insertions(+), 29 deletions(-) diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/belt.yml index f7da3a914c4..2b5d57b11cd 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Items/belt.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Items/belt.yml @@ -49,8 +49,17 @@ - type: entity id: ClothingBeltSalvageWebbingFilledNF - parent: [ ClothingBeltSalvageWebbing, ClothingBeltUtility ] - suffix: Filled + parent: ClothingBeltSalvageWebbing + suffix: Filled, Engineering + components: + - type: StorageFill + contents: + - id: Crowbar + - id: Wrench + - id: Screwdriver + - id: Wirecutter + - id: Welder + - id: Multitool - type: entity id: ClothingBeltChaplainSashFilled @@ -63,6 +72,5 @@ - id: Censer - id: Bible - id: Lantern - - id: ChaplainHolywaterBottleFilled - - id: WoodenStake - amount: 2 + - id: ChaplainHolywaterFlaskFilled + - id: UrnMortuary diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/misc.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/misc.yml index d7833b3fbda..2dc75b0e9f3 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Items/misc.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Items/misc.yml @@ -23,9 +23,9 @@ parent: [ClothingShoesBootsNfsdCream, ClothingShoesBootsCombatFilled] - type: entity - parent: ChemistryEmptyBottle04 - id: ChaplainHolywaterBottleFilled - name: holy water bottle + parent: DrinkFlaskBar + id: ChaplainHolywaterFlaskFilled + name: holy water flask description: Blessed be this holy water by the deity of your choosing. components: - type: SolutionContainerManager diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts.yml index 9067dd4a752..65284e1e2b3 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Belt/belts.yml @@ -26,32 +26,47 @@ # TODO: Fill this out more. whitelist: tags: - - Book - - Smokable - - Flare - - Matchstick - - Flashlight - - Trash - - CigPack - - Radio - - Crayon - - Bottle - - WeaponMeleeStake - - Censer - - ReligiousSymbol - - Crucifix - - Spear - - Wooden + - ObjectOfSpiritualSignificance + - Censer + - ReligiousSymbol + - Crucifix + - WeaponMeleeStake + - Book + - Smokable + - Matchstick + - Flashlight + - Trash + - CigPack + - Radio + - Crayon + - Bottle + - DrinkBottle + components: + - BibleComponent + - Drink + - Smokable + - MeleeWeapon + - HandheldLight + - ExpendableLight + - ToggleableLightVisuals + - Paper + - Stamp - type: ItemMapper mapLayers: book: whitelist: tags: - Book + components: + - BibleComponent + - Paper bottle: whitelist: tags: - Bottle + - DrinkBottle + components: + - Drink censer: whitelist: tags: diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Neck/misc.yml b/Resources/Prototypes/_NF/Entities/Clothing/Neck/misc.yml index 72374f0b247..ae5edda9e70 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Neck/misc.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Neck/misc.yml @@ -57,3 +57,6 @@ rechargeCooldown: 440 rechargeSound: path: /Audio/_NF/Effects/silence.ogg + - type: Tag + tags: + - ObjectOfSpiritualSignificance diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/belt.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/belt.yml index 5dfb0b4e07f..c99782cba5b 100644 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/belt.yml +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/belt.yml @@ -121,7 +121,7 @@ - type: loadout id: ContractorClothingBeltSalvageWebbingFilledNF equipment: ContractorClothingBeltSalvageWebbingFilledNF - price: 500 + price: 1500 - type: startingGear id: ContractorClothingBeltSalvageWebbingFilledNF @@ -166,7 +166,7 @@ - type: startingGear id: ContractorClothingBeltPilotFilled equipment: - belt: ClothingBeltPilot + belt: ClothingBeltPilotFilled - type: loadout id: ContractorClothingBeltBandolier diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/jumpsuit.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/jumpsuit.yml index 00499149d04..b809378196c 100644 --- a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/jumpsuit.yml +++ b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/jumpsuit.yml @@ -394,6 +394,19 @@ id: ContractorClothingUniformJumpskirtColorDarkBlue equipment: jumpsuit: ClothingUniformJumpskirtColorDarkBlue + +- type: loadout + id: ContractorClothingUniformJumpsuitColorDarkGreen + equipment: ContractorClothingUniformJumpsuitColorDarkGreen + effects: + - !type:GroupLoadoutEffect + proto: ContractorT1 + price: 500 + +- type: startingGear + id: ContractorClothingUniformJumpsuitColorDarkGreen + equipment: + jumpsuit: ClothingUniformJumpsuitColorDarkGreen - type: loadout id: ContractorClothingUniformJumpskirtColorDarkGreen diff --git a/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml index 6454278b7b9..eef99fcb59a 100644 --- a/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml +++ b/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml @@ -41,7 +41,7 @@ - ContractorClothingUniformJumpskirtColorPink - ContractorClothingUniformJumpsuitColorDarkBlue - ContractorClothingUniformJumpskirtColorDarkBlue - - ContractorClothingUniformJumpskirtColorDarkBlue + - ContractorClothingUniformJumpsuitColorDarkGreen - ContractorClothingUniformJumpskirtColorDarkGreen - ContractorClothingUniformJumpsuitColorTeal - ContractorClothingUniformJumpskirtColorTeal diff --git a/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml index 9c9bdbc7912..cb97c297947 100644 --- a/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml +++ b/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml @@ -7,6 +7,7 @@ #Second Section: Contractor list - ContractorClothingUniformJumpsuitColorGrey - ContractorClothingUniformJumpskirtColorGrey + - PilotClothingUniformJumpsuitPilot - ContractorClothingUniformJumpsuitAtmos - ContractorClothingUniformJumpskirtAtmos - ContractorClothingUniformJumpsuitBartender @@ -44,7 +45,7 @@ - ContractorClothingUniformJumpskirtColorPink - ContractorClothingUniformJumpsuitColorDarkBlue - ContractorClothingUniformJumpskirtColorDarkBlue - - ContractorClothingUniformJumpskirtColorDarkBlue + - ContractorClothingUniformJumpsuitColorDarkGreen - ContractorClothingUniformJumpskirtColorDarkGreen - ContractorClothingUniformJumpsuitColorTeal - ContractorClothingUniformJumpskirtColorTeal @@ -139,6 +140,10 @@ - ContractorClothingBackpackDuffelFilled - ContractorClothingBackpackSatchelFilled - ContractorClothingBackpackMessengerFilled + - PilotClothingBackpackPilotFilled + - PilotClothingBackpackDuffelPilotFilled + - PilotClothingBackpackSatchelPilotFilled + - PilotClothingBackpackMessengerPilotFilled - ContractorClothingBackpackCaptainFilled - ContractorClothingBackpackDuffelCaptainFilled - ContractorClothingBackpackSatchelCaptainFilled diff --git a/Resources/Prototypes/_NF/Loadouts/pilot_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/pilot_loadout_groups.yml index 29a9fd80956..b7051fbf923 100644 --- a/Resources/Prototypes/_NF/Loadouts/pilot_loadout_groups.yml +++ b/Resources/Prototypes/_NF/Loadouts/pilot_loadout_groups.yml @@ -43,7 +43,7 @@ - ContractorClothingUniformJumpskirtColorPink - ContractorClothingUniformJumpsuitColorDarkBlue - ContractorClothingUniformJumpskirtColorDarkBlue - - ContractorClothingUniformJumpskirtColorDarkBlue + - ContractorClothingUniformJumpsuitColorDarkGreen - ContractorClothingUniformJumpskirtColorDarkGreen - ContractorClothingUniformJumpsuitColorTeal - ContractorClothingUniformJumpskirtColorTeal From a6fd22c7c59aeaeb1d217f2ee4740e41c694e442 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Sat, 18 May 2024 11:35:31 +0000 Subject: [PATCH 02/14] Automatic Changelog (#1385) --- Resources/Changelog/Changelog.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 8df3771b462..ee081b42e85 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -4602,3 +4602,17 @@ Entries: message: Added basic utensil recipes to the service techfab id: 4983 time: '2024-05-18T02:06:15.0000000+00:00' +- author: erhardsteinhauer + changes: + - type: Tweak + message: >- + Changed contents of filled chaplain sash to contain: Crucifix, Censer, + Bible, Lantern, Flask with Holy Water, Mortuary Urn. + - type: Tweak + message: Gave mercenaries access to pilot clothes in loadouts. + - type: Fix + message: Fixed filled Pilot webbing and Filled Salvager Rig in loadouts. + - type: Fix + message: Enabled dark green jumpsuit. + id: 4984 + time: '2024-05-18T11:35:08.0000000+00:00' From 79ad11d4b1f58a08c9c57515f8f48400f67ab28d Mon Sep 17 00:00:00 2001 From: Cuir <123379145+Cu1r@users.noreply.github.com> Date: Sat, 18 May 2024 10:58:01 -0400 Subject: [PATCH 03/14] Switched out catwalks in the salvage area for cargo pallets. (#1386) --- .../Maps/_NF/Shuttles/Expedition/ambition.yml | 1520 +++++++++-------- 1 file changed, 761 insertions(+), 759 deletions(-) diff --git a/Resources/Maps/_NF/Shuttles/Expedition/ambition.yml b/Resources/Maps/_NF/Shuttles/Expedition/ambition.yml index 840e3b52dc3..65251c301bc 100644 --- a/Resources/Maps/_NF/Shuttles/Expedition/ambition.yml +++ b/Resources/Maps/_NF/Shuttles/Expedition/ambition.yml @@ -95,8 +95,8 @@ entities: id: ArrowsGreyscale decals: 2: -1,9 - 123: 0,9 - 124: 1,9 + 118: 0,9 + 119: 1,9 - node: angle: 1.5707963267948966 rad color: '#FFFF00FF' @@ -111,991 +111,991 @@ entities: id: ArrowsGreyscale decals: 6: 4,6 - 741: 4,5 - 742: 4,4 + 714: 4,5 + 715: 4,4 - node: color: '#FFFF00FF' id: BotGreyscale decals: - 46: 6,-3 - 529: -2,-8 + 44: 6,-3 + 514: -2,-8 - node: color: '#00FFFFFF' id: BoxGreyscale decals: - 481: 2,30 - 482: -5,-2 - 483: -4,-2 - 484: -5,-6 + 466: 2,30 + 467: -5,-2 + 468: -4,-2 + 469: -5,-6 - node: color: '#FFFF00FF' id: BoxGreyscale decals: - 453: -9,26 - 454: -9,27 - 455: -9,29 - 456: -9,30 + 439: -9,26 + 440: -9,27 + 441: -9,29 + 442: -9,30 - node: color: '#A4610696' id: BrickCornerOverlayNE decals: - 544: 9,32 + 529: 9,32 - node: color: '#A4610696' id: BrickCornerOverlaySW decals: - 557: 7,30 + 542: 7,30 - node: color: '#3EB38896' id: BrickLineOverlayE decals: - 508: -8,3 - 509: -8,4 - 510: -8,5 - 522: -8,0 - 523: -8,1 - 524: -8,2 - 536: -8,-1 - 537: -8,6 + 493: -8,3 + 494: -8,4 + 495: -8,5 + 507: -8,0 + 508: -8,1 + 509: -8,2 + 521: -8,-1 + 522: -8,6 - node: color: '#8C347F96' id: BrickLineOverlayE decals: - 573: -9,-6 + 558: -9,-6 - node: color: '#A4610696' id: BrickLineOverlayE decals: - 545: 9,31 - 546: 9,30 - 547: 9,29 - 548: 9,28 - 549: 9,27 - 550: 9,26 + 530: 9,31 + 531: 9,30 + 532: 9,29 + 533: 9,28 + 534: 9,27 + 535: 9,26 - node: color: '#EFB34196' id: BrickLineOverlayE decals: - 599: -2,-5 + 584: -2,-5 - node: color: '#3EB38896' id: BrickLineOverlayN decals: - 514: -7,-3 - 521: -10,6 - 570: -11,6 + 499: -7,-3 + 506: -10,6 + 555: -11,6 - node: color: '#A4610696' id: BrickLineOverlayN decals: - 543: 4,32 + 528: 4,32 - node: color: '#3EB38896' id: BrickLineOverlayS decals: - 513: -10,-1 + 498: -10,-1 - node: color: '#8C347F96' id: BrickLineOverlayS decals: - 515: -7,-4 - 516: -6,-4 - 517: -5,-4 + 500: -7,-4 + 501: -6,-4 + 502: -5,-4 - node: color: '#A4610696' id: BrickLineOverlayS decals: - 551: 4,31 - 552: 5,31 - 553: 6,31 + 536: 4,31 + 537: 5,31 + 538: 6,31 - node: color: '#3EB38896' id: BrickLineOverlayW decals: - 511: -10,4 - 512: -10,1 + 496: -10,4 + 497: -10,1 - node: color: '#8C347F96' id: BrickLineOverlayW decals: - 518: -3,-6 - 525: -3,-8 + 503: -3,-6 + 510: -3,-8 - node: color: '#A4610696' id: BrickLineOverlayW decals: - 542: 8,27 - 554: 8,28 - 555: 8,29 + 527: 8,27 + 539: 8,28 + 540: 8,29 - node: color: '#FF0000FF' id: DeliveryGreyscale decals: - 479: -6,-2 + 465: -6,-2 - node: cleanable: True color: '#FFFFFFFF' id: Dirt decals: - 496: -1,4 - 497: -1,5 - 498: -1,6 - 499: 0,6 - 500: 1,6 - 501: 1,5 - 502: 0,5 - 503: 0,4 - 504: 1,4 + 481: -1,4 + 482: -1,5 + 483: -1,6 + 484: 0,6 + 485: 1,6 + 486: 1,5 + 487: 0,5 + 488: 0,4 + 489: 1,4 - node: color: '#A4610696' id: DirtHeavy decals: - 556: 7,30 - 560: 8,25 - 561: 8,24 - 562: 8,26 + 541: 7,30 + 545: 8,25 + 546: 8,24 + 547: 8,26 - node: color: '#FFFF00FF' id: DirtHeavy decals: - 47: -5,28 - 48: -4,28 - 49: -6,27 - 50: -5,22 - 51: -5,21 - 52: -5,19 - 53: -5,18 - 54: -5,16 - 55: -5,15 - 56: -5,13 - 57: -5,12 - 58: 5,12 - 59: 5,13 - 60: 5,15 - 61: 5,16 - 62: 5,18 - 63: 5,19 - 64: 5,21 - 65: 5,22 - 66: 5,28 - 67: 4,28 - 152: 7,-5 - 153: 9,-6 - 154: 8,-7 - 155: 7,-8 - 156: 5,-8 - 157: 5,-6 - 158: 6,-6 - 243: 9,9 - 244: 10,9 - 245: 10,8 - 246: 9,8 - 247: -9,8 - 248: -10,8 - 249: -10,9 - 250: -9,9 - 251: -8,5 - 259: -11,0 - 260: -10,-1 - 261: -11,-1 - 268: 1,-5 - 269: 2,-5 - 270: 3,-5 - 271: 2,-8 - 272: 3,-8 - 273: 1,-9 - 274: 1,-10 - 275: 1,-11 - 276: 1,-12 - 277: -1,-12 - 278: -1,-11 - 279: -1,-10 - 307: -1,-18 - 308: -1,-19 - 309: 0,-19 - 310: 1,-19 - 311: 1,-18 - 312: 0,-18 - 313: 1,-20 - 314: 0,-20 - 315: -1,-20 - 316: -1,-21 - 317: 0,-21 - 318: 1,-21 - 319: 1,-22 - 320: 0,-22 - 321: -1,-22 - 322: -1,-23 - 323: 0,-23 - 324: 1,-23 - 325: 8,-21 - 326: 8,-22 - 327: 7,-21 - 328: 7,-22 - 329: -8,-21 - 330: -8,-22 - 331: -7,-21 - 332: -7,-22 - 339: 8,13 - 340: 9,13 - 341: 10,13 - 342: 10,12 - 343: 9,12 - 344: 8,12 - 345: 8,16 - 346: 9,16 - 347: 10,16 - 348: 10,15 - 349: 9,15 - 350: 8,15 - 351: 8,18 - 352: 8,19 - 353: 9,19 - 354: 9,18 - 355: 10,18 - 356: 10,19 - 357: 10,21 - 358: 10,22 - 359: 9,22 - 360: 9,21 - 361: 8,21 - 362: 8,22 - 363: -8,22 - 364: -8,21 - 365: -9,21 - 366: -9,22 - 367: -10,22 - 368: -10,21 - 369: -10,19 - 370: -9,19 - 371: -8,19 - 372: -8,18 - 373: -9,18 - 374: -10,18 - 375: -10,16 - 376: -10,15 - 377: -9,15 - 378: -9,16 - 379: -8,16 - 380: -8,15 - 381: -10,13 - 382: -10,12 - 383: -9,12 - 384: -9,13 - 385: -8,13 - 386: -8,12 - 387: 9,24 - 388: 9,25 - 389: 10,25 - 390: 10,24 - 391: 5,31 - 392: 6,31 - 393: 4,32 - 394: 7,31 + 45: -5,28 + 46: -4,28 + 47: -6,27 + 48: -5,22 + 49: -5,21 + 50: -5,19 + 51: -5,18 + 52: -5,16 + 53: -5,15 + 54: -5,13 + 55: -5,12 + 56: 5,12 + 57: 5,13 + 58: 5,15 + 59: 5,16 + 60: 5,18 + 61: 5,19 + 62: 5,21 + 63: 5,22 + 64: 5,28 + 65: 4,28 + 147: 7,-5 + 148: 9,-6 + 149: 8,-7 + 150: 7,-8 + 151: 5,-8 + 152: 5,-6 + 153: 6,-6 + 229: 9,9 + 230: 10,9 + 231: 10,8 + 232: 9,8 + 233: -9,8 + 234: -10,8 + 235: -10,9 + 236: -9,9 + 237: -8,5 + 245: -11,0 + 246: -10,-1 + 247: -11,-1 + 254: 1,-5 + 255: 2,-5 + 256: 3,-5 + 257: 2,-8 + 258: 3,-8 + 259: 1,-9 + 260: 1,-10 + 261: 1,-11 + 262: 1,-12 + 263: -1,-12 + 264: -1,-11 + 265: -1,-10 + 293: -1,-18 + 294: -1,-19 + 295: 0,-19 + 296: 1,-19 + 297: 1,-18 + 298: 0,-18 + 299: 1,-20 + 300: 0,-20 + 301: -1,-20 + 302: -1,-21 + 303: 0,-21 + 304: 1,-21 + 305: 1,-22 + 306: 0,-22 + 307: -1,-22 + 308: -1,-23 + 309: 0,-23 + 310: 1,-23 + 311: 8,-21 + 312: 8,-22 + 313: 7,-21 + 314: 7,-22 + 315: -8,-21 + 316: -8,-22 + 317: -7,-21 + 318: -7,-22 + 325: 8,13 + 326: 9,13 + 327: 10,13 + 328: 10,12 + 329: 9,12 + 330: 8,12 + 331: 8,16 + 332: 9,16 + 333: 10,16 + 334: 10,15 + 335: 9,15 + 336: 8,15 + 337: 8,18 + 338: 8,19 + 339: 9,19 + 340: 9,18 + 341: 10,18 + 342: 10,19 + 343: 10,21 + 344: 10,22 + 345: 9,22 + 346: 9,21 + 347: 8,21 + 348: 8,22 + 349: -8,22 + 350: -8,21 + 351: -9,21 + 352: -9,22 + 353: -10,22 + 354: -10,21 + 355: -10,19 + 356: -9,19 + 357: -8,19 + 358: -8,18 + 359: -9,18 + 360: -10,18 + 361: -10,16 + 362: -10,15 + 363: -9,15 + 364: -9,16 + 365: -8,16 + 366: -8,15 + 367: -10,13 + 368: -10,12 + 369: -9,12 + 370: -9,13 + 371: -8,13 + 372: -8,12 + 373: 9,24 + 374: 9,25 + 375: 10,25 + 376: 10,24 + 377: 5,31 + 378: 6,31 + 379: 4,32 + 380: 7,31 - node: cleanable: True color: '#FFFFFFFF' id: DirtHeavy decals: - 446: 5,32 - 447: 6,32 - 448: 8,32 - 449: 9,31 - 451: 7,28 - 452: 6,27 - 485: -7,-6 - 486: -6,-6 - 487: -5,-6 - 488: -5,-7 - 489: -6,-7 - 490: -7,-7 - 519: -9,-6 - 581: 2,18 - 582: 2,17 - 583: 3,17 - 584: 3,18 - 585: 4,18 - 586: 2,19 - 587: 3,19 - 588: -4,11 - 589: -3,11 - 590: -3,10 - 591: -2,11 - 592: -3,12 - 593: -2,-4 - 594: -3,-5 - 595: -2,-5 - 596: -2,-6 - 597: -3,-12 - 598: -3,-13 - 602: 1,-6 - 603: 2,-6 - 604: 3,-6 - 605: -2,30 - 606: 2,30 - 607: 8,32 - 608: 9,32 - 609: 9,31 - 620: -1,22 - 621: 0,22 - 622: 1,22 - 623: 1,23 - 624: 1,24 - 625: -1,24 - 626: -1,23 - 627: -1,18 - 628: 0,18 - 629: 1,18 - 630: 1,17 - 631: 0,17 - 632: -1,17 - 633: -1,16 - 634: 1,16 - 635: -1,12 - 636: 0,12 - 637: 1,12 - 638: -1,11 - 639: -1,10 - 640: 0,10 - 641: 1,10 - 642: 0,11 - 643: 1,11 - 644: 0,16 - 645: 0,23 - 646: 0,24 - 647: -1,21 - 648: 0,21 - 649: -1,19 - 650: -1,20 - 651: 0,19 - 652: -1,15 - 653: -1,14 - 654: 0,15 - 655: -1,13 - 656: 0,13 - 657: 0,9 - 658: 1,9 - 659: 2,9 - 662: -2,30 - 663: 2,30 - 664: -1,-13 - 665: 1,-13 - 666: -1,-12 - 667: 1,-10 - 668: 3,-8 - 669: 3,-5 - 670: 1,-5 - 671: 3,-6 - 672: 2,-5 - 675: 5,-11 - 676: 5,-12 - 677: 5,-13 - 686: 4,-11 - 687: 4,-12 - 688: 4,-13 - 689: 3,-13 - 690: 3,-12 - 691: 3,-11 - 693: 4,-10 - 694: -11,-2 - 695: -11,-1 - 696: -10,-1 - 707: -11,2 - 708: -11,3 - 709: -10,3 - 712: -11,6 - 713: -11,5 - 714: -10,5 - 715: -9,4 - 720: -4,4 - 721: -5,4 - 722: -4,5 - 723: -10,9 - 724: -9,9 - 725: -10,8 - 726: -8,8 - 727: -8,9 - 728: -9,8 - 729: 10,9 - 730: 9,9 - 731: 10,8 - 732: 9,8 - 733: 8,9 - 734: 8,8 - 738: 5,4 - 739: 4,5 - 740: 4,4 + 432: 5,32 + 433: 6,32 + 434: 8,32 + 435: 9,31 + 437: 7,28 + 438: 6,27 + 470: -7,-6 + 471: -6,-6 + 472: -5,-6 + 473: -5,-7 + 474: -6,-7 + 475: -7,-7 + 504: -9,-6 + 566: 2,18 + 567: 2,17 + 568: 3,17 + 569: 3,18 + 570: 4,18 + 571: 2,19 + 572: 3,19 + 573: -4,11 + 574: -3,11 + 575: -3,10 + 576: -2,11 + 577: -3,12 + 578: -2,-4 + 579: -3,-5 + 580: -2,-5 + 581: -2,-6 + 582: -3,-12 + 583: -3,-13 + 587: 1,-6 + 588: 2,-6 + 589: 3,-6 + 590: -2,30 + 591: 2,30 + 592: 8,32 + 593: 9,32 + 594: 9,31 + 605: -1,22 + 606: 0,22 + 607: 1,22 + 608: 1,23 + 609: 1,24 + 610: -1,24 + 611: -1,23 + 612: -1,18 + 613: 0,18 + 614: 1,18 + 615: 1,17 + 616: 0,17 + 617: -1,17 + 618: -1,16 + 619: 1,16 + 620: -1,12 + 621: 0,12 + 622: 1,12 + 623: -1,11 + 624: -1,10 + 625: 0,10 + 626: 1,10 + 627: 0,11 + 628: 1,11 + 629: 0,16 + 630: 0,23 + 631: 0,24 + 632: -1,21 + 633: 0,21 + 634: -1,19 + 635: -1,20 + 636: 0,19 + 637: -1,15 + 638: -1,14 + 639: 0,15 + 640: -1,13 + 641: 0,13 + 642: 0,9 + 643: 1,9 + 644: 2,9 + 647: -2,30 + 648: 2,30 + 649: -1,-13 + 650: 1,-13 + 651: -1,-12 + 652: 1,-10 + 653: 3,-8 + 654: 3,-5 + 655: 1,-5 + 656: 3,-6 + 657: 2,-5 + 660: 5,-11 + 661: 5,-12 + 662: 5,-13 + 663: 4,-11 + 664: 4,-12 + 665: 4,-13 + 666: 3,-13 + 667: 3,-12 + 668: 3,-11 + 669: 4,-10 + 670: -11,-2 + 671: -11,-1 + 672: -10,-1 + 683: -11,2 + 684: -11,3 + 685: -10,3 + 688: -11,6 + 689: -11,5 + 690: -10,5 + 691: -9,4 + 696: -4,4 + 697: -5,4 + 698: -4,5 + 699: -10,9 + 700: -9,9 + 701: -10,8 + 702: -8,8 + 703: -8,9 + 704: -9,8 + 705: 10,9 + 706: 9,9 + 707: 10,8 + 708: 9,8 + 709: 8,9 + 710: 8,8 + 711: 5,4 + 712: 4,5 + 713: 4,4 - node: cleanable: True angle: 4.71238898038469 rad color: '#FFFFFFFF' id: DirtHeavy decals: - 743: -1,-18 - 744: -1,-19 - 745: 1,-18 - 746: 1,-19 - 747: 1,-20 - 748: 0,-20 - 749: -1,-20 - 750: 0,-19 - 751: 0,-18 - 752: 0,-16 - 753: 0,-15 - 754: -1,-21 - 755: 0,-21 - 756: 1,-21 - 757: 1,-22 - 758: 0,-22 - 759: -1,-22 - 760: -1,-23 - 761: 0,-23 - 762: 1,-23 - 763: 8,24 - 764: 9,24 - 765: 9,25 - 766: 10,24 - 767: 10,25 - 768: 9,26 - 769: 8,25 + 716: -1,-18 + 717: -1,-19 + 718: 1,-18 + 719: 1,-19 + 720: 1,-20 + 721: 0,-20 + 722: -1,-20 + 723: 0,-19 + 724: 0,-18 + 725: 0,-16 + 726: 0,-15 + 727: -1,-21 + 728: 0,-21 + 729: 1,-21 + 730: 1,-22 + 731: 0,-22 + 732: -1,-22 + 733: -1,-23 + 734: 0,-23 + 735: 1,-23 + 736: 8,24 + 737: 9,24 + 738: 9,25 + 739: 10,24 + 740: 10,25 + 741: 9,26 + 742: 8,25 - node: color: '#FFFF00FF' id: DirtLight decals: - 127: -2,25 - 128: 2,25 - 129: 3,25 - 130: 4,26 - 131: 5,26 - 132: -5,26 - 133: -4,26 - 134: -3,25 - 135: 6,25 - 136: 5,3 - 137: 5,2 - 151: 7,-5 - 176: 12,-4 - 177: 12,-6 - 186: -1,32 - 187: 0,32 - 188: 1,32 - 189: 2,33 - 190: -2,33 - 191: -1,33 - 192: 1,33 - 193: 0,33 - 194: 4,24 - 195: -4,24 - 218: 0,24 - 219: 0,23 - 220: -2,23 - 221: -2,22 - 222: 0,21 - 223: 1,21 - 224: 2,22 - 225: 2,24 - 226: 1,19 - 227: 0,19 - 228: -2,17 - 229: -2,16 - 230: 0,16 - 231: 1,15 - 232: 2,16 - 233: -1,15 - 234: 0,13 - 235: 1,13 - 236: 0,11 - 237: 1,11 - 238: 2,12 - 239: 1,9 - 240: -1,9 - 241: -2,10 - 242: -2,12 - 255: -10,5 - 256: -8,4 - 257: -9,3 - 258: -9,2 - 263: -9,0 - 264: -9,1 - 265: -10,1 - 266: -11,2 - 267: -11,3 - 404: 9,27 - 405: 8,27 - 406: 8,28 - 407: 8,30 + 122: -2,25 + 123: 2,25 + 124: 3,25 + 125: 4,26 + 126: 5,26 + 127: -5,26 + 128: -4,26 + 129: -3,25 + 130: 6,25 + 131: 5,3 + 132: 5,2 + 146: 7,-5 + 163: 12,-4 + 164: 12,-6 + 172: -1,32 + 173: 0,32 + 174: 1,32 + 175: 2,33 + 176: -2,33 + 177: -1,33 + 178: 1,33 + 179: 0,33 + 180: 4,24 + 181: -4,24 + 204: 0,24 + 205: 0,23 + 206: -2,23 + 207: -2,22 + 208: 0,21 + 209: 1,21 + 210: 2,22 + 211: 2,24 + 212: 1,19 + 213: 0,19 + 214: -2,17 + 215: -2,16 + 216: 0,16 + 217: 1,15 + 218: 2,16 + 219: -1,15 + 220: 0,13 + 221: 1,13 + 222: 0,11 + 223: 1,11 + 224: 2,12 + 225: 1,9 + 226: -1,9 + 227: -2,10 + 228: -2,12 + 241: -10,5 + 242: -8,4 + 243: -9,3 + 244: -9,2 + 249: -9,0 + 250: -9,1 + 251: -10,1 + 252: -11,2 + 253: -11,3 + 390: 9,27 + 391: 8,27 + 392: 8,28 + 393: 8,30 - node: angle: 1.5707963267948966 rad color: '#FFFF00FF' id: DirtLight decals: - 87: -5,10 - 88: -4,11 - 89: -4,13 - 90: -4,14 - 91: -4,17 - 92: -4,19 - 93: -4,22 - 94: -5,24 - 95: -6,25 - 96: 5,24 - 97: 4,23 - 98: 4,20 - 99: 4,17 - 100: 4,15 - 101: 4,12 - 102: 5,10 - 103: 6,9 - 104: 2,9 - 110: 6,4 - 111: 5,5 - 112: 4,6 - 113: 4,7 - 114: -4,7 - 115: -4,6 - 116: -5,5 - 117: -5,4 - 118: 3,8 - 119: -3,8 - 120: -2,9 - 121: -4,10 - 122: 4,10 + 85: -5,10 + 86: -4,11 + 87: -4,13 + 88: -4,14 + 89: -4,17 + 90: -4,19 + 91: -4,22 + 92: -5,24 + 93: -6,25 + 94: 5,24 + 95: 4,23 + 96: 4,20 + 97: 4,17 + 98: 4,15 + 99: 4,12 + 100: 5,10 + 101: 6,9 + 102: 2,9 + 105: 6,4 + 106: 5,5 + 107: 4,6 + 108: 4,7 + 109: -4,7 + 110: -4,6 + 111: -5,5 + 112: -5,4 + 113: 3,8 + 114: -3,8 + 115: -2,9 + 116: -4,10 + 117: 4,10 - node: cleanable: True color: '#FFFFFFFF' id: DirtLight decals: - 411: -4,-7 - 412: -4,-10 - 413: -4,-13 - 414: 4,-4 - 415: 5,-4 - 416: 5,-3 - 417: 6,-3 - 418: 6,-4 - 424: -9,-4 - 425: -8,-4 - 426: -11,-4 - 427: -11,-6 - 428: -12,-6 - 429: -12,-4 - 430: -7,-3 - 431: -7,-4 - 432: -6,-4 - 433: -5,-3 - 434: -5,-4 - 435: -4,-3 - 436: -4,-4 - 437: -4,-5 - 438: -3,-4 - 439: -3,-6 - 440: -3,-10 - 441: -3,-11 - 450: -4,16 - 505: -1,28 - 506: 0,28 - 507: 1,28 - 574: 4,-3 - 660: 2,10 - 661: 2,11 - 710: -10,2 - 711: -10,4 - 716: -10,6 - 717: -9,5 - 718: -8,4 - 719: -10,4 + 397: -4,-7 + 398: -4,-10 + 399: -4,-13 + 400: 4,-4 + 401: 5,-4 + 402: 5,-3 + 403: 6,-3 + 404: 6,-4 + 410: -9,-4 + 411: -8,-4 + 412: -11,-4 + 413: -11,-6 + 414: -12,-6 + 415: -12,-4 + 416: -7,-3 + 417: -7,-4 + 418: -6,-4 + 419: -5,-3 + 420: -5,-4 + 421: -4,-3 + 422: -4,-4 + 423: -4,-5 + 424: -3,-4 + 425: -3,-6 + 426: -3,-10 + 427: -3,-11 + 436: -4,16 + 490: -1,28 + 491: 0,28 + 492: 1,28 + 559: 4,-3 + 645: 2,10 + 646: 2,11 + 686: -10,2 + 687: -10,4 + 692: -10,6 + 693: -9,5 + 694: -8,4 + 695: -10,4 - node: color: '#FFFF00FF' id: DirtMedium decals: - 125: 3,26 - 126: -3,26 - 138: 6,-9 - 139: 6,-8 - 140: 6,-7 - 141: 7,-7 - 142: 5,-7 - 143: 7,-6 - 144: 8,-6 - 145: 8,-5 - 146: 9,-5 - 147: 9,-4 - 148: 8,-4 - 149: 8,-3 - 150: 9,-3 - 167: 6,-14 - 168: 6,-13 - 169: 6,-12 - 170: 6,-11 - 171: 6,-10 - 172: 11,-6 - 173: 11,-4 - 174: 10,-4 - 175: 11,-5 - 179: -1,31 - 180: 0,31 - 181: -2,31 - 182: -2,32 - 183: 1,31 - 184: 2,31 - 185: 2,32 - 196: 1,12 - 197: 0,12 - 198: -1,12 - 199: -1,11 - 200: -1,10 - 201: 0,10 - 202: 1,10 - 203: -1,16 - 204: -1,17 - 205: 0,17 - 206: 1,17 - 207: 1,16 - 208: 1,18 - 209: 0,18 - 210: -1,18 - 211: -1,22 - 212: 0,22 - 213: 1,22 - 214: 1,23 - 215: 1,24 - 216: -1,24 - 217: -1,23 - 252: -9,5 - 253: -10,6 - 254: -9,4 - 262: -10,0 - 280: -1,-9 - 281: 1,-8 - 282: 0,-6 - 283: 0,-7 - 284: 0,-8 - 285: 0,-9 - 286: 0,-10 - 287: 0,-11 - 288: 0,-12 - 289: 0,-13 - 290: 1,-7 - 291: 2,-7 - 292: 3,-7 - 293: 4,-7 - 294: 5,-5 - 295: 8,-2 - 296: 9,-2 - 297: 5,-11 - 298: 5,-12 - 299: 5,-13 - 300: 10,-6 - 301: -1,-13 - 302: 1,-13 - 303: 0,-14 - 304: 0,-15 - 305: 0,-16 - 306: 0,-17 - 333: -7,-20 - 334: -6,-21 - 335: -6,-22 - 336: 6,-22 - 337: 6,-21 - 338: 7,-20 - 395: 4,31 - 396: 4,30 - 397: 5,30 - 398: 6,30 - 399: 8,31 - 400: 9,30 - 401: 9,29 - 402: 9,28 - 403: 9,26 + 120: 3,26 + 121: -3,26 + 133: 6,-9 + 134: 6,-8 + 135: 6,-7 + 136: 7,-7 + 137: 5,-7 + 138: 7,-6 + 139: 8,-6 + 140: 8,-5 + 141: 9,-5 + 142: 9,-4 + 143: 8,-4 + 144: 8,-3 + 145: 9,-3 + 154: 6,-14 + 155: 6,-13 + 156: 6,-12 + 157: 6,-11 + 158: 6,-10 + 159: 11,-6 + 160: 11,-4 + 161: 10,-4 + 162: 11,-5 + 165: -1,31 + 166: 0,31 + 167: -2,31 + 168: -2,32 + 169: 1,31 + 170: 2,31 + 171: 2,32 + 182: 1,12 + 183: 0,12 + 184: -1,12 + 185: -1,11 + 186: -1,10 + 187: 0,10 + 188: 1,10 + 189: -1,16 + 190: -1,17 + 191: 0,17 + 192: 1,17 + 193: 1,16 + 194: 1,18 + 195: 0,18 + 196: -1,18 + 197: -1,22 + 198: 0,22 + 199: 1,22 + 200: 1,23 + 201: 1,24 + 202: -1,24 + 203: -1,23 + 238: -9,5 + 239: -10,6 + 240: -9,4 + 248: -10,0 + 266: -1,-9 + 267: 1,-8 + 268: 0,-6 + 269: 0,-7 + 270: 0,-8 + 271: 0,-9 + 272: 0,-10 + 273: 0,-11 + 274: 0,-12 + 275: 0,-13 + 276: 1,-7 + 277: 2,-7 + 278: 3,-7 + 279: 4,-7 + 280: 5,-5 + 281: 8,-2 + 282: 9,-2 + 283: 5,-11 + 284: 5,-12 + 285: 5,-13 + 286: 10,-6 + 287: -1,-13 + 288: 1,-13 + 289: 0,-14 + 290: 0,-15 + 291: 0,-16 + 292: 0,-17 + 319: -7,-20 + 320: -6,-21 + 321: -6,-22 + 322: 6,-22 + 323: 6,-21 + 324: 7,-20 + 381: 4,31 + 382: 4,30 + 383: 5,30 + 384: 6,30 + 385: 8,31 + 386: 9,30 + 387: 9,29 + 388: 9,28 + 389: 9,26 - node: angle: 1.5707963267948966 rad color: '#FFFF00FF' id: DirtMedium decals: - 70: -5,27 - 71: -4,27 - 72: -6,26 - 73: -5,23 - 74: -5,20 - 75: -5,17 - 76: -5,14 - 77: -5,11 - 78: 5,11 - 79: 5,14 - 80: 5,17 - 81: 5,20 - 82: 5,23 - 83: 6,24 - 84: -6,24 - 85: -6,10 - 86: 6,10 - 106: -4,4 - 107: -4,5 + 68: -5,27 + 69: -4,27 + 70: -6,26 + 71: -5,23 + 72: -5,20 + 73: -5,17 + 74: -5,14 + 75: -5,11 + 76: 5,11 + 77: 5,14 + 78: 5,17 + 79: 5,20 + 80: 5,23 + 81: 6,24 + 82: -6,24 + 83: -6,10 + 84: 6,10 + 103: -4,4 + 104: -4,5 - node: angle: 3.141592653589793 rad color: '#FFFF00FF' id: DirtMedium decals: - 68: 4,27 - 69: 5,27 + 66: 4,27 + 67: 5,27 - node: cleanable: True color: '#FFFFFFFF' id: DirtMedium decals: - 419: -2,-7 - 420: -3,-9 - 421: -3,-3 - 422: -8,-5 - 423: -9,-5 - 442: 8,29 - 443: 9,32 - 444: 7,29 - 445: 7,32 - 520: -3,-8 - 526: -3,-7 - 527: -9,-3 - 528: -8,-3 - 530: -2,-8 - 532: -9,-1 - 533: -8,-1 - 539: -9,6 - 540: -8,6 - 566: -8,9 - 567: -8,8 - 568: 8,9 - 569: 8,8 - 610: 7,32 - 611: 8,31 - 612: 9,30 - 613: 8,30 - 614: 9,29 - 615: 8,29 - 616: 8,28 - 617: 5,31 - 618: 6,32 - 619: 6,31 - 673: 2,-6 - 674: 1,-6 - 697: -11,0 - 698: -10,0 - 699: -9,-1 - 700: -9,0 - 701: -10,1 - 702: -8,-1 - 703: -8,1 - 704: -8,2 - 705: -9,2 - 706: -9,3 + 405: -2,-7 + 406: -3,-9 + 407: -3,-3 + 408: -8,-5 + 409: -9,-5 + 428: 8,29 + 429: 9,32 + 430: 7,29 + 431: 7,32 + 505: -3,-8 + 511: -3,-7 + 512: -9,-3 + 513: -8,-3 + 515: -2,-8 + 517: -9,-1 + 518: -8,-1 + 524: -9,6 + 525: -8,6 + 551: -8,9 + 552: -8,8 + 553: 8,9 + 554: 8,8 + 595: 7,32 + 596: 8,31 + 597: 9,30 + 598: 8,30 + 599: 9,29 + 600: 8,29 + 601: 8,28 + 602: 5,31 + 603: 6,32 + 604: 6,31 + 658: 2,-6 + 659: 1,-6 + 673: -11,0 + 674: -10,0 + 675: -9,-1 + 676: -9,0 + 677: -10,1 + 678: -8,-1 + 679: -8,1 + 680: -8,2 + 681: -9,2 + 682: -9,3 - node: cleanable: True angle: 4.71238898038469 rad color: '#FFFFFFFF' id: DirtMedium decals: - 770: 8,26 - 771: 9,27 - 772: 8,27 + 743: 8,26 + 744: 9,27 + 745: 8,27 - node: color: '#EFB341FF' id: HalfTileOverlayGreyscale decals: - 19: 0,12 - 29: 0,18 + 17: 0,12 + 27: 0,18 - node: color: '#EFB341FF' id: HalfTileOverlayGreyscale180 decals: - 12: 0,10 - 13: 0,22 - 30: 0,17 + 10: 0,10 + 11: 0,22 + 28: 0,17 - node: color: '#EFB341FF' id: HalfTileOverlayGreyscale270 decals: - 15: 1,17 - 17: 1,16 - 20: 1,23 - 21: 1,24 + 13: 1,17 + 15: 1,16 + 18: 1,23 + 19: 1,24 - node: color: '#EFB341FF' id: HalfTileOverlayGreyscale90 decals: - 14: -1,11 - 16: -1,17 - 18: -1,16 - 22: -1,24 - 23: -1,23 + 12: -1,11 + 14: -1,17 + 16: -1,16 + 20: -1,24 + 21: -1,23 - node: color: '#FFFF00FF' id: LoadingAreaGreyscale decals: - 494: -1,33 - 495: 1,33 + 479: -1,33 + 480: 1,33 - node: color: '#3EB38896' id: MiniTileInnerOverlayNE decals: - 534: -8,-3 + 519: -8,-3 - node: color: '#A4610696' id: MiniTileInnerOverlayNE decals: - 565: 8,32 + 550: 8,32 - node: color: '#EFB34196' id: MiniTileInnerOverlayNE decals: - 600: -2,-6 + 585: -2,-6 - node: color: '#3EB38896' id: MiniTileInnerOverlayNW decals: - 531: -9,-3 - 538: -9,6 - 571: -3,-3 + 516: -9,-3 + 523: -9,6 + 556: -3,-3 - node: color: '#8C347F96' id: MiniTileInnerOverlayNW decals: - 572: -3,-9 + 557: -3,-9 - node: color: '#A4610696' id: MiniTileInnerOverlayNW decals: - 563: 8,26 - 564: 5,32 + 548: 8,26 + 549: 5,32 - node: color: '#EFB341FF' id: MiniTileInnerOverlayNW decals: - 35: -0.2500766,11.749403 - 36: 0.997731,11.749403 - 37: -0.25123465,9.499451 - 38: 1.0038857,9.499451 - 39: 0.99951637,21.501423 - 40: -0.2501716,21.501423 - 41: -0.25014085,17.749004 + 33: -0.2500766,11.749403 + 34: 0.997731,11.749403 + 35: -0.25123465,9.499451 + 36: 1.0038857,9.499451 + 37: 0.99951637,21.501423 + 38: -0.2501716,21.501423 + 39: -0.25014085,17.749004 - node: color: '#EFB34196' id: MiniTileInnerOverlaySE decals: - 541: -2,-7 - 601: -2,-4 + 526: -2,-7 + 586: -2,-4 - node: color: '#3EB38896' id: MiniTileInnerOverlaySW decals: - 535: -9,-1 + 520: -9,-1 - node: color: '#A4610696' id: MiniTileInnerOverlaySW decals: - 558: 8,30 - 559: 7,31 + 543: 8,30 + 544: 7,31 - node: color: '#EFB341FF' id: MiniTileInnerOverlaySW decals: - 27: 1.0013312,18.50004 + 25: 1.0013312,18.50004 - node: color: '#EFB341FF' id: QuarterTileOverlayGreyscale decals: - 25: 1,22 - 33: 1,10 + 23: 1,22 + 31: 1,10 - node: color: '#EFB341FF' id: QuarterTileOverlayGreyscale180 decals: - 26: -1,18 - 31: -1,12 + 24: -1,18 + 29: -1,12 - node: color: '#EFB341FF' id: QuarterTileOverlayGreyscale270 decals: - 28: 1,18 - 34: 1,12 + 26: 1,18 + 32: 1,12 - node: color: '#EFB341FF' id: QuarterTileOverlayGreyscale90 decals: - 24: -1,22 - 32: -1,10 + 22: -1,22 + 30: -1,10 - node: color: '#FFFF00FF' id: StandClearGreyscale decals: - 11: 0,3 - 42: 0,3 + 9: 0,3 + 40: 0,3 - node: color: '#FFFF00FF' id: WarnCornerGreyscaleNW decals: - 469: -7,30 + 455: -7,30 - node: color: '#FFFF00FF' id: WarnCornerSmallGreyscaleNE decals: - 470: -9,24 + 456: -9,24 - node: color: '#FFFF00FF' id: WarnCornerSmallGreyscaleNW decals: - 576: 4,-4 + 561: 4,-4 - node: color: '#FFFF00FF' id: WarnCornerSmallGreyscaleSE decals: - 468: -9,32 + 454: -9,32 - node: color: '#FFFF00FF' id: WarnLineGreyscaleE decals: - 458: -9,25 - 459: -9,31 - 460: -9,28 - 579: -8,9 - 580: -8,8 + 444: -9,25 + 445: -9,31 + 446: -9,28 + 564: -8,9 + 565: -8,8 - node: color: '#FFFF00FF' id: WarnLineGreyscaleN decals: - 9: 0,3 - 43: 0,3 - 457: -8,24 - 491: -6,30 - 492: -5,30 - 493: -4,30 + 7: 0,3 + 41: 0,3 + 443: -8,24 + 476: -6,30 + 477: -5,30 + 478: -4,30 - node: color: '#FFFF00FF' id: WarnLineGreyscaleS decals: - 10: 0,3 - 44: 0,3 - 461: -8,32 - 462: -7,32 - 463: -6,32 - 464: -5,32 - 465: -4,32 + 8: 0,3 + 42: 0,3 + 447: -8,32 + 448: -7,32 + 449: -6,32 + 450: -5,32 + 451: -4,32 - node: color: '#FFFF00FF' id: WarnLineGreyscaleW decals: - 45: -4,-7 - 466: -7,29 - 467: -7,28 - 471: 10,-1 - 472: 10,0 - 473: 10,1 - 474: 10,4 - 475: 10,5 - 476: 10,6 - 477: 10,2 - 478: 10,3 - 575: 4,-3 - 577: 8,9 - 578: 8,8 + 43: -4,-7 + 452: -7,29 + 453: -7,28 + 457: 10,-1 + 458: 10,0 + 459: 10,1 + 460: 10,4 + 461: 10,5 + 462: 10,6 + 463: 10,2 + 464: 10,3 + 560: 4,-3 + 562: 8,9 + 563: 8,8 - node: color: '#FFFFFFFF' id: WoodTrimThinLineW @@ -1107,9 +1107,9 @@ entities: color: '#32CD32FF' id: carp decals: - 408: 7.4089456,31.961815 - 409: 6.3766427,31.401342 - 410: 5.432822,31.961815 + 394: 7.4089456,31.961815 + 395: 6.3766427,31.401342 + 396: 5.432822,31.961815 - type: BecomesStation id: Ambition - type: GridAtmosphere @@ -5831,6 +5831,28 @@ entities: - type: Transform pos: -10.594801,5.7791753 parent: 1 +- proto: CargoPallet + entities: + - uid: 1156 + components: + - type: Transform + pos: 7.5,29.5 + parent: 1 + - uid: 1163 + components: + - type: Transform + pos: 6.5,30.5 + parent: 1 + - uid: 1604 + components: + - type: Transform + pos: 5.5,30.5 + parent: 1 + - uid: 2387 + components: + - type: Transform + pos: 4.5,30.5 + parent: 1 - proto: CarpetBlue entities: - uid: 12 @@ -6133,21 +6155,11 @@ entities: rot: 1.5707963267948966 rad pos: 0.5,-10.5 parent: 1 - - uid: 1156 - components: - - type: Transform - pos: 7.5,29.5 - parent: 1 - uid: 1160 components: - type: Transform pos: -5.5,9.5 parent: 1 - - uid: 1163 - components: - - type: Transform - pos: 6.5,30.5 - parent: 1 - uid: 1172 components: - type: Transform @@ -6541,11 +6553,6 @@ entities: - type: Transform pos: -5.5,25.5 parent: 1 - - uid: 1604 - components: - - type: Transform - pos: 5.5,30.5 - parent: 1 - uid: 1617 components: - type: Transform @@ -6698,11 +6705,6 @@ entities: rot: -1.5707963267948966 rad pos: 11.5,31.5 parent: 1 - - uid: 2387 - components: - - type: Transform - pos: 4.5,30.5 - parent: 1 - uid: 2389 components: - type: Transform From b89bf7e6b281a5e613f15359b2a81717705eb3a7 Mon Sep 17 00:00:00 2001 From: Checkraze <71046427+Cheackraze@users.noreply.github.com> Date: Sat, 18 May 2024 12:31:57 -0400 Subject: [PATCH 04/14] Revert "Optimize Debris Code (#1374)" (#1383) This reverts commit 4220e4dbc45ce44fc011204395d8cc8f550d115c. --- .../Worldgen/Prototypes/GCQueuePrototype.cs | 5 ++- .../Worldgen/Systems/LocalityLoaderSystem.cs | 44 ++----------------- .../Components/Debris/SpaceDebrisComponent.cs | 8 ---- .../Entities/World/Debris/base_debris.yml | 2 - Resources/Prototypes/GC/world.yml | 5 +-- 5 files changed, 8 insertions(+), 56 deletions(-) delete mode 100644 Content.Shared/_NF/Worldgen/Components/Debris/SpaceDebrisComponent.cs diff --git a/Content.Server/Worldgen/Prototypes/GCQueuePrototype.cs b/Content.Server/Worldgen/Prototypes/GCQueuePrototype.cs index c62f2bc00d9..94e6cf5fa31 100644 --- a/Content.Server/Worldgen/Prototypes/GCQueuePrototype.cs +++ b/Content.Server/Worldgen/Prototypes/GCQueuePrototype.cs @@ -1,4 +1,4 @@ -using Robust.Shared.Prototypes; +using Robust.Shared.Prototypes; namespace Content.Server.Worldgen.Prototypes; @@ -23,7 +23,7 @@ public sealed class GCQueuePrototype : IPrototype /// The maximum amount of time that can be spent processing this queue. /// [DataField("maximumTickTime")] - public TimeSpan MaximumTickTime { get; } = TimeSpan.FromMilliseconds(5); // Frontier 1<5 + public TimeSpan MaximumTickTime { get; } = TimeSpan.FromMilliseconds(1); /// /// The minimum depth before entities in the queue actually get processed for deletion. @@ -38,3 +38,4 @@ public sealed class GCQueuePrototype : IPrototype [DataField("trySkipQueue")] public bool TrySkipQueue { get; } } + diff --git a/Content.Server/Worldgen/Systems/LocalityLoaderSystem.cs b/Content.Server/Worldgen/Systems/LocalityLoaderSystem.cs index 18cc1be8beb..fb02e8aa0bd 100644 --- a/Content.Server/Worldgen/Systems/LocalityLoaderSystem.cs +++ b/Content.Server/Worldgen/Systems/LocalityLoaderSystem.cs @@ -1,10 +1,5 @@ -using Content.Server.Worldgen.Components; +using Content.Server.Worldgen.Components; using Robust.Server.GameObjects; -using Content.Server._NF.Worldgen.Components.Debris; // Frontier -using Content.Shared.Humanoid; // Frontier -using Content.Shared.Mobs.Components; // Frontier -using Robust.Server.GameObjects; // Frontier -using Robust.Shared.Spawners; // Frontier namespace Content.Server.Worldgen.Systems; @@ -15,13 +10,6 @@ public sealed class LocalityLoaderSystem : BaseWorldSystem { [Dependency] private readonly TransformSystem _xformSys = default!; - private const float DebrisActiveDuration = 5*60; // Frontier - Duration to reset the despawn timer to when a debris is loaded into a player's view. - - public override void Initialize() // Frontier - { - SubscribeLocalEvent(OnDebrisDespawn); - } - /// public override void Update(float frameTime) { @@ -57,8 +45,6 @@ public override void Update(float frameTime) if ((_xformSys.GetWorldPosition(loaderXform) - _xformSys.GetWorldPosition(xform)).Length() > loadable.LoadingDistance) continue; - ResetTimedDespawn(uid); // Frontier - Reset the TimedDespawnComponent's lifetime when loaded - RaiseLocalEvent(uid, new LocalStructureLoadedEvent()); RemCompDeferred(uid); done = true; @@ -68,34 +54,10 @@ public override void Update(float frameTime) } } } - - // Frontier - private void ResetTimedDespawn(EntityUid uid) - { - if (TryComp(uid, out var timedDespawn)) - { - timedDespawn.Lifetime = DebrisActiveDuration; - } - else - { - // Add TimedDespawnComponent if it does not exist - timedDespawn = AddComp(uid); - timedDespawn.Lifetime = DebrisActiveDuration; - } - } - - private void OnDebrisDespawn(EntityUid entity, SpaceDebrisComponent component, EntityTerminatingEvent e) - { - var mobQuery = AllEntityQuery(); - - while (mobQuery.MoveNext(out var mob, out _, out _, out var xform)) - if (xform.MapUid is not null && xform.GridUid == entity) - _xformSys.SetCoordinates(mob, new(xform.MapUid.Value, _xformSys.GetWorldPosition(xform))); - } - // Frontier } /// -/// An event fired on a loadable entity when a local loader enters its vicinity. +/// A directed fired on a loadable entity when a local loader enters it's vicinity. /// public record struct LocalStructureLoadedEvent; + diff --git a/Content.Shared/_NF/Worldgen/Components/Debris/SpaceDebrisComponent.cs b/Content.Shared/_NF/Worldgen/Components/Debris/SpaceDebrisComponent.cs deleted file mode 100644 index fcb18abd365..00000000000 --- a/Content.Shared/_NF/Worldgen/Components/Debris/SpaceDebrisComponent.cs +++ /dev/null @@ -1,8 +0,0 @@ -using Robust.Shared.GameStates; - -namespace Content.Server._NF.Worldgen.Components.Debris; - -[RegisterComponent, NetworkedComponent] -public sealed partial class SpaceDebrisComponent : Component -{ -} diff --git a/Resources/Prototypes/Entities/World/Debris/base_debris.yml b/Resources/Prototypes/Entities/World/Debris/base_debris.yml index ff5cb037de3..c125d991fd4 100644 --- a/Resources/Prototypes/Entities/World/Debris/base_debris.yml +++ b/Resources/Prototypes/Entities/World/Debris/base_debris.yml @@ -4,5 +4,3 @@ components: - type: OwnedDebris - type: LocalityLoader - - type: TimedDespawn # Frontier - lifetime: 600 # Frontier \ No newline at end of file diff --git a/Resources/Prototypes/GC/world.yml b/Resources/Prototypes/GC/world.yml index 166942edca6..b58a68158cc 100644 --- a/Resources/Prototypes/GC/world.yml +++ b/Resources/Prototypes/GC/world.yml @@ -1,5 +1,4 @@ - type: gcQueue id: SpaceDebris - depth: 256 # Frontier - minDepthToProcess: 128 # Frontier - trySkipQueue: true # Frontier - Attempt immediate removal if possible \ No newline at end of file + depth: 512 # So there's a decent bit of time before roids unload. + minDepthToProcess: 256 From 17b4878170cc8a323137b383ea0f724f1e8ef645 Mon Sep 17 00:00:00 2001 From: Tych0 <151581207+Tych0theSynth@users.noreply.github.com> Date: Sat, 18 May 2024 21:16:54 +0200 Subject: [PATCH 05/14] NT Fishbowl (New) - Central commander personal transport/office (admin only) (#1223) * Adds the NT Fishbowl. * New NFSD thrusters and gyro * Merge branch 'master' of https://github.com/MagnusCrowe/frontier-station-14 into pr/1223 * Named warp point and fixed thruster/gryo --------- Co-authored-by: Maxtone --- .../Maps/_NF/Shuttles/Admin/fishbowl.yml | 1303 +++++++++++++++++ 1 file changed, 1303 insertions(+) create mode 100644 Resources/Maps/_NF/Shuttles/Admin/fishbowl.yml diff --git a/Resources/Maps/_NF/Shuttles/Admin/fishbowl.yml b/Resources/Maps/_NF/Shuttles/Admin/fishbowl.yml new file mode 100644 index 00000000000..1ba1ff0df7f --- /dev/null +++ b/Resources/Maps/_NF/Shuttles/Admin/fishbowl.yml @@ -0,0 +1,1303 @@ +meta: + format: 6 + postmapinit: false +tilemap: + 0: Space + 34: FloorDarkMini + 46: FloorGlass + 124: Lattice + 125: Plating +entities: +- proto: "" + entities: + - uid: 2 + components: + - type: MetaData + name: NT Fishbowl + - type: Transform + pos: 1.1562505,-0.5781255 + parent: invalid + - type: MapGrid + chunks: + 0,0: + ind: 0,0 + tiles: fQAAAAAAfQAAAAAALgAAAAABfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAALgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAACLgAAAAACfQAAAAAALgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAALgAAAAAALgAAAAABfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAABLgAAAAAALgAAAAACfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAADfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAADIgAAAAAAIgAAAAACIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAAAIgAAAAADfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAADIgAAAAAAIgAAAAACIgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAABIgAAAAACfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAACfQAAAAAALgAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAALgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + -1,0: + ind: -1,0 + tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAALgAAAAADfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAALgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAADfQAAAAAALgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAALgAAAAACLgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAALgAAAAABLgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIgAAAAAAIgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIgAAAAACIgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAIgAAAAAAIgAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAIgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAALgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALgAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + version: 6 + - type: Broadphase + - type: Physics + bodyStatus: InAir + angularDamping: 0.05 + linearDamping: 0.05 + fixedRotation: False + bodyType: Dynamic + - type: Fixtures + fixtures: {} + - type: OccluderTree + - type: SpreaderGrid + - type: Shuttle + - type: GridPathfinding + - type: Gravity + gravityShakeSound: !type:SoundPathSpecifier + path: /Audio/Effects/alert.ogg + - type: DecalGrid + chunkCollection: + version: 2 + nodes: + - node: + color: '#0E7F1B3F' + id: MiniTileCheckerAOverlay + decals: + 0: 0,11 + 1: 0,10 + 25: 2,8 + 26: 2,6 + - node: + color: '#FFFF0019' + id: MiniTileCheckerBOverlay + decals: + 13: 2,8 + 14: 2,6 + 15: 0,11 + 16: 0,10 + - node: + color: '#0E7F1B7F' + id: MiniTileWhiteCornerNe + decals: + 4: 1,9 + - node: + color: '#0E7F1B7F' + id: MiniTileWhiteCornerNw + decals: + 2: -1,9 + 3: -2,8 + - node: + color: '#0E7F1B7F' + id: MiniTileWhiteCornerSe + decals: + 23: 1,6 + - node: + color: '#0E7F1B7F' + id: MiniTileWhiteCornerSw + decals: + 5: -2,6 + - node: + color: '#FFFF0066' + id: MiniTileWhiteInnerNe + decals: + 20: -1,6 + - node: + color: '#FFFF0066' + id: MiniTileWhiteInnerNw + decals: + 17: 1,6 + - node: + color: '#FFFF0066' + id: MiniTileWhiteInnerSe + decals: + 18: -1,8 + - node: + color: '#FFFF0066' + id: MiniTileWhiteInnerSw + decals: + 19: 1,8 + - node: + color: '#0E7F1B7F' + id: MiniTileWhiteLineE + decals: + 7: 1,8 + 8: 1,7 + 11: -1,7 + - node: + color: '#0E7F1B7F' + id: MiniTileWhiteLineN + decals: + 12: 0,6 + - node: + color: '#0E7F1B7F' + id: MiniTileWhiteLineS + decals: + 10: 0,8 + 24: -1,6 + - node: + color: '#0E7F1B7F' + id: MiniTileWhiteLineW + decals: + 6: -2,7 + 9: 1,7 + - node: + color: '#FFFF0099' + id: WarnLineGreyscaleN + decals: + 21: 0,9 + - node: + color: '#FFFF0099' + id: WarnLineGreyscaleS + decals: + 22: 0,6 + - type: GridAtmosphere + version: 2 + data: + tiles: + 0,0: + 0: 63347 + 1: 2188 + -1,0: + 1: 550 + 0: 60616 + 0,1: + 0: 65535 + 0,2: + 0: 13311 + 1: 3072 + 0,3: + 0: 1 + 1: 2 + -1,1: + 0: 61166 + -1,2: + 0: 35054 + 1: 1536 + -1,3: + 1: 8 + 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: GasTileOverlay + - type: RadiationGridResistance +- proto: AirCanister + entities: + - uid: 43 + components: + - type: Transform + pos: -1.5,7.5 + parent: 2 +- proto: AirlockCentralCommandLocked + entities: + - uid: 118 + components: + - type: Transform + pos: 0.5,5.5 + parent: 2 +- proto: AirlockGlassShuttle + entities: + - uid: 122 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,8.5 + parent: 2 + - uid: 123 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: 3.5,6.5 + parent: 2 +- proto: APCBasic + entities: + - uid: 81 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,7.5 + parent: 2 +- proto: AtmosDeviceFanTiny + entities: + - uid: 98 + components: + - type: Transform + pos: 3.5,8.5 + parent: 2 + - uid: 99 + components: + - type: Transform + pos: 3.5,6.5 + parent: 2 +- proto: AtmosFixBlockerMarker + entities: + - uid: 150 + components: + - type: Transform + pos: -2.5,10.5 + parent: 2 + - uid: 151 + components: + - type: Transform + pos: -1.5,10.5 + parent: 2 + - uid: 152 + components: + - type: Transform + pos: -0.5,12.5 + parent: 2 + - uid: 153 + components: + - type: Transform + pos: 1.5,12.5 + parent: 2 + - uid: 154 + components: + - type: Transform + pos: 2.5,10.5 + parent: 2 + - uid: 155 + components: + - type: Transform + pos: 3.5,10.5 + parent: 2 + - uid: 156 + components: + - type: Transform + pos: 3.5,2.5 + parent: 2 + - uid: 157 + components: + - type: Transform + pos: 3.5,1.5 + parent: 2 + - uid: 158 + components: + - type: Transform + pos: 3.5,0.5 + parent: 2 + - uid: 159 + components: + - type: Transform + pos: 2.5,0.5 + parent: 2 + - uid: 160 + components: + - type: Transform + pos: -1.5,0.5 + parent: 2 + - uid: 161 + components: + - type: Transform + pos: -2.5,0.5 + parent: 2 + - uid: 162 + components: + - type: Transform + pos: -2.5,1.5 + parent: 2 + - uid: 163 + components: + - type: Transform + pos: -2.5,2.5 + parent: 2 +- proto: BoxFolderGreen + entities: + - uid: 144 + components: + - type: Transform + pos: 0.71031404,2.691218 + parent: 2 +- proto: BoxFolderYellow + entities: + - uid: 145 + components: + - type: Transform + pos: 0.41343904,2.488093 + parent: 2 +- proto: BoxMRE + entities: + - uid: 132 + components: + - type: Transform + pos: -0.48791015,9.68729 + parent: 2 +- proto: BriefcaseBrownFilled + entities: + - uid: 148 + components: + - type: Transform + pos: -0.60218596,1.8474679 + parent: 2 +- proto: CableApcExtension + entities: + - uid: 60 + components: + - type: Transform + pos: -2.5,7.5 + parent: 2 + - uid: 61 + components: + - type: Transform + pos: -1.5,7.5 + parent: 2 + - uid: 62 + components: + - type: Transform + pos: -0.5,7.5 + parent: 2 + - uid: 63 + components: + - type: Transform + pos: 0.5,7.5 + parent: 2 + - uid: 64 + components: + - type: Transform + pos: 1.5,7.5 + parent: 2 + - uid: 65 + components: + - type: Transform + pos: 0.5,8.5 + parent: 2 + - uid: 66 + components: + - type: Transform + pos: 0.5,9.5 + parent: 2 + - uid: 67 + components: + - type: Transform + pos: 0.5,10.5 + parent: 2 + - uid: 68 + components: + - type: Transform + pos: 0.5,6.5 + parent: 2 + - uid: 69 + components: + - type: Transform + pos: 0.5,5.5 + parent: 2 + - uid: 70 + components: + - type: Transform + pos: 0.5,4.5 + parent: 2 + - uid: 71 + components: + - type: Transform + pos: 1.5,4.5 + parent: 2 + - uid: 72 + components: + - type: Transform + pos: -0.5,4.5 + parent: 2 + - uid: 73 + components: + - type: Transform + pos: 0.5,3.5 + parent: 2 + - uid: 74 + components: + - type: Transform + pos: 0.5,2.5 + parent: 2 + - uid: 75 + components: + - type: Transform + pos: 0.5,1.5 + parent: 2 + - uid: 76 + components: + - type: Transform + pos: -0.5,1.5 + parent: 2 + - uid: 77 + components: + - type: Transform + pos: 1.5,1.5 + parent: 2 +- proto: CableHV + entities: + - uid: 52 + components: + - type: Transform + pos: 0.5,10.5 + parent: 2 + - uid: 53 + components: + - type: Transform + pos: -0.5,10.5 + parent: 2 + - uid: 54 + components: + - type: Transform + pos: -0.5,9.5 + parent: 2 + - uid: 55 + components: + - type: Transform + pos: 1.5,10.5 + parent: 2 + - uid: 56 + components: + - type: Transform + pos: -1.5,9.5 + parent: 2 +- proto: CableMV + entities: + - uid: 51 + components: + - type: Transform + pos: -1.5,9.5 + parent: 2 + - uid: 57 + components: + - type: Transform + pos: -2.5,7.5 + parent: 2 + - uid: 58 + components: + - type: Transform + pos: -1.5,7.5 + parent: 2 + - uid: 127 + components: + - type: Transform + pos: -1.5,8.5 + parent: 2 +- proto: CarpetGreen + entities: + - uid: 106 + components: + - type: Transform + pos: -0.5,1.5 + parent: 2 + - uid: 107 + components: + - type: Transform + pos: 0.5,1.5 + parent: 2 +- proto: ChairGreyscale + entities: + - uid: 139 + components: + - type: Transform + pos: -0.5,3.5 + parent: 2 + - uid: 140 + components: + - type: Transform + pos: 0.5,3.5 + parent: 2 +- proto: ChairOfficeDark + entities: + - uid: 141 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.0085862875,1.6264358 + parent: 2 +- proto: ChairPilotSeat + entities: + - uid: 125 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,10.5 + parent: 2 +- proto: ComputerShuttle + entities: + - uid: 124 + components: + - type: Transform + pos: 0.5,11.5 + parent: 2 +- proto: ComputerStationRecords + entities: + - uid: 136 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,3.5 + parent: 2 +- proto: FaxMachineCentcom + entities: + - uid: 135 + components: + - type: Transform + pos: 2.5,4.5 + parent: 2 +- proto: filingCabinetRandom + entities: + - uid: 133 + components: + - type: Transform + pos: -1.5,4.5 + parent: 2 +- proto: Firelock + entities: + - uid: 169 + components: + - type: Transform + pos: 0.5,5.5 + parent: 2 +- proto: GasPipeBend + entities: + - uid: 44 + components: + - type: Transform + pos: -0.5,7.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 46 + components: + - type: Transform + pos: 0.5,6.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasPipeStraight + entities: + - uid: 47 + components: + - type: Transform + pos: 0.5,5.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 48 + components: + - type: Transform + pos: 0.5,4.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 49 + components: + - type: Transform + pos: 0.5,3.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasPipeTJunction + entities: + - uid: 45 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -0.5,6.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GasPort + entities: + - uid: 130 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,7.5 + parent: 2 +- proto: GasVentPump + entities: + - uid: 42 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,6.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' + - uid: 50 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,2.5 + parent: 2 + - type: AtmosPipeColor + color: '#0055CCFF' +- proto: GeneratorWallmountAPU + entities: + - uid: 78 + components: + - type: Transform + pos: 1.5,10.5 + parent: 2 + - uid: 79 + components: + - type: Transform + pos: -0.5,10.5 + parent: 2 +- proto: GravityGeneratorMini + entities: + - uid: 128 + components: + - type: Transform + pos: -1.5,8.5 + parent: 2 +- proto: Grille + entities: + - uid: 28 + components: + - type: Transform + pos: -0.5,11.5 + parent: 2 + - uid: 29 + components: + - type: Transform + pos: 0.5,12.5 + parent: 2 + - uid: 30 + components: + - type: Transform + pos: 1.5,11.5 + parent: 2 + - uid: 31 + components: + - type: Transform + pos: 3.5,7.5 + parent: 2 + - uid: 32 + components: + - type: Transform + pos: 2.5,7.5 + parent: 2 + - uid: 33 + components: + - type: Transform + pos: 3.5,4.5 + parent: 2 + - uid: 34 + components: + - type: Transform + pos: 3.5,3.5 + parent: 2 + - uid: 35 + components: + - type: Transform + pos: -2.5,3.5 + parent: 2 + - uid: 36 + components: + - type: Transform + pos: -2.5,4.5 + parent: 2 + - uid: 37 + components: + - type: Transform + pos: -0.5,0.5 + parent: 2 + - uid: 38 + components: + - type: Transform + pos: 0.5,0.5 + parent: 2 + - uid: 39 + components: + - type: Transform + pos: 1.5,0.5 + parent: 2 + - uid: 40 + components: + - type: Transform + pos: -0.5,5.5 + parent: 2 + - uid: 41 + components: + - type: Transform + pos: 1.5,5.5 + parent: 2 +- proto: GrilleDiagonal + entities: + - uid: 26 + components: + - type: Transform + pos: -0.5,12.5 + parent: 2 + - uid: 27 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,12.5 + parent: 2 +- proto: GyroscopeNfsd + entities: + - uid: 129 + components: + - type: Transform + pos: -1.5,6.5 + parent: 2 + - type: Thruster + originalPowerLoad: 1500 +- proto: PaperBin20 + entities: + - uid: 143 + components: + - type: Transform + pos: -0.5,2.5 + parent: 2 +- proto: PaperOffice + entities: + - uid: 146 + components: + - type: Transform + pos: 0.36656404,2.706843 + parent: 2 + - uid: 147 + components: + - type: Transform + pos: 0.71031404,2.503718 + parent: 2 +- proto: PenCentcom + entities: + - uid: 142 + components: + - type: Transform + pos: -0.053913713,2.5795608 + parent: 2 +- proto: PosterContrabandWehWatches + entities: + - uid: 174 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,5.5 + parent: 2 +- proto: PosterLegitNanotrasenLogo + entities: + - uid: 171 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,1.5 + parent: 2 +- proto: PosterLegitNoERP + entities: + - uid: 175 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -1.5,5.5 + parent: 2 +- proto: PosterLegitSafetyInternals + entities: + - uid: 172 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,8.5 + parent: 2 +- proto: PosterLegitWorkForAFuture + entities: + - uid: 173 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,9.5 + parent: 2 +- proto: Poweredlight + entities: + - uid: 164 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 0.5,10.5 + parent: 2 + - uid: 165 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,7.5 + parent: 2 + - uid: 166 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,3.5 + parent: 2 + - uid: 167 + components: + - type: Transform + pos: -1.5,4.5 + parent: 2 + - uid: 168 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,1.5 + parent: 2 +- proto: PoweredlightGreen + entities: + - uid: 1 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,10.5 + parent: 2 +- proto: PoweredlightRed + entities: + - uid: 170 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,10.5 + parent: 2 +- proto: ReinforcedWindow + entities: + - uid: 82 + components: + - type: Transform + pos: -0.5,11.5 + parent: 2 + - uid: 83 + components: + - type: Transform + pos: 0.5,12.5 + parent: 2 + - uid: 84 + components: + - type: Transform + pos: 3.5,4.5 + parent: 2 + - uid: 85 + components: + - type: Transform + pos: 3.5,3.5 + parent: 2 + - uid: 86 + components: + - type: Transform + pos: 1.5,0.5 + parent: 2 + - uid: 87 + components: + - type: Transform + pos: 0.5,0.5 + parent: 2 + - uid: 88 + components: + - type: Transform + pos: -0.5,0.5 + parent: 2 + - uid: 89 + components: + - type: Transform + pos: -2.5,3.5 + parent: 2 + - uid: 90 + components: + - type: Transform + pos: -2.5,4.5 + parent: 2 + - uid: 91 + components: + - type: Transform + pos: 2.5,7.5 + parent: 2 + - uid: 92 + components: + - type: Transform + pos: 3.5,7.5 + parent: 2 + - uid: 93 + components: + - type: Transform + pos: 1.5,11.5 + parent: 2 +- proto: ReinforcedWindowDiagonal + entities: + - uid: 94 + components: + - type: Transform + pos: -0.5,12.5 + parent: 2 + - uid: 95 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 1.5,12.5 + parent: 2 +- proto: ShuttersNormalOpen + entities: + - uid: 109 + components: + - type: Transform + pos: -0.5,5.5 + parent: 2 + - type: DeviceLinkSink + links: + - 108 + - uid: 110 + components: + - type: Transform + pos: 1.5,5.5 + parent: 2 + - type: DeviceLinkSink + links: + - 108 + - uid: 111 + components: + - type: Transform + pos: 3.5,4.5 + parent: 2 + - type: DeviceLinkSink + links: + - 108 + - uid: 112 + components: + - type: Transform + pos: 3.5,3.5 + parent: 2 + - type: DeviceLinkSink + links: + - 108 + - uid: 113 + components: + - type: Transform + pos: 1.5,0.5 + parent: 2 + - type: DeviceLinkSink + links: + - 108 + - uid: 114 + components: + - type: Transform + pos: 0.5,0.5 + parent: 2 + - type: DeviceLinkSink + links: + - 108 + - uid: 115 + components: + - type: Transform + pos: -0.5,0.5 + parent: 2 + - type: DeviceLinkSink + links: + - 108 + - uid: 116 + components: + - type: Transform + pos: -2.5,4.5 + parent: 2 + - type: DeviceLinkSink + links: + - 108 + - uid: 117 + components: + - type: Transform + pos: -2.5,3.5 + parent: 2 + - type: DeviceLinkSink + links: + - 108 +- proto: SignalButtonDirectional + entities: + - uid: 108 + components: + - type: MetaData + name: Shutter Control + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,1.5 + parent: 2 + - type: DeviceLinkSource + linkedPorts: + 115: + - Pressed: Toggle + 114: + - Pressed: Toggle + 113: + - Pressed: Toggle + 112: + - Pressed: Toggle + 111: + - Pressed: Toggle + 117: + - Pressed: Toggle + 116: + - Pressed: Toggle + 109: + - Pressed: Toggle + 110: + - Pressed: Toggle +- proto: SubstationWallBasic + entities: + - uid: 80 + components: + - type: Transform + pos: -1.5,9.5 + parent: 2 +- proto: TableGlass + entities: + - uid: 131 + components: + - type: Transform + pos: -0.5,9.5 + parent: 2 + - uid: 134 + components: + - type: Transform + pos: 2.5,4.5 + parent: 2 +- proto: TableWood + entities: + - uid: 137 + components: + - type: Transform + pos: -0.5,2.5 + parent: 2 + - uid: 138 + components: + - type: Transform + pos: 0.5,2.5 + parent: 2 +- proto: ThrusterNfsd + entities: + - uid: 100 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,1.5 + parent: 2 + - type: Thruster + originalPowerLoad: 1500 + - uid: 101 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 3.5,1.5 + parent: 2 + - type: Thruster + originalPowerLoad: 1500 + - uid: 102 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: -2.5,0.5 + parent: 2 + - type: Thruster + originalPowerLoad: 1500 + - uid: 103 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,0.5 + parent: 2 + - type: Thruster + originalPowerLoad: 1500 + - uid: 104 + components: + - type: Transform + pos: 3.5,10.5 + parent: 2 + - type: Thruster + originalPowerLoad: 1500 + - uid: 105 + components: + - type: Transform + pos: -2.5,10.5 + parent: 2 + - type: Thruster + originalPowerLoad: 1500 +- proto: VendingMachineCoffee + entities: + - uid: 126 + components: + - type: Transform + pos: 1.5,9.5 + parent: 2 +- proto: WallShuttle + entities: + - uid: 3 + components: + - type: Transform + pos: -1.5,9.5 + parent: 2 + - uid: 4 + components: + - type: Transform + pos: -2.5,9.5 + parent: 2 + - uid: 5 + components: + - type: Transform + pos: -2.5,8.5 + parent: 2 + - uid: 6 + components: + - type: Transform + pos: -2.5,7.5 + parent: 2 + - uid: 7 + components: + - type: Transform + pos: -2.5,6.5 + parent: 2 + - uid: 8 + components: + - type: Transform + pos: -2.5,5.5 + parent: 2 + - uid: 9 + components: + - type: Transform + pos: -1.5,5.5 + parent: 2 + - uid: 10 + components: + - type: Transform + pos: 2.5,5.5 + parent: 2 + - uid: 11 + components: + - type: Transform + pos: -1.5,2.5 + parent: 2 + - uid: 12 + components: + - type: Transform + pos: -1.5,1.5 + parent: 2 + - uid: 13 + components: + - type: Transform + pos: 2.5,1.5 + parent: 2 + - uid: 14 + components: + - type: Transform + pos: 2.5,2.5 + parent: 2 + - uid: 15 + components: + - type: Transform + pos: 3.5,5.5 + parent: 2 + - uid: 16 + components: + - type: Transform + pos: 3.5,9.5 + parent: 2 + - uid: 17 + components: + - type: Transform + pos: 2.5,9.5 + parent: 2 + - uid: 18 + components: + - type: Transform + pos: 1.5,10.5 + parent: 2 + - uid: 19 + components: + - type: Transform + pos: -0.5,10.5 + parent: 2 +- proto: WallShuttleDiagonal + entities: + - uid: 20 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -1.5,0.5 + parent: 2 + - uid: 21 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 2.5,0.5 + parent: 2 + - uid: 22 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 3.5,2.5 + parent: 2 + - uid: 23 + components: + - type: Transform + rot: 1.5707963267948966 rad + pos: -2.5,2.5 + parent: 2 + - uid: 24 + components: + - type: Transform + pos: -1.5,10.5 + parent: 2 + - uid: 25 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,10.5 + parent: 2 +- proto: WarpPoint + entities: + - uid: 149 + components: + - type: MetaData + name: Fishbowl + - type: Transform + pos: 0.5,7.5 + parent: 2 +- proto: WindoorSecureCentralCommandLocked + entities: + - uid: 119 + components: + - type: Transform + rot: 3.141592653589793 rad + pos: 0.5,9.5 + parent: 2 + - uid: 120 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,8.5 + parent: 2 + - uid: 121 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 2.5,6.5 + parent: 2 +- proto: Window + entities: + - uid: 96 + components: + - type: Transform + pos: -0.5,5.5 + parent: 2 + - uid: 97 + components: + - type: Transform + pos: 1.5,5.5 + parent: 2 +- proto: Wrench + entities: + - uid: 59 + components: + - type: Transform + pos: -1.5330005,7.4166317 + parent: 2 +... From f6e248638c90d286c526f6a9b9f1679a41936b43 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Sat, 18 May 2024 19:17:19 +0000 Subject: [PATCH 06/14] Automatic Changelog (#1223) --- Resources/Changelog/Changelog.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index ee081b42e85..bc4f0c89c04 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -4616,3 +4616,11 @@ Entries: message: Enabled dark green jumpsuit. id: 4984 time: '2024-05-18T11:35:08.0000000+00:00' +- author: Tych0theSynth + changes: + - type: Add + message: >- + Added the NT Fishbowl - a personal transport/office for central + commanders. + id: 4985 + time: '2024-05-18T19:16:54.0000000+00:00' From 6c4aecea8dfecdff55c9d71f1a3c66badbc45db1 Mon Sep 17 00:00:00 2001 From: Checkraze <71046427+Cheackraze@users.noreply.github.com> Date: Sat, 18 May 2024 21:02:41 -0400 Subject: [PATCH 07/14] Revert "BankLable Corvax (#1379)" (#1390) This reverts commit d23d0dceba2660db0bd29878006dca46a365c9c9. --- .../Administration/AdminNameOverlay.cs | 2 -- .../UI/Tabs/PlayerTab/PlayerTab.xaml.cs | 6 ++--- .../UI/Tabs/PlayerTab/PlayerTabEntry.xaml | 4 --- .../UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs | 5 ++-- .../UI/Tabs/PlayerTab/PlayerTabHeader.xaml | 9 +------ .../UI/Tabs/PlayerTab/PlayerTabHeader.xaml.cs | 14 ++--------- .../Administration/Systems/AdminSystem.cs | 25 +------------------ Content.Server/_NF/Bank/BankSystem.cs | 5 ---- Content.Shared/Administration/PlayerInfo.cs | 3 +-- .../_NF/Bank/Events/BalanceChangedMessage.cs | 4 --- .../_NF/administration/ui/tabs/player-tab.ftl | 1 - 11 files changed, 9 insertions(+), 69 deletions(-) delete mode 100644 Content.Shared/_NF/Bank/Events/BalanceChangedMessage.cs delete mode 100644 Resources/Locale/en-US/_NF/administration/ui/tabs/player-tab.ftl diff --git a/Content.Client/Administration/AdminNameOverlay.cs b/Content.Client/Administration/AdminNameOverlay.cs index 46c6c5d3ee5..c21ba2e32ca 100644 --- a/Content.Client/Administration/AdminNameOverlay.cs +++ b/Content.Client/Administration/AdminNameOverlay.cs @@ -61,14 +61,12 @@ protected override void Draw(in OverlayDrawArgs args) var screenCoordinates = _eyeManager.WorldToScreen(aabb.Center + new Angle(-_eyeManager.CurrentEye.Rotation).RotateVec( aabb.TopRight - aabb.Center)) + new Vector2(1f, 7f); - var balance_str = playerInfo.Balance == int.MinValue ? "NO BALANCE" : playerInfo.Balance.ToString(); // Frontier if (playerInfo.Antag) { args.ScreenHandle.DrawString(_font, screenCoordinates + (lineoffset * 2), "ANTAG", Color.OrangeRed); } args.ScreenHandle.DrawString(_font, screenCoordinates+lineoffset, playerInfo.Username, playerInfo.Connected ? Color.Yellow : Color.White); args.ScreenHandle.DrawString(_font, screenCoordinates, playerInfo.CharacterName, playerInfo.Connected ? Color.Aquamarine : Color.White); - args.ScreenHandle.DrawString(_font, screenCoordinates + 3 * lineoffset, $"balance: {balance_str}", playerInfo.Connected ? Color.Aquamarine : Color.White); } } } diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs index acf78be1d64..33a1d2361f2 100644 --- a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs +++ b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs @@ -121,8 +121,7 @@ private void RefreshPlayerList(IReadOnlyList players) player.Antag ? "YES" : "NO", new StyleBoxFlat(useAltColor ? _altColor : _defaultColor), player.Connected, - player.PlaytimeString, // Frontier - player.Balance == int.MinValue ? "NO BALANCE" : player.Balance.ToString()); // Frontier + player.PlaytimeString); entry.PlayerEntity = player.NetEntity; entry.OnKeyBindDown += args => OnEntryKeyBindDown?.Invoke(entry, args); entry.ToolTip = Loc.GetString("player-tab-entry-tooltip"); @@ -152,9 +151,8 @@ private int Compare(PlayerInfo x, PlayerInfo y) Header.Job => Compare(x.StartingJob, y.StartingJob), Header.Antagonist => x.Antag.CompareTo(y.Antag), Header.Playtime => TimeSpan.Compare(x.OverallPlaytime ?? default, y.OverallPlaytime ?? default), - Header.Balance => x.Balance.CompareTo(y.Balance), // Frontier _ => 1 - }; ; + }; } private int Compare(string x, string y) diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml index 70a91ef383d..8ac90305ca9 100644 --- a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml +++ b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml @@ -27,9 +27,5 @@ SizeFlagsStretchRatio="2" HorizontalExpand="True" ClipText="True"/> -