From e27719eccc1c16c88dc745b989b1580575615c01 Mon Sep 17 00:00:00 2001 From: Kesiath <96151729+Kesiath@users.noreply.github.com> Date: Mon, 23 Oct 2023 17:04:53 -0500 Subject: [PATCH 1/6] STC QoL Update (#461) * station updates * stc job and frontier airlocks * linter error * sergeant and stc latejoin * roles for frontier and job time locks --- .../Components/IdCardConsoleComponent.cs | 1 + .../Locale/en-US/job/job-description.ftl | 1 + Resources/Locale/en-US/job/job-names.ftl | 2 + .../en-US/prototypes/access/accesses.ftl | 1 + Resources/Maps/frontier.yml | 4532 +++++++---------- Resources/Prototypes/Access/command.yml | 7 +- Resources/Prototypes/Access/misc.yml | 1 + .../Objects/Tools/access_configurator.yml | 1 + Resources/Prototypes/Maps/frontier.yml | 4 + .../Roles/Jobs/Cargo/cargo_technician.yml | 3 + .../Roles/Jobs/Cargo/quartermaster.yml | 13 +- .../Roles/Jobs/Cargo/salvage_specialist.yml | 7 +- .../Roles/Jobs/Civilian/bartender.yml | 5 +- .../Roles/Jobs/Civilian/botanist.yml | 3 + .../Roles/Jobs/Civilian/chaplain.yml | 3 + .../Prototypes/Roles/Jobs/Civilian/chef.yml | 7 +- .../Prototypes/Roles/Jobs/Civilian/clown.yml | 3 + .../Roles/Jobs/Civilian/janitor.yml | 3 + .../Roles/Jobs/Civilian/librarian.yml | 3 + .../Prototypes/Roles/Jobs/Civilian/mime.yml | 2 +- .../Roles/Jobs/Civilian/musician.yml | 3 + .../Roles/Jobs/Civilian/service_worker.yml | 3 + .../Roles/Jobs/Command/head_of_personnel.yml | 1 + .../Engineering/atmospheric_technician.yml | 5 +- .../Roles/Jobs/Engineering/chief_engineer.yml | 15 +- .../Jobs/Engineering/station_engineer.yml | 7 +- .../Prototypes/Roles/Jobs/Medical/chemist.yml | 7 +- .../Jobs/Medical/chief_medical_officer.yml | 15 +- .../Roles/Jobs/Medical/medical_doctor.yml | 7 +- .../Roles/Jobs/Medical/paramedic.yml | 9 +- .../Roles/Jobs/Science/research_director.yml | 7 +- .../Roles/Jobs/Science/scientist.yml | 7 +- .../Roles/Jobs/Security/brigmedic.yml | 2 +- .../Roles/Jobs/Security/detective.yml | 2 +- .../Roles/Jobs/Security/head_of_security.yml | 1 + .../Roles/Jobs/Security/security_cadet.yml | 2 +- .../Roles/Jobs/Security/security_officer.yml | 2 +- .../Prototypes/Roles/Jobs/Security/warden.yml | 5 +- .../Prototypes/Roles/Jobs/Wildcards/boxer.yml | 3 + .../Roles/Jobs/Wildcards/psychologist.yml | 3 + .../Roles/Jobs/Wildcards/reporter.yml | 3 + .../Roles/Jobs/Wildcards/zookeeper.yml | 3 + .../Prototypes/Roles/Jobs/departments.yml | 3 +- .../Prototypes/Roles/play_time_trackers.yml | 3 + .../Devices/Misc/identification_cards.yml | 16 +- .../_NF/Entities/Objects/Devices/pda.yml | 15 + .../Structures/Doors/Airlocks/access.yml | 19 + .../Prototypes/_NF/Markers/Spawners/jobs.yml | 2 +- .../Prototypes/_NF/Roles/Jobs/Command/stc.yml | 29 + .../_NF/Roles/Jobs/Security/mercenary.yml | 3 + .../_Nyano/Roles/Jobs/Cargo/mail_carrier.yml | 3 + .../_Nyano/Roles/Jobs/Civilian/valet.yml | 3 + .../Roles/Jobs/Security/prisonguard.yml | 2 +- .../_Nyano/Roles/Jobs/Wildcards/gladiator.yml | 3 + .../Roles/Jobs/Wildcards/martialartist.yml | 3 + .../_Nyano/Roles/Jobs/Wildcards/prisoner.yml | 6 +- 56 files changed, 2036 insertions(+), 2788 deletions(-) create mode 100644 Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml create mode 100644 Resources/Prototypes/_NF/Roles/Jobs/Command/stc.yml diff --git a/Content.Shared/Access/Components/IdCardConsoleComponent.cs b/Content.Shared/Access/Components/IdCardConsoleComponent.cs index 47f2660d809..377d9bdb4d5 100644 --- a/Content.Shared/Access/Components/IdCardConsoleComponent.cs +++ b/Content.Shared/Access/Components/IdCardConsoleComponent.cs @@ -58,6 +58,7 @@ public WriteToTargetIdMessage(string fullName, string jobTitle, List acc "Command", "Engineering", "External", + "Frontier", "HeadOfPersonnel", "HeadOfSecurity", "Hydroponics", diff --git a/Resources/Locale/en-US/job/job-description.ftl b/Resources/Locale/en-US/job/job-description.ftl index a4aab9e68bb..6e9575dee97 100644 --- a/Resources/Locale/en-US/job/job-description.ftl +++ b/Resources/Locale/en-US/job/job-description.ftl @@ -48,3 +48,4 @@ job-description-senior-engineer = Teach new engineers the basics of the station' job-description-senior-researcher = Teach new scientists the basics of item printing, artifact research and anomalous objects. job-description-senior-physician = Teach new medics the basics of tending to the wounded, chemistry, diagnosing the diseased and disposing of the dead. job-description-senior-officer = Teach new deputies the basics of searches, preforming arrests, prison times and how to properly shoot a firearm. +job-description-stc = Expertly de-conflict the space around the station and help the NFSD issue fines for overdocked ships. diff --git a/Resources/Locale/en-US/job/job-names.ftl b/Resources/Locale/en-US/job/job-names.ftl index e2197e9c9c9..f1bb9c4ffb7 100644 --- a/Resources/Locale/en-US/job/job-names.ftl +++ b/Resources/Locale/en-US/job/job-names.ftl @@ -48,6 +48,7 @@ job-name-senior-engineer = Senior Engineer job-name-senior-researcher = Senior Researcher job-name-senior-physician = Senior Physician job-name-senior-officer = Sergeant +job-name-stc = Station Traffic Controller # Role timers - Make these alphabetical or I cut you JobAtmosphericTechnician = Atmospheric Technician @@ -96,6 +97,7 @@ JobSeniorOfficer = Sergeant JobSeniorPhysician = Senior Physician JobSeniorResearcher = Senior Researcher JobServiceWorker = Service Worker +JobSTC = Station Traffic Controller JobStationEngineer = Station Engineer JobTechnicalAssistant = Technical Assistant JobWarden = Bailiff diff --git a/Resources/Locale/en-US/prototypes/access/accesses.ftl b/Resources/Locale/en-US/prototypes/access/accesses.ftl index a7a7795c11e..c2f413c97de 100644 --- a/Resources/Locale/en-US/prototypes/access/accesses.ftl +++ b/Resources/Locale/en-US/prototypes/access/accesses.ftl @@ -1,6 +1,7 @@ id-card-access-level-command = Command id-card-access-level-captain = Captain id-card-access-level-head-of-personnel = Station Representative +id-card-access-level-frontier = Station Traffic Controller id-card-access-level-head-of-security = Sheriff id-card-access-level-security = Security diff --git a/Resources/Maps/frontier.yml b/Resources/Maps/frontier.yml index 4609044e9dd..be40c606b96 100644 --- a/Resources/Maps/frontier.yml +++ b/Resources/Maps/frontier.yml @@ -201,39 +201,39 @@ entities: color: '#FFFFFFFF' id: Arrows decals: - 2626: 3,40 - 2627: 4,40 + 2595: 3,40 + 2596: 4,40 - node: angle: 3.141592653589793 rad color: '#FFFFFFFF' id: Arrows decals: - 2628: 3,37 - 2629: 4,37 + 2597: 3,37 + 2598: 4,37 - node: color: '#334E6DC8' id: ArrowsGreyscale decals: - 2551: 0,9 - 2552: 0,9 - 2553: 0,9 - 2554: 0,9 - 2586: -2,9 - 2587: -2,9 - 2588: -2,9 - 2589: -2,9 - 2590: -2,9 + 2520: 0,9 + 2521: 0,9 + 2522: 0,9 + 2523: 0,9 + 2555: -2,9 + 2556: -2,9 + 2557: -2,9 + 2558: -2,9 + 2559: -2,9 - node: angle: 3.141592653589793 rad color: '#334E6DC8' id: ArrowsGreyscale decals: - 2545: -2,12 - 2546: -2,12 - 2547: -2,12 - 2548: 0,12 - 2549: 0,12 - 2550: 0,12 + 2514: -2,12 + 2515: -2,12 + 2516: -2,12 + 2517: 0,12 + 2518: 0,12 + 2519: 0,12 - node: color: '#52B4E9FF' id: ArrowsGreyscale @@ -247,20 +247,20 @@ entities: color: '#52B4F3AD' id: ArrowsGreyscale decals: - 1997: 23,21 - 1998: 23,21 - 1999: 23,21 - 2000: 23,21 - 2001: 23,21 - 2002: 23,21 - 2003: 23,21 - 2004: 23,21 - 2005: 23,21 - 2006: 23,21 - 2009: 21,21 - 2010: 21,21 - 2011: 21,21 - 2012: 21,21 + 1966: 23,21 + 1967: 23,21 + 1968: 23,21 + 1969: 23,21 + 1970: 23,21 + 1971: 23,21 + 1972: 23,21 + 1973: 23,21 + 1974: 23,21 + 1975: 23,21 + 1978: 21,21 + 1979: 21,21 + 1980: 21,21 + 1981: 21,21 - node: color: '#DE3A3A96' id: Bot @@ -272,23 +272,23 @@ entities: color: '#FFFFFFFF' id: Bot decals: - 2654: -1,45 - 2655: -1,44 - 2656: -1,43 - 2657: 5,43 - 2658: 5,44 - 2659: 5,45 - 2660: 2,48 + 2623: -1,45 + 2624: -1,44 + 2625: -1,43 + 2626: 5,43 + 2627: 5,44 + 2628: 5,45 + 2629: 2,48 - node: color: '#52B4E9AE' id: BotLeftGreyscale decals: - 1945: 4,25 - 1946: 5,25 - 1947: 6,25 - 1948: 8,25 - 1995: 7,25 - 1996: 24,20 + 1914: 4,25 + 1915: 5,25 + 1916: 6,25 + 1917: 8,25 + 1964: 7,25 + 1965: 24,20 - node: color: '#52B4E9FF' id: BotLeftGreyscale @@ -321,29 +321,29 @@ entities: 835: -11,12 836: -12,11 837: -15,11 - 1763: -17,11 - 1764: -11,14 - 3006: -5,10 - 3007: -5,12 - 3008: -5,14 - 3009: -5,17 - 3010: -11,14 - 3011: -12,13 - 3012: -11,12 - 3013: -12,11 - 3014: -10,11 - 3015: -10,13 - 3016: -15,11 - 3017: -17,11 + 1732: -17,11 + 1733: -11,14 + 2965: -5,10 + 2966: -5,12 + 2967: -5,14 + 2968: -5,17 + 2969: -11,14 + 2970: -12,13 + 2971: -11,12 + 2972: -12,11 + 2973: -10,11 + 2974: -10,13 + 2975: -15,11 + 2976: -17,11 - node: cleanable: True color: '#FFFFFFFF' id: BrickTileDarkBox decals: - 1788: -5,17 - 1789: -5,14 - 1790: -5,12 - 1791: -5,10 + 1757: -5,17 + 1758: -5,14 + 1759: -5,12 + 1760: -5,10 - node: color: '#FFFFFFFF' id: BrickTileDarkCornerNe @@ -351,7 +351,7 @@ entities: 302: 38,15 527: -4,28 548: 22,13 - 2534: 1,9 + 2503: 1,9 - node: color: '#FFFFFFFF' id: BrickTileDarkCornerNw @@ -359,7 +359,7 @@ entities: 301: 36,15 530: -6,28 547: 19,13 - 2583: -3,9 + 2552: -3,9 - node: color: '#FFFFFFFF' id: BrickTileDarkCornerSe @@ -367,7 +367,7 @@ entities: 300: 38,13 529: -4,26 545: 22,9 - 1793: 1,12 + 1762: 1,12 - node: color: '#FFFFFFFF' id: BrickTileDarkCornerSw @@ -375,15 +375,15 @@ entities: 299: 36,13 528: -6,26 546: 19,9 - 1792: -3,12 + 1761: -3,12 - node: color: '#FFFFFF81' id: BrickTileDarkInnerNe decals: - 2510: -3,12 - 2511: -3,12 - 2520: -1,12 - 2521: -1,12 + 2479: -3,12 + 2480: -3,12 + 2489: -1,12 + 2490: -1,12 - node: color: '#FFFFFFFF' id: BrickTileDarkInnerNe @@ -391,68 +391,68 @@ entities: 170: 4,14 262: 34,11 469: 11,12 - 2536: 0,9 + 2505: 0,9 - node: color: '#FFFFFF81' id: BrickTileDarkInnerNw decals: - 2514: -1,12 - 2515: -1,12 - 2522: 1,12 - 2523: 1,12 + 2483: -1,12 + 2484: -1,12 + 2491: 1,12 + 2492: 1,12 - node: color: '#FFFFFFFF' id: BrickTileDarkInnerNw decals: 263: 40,11 470: 16,12 - 2585: -2,9 + 2554: -2,9 - node: color: '#FFFFFF81' id: BrickTileDarkInnerSe decals: - 2571: -1,9 - 2572: -1,9 - 2573: -3,9 - 2574: -3,9 + 2540: -1,9 + 2541: -1,9 + 2542: -3,9 + 2543: -3,9 - node: color: '#FFFFFFFF' id: BrickTileDarkInnerSe decals: 169: 4,17 264: 34,17 - 1797: 0,12 + 1766: 0,12 - node: color: '#FFFFFF81' id: BrickTileDarkInnerSw decals: - 2541: 1,9 - 2542: 1,9 - 2577: -1,9 - 2578: -1,9 + 2510: 1,9 + 2511: 1,9 + 2546: -1,9 + 2547: -1,9 - node: color: '#FFFFFFFF' id: BrickTileDarkInnerSw decals: 265: 40,17 - 1796: -2,12 + 1765: -2,12 - node: color: '#52B4E996' id: BrickTileDarkLineE decals: - 3022: -48,2 + 2981: -48,2 - node: color: '#FFFFFF81' id: BrickTileDarkLineE decals: - 2508: -3,13 - 2509: -3,13 - 2518: -1,13 - 2519: -1,13 - 2565: -3,8 - 2566: -3,8 - 2567: -1,8 - 2568: -1,8 + 2477: -3,13 + 2478: -3,13 + 2487: -1,13 + 2488: -1,13 + 2534: -3,8 + 2535: -3,8 + 2536: -1,8 + 2537: -1,8 - node: color: '#FFFFFFFF' id: BrickTileDarkLineE @@ -474,26 +474,26 @@ entities: 542: 22,12 543: 22,11 544: 22,10 - 1794: 1,13 - 2535: 1,8 - 2558: -3,11 - 2559: -3,10 - 3020: -48,2 - 3021: -48,1 + 1763: 1,13 + 2504: 1,8 + 2527: -3,11 + 2528: -3,10 + 2979: -48,2 + 2980: -48,1 - node: color: '#FFFFFF81' id: BrickTileDarkLineN decals: - 2512: -2,12 - 2513: -2,12 - 2526: 0,12 - 2527: 0,12 - 2537: 0,9 - 2538: 0,9 - 2579: -1,9 - 2580: -1,9 - 2581: -2,9 - 2582: -2,9 + 2481: -2,12 + 2482: -2,12 + 2495: 0,12 + 2496: 0,12 + 2506: 0,9 + 2507: 0,9 + 2548: -1,9 + 2549: -1,9 + 2550: -2,9 + 2551: -2,9 - node: color: '#FFFFFFFF' id: BrickTileDarkLineN @@ -546,16 +546,16 @@ entities: color: '#FFFFFF81' id: BrickTileDarkLineS decals: - 2528: -2,12 - 2529: -2,12 - 2530: 0,12 - 2531: 0,12 - 2532: -1,12 - 2533: -1,12 - 2543: 0,9 - 2544: 0,9 - 2575: -2,9 - 2576: -2,9 + 2497: -2,12 + 2498: -2,12 + 2499: 0,12 + 2500: 0,12 + 2501: -1,12 + 2502: -1,12 + 2512: 0,9 + 2513: 0,9 + 2544: -2,9 + 2545: -2,9 - node: color: '#FFFFFFFF' id: BrickTileDarkLineS @@ -606,14 +606,14 @@ entities: color: '#FFFFFF81' id: BrickTileDarkLineW decals: - 2516: -1,13 - 2517: -1,13 - 2524: 1,13 - 2525: 1,13 - 2539: 1,8 - 2540: 1,8 - 2569: -1,8 - 2570: -1,8 + 2485: -1,13 + 2486: -1,13 + 2493: 1,13 + 2494: 1,13 + 2508: 1,8 + 2509: 1,8 + 2538: -1,8 + 2539: -1,8 - node: color: '#FFFFFFFF' id: BrickTileDarkLineW @@ -639,10 +639,10 @@ entities: 535: 19,10 536: 19,11 537: 19,12 - 1795: -3,13 - 2556: 1,11 - 2557: 1,10 - 2584: -3,8 + 1764: -3,13 + 2525: 1,11 + 2526: 1,10 + 2553: -3,8 - node: color: '#52B4E9FF' id: BrickTileSteelCornerNe @@ -657,14 +657,14 @@ entities: 608: 19,21 609: 25,21 610: 27,21 - 2007: 23,21 - 2008: 21,21 + 1976: 23,21 + 1977: 21,21 - node: color: '#52B4E996' id: BrickTileSteelLineE decals: - 3023: -48,2 - 3024: -48,1 + 2982: -48,2 + 2983: -48,1 - node: color: '#52B4E9FF' id: BrickTileSteelLineE @@ -678,8 +678,8 @@ entities: color: '#FFFFFFFF' id: BrickTileSteelLineE decals: - 2563: 0,11 - 2564: 0,10 + 2532: 0,11 + 2533: 0,10 - node: color: '#52B4E9FF' id: BrickTileSteelLineN @@ -713,8 +713,8 @@ entities: id: BrickTileSteelLineW decals: 165: -3,42 - 2555: -2,10 - 2562: -2,11 + 2524: -2,10 + 2531: -2,11 - node: color: '#FFFFFFFF' id: BrickTileWhiteCornerNe @@ -737,7 +737,7 @@ entities: color: '#A4610696' id: BrickTileWhiteCornerSw decals: - 2618: -3,36 + 2587: -3,36 - node: color: '#FFFFFFFF' id: BrickTileWhiteCornerSw @@ -810,20 +810,20 @@ entities: color: '#A4610696' id: BrickTileWhiteLineE decals: - 2631: 8,52 - 2632: 8,51 - 2633: 8,50 - 2634: 8,49 - 2635: 8,48 - 2636: 8,47 - 2637: 8,46 - 2638: 8,45 - 2639: 8,44 - 2640: 8,43 - 2641: 8,42 - 2642: 8,41 - 2643: 8,56 - 2644: 8,57 + 2600: 8,52 + 2601: 8,51 + 2602: 8,50 + 2603: 8,49 + 2604: 8,48 + 2605: 8,47 + 2606: 8,46 + 2607: 8,45 + 2608: 8,44 + 2609: 8,43 + 2610: 8,42 + 2611: 8,41 + 2612: 8,56 + 2613: 8,57 - node: color: '#DE3A3A96' id: BrickTileWhiteLineE @@ -945,13 +945,13 @@ entities: color: '#A4610696' id: BrickTileWhiteLineS decals: - 2619: -2,36 - 2620: -1,36 - 2621: 0,36 - 2622: 1,36 - 2623: 2,36 - 2624: 3,36 - 2625: 4,36 + 2588: -2,36 + 2589: -1,36 + 2590: 0,36 + 2591: 1,36 + 2592: 2,36 + 2593: 3,36 + 2594: 4,36 - node: color: '#DE3A3A96' id: BrickTileWhiteLineS @@ -1018,18 +1018,18 @@ entities: id: BrickTileWhiteLineW decals: 166: -3,42 - 2613: -3,41 - 2614: -3,40 - 2615: -3,39 - 2616: -3,38 - 2617: -3,37 + 2582: -3,41 + 2583: -3,40 + 2584: -3,39 + 2585: -3,38 + 2586: -3,37 - node: zIndex: 180 color: '#A4610696' id: BrickTileWhiteLineW decals: - 2645: -3,47 - 2646: -3,46 + 2614: -3,47 + 2615: -3,46 - node: color: '#DE3A3A96' id: BrickTileWhiteLineW @@ -1092,8 +1092,8 @@ entities: color: '#FFFFFFFF' id: Delivery decals: - 2661: 1,48 - 2662: 3,48 + 2630: 1,48 + 2631: 3,48 - node: cleanable: True color: '#A4610696' @@ -1268,38 +1268,38 @@ entities: 831: -50,18 832: -48,18 833: -48,18 - 2962: 5,3 - 2963: 6,3 - 2964: 9,3 - 2965: 8,2 - 2966: 10,3 - 2967: 9,2 - 2968: 8,3 - 2969: 7,3 - 2970: 6,3 - 2971: 7,4 - 2972: 8,4 - 2973: 11,3 - 2974: 5,3 - 2975: -13,3 - 2976: -13,3 - 2977: -12,3 - 2978: -11,3 - 2979: -11,3 - 2980: -11,4 - 2981: -10,2 - 2982: -9,2 - 2983: -9,3 - 2984: -10,3 - 2985: -8,3 - 2986: -7,3 - 2987: -8,3 + 2921: 5,3 + 2922: 6,3 + 2923: 9,3 + 2924: 8,2 + 2925: 10,3 + 2926: 9,2 + 2927: 8,3 + 2928: 7,3 + 2929: 6,3 + 2930: 7,4 + 2931: 8,4 + 2932: 11,3 + 2933: 5,3 + 2934: -13,3 + 2935: -13,3 + 2936: -12,3 + 2937: -11,3 + 2938: -11,3 + 2939: -11,4 + 2940: -10,2 + 2941: -9,2 + 2942: -9,3 + 2943: -10,3 + 2944: -8,3 + 2945: -7,3 + 2946: -8,3 - node: color: '#FFFFFFFF' id: DirtHeavy decals: 869: -60,3 - 2561: -3,10 + 2530: -3,10 - node: cleanable: True color: '#FFFFFFFF' @@ -1387,412 +1387,412 @@ entities: 1219: -10,6 1220: -11,5 1221: -12,5 - 1223: -15,2 - 1224: -16,2 - 1225: -14,1 - 1226: -10,2 - 1227: -8,1 - 1228: -7,2 - 1229: -9,1 - 1230: -5,3 - 1231: -4,4 - 1232: -4,3 - 1233: -4,2 - 1234: -16,1 - 1235: -17,2 - 1236: -17,3 - 1237: -20,1 - 1238: -20,2 - 1239: -21,3 - 1240: -23,1 - 1241: -25,2 - 1242: -25,3 - 1243: -26,3 - 1244: -27,1 - 1245: -27,3 - 1304: -2,6 - 1305: -2,4 - 1306: -1,3 - 1307: -2,3 - 1308: -2,2 - 1309: 0,3 - 1416: 6,2 - 1417: 6,2 - 1419: 5,5 - 1420: 3,6 - 1421: 3,2 - 1422: 9,2 - 1423: 8,5 - 1424: 10,5 - 1426: 12,2 - 1427: 13,3 - 1428: 14,2 - 1429: 14,2 - 1430: 14,4 - 1431: 17,2 - 1432: 18,3 - 1433: 18,3 - 1434: 20,2 - 1435: 21,1 - 1436: 24,3 - 1437: 23,3 - 1438: 22,3 - 1439: 22,2 - 1440: 22,2 - 1441: 23,2 - 1584: 52,1 - 1585: 53,2 - 1586: 52,2 - 1587: 52,3 - 1588: 55,0 - 1589: 54,1 - 1590: 47,2 - 1591: 44,3 - 1592: 44,4 - 1593: 45,3 - 1594: 42,2 - 1595: 39,1 - 1596: 38,3 - 1597: 35,3 - 1598: 35,2 - 1599: 34,4 - 1600: 33,4 - 1601: 31,2 - 1602: 29,1 - 1603: 28,3 - 1604: 28,1 - 1605: 35,5 - 1606: 45,6 - 1607: 45,5 - 1608: 48,4 - 1609: 47,4 - 1610: 34,8 - 1611: 34,7 - 1612: 35,7 - 1613: 39,7 - 1637: 41,15 - 1638: 41,14 - 1639: 41,13 - 1640: 38,10 - 1641: 36,10 - 1643: 34,15 - 1644: 31,13 - 1645: 34,12 - 1646: 33,9 - 1651: 27,-1 - 1652: 29,-3 - 1653: 28,-4 - 1654: 28,-6 - 1655: 28,-8 - 1656: 27,-6 - 1657: 27,-5 - 1658: 29,-5 - 1659: 29,-7 - 1660: 29,-8 - 1661: 29,-9 - 1662: 29,-11 - 1663: 27,-12 - 1664: 27,-13 - 1665: 28,-13 - 1666: 29,-13 - 1667: 28,-16 - 1668: 27,-18 - 1669: 28,-19 - 1670: 27,-20 - 1671: 29,-22 - 1672: 29,-23 - 1673: 29,-24 - 1714: 10,4 - 1715: -2,29 - 1716: -1,27 - 1717: -1,25 - 1718: -1,24 - 1719: 0,22 - 1720: 1,22 - 1721: 1,24 - 1722: 0,22 - 1723: -2,21 - 1724: -2,20 - 1725: 1,20 - 1726: 1,21 - 1745: -2,28 - 1746: -1,26 - 1747: -1,25 - 1765: -19,11 - 1766: -17,10 - 1767: -14,12 - 1768: -13,11 - 1769: -14,10 - 1782: -15,10 - 1820: -2,15 - 1821: -2,16 - 1822: -2,17 - 1823: -2,17 - 1824: -2,17 - 1825: 0,18 - 1834: -2,18 - 1835: -2,18 - 1842: -3,18 - 1843: -3,18 - 1864: -4,15 - 1865: -4,14 - 1872: -4,12 - 1873: -6,11 - 1874: -6,11 - 1875: -6,11 - 1898: -5,8 - 1899: -5,8 - 1900: -5,8 - 1901: 2,10 - 1902: 2,9 - 1903: 3,8 - 1949: 3,28 - 1950: 4,26 - 1951: 8,28 - 1952: 6,28 - 1953: 9,26 - 1954: 10,26 - 1955: 10,24 - 1956: 10,23 - 1957: 11,24 - 1958: 11,25 - 1959: 11,28 - 1994: 11,26 - 2013: 12,26 - 2014: 13,26 - 2015: 13,24 - 2016: 13,22 - 2017: 16,23 - 2018: 14,21 - 2019: 13,20 - 2020: 14,20 - 2021: 15,23 - 2022: 18,25 - 2023: 15,26 - 2024: 14,26 - 2025: 16,25 - 2026: 17,22 - 2027: 18,25 - 2028: 19,25 - 2029: 17,25 - 2030: 18,22 - 2031: 19,23 - 2032: 22,22 - 2033: 18,23 - 2034: 19,25 - 2035: 17,24 - 2036: 19,23 - 2037: 23,25 - 2038: 21,26 - 2039: 20,25 - 2040: 23,21 - 2041: 21,22 - 2042: 25,22 - 2043: 25,24 - 2044: 25,23 - 2045: 25,25 - 2046: 24,25 - 2047: 28,24 - 2048: 30,23 - 2049: 26,24 - 2050: 27,25 - 2051: 27,24 - 2052: 27,23 - 2053: 29,22 - 2054: 30,22 - 2055: 30,21 - 2056: 29,20 - 2057: 29,20 - 2058: 30,19 - 2059: 32,23 - 2060: 32,23 - 2061: 33,25 - 2062: 33,25 - 2063: 31,26 - 2199: 16,21 - 2200: 24,21 - 2201: 24,21 - 2202: 33,20 - 2203: 33,20 - 2204: 31,20 - 2205: 34,22 - 2206: 30,19 - 2207: 29,19 - 2208: 29,19 - 2222: 36,26 - 2223: 37,24 - 2224: 37,24 - 2256: 48,24 - 2257: 47,24 - 2258: 47,23 - 2259: 48,23 - 2260: 49,22 - 2261: 49,22 - 2262: 49,23 - 2263: 52,24 - 2264: 51,25 - 2265: 50,26 - 2266: 49,25 - 2267: 51,25 - 2268: 52,26 - 2269: 52,26 - 2270: 50,26 - 2271: 53,26 - 2272: 53,26 - 2273: 54,26 - 2332: 40,22 - 2333: 52,22 - 2334: 51,22 - 2335: 52,22 - 2336: 53,23 - 2337: 53,24 - 2338: 54,24 - 2339: 54,23 - 2340: 43,18 - 2341: 39,18 - 2342: 37,17 - 2343: 36,17 - 2344: 34,17 - 2345: 34,18 - 2346: 35,18 - 2347: 33,15 - 2348: 33,16 - 2349: 32,16 - 2350: 32,15 - 2372: 39,17 - 2373: 41,18 - 2374: 41,18 - 2375: 41,17 - 2376: 41,16 - 2377: 42,18 - 2378: 40,15 - 2379: 31,10 - 2380: 31,8 - 2381: 30,8 - 2382: 30,8 - 2383: 30,8 - 2384: 31,7 - 2385: 31,7 - 2386: 31,9 - 2387: 30,10 - 2388: 30,11 - 2429: 14,15 - 2430: 12,16 - 2431: 11,16 - 2432: 10,15 - 2433: 12,15 - 2434: 14,15 - 2435: 15,16 - 2436: 16,16 - 2437: 16,15 - 2438: 16,14 - 2439: 16,13 - 2440: 17,14 - 2441: 16,13 - 2442: 16,11 - 2443: 15,10 - 2444: 15,10 - 2445: 15,12 - 2446: 15,12 - 2447: 15,11 - 2448: 16,10 - 2449: 17,11 - 2450: 17,11 - 2451: 16,12 - 2452: 13,12 - 2453: 13,12 - 2486: -3,33 - 2487: -2,33 - 2488: -2,32 - 2489: -2,32 - 2490: -1,31 - 2491: 0,31 - 2492: 0,31 - 2944: 7,2 - 2945: 6,4 - 2946: 4,3 - 2947: 5,4 - 2948: 11,3 - 2949: 10,2 - 2988: -8,4 - 2989: -7,4 + 1222: -15,2 + 1223: -16,2 + 1224: -14,1 + 1225: -10,2 + 1226: -8,1 + 1227: -7,2 + 1228: -9,1 + 1229: -5,3 + 1230: -4,4 + 1231: -4,3 + 1232: -4,2 + 1233: -16,1 + 1234: -17,2 + 1235: -17,3 + 1236: -20,1 + 1237: -20,2 + 1238: -21,3 + 1239: -23,1 + 1240: -25,2 + 1241: -25,3 + 1242: -26,3 + 1243: -27,1 + 1244: -27,3 + 1295: -2,6 + 1296: -2,4 + 1297: -1,3 + 1298: -2,3 + 1299: -2,2 + 1300: 0,3 + 1394: 6,2 + 1395: 6,2 + 1396: 5,5 + 1397: 3,6 + 1398: 3,2 + 1399: 9,2 + 1400: 8,5 + 1401: 10,5 + 1402: 12,2 + 1403: 13,3 + 1404: 14,2 + 1405: 14,2 + 1406: 14,4 + 1407: 17,2 + 1408: 18,3 + 1409: 18,3 + 1410: 20,2 + 1411: 21,1 + 1412: 24,3 + 1413: 23,3 + 1414: 22,3 + 1415: 22,2 + 1416: 22,2 + 1417: 23,2 + 1553: 52,1 + 1554: 53,2 + 1555: 52,2 + 1556: 52,3 + 1557: 55,0 + 1558: 54,1 + 1559: 47,2 + 1560: 44,3 + 1561: 44,4 + 1562: 45,3 + 1563: 42,2 + 1564: 39,1 + 1565: 38,3 + 1566: 35,3 + 1567: 35,2 + 1568: 34,4 + 1569: 33,4 + 1570: 31,2 + 1571: 29,1 + 1572: 28,3 + 1573: 28,1 + 1574: 35,5 + 1575: 45,6 + 1576: 45,5 + 1577: 48,4 + 1578: 47,4 + 1579: 34,8 + 1580: 34,7 + 1581: 35,7 + 1582: 39,7 + 1606: 41,15 + 1607: 41,14 + 1608: 41,13 + 1609: 38,10 + 1610: 36,10 + 1612: 34,15 + 1613: 31,13 + 1614: 34,12 + 1615: 33,9 + 1620: 27,-1 + 1621: 29,-3 + 1622: 28,-4 + 1623: 28,-6 + 1624: 28,-8 + 1625: 27,-6 + 1626: 27,-5 + 1627: 29,-5 + 1628: 29,-7 + 1629: 29,-8 + 1630: 29,-9 + 1631: 29,-11 + 1632: 27,-12 + 1633: 27,-13 + 1634: 28,-13 + 1635: 29,-13 + 1636: 28,-16 + 1637: 27,-18 + 1638: 28,-19 + 1639: 27,-20 + 1640: 29,-22 + 1641: 29,-23 + 1642: 29,-24 + 1683: 10,4 + 1684: -2,29 + 1685: -1,27 + 1686: -1,25 + 1687: -1,24 + 1688: 0,22 + 1689: 1,22 + 1690: 1,24 + 1691: 0,22 + 1692: -2,21 + 1693: -2,20 + 1694: 1,20 + 1695: 1,21 + 1714: -2,28 + 1715: -1,26 + 1716: -1,25 + 1734: -19,11 + 1735: -17,10 + 1736: -14,12 + 1737: -13,11 + 1738: -14,10 + 1751: -15,10 + 1789: -2,15 + 1790: -2,16 + 1791: -2,17 + 1792: -2,17 + 1793: -2,17 + 1794: 0,18 + 1803: -2,18 + 1804: -2,18 + 1811: -3,18 + 1812: -3,18 + 1833: -4,15 + 1834: -4,14 + 1841: -4,12 + 1842: -6,11 + 1843: -6,11 + 1844: -6,11 + 1867: -5,8 + 1868: -5,8 + 1869: -5,8 + 1870: 2,10 + 1871: 2,9 + 1872: 3,8 + 1918: 3,28 + 1919: 4,26 + 1920: 8,28 + 1921: 6,28 + 1922: 9,26 + 1923: 10,26 + 1924: 10,24 + 1925: 10,23 + 1926: 11,24 + 1927: 11,25 + 1928: 11,28 + 1963: 11,26 + 1982: 12,26 + 1983: 13,26 + 1984: 13,24 + 1985: 13,22 + 1986: 16,23 + 1987: 14,21 + 1988: 13,20 + 1989: 14,20 + 1990: 15,23 + 1991: 18,25 + 1992: 15,26 + 1993: 14,26 + 1994: 16,25 + 1995: 17,22 + 1996: 18,25 + 1997: 19,25 + 1998: 17,25 + 1999: 18,22 + 2000: 19,23 + 2001: 22,22 + 2002: 18,23 + 2003: 19,25 + 2004: 17,24 + 2005: 19,23 + 2006: 23,25 + 2007: 21,26 + 2008: 20,25 + 2009: 23,21 + 2010: 21,22 + 2011: 25,22 + 2012: 25,24 + 2013: 25,23 + 2014: 25,25 + 2015: 24,25 + 2016: 28,24 + 2017: 30,23 + 2018: 26,24 + 2019: 27,25 + 2020: 27,24 + 2021: 27,23 + 2022: 29,22 + 2023: 30,22 + 2024: 30,21 + 2025: 29,20 + 2026: 29,20 + 2027: 30,19 + 2028: 32,23 + 2029: 32,23 + 2030: 33,25 + 2031: 33,25 + 2032: 31,26 + 2168: 16,21 + 2169: 24,21 + 2170: 24,21 + 2171: 33,20 + 2172: 33,20 + 2173: 31,20 + 2174: 34,22 + 2175: 30,19 + 2176: 29,19 + 2177: 29,19 + 2191: 36,26 + 2192: 37,24 + 2193: 37,24 + 2225: 48,24 + 2226: 47,24 + 2227: 47,23 + 2228: 48,23 + 2229: 49,22 + 2230: 49,22 + 2231: 49,23 + 2232: 52,24 + 2233: 51,25 + 2234: 50,26 + 2235: 49,25 + 2236: 51,25 + 2237: 52,26 + 2238: 52,26 + 2239: 50,26 + 2240: 53,26 + 2241: 53,26 + 2242: 54,26 + 2301: 40,22 + 2302: 52,22 + 2303: 51,22 + 2304: 52,22 + 2305: 53,23 + 2306: 53,24 + 2307: 54,24 + 2308: 54,23 + 2309: 43,18 + 2310: 39,18 + 2311: 37,17 + 2312: 36,17 + 2313: 34,17 + 2314: 34,18 + 2315: 35,18 + 2316: 33,15 + 2317: 33,16 + 2318: 32,16 + 2319: 32,15 + 2341: 39,17 + 2342: 41,18 + 2343: 41,18 + 2344: 41,17 + 2345: 41,16 + 2346: 42,18 + 2347: 40,15 + 2348: 31,10 + 2349: 31,8 + 2350: 30,8 + 2351: 30,8 + 2352: 30,8 + 2353: 31,7 + 2354: 31,7 + 2355: 31,9 + 2356: 30,10 + 2357: 30,11 + 2398: 14,15 + 2399: 12,16 + 2400: 11,16 + 2401: 10,15 + 2402: 12,15 + 2403: 14,15 + 2404: 15,16 + 2405: 16,16 + 2406: 16,15 + 2407: 16,14 + 2408: 16,13 + 2409: 17,14 + 2410: 16,13 + 2411: 16,11 + 2412: 15,10 + 2413: 15,10 + 2414: 15,12 + 2415: 15,12 + 2416: 15,11 + 2417: 16,10 + 2418: 17,11 + 2419: 17,11 + 2420: 16,12 + 2421: 13,12 + 2422: 13,12 + 2455: -3,33 + 2456: -2,33 + 2457: -2,32 + 2458: -2,32 + 2459: -1,31 + 2460: 0,31 + 2461: 0,31 + 2903: 7,2 + 2904: 6,4 + 2905: 4,3 + 2906: 5,4 + 2907: 11,3 + 2908: 10,2 + 2947: -8,4 + 2948: -7,4 - node: cleanable: True zIndex: 180 color: '#FFFFFFFF' id: DirtHeavy decals: - 2744: 5,48 - 2745: 5,49 - 2746: 4,49 - 2747: 5,51 - 2748: 5,53 - 2749: 5,54 - 2750: 5,55 - 2751: 6,55 - 2752: 7,57 - 2753: 6,54 - 2754: 6,54 - 2755: 8,55 - 2756: 7,50 - 2757: 8,50 - 2758: 3,50 - 2759: 2,47 - 2760: -2,45 - 2761: 4,47 - 2762: 8,45 - 2763: 7,46 - 2764: 7,43 - 2765: 8,42 - 2766: 4,41 - 2767: 2,39 - 2768: 0,39 - 2769: -1,39 - 2770: -1,38 - 2818: 8,51 - 2832: 10,53 - 2833: 10,53 - 2834: 11,55 - 2835: 11,55 - 2836: -6,44 - 2837: -6,45 - 2838: -5,44 - 2839: -6,43 - 2840: -5,43 - 2841: -5,43 - 2842: 0,40 - 2843: 4,40 - 2844: -34,8 - 2845: -33,7 - 2846: -32,8 - 2847: -33,10 - 2848: -33,10 - 2849: -34,10 - 2850: -32,11 - 2851: -36,12 - 2852: -35,11 - 2853: -39,11 - 2854: -40,12 - 2881: -53,18 - 2882: -53,16 - 2883: -52,15 - 2884: -52,14 - 2885: -51,15 - 2902: -50,3 - 2903: -50,3 - 2904: -50,3 - 2905: -49,5 - 2906: -49,5 - 2907: -56,2 - 2908: -46,4 - 2909: -42,3 - 2910: -42,3 + 2713: 5,48 + 2714: 5,49 + 2715: 4,49 + 2716: 5,51 + 2717: 5,53 + 2718: 5,54 + 2719: 5,55 + 2720: 6,55 + 2721: 7,57 + 2722: 6,54 + 2723: 6,54 + 2724: 8,55 + 2725: 7,50 + 2726: 8,50 + 2727: 3,50 + 2728: 2,47 + 2729: -2,45 + 2730: 4,47 + 2731: 8,45 + 2732: 7,46 + 2733: 7,43 + 2734: 8,42 + 2735: 4,41 + 2736: 2,39 + 2737: 0,39 + 2738: -1,39 + 2739: -1,38 + 2787: 8,51 + 2801: 10,53 + 2802: 10,53 + 2803: 11,55 + 2804: 11,55 + 2805: -6,44 + 2806: -6,45 + 2807: -5,44 + 2808: -6,43 + 2809: -5,43 + 2810: -5,43 + 2811: 0,40 + 2812: 4,40 + 2813: -34,8 + 2814: -33,7 + 2815: -32,8 + 2816: -33,10 + 2817: -33,10 + 2818: -34,10 + 2819: -32,11 + 2820: -36,12 + 2821: -35,11 + 2822: -39,11 + 2823: -40,12 + 2850: -53,18 + 2851: -53,16 + 2852: -52,15 + 2853: -52,14 + 2854: -51,15 + 2871: -50,3 + 2872: -50,3 + 2873: -50,3 + 2874: -49,5 + 2875: -49,5 + 2876: -56,2 + 2877: -46,4 + 2878: -42,3 + 2879: -42,3 - node: color: '#FFFFFFFF' id: DirtHeavyMonotile decals: 953: -46,7 - 2560: -3,11 + 2529: -3,11 - node: cleanable: True color: '#FFFFFFFF' @@ -1836,452 +1836,452 @@ entities: 1204: -30,-23 1205: -28,-23 1206: -29,-22 - 1246: -27,4 - 1247: -25,2 - 1248: -24,1 - 1249: -20,3 - 1250: -18,3 - 1251: -19,2 - 1252: -16,4 + 1245: -27,4 + 1246: -25,2 + 1247: -24,1 + 1248: -20,3 + 1249: -18,3 + 1250: -19,2 + 1251: -16,4 + 1252: -12,4 1253: -12,4 - 1254: -12,4 - 1255: -7,5 - 1310: 0,6 - 1311: 0,2 - 1389: 16,2 - 1390: 19,1 - 1391: 19,1 - 1392: 20,2 - 1393: 19,3 - 1394: 19,3 - 1395: 24,3 - 1396: 24,4 - 1397: 24,2 - 1398: 25,1 - 1399: 12,3 - 1401: 11,2 - 1402: 14,1 - 1403: 14,1 - 1404: 14,1 - 1408: 5,1 - 1409: 4,4 - 1410: 4,4 - 1411: 4,4 - 1412: 3,3 - 1413: 5,2 - 1511: 46,3 - 1512: 46,5 - 1513: 47,6 - 1514: 47,7 - 1515: 46,8 - 1516: 45,8 - 1517: 46,6 - 1518: 45,2 - 1519: 43,2 - 1520: 42,5 - 1521: 41,4 - 1522: 39,3 - 1523: 39,4 - 1524: 38,5 - 1525: 36,3 - 1526: 34,3 - 1527: 32,4 - 1528: 32,3 - 1529: 32,2 - 1530: 34,2 - 1531: 33,3 - 1532: 33,2 - 1533: 29,2 - 1534: 29,4 - 1535: 28,5 - 1536: 28,3 - 1537: 27,2 - 1538: 27,3 - 1539: 28,2 - 1540: 30,1 - 1541: 32,1 - 1542: 33,1 - 1642: 41,14 - 1751: -1,23 - 1752: -1,23 - 1753: -1,21 - 1754: 0,21 - 1755: 0,25 - 1756: 0,27 - 1757: 0,27 - 1758: -2,28 - 1759: -1,28 - 1760: 1,26 - 1761: -2,22 - 1762: -1,22 - 1783: -16,10 - 1784: -18,11 - 1785: -13,10 - 1786: -11,13 - 1787: -12,17 - 1826: -1,18 - 1827: 0,17 - 1836: -1,18 - 1837: -1,17 - 1844: -3,16 - 1845: -3,16 - 1846: -3,16 - 1847: -4,17 - 1848: -4,17 - 1849: -4,18 - 1850: -4,18 - 1856: -6,18 - 1857: -5,17 - 1858: -4,16 - 1866: -6,14 - 1867: -6,13 - 1868: -6,15 - 1869: -5,16 - 1870: -4,11 - 1871: -4,11 - 1883: -4,9 - 1884: -6,10 - 1885: -6,10 - 1886: -3,11 - 1887: -6,13 - 1888: -6,13 - 1889: -6,18 - 1904: 4,9 - 1905: 3,12 - 1906: 3,13 - 1907: 3,13 - 1908: 2,12 - 1909: 2,12 - 1910: 3,11 - 1911: 3,10 - 1912: 3,14 - 1913: 3,17 - 1914: 3,17 - 1960: 3,28 - 1961: 3,27 - 1962: 3,26 - 1963: 3,25 - 1964: 7,26 - 1965: 7,27 - 1966: 6,27 - 1986: 4,25 - 1987: 6,25 - 1988: 8,25 - 1989: 8,25 - 2064: 14,25 - 2065: 13,25 - 2066: 14,23 - 2067: 14,23 - 2068: 13,23 - 2069: 15,24 - 2070: 15,24 - 2071: 16,24 - 2072: 17,23 - 2073: 16,22 - 2074: 15,22 - 2075: 18,24 - 2076: 19,25 - 2077: 19,24 - 2078: 20,24 - 2079: 20,24 - 2080: 20,23 - 2081: 20,23 - 2082: 19,26 - 2083: 19,26 - 2084: 18,26 - 2085: 17,26 - 2086: 16,26 - 2087: 21,24 - 2088: 21,24 - 2089: 21,22 - 2090: 23,22 - 2091: 21,23 - 2092: 21,23 - 2093: 20,22 - 2094: 22,23 - 2095: 23,24 - 2096: 22,25 - 2097: 21,24 - 2098: 22,24 - 2099: 23,24 - 2100: 24,24 - 2101: 26,25 - 2102: 26,25 - 2103: 24,24 - 2104: 24,23 - 2105: 27,22 - 2106: 27,22 - 2107: 26,22 - 2108: 26,23 - 2109: 28,23 - 2110: 28,23 - 2111: 28,24 - 2112: 29,24 - 2113: 29,24 - 2114: 31,24 - 2115: 31,25 - 2116: 29,25 - 2117: 30,24 - 2118: 29,22 - 2119: 31,23 - 2120: 31,23 - 2121: 31,22 - 2122: 32,22 - 2123: 30,23 - 2124: 29,23 - 2125: 29,21 - 2126: 28,22 - 2127: 30,20 - 2128: 31,21 - 2129: 31,21 - 2130: 32,22 - 2131: 33,24 - 2132: 33,24 - 2133: 32,24 - 2134: 32,25 - 2135: 32,26 - 2209: 34,23 - 2210: 34,23 - 2211: 34,25 - 2212: 34,26 - 2225: 41,25 - 2226: 40,26 - 2227: 40,26 - 2228: 39,25 - 2229: 40,24 - 2230: 39,23 - 2231: 40,22 - 2232: 41,23 - 2233: 44,24 - 2234: 44,25 - 2235: 43,25 - 2236: 42,25 - 2237: 43,25 - 2238: 44,26 - 2239: 44,26 - 2240: 46,25 - 2241: 47,26 - 2242: 49,26 - 2243: 48,26 - 2244: 49,25 - 2245: 49,26 - 2246: 50,25 - 2247: 50,24 - 2248: 50,22 - 2249: 50,22 - 2250: 50,23 - 2251: 49,24 - 2252: 48,24 - 2253: 46,23 - 2254: 46,23 - 2255: 46,24 - 2321: 50,26 - 2322: 51,23 - 2323: 51,24 - 2324: 45,22 - 2325: 45,22 - 2326: 45,23 - 2327: 44,23 - 2328: 42,23 - 2329: 43,22 - 2330: 42,22 - 2331: 41,22 - 2351: 33,14 - 2352: 32,14 - 2353: 32,13 - 2354: 32,13 - 2355: 34,11 - 2356: 34,10 - 2357: 33,10 - 2358: 35,10 - 2359: 38,10 - 2360: 37,11 - 2361: 38,11 - 2397: 30,9 - 2398: 30,9 - 2399: 14,11 - 2400: 14,11 - 2401: 14,11 - 2402: 14,10 - 2403: 13,10 - 2404: 13,11 - 2405: 11,11 - 2406: 10,11 - 2407: 9,11 - 2408: 9,11 - 2409: 9,10 - 2410: 9,13 - 2411: 9,13 - 2412: 9,13 - 2413: 9,13 - 2414: 11,14 - 2415: 11,15 - 2416: 12,16 - 2417: 11,16 - 2418: 10,15 - 2419: 11,15 - 2420: 15,16 - 2421: 13,14 - 2422: 15,15 - 2423: 16,16 - 2424: 17,16 - 2425: 17,15 - 2426: 17,13 - 2427: 17,13 - 2428: 17,12 - 2454: 10,12 - 2455: 11,12 - 2456: 11,13 - 2457: 11,13 - 2458: 9,12 - 2459: 8,12 - 2460: 8,12 - 2461: 10,14 - 2493: -3,32 - 2494: -2,32 - 2495: -2,31 - 2496: -2,31 - 2497: 0,33 - 2498: 0,33 - 2593: -3,13 - 2594: -2,10 - 2595: -3,9 - 2596: -1,8 - 2597: -1,9 - 2598: 0,10 - 2602: -1,12 - 2603: -1,13 - 2604: -3,12 - 2605: 0,11 - 2606: 1,13 - 2607: 3,16 - 2608: 3,16 - 2609: 3,18 - 2610: 3,18 - 2611: 3,18 - 2612: 2,18 - 2950: 8,2 - 2951: 7,4 - 2952: 11,4 - 2953: 6,5 - 2990: -14,2 - 2991: -14,4 - 2992: -13,2 + 1254: -7,5 + 1301: 0,6 + 1302: 0,2 + 1373: 16,2 + 1374: 19,1 + 1375: 19,1 + 1376: 20,2 + 1377: 19,3 + 1378: 19,3 + 1379: 24,3 + 1380: 24,4 + 1381: 24,2 + 1382: 25,1 + 1383: 12,3 + 1384: 11,2 + 1385: 14,1 + 1386: 14,1 + 1387: 14,1 + 1388: 5,1 + 1389: 4,4 + 1390: 4,4 + 1391: 4,4 + 1392: 3,3 + 1393: 5,2 + 1480: 46,3 + 1481: 46,5 + 1482: 47,6 + 1483: 47,7 + 1484: 46,8 + 1485: 45,8 + 1486: 46,6 + 1487: 45,2 + 1488: 43,2 + 1489: 42,5 + 1490: 41,4 + 1491: 39,3 + 1492: 39,4 + 1493: 38,5 + 1494: 36,3 + 1495: 34,3 + 1496: 32,4 + 1497: 32,3 + 1498: 32,2 + 1499: 34,2 + 1500: 33,3 + 1501: 33,2 + 1502: 29,2 + 1503: 29,4 + 1504: 28,5 + 1505: 28,3 + 1506: 27,2 + 1507: 27,3 + 1508: 28,2 + 1509: 30,1 + 1510: 32,1 + 1511: 33,1 + 1611: 41,14 + 1720: -1,23 + 1721: -1,23 + 1722: -1,21 + 1723: 0,21 + 1724: 0,25 + 1725: 0,27 + 1726: 0,27 + 1727: -2,28 + 1728: -1,28 + 1729: 1,26 + 1730: -2,22 + 1731: -1,22 + 1752: -16,10 + 1753: -18,11 + 1754: -13,10 + 1755: -11,13 + 1756: -12,17 + 1795: -1,18 + 1796: 0,17 + 1805: -1,18 + 1806: -1,17 + 1813: -3,16 + 1814: -3,16 + 1815: -3,16 + 1816: -4,17 + 1817: -4,17 + 1818: -4,18 + 1819: -4,18 + 1825: -6,18 + 1826: -5,17 + 1827: -4,16 + 1835: -6,14 + 1836: -6,13 + 1837: -6,15 + 1838: -5,16 + 1839: -4,11 + 1840: -4,11 + 1852: -4,9 + 1853: -6,10 + 1854: -6,10 + 1855: -3,11 + 1856: -6,13 + 1857: -6,13 + 1858: -6,18 + 1873: 4,9 + 1874: 3,12 + 1875: 3,13 + 1876: 3,13 + 1877: 2,12 + 1878: 2,12 + 1879: 3,11 + 1880: 3,10 + 1881: 3,14 + 1882: 3,17 + 1883: 3,17 + 1929: 3,28 + 1930: 3,27 + 1931: 3,26 + 1932: 3,25 + 1933: 7,26 + 1934: 7,27 + 1935: 6,27 + 1955: 4,25 + 1956: 6,25 + 1957: 8,25 + 1958: 8,25 + 2033: 14,25 + 2034: 13,25 + 2035: 14,23 + 2036: 14,23 + 2037: 13,23 + 2038: 15,24 + 2039: 15,24 + 2040: 16,24 + 2041: 17,23 + 2042: 16,22 + 2043: 15,22 + 2044: 18,24 + 2045: 19,25 + 2046: 19,24 + 2047: 20,24 + 2048: 20,24 + 2049: 20,23 + 2050: 20,23 + 2051: 19,26 + 2052: 19,26 + 2053: 18,26 + 2054: 17,26 + 2055: 16,26 + 2056: 21,24 + 2057: 21,24 + 2058: 21,22 + 2059: 23,22 + 2060: 21,23 + 2061: 21,23 + 2062: 20,22 + 2063: 22,23 + 2064: 23,24 + 2065: 22,25 + 2066: 21,24 + 2067: 22,24 + 2068: 23,24 + 2069: 24,24 + 2070: 26,25 + 2071: 26,25 + 2072: 24,24 + 2073: 24,23 + 2074: 27,22 + 2075: 27,22 + 2076: 26,22 + 2077: 26,23 + 2078: 28,23 + 2079: 28,23 + 2080: 28,24 + 2081: 29,24 + 2082: 29,24 + 2083: 31,24 + 2084: 31,25 + 2085: 29,25 + 2086: 30,24 + 2087: 29,22 + 2088: 31,23 + 2089: 31,23 + 2090: 31,22 + 2091: 32,22 + 2092: 30,23 + 2093: 29,23 + 2094: 29,21 + 2095: 28,22 + 2096: 30,20 + 2097: 31,21 + 2098: 31,21 + 2099: 32,22 + 2100: 33,24 + 2101: 33,24 + 2102: 32,24 + 2103: 32,25 + 2104: 32,26 + 2178: 34,23 + 2179: 34,23 + 2180: 34,25 + 2181: 34,26 + 2194: 41,25 + 2195: 40,26 + 2196: 40,26 + 2197: 39,25 + 2198: 40,24 + 2199: 39,23 + 2200: 40,22 + 2201: 41,23 + 2202: 44,24 + 2203: 44,25 + 2204: 43,25 + 2205: 42,25 + 2206: 43,25 + 2207: 44,26 + 2208: 44,26 + 2209: 46,25 + 2210: 47,26 + 2211: 49,26 + 2212: 48,26 + 2213: 49,25 + 2214: 49,26 + 2215: 50,25 + 2216: 50,24 + 2217: 50,22 + 2218: 50,22 + 2219: 50,23 + 2220: 49,24 + 2221: 48,24 + 2222: 46,23 + 2223: 46,23 + 2224: 46,24 + 2290: 50,26 + 2291: 51,23 + 2292: 51,24 + 2293: 45,22 + 2294: 45,22 + 2295: 45,23 + 2296: 44,23 + 2297: 42,23 + 2298: 43,22 + 2299: 42,22 + 2300: 41,22 + 2320: 33,14 + 2321: 32,14 + 2322: 32,13 + 2323: 32,13 + 2324: 34,11 + 2325: 34,10 + 2326: 33,10 + 2327: 35,10 + 2328: 38,10 + 2329: 37,11 + 2330: 38,11 + 2366: 30,9 + 2367: 30,9 + 2368: 14,11 + 2369: 14,11 + 2370: 14,11 + 2371: 14,10 + 2372: 13,10 + 2373: 13,11 + 2374: 11,11 + 2375: 10,11 + 2376: 9,11 + 2377: 9,11 + 2378: 9,10 + 2379: 9,13 + 2380: 9,13 + 2381: 9,13 + 2382: 9,13 + 2383: 11,14 + 2384: 11,15 + 2385: 12,16 + 2386: 11,16 + 2387: 10,15 + 2388: 11,15 + 2389: 15,16 + 2390: 13,14 + 2391: 15,15 + 2392: 16,16 + 2393: 17,16 + 2394: 17,15 + 2395: 17,13 + 2396: 17,13 + 2397: 17,12 + 2423: 10,12 + 2424: 11,12 + 2425: 11,13 + 2426: 11,13 + 2427: 9,12 + 2428: 8,12 + 2429: 8,12 + 2430: 10,14 + 2462: -3,32 + 2463: -2,32 + 2464: -2,31 + 2465: -2,31 + 2466: 0,33 + 2467: 0,33 + 2562: -3,13 + 2563: -2,10 + 2564: -3,9 + 2565: -1,8 + 2566: -1,9 + 2567: 0,10 + 2571: -1,12 + 2572: -1,13 + 2573: -3,12 + 2574: 0,11 + 2575: 1,13 + 2576: 3,16 + 2577: 3,16 + 2578: 3,18 + 2579: 3,18 + 2580: 3,18 + 2581: 2,18 + 2909: 8,2 + 2910: 7,4 + 2911: 11,4 + 2912: 6,5 + 2949: -14,2 + 2950: -14,4 + 2951: -13,2 - node: cleanable: True zIndex: 180 color: '#FFFFFFFF' id: DirtHeavyMonotile decals: - 2666: 6,57 - 2667: 5,57 - 2668: 5,56 - 2669: 5,54 - 2670: 7,54 - 2671: 7,54 - 2672: 6,54 - 2673: 6,53 - 2674: 5,53 - 2675: 7,53 - 2676: 8,51 - 2677: 8,49 - 2678: 7,48 - 2679: 7,50 - 2680: 7,50 - 2681: 5,50 - 2682: 4,48 - 2683: 5,47 - 2684: 4,50 - 2685: 2,50 - 2686: 2,50 - 2687: 1,51 - 2688: 1,51 - 2689: 0,50 - 2690: 1,49 - 2691: 0,48 - 2692: 1,48 - 2693: 0,47 - 2694: 0,47 - 2695: 0,47 - 2696: -1,47 - 2697: -1,46 - 2698: -2,47 - 2699: -2,47 - 2700: -2,46 - 2701: -2,45 - 2702: -3,45 - 2703: -3,44 - 2704: -3,44 - 2705: -1,44 - 2706: -1,44 - 2707: -3,43 - 2708: -2,43 - 2709: -1,43 - 2710: -1,42 - 2711: -2,42 - 2712: 0,41 - 2713: -1,41 - 2714: -2,40 - 2715: -2,40 - 2716: -3,40 - 2717: -3,39 - 2718: -2,38 - 2719: -3,38 - 2720: -2,38 - 2721: -3,37 - 2722: -3,36 - 2723: -2,36 - 2724: 0,36 - 2725: 0,38 - 2726: 1,38 - 2727: 3,38 - 2728: 1,40 - 2729: 3,41 - 2730: 5,41 - 2731: 2,41 - 2732: 3,36 - 2733: 4,36 - 2734: 4,37 - 2735: 6,41 - 2736: 7,41 - 2737: 7,42 - 2738: 8,43 - 2739: 8,43 - 2740: 7,45 - 2741: 7,47 - 2742: 8,47 - 2743: 5,48 - 2819: 6,52 - 2820: 5,52 - 2821: 6,51 - 2822: 6,51 - 2823: 1,41 - 2824: 1,41 - 2825: 11,53 - 2826: 11,53 - 2827: 11,53 - 2828: 10,55 - 2829: 10,55 - 2830: 10,54 - 2831: 11,54 - 2855: -40,11 - 2856: -41,12 - 2857: -38,12 - 2858: -37,11 - 2859: -36,11 - 2860: -36,11 - 2861: -35,12 - 2862: -32,12 - 2863: -29,12 - 2864: -28,12 - 2865: -27,12 - 2886: -53,15 - 2887: -51,14 - 2888: -51,14 - 2889: -53,12 - 2890: -53,12 - 2891: -53,13 - 2892: -52,12 + 2635: 6,57 + 2636: 5,57 + 2637: 5,56 + 2638: 5,54 + 2639: 7,54 + 2640: 7,54 + 2641: 6,54 + 2642: 6,53 + 2643: 5,53 + 2644: 7,53 + 2645: 8,51 + 2646: 8,49 + 2647: 7,48 + 2648: 7,50 + 2649: 7,50 + 2650: 5,50 + 2651: 4,48 + 2652: 5,47 + 2653: 4,50 + 2654: 2,50 + 2655: 2,50 + 2656: 1,51 + 2657: 1,51 + 2658: 0,50 + 2659: 1,49 + 2660: 0,48 + 2661: 1,48 + 2662: 0,47 + 2663: 0,47 + 2664: 0,47 + 2665: -1,47 + 2666: -1,46 + 2667: -2,47 + 2668: -2,47 + 2669: -2,46 + 2670: -2,45 + 2671: -3,45 + 2672: -3,44 + 2673: -3,44 + 2674: -1,44 + 2675: -1,44 + 2676: -3,43 + 2677: -2,43 + 2678: -1,43 + 2679: -1,42 + 2680: -2,42 + 2681: 0,41 + 2682: -1,41 + 2683: -2,40 + 2684: -2,40 + 2685: -3,40 + 2686: -3,39 + 2687: -2,38 + 2688: -3,38 + 2689: -2,38 + 2690: -3,37 + 2691: -3,36 + 2692: -2,36 + 2693: 0,36 + 2694: 0,38 + 2695: 1,38 + 2696: 3,38 + 2697: 1,40 + 2698: 3,41 + 2699: 5,41 + 2700: 2,41 + 2701: 3,36 + 2702: 4,36 + 2703: 4,37 + 2704: 6,41 + 2705: 7,41 + 2706: 7,42 + 2707: 8,43 + 2708: 8,43 + 2709: 7,45 + 2710: 7,47 + 2711: 8,47 + 2712: 5,48 + 2788: 6,52 + 2789: 5,52 + 2790: 6,51 + 2791: 6,51 + 2792: 1,41 + 2793: 1,41 + 2794: 11,53 + 2795: 11,53 + 2796: 11,53 + 2797: 10,55 + 2798: 10,55 + 2799: 10,54 + 2800: 11,54 + 2824: -40,11 + 2825: -41,12 + 2826: -38,12 + 2827: -37,11 + 2828: -36,11 + 2829: -36,11 + 2830: -35,12 + 2831: -32,12 + 2832: -29,12 + 2833: -28,12 + 2834: -27,12 + 2855: -53,15 + 2856: -51,14 + 2857: -51,14 + 2858: -53,12 + 2859: -53,12 + 2860: -53,13 + 2861: -52,12 - node: color: '#FFFFFFFF' id: DirtLight @@ -2374,470 +2374,470 @@ entities: 1189: -30,-3 1190: -30,-2 1191: -30,-3 - 1265: -11,5 - 1266: -10,5 - 1267: -10,4 - 1268: -9,4 - 1269: -6,2 - 1270: -6,4 + 1264: -11,5 + 1265: -10,5 + 1266: -10,4 + 1267: -9,4 + 1268: -6,2 + 1269: -6,4 + 1270: -6,3 1271: -6,3 - 1272: -6,3 - 1273: -5,4 + 1272: -5,4 + 1273: -6,5 1274: -6,5 - 1275: -6,5 + 1275: -6,6 1276: -6,6 - 1277: -6,6 - 1278: -6,2 - 1279: -5,2 + 1277: -6,2 + 1278: -5,2 + 1279: -5,1 1280: -5,1 - 1281: -5,1 + 1281: -5,2 1282: -5,2 - 1283: -5,2 - 1284: -13,1 - 1285: -16,2 + 1283: -13,1 + 1284: -16,2 + 1285: -16,3 1286: -16,3 - 1287: -16,3 - 1288: -18,3 - 1289: -20,3 - 1290: -20,4 - 1291: -21,2 - 1292: -24,2 - 1293: -25,3 - 1294: -24,3 - 1295: -26,4 - 1313: -1,5 - 1314: 13,1 - 1315: 12,3 - 1318: 7,5 - 1321: 4,5 - 1322: 4,6 - 1323: 2,6 - 1324: 3,4 - 1325: 2,3 - 1326: 3,1 - 1327: 4,1 - 1328: 5,1 - 1329: 6,1 - 1330: 7,1 - 1331: 9,1 - 1332: 8,4 - 1333: 8,6 - 1334: 9,6 - 1335: 9,6 - 1336: 12,3 - 1337: 13,4 - 1338: 15,4 - 1339: 13,5 - 1340: 14,5 - 1341: 15,3 - 1342: 17,2 - 1343: 17,4 - 1344: 18,4 - 1345: 20,1 - 1346: 19,1 - 1347: 20,1 - 1348: 21,2 - 1349: 20,4 - 1350: 23,3 - 1351: 22,2 - 1352: 23,2 - 1353: 24,3 - 1354: 25,4 - 1355: 25,4 - 1356: 24,1 - 1543: 28,2 - 1544: 29,1 - 1545: 29,1 - 1546: 32,2 - 1547: 34,2 - 1548: 36,2 - 1549: 35,2 - 1550: 34,2 - 1551: 35,3 - 1552: 33,4 - 1553: 33,3 - 1554: 31,3 - 1555: 36,4 - 1556: 40,4 - 1557: 38,5 - 1558: 43,3 - 1559: 44,3 - 1560: 44,3 - 1561: 44,3 - 1562: 44,3 - 1563: 41,2 - 1564: 43,1 - 1565: 45,1 - 1566: 45,2 - 1567: 40,1 - 1568: 38,2 - 1569: 41,1 - 1570: 42,1 - 1571: 47,3 - 1572: 47,5 - 1573: 48,6 - 1574: 47,5 - 1575: 48,3 - 1576: 51,2 - 1577: 51,1 - 1578: 50,2 - 1579: 51,3 - 1580: 48,2 - 1581: 46,1 - 1582: 53,1 - 1583: 53,2 - 1614: 38,8 - 1615: 40,8 - 1616: 40,7 - 1617: 36,9 - 1618: 36,11 - 1619: 34,10 - 1620: 34,10 - 1621: 33,11 - 1622: 33,13 - 1623: 32,14 - 1624: 32,14 - 1625: 33,15 - 1626: 34,18 - 1627: 36,18 - 1628: 36,18 - 1629: 37,19 - 1630: 37,19 - 1631: 41,17 - 1632: 41,17 - 1633: 40,17 - 1634: 40,17 - 1635: 40,18 - 1636: 45,18 - 1674: 27,-24 - 1675: 28,-24 - 1676: 28,-22 - 1677: 27,-21 - 1678: 27,-19 - 1679: 29,-19 - 1680: 28,-19 - 1681: 27,-16 - 1682: 29,-14 - 1683: 28,-14 - 1684: 28,-15 - 1685: 29,-14 - 1686: 28,-10 - 1687: 29,-8 - 1688: 29,-7 - 1689: 28,-6 - 1690: 29,-6 - 1691: 28,-2 - 1692: 27,-2 - 1693: 29,-1 - 1694: 29,-2 - 1713: 9,5 - 1727: 0,20 - 1728: -1,20 - 1729: -2,21 - 1730: -2,23 - 1731: -2,24 - 1732: -2,25 - 1733: 0,25 - 1734: 0,26 - 1735: 1,25 - 1736: 1,25 - 1737: 1,27 - 1738: 1,28 - 1739: 0,28 - 1740: -1,29 - 1741: 0,29 - 1742: 0,29 - 1743: -2,26 - 1744: -2,26 - 1770: -12,12 - 1771: -11,11 - 1772: -10,15 - 1773: -11,16 - 1774: -11,17 - 1814: -2,18 - 1815: -1,17 - 1816: -1,17 - 1817: -1,15 - 1818: -1,15 - 1819: 0,15 - 1828: -1,17 - 1829: 0,16 - 1830: 0,16 - 1831: 0,16 - 1832: -1,16 - 1833: -1,18 - 1838: -1,16 - 1839: -1,16 - 1840: -3,17 - 1841: -3,17 - 1876: -6,9 - 1877: -4,8 - 1878: -4,8 - 1879: -4,8 - 1880: -4,8 - 1890: -6,17 - 1891: -6,18 - 1892: -4,16 - 1893: -6,8 - 1894: -6,8 - 1895: -6,8 - 1896: -6,8 - 1897: -6,9 - 1915: 2,17 - 1916: 2,18 - 1917: 4,18 - 1918: 4,18 - 1919: 4,17 - 1920: 4,17 - 1921: 4,16 - 1922: 4,14 - 1923: 4,13 - 1924: 4,13 - 1925: 4,14 - 1926: 4,14 - 1927: 2,16 - 1928: 2,16 - 1929: 2,16 - 1930: 2,16 - 1931: 2,11 - 1932: 2,10 - 1933: 2,9 - 1934: 3,8 - 1935: 2,8 - 1967: 4,27 - 1968: 4,27 - 1969: 5,28 - 1970: 5,28 - 1971: 5,27 - 1972: 10,27 - 1973: 10,27 - 1974: 9,27 - 1975: 11,27 - 1976: 11,26 - 1992: 9,25 - 1993: 6,26 - 2136: 33,26 - 2137: 34,26 - 2138: 34,25 - 2139: 34,24 - 2140: 33,23 - 2141: 33,23 - 2142: 31,24 - 2143: 32,24 - 2144: 33,24 - 2145: 33,24 - 2146: 32,22 - 2147: 32,21 - 2148: 34,21 - 2149: 34,22 - 2150: 33,22 - 2151: 30,21 - 2152: 30,22 - 2153: 29,21 - 2154: 28,21 - 2155: 28,23 - 2156: 27,22 - 2157: 26,22 - 2158: 28,21 - 2159: 28,22 - 2160: 25,23 - 2161: 26,23 - 2162: 26,23 - 2163: 25,21 - 2164: 26,21 - 2165: 24,23 - 2166: 23,24 - 2167: 24,23 - 2168: 23,23 - 2169: 23,23 - 2170: 24,22 - 2171: 24,24 - 2172: 23,25 - 2173: 22,24 - 2174: 22,25 - 2175: 22,26 - 2176: 25,26 - 2177: 25,26 - 2178: 20,26 - 2179: 19,26 - 2180: 20,26 - 2181: 17,26 - 2182: 18,26 - 2183: 15,26 - 2184: 15,26 - 2185: 15,25 - 2186: 15,25 - 2187: 17,24 - 2188: 16,24 - 2189: 13,24 - 2190: 14,23 - 2191: 14,22 - 2192: 15,22 - 2193: 17,23 - 2194: 19,22 - 2195: 20,22 - 2196: 20,21 - 2197: 20,21 - 2198: 18,21 - 2213: 37,26 - 2214: 37,26 - 2215: 36,25 - 2216: 36,25 - 2217: 34,26 - 2218: 33,26 - 2219: 32,26 - 2220: 31,25 - 2221: 29,25 - 2291: 39,25 - 2292: 39,24 - 2293: 39,24 - 2294: 39,23 - 2295: 41,23 - 2296: 44,24 - 2297: 44,24 - 2298: 43,24 - 2299: 43,24 - 2300: 42,23 - 2301: 43,23 - 2302: 44,23 - 2303: 45,24 - 2304: 45,25 - 2305: 45,25 - 2306: 47,26 - 2307: 47,26 - 2308: 50,25 - 2309: 50,25 - 2310: 49,24 - 2311: 51,25 - 2312: 52,25 - 2313: 51,25 - 2314: 51,25 - 2315: 53,26 - 2316: 54,26 - 2317: 53,25 - 2318: 53,25 - 2319: 54,25 - 2320: 51,26 - 2362: 38,10 - 2363: 40,10 - 2364: 40,10 - 2365: 39,10 - 2366: 40,11 - 2367: 41,11 - 2368: 41,12 - 2369: 42,12 - 2370: 43,12 - 2371: 40,14 - 2389: 31,11 - 2390: 31,11 - 2391: 31,10 - 2392: 29,8 - 2393: 30,9 - 2394: 30,8 - 2395: 31,7 - 2396: 32,7 - 2462: 10,14 - 2463: 10,14 - 2464: 10,13 - 2465: 10,13 - 2466: 14,16 - 2467: 13,16 - 2468: 13,16 - 2469: 17,15 - 2470: 17,14 - 2471: 17,15 - 2472: 17,16 - 2473: 17,13 - 2474: 15,11 - 2475: 15,10 - 2476: 14,10 - 2477: 14,12 - 2478: 14,12 - 2479: 7,15 - 2480: 8,16 - 2481: 8,16 - 2482: 7,16 - 2483: 13,21 - 2484: 13,21 - 2485: 13,21 - 2499: -3,32 - 2500: -1,33 - 2501: -1,33 - 2502: -1,32 - 2503: 0,32 - 2504: 0,32 - 2505: 0,32 - 2506: 0,32 - 2591: -1,11 - 2592: -1,13 - 2599: -2,11 - 2600: 1,11 - 2601: -5,12 - 2954: 5,4 - 2955: 5,3 - 2956: 6,2 - 2957: 4,2 - 2958: 10,2 - 2993: -13,2 - 2994: -13,4 - 2995: -11,2 - 2996: -12,2 + 1287: -18,3 + 1288: -20,3 + 1289: -20,4 + 1290: -21,2 + 1291: -24,2 + 1292: -25,3 + 1293: -24,3 + 1294: -26,4 + 1304: -1,5 + 1305: 13,1 + 1306: 12,3 + 1307: 7,5 + 1308: 4,5 + 1309: 4,6 + 1310: 2,6 + 1311: 3,4 + 1312: 2,3 + 1313: 3,1 + 1314: 4,1 + 1315: 5,1 + 1316: 6,1 + 1317: 7,1 + 1318: 9,1 + 1319: 8,4 + 1320: 8,6 + 1321: 9,6 + 1322: 9,6 + 1323: 12,3 + 1324: 13,4 + 1325: 15,4 + 1326: 13,5 + 1327: 14,5 + 1328: 15,3 + 1329: 17,2 + 1330: 17,4 + 1331: 18,4 + 1332: 20,1 + 1333: 19,1 + 1334: 20,1 + 1335: 21,2 + 1336: 20,4 + 1337: 23,3 + 1338: 22,2 + 1339: 23,2 + 1340: 24,3 + 1341: 25,4 + 1342: 25,4 + 1343: 24,1 + 1512: 28,2 + 1513: 29,1 + 1514: 29,1 + 1515: 32,2 + 1516: 34,2 + 1517: 36,2 + 1518: 35,2 + 1519: 34,2 + 1520: 35,3 + 1521: 33,4 + 1522: 33,3 + 1523: 31,3 + 1524: 36,4 + 1525: 40,4 + 1526: 38,5 + 1527: 43,3 + 1528: 44,3 + 1529: 44,3 + 1530: 44,3 + 1531: 44,3 + 1532: 41,2 + 1533: 43,1 + 1534: 45,1 + 1535: 45,2 + 1536: 40,1 + 1537: 38,2 + 1538: 41,1 + 1539: 42,1 + 1540: 47,3 + 1541: 47,5 + 1542: 48,6 + 1543: 47,5 + 1544: 48,3 + 1545: 51,2 + 1546: 51,1 + 1547: 50,2 + 1548: 51,3 + 1549: 48,2 + 1550: 46,1 + 1551: 53,1 + 1552: 53,2 + 1583: 38,8 + 1584: 40,8 + 1585: 40,7 + 1586: 36,9 + 1587: 36,11 + 1588: 34,10 + 1589: 34,10 + 1590: 33,11 + 1591: 33,13 + 1592: 32,14 + 1593: 32,14 + 1594: 33,15 + 1595: 34,18 + 1596: 36,18 + 1597: 36,18 + 1598: 37,19 + 1599: 37,19 + 1600: 41,17 + 1601: 41,17 + 1602: 40,17 + 1603: 40,17 + 1604: 40,18 + 1605: 45,18 + 1643: 27,-24 + 1644: 28,-24 + 1645: 28,-22 + 1646: 27,-21 + 1647: 27,-19 + 1648: 29,-19 + 1649: 28,-19 + 1650: 27,-16 + 1651: 29,-14 + 1652: 28,-14 + 1653: 28,-15 + 1654: 29,-14 + 1655: 28,-10 + 1656: 29,-8 + 1657: 29,-7 + 1658: 28,-6 + 1659: 29,-6 + 1660: 28,-2 + 1661: 27,-2 + 1662: 29,-1 + 1663: 29,-2 + 1682: 9,5 + 1696: 0,20 + 1697: -1,20 + 1698: -2,21 + 1699: -2,23 + 1700: -2,24 + 1701: -2,25 + 1702: 0,25 + 1703: 0,26 + 1704: 1,25 + 1705: 1,25 + 1706: 1,27 + 1707: 1,28 + 1708: 0,28 + 1709: -1,29 + 1710: 0,29 + 1711: 0,29 + 1712: -2,26 + 1713: -2,26 + 1739: -12,12 + 1740: -11,11 + 1741: -10,15 + 1742: -11,16 + 1743: -11,17 + 1783: -2,18 + 1784: -1,17 + 1785: -1,17 + 1786: -1,15 + 1787: -1,15 + 1788: 0,15 + 1797: -1,17 + 1798: 0,16 + 1799: 0,16 + 1800: 0,16 + 1801: -1,16 + 1802: -1,18 + 1807: -1,16 + 1808: -1,16 + 1809: -3,17 + 1810: -3,17 + 1845: -6,9 + 1846: -4,8 + 1847: -4,8 + 1848: -4,8 + 1849: -4,8 + 1859: -6,17 + 1860: -6,18 + 1861: -4,16 + 1862: -6,8 + 1863: -6,8 + 1864: -6,8 + 1865: -6,8 + 1866: -6,9 + 1884: 2,17 + 1885: 2,18 + 1886: 4,18 + 1887: 4,18 + 1888: 4,17 + 1889: 4,17 + 1890: 4,16 + 1891: 4,14 + 1892: 4,13 + 1893: 4,13 + 1894: 4,14 + 1895: 4,14 + 1896: 2,16 + 1897: 2,16 + 1898: 2,16 + 1899: 2,16 + 1900: 2,11 + 1901: 2,10 + 1902: 2,9 + 1903: 3,8 + 1904: 2,8 + 1936: 4,27 + 1937: 4,27 + 1938: 5,28 + 1939: 5,28 + 1940: 5,27 + 1941: 10,27 + 1942: 10,27 + 1943: 9,27 + 1944: 11,27 + 1945: 11,26 + 1961: 9,25 + 1962: 6,26 + 2105: 33,26 + 2106: 34,26 + 2107: 34,25 + 2108: 34,24 + 2109: 33,23 + 2110: 33,23 + 2111: 31,24 + 2112: 32,24 + 2113: 33,24 + 2114: 33,24 + 2115: 32,22 + 2116: 32,21 + 2117: 34,21 + 2118: 34,22 + 2119: 33,22 + 2120: 30,21 + 2121: 30,22 + 2122: 29,21 + 2123: 28,21 + 2124: 28,23 + 2125: 27,22 + 2126: 26,22 + 2127: 28,21 + 2128: 28,22 + 2129: 25,23 + 2130: 26,23 + 2131: 26,23 + 2132: 25,21 + 2133: 26,21 + 2134: 24,23 + 2135: 23,24 + 2136: 24,23 + 2137: 23,23 + 2138: 23,23 + 2139: 24,22 + 2140: 24,24 + 2141: 23,25 + 2142: 22,24 + 2143: 22,25 + 2144: 22,26 + 2145: 25,26 + 2146: 25,26 + 2147: 20,26 + 2148: 19,26 + 2149: 20,26 + 2150: 17,26 + 2151: 18,26 + 2152: 15,26 + 2153: 15,26 + 2154: 15,25 + 2155: 15,25 + 2156: 17,24 + 2157: 16,24 + 2158: 13,24 + 2159: 14,23 + 2160: 14,22 + 2161: 15,22 + 2162: 17,23 + 2163: 19,22 + 2164: 20,22 + 2165: 20,21 + 2166: 20,21 + 2167: 18,21 + 2182: 37,26 + 2183: 37,26 + 2184: 36,25 + 2185: 36,25 + 2186: 34,26 + 2187: 33,26 + 2188: 32,26 + 2189: 31,25 + 2190: 29,25 + 2260: 39,25 + 2261: 39,24 + 2262: 39,24 + 2263: 39,23 + 2264: 41,23 + 2265: 44,24 + 2266: 44,24 + 2267: 43,24 + 2268: 43,24 + 2269: 42,23 + 2270: 43,23 + 2271: 44,23 + 2272: 45,24 + 2273: 45,25 + 2274: 45,25 + 2275: 47,26 + 2276: 47,26 + 2277: 50,25 + 2278: 50,25 + 2279: 49,24 + 2280: 51,25 + 2281: 52,25 + 2282: 51,25 + 2283: 51,25 + 2284: 53,26 + 2285: 54,26 + 2286: 53,25 + 2287: 53,25 + 2288: 54,25 + 2289: 51,26 + 2331: 38,10 + 2332: 40,10 + 2333: 40,10 + 2334: 39,10 + 2335: 40,11 + 2336: 41,11 + 2337: 41,12 + 2338: 42,12 + 2339: 43,12 + 2340: 40,14 + 2358: 31,11 + 2359: 31,11 + 2360: 31,10 + 2361: 29,8 + 2362: 30,9 + 2363: 30,8 + 2364: 31,7 + 2365: 32,7 + 2431: 10,14 + 2432: 10,14 + 2433: 10,13 + 2434: 10,13 + 2435: 14,16 + 2436: 13,16 + 2437: 13,16 + 2438: 17,15 + 2439: 17,14 + 2440: 17,15 + 2441: 17,16 + 2442: 17,13 + 2443: 15,11 + 2444: 15,10 + 2445: 14,10 + 2446: 14,12 + 2447: 14,12 + 2448: 7,15 + 2449: 8,16 + 2450: 8,16 + 2451: 7,16 + 2452: 13,21 + 2453: 13,21 + 2454: 13,21 + 2468: -3,32 + 2469: -1,33 + 2470: -1,33 + 2471: -1,32 + 2472: 0,32 + 2473: 0,32 + 2474: 0,32 + 2475: 0,32 + 2560: -1,11 + 2561: -1,13 + 2568: -2,11 + 2569: 1,11 + 2570: -5,12 + 2913: 5,4 + 2914: 5,3 + 2915: 6,2 + 2916: 4,2 + 2917: 10,2 + 2952: -13,2 + 2953: -13,4 + 2954: -11,2 + 2955: -12,2 - node: cleanable: True zIndex: 180 color: '#FFFFFFFF' id: DirtLight decals: - 2771: -2,39 - 2772: -2,39 - 2773: 1,37 - 2774: 1,37 - 2775: -1,37 - 2776: -1,37 - 2777: -2,37 - 2778: -2,37 - 2779: -1,41 - 2780: -1,40 - 2781: 0,40 - 2782: -2,44 - 2783: 0,48 - 2784: 0,49 - 2785: 0,49 - 2786: 0,51 - 2787: 3,51 - 2788: 6,53 - 2789: 7,53 - 2790: 8,53 - 2791: 8,54 - 2792: 8,54 - 2793: 7,55 - 2815: 1,50 - 2816: 1,50 - 2817: 7,51 - 2866: -38,11 - 2867: -38,11 - 2868: -39,12 - 2869: -39,12 - 2870: -41,10 - 2871: -38,12 - 2872: -32,12 - 2873: -34,12 - 2874: -33,11 - 2875: -34,8 - 2876: -33,8 - 2877: -29,11 - 2878: -31,12 - 2879: -30,12 - 2880: -30,12 - 2893: -52,11 - 2894: -53,10 - 2895: -49,14 - 2896: -48,14 - 2897: -48,14 - 2898: -50,5 - 2899: -51,5 - 2900: -51,6 - 2901: -51,5 + 2740: -2,39 + 2741: -2,39 + 2742: 1,37 + 2743: 1,37 + 2744: -1,37 + 2745: -1,37 + 2746: -2,37 + 2747: -2,37 + 2748: -1,41 + 2749: -1,40 + 2750: 0,40 + 2751: -2,44 + 2752: 0,48 + 2753: 0,49 + 2754: 0,49 + 2755: 0,51 + 2756: 3,51 + 2757: 6,53 + 2758: 7,53 + 2759: 8,53 + 2760: 8,54 + 2761: 8,54 + 2762: 7,55 + 2784: 1,50 + 2785: 1,50 + 2786: 7,51 + 2835: -38,11 + 2836: -38,11 + 2837: -39,12 + 2838: -39,12 + 2839: -41,10 + 2840: -38,12 + 2841: -32,12 + 2842: -34,12 + 2843: -33,11 + 2844: -34,8 + 2845: -33,8 + 2846: -29,11 + 2847: -31,12 + 2848: -30,12 + 2849: -30,12 + 2862: -52,11 + 2863: -53,10 + 2864: -49,14 + 2865: -48,14 + 2866: -48,14 + 2867: -50,5 + 2868: -51,5 + 2869: -51,6 + 2870: -51,5 - node: color: '#FFFFFFFF' id: DirtMedium @@ -2906,215 +2906,215 @@ entities: 1167: -29,-24 1168: -31,-23 1169: -31,-24 - 1256: -22,3 - 1257: -23,2 - 1258: -22,1 - 1259: -23,3 - 1260: -26,1 - 1261: -15,2 + 1255: -22,3 + 1256: -23,2 + 1257: -22,1 + 1258: -23,3 + 1259: -26,1 + 1260: -15,2 + 1261: -14,3 1262: -14,3 - 1263: -14,3 - 1264: -15,4 - 1312: -1,4 - 1357: 16,1 - 1358: 16,1 - 1359: 14,3 - 1360: 13,3 - 1361: 11,2 - 1363: 9,4 - 1364: 7,5 - 1367: 5,2 - 1368: 4,5 - 1369: 4,5 - 1370: 2,5 - 1371: 3,3 - 1372: 2,6 - 1373: 4,6 - 1374: 4,5 - 1375: 3,2 - 1376: 3,1 - 1377: 4,1 - 1378: 7,1 - 1379: 8,1 - 1380: 11,4 - 1381: 10,5 - 1382: 12,5 - 1383: 15,2 - 1384: 16,3 - 1385: 17,4 - 1386: 17,4 - 1387: 17,1 - 1388: 19,1 - 1462: 27,1 - 1463: 30,3 - 1464: 31,3 - 1465: 31,1 - 1466: 28,4 - 1467: 30,4 - 1468: 34,3 - 1469: 33,1 - 1470: 34,4 - 1471: 34,5 - 1472: 37,4 - 1473: 35,1 - 1474: 37,1 - 1475: 39,3 - 1476: 38,2 - 1477: 37,2 - 1478: 37,2 - 1479: 41,2 - 1480: 42,4 - 1481: 44,5 - 1482: 44,2 - 1483: 43,1 - 1484: 45,4 - 1485: 45,6 - 1486: 43,6 - 1487: 42,5 - 1488: 44,2 - 1489: 48,7 - 1490: 46,9 - 1491: 47,9 - 1492: 47,8 - 1493: 48,8 - 1494: 48,7 - 1495: 46,5 - 1496: 48,3 - 1497: 49,3 - 1498: 49,4 - 1499: 49,4 - 1500: 49,1 - 1501: 47,1 - 1502: 45,1 - 1503: 46,2 - 1504: 52,1 - 1505: 51,3 - 1506: 53,3 - 1507: 53,3 - 1508: 53,1 - 1509: 54,2 - 1510: 54,3 - 1647: 37,9 - 1648: 34,16 - 1649: 37,17 - 1650: 38,18 - 1695: 27,-1 - 1696: 27,-3 - 1697: 29,-4 - 1698: 28,-3 - 1699: 29,-4 - 1700: 29,-7 - 1701: 29,-9 - 1702: 28,-10 - 1703: 28,-9 - 1704: 29,-10 - 1705: 29,-10 - 1706: 28,-12 - 1707: 28,-14 - 1708: 27,-14 - 1709: 27,-14 - 1710: 29,-12 - 1711: 29,-16 - 1712: 27,-19 - 1748: -2,27 - 1749: 0,23 - 1750: 1,23 - 1775: -9,17 - 1776: -8,15 - 1777: -9,15 - 1778: -10,14 - 1779: -13,12 - 1780: -15,12 - 1781: -14,11 - 1851: -5,18 - 1852: -5,18 - 1853: -5,17 - 1854: -6,17 - 1855: -6,16 - 1859: -6,16 - 1860: -5,15 - 1861: -5,13 - 1862: -5,13 - 1863: -4,13 - 1881: -5,9 - 1882: -4,10 - 1936: 2,8 - 1937: 4,9 - 1938: 4,10 - 1939: 3,9 - 1940: 4,12 - 1941: 4,13 - 1942: 2,15 - 1943: 2,14 - 1944: 4,15 - 1977: 3,28 - 1978: 4,28 - 1979: 5,28 - 1980: 7,28 - 1981: 7,28 - 1982: 6,27 - 1983: 5,26 - 1984: 5,26 - 1985: 8,27 - 1990: 10,23 - 1991: 11,23 - 2274: 48,26 - 2275: 49,26 - 2276: 48,25 - 2277: 47,25 - 2278: 46,26 - 2279: 45,26 - 2280: 45,26 - 2281: 40,26 - 2282: 43,26 - 2283: 43,26 - 2284: 42,24 - 2285: 41,24 - 2286: 42,25 - 2287: 42,26 - 2288: 41,26 - 2289: 40,25 - 2290: 39,26 - 2507: -1,32 - 2959: 4,3 - 2960: 6,4 - 2961: 11,2 - 2997: -9,4 - 2998: -10,4 - 2999: -8,2 - 3000: -12,4 - 3001: -11,2 - 3002: -12,2 - 3003: -12,1 - 3004: -13,4 - 3005: -13,5 + 1263: -15,4 + 1303: -1,4 + 1344: 16,1 + 1345: 16,1 + 1346: 14,3 + 1347: 13,3 + 1348: 11,2 + 1349: 9,4 + 1350: 7,5 + 1351: 5,2 + 1352: 4,5 + 1353: 4,5 + 1354: 2,5 + 1355: 3,3 + 1356: 2,6 + 1357: 4,6 + 1358: 4,5 + 1359: 3,2 + 1360: 3,1 + 1361: 4,1 + 1362: 7,1 + 1363: 8,1 + 1364: 11,4 + 1365: 10,5 + 1366: 12,5 + 1367: 15,2 + 1368: 16,3 + 1369: 17,4 + 1370: 17,4 + 1371: 17,1 + 1372: 19,1 + 1431: 27,1 + 1432: 30,3 + 1433: 31,3 + 1434: 31,1 + 1435: 28,4 + 1436: 30,4 + 1437: 34,3 + 1438: 33,1 + 1439: 34,4 + 1440: 34,5 + 1441: 37,4 + 1442: 35,1 + 1443: 37,1 + 1444: 39,3 + 1445: 38,2 + 1446: 37,2 + 1447: 37,2 + 1448: 41,2 + 1449: 42,4 + 1450: 44,5 + 1451: 44,2 + 1452: 43,1 + 1453: 45,4 + 1454: 45,6 + 1455: 43,6 + 1456: 42,5 + 1457: 44,2 + 1458: 48,7 + 1459: 46,9 + 1460: 47,9 + 1461: 47,8 + 1462: 48,8 + 1463: 48,7 + 1464: 46,5 + 1465: 48,3 + 1466: 49,3 + 1467: 49,4 + 1468: 49,4 + 1469: 49,1 + 1470: 47,1 + 1471: 45,1 + 1472: 46,2 + 1473: 52,1 + 1474: 51,3 + 1475: 53,3 + 1476: 53,3 + 1477: 53,1 + 1478: 54,2 + 1479: 54,3 + 1616: 37,9 + 1617: 34,16 + 1618: 37,17 + 1619: 38,18 + 1664: 27,-1 + 1665: 27,-3 + 1666: 29,-4 + 1667: 28,-3 + 1668: 29,-4 + 1669: 29,-7 + 1670: 29,-9 + 1671: 28,-10 + 1672: 28,-9 + 1673: 29,-10 + 1674: 29,-10 + 1675: 28,-12 + 1676: 28,-14 + 1677: 27,-14 + 1678: 27,-14 + 1679: 29,-12 + 1680: 29,-16 + 1681: 27,-19 + 1717: -2,27 + 1718: 0,23 + 1719: 1,23 + 1744: -9,17 + 1745: -8,15 + 1746: -9,15 + 1747: -10,14 + 1748: -13,12 + 1749: -15,12 + 1750: -14,11 + 1820: -5,18 + 1821: -5,18 + 1822: -5,17 + 1823: -6,17 + 1824: -6,16 + 1828: -6,16 + 1829: -5,15 + 1830: -5,13 + 1831: -5,13 + 1832: -4,13 + 1850: -5,9 + 1851: -4,10 + 1905: 2,8 + 1906: 4,9 + 1907: 4,10 + 1908: 3,9 + 1909: 4,12 + 1910: 4,13 + 1911: 2,15 + 1912: 2,14 + 1913: 4,15 + 1946: 3,28 + 1947: 4,28 + 1948: 5,28 + 1949: 7,28 + 1950: 7,28 + 1951: 6,27 + 1952: 5,26 + 1953: 5,26 + 1954: 8,27 + 1959: 10,23 + 1960: 11,23 + 2243: 48,26 + 2244: 49,26 + 2245: 48,25 + 2246: 47,25 + 2247: 46,26 + 2248: 45,26 + 2249: 45,26 + 2250: 40,26 + 2251: 43,26 + 2252: 43,26 + 2253: 42,24 + 2254: 41,24 + 2255: 42,25 + 2256: 42,26 + 2257: 41,26 + 2258: 40,25 + 2259: 39,26 + 2476: -1,32 + 2918: 4,3 + 2919: 6,4 + 2920: 11,2 + 2956: -9,4 + 2957: -10,4 + 2958: -8,2 + 2959: -12,4 + 2960: -11,2 + 2961: -12,2 + 2962: -12,1 + 2963: -13,4 + 2964: -13,5 - node: cleanable: True zIndex: 180 color: '#FFFFFFFF' id: DirtMedium decals: - 2794: 7,55 - 2795: 5,56 - 2796: 5,57 - 2797: 4,50 - 2798: 7,49 - 2799: 8,48 - 2800: 8,45 - 2801: 8,44 - 2802: 7,44 - 2803: 8,41 - 2804: 5,41 - 2805: 3,41 - 2806: 3,40 - 2807: 2,40 - 2808: 1,39 - 2809: -1,36 - 2810: 0,37 - 2811: 2,37 - 2812: 2,37 - 2813: -1,40 - 2814: -3,47 + 2763: 7,55 + 2764: 5,56 + 2765: 5,57 + 2766: 4,50 + 2767: 7,49 + 2768: 8,48 + 2769: 8,45 + 2770: 8,44 + 2771: 7,44 + 2772: 8,41 + 2773: 5,41 + 2774: 3,41 + 2775: 3,40 + 2776: 2,40 + 2777: 1,39 + 2778: -1,36 + 2779: 0,37 + 2780: 2,37 + 2781: 2,37 + 2782: -1,40 + 2783: -3,47 - node: cleanable: True color: '#334E6DD0' @@ -3150,8 +3150,8 @@ entities: decals: 421: 57,1 422: 56,1 - 1457: 47,9 - 1458: 48,9 + 1426: 47,9 + 1427: 48,9 - node: color: '#FFA5007F' id: HalfTileOverlayGreyscale @@ -3201,8 +3201,8 @@ entities: color: '#FFFFFFFF' id: LoadingArea decals: - 2650: -1,42 - 2651: -1,46 + 2619: -1,42 + 2620: -1,46 - node: angle: 1.5707963267948966 rad color: '#FFFFFFFF' @@ -3216,8 +3216,8 @@ entities: color: '#FFFFFFFF' id: LoadingArea decals: - 2652: 5,42 - 2653: 5,46 + 2621: 5,42 + 2622: 5,46 - node: color: '#DE3A3A96' id: MiniTileCheckerAOverlay @@ -3317,14 +3317,14 @@ entities: 238: 45,9 239: 46,9 426: 57,2 - 1449: 37,5 - 1450: 38,5 - 1451: 39,5 - 1452: 40,5 - 1453: 41,5 - 1454: 42,6 - 1455: 43,6 - 1456: 44,6 + 1418: 37,5 + 1419: 38,5 + 1420: 39,5 + 1421: 40,5 + 1422: 41,5 + 1423: 42,6 + 1424: 43,6 + 1425: 44,6 - node: color: '#52B4E996' id: QuarterTileOverlayGreyscale180 @@ -3427,9 +3427,9 @@ entities: 241: 48,5 653: 53,22 654: 53,23 - 1459: 48,6 - 1460: 48,7 - 1461: 48,8 + 1428: 48,6 + 1429: 48,7 + 1430: 48,8 - node: color: '#EFB34196' id: QuarterTileOverlayGreyscale90 @@ -3447,68 +3447,68 @@ entities: color: '#FFFFFFFF' id: SpaceStationSign1 decals: - 2915: -11,4 - 2940: 7,4 + 2884: -11,4 + 2899: 7,4 - node: color: '#FFFFFFFF' id: SpaceStationSign10 decals: - 2920: -10,2 - 2941: 8,2 + 2889: -10,2 + 2900: 8,2 - node: color: '#FFFFFFFF' id: SpaceStationSign11 decals: - 2921: -9,2 - 2942: 9,2 + 2890: -9,2 + 2901: 9,2 - node: color: '#FFFFFFFF' id: SpaceStationSign2 decals: - 2922: -10,4 - 2943: 8,4 + 2891: -10,4 + 2902: 8,4 - node: color: '#FFFFFFFF' id: SpaceStationSign3 decals: - 2912: -13,3 - 2939: 5,3 + 2881: -13,3 + 2898: 5,3 - node: color: '#FFFFFFFF' id: SpaceStationSign4 decals: - 2913: -12,3 - 2938: 6,3 + 2882: -12,3 + 2897: 6,3 - node: color: '#FFFFFFFF' id: SpaceStationSign5 decals: - 2914: -11,3 - 2937: 7,3 + 2883: -11,3 + 2896: 7,3 - node: color: '#FFFFFFFF' id: SpaceStationSign6 decals: - 2916: -10,3 - 2936: 8,3 + 2885: -10,3 + 2895: 8,3 - node: color: '#FFFFFFFF' id: SpaceStationSign7 decals: - 2917: -9,3 - 2935: 9,3 + 2886: -9,3 + 2894: 9,3 - node: color: '#FFFFFFFF' id: SpaceStationSign8 decals: - 2918: -8,3 - 2934: 10,3 + 2887: -8,3 + 2893: 10,3 - node: color: '#FFFFFFFF' id: SpaceStationSign9 decals: - 2919: -7,3 - 2933: 11,3 + 2888: -7,3 + 2892: 11,3 - node: color: '#DE3A3A96' id: StandClear @@ -3625,23 +3625,23 @@ entities: 580: 12,24 581: 12,25 582: 12,26 - 1798: 1,18 - 1799: 1,17 - 1800: 1,16 - 1801: 1,15 - 1806: -3,15 - 1807: -3,16 - 1808: -3,17 - 1809: -3,18 - 3018: -28,1 + 1767: 1,18 + 1768: 1,17 + 1769: 1,16 + 1770: 1,15 + 1775: -3,15 + 1776: -3,16 + 1777: -3,17 + 1778: -3,18 + 2977: -28,1 - node: zIndex: 180 color: '#FFFFFFFF' id: WarnLineE decals: - 2663: 8,53 - 2664: 8,54 - 2665: 8,55 + 2632: 8,53 + 2633: 8,54 + 2634: 8,55 - node: color: '#FFFFFFFF' id: WarnLineN @@ -3754,23 +3754,23 @@ entities: 567: 55,24 568: 55,25 569: 55,26 - 1802: -3,18 - 1803: -3,17 - 1804: -3,16 - 1805: -3,15 - 1810: 1,15 - 1811: 1,16 - 1812: 1,17 - 1813: 1,18 - 3019: -28,1 + 1771: -3,18 + 1772: -3,17 + 1773: -3,16 + 1774: -3,15 + 1779: 1,15 + 1780: 1,16 + 1781: 1,17 + 1782: 1,18 + 2978: -28,1 - node: zIndex: 180 color: '#FFFFFFFF' id: WarnLineS decals: - 2647: -3,43 - 2648: -3,44 - 2649: -3,45 + 2616: -3,43 + 2617: -3,44 + 2618: -3,45 - node: color: '#FFFFFFFF' id: WarnLineW @@ -3865,7 +3865,7 @@ entities: color: '#FF00FFFF' id: clown decals: - 2911: 6.027291,42.00365 + 2880: 6.027291,42.00365 - node: color: '#9BC516FF' id: shop @@ -3877,7 +3877,7 @@ entities: color: '#FFFF00FF' id: trade decals: - 2630: 2,38 + 2599: 2,38 type: DecalGrid - version: 2 data: @@ -4948,6 +4948,40 @@ entities: - pos: -58.5,0.5 parent: 2173 type: Transform +- proto: AirlockFrontierGlassLocked + entities: + - uid: 3955 + components: + - pos: 9.5,16.5 + parent: 2173 + type: Transform + - uid: 4114 + components: + - pos: 9.5,15.5 + parent: 2173 + type: Transform + - uid: 4115 + components: + - pos: 5.5,16.5 + parent: 2173 + type: Transform + - uid: 4116 + components: + - pos: 5.5,15.5 + parent: 2173 + type: Transform + - uid: 4117 + components: + - pos: 18.5,11.5 + parent: 2173 + type: Transform +- proto: AirlockFrontierLocked + entities: + - uid: 4118 + components: + - pos: 23.5,13.5 + parent: 2173 + type: Transform - proto: AirlockGlass entities: - uid: 539 @@ -5215,14 +5249,14 @@ entities: - pos: -1.5,-0.5 parent: 2173 type: Transform - - name: 6 + - name: 6A type: Docking - uid: 2180 components: - pos: 0.5,-0.5 parent: 2173 type: Transform - - name: 6 + - name: 6A type: Docking - uid: 2181 components: @@ -5344,7 +5378,7 @@ entities: pos: -6.5,43.5 parent: 2173 type: Transform - - name: 5A + - name: 7A type: Docking - uid: 2197 components: @@ -5352,7 +5386,7 @@ entities: pos: -6.5,44.5 parent: 2173 type: Transform - - name: 5A + - name: 7A type: Docking - uid: 2198 components: @@ -5360,7 +5394,7 @@ entities: pos: -6.5,45.5 parent: 2173 type: Transform - - name: 5A + - name: 7A type: Docking - uid: 2199 components: @@ -5368,7 +5402,7 @@ entities: pos: 12.5,53.5 parent: 2173 type: Transform - - name: 5B + - name: 7B type: Docking - uid: 2200 components: @@ -5376,7 +5410,7 @@ entities: pos: 12.5,54.5 parent: 2173 type: Transform - - name: 5B + - name: 7B type: Docking - uid: 2201 components: @@ -5384,7 +5418,7 @@ entities: pos: 12.5,55.5 parent: 2173 type: Transform - - name: 5B + - name: 7B type: Docking - uid: 2202 components: @@ -5437,48 +5471,64 @@ entities: pos: 56.5,29.5 parent: 2173 type: Transform + - name: 5A + type: Docking - uid: 2589 components: - rot: 3.141592653589793 rad pos: 29.5,28.5 parent: 2173 type: Transform + - name: 6B + type: Docking - uid: 3770 components: - rot: 1.5707963267948966 rad pos: 61.5,26.5 parent: 2173 type: Transform + - name: 5B + type: Docking - uid: 3919 components: - rot: 3.141592653589793 rad pos: 58.5,29.5 parent: 2173 type: Transform + - name: 5A + type: Docking - uid: 3920 components: - rot: 3.141592653589793 rad pos: 57.5,29.5 parent: 2173 type: Transform + - name: 5A + type: Docking - uid: 4051 components: - rot: 3.141592653589793 rad pos: 27.5,28.5 parent: 2173 type: Transform + - name: 6B + type: Docking - uid: 4982 components: - rot: 1.5707963267948966 rad pos: 61.5,24.5 parent: 2173 type: Transform + - name: 5B + type: Docking - uid: 4983 components: - rot: 1.5707963267948966 rad pos: 61.5,25.5 parent: 2173 type: Transform + - name: 5B + type: Docking - uid: 5801 components: - pos: -29.5,-30.5 @@ -5500,38 +5550,6 @@ entities: - pos: 7.5,17.5 parent: 2173 type: Transform - - uid: 4114 - components: - - pos: 5.5,15.5 - parent: 2173 - type: Transform - - uid: 4115 - components: - - pos: 5.5,16.5 - parent: 2173 - type: Transform - - uid: 4116 - components: - - pos: 9.5,15.5 - parent: 2173 - type: Transform - - uid: 4117 - components: - - pos: 9.5,16.5 - parent: 2173 - type: Transform - - uid: 4118 - components: - - pos: 18.5,11.5 - parent: 2173 - type: Transform -- proto: AirlockHeadOfPersonnelLocked - entities: - - uid: 4139 - components: - - pos: 23.5,13.5 - parent: 2173 - type: Transform - proto: AirlockJanitorLocked entities: - uid: 2754 @@ -5703,14 +5721,6 @@ entities: parent: 2173 type: Transform - proto: APCBasic - entities: - - uid: 2614 - components: - - rot: -1.5707963267948966 rad - pos: 9.5,19.5 - parent: 2173 - type: Transform -- proto: APCBasicEmpImmune entities: - uid: 1671 components: @@ -5740,6 +5750,12 @@ entities: - pos: -40.5,13.5 parent: 2173 type: Transform + - uid: 2614 + components: + - rot: -1.5707963267948966 rad + pos: 9.5,19.5 + parent: 2173 + type: Transform - uid: 2860 components: - pos: 40.5,19.5 @@ -7322,15 +7338,11 @@ entities: - pos: 30.5,26.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 626 components: - pos: 28.5,26.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 627 components: - pos: 25.5,26.5 @@ -7376,8 +7388,6 @@ entities: - pos: 56.5,29.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 641 components: - pos: 20.5,24.5 @@ -7433,8 +7443,6 @@ entities: - pos: 9.5,24.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 707 components: - pos: 8.5,28.5 @@ -7490,8 +7498,6 @@ entities: - pos: 61.5,24.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1229 components: - pos: 44.5,26.5 @@ -7512,8 +7518,6 @@ entities: - pos: 26.5,26.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1571 components: - pos: 23.5,26.5 @@ -7539,8 +7543,6 @@ entities: - pos: -29.5,14.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1688 components: - pos: -28.5,14.5 @@ -7596,155 +7598,111 @@ entities: - pos: -30.5,14.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1699 components: - pos: -30.5,15.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1700 components: - pos: -30.5,16.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1701 components: - pos: -30.5,17.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1702 components: - pos: -30.5,18.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1703 components: - pos: -31.5,18.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1704 components: - pos: -32.5,18.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1705 components: - pos: -33.5,18.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1706 components: - pos: -33.5,17.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1707 components: - pos: -33.5,16.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1708 components: - pos: -33.5,15.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1709 components: - pos: -33.5,14.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1710 components: - pos: -34.5,14.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1711 components: - pos: -34.5,16.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1712 components: - pos: -35.5,16.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1713 components: - pos: -36.5,16.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1714 components: - pos: -35.5,14.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1715 components: - pos: -36.5,14.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1716 components: - pos: -34.5,18.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1717 components: - pos: -35.5,18.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1718 components: - pos: -36.5,18.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1845 components: - pos: -2.5,7.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1846 components: - pos: -3.5,7.5 @@ -7765,29 +7723,21 @@ entities: - pos: -1.5,7.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1850 components: - pos: -0.5,7.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1851 components: - pos: 0.5,7.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1852 components: - pos: 1.5,7.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1853 components: - pos: 2.5,7.5 @@ -8088,8 +8038,6 @@ entities: - pos: 5.5,40.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1965 components: - pos: 5.5,41.5 @@ -8315,8 +8263,6 @@ entities: - pos: 4.5,52.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 2023 components: - pos: 5.5,52.5 @@ -8707,8 +8653,6 @@ entities: - pos: 58.5,29.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 2497 components: - pos: 56.5,26.5 @@ -8749,8 +8693,6 @@ entities: - pos: 61.5,26.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 2593 components: - pos: 10.5,26.5 @@ -8766,8 +8708,6 @@ entities: - pos: 9.5,19.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3031 components: - pos: 30.5,23.5 @@ -8788,8 +8728,6 @@ entities: - pos: -49.5,16.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3180 components: - pos: -49.5,17.5 @@ -9055,8 +8993,6 @@ entities: - pos: -28.5,9.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3233 components: - pos: -50.5,11.5 @@ -9322,8 +9258,6 @@ entities: - pos: -41.5,0.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3286 components: - pos: -41.5,1.5 @@ -9444,99 +9378,71 @@ entities: - pos: -29.5,7.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3310 components: - pos: -29.5,8.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3311 components: - pos: -29.5,9.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3312 components: - pos: -27.5,9.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3313 components: - pos: -26.5,9.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3314 components: - pos: -25.5,9.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3315 components: - pos: -24.5,9.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3316 components: - pos: -23.5,9.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3317 components: - pos: -22.5,9.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3318 components: - pos: -21.5,9.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3319 components: - pos: -21.5,10.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3320 components: - pos: -21.5,11.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3321 components: - pos: -21.5,12.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3322 components: - pos: -21.5,13.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3323 components: - pos: -22.5,13.5 @@ -9547,15 +9453,11 @@ entities: - pos: -23.5,13.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3325 components: - pos: -23.5,12.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3326 components: - pos: 43.5,5.5 @@ -9566,8 +9468,6 @@ entities: - pos: -40.5,13.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3328 components: - pos: -40.5,12.5 @@ -9713,8 +9613,6 @@ entities: - pos: -18.5,5.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3357 components: - pos: -18.5,4.5 @@ -10240,8 +10138,6 @@ entities: - pos: 17.5,5.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3462 components: - pos: 16.5,4.5 @@ -10357,8 +10253,6 @@ entities: - pos: 30.5,-15.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3485 components: - pos: 29.5,-15.5 @@ -10719,8 +10613,6 @@ entities: - pos: -31.5,-15.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3557 components: - pos: -30.5,-15.5 @@ -11181,8 +11073,6 @@ entities: - pos: 46.5,0.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3649 components: - pos: 46.5,1.5 @@ -11408,78 +11298,56 @@ entities: - pos: 52.5,5.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3694 components: - pos: 53.5,5.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3695 components: - pos: 53.5,6.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3696 components: - pos: 53.5,7.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3697 components: - pos: 53.5,8.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3698 components: - pos: 53.5,9.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3699 components: - pos: 53.5,10.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3700 components: - pos: 53.5,11.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3701 components: - pos: 53.5,12.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3702 components: - pos: 53.5,13.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3703 components: - pos: 52.5,13.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3704 components: - pos: 52.5,14.5 @@ -11510,15 +11378,11 @@ entities: - pos: 50.5,15.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3710 components: - pos: 49.5,15.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3711 components: - pos: 48.5,15.5 @@ -11544,15 +11408,11 @@ entities: - pos: 49.5,18.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3716 components: - pos: 50.5,18.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3717 components: - pos: 51.5,18.5 @@ -11563,15 +11423,11 @@ entities: - pos: 51.5,13.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3719 components: - pos: 40.5,19.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3720 components: - pos: 40.5,18.5 @@ -11812,8 +11668,6 @@ entities: - pos: 35.5,20.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3776 components: - pos: 36.5,20.5 @@ -11869,8 +11723,6 @@ entities: - pos: 46.5,16.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3787 components: - pos: 45.5,16.5 @@ -12246,120 +12098,86 @@ entities: - pos: 28.5,7.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3862 components: - pos: 28.5,8.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3863 components: - pos: 28.5,9.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3864 components: - pos: 28.5,10.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3865 components: - pos: 28.5,11.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3866 components: - pos: 28.5,12.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3867 components: - pos: 28.5,13.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3868 components: - pos: 28.5,14.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3869 components: - pos: 28.5,15.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3870 components: - pos: 27.5,15.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3871 components: - pos: 27.5,16.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3872 components: - pos: 27.5,17.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3873 components: - pos: 26.5,17.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3874 components: - pos: 25.5,17.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3875 components: - pos: 24.5,17.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3876 components: - pos: 23.5,17.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3877 components: - pos: 12.5,17.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3878 components: - pos: 12.5,16.5 @@ -12505,57 +12323,41 @@ entities: - pos: 12.5,18.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3907 components: - pos: 13.5,18.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3908 components: - pos: 14.5,18.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3909 components: - pos: 15.5,18.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3910 components: - pos: 16.5,18.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3911 components: - pos: 17.5,18.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3912 components: - pos: 18.5,18.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3913 components: - pos: 19.5,18.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3914 components: - pos: 9.5,25.5 @@ -12876,8 +12678,6 @@ entities: - pos: -2.5,28.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3999 components: - pos: -3.5,28.5 @@ -12968,8 +12768,6 @@ entities: - pos: -3.5,25.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 4017 components: - pos: -3.5,26.5 @@ -13105,8 +12903,6 @@ entities: - pos: -8.5,13.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 4387 components: - pos: -9.5,13.5 @@ -13187,8 +12983,6 @@ entities: - pos: -18.5,13.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 4403 components: - pos: -18.5,14.5 @@ -13244,8 +13038,6 @@ entities: - pos: -12.5,18.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 4414 components: - pos: -11.5,18.5 @@ -13316,15 +13108,11 @@ entities: - pos: -12.5,13.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 4428 components: - pos: -13.5,13.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 4429 components: - pos: -14.5,13.5 @@ -13335,22 +13123,16 @@ entities: - pos: -15.5,13.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 4431 components: - pos: -16.5,13.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 4432 components: - pos: -17.5,13.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 4433 components: - pos: -13.5,14.5 @@ -13366,8 +13148,6 @@ entities: - pos: -13.5,16.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 4436 components: - pos: -13.5,17.5 @@ -13438,29 +13218,21 @@ entities: - pos: 29.5,15.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 5860 components: - pos: 29.5,16.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 5861 components: - pos: 29.5,17.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 5862 components: - pos: 30.5,17.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 5863 components: - pos: 30.5,18.5 @@ -13588,15 +13360,11 @@ entities: - pos: -37.5,8.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1607 components: - pos: -37.5,9.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1608 components: - pos: -36.5,11.5 @@ -13637,36 +13405,26 @@ entities: - pos: -42.5,12.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1616 components: - pos: -42.5,11.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1617 components: - pos: -42.5,10.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1618 components: - pos: -42.5,9.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1619 components: - pos: -42.5,8.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1628 components: - pos: -38.5,9.5 @@ -13852,8 +13610,6 @@ entities: - pos: -25.5,14.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1719 components: - pos: -29.5,6.5 @@ -13864,106 +13620,76 @@ entities: - pos: -29.5,7.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1721 components: - pos: -29.5,8.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1722 components: - pos: -29.5,9.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1723 components: - pos: -28.5,9.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1724 components: - pos: -27.5,9.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1725 components: - pos: -26.5,9.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1726 components: - pos: -25.5,9.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1727 components: - pos: -24.5,9.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1728 components: - pos: -23.5,9.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1729 components: - pos: -22.5,9.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1730 components: - pos: -21.5,9.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1731 components: - pos: -21.5,10.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1732 components: - pos: -21.5,11.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1733 components: - pos: -21.5,12.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1734 components: - pos: -21.5,13.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1735 components: - pos: -22.5,13.5 @@ -13974,15 +13700,11 @@ entities: - pos: -23.5,13.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1737 components: - pos: -23.5,12.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1738 components: - pos: -23.5,11.5 @@ -14298,92 +14020,66 @@ entities: - pos: 28.5,7.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1801 components: - pos: 28.5,8.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1802 components: - pos: 28.5,9.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1803 components: - pos: 28.5,10.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1804 components: - pos: 28.5,11.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1805 components: - pos: 28.5,12.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1806 components: - pos: 28.5,13.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1807 components: - pos: 28.5,14.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1808 components: - pos: 28.5,15.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1809 components: - pos: 27.5,15.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1810 components: - pos: 27.5,16.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1811 components: - pos: 27.5,17.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1812 components: - pos: 27.5,18.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1813 components: - pos: -3.5,5.5 @@ -14464,22 +14160,16 @@ entities: - pos: 0.5,14.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1832 components: - pos: -0.5,14.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1833 components: - pos: -1.5,14.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1834 components: - pos: -2.5,14.5 @@ -14605,43 +14295,31 @@ entities: - pos: -3.5,36.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1938 components: - pos: -3.5,37.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1939 components: - pos: -3.5,38.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1940 components: - pos: -3.5,39.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1941 components: - pos: -3.5,40.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 5803 components: - pos: -3.5,41.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - proto: CableMV entities: - uid: 669 @@ -14649,113 +14327,81 @@ entities: - pos: 9.5,24.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1672 components: - pos: -25.5,14.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1673 components: - pos: -25.5,15.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1674 components: - pos: -25.5,16.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1675 components: - pos: -25.5,17.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1676 components: - pos: -25.5,18.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1677 components: - pos: -25.5,19.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1678 components: - pos: -26.5,19.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1679 components: - pos: -27.5,19.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1680 components: - pos: -28.5,19.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1681 components: - pos: -29.5,19.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1682 components: - pos: -29.5,18.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1683 components: - pos: -29.5,17.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1684 components: - pos: -29.5,16.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1685 components: - pos: -29.5,15.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1686 components: - pos: -29.5,14.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1837 components: - pos: -2.5,14.5 @@ -14796,29 +14442,21 @@ entities: - pos: -2.5,7.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1943 components: - pos: -3.5,36.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1944 components: - pos: -3.5,35.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1945 components: - pos: -2.5,35.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1946 components: - pos: -1.5,35.5 @@ -14834,43 +14472,31 @@ entities: - pos: -3.5,37.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1949 components: - pos: -3.5,38.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1950 components: - pos: -3.5,39.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1951 components: - pos: -3.5,40.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1952 components: - pos: -3.5,41.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1954 components: - pos: -3.5,40.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1955 components: - pos: -2.5,40.5 @@ -14916,15 +14542,11 @@ entities: - pos: 5.5,40.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1970 components: - pos: 4.5,52.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1971 components: - pos: 4.5,51.5 @@ -14985,8 +14607,6 @@ entities: - pos: -29.5,8.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 2164 components: - pos: 10.5,20.5 @@ -15007,8 +14627,6 @@ entities: - pos: -24.5,12.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 2877 components: - pos: -25.5,12.5 @@ -15094,8 +14712,6 @@ entities: - pos: -40.5,13.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 2894 components: - pos: -40.5,11.5 @@ -15161,8 +14777,6 @@ entities: - pos: -41.5,0.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 2907 components: - pos: -42.5,4.5 @@ -15278,22 +14892,16 @@ entities: - pos: -49.5,16.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 2931 components: - pos: -23.5,12.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 2932 components: - pos: -23.5,13.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 2933 components: - pos: -22.5,13.5 @@ -15304,99 +14912,71 @@ entities: - pos: -21.5,13.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 2935 components: - pos: -21.5,12.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 2936 components: - pos: -21.5,11.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 2937 components: - pos: -21.5,10.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 2938 components: - pos: -21.5,9.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 2939 components: - pos: -22.5,9.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 2940 components: - pos: -23.5,9.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 2941 components: - pos: -24.5,9.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 2942 components: - pos: -25.5,9.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 2943 components: - pos: -26.5,9.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 2944 components: - pos: -27.5,9.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 2945 components: - pos: -28.5,9.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 2946 components: - pos: -29.5,9.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 2947 components: - pos: -29.5,7.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 2948 components: - pos: -29.5,6.5 @@ -15522,8 +15102,6 @@ entities: - pos: -31.5,-15.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 2973 components: - pos: 28.5,3.5 @@ -15534,8 +15112,6 @@ entities: - pos: -20.5,11.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 2975 components: - pos: -19.5,11.5 @@ -15606,8 +15182,6 @@ entities: - pos: -8.5,13.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 2989 components: - pos: -28.5,4.5 @@ -15668,8 +15242,6 @@ entities: - pos: -18.5,5.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3001 components: - pos: -9.5,14.5 @@ -15800,8 +15372,6 @@ entities: - pos: -2.5,28.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3027 components: - pos: 0.5,25.5 @@ -15817,8 +15387,6 @@ entities: - pos: 2.5,25.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3030 components: - pos: 3.5,25.5 @@ -15844,8 +15412,6 @@ entities: - pos: 10.5,19.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3036 components: - pos: 1.5,21.5 @@ -15906,92 +15472,66 @@ entities: - pos: 27.5,18.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3050 components: - pos: 27.5,17.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3051 components: - pos: 27.5,16.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3052 components: - pos: 27.5,15.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3053 components: - pos: 28.5,15.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3054 components: - pos: 28.5,14.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3055 components: - pos: 28.5,13.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3056 components: - pos: 28.5,12.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3057 components: - pos: 28.5,11.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3058 components: - pos: 28.5,10.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3059 components: - pos: 28.5,9.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3060 components: - pos: 28.5,8.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3061 components: - pos: 28.5,7.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3062 components: - pos: 28.5,6.5 @@ -16067,8 +15607,6 @@ entities: - pos: 17.5,5.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3077 components: - pos: 29.5,4.5 @@ -16179,134 +15717,96 @@ entities: - pos: 46.5,0.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3099 components: - pos: 26.5,17.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3100 components: - pos: 25.5,17.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3101 components: - pos: 24.5,17.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3102 components: - pos: 23.5,17.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3103 components: - pos: 23.5,18.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3104 components: - pos: 22.5,18.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3105 components: - pos: 21.5,18.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3106 components: - pos: 20.5,18.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3107 components: - pos: 19.5,18.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3108 components: - pos: 18.5,18.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3109 components: - pos: 17.5,18.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3110 components: - pos: 16.5,18.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3111 components: - pos: 15.5,18.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3112 components: - pos: 14.5,18.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3113 components: - pos: 13.5,18.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3114 components: - pos: 12.5,18.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3115 components: - pos: 12.5,17.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3116 components: - pos: 29.5,14.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3117 components: - pos: 30.5,14.5 @@ -16387,8 +15887,6 @@ entities: - pos: 40.5,19.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3133 components: - pos: 37.5,18.5 @@ -16509,22 +16007,16 @@ entities: - pos: 30.5,-15.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3939 components: - pos: 10.5,18.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 3948 components: - pos: 11.5,18.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 4604 components: - pos: -51.5,8.5 @@ -16540,8 +16032,6 @@ entities: - pos: 9.5,19.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 5731 components: - pos: 41.5,18.5 @@ -16582,8 +16072,6 @@ entities: - pos: 46.5,16.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 6020 components: - pos: 8.5,20.5 @@ -17752,6 +17240,8 @@ entities: pos: 12.5,14.5 parent: 2173 type: Transform + - maxRange: 512 + type: RadarConsole - proto: ComputerStationRecords entities: - uid: 2633 @@ -19660,8 +19150,6 @@ entities: type: Transform - enabled: True type: PointLight - - enabled: True - type: AmbientSound - type: ActiveEmergencyLight - uid: 4325 components: @@ -19671,8 +19159,6 @@ entities: type: Transform - enabled: True type: PointLight - - enabled: True - type: AmbientSound - type: ActiveEmergencyLight - uid: 4326 components: @@ -19682,8 +19168,6 @@ entities: type: Transform - enabled: True type: PointLight - - enabled: True - type: AmbientSound - type: ActiveEmergencyLight - uid: 4327 components: @@ -19692,8 +19176,6 @@ entities: type: Transform - enabled: True type: PointLight - - enabled: True - type: AmbientSound - type: ActiveEmergencyLight - uid: 4328 components: @@ -19703,8 +19185,6 @@ entities: type: Transform - enabled: True type: PointLight - - enabled: True - type: AmbientSound - type: ActiveEmergencyLight - uid: 4329 components: @@ -19714,8 +19194,6 @@ entities: type: Transform - enabled: True type: PointLight - - enabled: True - type: AmbientSound - type: ActiveEmergencyLight - uid: 4330 components: @@ -19725,8 +19203,6 @@ entities: type: Transform - enabled: True type: PointLight - - enabled: True - type: AmbientSound - type: ActiveEmergencyLight - uid: 4331 components: @@ -19736,8 +19212,6 @@ entities: type: Transform - enabled: True type: PointLight - - enabled: True - type: AmbientSound - type: ActiveEmergencyLight - uid: 4332 components: @@ -19747,8 +19221,6 @@ entities: type: Transform - enabled: True type: PointLight - - enabled: True - type: AmbientSound - type: ActiveEmergencyLight - uid: 4333 components: @@ -19758,8 +19230,6 @@ entities: type: Transform - enabled: True type: PointLight - - enabled: True - type: AmbientSound - type: ActiveEmergencyLight - uid: 4334 components: @@ -19768,8 +19238,6 @@ entities: type: Transform - enabled: True type: PointLight - - enabled: True - type: AmbientSound - type: ActiveEmergencyLight - uid: 4335 components: @@ -19778,8 +19246,6 @@ entities: type: Transform - enabled: True type: PointLight - - enabled: True - type: AmbientSound - type: ActiveEmergencyLight - uid: 4336 components: @@ -19789,8 +19255,6 @@ entities: type: Transform - enabled: True type: PointLight - - enabled: True - type: AmbientSound - type: ActiveEmergencyLight - uid: 4337 components: @@ -19800,8 +19264,6 @@ entities: type: Transform - enabled: True type: PointLight - - enabled: True - type: AmbientSound - type: ActiveEmergencyLight - uid: 4338 components: @@ -19811,8 +19273,6 @@ entities: type: Transform - enabled: True type: PointLight - - enabled: True - type: AmbientSound - type: ActiveEmergencyLight - uid: 4339 components: @@ -19822,8 +19282,6 @@ entities: type: Transform - enabled: True type: PointLight - - enabled: True - type: AmbientSound - type: ActiveEmergencyLight - uid: 4340 components: @@ -19833,8 +19291,6 @@ entities: type: Transform - enabled: True type: PointLight - - enabled: True - type: AmbientSound - type: ActiveEmergencyLight - uid: 4341 components: @@ -19844,8 +19300,6 @@ entities: type: Transform - enabled: True type: PointLight - - enabled: True - type: AmbientSound - type: ActiveEmergencyLight - uid: 4342 components: @@ -19854,8 +19308,6 @@ entities: type: Transform - enabled: True type: PointLight - - enabled: True - type: AmbientSound - type: ActiveEmergencyLight - uid: 4343 components: @@ -19864,8 +19316,6 @@ entities: type: Transform - enabled: True type: PointLight - - enabled: True - type: AmbientSound - type: ActiveEmergencyLight - uid: 4344 components: @@ -19875,8 +19325,6 @@ entities: type: Transform - enabled: True type: PointLight - - enabled: True - type: AmbientSound - type: ActiveEmergencyLight - uid: 4345 components: @@ -19886,8 +19334,6 @@ entities: type: Transform - enabled: True type: PointLight - - enabled: True - type: AmbientSound - type: ActiveEmergencyLight - uid: 4346 components: @@ -19896,8 +19342,6 @@ entities: type: Transform - enabled: True type: PointLight - - enabled: True - type: AmbientSound - type: ActiveEmergencyLight - uid: 4347 components: @@ -19906,8 +19350,6 @@ entities: type: Transform - enabled: True type: PointLight - - enabled: True - type: AmbientSound - type: ActiveEmergencyLight - uid: 4348 components: @@ -19916,8 +19358,6 @@ entities: type: Transform - enabled: True type: PointLight - - enabled: True - type: AmbientSound - type: ActiveEmergencyLight - uid: 4350 components: @@ -19927,8 +19367,6 @@ entities: type: Transform - enabled: True type: PointLight - - enabled: True - type: AmbientSound - type: ActiveEmergencyLight - uid: 4351 components: @@ -19938,8 +19376,6 @@ entities: type: Transform - enabled: True type: PointLight - - enabled: True - type: AmbientSound - type: ActiveEmergencyLight - uid: 4353 components: @@ -19948,8 +19384,6 @@ entities: type: Transform - enabled: True type: PointLight - - enabled: True - type: AmbientSound - type: ActiveEmergencyLight - uid: 4354 components: @@ -19959,8 +19393,6 @@ entities: type: Transform - enabled: True type: PointLight - - enabled: True - type: AmbientSound - type: ActiveEmergencyLight - uid: 4355 components: @@ -19970,8 +19402,6 @@ entities: type: Transform - enabled: True type: PointLight - - enabled: True - type: AmbientSound - type: ActiveEmergencyLight - uid: 4356 components: @@ -19981,8 +19411,6 @@ entities: type: Transform - enabled: True type: PointLight - - enabled: True - type: AmbientSound - type: ActiveEmergencyLight - uid: 4357 components: @@ -19992,8 +19420,6 @@ entities: type: Transform - enabled: True type: PointLight - - enabled: True - type: AmbientSound - type: ActiveEmergencyLight - uid: 4358 components: @@ -20003,8 +19429,6 @@ entities: type: Transform - enabled: True type: PointLight - - enabled: True - type: AmbientSound - type: ActiveEmergencyLight - proto: EmergencyMedipen entities: @@ -21233,8 +20657,6 @@ entities: pos: -38.5,17.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1114 components: - pos: -30.5,17.5 @@ -21242,8 +20664,6 @@ entities: type: Transform - color: '#990000FF' type: AtmosPipeColor - - enabled: True - type: AmbientSound - uid: 1119 components: - rot: -1.5707963267948966 rad @@ -21257,8 +20677,6 @@ entities: - pos: -31.5,16.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1135 components: - rot: 1.5707963267948966 rad @@ -21275,16 +20693,12 @@ entities: type: Transform - color: '#990000FF' type: AtmosPipeColor - - enabled: True - type: AmbientSound - uid: 1147 components: - rot: 1.5707963267948966 rad pos: -37.5,7.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 2499 components: - rot: 1.5707963267948966 rad @@ -21715,112 +21129,84 @@ entities: pos: -35.5,16.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1093 components: - rot: -1.5707963267948966 rad pos: -35.5,14.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1094 components: - rot: -1.5707963267948966 rad pos: -34.5,14.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1095 components: - rot: -1.5707963267948966 rad pos: -34.5,16.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1096 components: - rot: -1.5707963267948966 rad pos: -34.5,17.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1097 components: - rot: -1.5707963267948966 rad pos: -34.5,18.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1098 components: - rot: -1.5707963267948966 rad pos: -33.5,14.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1099 components: - rot: -1.5707963267948966 rad pos: -33.5,16.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1100 components: - rot: -1.5707963267948966 rad pos: -33.5,17.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1101 components: - rot: -1.5707963267948966 rad pos: -33.5,18.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1103 components: - rot: 1.5707963267948966 rad pos: -35.5,18.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1104 components: - rot: 1.5707963267948966 rad pos: -35.5,17.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1105 components: - rot: 1.5707963267948966 rad pos: -36.5,17.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1106 components: - rot: 1.5707963267948966 rad pos: -37.5,17.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1115 components: - rot: 3.141592653589793 rad @@ -21829,8 +21215,6 @@ entities: type: Transform - color: '#990000FF' type: AtmosPipeColor - - enabled: True - type: AmbientSound - uid: 1116 components: - pos: -30.5,15.5 @@ -21838,8 +21222,6 @@ entities: type: Transform - color: '#990000FF' type: AtmosPipeColor - - enabled: True - type: AmbientSound - uid: 1117 components: - pos: -30.5,14.5 @@ -21847,8 +21229,6 @@ entities: type: Transform - color: '#990000FF' type: AtmosPipeColor - - enabled: True - type: AmbientSound - uid: 1118 components: - pos: -30.5,13.5 @@ -21856,15 +21236,11 @@ entities: type: Transform - color: '#990000FF' type: AtmosPipeColor - - enabled: True - type: AmbientSound - uid: 1124 components: - pos: -31.5,15.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1125 components: - rot: -1.5707963267948966 rad @@ -21943,8 +21319,6 @@ entities: type: Transform - color: '#990000FF' type: AtmosPipeColor - - enabled: True - type: AmbientSound - uid: 1138 components: - pos: -41.5,9.5 @@ -21965,8 +21339,6 @@ entities: pos: -34.5,7.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1154 components: - rot: 3.141592653589793 rad @@ -23974,8 +23346,6 @@ entities: type: Transform - color: '#990000FF' type: AtmosPipeColor - - enabled: True - type: AmbientSound - uid: 4841 components: - rot: -1.5707963267948966 rad @@ -24440,8 +23810,6 @@ entities: type: Transform - color: '#990000FF' type: AtmosPipeColor - - enabled: True - type: AmbientSound - uid: 4924 components: - pos: 35.5,10.5 @@ -24565,8 +23933,6 @@ entities: type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - enabled: True - type: AmbientSound - uid: 4950 components: - rot: 1.5707963267948966 rad @@ -25542,8 +24908,6 @@ entities: type: Transform - color: '#990000FF' type: AtmosPipeColor - - enabled: True - type: AmbientSound - uid: 5161 components: - pos: -5.5,20.5 @@ -26081,8 +25445,6 @@ entities: type: Transform - color: '#990000FF' type: AtmosPipeColor - - enabled: True - type: AmbientSound - uid: 5262 components: - rot: 1.5707963267948966 rad @@ -26106,8 +25468,6 @@ entities: type: Transform - color: '#990000FF' type: AtmosPipeColor - - enabled: True - type: AmbientSound - uid: 5267 components: - pos: 6.5,22.5 @@ -26297,8 +25657,6 @@ entities: type: Transform - color: '#0055CCFF' type: AtmosPipeColor - - enabled: True - type: AmbientSound - uid: 5303 components: - rot: 3.141592653589793 rad @@ -26643,8 +26001,6 @@ entities: pos: 30.5,26.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 5894 components: - rot: -1.5707963267948966 rad @@ -26657,8 +26013,6 @@ entities: pos: 28.5,26.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 5896 components: - rot: -1.5707963267948966 rad @@ -26671,8 +26025,6 @@ entities: pos: 26.5,26.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 5898 components: - rot: -1.5707963267948966 rad @@ -27205,8 +26557,6 @@ entities: type: Transform - color: '#990000FF' type: AtmosPipeColor - - enabled: True - type: AmbientSound - uid: 1112 components: - pos: -31.5,18.5 @@ -27214,8 +26564,6 @@ entities: type: Transform - color: '#990000FF' type: AtmosPipeColor - - enabled: True - type: AmbientSound - uid: 1126 components: - pos: -32.5,12.5 @@ -27238,15 +26586,11 @@ entities: type: Transform - color: '#990000FF' type: AtmosPipeColor - - enabled: True - type: AmbientSound - uid: 1148 components: - pos: -36.5,7.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1149 components: - rot: -1.5707963267948966 rad @@ -27260,8 +26604,6 @@ entities: - pos: -35.5,7.5 parent: 2173 type: Transform - - enabled: True - type: AmbientSound - uid: 1153 components: - rot: -1.5707963267948966 rad @@ -28048,16 +27390,12 @@ entities: pos: 8.5,23.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - uid: 4494 components: - rot: 1.5707963267948966 rad pos: -32.5,8.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#0055CCFF' type: AtmosPipeColor - uid: 4509 @@ -28066,8 +27404,6 @@ entities: pos: -42.5,3.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#0055CCFF' type: AtmosPipeColor - uid: 4510 @@ -28076,8 +27412,6 @@ entities: pos: -30.5,3.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#0055CCFF' type: AtmosPipeColor - uid: 4513 @@ -28086,8 +27420,6 @@ entities: pos: -29.5,-4.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#0055CCFF' type: AtmosPipeColor - uid: 4514 @@ -28096,8 +27428,6 @@ entities: pos: -29.5,-16.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#0055CCFF' type: AtmosPipeColor - uid: 4517 @@ -28106,8 +27436,6 @@ entities: pos: -32.5,-26.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#0055CCFF' type: AtmosPipeColor - uid: 4518 @@ -28116,8 +27444,6 @@ entities: pos: -26.5,-26.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#0055CCFF' type: AtmosPipeColor - uid: 4519 @@ -28126,8 +27452,6 @@ entities: pos: -29.5,-29.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#0055CCFF' type: AtmosPipeColor - uid: 4579 @@ -28136,8 +27460,6 @@ entities: pos: -50.5,4.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#0055CCFF' type: AtmosPipeColor - uid: 4608 @@ -28146,8 +27468,6 @@ entities: pos: -48.5,11.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#0055CCFF' type: AtmosPipeColor - uid: 4617 @@ -28156,8 +27476,6 @@ entities: pos: -49.5,17.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#0055CCFF' type: AtmosPipeColor - uid: 4618 @@ -28165,8 +27483,6 @@ entities: - pos: -51.5,18.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#0055CCFF' type: AtmosPipeColor - uid: 4655 @@ -28174,8 +27490,6 @@ entities: - pos: -44.5,10.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#0055CCFF' type: AtmosPipeColor - uid: 4681 @@ -28184,8 +27498,6 @@ entities: pos: -18.5,3.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#0055CCFF' type: AtmosPipeColor - uid: 4697 @@ -28194,8 +27506,6 @@ entities: pos: -5.5,4.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#0055CCFF' type: AtmosPipeColor - uid: 4737 @@ -28203,8 +27513,6 @@ entities: - pos: -0.5,6.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#0055CCFF' type: AtmosPipeColor - uid: 4750 @@ -28213,8 +27521,6 @@ entities: pos: 4.5,4.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#0055CCFF' type: AtmosPipeColor - uid: 4793 @@ -28223,8 +27529,6 @@ entities: pos: 17.5,3.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#0055CCFF' type: AtmosPipeColor - uid: 4799 @@ -28233,8 +27537,6 @@ entities: pos: 28.5,3.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#0055CCFF' type: AtmosPipeColor - uid: 4815 @@ -28243,8 +27545,6 @@ entities: pos: 40.5,3.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#0055CCFF' type: AtmosPipeColor - uid: 4845 @@ -28253,8 +27553,6 @@ entities: pos: 46.5,12.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#0055CCFF' type: AtmosPipeColor - uid: 4885 @@ -28262,8 +27560,6 @@ entities: - pos: 46.5,7.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#0055CCFF' type: AtmosPipeColor - uid: 4894 @@ -28272,8 +27568,6 @@ entities: pos: 53.5,2.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#0055CCFF' type: AtmosPipeColor - uid: 4904 @@ -28282,8 +27576,6 @@ entities: pos: 60.5,2.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#0055CCFF' type: AtmosPipeColor - uid: 4905 @@ -28292,8 +27584,6 @@ entities: pos: 57.5,-0.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#0055CCFF' type: AtmosPipeColor - uid: 4947 @@ -28302,8 +27592,6 @@ entities: pos: 31.5,8.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#0055CCFF' type: AtmosPipeColor - uid: 4948 @@ -28311,8 +27599,6 @@ entities: - pos: 36.5,10.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#0055CCFF' type: AtmosPipeColor - uid: 4962 @@ -28321,8 +27607,6 @@ entities: pos: 36.5,18.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#0055CCFF' type: AtmosPipeColor - uid: 5063 @@ -28331,8 +27615,6 @@ entities: pos: 28.5,-4.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#0055CCFF' type: AtmosPipeColor - uid: 5066 @@ -28341,8 +27623,6 @@ entities: pos: 28.5,-16.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#0055CCFF' type: AtmosPipeColor - uid: 5134 @@ -28351,8 +27631,6 @@ entities: pos: 28.5,-29.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#0055CCFF' type: AtmosPipeColor - uid: 5135 @@ -28361,8 +27639,6 @@ entities: pos: 31.5,-26.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#0055CCFF' type: AtmosPipeColor - uid: 5136 @@ -28371,8 +27647,6 @@ entities: pos: 25.5,-26.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#0055CCFF' type: AtmosPipeColor - uid: 5175 @@ -28380,8 +27654,6 @@ entities: - pos: 3.5,15.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#0055CCFF' type: AtmosPipeColor - uid: 5180 @@ -28390,8 +27662,6 @@ entities: pos: -4.5,15.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#0055CCFF' type: AtmosPipeColor - uid: 5205 @@ -28400,8 +27670,6 @@ entities: pos: 13.5,15.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#0055CCFF' type: AtmosPipeColor - uid: 5240 @@ -28409,8 +27677,6 @@ entities: - pos: -4.5,21.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#0055CCFF' type: AtmosPipeColor - uid: 5245 @@ -28419,8 +27685,6 @@ entities: pos: -0.5,22.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#0055CCFF' type: AtmosPipeColor - uid: 5278 @@ -28429,8 +27693,6 @@ entities: pos: -0.5,33.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#0055CCFF' type: AtmosPipeColor - uid: 5300 @@ -28438,8 +27700,6 @@ entities: - pos: 3.5,22.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#0055CCFF' type: AtmosPipeColor - uid: 5302 @@ -28448,8 +27708,6 @@ entities: pos: 1.5,40.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#0055CCFF' type: AtmosPipeColor - uid: 5348 @@ -28457,8 +27715,6 @@ entities: - pos: 3.5,47.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#0055CCFF' type: AtmosPipeColor - uid: 5349 @@ -28467,8 +27723,6 @@ entities: pos: 10.5,54.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#0055CCFF' type: AtmosPipeColor - uid: 5350 @@ -28477,8 +27731,6 @@ entities: pos: -4.5,44.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#0055CCFF' type: AtmosPipeColor - uid: 5589 @@ -28487,44 +27739,32 @@ entities: pos: -0.5,17.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - uid: 5953 components: - pos: 31.5,25.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - uid: 5975 components: - pos: 10.5,25.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - uid: 5976 components: - pos: 21.5,25.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - uid: 6005 components: - pos: 60.5,25.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - uid: 6006 components: - rot: 1.5707963267948966 rad pos: 57.5,28.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - proto: GasVentScrubber entities: - uid: 4493 @@ -28533,8 +27773,6 @@ entities: pos: -32.5,11.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 4508 @@ -28542,8 +27780,6 @@ entities: - pos: -43.5,3.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 4511 @@ -28551,8 +27787,6 @@ entities: - pos: -30.5,2.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 4512 @@ -28561,8 +27795,6 @@ entities: pos: -29.5,-5.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 4515 @@ -28571,8 +27803,6 @@ entities: pos: -29.5,-17.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 4516 @@ -28581,8 +27811,6 @@ entities: pos: -29.5,-26.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 4577 @@ -28591,8 +27819,6 @@ entities: pos: -58.5,2.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 4578 @@ -28600,8 +27826,6 @@ entities: - pos: -53.5,3.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 4621 @@ -28610,8 +27834,6 @@ entities: pos: -47.5,17.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 4626 @@ -28620,8 +27842,6 @@ entities: pos: -44.5,14.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 4627 @@ -28630,8 +27850,6 @@ entities: pos: -44.5,17.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 4636 @@ -28640,8 +27858,6 @@ entities: pos: -51.5,13.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 4682 @@ -28649,8 +27865,6 @@ entities: - pos: -18.5,2.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 4696 @@ -28658,8 +27872,6 @@ entities: - pos: -5.5,2.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 4736 @@ -28667,8 +27879,6 @@ entities: - pos: -0.5,3.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 4749 @@ -28676,8 +27886,6 @@ entities: - pos: 4.5,2.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 4792 @@ -28685,8 +27893,6 @@ entities: - pos: 17.5,2.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 4798 @@ -28694,8 +27900,6 @@ entities: - pos: 28.5,2.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 4814 @@ -28703,8 +27907,6 @@ entities: - pos: 40.5,2.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 4844 @@ -28712,8 +27914,6 @@ entities: - pos: 47.5,12.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 4876 @@ -28721,8 +27921,6 @@ entities: - pos: 57.5,2.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 4886 @@ -28730,8 +27928,6 @@ entities: - pos: 47.5,7.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 4895 @@ -28739,8 +27935,6 @@ entities: - pos: 52.5,2.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 4917 @@ -28749,8 +27943,6 @@ entities: pos: 39.5,8.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 4918 @@ -28759,8 +27951,6 @@ entities: pos: 35.5,8.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 4923 @@ -28769,8 +27959,6 @@ entities: pos: 31.5,10.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 4929 @@ -28778,8 +27966,6 @@ entities: - pos: 37.5,14.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 4949 @@ -28788,8 +27974,6 @@ entities: pos: 38.5,10.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 4990 @@ -28798,8 +27982,6 @@ entities: pos: 36.5,19.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 5064 @@ -28808,8 +27990,6 @@ entities: pos: 28.5,-5.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 5065 @@ -28818,8 +27998,6 @@ entities: pos: 28.5,-17.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 5067 @@ -28828,8 +28006,6 @@ entities: pos: 28.5,-26.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 5148 @@ -28838,8 +28014,6 @@ entities: pos: -4.5,11.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 5149 @@ -28848,8 +28022,6 @@ entities: pos: 3.5,11.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 5150 @@ -28858,8 +28030,6 @@ entities: pos: -0.5,10.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 5165 @@ -28868,8 +28038,6 @@ entities: pos: -4.5,23.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 5166 @@ -28878,8 +28046,6 @@ entities: pos: -4.5,27.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 5174 @@ -28888,8 +28054,6 @@ entities: pos: -0.5,16.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 5206 @@ -28898,8 +28062,6 @@ entities: pos: 14.5,15.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 5246 @@ -28908,8 +28070,6 @@ entities: pos: -0.5,24.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 5268 @@ -28918,8 +28078,6 @@ entities: pos: 6.5,21.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 5269 @@ -28928,8 +28086,6 @@ entities: pos: 7.5,23.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 5277 @@ -28938,8 +28094,6 @@ entities: pos: -0.5,31.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 5301 @@ -28948,8 +28102,6 @@ entities: pos: -0.5,40.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 5320 @@ -28958,8 +28110,6 @@ entities: pos: 1.5,47.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - color: '#990000FF' type: AtmosPipeColor - uid: 5918 @@ -28967,40 +28117,30 @@ entities: - pos: 6.5,27.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - uid: 5919 components: - rot: 3.141592653589793 rad pos: 20.5,25.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - uid: 5920 components: - rot: 3.141592653589793 rad pos: 32.5,25.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - uid: 5941 components: - rot: 3.141592653589793 rad pos: 57.5,25.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - uid: 5942 components: - rot: 3.141592653589793 rad pos: 41.5,25.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - proto: GasVolumePump entities: - uid: 1109 @@ -32140,39 +31280,29 @@ entities: pos: 39.5,23.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - uid: 616 components: - rot: -1.5707963267948966 rad pos: 34.5,23.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - uid: 705 components: - pos: 21.5,26.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - uid: 1197 components: - rot: 3.141592653589793 rad pos: 20.5,20.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - uid: 1208 components: - rot: 3.141592653589793 rad pos: 57.5,24.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - uid: 1244 components: - pos: 57.5,3.5 @@ -32193,8 +31323,6 @@ entities: pos: 9.5,25.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - uid: 2681 components: - rot: -1.5707963267948966 rad @@ -32209,8 +31337,6 @@ entities: pos: 36.5,22.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - uid: 4192 components: - rot: 1.5707963267948966 rad @@ -32612,8 +31738,6 @@ entities: pos: 9.5,20.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - uid: 4252 components: - rot: 3.141592653589793 rad @@ -32749,16 +31873,12 @@ entities: - pos: 47.5,26.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - uid: 6024 components: - rot: 1.5707963267948966 rad pos: -11.5,16.5 parent: 2173 type: Transform - - enabled: False - type: AmbientSound - proto: PoweredlightLED entities: - uid: 4191 @@ -36281,7 +35401,13 @@ entities: type: Transform - containers: board: !type:Container + showEnts: False + occludes: True ents: [] + station-bank-ATM-cashSlot: !type:ContainerSlot + showEnts: False + occludes: True + ent: null type: ContainerContainer - uid: 5749 components: @@ -36291,7 +35417,13 @@ entities: type: Transform - containers: board: !type:Container + showEnts: False + occludes: True ents: [] + station-bank-ATM-cashSlot: !type:ContainerSlot + showEnts: False + occludes: True + ent: null type: ContainerContainer - proto: Stool entities: diff --git a/Resources/Prototypes/Access/command.yml b/Resources/Prototypes/Access/command.yml index f71ca12f3ba..aaa5f442287 100644 --- a/Resources/Prototypes/Access/command.yml +++ b/Resources/Prototypes/Access/command.yml @@ -2,6 +2,10 @@ id: Command name: id-card-access-level-command +- type: accessLevel + id: Frontier + name: id-card-access-level-frontier + - type: accessLevel id: Captain name: id-card-access-level-captain @@ -13,9 +17,10 @@ - type: accessGroup id: Command tags: + - Frontier - Command - Captain - HeadOfPersonnel - type: accessLevel - id: EmergencyShuttleRepealAll + id: EmergencyShuttleRepealAll \ No newline at end of file diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml index 54db7ca0437..60974873b97 100644 --- a/Resources/Prototypes/Access/misc.yml +++ b/Resources/Prototypes/Access/misc.yml @@ -8,6 +8,7 @@ - ChiefMedicalOfficer - HeadOfSecurity - ResearchDirector + - Frontier - Command - Security - Detective diff --git a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml index c8b05c6959d..1ff15a91886 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/access_configurator.yml @@ -30,6 +30,7 @@ - Chemistry - ChiefEngineer - ChiefMedicalOfficer + - Frontier - Command - Engineering - External diff --git a/Resources/Prototypes/Maps/frontier.yml b/Resources/Prototypes/Maps/frontier.yml index 8b8cd2ed8bb..91e1c146897 100644 --- a/Resources/Prototypes/Maps/frontier.yml +++ b/Resources/Prototypes/Maps/frontier.yml @@ -20,8 +20,12 @@ HeadOfPersonnel: [ 1, 1 ] HeadOfSecurity: [ 1, 1 ] SecurityOfficer: [ 0, 0 ] + SeniorOfficer: [ 0, 0 ] + SecurityCadet: [ 0, 0 ] + StationTrafficController: [ 0, 0 ] Borg: [ 0, 0 ] Valet: [ 1, 1 ] + MailCarrier: [ 0, 0 ] Janitor: [ 1, 1 ] Musician: [ 0, 0 ] Lawyer: [ 0, 0 ] diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml index b9b02e134c5..c4b00b7a4ef 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/cargo_technician.yml @@ -3,6 +3,9 @@ name: job-name-cargotech description: job-description-cargotech playTimeTracker: JobCargoTechnician + requirements: + - !type:OverallPlaytimeRequirement + time: 10800 startingGear: CargoTechGear icon: "JobIconCargoTechnician" supervisors: job-supervisors-qm diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index 8b63eb8ae19..bdcdfc4dcb3 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -3,16 +3,9 @@ name: job-name-qm description: job-description-qm playTimeTracker: JobQuartermaster - # requirements: - # - !type:RoleTimeRequirement - # role: JobCargoTechnician - # time: 21600 #6 hrs - # - !type:RoleTimeRequirement - # role: JobSalvageSpecialist - # time: 21600 #6 hrs - # - !type:DepartmentTimeRequirement - # department: Cargo - # time: 108000 # 30 hrs + requirements: + - !type:OverallPlaytimeRequirement + time: 10800 weight: 10 startingGear: QuartermasterGear icon: "JobIconQuarterMaster" diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml index 1076d5eea03..0bc225ed755 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml @@ -3,10 +3,9 @@ name: job-name-salvagespec description: job-description-salvagespec playTimeTracker: JobSalvageSpecialist - # requirements: - # - !type:DepartmentTimeRequirement - # department: Cargo - # time: 3600 + requirements: + - !type:OverallPlaytimeRequirement + time: 10800 icon: "JobIconShaftMiner" startingGear: SalvageSpecialistGear supervisors: job-supervisors-qm diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml index fb1949edb22..74384461c62 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml @@ -4,9 +4,8 @@ description: job-description-bartender playTimeTracker: JobBartender requirements: - # - !type:DepartmentTimeRequirement - # department: Civilian - # time: 1800 + - !type:OverallPlaytimeRequirement + time: 10800 startingGear: BartenderGear icon: "JobIconBartender" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml index 35b858fb388..08fdeb940de 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/botanist.yml @@ -3,6 +3,9 @@ name: job-name-botanist description: job-description-botanist playTimeTracker: JobBotanist + requirements: + - !type:OverallPlaytimeRequirement + time: 10800 startingGear: BotanistGear icon: "JobIconBotanist" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml index 647a54c9e26..ed659e7efa8 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml @@ -3,6 +3,9 @@ name: job-name-chaplain description: job-description-chaplain playTimeTracker: JobChaplain + requirements: + - !type:OverallPlaytimeRequirement + time: 10800 startingGear: ChaplainGear icon: "JobIconChaplain" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml index db6c6d084f6..43653adc4d8 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml @@ -3,10 +3,9 @@ name: job-name-chef description: job-description-chef playTimeTracker: JobChef - # requirements: - # - !type:DepartmentTimeRequirement - # department: Civilian - # time: 1800 + requirements: + - !type:OverallPlaytimeRequirement + time: 10800 startingGear: ChefGear icon: "JobIconChef" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml index 23c70d79cc5..b8640c8d605 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml @@ -3,6 +3,9 @@ name: job-name-clown description: job-description-clown playTimeTracker: JobClown + requirements: + - !type:OverallPlaytimeRequirement + time: 10800 startingGear: ClownGear icon: "JobIconClown" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml index ed48ea2711f..3157605f152 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml @@ -3,6 +3,9 @@ name: job-name-janitor description: job-description-janitor playTimeTracker: JobJanitor + requirements: + - !type:OverallPlaytimeRequirement + time: 10800 startingGear: JanitorGear icon: "JobIconJanitor" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml index 02c26b2e9ca..dc379216d70 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml @@ -3,6 +3,9 @@ name: job-name-librarian description: job-description-librarian playTimeTracker: JobLibrarian + requirements: + - !type:OverallPlaytimeRequirement + time: 10800 startingGear: LibrarianGear icon: "JobIconLibrarian" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml index 76ae6a407af..d086c59e330 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml @@ -5,7 +5,7 @@ playTimeTracker: JobMime requirements: - !type:OverallPlaytimeRequirement - time: 14400 #4 hrs + time: 10800 startingGear: MimeGear icon: "JobIconMime" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml index f50825945a3..75534b6f3fb 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml @@ -3,6 +3,9 @@ name: job-name-musician description: job-description-musician playTimeTracker: JobMusician + requirements: + - !type:OverallPlaytimeRequirement + time: 10800 startingGear: MusicianGear icon: "JobIconMusician" supervisors: job-supervisors-hire diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml index 7b60f3f7f74..3cff97c163b 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml @@ -3,6 +3,9 @@ name: job-name-serviceworker description: job-description-serviceworker playTimeTracker: JobServiceWorker + requirements: + - !type:OverallPlaytimeRequirement + time: 10800 startingGear: ServiceWorkerGear icon: "JobIconServiceWorker" supervisors: job-supervisors-service diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index 8a6fbaa576f..c00b77978fa 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -18,6 +18,7 @@ - HeadOfPersonnel - Bar - Service + - Frontier - Maintenance - Janitor - Theatre diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml index d4e002ce249..945af9e9386 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml @@ -4,9 +4,8 @@ description: job-description-atmostech playTimeTracker: JobAtmosphericTechnician requirements: - # - !type:DepartmentTimeRequirement - # department: Engineering - # time: 3600 + - !type:OverallPlaytimeRequirement + time: 10800 startingGear: AtmosphericTechnicianGear icon: "JobIconAtmosphericTechnician" supervisors: job-supervisors-ce diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml index 243e8bded69..ec468298a11 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -3,18 +3,9 @@ name: job-name-ce description: job-description-ce playTimeTracker: JobChiefEngineer -# requirements: -# - !type:RoleTimeRequirement -# role: JobAtmosphericTechnician -# time: 21600 #6 hrs -# - !type:RoleTimeRequirement -# role: JobStationEngineer -# time: 21600 #6 hrs -# - !type:DepartmentTimeRequirement -# department: Engineering -# time: 36000 #10 hrs -# - !type:OverallPlaytimeRequirement -# time: 144000 #40 hrs + requirements: + - !type:OverallPlaytimeRequirement + time: 10800 weight: 10 startingGear: ChiefEngineerGear icon: "JobIconChiefEngineer" diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml index c3a63115b86..f9e60108508 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml @@ -3,10 +3,9 @@ name: job-name-engineer description: job-description-engineer playTimeTracker: JobStationEngineer - # requirements: - # - !type:DepartmentTimeRequirement - # department: Engineering - # time: 1800 + requirements: + - !type:OverallPlaytimeRequirement + time: 10800 startingGear: StationEngineerGear icon: "JobIconStationEngineer" supervisors: job-supervisors-ce diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml index 0a499730d11..7302d7b4891 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml @@ -3,10 +3,9 @@ name: job-name-chemist description: job-description-chemist playTimeTracker: JobChemist - # requirements: - # - !type:DepartmentTimeRequirement - # department: Medical - # time: 1800 + requirements: + - !type:OverallPlaytimeRequirement + time: 10800 startingGear: ChemistGear icon: "JobIconChemist" supervisors: job-supervisors-cmo diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml index d4b69dc4529..5e605b42aab 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -5,18 +5,9 @@ name: job-name-cmo description: job-description-cmo playTimeTracker: JobChiefMedicalOfficer -# requirements: -# - !type:RoleTimeRequirement -# role: JobChemist -# time: 10800 #3 hrs -# - !type:RoleTimeRequirement -# role: JobMedicalDoctor -# time: 21600 #6 hrs -# - !type:DepartmentTimeRequirement -# department: Medical -# time: 36000 #10 hrs -# - !type:OverallPlaytimeRequirement -# time: 144000 #40 hrs + requirements: + - !type:OverallPlaytimeRequirement + time: 10800 weight: 10 startingGear: CMOGear icon: "JobIconChiefMedicalOfficer" diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml index 048d410f572..df990775623 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml @@ -3,10 +3,9 @@ name: job-name-doctor description: job-description-doctor playTimeTracker: JobMedicalDoctor - # requirements: - # - !type:DepartmentTimeRequirement - # department: Medical - # time: 1800 + requirements: + - !type:OverallPlaytimeRequirement + time: 10800 startingGear: DoctorGear icon: "JobIconMedicalDoctor" supervisors: job-supervisors-cmo diff --git a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml index e8ff7b3dc47..e83ed1ebb63 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml @@ -3,12 +3,9 @@ name: job-name-paramedic description: job-description-paramedic playTimeTracker: JobParamedic - # requirements: - # - !type:DepartmentTimeRequirement - # department: Medical - # time: 9000 - # - !type:OverallPlaytimeRequirement - # time: 54000 + requirements: + - !type:OverallPlaytimeRequirement + time: 10800 startingGear: ParamedicGear icon: "JobIconParamedic" supervisors: job-supervisors-cmo diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index 29226f8c43c..16a26d0bcb6 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -3,10 +3,9 @@ name: job-name-rd description: job-description-rd playTimeTracker: JobResearchDirector - # requirements: - # - !type:DepartmentTimeRequirement - # department: Science - # time: 108000 # 30 hrs + requirements: + - !type:OverallPlaytimeRequirement + time: 10800 weight: 10 startingGear: ResearchDirectorGear icon: "JobIconResearchDirector" diff --git a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml index 9d40088c24d..e205715626a 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml @@ -3,10 +3,9 @@ name: job-name-scientist description: job-description-scientist playTimeTracker: JobScientist - # requirements: - # - !type:DepartmentTimeRequirement - # department: Science - # time: 1800 + requirements: + - !type:OverallPlaytimeRequirement + time: 10800 startingGear: ScientistGear icon: "JobIconScientist" supervisors: job-supervisors-rd diff --git a/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml index 59a418d470d..979c8d622fc 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml @@ -5,7 +5,7 @@ playTimeTracker: JobBrigmedic requirements: - !type:OverallPlaytimeRequirement - time: 1400 + time: 21600 startingGear: BrigmedicGear icon: "JobIconBrigmedic" supervisors: job-supervisors-hos diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml index 1e39521d862..b081773e4cb 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml @@ -5,7 +5,7 @@ playTimeTracker: JobDetective requirements: - !type:OverallPlaytimeRequirement - time: 10800 #3 hr + time: 21600 startingGear: DetectiveGear icon: "JobIconDetective" supervisors: job-supervisors-hos diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index 24ccb3ce3fe..55c3ebed9c3 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -31,6 +31,7 @@ - HeadOfPersonnel - Command - Brig + - Frontier - Security - Armory - Maintenance diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml index 35c5c23c4a0..4371bd7a12a 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml @@ -5,7 +5,7 @@ playTimeTracker: JobSecurityCadet requirements: - !type:OverallPlaytimeRequirement - time: 36000 #10 hrs + time: 10800 - !type:DepartmentTimeRequirement department: Security time: 54000 #15 hrs diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml index 9506f1239f4..a1a22a941da 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml @@ -5,7 +5,7 @@ playTimeTracker: JobSecurityOfficer requirements: - !type:OverallPlaytimeRequirement - time: 7200 #2 hr + time: 21600 startingGear: SecurityOfficerGear icon: "JobIconSecurityOfficer" supervisors: job-supervisors-hos diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml index 8c9bdbcd1f8..b16b0b8e47a 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -5,7 +5,10 @@ playTimeTracker: JobWarden requirements: - !type:OverallPlaytimeRequirement - time: 1400 + time: 21600 + - !type:RoleTimeRequirement + role: JobSecurityOfficer + time: 21600 startingGear: WardenGear icon: "JobIconWarden" supervisors: job-supervisors-hos diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml index d9fe88fc142..147d296eba7 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml @@ -3,6 +3,9 @@ name: job-name-boxer description: job-description-boxer playTimeTracker: JobBoxer + requirements: + - !type:OverallPlaytimeRequirement + time: 10800 startingGear: BoxerGear icon: "JobIconBoxer" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml index 8861924cf6c..1038b2be84d 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml @@ -3,6 +3,9 @@ name: job-name-psychologist description: job-description-psychologist playTimeTracker: JobPsychologist + requirements: + - !type:OverallPlaytimeRequirement + time: 10800 startingGear: PsychologistGear icon: "JobIconPsychologist" supervisors: job-supervisors-cmo diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml index 60721273476..d348fd9524d 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/reporter.yml @@ -3,6 +3,9 @@ name: job-name-reporter description: job-description-reporter playTimeTracker: JobReporter + requirements: + - !type:OverallPlaytimeRequirement + time: 10800 startingGear: ReporterGear icon: "JobIconReporter" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml index bd8f5b85b6c..4e3f58a4dc0 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/zookeeper.yml @@ -3,6 +3,9 @@ name: job-name-zookeeper description: job-description-zookeeper playTimeTracker: JobZookeeper + requirements: + - !type:OverallPlaytimeRequirement + time: 10800 startingGear: ZookeeperGear icon: "JobIconZookeeper" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index bb54acfcf3b..e2cbfb93dbe 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -33,7 +33,8 @@ - MartialArtist - MailCarrier - Gladiator - - Mercenary ## NF Job + - Mercenary ## NF Job below + - StationTrafficController - type: department diff --git a/Resources/Prototypes/Roles/play_time_trackers.yml b/Resources/Prototypes/Roles/play_time_trackers.yml index da9b84214bd..99c029450d1 100644 --- a/Resources/Prototypes/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/Roles/play_time_trackers.yml @@ -136,6 +136,9 @@ - type: playTimeTracker id: JobServiceWorker +- type: playTimeTracker + id: JobSTC + - type: playTimeTracker id: JobStationEngineer diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml index dd6137b0a43..5522509fcbc 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/Misc/identification_cards.yml @@ -8,4 +8,18 @@ - state: default - state: idpassenger - type: PresetIdCard - job: Mercenary \ No newline at end of file + job: Mercenary + +- type: entity + parent: IDCardStandard + id: STCIDCard + name: station traffic controller ID card + components: + - type: Sprite + layers: + - state: silver + - state: idheadofpersonnel + - type: Item + heldPrefix: silver + - type: PresetIdCard + job: StationTrafficController \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml index fbd30b595a0..70b6c661a2c 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Devices/pda.yml @@ -10,5 +10,20 @@ - type: PdaBorderColor borderColor: "#717059" accentVColor: "#A32D26" + - type: Icon + state: pda + +- type: entity + parent: BasePDA + id: STCPDA + name: station traffic controller PDA + description: Declare emergencies in style! + components: + - type: Pda + id: STCIDCard + state: pda + - type: PdaBorderColor + borderColor: "#717059" + accentVColor: "#A32D26" - type: Icon state: pda \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml new file mode 100644 index 00000000000..82fa304a941 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Structures/Doors/Airlocks/access.yml @@ -0,0 +1,19 @@ +- type: entity + parent: AirlockCommand + id: AirlockFrontierLocked + suffix: Frontier, Locked + components: + - type: AccessReader + access: [["Frontier"]] + - type: Wires + layoutId: AirlockCommand + +- type: entity + parent: AirlockCommandGlass + id: AirlockFrontierGlassLocked + suffix: Frontier, Locked + components: + - type: AccessReader + access: [["Frontier"]] + - type: Wires + layoutId: AirlockCommand \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Markers/Spawners/jobs.yml b/Resources/Prototypes/_NF/Markers/Spawners/jobs.yml index 86ec65ce7c7..809a0fe4e8c 100644 --- a/Resources/Prototypes/_NF/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/_NF/Markers/Spawners/jobs.yml @@ -8,4 +8,4 @@ - type: Sprite layers: - state: green - - state: security_cadet + - state: security_cadet \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Command/stc.yml b/Resources/Prototypes/_NF/Roles/Jobs/Command/stc.yml new file mode 100644 index 00000000000..4321d5cce1c --- /dev/null +++ b/Resources/Prototypes/_NF/Roles/Jobs/Command/stc.yml @@ -0,0 +1,29 @@ +- type: job + id: StationTrafficController + name: job-name-stc + description: job-description-stc + playTimeTracker: JobSTC + startingGear: STCGear + requirements: + - !type:OverallPlaytimeRequirement + time: 10800 + canBeAntag: false + icon: "JobIconServiceWorker" + supervisors: job-supervisors-hop + setPreference: true + access: + - Maintenance + - Frontier + +- type: startingGear + id: STCGear + equipment: + jumpsuit: ClothingUniformJumpsuitDetectiveGrey + back: ClothingBackpackFilled + shoes: ClothingShoesColorBlack + id: STCPDA + ears: ClothingHeadsetAltCommand + belt: BoxFolderClipboard + innerClothingSkirt: ClothingUniformJumpskirtDetectiveGrey + satchel: ClothingBackpackSatchelFilled + duffelbag: ClothingBackpackDuffelFilled \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml b/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml index 9edb5dca8c6..77095085f02 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Security/mercenary.yml @@ -3,6 +3,9 @@ name: job-name-mercenary description: job-description-mercenary playTimeTracker: JobMercenary + requirements: + - !type:OverallPlaytimeRequirement + time: 10800 startingGear: MercenaryGear canBeAntag: true icon: "JobIconSeniorOfficer" diff --git a/Resources/Prototypes/_Nyano/Roles/Jobs/Cargo/mail_carrier.yml b/Resources/Prototypes/_Nyano/Roles/Jobs/Cargo/mail_carrier.yml index ee2cf67371a..88ee0f7248b 100644 --- a/Resources/Prototypes/_Nyano/Roles/Jobs/Cargo/mail_carrier.yml +++ b/Resources/Prototypes/_Nyano/Roles/Jobs/Cargo/mail_carrier.yml @@ -4,6 +4,9 @@ description: job-name-mail-carrier startingGear: MailCarrierGear playTimeTracker: JobMailCarrier + requirements: + - !type:OverallPlaytimeRequirement + time: 10800 icon: "JobIconMailCarrier" supervisors: "station representative" access: diff --git a/Resources/Prototypes/_Nyano/Roles/Jobs/Civilian/valet.yml b/Resources/Prototypes/_Nyano/Roles/Jobs/Civilian/valet.yml index 7c5a3a16099..a44714e5e70 100644 --- a/Resources/Prototypes/_Nyano/Roles/Jobs/Civilian/valet.yml +++ b/Resources/Prototypes/_Nyano/Roles/Jobs/Civilian/valet.yml @@ -3,6 +3,9 @@ name: job-name-valet description: job-description-valet playTimeTracker: JobValet + requirements: + - !type:OverallPlaytimeRequirement + time: 10800 startingGear: ValetGear icon: "JobIconServiceWorker" supervisors: job-supervisors-everyone diff --git a/Resources/Prototypes/_Nyano/Roles/Jobs/Security/prisonguard.yml b/Resources/Prototypes/_Nyano/Roles/Jobs/Security/prisonguard.yml index 948a4c2c543..67da12f3280 100644 --- a/Resources/Prototypes/_Nyano/Roles/Jobs/Security/prisonguard.yml +++ b/Resources/Prototypes/_Nyano/Roles/Jobs/Security/prisonguard.yml @@ -5,7 +5,7 @@ playTimeTracker: JobPrisonGuard requirements: - !type:OverallPlaytimeRequirement - time: 1400 + time: 10800 startingGear: PrisonGuardGear canBeAntag: false icon: "JobIconWarden" diff --git a/Resources/Prototypes/_Nyano/Roles/Jobs/Wildcards/gladiator.yml b/Resources/Prototypes/_Nyano/Roles/Jobs/Wildcards/gladiator.yml index d0f59ae1304..c5a1c4a7a0f 100644 --- a/Resources/Prototypes/_Nyano/Roles/Jobs/Wildcards/gladiator.yml +++ b/Resources/Prototypes/_Nyano/Roles/Jobs/Wildcards/gladiator.yml @@ -3,6 +3,9 @@ name: job-name-gladiator description: job-description-gladiator playTimeTracker: JobGladiator + requirements: + - !type:OverallPlaytimeRequirement + time: 10800 startingGear: GladiatorGear canBeAntag: false icon: "JobIconBoxer" diff --git a/Resources/Prototypes/_Nyano/Roles/Jobs/Wildcards/martialartist.yml b/Resources/Prototypes/_Nyano/Roles/Jobs/Wildcards/martialartist.yml index 02a40f7ef7b..4243dd59663 100644 --- a/Resources/Prototypes/_Nyano/Roles/Jobs/Wildcards/martialartist.yml +++ b/Resources/Prototypes/_Nyano/Roles/Jobs/Wildcards/martialartist.yml @@ -3,6 +3,9 @@ name: job-name-martialartist description: job-description-martialartist playTimeTracker: JobMartialArtist + requirements: + - !type:OverallPlaytimeRequirement + time: 10800 startingGear: MartialGear icon: "JobIconBoxer" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/_Nyano/Roles/Jobs/Wildcards/prisoner.yml b/Resources/Prototypes/_Nyano/Roles/Jobs/Wildcards/prisoner.yml index 37cc9bac45f..c302e1528e5 100644 --- a/Resources/Prototypes/_Nyano/Roles/Jobs/Wildcards/prisoner.yml +++ b/Resources/Prototypes/_Nyano/Roles/Jobs/Wildcards/prisoner.yml @@ -3,14 +3,14 @@ name: job-name-prisoner description: job-description-prisoner playTimeTracker: JobPrisoner + requirements: + - !type:OverallPlaytimeRequirement + time: 10800 startingGear: PrisonerGear canBeAntag: false whitelistRequired: true icon: "JobIconPrisoner" supervisors: job-supervisors-security - requirements: - - !type:OverallPlaytimeRequirement - time: 3600 - type: startingGear id: PrisonerGear From a212a7273085cf29391ce0f9c10ab4a105e898a2 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Mon, 23 Oct 2023 22:05:17 +0000 Subject: [PATCH 2/6] Automatic Changelog (#461) --- Resources/Changelog/Changelog.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 06b20ef5dcf..6ab06de3bf1 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1275,3 +1275,23 @@ Entries: message: Central sent out a UI update to all radars in the sector. id: 146 time: '2023-10-22T23:16:38.0000000+00:00' +- author: Kesiath + changes: + - type: Add + message: Added the Station Traffic Controller access and job. + - type: Add + message: >- + Added the STC, Sergeant, Cadet, and Mail Carrier jobs as late-join + hirable roles for the STC. + - type: Tweak + message: >- + Changed the bridge access to be restricted to frontier command instead + of SR access. + - type: Tweak + message: Changed the shuttle console in the bridge to a higher radar resolution. + - type: Tweak + message: Changed most job playtime requirements to 3 hours. + - type: Fix + message: Fixed missing dock labels on Frontier. + id: 147 + time: '2023-10-23T22:04:53.0000000+00:00' From 9963908b5ca899260a0569babb21cb4d63f25b57 Mon Sep 17 00:00:00 2001 From: Checkraze <71046427+Cheackraze@users.noreply.github.com> Date: Mon, 23 Oct 2023 18:17:45 -0400 Subject: [PATCH 3/6] Cherry Pick Fried Food (#466) * Deep Fryer And Its Powers (#163) * Deep Fryer And Its Powers The Deep Fryer has been implemented. It uses Corn Oil, Ghee, and Olive Oil to fry. Other features include: 1. Mixing Oil and Water at a certain temperature causes smoke. 2. When throwing an object at the Deep Fryer, a Chef will *always* land the shot, but anyone else has a chance of missing. 3. When an item is sliced, an event is triggered that other items can see. * Update meal_recipes.yml * Reworking the effects so they won't trigger on init. * Create DeepFryerTest.cs * Commenting out the UnsafeOilVolumeEffects part of the .yml. Something about the sound script inside of it breaks UnintializedSaveTest and it's not necessary for a smoke reaction to occur anyway. * Update DeepFryerSystem.cs (cherry picked from commit f06fc04768736b8b7e4195fad6c5b122b4fcc8ea) * Deep-Fried Crispy Shader (#200) (cherry picked from commit b4e2feb75dda9e802536b239a5975c3feab6ed9b) * Adds the jar of olive oil (#197) Co-authored-by: Jeff <> (cherry picked from commit ab14a5bb51f32546d4c67769ec167c541fe8330d) * fried food mods and add missing sounds * flavorol tweaks * ship update --------- Co-authored-by: JJ <47927305+phcodes@users.noreply.github.com> Co-authored-by: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com> --- .../Kitchen/Components/DeepFriedComponent.cs | 10 + .../Kitchen/Components/DeepFryerComponent.cs | 10 + .../Kitchen/UI/DeepFryerBoundUserInterface.cs | 64 + .../Kitchen/UI/DeepFryerWindow.xaml | 67 ++ .../Kitchen/UI/DeepFryerWindow.xaml.cs | 71 ++ .../Visualizers/DeepFriedVisualizer.cs | 73 ++ .../Visualizers/DeepFryerVisualizer.cs | 21 + .../Tests/Nyanotrasen/DeepFryerTest.cs | 58 + .../EntitySystems/SliceableFoodSystem.cs | 42 + .../Kitchen/Components/DeepFriedComponent.cs | 23 + .../Kitchen/Components/DeepFryerComponent.cs | 240 ++++ .../Components/ProfessionalChefComponent.cs | 5 + .../Kitchen/EntitySystems/DeepFryerSystem.cs | 1065 +++++++++++++++++ .../Kitchen/ClearSlagDoAfterEvent.cs | 29 + .../Components/SharedDeepFriedComponent.cs | 22 + .../Components/SharedDeepFryerComponent.cs | 12 + .../Kitchen/UI/DeepFryerMessages.cs | 67 ++ Content.Shared/Throwing/ThrowEvents.cs | 13 +- Content.Shared/Throwing/ThrownItemSystem.cs | 5 +- .../Ambience/Objects/deepfryer_sizzling.ogg | Bin 0 -> 178914 bytes .../Nyanotrasen/Machines/attributions.yml | 9 + .../Machines/deepfryer_basket_add_item.ogg | Bin 0 -> 38471 bytes .../Machines/deepfryer_basket_remove_item.ogg | Bin 0 -> 9506 bytes .../kitchen/deep-fryer-component.ftl | 47 + Resources/Maps/Shuttles/bocadillo.yml | 197 ++- Resources/Maps/Shuttles/skipper.yml | 423 ++++--- .../Prototypes/Catalog/Fills/Crates/food.yml | 6 + Resources/Prototypes/DeltaV/shaders.yml | 5 + .../Entities/Structures/Machines/lathe.yml | 9 + .../Devices/CircuitBoards/production.yml | 16 + .../Recipes/Lathes/electronics.yml | 9 + .../Reagents/Consumable/Food/ingredients.yml | 2 + .../Prototypes/Research/civilianservices.yml | 1 + .../Prototypes/Roles/Jobs/Civilian/chef.yml | 6 +- .../_NF/Reagents/Consumables/food.yml | 5 +- .../Objects/Consumable/Drinks/drinks_oil.yml | 75 ++ .../Structures/Machines/deep_fryer.yml | 171 +++ .../Markers/Spawners/Random/devices.yml | 1 + .../Reagents/Consumable/Food/condiments.yml | 21 +- .../_Nyano/Recipes/Reactions/food.yml | 13 +- .../_Nyano/Recipes/Reactions/pyrotechnic.yml | 39 + .../Consumable/Drinks/oil_jar.rsi/butter.png | Bin 0 -> 154 bytes .../Consumable/Drinks/oil_jar.rsi/corn.png | Bin 0 -> 157 bytes .../Consumable/Drinks/oil_jar.rsi/icon.png | Bin 0 -> 278 bytes .../Drinks/oil_jar.rsi/icon_open.png | Bin 0 -> 267 bytes .../Consumable/Drinks/oil_jar.rsi/meta.json | 26 + .../Consumable/Drinks/oil_jar.rsi/olives.png | Bin 0 -> 143 bytes .../Machines/deep_fryer.rsi/meta.json | 255 ++++ .../Machines/deep_fryer.rsi/off-0.png | Bin 0 -> 981 bytes .../Machines/deep_fryer.rsi/off-1.png | Bin 0 -> 152 bytes .../Machines/deep_fryer.rsi/off-2.png | Bin 0 -> 208 bytes .../Machines/deep_fryer.rsi/off-3.png | Bin 0 -> 217 bytes .../Machines/deep_fryer.rsi/off-4.png | Bin 0 -> 212 bytes .../Machines/deep_fryer.rsi/off-5.png | Bin 0 -> 236 bytes .../Machines/deep_fryer.rsi/off-6.png | Bin 0 -> 244 bytes .../Machines/deep_fryer.rsi/off-7.png | Bin 0 -> 240 bytes .../Machines/deep_fryer.rsi/off-8.png | Bin 0 -> 259 bytes .../Machines/deep_fryer.rsi/on-1.png | Bin 0 -> 322 bytes .../Machines/deep_fryer.rsi/on-2.png | Bin 0 -> 473 bytes .../Machines/deep_fryer.rsi/on-3.png | Bin 0 -> 539 bytes .../Machines/deep_fryer.rsi/on-4.png | Bin 0 -> 535 bytes .../Machines/deep_fryer.rsi/on-5.png | Bin 0 -> 566 bytes .../Machines/deep_fryer.rsi/on-6.png | Bin 0 -> 720 bytes .../Machines/deep_fryer.rsi/on-7.png | Bin 0 -> 729 bytes .../Machines/deep_fryer.rsi/on-8.png | Bin 0 -> 769 bytes Resources/Textures/Shaders/crispy.swsl | 351 ++++++ 66 files changed, 3328 insertions(+), 256 deletions(-) create mode 100644 Content.Client/Nyanotrasen/Kitchen/Components/DeepFriedComponent.cs create mode 100644 Content.Client/Nyanotrasen/Kitchen/Components/DeepFryerComponent.cs create mode 100644 Content.Client/Nyanotrasen/Kitchen/UI/DeepFryerBoundUserInterface.cs create mode 100644 Content.Client/Nyanotrasen/Kitchen/UI/DeepFryerWindow.xaml create mode 100644 Content.Client/Nyanotrasen/Kitchen/UI/DeepFryerWindow.xaml.cs create mode 100644 Content.Client/Nyanotrasen/Kitchen/Visualizers/DeepFriedVisualizer.cs create mode 100644 Content.Client/Nyanotrasen/Kitchen/Visualizers/DeepFryerVisualizer.cs create mode 100644 Content.IntegrationTests/Tests/Nyanotrasen/DeepFryerTest.cs create mode 100644 Content.Server/Nyanotrasen/Kitchen/Components/DeepFriedComponent.cs create mode 100644 Content.Server/Nyanotrasen/Kitchen/Components/DeepFryerComponent.cs create mode 100644 Content.Server/Nyanotrasen/Kitchen/Components/ProfessionalChefComponent.cs create mode 100644 Content.Server/Nyanotrasen/Kitchen/EntitySystems/DeepFryerSystem.cs create mode 100644 Content.Shared/Nyanotrasen/Kitchen/ClearSlagDoAfterEvent.cs create mode 100644 Content.Shared/Nyanotrasen/Kitchen/Components/SharedDeepFriedComponent.cs create mode 100644 Content.Shared/Nyanotrasen/Kitchen/Components/SharedDeepFryerComponent.cs create mode 100644 Content.Shared/Nyanotrasen/Kitchen/UI/DeepFryerMessages.cs create mode 100644 Resources/Audio/Nyanotrasen/Ambience/Objects/deepfryer_sizzling.ogg create mode 100644 Resources/Audio/Nyanotrasen/Machines/attributions.yml create mode 100644 Resources/Audio/Nyanotrasen/Machines/deepfryer_basket_add_item.ogg create mode 100644 Resources/Audio/Nyanotrasen/Machines/deepfryer_basket_remove_item.ogg create mode 100644 Resources/Locale/en-US/nyanotrasen/kitchen/deep-fryer-component.ftl create mode 100644 Resources/Prototypes/DeltaV/shaders.yml create mode 100644 Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/CircuitBoards/production.yml create mode 100644 Resources/Prototypes/Nyanotrasen/Recipes/Lathes/electronics.yml create mode 100644 Resources/Prototypes/_Nyano/Entities/Objects/Consumable/Drinks/drinks_oil.yml create mode 100644 Resources/Prototypes/_Nyano/Entities/Structures/Machines/deep_fryer.yml create mode 100644 Resources/Prototypes/_Nyano/Recipes/Reactions/pyrotechnic.yml create mode 100644 Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/oil_jar.rsi/butter.png create mode 100644 Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/oil_jar.rsi/corn.png create mode 100644 Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/oil_jar.rsi/icon.png create mode 100644 Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/oil_jar.rsi/icon_open.png create mode 100644 Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/oil_jar.rsi/meta.json create mode 100644 Resources/Textures/Nyanotrasen/Objects/Consumable/Drinks/oil_jar.rsi/olives.png create mode 100644 Resources/Textures/Nyanotrasen/Structures/Machines/deep_fryer.rsi/meta.json create mode 100644 Resources/Textures/Nyanotrasen/Structures/Machines/deep_fryer.rsi/off-0.png create mode 100644 Resources/Textures/Nyanotrasen/Structures/Machines/deep_fryer.rsi/off-1.png create mode 100644 Resources/Textures/Nyanotrasen/Structures/Machines/deep_fryer.rsi/off-2.png create mode 100644 Resources/Textures/Nyanotrasen/Structures/Machines/deep_fryer.rsi/off-3.png create mode 100644 Resources/Textures/Nyanotrasen/Structures/Machines/deep_fryer.rsi/off-4.png create mode 100644 Resources/Textures/Nyanotrasen/Structures/Machines/deep_fryer.rsi/off-5.png create mode 100644 Resources/Textures/Nyanotrasen/Structures/Machines/deep_fryer.rsi/off-6.png create mode 100644 Resources/Textures/Nyanotrasen/Structures/Machines/deep_fryer.rsi/off-7.png create mode 100644 Resources/Textures/Nyanotrasen/Structures/Machines/deep_fryer.rsi/off-8.png create mode 100644 Resources/Textures/Nyanotrasen/Structures/Machines/deep_fryer.rsi/on-1.png create mode 100644 Resources/Textures/Nyanotrasen/Structures/Machines/deep_fryer.rsi/on-2.png create mode 100644 Resources/Textures/Nyanotrasen/Structures/Machines/deep_fryer.rsi/on-3.png create mode 100644 Resources/Textures/Nyanotrasen/Structures/Machines/deep_fryer.rsi/on-4.png create mode 100644 Resources/Textures/Nyanotrasen/Structures/Machines/deep_fryer.rsi/on-5.png create mode 100644 Resources/Textures/Nyanotrasen/Structures/Machines/deep_fryer.rsi/on-6.png create mode 100644 Resources/Textures/Nyanotrasen/Structures/Machines/deep_fryer.rsi/on-7.png create mode 100644 Resources/Textures/Nyanotrasen/Structures/Machines/deep_fryer.rsi/on-8.png create mode 100644 Resources/Textures/Shaders/crispy.swsl diff --git a/Content.Client/Nyanotrasen/Kitchen/Components/DeepFriedComponent.cs b/Content.Client/Nyanotrasen/Kitchen/Components/DeepFriedComponent.cs new file mode 100644 index 00000000000..a1252cf43ed --- /dev/null +++ b/Content.Client/Nyanotrasen/Kitchen/Components/DeepFriedComponent.cs @@ -0,0 +1,10 @@ +using Content.Shared.Kitchen.Components; + +namespace Content.Client.Kitchen.Components +{ + [RegisterComponent] + //Unnecessary item: [ComponentReference(typeof(SharedDeepFriedComponent))] + public sealed partial class DeepFriedComponent : SharedDeepFriedComponent + { + } +} diff --git a/Content.Client/Nyanotrasen/Kitchen/Components/DeepFryerComponent.cs b/Content.Client/Nyanotrasen/Kitchen/Components/DeepFryerComponent.cs new file mode 100644 index 00000000000..4123eb341ca --- /dev/null +++ b/Content.Client/Nyanotrasen/Kitchen/Components/DeepFryerComponent.cs @@ -0,0 +1,10 @@ +using Content.Shared.Kitchen.Components; + +namespace Content.Client.Kitchen.Components +{ + [RegisterComponent] + // Unnecessary line: [ComponentReference(typeof(SharedDeepFryerComponent))] + public sealed partial class DeepFryerComponent : SharedDeepFryerComponent + { + } +} diff --git a/Content.Client/Nyanotrasen/Kitchen/UI/DeepFryerBoundUserInterface.cs b/Content.Client/Nyanotrasen/Kitchen/UI/DeepFryerBoundUserInterface.cs new file mode 100644 index 00000000000..8db884328e4 --- /dev/null +++ b/Content.Client/Nyanotrasen/Kitchen/UI/DeepFryerBoundUserInterface.cs @@ -0,0 +1,64 @@ +using Robust.Client.GameObjects; +using Content.Shared.Kitchen.UI; + +namespace Content.Client.Nyanotrasen.Kitchen.UI +{ + public sealed class DeepFryerBoundUserInterface : BoundUserInterface + { + private DeepFryerWindow? _window; + + private NetEntity[] _entities = default!; + + public DeepFryerBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) + { + base.Open(); + _window = new DeepFryerWindow(); + _window.OnClose += Close; + _window.ItemList.OnItemSelected += args => + { + SendMessage(new DeepFryerRemoveItemMessage(_entities[args.ItemIndex])); + }; + _window.InsertItem.OnPressed += _ => + { + SendMessage(new DeepFryerInsertItemMessage()); + }; + _window.ScoopVat.OnPressed += _ => + { + SendMessage(new DeepFryerScoopVatMessage()); + }; + _window.ClearSlag.OnPressed += args => + { + SendMessage(new DeepFryerClearSlagMessage()); + }; + _window.RemoveAllItems.OnPressed += _ => + { + SendMessage(new DeepFryerRemoveAllItemsMessage()); + }; + _window.OpenCentered(); + } + + protected override void UpdateState(BoundUserInterfaceState state) + { + base.UpdateState(state); + + if (_window == null) + return; + + if (state is not DeepFryerBoundUserInterfaceState cast) + return; + + _entities = cast.ContainedEntities; + _window.UpdateState(cast); + } + + protected override void Dispose(bool disposing) + { + base.Dispose(disposing); + + if (!disposing) + return; + + _window?.Dispose(); + } + } +} diff --git a/Content.Client/Nyanotrasen/Kitchen/UI/DeepFryerWindow.xaml b/Content.Client/Nyanotrasen/Kitchen/UI/DeepFryerWindow.xaml new file mode 100644 index 00000000000..6ada0b95baf --- /dev/null +++ b/Content.Client/Nyanotrasen/Kitchen/UI/DeepFryerWindow.xaml @@ -0,0 +1,67 @@ + + + + + +